This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_3_8

'OOO_BUILD_1_3_8'.
author: nobody <nobody@gnome.org> 2005-01-27 10:23:36 +0000
committer: nobody <nobody@gnome.org> 2005-01-27 10:23:36 +0000
commit: f4e8f357409a669db8b9151b4f333409d0f62260 (patch)
tree: 32ac0c14c98a8f3994a10d8067a799829cd438c3
parent: 4bfa94e9488518b5b5da6e54fef6522c91dce1f1 (diff)
127 files changed, 9858 insertions, 7799 deletions
diff --git a/Makefile.am b/Makefile.am
index 3cb8b5ce7..1fbc5f594 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if BONOBO
   MAYBE_BONOBO = bonobo
 endif
 
-SUBDIRS = po desktop bin etc patches man doc fonts stamp src www $(MAYBE_BONOBO)
+SUBDIRS = po distro-configs desktop bin etc patches man doc fonts stamp src www $(MAYBE_BONOBO)
 
 include $(top_srcdir)/Makefile.shared
 
diff --git a/NEWS b/NEWS
index 5d8e0cd2b..f5047008c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,111 @@
+ooo-build-1.3.8
+
+    + bug fixes
+	+ gtk+ bits
+		+ RTL rendering fix (Raul)
+		+ XIM fixes (Michael)
+		+ multi-file-select (Caolan)
+		+ vfs/uno registration (Dan)
+		+ menubar backgrounds fix (Dan)
+	+ build fixes
+		+ new distro config setup (Dan)
+		+ better language mappings (Rene, Dan)
+		+ .desktop install fixes (Dan)
+		+ rpath fixes (Dan)
+		+ use dmake 4.3 (Rene)
+		+ misc (Chris, Raul, Dan)
+	+ misc
+		+ splash window title fix (Dan)
+		+ calc column unhiding (Dan)
+		+ recent-files fixes (Dan)
+		+ font encoding fixes (Dan)
+		+ padmin i18n fix (Dan)
+		+ indic/bengali font/i18n work (Dan)
+		+ font substitution fixes (Dan)
+		+ xls interop fix (Dan)
+		+ misc. crashers (Dan)
+		+ dlopen right libGL (Rene)
+		+ fix basic/xinerama issues (Bero)
+    + features
+	+ Send E-mail in MS format (Jayant)
+	+ ctrl/shift multi-select slides (Raul)
+	+ Quattro Pro 6 import filter (Shilpa)
+	+ gcc 3.4 support (Guiseppe, Hanno Meyer-Thurow, Bero)
+	+ target up-stream 1.1.4 (Bero, Shreyas)
+	+ Mandrake support (Guiseppe)
+	    + splash
+	    + PDF pseudo printers
+	    + italian fixes
+
+ooo-build-1.3.7
+
+    + bug fixes
+	+ don't crash on calc row deletion (Chris)
+	+ updated psprint: lots of fixes (Chris)
+	+ kde fpicker list update fix (Lubos Lunak)
+	+ expanded .desktop mime-types (Rene)
+	+ vcl/libXt/Java interaction (Petr)
+	+ evo / connectivity fix (Jayant)
+    + features
+	+ calc ctrl +/- to insert/delete lines (Jayant)
+	+ default to optimal page wrap (Jayant)
+	+ more reliable desktop detection (Kendy)
+	+ Debian uses more common patches (Rene)
+	+ DataPilot (Srini)
+		+ auto-format support
+		+ dynamic range alteration
+	+ gcc-3.4 support (Hanno Meyer-Thurow, Bero)
+
+ooo-build-1.3.6
+
+    + bug fixes
+	+ i18n
+		+ Hebrew font fixes (Rene)
+		+ merge-cell translations (Petr)
+		+ Japanese font fixes (Petr)
+		+ Korean font fixes (Dan)
+		+ turkish currency update (Rene)
+	+ Win32 bits		
+		+ .Net 2002 (Gabor Keresztfalvi)
+		+ Java build (Raul)
+		+ writerperfect Win32 build (Raul)
+	+ Misc
+		+ cell selection fixes (Nicel)
+		+ escape closes print preview (Jayant)
+		+ email attachment filenames (Jayant)
+		+ desktop debug build fix (Josh Triplett)
+		+ setup symlink fixes (Petr)
+	+ Unix Desktop
+		+ KDE fpicker (Jan)
+			+ don't freeze on double-click
+			+ confirmation for Save As
+			+ translation fixes
+			+ filter list fix
+		+ KDE NFW fixes (Jan)
+		+ gtk+ (Michael)
+			+ NWF fixes
+			+ IM mangling
+	+ Interop
+		+ word interop crasher (Caolan)
+		+ writerperfect import fix (Friedrich Strba)
+	+ Build 
+		+ word count compilation fix (Dan)
+		+ improved RPM packaging (Dan)
+		+ updated pyuno docs (Martin)
+		+ MimeType fixes to .desktop files (Rene)
+		+ improve per-desktop icon code (Arkadiusz)
+		+ LD_ASSUME_KERNEL pain (Bernhard R)
+		+ misc. (Rene, Raul)
+    + features
+	+ much improved calc filters (Srinivasa)
+	+ build with free .jars (Macro Pratesi)
+	+ build vs. 1.3.3 final (Martin K)
+	+ Linux/ARM support (Peter Naulls)
+	+ basic lotus 123 import (Aswanth, Sunil Gandhi)
+	+ evolution connectivity re-write (Jayant, Michael)
+    + pending
+	+ Quattro Pro import (Shilpa, Michael)
+
 ooo-build-1.3.5
 
     + bug fixes
diff --git a/bin/oowintool b/bin/oowintool
index 38cf6b04b..983bd9ad5 100755
--- a/bin/oowintool
+++ b/bin/oowintool
@@ -88,7 +88,7 @@ my %msvc6 = (
 my %msvs_net_2002 = (
     'ver' => '7.0',
     'key' => 'Microsoft/VisualStudio/7.0/Setup/VC/ProductDir',
-    'dll_path' => '../SDK/v1.1/Bin', # testme ...
+    'dll_path' => '../Visual Studio .NET Professional - English', # testme ...
     'dll_suffix' => '70'
 );
 my %msvs_net_2003 = (
diff --git a/bin/openoffice-xlate-lang b/bin/openoffice-xlate-lang
index 2fcd9922d..ff1fd04b8 100755
--- a/bin/openoffice-xlate-lang
+++ b/bin/openoffice-xlate-lang
@@ -114,9 +114,11 @@ __DATA__
 01:en:english
 03:pt:portuguese
 07:ru:russian
+10:eu:basque
 26:ns:northernsotho
 27:af:afrikaans
 28:zu:zulu
+29:tn:tswana
 30:el:greek
 31:nl:dutch
 33:fr:french
@@ -124,6 +126,7 @@ __DATA__
 35:fi:finnish
 36:hu:hungarian
 37:ca:catalan
+38:gl:galician
 39:it:italian
 42:cs:czech
 43:sk:slovak
@@ -135,6 +138,8 @@ __DATA__
 50:sl:slovenian
 53:cy:welsh
 55:pt-BR:portuguese_brazilian
+58:lt:lithuanian
+66:th:thai
 77:et:estonian
 79:nn:norwegian_nynorsk
 81:ja:japanese
@@ -143,5 +148,8 @@ __DATA__
 88:zh-TW:chinese_traditional
 90:tr:turkish
 91:hi:hindi
+92:ta:tamil
+93:kn:kannda
+94:gu:gujarati
 96:ar:arabic
 97:he:hebrew
diff --git a/bin/package-lang b/bin/package-lang
index d628ec77d..36e66df8c 100755
--- a/bin/package-lang
+++ b/bin/package-lang
@@ -221,8 +221,8 @@ sub BuildLang {
 				    $action = "Link";
 				}
 				else {
-				    chmod 0644,"$outpath/$value->{Name}";
-				    copy($fileToCopy,$outpath) or die "Can't copy $fileToCopy to $outpath";
+				    chmod 0644,"$destFile";
+				    copy($fileToCopy,$destFile) or die "Can't copy $fileToCopy to $destFile";
 				    $action = "Copy";
 				}
 			    }
diff --git a/bin/package-ooo b/bin/package-ooo
index 42bdb544a..dd83ba78a 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -52,6 +52,33 @@ create_simple_wrapper()
     cat <<EOT >$2
 #!/bin/sh
 
+# Keep in ~sync with ooo-wrapper
+
+SystemInstallDir="$OOINSTBASE"
+
+if [ -n "\$GNOME_DESKTOP_SESSION_ID" -a -d "\$SystemInstallDir/program/resource.gnome" ]; then
+    icon_set="gnome"
+elif [ -n "\$KDE_FULL_SESSION" -a -d "\$SystemInstallDir/program/resource.kde" ]; then
+    icon_set="kde"
+fi
+
+if [ -z "\$icon_set" ]; then
+    if [ -d "\$SystemInstallDir/program/resource.default" ]; then
+	icon_set="default"
+    elif [ -d "\$SystemInstallDir/program/resource.kde" ]; then
+	icon_set="kde"
+    elif [ -d "\$SystemInstallDir/program/resource.gnome" ]; then
+	icon_set="gnome"
+    else
+	icon_set="default"
+    fi
+fi
+    
+if [ -d "\$SystemInstallDir/program/resource.\$icon_set" ]; then
+    OOO_PREFERRED_RESOURCE_PATH="\$SystemInstallDir/program/resource.\$icon_set"
+    export OOO_PREFERRED_RESOURCE_PATH
+fi
+
 exec "$1" "\$@"
 EOT
     chmod 755 $2
@@ -100,7 +127,7 @@ if test "z$VENDORNAME" = "zRedHat" ; then
 	mkdir -p $PREFIX/share/applications
 	for i in openoffice-printeradmin openoffice-setup redhat-drawing \
 			redhat-math redhat-presentations redhat-word-processor redhat-spreadsheet; do
-		cp -f /usr/share/desktop-menu-patches/$i.desktop $PREFIX/share/applications/$i.desktop
+		ln -sf /usr/share/desktop-menu-patches/$i.desktop $PREFIX/share/applications/$i.desktop
 		echo "StartupNotify=true" >> $PREFIX/share/applications/$i.desktop
 	done
 
diff --git a/bin/setup.in b/bin/setup.in
index 331eda47b..178feb094 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -27,6 +27,8 @@ OOO_ICONS_VERS='@OOO_ICONS_VERS@'
 OOO_ICONS_NAMES='@OOO_ICONS_NAMES@'
 OOO_WIDGET_FLAGS='@OOO_WIDGET_FLAGS@'
 OOO_BUILDVERSION='@OOO_BUILDVERSION@'
+SYSTEM_DB_VERSION='@SYSTEM_DB_VERSION@'
+TOOLSDIR='@TOOLSDIR@'
 
 # shrink this to ENUS,GERM for a faster build
 LANGS="ENUS,FREN,GERM,SPAN,ITAL,DTCH,PORT,SWED,POL,RUSS";
@@ -37,68 +39,18 @@ if test "z$VERSION" != "z1.1.0"; then
 	LANGS="$LANGS,HUNG,ESTONIAN,SLOVENIAN";
 fi
 
-if test "z$DISTRO" = "zRHFedora"; then
-    CONFIGURE_OPTIONS="--with-lang=ALL		\
-				--enable-libart		\
-				--enable-libsn			\
-				--enable-crashdump=no	\
-				--enable-symbols=yes	\
-				--enable-fontconfig		\
-				--with-system-zlib		\
-				--with-system-freetype	\
-				--with-system-db		\
-				--with-db-version=4.2	\
-				--without-fonts		\
-				--enable-gtk			\
-				--enable-kde			\
-				--disable-mozilla";
-
-elif test "z$DISTRO" = "zRHEL3"; then
-    CONFIGURE_OPTIONS="--with-lang=ALL		\
-				--enable-libart		\
-				--enable-libsn			\
-				--enable-crashdump=no	\
-				--enable-symbols=yes	\
-				--enable-fontconfig		\
-				--with-system-zlib		\
-				--with-system-freetype	\
-				--with-system-db		\
-				--with-db-version=4.1	\
-				--without-fonts		\
-				--disable-mozilla";
-
-elif test "z$DISTRO" = "zRHL9"; then
-    CONFIGURE_OPTIONS="--with-lang=ALL		\
-				--enable-libart		\
-				--enable-libsn			\
-				--enable-crashdump=no	\
-				--enable-symbols=yes	\
-				--enable-fontconfig		\
-				--with-system-zlib		\
-				--with-system-freetype	\
-				--with-system-db		\
-				--with-db-version=4.1	\
-				--without-fonts		\
-				--disable-mozilla";
-
-elif test "z$DISTRO" = "zArk"; then
-    CONFIGURE_OPTIONS="--with-lang=$LANGS \
-                       --enable-libart --enable-crashdump=no \
-                       --without-fonts --with-system-zlib --enable-fontconfig \
-                       --with-system-freetype --with-system-db \
-                       --with-system-sane-headers \
-                       --with-system-x11-extensions-headers \
-                       --with-system-unixodbc-headers \
-                       --with-system-curl --disable-mozilla\
-                       --with-python=/usr/bin/python \
-                       --with-system-xrender \
-                       --enable-kde"
-
-elif test "z$BUILD_WIN32" != "z"; then
-    CONFIGURE_OPTIONS="--with-lang=$LANGS --with-use-shell=tcsh \
-		       --enable-libart --enable-crashdump=no \
-		       --disable-mozilla"
-
+# We pull config options in from distro-specific config
+# files, if present
+if test "z$DISTRO" != "z"; then
+	if test -f "$TOOLSDIR/distro-configs/$DISTRO.conf"; then
+		CONFIGURE_OPTIONS="`cat $TOOLSDIR/distro-configs/$DISTRO.conf | xargs`";
+		CONFIGURE_OPTIONS=`eval echo $CONFIGURE_OPTIONS`;
+	else
+		echo "Could not find the distribution specific configure options";
+		echo "   file in $TOOLSDIR/distro-configs/.  Please add one for this";
+		echo "   distribution.";
+		exit 1;
+	fi
 else
     if test "z$CONFIGURE_OPTIONS" = "z"; then
 	if [ -s ./setup.configure ]; then
@@ -129,8 +81,8 @@ CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $OOO_WIDGET_FLAGS"
 ENABLE_BONOBO=@ENABLE_BONOBO@
 ENABLE_JAVA=@ENABLE_JAVA@
 JDK_HOME=@JDK_HOME@
+ANT_HOME=@ANT_HOME@
 # Misc. internal
-TOOLSDIR='@TOOLSDIR@'
 OOBUILDDIR='@OOBUILDDIR@'
 SYSTEM_GCC='@SYSTEM_GCC@'
 FORCE_GCC33='@FORCE_GCC33@'
@@ -168,6 +120,10 @@ TCSH=/bin/tcsh
 # setup paths
 PATH="$BUILDDIR/bin:$PATH:$TOOLSDIR/bin"
 if test "z$ENABLE_JAVA" = "zyes"; then
+    if test "z$ANT_HOME" != "z"; then
+        CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-ant-home=$ANT_HOME"
+        PATH="$ANT_HOME:$PATH"
+    fi
     if test "z$JDK_HOME" != "z"; then
         CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-jdk-home=$JDK_HOME"
         PATH="$JDK_HOME:$PATH"
diff --git a/bin/unpack b/bin/unpack
index 5a6d12dea..e09d6e9ff 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -102,6 +102,14 @@ tar $OOO_UNTAR_OPTIONS $SRCDIR/$OOO_TARBALL || exit 1
 cp -af $TOOLSDIR/bin/oowintool $OOBUILDDIR/config_office
 chmod a+x $OOBUILDDIR/config_office/oowintool
 
+# hack: fix possible packaging problem in 1.1.3
+chmod a+x $OOBUILDDIR/icu/convert.sh
+
+# Fix error in archive
+if test "z$VERSION" = 'z1.1.4'; then
+    rm -f $OOBUILDDIR/berkeleydb/download/db-3.2.9.tar.gz;
+fi
+
 # Win32 prerequisites ...
 if test "z$BUILD_WIN32" != "z"; then
 
diff --git a/configure.in b/configure.in
index 043a1c0ad..97a4bcfe2 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_PREFIX_DEFAULT(/usr)
 
 OOO_BUILDMAJOR_VERSION=1
 OOO_BUILDMINOR_VERSION=3
-OOO_BUILDMICRO_VERSION=5
+OOO_BUILDMICRO_VERSION=8
 dnl this includes pre-pended period.
 OOO_BUILDSTRIKE_VERSION=
 OOO_BUILDVERSION="$OOO_BUILDMAJOR_VERSION.$OOO_BUILDMINOR_VERSION.$OOO_BUILDMICRO_VERSION$OOO_BUILDSTRIKE_VERSION"
@@ -75,6 +75,11 @@ AC_ARG_WITH(jdk-home,
 			Java is disabled, this option has no effect.
 ],,)
 
+AC_ARG_WITH(ant-home,
+[
+	--with-ant-home: specify the path of your ant installation. 
+],,)
+
 AC_ARG_WITH(installed-ooo-dirname,
 [
 	--with-installed-ooo-dirname:	specify the directory name of the core OOo network
@@ -83,6 +88,15 @@ AC_ARG_WITH(installed-ooo-dirname,
 				Example:  --with-installed-ooo-dirname=ooo-1.1
 ],,)
 
+AC_ARG_WITH(binsuffix,
+[
+  --with-binsuffix
+			  specify the suffix to be used on the end of script
+			  names, to allow parallel installation of two versions.
+			  
+			  Default:  --with-binsuffix=1.9],
+,)
+
 AC_ARG_WITH(docdir,
 [
 	--with-docdir: define the directory name where the extra documentation
@@ -157,15 +171,14 @@ AC_ARG_ENABLE(gcc33,
                           Usage: --force-gcc33
 ],,)
 
-AC_ARG_WITH(arch,
+AC_ARG_WITH(system-db-version,
 [
-	--with-arch:         Define the architecture that we will target.
+	--with-system-db-version:  Specify the version of berkeleydb on the system that you wish to use.
 
-                          Usage: --with-arch=[x86|ppc|sparc]
+                          Usage: --with-system-db-version=4.2
 
 ],,)
 
-
 AM_MAINTAINER_MODE
 
 dnl
@@ -198,19 +211,26 @@ else
 fi
 
 PKG_CHECK_MODULES( FOO_COMMON, 
-		   [ gtk+-2.0 libxml-2.0 fontconfig >= 1.0.1 \
-		   libstartup-notification-1.0 ],
+		   [ libxml-2.0 fontconfig >= 1.0.1 ],
 		   have_common=true, have_common=false )
 
+PKG_CHECK_MODULES( FOO_COMMON_OPTIONAL,
+		   [ gtk+-2.0 libstartup-notification-1.0 ],
+		   have_common_optional=true, have_common_optional=false )
+
 # NB. according to:
 #   http://sources.redhat.com/ml/bug-automake/2002/msg02066.html
 # it's a really bad idea to do conditional tests for things.
 #
 if test "z$with_win32" = "z"; then
-    if test ! $have_common; then
+    if test "$have_common" != "true"; then
 	AC_MSG_ERROR([Library requirements were not met])
     fi
 
+    if test "$have_common_optional" != "true"; then
+        AC_MSG_WARN([libstartup-notification and/or gtk+ are missing, some configs depend on them])
+    fi
+
     if test "z$enable_bonobo" = "zyes"; then
 	ENABLE_BONOBO="yes"
     else
@@ -232,8 +252,8 @@ fi
 PKG_CHECK_MODULES( FOO_GNOME, [ gnome-vfs-2.0 ],
 		   have_gnome=true, have_gnome=false )
 
-if test ! $have_gnome; then
-    AC_MSG_ERROR([Gnome library requirements were not met])
+if test "$have_gnome" != "true"; then
+    AC_MSG_WARN([Gnome library requirements were not met, building without gnome support])
 fi
 
 AC_SUBST(ENABLE_BONOBO)
@@ -249,10 +269,6 @@ if test "z$with_tag" = "z"; then
 fi
 
 APPLY_DIR="$TOOLSDIR/patches/$with_tag"
-# Exceptions for some tags...
-if test "z$with_tag" = "zOOO_1_1_3_fix2" ; then
-    APPLY_DIR="$TOOLSDIR/patches/OOO_1_1_3"
-fi
 
 if test -f $APPLY_DIR/apply; then
    AC_MSG_RESULT( found $with_tag, using $APPLY_DIR/apply )
@@ -315,14 +331,13 @@ PKG_CHECK_MODULES( BAA, libart-2.0 >= $LIBART_VERSION,
 		   have_baa=true, have_baa=false )
 
 if test "z$with_win32" = "z"; then
-    if test ! $have_baa; then
+    if test "$have_baa" != "true"; then
 	AC_MSG_ERROR([You need to install libart development headers])
     fi
 else
     AC_PATH_PROG(CABEXTRACT, cabextract)
     if test "!" -x "$CABEXTRACT" ; then
-      AC_MSG_ERROR([
-*** The cabextract utility must be installed.])
+        AC_MSG_ERROR([*** The cabextract utility must be installed.])
     fi
 fi
 
@@ -334,7 +349,7 @@ AC_SUBST(DISTRO)
 
 PKG_CHECK_MODULES( BAZ, evolution-data-server-1.0 >= 0.0.92,
 		   have_baz=true, have_baz=false )
-if test "z$with_distro" = "NLD" -a ! $have_baz; then
+if test "z$with_distro" = "zNLD" -a "$have_baz" != "true"; then
    AC_MSG_ERROR([You need to install evolution-data-server])
 fi
 
@@ -365,11 +380,15 @@ if test "z$with_distro" = "zArk"; then
 fi
 
 JDK_HOME=
+ANT_HOME=
 if test "z$enable_java" = "zyes"; then
    ENABLE_JAVA=yes
    if test "z$with_jdk_home" != "z"; then
       JDK_HOME=$with_jdk_home
    fi
+   if test "z$with_ant_home" != "z"; then
+      ANT_HOME=$with_ant_home
+   fi
 else
    AC_PATH_PROG(XSLTPROC, xsltproc, no)
    if test "$XSLTPROC" = "no"; then
@@ -379,20 +398,26 @@ else
 fi
 AC_SUBST(ENABLE_JAVA)
 AC_SUBST(JDK_HOME)
-
-AC_CHECK_HEADER(security/pam_appl.h, have_pam=true, have_pam=false)
-AC_CHECK_HEADER(png.h, have_png=true, have_png=false)
-AC_CHECK_HEADER(zlib.h, have_zlib=true, have_zlib=false)
+AC_SUBST(ANT_HOME)
 
 if test "z$with_win32" = "z"; then
-    if test ! $have_pam; then
+    AC_CHECK_HEADER(security/pam_appl.h, have_pam=true, have_pam=false)
+    if test "$have_pam" != "true"; then
 	AC_MSG_ERROR(install pam-devel)
     fi
-    if test ! $have_png; then
+
+    AC_CHECK_HEADER(cups/cups.h, have_cups=true, have_cups=false)
+    if test "$have_cups" != "true"; then
+	AC_MSG_ERROR(install cups-devel)
+    fi
+
+    AC_CHECK_HEADER(png.h, have_png=true, have_png=false)
+    if test "$have_png" != "true"; then
 	AC_MSG_ERROR(install png-devel)
     fi
 
-    if test ! $have_zlib; then
+    AC_CHECK_HEADER(zlib.h, have_zlib=true, have_zlib=false)
+    if test "$have_zlib" != "true"; then
 	AC_MSG_ERROR(install zlib-devel)
     fi
 
@@ -466,7 +491,7 @@ for icons_name in $with_icons ; do
 	    ooo_icons_ver="ooo-debug_icons-OOO_1_1-0.1"
 	    ;;
 	Bluecurve)
-	    ooo_icons_ver="ooo-icons-bluecurve-OOO_1_1-10"
+	    ooo_icons_ver="ooo-icons-bluecurve-OOO_1_1-11"
 	    ;;
 	Ximian | Gnome | gnome | GNOME )
 	    ooo_icons_ver="ooo-icons-OOO_1_1-10"
@@ -517,16 +542,12 @@ if test "z$enable_gcc33" != "z"; then
 fi
 AC_SUBST(FORCE_GCC33)
 
-ARCHITECTURE="unxlngi4"
-if test "z$with_arch" != "z"; then
-    if test "z$with_arch" = "zppc"; then
-        ARCHITECTURE="unxlngppc"
-    fi
-    if test "z$with_arch" = "zsparc"; then
-        ARCHITECTURE="unxlngs"
-    fi
+# Specify a system berkeleydb version
+SYSTEM_DB_VERSION=""
+if test "z$with_system_db_version" != "z"; then
+    SYSTEM_DB_VERSION="$with_system_db_version"
 fi
-AC_SUBST(ARCHITECTURE)
+AC_SUBST(SYSTEM_DB_VERSION)
 
 AC_MSG_CHECKING([for broken aliases])
 if `alias gcc > /dev/null 2>&1`; then
@@ -534,7 +555,17 @@ if `alias gcc > /dev/null 2>&1`; then
 fi
 AC_MSG_RESULT(ok)
 
-OOO_BINSUFFIX=
+AC_MSG_CHECKING([for binsuffix])
+
+if test "z$with_binsuffix" = "zno"; then
+    OOO_BINSUFFIX=
+elif test "z$with_binsuffix" != "z"; then
+    OOO_BINSUFFIX=$with_binsuffix
+else
+    OOO_BINSUFFIX=1.9
+fi
+AC_MSG_RESULT([$OOO_BINSUFFIX])
+AC_SUBST(OOO_BINSUFFIX)
 
 AC_MSG_CHECKING([for ooo-version])
 if test "z$(echo "$CVSTAG" | sed -e 's#OOO_\([0-9]_[0-9]\)_.*#\1#')" = "z1_1"; then
@@ -545,7 +576,6 @@ fi
 OOO_VERSION="$OOO_MAJOR.$(echo "$CVSTAG" | sed -e 's#OOO_[0-9]_[0-9]_\([0-9]\).*#\1#')"
 
 AC_SUBST(OOO_VERSION)
-AC_SUBST(OOO_BINSUFFIX)
 
 datestamp=`date '+%Y%m%d.%H%M'`;
 SNAPSHOT_TAG="$datestamp.$TAG";
@@ -584,16 +614,27 @@ ooo1.1.spec
 bin/setup
 bin/Makefile
 desktop/Makefile
+distro-configs/Makefile
+distro-configs/NLD.conf
+distro-configs/RH9.conf
+distro-configs/FedoraCore1.conf
+distro-configs/FedoraCore2.conf
+distro-configs/FedoraCore3.conf
+distro-configs/FedoraCore4.conf
+distro-configs/RHEL3.conf
+distro-configs/RHEL4.conf
+distro-configs/Ark.conf
 etc/Makefile
 fonts/Makefile
 patches/Makefile
 patches/wpd/Makefile
 patches/evo2/Makefile
+patches/gcc34/Makefile
 patches/vclplug/Makefile
 patches/mscodec/Makefile
 patches/OOO_1_1/Makefile
-patches/OOO_1_1_2/Makefile
 patches/OOO_1_1_3/Makefile
+patches/OOO_1_1_4/Makefile
 po/Makefile
 doc/Makefile
 src/Makefile
diff --git a/download.in b/download.in
index e757ce96c..04bbc22bb 100755
--- a/download.in
+++ b/download.in
@@ -23,13 +23,15 @@ sub usage {
     'OOO_1_1_0.tar.bz2'                  => 'http://ooo.ximian.com/packages/OOO_1_1_0',
     'OOO_1_1_1.tar.bz2'                  => 'http://ooo.ximian.com/packages/OOO_1_1_1',
     'OOO_1_1_2.tar.bz2'                  => 'http://ooo.ximian.com/packages/OOO_1_1_2',
+    'OOO_1_1_3.tar.bz2'                  => 'http://ooo.ximian.com/packages/OOO_1_1_3',
     'OOO_1_1_3_fix2.tar.bz2'             => 'http://ooo.ximian.com/packages/OOO_1_1_3',
+    'OOO_1_1_4.tar.bz2'                  => 'http://ooo.ximian.com/packages/OOO_1_1_4',
     'libwpd-snap-20040823.tar.gz'	 => 'http://ooo.ximian.com/packages',
     'ooo-scaled-icons.tar.gz'            => 'http://ooo.ximian.com/packages',
     'ooo-icons-OOO_1_1-10.tar.gz'	 => 'http://ooo.ximian.com/packages',
     'ooo-KDE_icons-OOO_1_1-0.3.tar.gz'	 => 'http://kde.openoffice.org/files/documents/159/1975',
     'ooo-debug_icons-OOO_1_1-0.1.tar.gz' => 'http://kde.openoffice.org/files/documents/159/1786',
-    'ooo-icons-bluecurve-OOO_1_1-9.tar.gz' => '',
+    'ooo-icons-bluecurve-OOO_1_1-11.tar.gz' => 'http://people.redhat.com/dcbw/ooo-icons-bluecurve-OOO_1_1-11.tar.gz',
 # Win32 bits:
     'unicows.exe'			 => 'http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642',
     # from http://www.microsoft.com/downloads/release.asp?releaseid=30682'
diff --git a/patches/Makefile.am b/patches/Makefile.am
index 883f59337..cc424ac46 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,10 +1,11 @@
 SUBDIRS=\
 	wpd \
 	evo2 \
+	gcc34 \
 	vclplug \
 	mscodec \
 	OOO_1_1   \
-	OOO_1_1_2 \
-	OOO_1_1_3
+	OOO_1_1_3 \
+	OOO_1_1_4
 
 EXTRA_DIST=README apply.pl order $(wildcard *.diff)
diff --git a/patches/OOO_1_1/allow-free-jars.diff b/patches/OOO_1_1/allow-free-jars.diff
new file mode 100644
index 000000000..d24c83b2d
--- /dev/null
+++ b/patches/OOO_1_1/allow-free-jars.diff
@@ -0,0 +1,116 @@
+--- officecfg/org/openoffice/configuration/XMLDefaultGenerator.java.orig	Mon Oct 20 09:53:18 2003
++++ officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	Mon Oct 20 15:05:46 2003
+@@ -62,12 +62,12 @@
+ 
+ import org.xml.sax.*;
+ import org.w3c.dom.*;
+-import com.sun.xml.tree.XmlDocument;
++//import com.sun.xml.tree.XmlDocument;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.SAXParseException;
+ import javax.xml.parsers.SAXParserFactory;
+ import javax.xml.parsers.SAXParser;
+-import com.sun.xml.tree.*;
++//import com.sun.xml.tree.*;
+ import java.util.*;
+ import java.io.*;
+ import com.jclark.xsl.sax.Driver;
+--- XmlSearch/prj/build.lst.orig	Mon Oct 20 13:58:06 2003
++++ XmlSearch/prj/build.lst	Mon Oct 20 13:58:11 2003
+@@ -1,2 +1 @@
+ xh	XmlSearch	:	external codemaker NULL
+-xh XmlSearch\src\com\sun\xmlsearch	nmake - all xs NULL
+--- xmlhelp/prj/build.lst.orig	Mon Oct 20 13:53:25 2003
++++ xmlhelp/prj/build.lst	Mon Oct 20 13:53:33 2003
+@@ -2,7 +2,6 @@
+ xh	xmlhelp									usr1	-	all	xh_mkout NULL
+ xh	xmlhelp\source\helpprovider				nmake	-	all	xh_helpprovider NULL
+ xh	xmlhelp\source\treeview					nmake	-	all	xh_treeview NULL
+-xh	xmlhelp\source\com\sun\star\help		nmake	-	all	xh_help NULL
+ xh	xmlhelp\source\cxxhelp\util				nmake	-	all	xh_cutil NULL
+ xh	xmlhelp\source\cxxhelp\qe				nmake	-	all	xh_qe NULL
+ xh	xmlhelp\source\cxxhelp\db				nmake	-	all	xh_db NULL
+Index: util/makefile.pmk
+===================================================================
+RCS file: /cvs/installation/readlicense/util/makefile.pmk,v
+retrieving revision 1.2.30.1
+diff -u -u -r1.2.30.1 makefile.pmk
+--- readlicense_oo/util/makefile.pmk	9 Jan 2004 18:10:12 -0000	1.2.30.1
++++ readlicense_oo/util/makefile.pmk	17 Oct 2004 22:32:06 -0000
+@@ -79,7 +79,7 @@
+ $(MISC)$/%.html :
+     @+-$(MKDIR) $(@:d)
+ .IF "$(SOLAR_JAVA)"!=""
+-	$(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=html file=$@
++	$(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) 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 > ..$/readme2.xsl
+ 	xsltproc -o $@ \
+@@ -97,7 +97,7 @@
+ $(MISC)$/%.txt :
+     @+-$(MKDIR) $(@:d)
+ .IF "$(SOLAR_JAVA)"!=""
+-	$(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=text file=$@
++	$(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) 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 > ..$/readme2.xsl
+ 	xsltproc -o $@ \
+Index: makefile.pmk
+===================================================================
+RCS file: /cvs/util/officecfg/util/makefile.pmk,v
+retrieving revision 1.23.94.1
+diff -u -u -r1.23.94.1 makefile.pmk
+--- officecfg/util/makefile.pmk	9 Jan 2004 18:06:41 -0000	1.23.94.1
++++ officecfg/util/makefile.pmk	17 Oct 2004 22:35:53 -0000
+@@ -68,11 +68,11 @@
+     @+echo -------------+ validating and stripping schema files
+ 	-$(MKDIR) -p $(@:d)
+ .IF "$(SOLAR_JAVA)"!=""
+-	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+-	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b) pathSeparator=$/	
+-	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/
+-	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp
+-	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
++	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar org.openoffice.configuration.Inspector $<
++	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b) pathSeparator=$/	
++	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/
++	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp
++	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
+ .ELSE
+ # xsltproc already validates against the dtd.  For additional validation,
+ # org.openoffice.configuration.Inspector should be replaced and the
+@@ -98,7 +98,7 @@
+     @+echo -------------+ creating locale dependent resource bundles
+ 	-$(MKDIR) -p $(@:d)
+ .IF "$(SOLAR_JAVA)"!=""
+-	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}
++	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}
+ .ELSE
+ 	$(XSLTPROC) -o $(@:d)$(<:b).properties \
+ 	            --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \
+@@ -111,10 +111,10 @@
+     @+echo -------------+ validating and creating a locale independent file
+ 	-$(MKDIR) -p $(@:d) 
+ .IF "$(SOLAR_JAVA)"!=""
+-	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+-	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
+-	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
+-	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar org.openoffice.configuration.Inspector $<
++	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
++	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
++	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
+ .ELSE
+ # xsltproc already validates against the dtd.  For additional validation,
+ # org.openoffice.configuration.Inspector should be replaced and the
+@@ -142,8 +142,8 @@
+     @+echo -------------+ creating locale dependent entries
+ 	-$(MKDIR) -p $(@:d)
+ .IF "$(SOLAR_JAVA)"!=""
+-	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}	
+-	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++	$(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}	
++	$(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
+ .ELSE
+ 	$(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
+ 	$(XSLTPROC) -o $(@:d)$(<:b).tmp \
diff --git a/patches/OOO_1_1/crash-sw-checkbox-field.diff b/patches/OOO_1_1/crash-sw-checkbox-field.diff
index c24f15820..731a91bfd 100644
--- a/patches/OOO_1_1/crash-sw-checkbox-field.diff
+++ b/patches/OOO_1_1/crash-sw-checkbox-field.diff
@@ -35,7 +35,7 @@ diff -u -p -r1.115.68.4 ww8par.hxx
 +		com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
 +		com::sun::star::uno::Reference <
 +		com::sun::star::form::XFormComponent> &rFComp,
-+		com::sun::star::awt::Size &rSz) {}
++		com::sun::star::awt::Size &rSz) { return FALSE; }
  private:
      //No copying
      WW8FormulaControl(const WW8FormulaControl&);
diff --git a/patches/OOO_1_1/disable-hindi-kannada.diff b/patches/OOO_1_1/disable-hindi-kannada.diff
new file mode 100644
index 000000000..11fdc8a29
--- /dev/null
+++ b/patches/OOO_1_1/disable-hindi-kannada.diff
@@ -0,0 +1,13 @@
+--- config_office/set_soenv.in-old	2004-10-09 22:36:28.000000000 +0200
++++ config_office/set_soenv.in	2004-10-09 22:36:59.000000000 +0200
+@@ -49,8 +49,8 @@
+ #-------------------------------------------------
+ #
+ # Platform independent constant values.
+-my @LANGUAGES = ("AFRIK", "ARAB", "BASQUE", "CAT", "CHINSIM", "CHINTRAD", "CZECH", "DAN", "DTCH", "ENUS", "ESTONIAN", "FINN", "FREN", "GAL", "GREEK", "HEBREW", "HINDI", "HUNG", "ITAL",
+-"JAPN", "KANNADA", "KOREAN", "LITHUANIAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "THAI", "TSWANA", "TURK", "WELSH", "ZULU" ); 
++my @LANGUAGES = ("AFRIK", "ARAB", "BASQUE", "CAT", "CHINSIM", "CHINTRAD", "CZECH", "DAN", "DTCH", "ENUS", "ESTONIAN", "FINN", "FREN", "GAL", "GREEK", "HEBREW", "HUNG", "ITAL",
++"JAPN", "KOREAN", "LITHUANIAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "THAI", "TSWANA", "TURK", "WELSH", "ZULU" ); 
+ my @DICTIONARIES = ("DADK", "DEDE", "ENGB", "ENUS", "ITIT", "RURU" );
+ my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
+      $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
diff --git a/patches/OOO_1_1/dmake43.diff b/patches/OOO_1_1/dmake43.diff
new file mode 100644
index 000000000..5dd5417d4
--- /dev/null
+++ b/patches/OOO_1_1/dmake43.diff
@@ -0,0 +1,16 @@
+Index: configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.55.6.10
+diff -u -u -r1.55.6.10 configure.in
+--- config_office/configure.in	27 Aug 2004 10:03:41 -0000	1.55.6.10
++++ config_office/configure.in	17 Jan 2005 23:45:18 -0000
+@@ -1401,7 +1457,7 @@
+     # different
+     # This test _should_ work because the one accepts -V (ours) and one
+     # (the other) not...
+-    dmake -V 2>/dev/null | grep 'dmake .* Version 4.*, PL ' >/dev/null
++    dmake -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
+     if test $? -eq 0; then 
+        BUILD_DMAKE=NO
+        AC_MSG_RESULT([yes])
diff --git a/patches/OOO_1_1/email-attachment.diff b/patches/OOO_1_1/email-attachment.diff
new file mode 100644
index 000000000..6b51cb9ba
--- /dev/null
+++ b/patches/OOO_1_1/email-attachment.diff
@@ -0,0 +1,38 @@
+--- unotools/source/ucbhelper/tempfile.cxx	2004-10-12 10:47:47.000000000 +0530
++++ unotools/source/ucbhelper/tempfile.cxx	2004-10-19 16:20:49.663737320 +0530
+@@ -324,7 +324,8 @@
+     for ( sal_Int32 i=0;; i++ )
+     {
+         String aTmp( aName );
+-       	aTmp += String::CreateFromInt32( i );
++	if (i)
++        	aTmp += String::CreateFromInt32( i );
+         if ( pExtension )
+             aTmp += *pExtension;
+         else
+--- sfx2/source/dialog/mailmodel.cxx	2004-10-19 16:52:56.703782704 +0530
++++ sfx2/source/dialog/mailmodel.cxx	2004-10-11 20:48:22.000000000 +0530
+@@ -341,12 +341,12 @@
+ 				pExt = new String( String::CreateFromAscii( "." ) + aFileObj.getExtension() );
+ 				aFileObj.removeExtension();
+ 				aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+-				 aLeadingStr += String::CreateFromAscii( "_" );
++				// aLeadingStr += String::CreateFromAscii( "_" );
+ 			}
+ 			else
+ 			{
+ 				aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+-				 aLeadingStr += String::CreateFromAscii( "_" );
++				// aLeadingStr += String::CreateFromAscii( "_" );
+ 			}
+ 		}
+ 
+@@ -441,7 +441,7 @@
+ 					pExt = new String( aPDFExtension );
+ 					aFileObj.removeExtension();
+ 					aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+-					aLeadingStr += String::CreateFromAscii( "_" );
++				//	aLeadingStr += String::CreateFromAscii( "_" );
+ 				}
+ 				else
+ 				{
diff --git a/patches/OOO_1_1/frmbase-cxx.diff b/patches/OOO_1_1/frmbase-cxx.diff
new file mode 100644
index 000000000..0c13eec30
--- /dev/null
+++ b/patches/OOO_1_1/frmbase-cxx.diff
@@ -0,0 +1,27 @@
+--- sc/source/filter/excel/frmbase.cxx.bak	2004-12-14 17:42:15.000000000 +0530
++++ sc/source/filter/excel/frmbase.cxx	2004-12-15 15:03:48.292113128 +0530
+@@ -312,3 +312,24 @@
+ 	aEingPos = aNewEingPos;
+ }
+ 
++QProConverterBase::QProConverterBase( BiffReader &rStr, sal_uInt16 nNewBuffer ) :
++        ConverterBase( nNewBuffer ),
++        aIn( rStr )
++{
++}
++                                                                                                                             
++QProConverterBase::~QProConverterBase()
++{
++}
++                                                                                                                             
++void QProConverterBase::Reset( ScAddress aNewPos )
++{
++  ConverterBase::Reset();
++  aEingPos = aNewPos;
++}
++                                                                                                                             
++void QProConverterBase::Reset()
++{
++        ConverterBase::Reset();
++        aEingPos.Set( 0, 0, 0 );
++}
diff --git a/patches/OOO_1_1/gcc34-gcc343.diff b/patches/OOO_1_1/gcc34-gcc343.diff
new file mode 100644
index 000000000..1fe7a6486
--- /dev/null
+++ b/patches/OOO_1_1/gcc34-gcc343.diff
@@ -0,0 +1,27 @@
+--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx.orig	2005-01-09 11:36:52.024133067 +0100
++++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx	2005-01-09 11:39:19.111769997 +0100
+@@ -184,7 +184,12 @@
+ 	{
+ 		jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;");
+ 		if(id)
+-			return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL));
++			return copyArrayAndDelete(
++                t.pEnv,
++                (jobjectArray)t.pEnv->GetObjectField( object, id),
++                static_cast< const ::rtl::OUString* >( NULL ),
++                static_cast< const java_lang_String* >( NULL )
++            );
+ 	} //t.pEnv
+ 	return Sequence< ::rtl::OUString>();
+ }
+--- connectivity/source/inc/java/tools.hxx.orig	2002-11-01 11:58:49.000000000 +0100
++++ connectivity/source/inc/java/tools.hxx	2005-01-09 11:39:19.124770230 +0100
+@@ -101,7 +101,7 @@
+ 
+ 	java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ 
+-    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const  T& _rD1,const  JT& _rD2)
++    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* )
+ 	{
+                 ::com::sun::star::uno::Sequence< T > xOut;
+ 		if(_Array)
diff --git a/patches/OOO_1_1/gui-toolbox-large-icons.diff b/patches/OOO_1_1/gui-toolbox-large-icons.diff
index 3e8c9eed7..3bef667bf 100644
--- a/patches/OOO_1_1/gui-toolbox-large-icons.diff
+++ b/patches/OOO_1_1/gui-toolbox-large-icons.diff
@@ -2,10 +2,11 @@ Index: registry/schema/org/openoffice/Office/Common.xcs
 ===================================================================
 RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
 retrieving revision 1.84.8.5
-diff -u -r1.84.8.5 Common.xcs
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs	27 Apr 2004 16:35:22 -0000	1.84.8.5
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	8 Jun 2004 23:01:08 -0000
-@@ -28992,41 +28992,46 @@
+Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
+===================================================================
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig	2004-09-12 12:14:15.192985792 +0200
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2004-09-12 12:18:47.003664288 +0200
+@@ -36038,50 +36038,55 @@
  					</enumeration>
  					<enumeration oor:value="1">
  						<info>
@@ -32,7 +33,7 @@ diff -u -r1.84.8.5 Common.xcs
 -							<desc xml:lang="pt-BR">32x32 pixel icons</desc>
 -							<desc xml:lang="ja">32×32 ピクセルアイコン</desc>
 -							<desc xml:lang="ko">32x32 pixel icons</desc>
--							<desc xml:lang="tr">32x32 pixel icons</desc>
+-							<desc xml:lang="tr">32x32 piksel simgeler</desc>
 -							<desc xml:lang="th">32x32 pixel icons</desc>
 -							<desc xml:lang="x-comment">32x32 pixel icons</desc>
 -							<desc xml:lang="hu">32x32 pixel icons</desc>
@@ -40,6 +41,15 @@ diff -u -r1.84.8.5 Common.xcs
 -							<desc xml:lang="ns">32x32 pixel icons</desc>
 -							<desc xml:lang="af">32x32 pixel icons</desc>
 -							<desc xml:lang="zu">32x32 pixel icons</desc>
+-							<desc xml:lang="nb">32x32 pixel icons</desc>
+-							<desc xml:lang="et">32x32 pixel icons</desc>
+-							<desc xml:lang="cy">32x32 pixel icons</desc>
+-							<desc xml:lang="tn">32x32 pixel icons</desc>
+-							<desc xml:lang="nn">32x32 pixel icons</desc>
+-							<desc xml:lang="eu">32x32 pixel icons</desc>
+-							<desc xml:lang="lt">32x32 taškų paveikslai</desc>
+-							<desc xml:lang="kn-IN">32x32 pixel icons</desc>
+-							<desc xml:lang="gl">32x32 pixel icons</desc>
 +							<desc xml:lang="en-US">24x24 pixel icons</desc>
 +							<desc xml:lang="el">24x24 pixel icons</desc>
 +							<desc xml:lang="nl">24x24 pixel iconen</desc>
@@ -63,7 +73,7 @@ diff -u -r1.84.8.5 Common.xcs
 +							<desc xml:lang="pt-BR">24x24 pixel icons</desc>
 +							<desc xml:lang="ja">24×24 ピクセルアイコン</desc>
 +							<desc xml:lang="ko">24x24 pixel icons</desc>
-+							<desc xml:lang="tr">24x24 pixel icons</desc>
++							<desc xml:lang="tr">24x24 piksel simgeler</desc>
 +							<desc xml:lang="th">24x24 pixel icons</desc>
 +							<desc xml:lang="x-comment">24x24 pixel icons</desc>
 +							<desc xml:lang="hu">24x24 pixel icons</desc>
@@ -71,6 +81,15 @@ diff -u -r1.84.8.5 Common.xcs
 +							<desc xml:lang="ns">24x24 pixel icons</desc>
 +							<desc xml:lang="af">24x24 pixel icons</desc>
 +							<desc xml:lang="zu">24x24 pixel icons</desc>
++							<desc xml:lang="nb">24x24 pixel icons</desc>
++							<desc xml:lang="et">24x24 pixel icons</desc>
++							<desc xml:lang="cy">24x24 pixel icons</desc>
++							<desc xml:lang="tn">24x24 pixel icons</desc>
++							<desc xml:lang="nn">24x24 pixel icons</desc>
++							<desc xml:lang="eu">24x24 pixel icons</desc>
++							<desc xml:lang="lt">24x24 taškų paveikslai</desc>
++							<desc xml:lang="kn-IN">24x24 pixel icons</desc>
++							<desc xml:lang="gl">24x24 pixel icons</desc>
 +						</info>
 +					</enumeration>
 +					<enumeration oor:value="2">
diff --git a/patches/OOO_1_1/hebrew-culmus.diff b/patches/OOO_1_1/hebrew-culmus.diff
new file mode 100644
index 000000000..fdb44e670
--- /dev/null
+++ b/patches/OOO_1_1/hebrew-culmus.diff
@@ -0,0 +1,16 @@
+Index: registry/data/org/openoffice/VCL.xcu
+===================================================================
+RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
+retrieving revision 1.20.14.7
+diff -u -u -r1.20.14.7 VCL.xcu
+--- officecfg/registry/data/org/openoffice/VCL.xcu	27 May 2004 13:21:14 -0000	1.20.14.7
++++ officecfg/registry/data/org/openoffice/VCL.xcu	7 Nov 2004 14:21:56 -0000
+@@ -409,7 +409,7 @@
+     </node>
+     <node oor:name="he" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+-        <value>Tahoma;Raanana;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
++        <value>Ellinia CLM;Tahoma;Raanana;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
+      </prop>
+       <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace">
+         <value>Tahoma;Raanana;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
diff --git a/patches/OOO_1_1/i18n-add-ta-gu-support.diff b/patches/OOO_1_1/i18n-add-ta-gu-support.diff
new file mode 100644
index 000000000..9f7ec1f18
--- /dev/null
+++ b/patches/OOO_1_1/i18n-add-ta-gu-support.diff
@@ -0,0 +1,509 @@
+--- ./config_office/set_soenv.in.indic	2005-01-06 09:58:28.764700768 -0500
++++ ./config_office/set_soenv.in	2005-01-06 09:58:50.442129887 -0500
+@@ -50,7 +50,8 @@
+ #
+ # Platform independent constant values.
+ my @LANGUAGES = ("AFRIK", "ARAB", "BASQUE", "CAT", "CHINSIM", "CHINTRAD", "CZECH", "DAN", "DTCH", "ENUS", "ESTONIAN", "FINN", "FREN", "GAL", "GREEK", "HEBREW", "HINDI", "HUNG", "ITAL",
+-"JAPN", "KANNADA", "KOREAN", "LITHUANIAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "THAI", "TSWANA", "TURK", "WELSH", "ZULU" ); 
++"JAPN", "KANNADA", "KOREAN", "LITHUANIAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "THAI", "TSWANA", "TURK", "WELSH", "ZULU",
++"TAMIL", "GUJARATI" ); 
+ my @DICTIONARIES = ("DADK", "DEDE", "ENGB", "ENUS", "ITIT", "RURU" );
+ my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
+      $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
+--- ./transex3/inc/export.hxx.indic	2005-01-04 16:14:53.403273610 -0500
++++ ./transex3/inc/export.hxx	2005-01-04 16:16:26.379237203 -0500
+@@ -242,11 +242,20 @@
+ #define GALICIAN_ISO				"gl"
+ #define GALICIAN_INDEX				42
+ 
++#define TAMIL					92
++#define TAMIL_ISO				"ta-IN"
++#define TAMIL_INDEX				43
++
++#define GUJARATI				94
++#define GUJARATI_ISO			"ga-IN"
++#define GUJARATI_INDEX			44
++
++
+ // special language for l10n framework
+ #define EXTERN					99
+-#define EXTERN_INDEX				43
++#define EXTERN_INDEX				45
+ 
+-#define LANGUAGES					44
++#define LANGUAGES					46
+ 
+ #define NO_TRANSLATE_ISO		"x-no-translate"
+ 
+@@ -265,6 +274,7 @@
+ 								( Export::LangId[ n ] == 42 ) || ( Export::LangId[ n ] == 43 ) || ( Export::LangId[ n ] == 97 ) || 	\
+ 								( Export::LangId[ n ] == 66 ) || ( Export::LangId[ n ] == 91 ) || ( Export::LangId[ n ] == 00 ) ||  \
+ 								( Export::LangId[ n ] == 99 ) || ( Export::LangId[ n ] == 77 ) || ( Export::LangId[ n ] == 36 ) ||	\
++								( Export::LangId[ n ] == 92 ) || ( Export::LangId[ n ] == 94 ) ||  \
+ 								( Export::LangId[ n ] == 93 )))
+ 
+ #define GERMAN_LIST_LINE_INDEX 	LANGUAGES
+--- ./transex3/source/export2.cxx.indic	2005-01-04 16:16:38.116464596 -0500
++++ ./transex3/source/export2.cxx	2005-01-04 16:17:39.983118807 -0500
+@@ -158,6 +158,8 @@
+ 	LITHUANIAN,
+ 	KANNADA,
+ 	GALICIAN,
++	TAMIL,
++	GUJARATI,
+ 	EXTERN
+ };
+ 
+@@ -271,6 +273,10 @@
+ 		return KANNADA;
+ 	else if ( sLang == ByteString( GALICIAN_ISO ).ToUpperAscii())
+ 		return GALICIAN;
++	else if ( sLang == ByteString( TAMIL_ISO ).ToUpperAscii())
++		return TAMIL;
++	else if ( sLang == ByteString( GUJARATI_ISO ).ToUpperAscii())
++		return GUJARATI;
+ 	else if ( sLang == ByteString( sIsoCode99 ).ToUpperAscii())
+ 		return EXTERN;
+ 
+@@ -324,6 +330,8 @@
+ 		case LITHUANIAN_INDEX: return LITHUANIAN_ISO;
+ 		case KANNADA_INDEX: return KANNADA_ISO;
+ 		case GALICIAN_INDEX: return GALICIAN_ISO;
++		case TAMIL_INDEX: return TAMIL_ISO;
++		case GUJARATI_INDEX: return GUJARATI_ISO;
+ 		case EXTERN_INDEX: return sIsoCode99;
+ 	}
+ 	return "";
+@@ -463,6 +471,8 @@
+ 	"lithuanian",
+ 	"kannada",
+ 	"galician",
++	"tamil",
++	"gujarati",
+ 	"extern"
+ };
+ 
+--- ./transex3/source/export.cxx.indic	2005-01-04 16:17:53.418088741 -0500
++++ ./transex3/source/export.cxx	2005-01-04 16:18:40.374991931 -0500
+@@ -1286,6 +1286,10 @@
+ 		return LITHUANIAN_INDEX; 
+ 	else if ( sLang == "KANNADA" )
+ 		return KANNADA_INDEX; 
++	else if ( sLang == "TAMIL" )
++		return TAMIL_INDEX;
++	else if ( sLang == "GUJARATI" )
++		return GUJARATI_INDEX;
+ 	else if ( sLang == "EXTERN" )
+ 		return EXTERN_INDEX;
+ 
+--- ./transex3/source/merge.cxx.indic	2005-01-04 16:19:44.545289901 -0500
++++ ./transex3/source/merge.cxx	2005-01-04 16:20:00.996801887 -0500
+@@ -432,6 +432,8 @@
+ 		case LITHUANIAN: return LITHUANIAN_INDEX;
+ 		case KANNADA: return KANNADA_INDEX;
+ 		case GALICIAN: return GALICIAN_INDEX;
++		case TAMIL: return TAMIL_INDEX;
++		case GUJARATI: return GUJARATI_INDEX;
+ 		case EXTERN: return EXTERN_INDEX;
+ 	}
+ 	return 0xFFFF;
+--- ./scp/inc/gcfg.inc.indic	2005-01-04 16:22:02.398426293 -0500
++++ ./scp/inc/gcfg.inc	2005-01-04 16:27:59.327611142 -0500
+@@ -268,7 +268,9 @@
+     ident (88)      = resid; \
+     ident (90)      = resid; \
+     ident (91)      = resid; \
++    ident (92)      = resid; \
+     ident (93)      = resid; \
++    ident (94)      = resid; \
+     ident (96)      = resid; \
+     ident (97)      = resid; \
+     ident (99)      = resid
+@@ -312,7 +314,9 @@
+     Name (88)       = RESFILENAME(name,88);     \
+     Name (90)       = RESFILENAME(name,90);     \
+     Name (91)       = RESFILENAME(name,91);     \
++    Name (92)       = RESFILENAME(name,92);     \
+     Name (93)       = RESFILENAME(name,93);     \
++    Name (94)       = RESFILENAME(name,94);     \
+     Name (96)       = RESFILENAME(name,96);     \
+ 	Name (97) 		= RESFILENAME(name,97);		\
+     Name (99)       = RESFILENAME(name,99)
+@@ -356,7 +360,9 @@
+     Name (88)       = SHORTRESFILENAME(name,88);     \
+     Name (90)       = SHORTRESFILENAME(name,90);     \
+     Name (91)       = SHORTRESFILENAME(name,91);     \
++    Name (92)       = SHORTRESFILENAME(name,92);     \
+     Name (93)       = SHORTRESFILENAME(name,93);     \
++    Name (94)       = SHORTRESFILENAME(name,94);     \
+     Name (96)       = SHORTRESFILENAME(name,96);     \
+     Name (97)       = SHORTRESFILENAME(name,97);     \
+     Name (99)       = SHORTRESFILENAME(name,99)
+@@ -400,7 +406,9 @@
+     key (88)       = READMETXTFILENAME(name,88,ext);     \
+     key (90)       = READMETXTFILENAME(name,90,ext);     \
+     key (91)       = READMETXTFILENAME(name,91,ext);     \
++    key (92)       = READMETXTFILENAME(name,92,ext);     \
+     key (93)       = READMETXTFILENAME(name,93,ext);     \
++    key (94)       = READMETXTFILENAME(name,94,ext);     \
+     key (96)       = READMETXTFILENAME(name,96,ext);     \
+     key (97)       = READMETXTFILENAME(name,97,ext);     \
+     key (99)       = READMETXTFILENAME(name,99,ext)
+@@ -444,7 +452,9 @@
+     key (88)       = READMEFILENAME(name,88);     \
+     key (90)       = READMEFILENAME(name,90);     \
+     key (91)       = READMEFILENAME(name,91);     \
++    key (92)       = READMEFILENAME(name,92);     \
+     key (93)       = READMEFILENAME(name,93);     \
++    key (94)       = READMEFILENAME(name,94);     \
+     key (96)       = READMEFILENAME(name,96);     \
+     key (97)       = READMEFILENAME(name,97);     \
+     key (99)       = READMEFILENAME(name,99)
+@@ -488,7 +498,9 @@
+     Name (88)       = EXTRAFILENAME(name,88);     \
+     Name (90)       = EXTRAFILENAME(name,90);     \
+     Name (91)       = EXTRAFILENAME(name,91);     \
++    Name (92)       = EXTRAFILENAME(name,92);     \
+     Name (93)       = EXTRAFILENAME(name,93);     \
++    Name (94)       = EXTRAFILENAME(name,94);     \
+     Name (96)       = EXTRAFILENAME(name,96);     \
+     Name (97)       = EXTRAFILENAME(name,97);     \
+     Name (99)       = EXTRAFILENAME(name,99)
+@@ -532,7 +544,9 @@
+     Name (88)       = STRING(name);     \
+     Name (90)       = STRING(name);     \
+     Name (91)       = STRING(name);     \
++    Name (92)       = STRING(name);     \
+     Name (93)       = STRING(name);     \
++    Name (94)       = STRING(name);     \
+     Name (96)       = STRING(name);     \
+     Name (97)       = STRING(name);     \
+     Name (99)       = STRING(name)
+@@ -576,7 +590,9 @@
+     Name (88)       = HELPFILENAME(name,88);     \
+     Name (90)       = HELPFILENAME(name,90);     \
+     Name (91)       = HELPFILENAME(name,91);     \
++    Name (92)       = HELPFILENAME(name,92);     \
+     Name (93)       = HELPFILENAME(name,93);     \
++    Name (94)       = HELPFILENAME(name,94);     \
+     Name (96)       = HELPFILENAME(name,96);     \
+     Name (97)       = HELPFILENAME(name,97);     \
+     Name (99)       = HELPFILENAME(name,99)
+@@ -620,7 +636,9 @@
+     Name (88)       = HELPFILENAME(name,88x);     \
+     Name (90)       = HELPFILENAME(name,90x);     \
+     Name (91)       = HELPFILENAME(name,91x);     \
++    Name (92)       = HELPFILENAME(name,92x);     \
+     Name (93)       = HELPFILENAME(name,93x);     \
++    Name (94)       = HELPFILENAME(name,94x);     \
+     Name (96)       = HELPFILENAME(name,96x);     \
+     Name (97)       = HELPFILENAME(name,97x);     \
+     Name (99)       = HELPFILENAME(name,99x)
+@@ -664,7 +682,9 @@
+     Name (88)       = HELPFILENAME(name,endung);     \
+     Name (90)       = HELPFILENAME(name,endung);     \
+     Name (91)       = HELPFILENAME(name,endung);     \
++    Name (92)       = HELPFILENAME(name,endung);     \
+     Name (93)       = HELPFILENAME(name,endung);     \
++    Name (94)       = HELPFILENAME(name,endung);     \
+     Name (96)       = HELPFILENAME(name,endung);     \
+     Name (97)       = HELPFILENAME(name,endung);     \
+     Name (99)       = HELPFILENAME(name,endung)
+@@ -708,7 +728,9 @@
+     Dir (88)       = GID_DIR_HELP_88;     \
+     Dir (90)       = GID_DIR_HELP_90;     \
+     Dir (91)       = GID_DIR_HELP_91;     \
++    Dir (92)       = GID_DIR_HELP_92;     \
+     Dir (93)       = GID_DIR_HELP_93;     \
++    Dir (94)       = GID_DIR_HELP_94;     \
+     Dir (96)       = GID_DIR_HELP_96;     \
+     Dir (97)       = GID_DIR_HELP_97;     \
+     Dir (99)       = GID_DIR_HELP_99
+@@ -752,7 +774,9 @@
+     DosName (88)       = STRING(name);     \
+     DosName (90)       = STRING(name);     \
+     DosName (91)       = STRING(name);     \
++    DosName (92)       = STRING(name);     \
+     DosName (93)       = STRING(name);     \
++    DosName (94)       = STRING(name);     \
+     DosName (96)       = STRING(name);     \
+     DosName (97)       = STRING(name);     \
+     DosName (99)       = STRING(name)
+@@ -796,7 +820,9 @@
+     DosName (88)       = "chinese_traditional";    \
+     DosName (90)       = "turkish";     \
+     DosName (91)       = "hindi";     \
++    DosName (92)       = "tamil";     \
+     DosName (93)       = "kannada";     \
++    DosName (94)       = "gujarati";     \
+     DosName (96)       = "arabic";     \
+     DosName (97)       = "hebrew";     \
+     DosName (99)       = STRING(ISO_CODE)
+@@ -840,7 +866,9 @@
+     DosName (88)       = "zh-TW"; \
+     DosName (90)       = "tr";  \
+     DosName (91)       = "hi-IN";  \
++    DosName (92)       = "ta-IN";  \
+     DosName (93)       = "kn-IN";  \
++    DosName (94)       = "gu-IN";  \
+     DosName (96)       = "ar";  \
+     DosName (97)       = "he";  \
+     DosName (99)       = STRING(ISO_CODE)
+@@ -884,7 +912,9 @@
+     DosName (88)       = "zh-TW"; \
+     DosName (90)       = "tr";  \
+     DosName (91)       = "hi-IN";  \
++    DosName (92)       = "ta-IN";  \
+     DosName (93)       = "kn-IN";  \
++    DosName (94)       = "gu-IN";  \
+     DosName (96)       = "ar";  \
+     DosName (97)       = "he";  \
+     DosName (99)       = STRING(ISO_CODE)
+@@ -928,7 +958,9 @@
+         Section (88)              = STRING(ident##-88); \
+         Section (90)              = STRING(ident##-90); \
+         Section (91)              = STRING(ident##-91); \
++        Section (92)              = STRING(ident##-92); \
+         Section (93)              = STRING(ident##-93); \
++        Section (94)              = STRING(ident##-94); \
+         Section (96)              = STRING(ident##-96); \
+         Section (97)              = STRING(ident##-97); \
+         Section (99)              = STRING(ident##-99)
+@@ -975,7 +1007,9 @@
+         Key (88)              = STRING(ident##-88-C); \
+         Key (90)              = STRING(ident##-90-C); \
+         Key (91)              = STRING(ident##-91-C); \
++        Key (92)              = STRING(ident##-92-C); \
+         Key (93)              = STRING(ident##-93-C); \
++        Key (94)              = STRING(ident##-94-C); \
+         Key (96)              = STRING(ident##-96-C); \
+         Key (97)              = STRING(ident##-97); \
+         Key (99)              = STRING(ident##-99)
+@@ -1037,8 +1071,10 @@
+         Key (86)              = STRING(2052); \
+         Key (88)              = STRING(1028); \
+         Key (90)              = STRING(1055); \
+-        Key (91)              = STRING(91); \
++        Key (91)              = STRING(1081); \
++        Key (92)              = STRING(1097); \
+         Key (93)              = STRING(1099); \
++        Key (94)              = STRING(1095); \
+         Key (96)              = STRING(1055); \
+         Key (97)              = STRING(1037); \
+         Key (99)              = STRING(ISO_CODE)
+@@ -1082,7 +1118,9 @@
+         Key (88)              = STRING(zh-TW); \
+         Key (90)              = STRING(tr); \
+         Key (91)              = STRING(hi-IN); \
++        Key (92)              = STRING(ta-IN); \
+         Key (93)              = STRING(kn-IN); \
++        Key (94)              = STRING(gu-IN); \
+         Key (96)              = STRING(ar); \
+         Key (97)              = STRING(he); \
+         Key (99)              = STRING(ISO_CODE)
+@@ -1124,8 +1162,10 @@
+         Value (86)              = STRING(2052); \
+         Value (88)              = STRING(1028); \
+         Value (90)              = STRING(1055); \
+-        Value (91)              = STRING(91); \
++        Value (91)              = STRING(1081); \
++        Value (92)              = STRING(1097); \
+         Value (93)              = STRING(1099); \
++        Value (94)              = STRING(1095); \
+         Value (96)              = STRING(1025); \
+         Value (97)              = STRING(1037); \
+         Value (99)              = STRING(ISO_CODE)
+@@ -1169,7 +1209,9 @@
+         Value (88)              = STRING(zh-TW); \
+         Value (90)              = STRING(tr); \
+         Value (91)              = STRING(hi-IN); \
++        Value (92)              = STRING(ta-IN); \
+         Value (93)              = STRING(kn-IN); \
++        Value (94)              = STRING(gu-IN); \
+         Value (96)              = STRING(ar); \
+         Value (97)              = STRING(he); \
+         Value (99)              = STRING(ISO_CODE)
+@@ -1213,7 +1255,9 @@
+         Value (88)              = STRING(en-US); \
+         Value (90)              = STRING(tr); \
+         Value (91)              = STRING(hi-IN); \
++        Value (92)              = STRING(ta-IN); \
+         Value (93)              = STRING(kn-IN); \
++        Value (94)              = STRING(gu-IN); \
+         Value (96)              = STRING(ar); \
+         Value (97)              = STRING(he); \
+         Value (99)              = STRING(ISO_CODE)
+@@ -1257,7 +1301,9 @@
+         Value (88)              = STRING(zh-TW); \
+         Value (90)              = STRING(tr); \
+         Value (91)              = STRING(hi-IN); \
++        Value (92)              = STRING(ta-IN); \
+         Value (93)              = STRING(kn-IN); \
++        Value (94)              = STRING(gu-IN); \
+         Value (96)              = STRING(ar); \
+         Value (97)              = STRING(he); \
+         Value (99)              = STRING(ISO_CODE)
+@@ -1301,7 +1347,9 @@
+         Value (88)              = STRING(88); \
+         Value (90)              = STRING(90); \
+         Value (91)              = STRING(91); \
++        Value (92)              = STRING(92); \
+         Value (93)              = STRING(93); \
++        Value (94)              = STRING(94); \
+         Value (96)              = STRING(96); \
+         Value (97)              = STRING(97); \
+         Value (99)              = STRING(99)
+--- ./scp/source/global/setupzip.scp.indic	2005-01-04 16:28:21.049273456 -0500
++++ ./scp/source/global/setupzip.scp	2005-01-04 16:28:44.401684974 -0500
+@@ -656,6 +656,9 @@
+         Name (88)       = "fontunxpsprint.zip";
+         Name (90)       = "fontunxpsprint.zip";
+         Name (91)       = "fontunxpsprint.zip";
++        Name (92)       = "fontunxpsprint.zip";
++        Name (93)       = "fontunxpsprint.zip";
++        Name (94)       = "fontunxpsprint.zip";
+         Name (96)       = "fontunxpsprint.zip";
+         Name (97)       = "fontunxpsprint.zip";
+         Name (99)       = "fontunxpsprint.zip";
+--- ./solenv/inc/postset.mk.indic	2005-01-04 16:13:24.512684427 -0500
++++ ./solenv/inc/postset.mk	2005-01-04 16:14:00.492257284 -0500
+@@ -373,6 +373,32 @@
+ RCLANGFLAGS_91+= -d HINDI
+ iso_91=hi-IN
+ 
++.IF "$(RES_TAMIL)"!="" || "$(give_me_all_languages)"!=""
++alllangext+=92
++.ENDIF
++completelangext+=92
++tamil$(LANG_GUI)*=$(default$(LANG_GUI))
++lang_92=tamil
++longlang_92=tamil
++langext_92=92
++rsclang_92=-lgTAMIL $(UTF8)
++rescharset_92=$(tamil$(LANG_GUI))
++RCLANGFLAGS_92+= -d TAMIL
++iso_92=ta
++
++.IF "$(RES_GUJARATI)"!="" || "$(give_me_all_languages)"!=""
++alllangext+=94
++.ENDIF
++completelangext+=94
++gujarati$(LANG_GUI)*=$(default$(LANG_GUI))
++lang_94=gujarati
++longlang_94=gujarati
++langext_94=94
++rsclang_94=-lgGUJARATI $(UTF8)
++rescharset_94=$(gujarati$(LANG_GUI))
++RCLANGFLAGS_94+= -d GUJARATI
++iso_94=gu
++
+ .IF "$(RES_PORTBR)"!="" || "$(give_me_all_languages)"!=""
+ alllangext+=55
+ .ENDIF 
+--- ./solenv/inc/lang.mk.indic	2005-01-04 16:14:14.717111217 -0500
++++ ./solenv/inc/lang.mk	2005-01-04 16:14:29.787837292 -0500
+@@ -93,6 +93,8 @@
+ korean$(LANG_GUI)=-CHARSET_UTF8
+ thai$(LANG_GUI)=-CHARSET_UTF8
+ hindi$(LANG_GUI)=-CHARSET_UTF8
++tamil$(LANG_GUI)=-CHARSET_UTF8
++gujarati$(LANG_GUI)=-CHARSET_UTF8
+ extern$(LANG_GUI)=-CHARSET_UTF8
+ nsotho$(LANG_GUI)=-CHARSET_UTF8
+ afrik$(LANG_GUI)=-CHARSET_UTF8
+--- ./tools/source/generic/l2txtenc.cxx.indic	2005-01-04 16:09:30.628927549 -0500
++++ ./tools/source/generic/l2txtenc.cxx	2005-01-04 16:10:10.017996577 -0500
+@@ -101,6 +101,8 @@
+ #define THAI					66
+ #define HINDI					91
+ #define KANNADA					93
++#define TAMIL					92
++#define GUJARATI					94
+ #define EXTERN					99
+ 
+ rtl_TextEncoding Langcode2TextEncoding( USHORT nLang )
+@@ -139,6 +141,8 @@
+ 		case CATALAN: return RTL_TEXTENCODING_MS_1252;
+ 		case THAI: return RTL_TEXTENCODING_UTF8;
+ 		case HINDI: return RTL_TEXTENCODING_UTF8;
++		case TAMIL: return RTL_TEXTENCODING_UTF8;
++		case GUJARATI: return RTL_TEXTENCODING_UTF8;
+ 		case EXTERN: return RTL_TEXTENCODING_UTF8;
+ 		case NORTHERNSOTHO: return RTL_TEXTENCODING_UTF8;
+ 		case AFRIKAANS: return RTL_TEXTENCODING_UTF8;
+--- ./tools/source/rc/resmgr.cxx.indic	2005-01-04 16:10:42.368124128 -0500
++++ ./tools/source/rc/resmgr.cxx	2005-01-04 16:12:49.034034598 -0500
+@@ -1268,6 +1268,10 @@
+ 				return "66";
+             case LANGUAGE_HINDI:
+                 return "91";
++            case LANGUAGE_TAMIL:
++                return "92";
++            case LANGUAGE_GUJARATI:
++                return "94";
+ 
+             case LANGUAGE_ARABIC:
+             case LANGUAGE_ARABIC_IRAQ:
+@@ -1458,6 +1462,8 @@
+         LANGUAGE_KOREAN_JOHAB,
+         LANGUAGE_THAI,
+         LANGUAGE_HINDI,
++        LANGUAGE_TAMIL,
++        LANGUAGE_GUJARATI,
+         LANGUAGE_HEBREW,
+ 	LANGUAGE_NORTHERNSOTHO,
+ 	LANGUAGE_AFRIKAANS,
+--- ./readlicense_oo/prj/d.lst.indic	2005-01-04 16:19:34.493809880 -0500
++++ ./readlicense_oo/prj/d.lst	2005-01-04 16:21:27.906653715 -0500
+@@ -79,8 +79,12 @@
+ mkdir: %_DEST%\bin%_EXT%\90\osl
+ mkdir: %_DEST%\bin%_EXT%\91
+ mkdir: %_DEST%\bin%_EXT%\91\osl
++mkdir: %_DEST%\bin%_EXT%\92
++mkdir: %_DEST%\bin%_EXT%\92\osl
+ mkdir: %_DEST%\bin%_EXT%\93
+ mkdir: %_DEST%\bin%_EXT%\93\osl
++mkdir: %_DEST%\bin%_EXT%\94
++mkdir: %_DEST%\bin%_EXT%\94\osl
+ mkdir: %_DEST%\bin%_EXT%\96
+ mkdir: %_DEST%\bin%_EXT%\96\osl
+ mkdir: %_DEST%\bin%_EXT%\97
+@@ -231,10 +235,22 @@
+ ..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\90\osl\LICENSE90
+ ..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\90\osl\license90.txt
+ ..\%__SRC%\misc\license\%GUI%\license.html %_DEST%\bin%_EXT%\90\osl\LICENSE90.html
++..\%__SRC%\misc\license\%GUI%\* %_DEST%\bin%_EXT%\91\osl\*
++..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\91\osl\LICENSE91
++..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\91\osl\license91.txt
++..\%__SRC%\misc\license\%GUI%\license.html %_DEST%\bin%_EXT%\91\osl\LICENSE91.html
++..\%__SRC%\misc\license\%GUI%\* %_DEST%\bin%_EXT%\92\osl\*
++..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\92\osl\LICENSE92
++..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\92\osl\license92.txt
++..\%__SRC%\misc\license\%GUI%\license.html %_DEST%\bin%_EXT%\92\osl\LICENSE92.html
+ ..\%__SRC%\misc\license\%GUI%\* %_DEST%\bin%_EXT%\93\osl\*
+ ..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\93\osl\LICENSE93
+ ..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\93\osl\license93.txt
+ ..\%__SRC%\misc\license\%GUI%\license.html %_DEST%\bin%_EXT%\93\osl\LICENSE93.html
++..\%__SRC%\misc\license\%GUI%\* %_DEST%\bin%_EXT%\94\osl\*
++..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\94\osl\LICENSE94
++..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\94\osl\license94.txt
++..\%__SRC%\misc\license\%GUI%\license.html %_DEST%\bin%_EXT%\94\osl\LICENSE94.html
+ ..\%__SRC%\misc\license\%GUI%\* %_DEST%\bin%_EXT%\96\osl\*
+ ..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\96\osl\LICENSE96
+ ..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\96\osl\license96.txt
+@@ -359,9 +375,15 @@
+ ..\%__SRC%\misc\91\* %_DEST%\bin%_EXT%\91\osl\*
+ ..\%__SRC%\misc\91\readme91.txt %_DEST%\bin%_EXT%\91\osl\README91
+ ..\%__SRC%\misc\91\readme91.html %_DEST%\bin%_EXT%\91\osl\README91.html
++..\%__SRC%\misc\92\* %_DEST%\bin%_EXT%\92\osl\*
++..\%__SRC%\misc\92\readme92.txt %_DEST%\bin%_EXT%\92\osl\README92
++..\%__SRC%\misc\92\readme92.html %_DEST%\bin%_EXT%\92\osl\README92.html
+ ..\%__SRC%\misc\93\* %_DEST%\bin%_EXT%\93\osl\*
+ ..\%__SRC%\misc\93\readme93.txt %_DEST%\bin%_EXT%\93\osl\README93
+ ..\%__SRC%\misc\93\readme93.html %_DEST%\bin%_EXT%\93\osl\README93.html
++..\%__SRC%\misc\94\* %_DEST%\bin%_EXT%\94\osl\*
++..\%__SRC%\misc\94\readme94.txt %_DEST%\bin%_EXT%\94\osl\README94
++..\%__SRC%\misc\94\readme94.html %_DEST%\bin%_EXT%\94\osl\README94.html
+ ..\%__SRC%\misc\96\* %_DEST%\bin%_EXT%\96\osl\*
+ ..\%__SRC%\misc\96\readme96.txt %_DEST%\bin%_EXT%\96\osl\README96
+ ..\%__SRC%\misc\96\readme96.html %_DEST%\bin%_EXT%\96\osl\README96.html
diff --git a/patches/OOO_1_1/i18n-calc-encoding.diff b/patches/OOO_1_1/i18n-calc-encoding.diff
index 15c23ed17..11c0cf3b2 100644
--- a/patches/OOO_1_1/i18n-calc-encoding.diff
+++ b/patches/OOO_1_1/i18n-calc-encoding.diff
@@ -2,10 +2,11 @@ Index: calc/profile_calc.lng
 ===================================================================
 RCS file: /cvs/installation/scp/source/calc/Attic/profile_calc.lng,v
 retrieving revision 1.49.24.5
-diff -u -r1.49.24.5 profile_calc.lng
---- scp/source/calc/profile_calc.lng	27 Apr 2004 18:15:09 -0000	1.49.24.5
-+++ scp/source/calc/profile_calc.lng	10 Jun 2004 15:28:49 -0000
-@@ -598,7 +598,7 @@
+Index: scp/source/calc/profile_calc.lng
+===================================================================
+--- scp/source/calc/profile_calc.lng.orig	2004-09-13 22:31:50.000000000 +0200
++++ scp/source/calc/profile_calc.lng	2004-09-14 15:49:37.746332016 +0200
+@@ -678,7 +678,7 @@
  82 = "%PRODUCTNAME %PRODUCTVERSION 스프레드시트"
  86 = "%PRODUCTNAME %PRODUCTVERSION 工作表"
  88 = "%PRODUCTNAME %PRODUCTVERSION 工作表"
@@ -14,23 +15,11 @@ diff -u -r1.49.24.5 profile_calc.lng
  07 = "����������� ������� %PRODUCTNAME %PRODUCTVERSION"
  30 = "������������ ����� %PRODUCTNAME %PRODUCTVERSION"
  31 = "%PRODUCTNAME %PRODUCTVERSION Werkblad"
-@@ -636,7 +636,7 @@
- 34 = "Hoja de ~c�lculo"
- 55 = "~Planilha"
- 48 = "~Arkusz kalkulacyjny"
--03 = "Folha de ~cálculo"
-+03 = "Folha de ~c�lculo"
- 82 = "스프레드시트(~S)"
- 33 = "~Classeur"
- 96 = "~Spreadsheet"
-Index: impress/profile_impress.lng
+Index: scp/source/impress/profile_impress.lng
 ===================================================================
-RCS file: /cvs/installation/scp/source/impress/Attic/profile_impress.lng,v
-retrieving revision 1.57.24.5
-diff -u -r1.57.24.5 profile_impress.lng
---- scp/source/impress/profile_impress.lng	27 Apr 2004 18:18:43 -0000	1.57.24.5
-+++ scp/source/impress/profile_impress.lng	10 Jun 2004 15:28:51 -0000
-@@ -639,7 +639,7 @@
+--- scp/source/impress/profile_impress.lng.orig	2004-09-13 22:32:00.000000000 +0200
++++ scp/source/impress/profile_impress.lng	2004-09-14 15:49:37.749331560 +0200
+@@ -724,7 +724,7 @@
  82 = "%PRODUCTNAME %PRODUCTVERSION 프레젠테이션"
  86 = "%PRODUCTNAME %PRODUCTVERSION 演示文稿"
  88 = "%PRODUCTNAME %PRODUCTVERSION 簡報"
@@ -39,7 +28,7 @@ diff -u -r1.57.24.5 profile_impress.lng
  07 = "����������� %PRODUCTNAME %PRODUCTVERSION"
  30 = "���������� %PRODUCTNAME %PRODUCTVERSION"
  31 = "%PRODUCTNAME %PRODUCTVERSION Presentatie"
-@@ -677,7 +677,7 @@
+@@ -767,7 +767,7 @@
  34 = "~Presentaci�n"
  55 = "A~presenta��o"
  48 = "~Prezentacja"
@@ -48,7 +37,7 @@ diff -u -r1.57.24.5 profile_impress.lng
  82 = "프레젠테이션(~P)"
  33 = "~Pr�sentation"
  96 = "��� �~�����"
-@@ -714,7 +714,7 @@
+@@ -809,7 +809,7 @@
  34 = "~Presentaci�n..."
  55 = "A~presenta��o..."
  48 = "~Prezentacja..."
@@ -56,15 +45,12 @@ diff -u -r1.57.24.5 profile_impress.lng
 +03 = "A~presenta��o..."
  82 = "프레젠테이션(~P)..."
  33 = "~Pr�sentation..."
- 96 = "~Presentation..."
-Index: math/profile_math.lng
+ 96 = "~��� ������..."
+Index: scp/source/math/profile_math.lng
 ===================================================================
-RCS file: /cvs/installation/scp/source/math/Attic/profile_math.lng,v
-retrieving revision 1.40.24.4
-diff -u -r1.40.24.4 profile_math.lng
---- scp/source/math/profile_math.lng	27 Apr 2004 18:20:23 -0000	1.40.24.4
-+++ scp/source/math/profile_math.lng	10 Jun 2004 15:28:51 -0000
-@@ -80,7 +80,7 @@
+--- scp/source/math/profile_math.lng.orig	2004-09-13 22:32:04.000000000 +0200
++++ scp/source/math/profile_math.lng	2004-09-14 15:49:37.750331408 +0200
+@@ -90,7 +90,7 @@
  34 = "~F�rmula"
  55 = "~F�rmula"
  48 = "F~ormu�a"
@@ -73,14 +59,11 @@ diff -u -r1.40.24.4 profile_math.lng
  82 = "수식(~O)"
  33 = "F~ormule"
  96 = "����"
-Index: office/profile.lng
+Index: scp/source/office/profile.lng
 ===================================================================
-RCS file: /cvs/installation/scp/source/office/Attic/profile.lng,v
-retrieving revision 1.58.24.8
-diff -u -r1.58.24.8 profile.lng
---- scp/source/office/profile.lng	4 May 2004 06:48:05 -0000	1.58.24.8
-+++ scp/source/office/profile.lng	10 Jun 2004 15:28:53 -0000
-@@ -1080,7 +1080,7 @@
+--- scp/source/office/profile.lng.orig	2004-09-13 22:32:06.000000000 +0200
++++ scp/source/office/profile.lng	2004-09-14 15:49:37.756330496 +0200
+@@ -1225,7 +1225,7 @@
  34 = "~Tarjetas de visita"
  55 = "Cart�es de ~Visita"
  48 = "~Wizyt�wki"
@@ -88,8 +71,8 @@ diff -u -r1.58.24.8 profile.lng
 +03 = "Cart�es de ~visita"
  82 = "명함(~U)"
  33 = "Cartes de ~visite"
- 96 = "B~usiness Cards"
-@@ -1302,7 +1302,7 @@
+ 96 = "�~�� �����"
+@@ -1477,7 +1477,7 @@
  34 = "P�gina ~Web..."
  55 = "P�gina da ~Web..."
  48 = "Strona ~WWW..."
@@ -97,8 +80,8 @@ diff -u -r1.58.24.8 profile.lng
 +03 = "P�gina ~Web..."
  82 = "웹 페이지(~W)..."
  33 = "Page ~Web..."
- 96 = "~Web Page..."
-@@ -1339,7 +1339,7 @@
+ 96 = "~���� ���..."
+@@ -1519,7 +1519,7 @@
  34 = "Formulario..."
  55 = "~Formul�rio..."
  48 = "Fo~rmularz..."
@@ -106,8 +89,8 @@ diff -u -r1.58.24.8 profile.lng
 +03 = "F~ormul�rio..."
  82 = "양식(~R)..."
  33 = "Form~ulaire..."
- 96 = "Form..."
-@@ -1520,7 +1520,7 @@
+ 96 = "��~���..."
+@@ -1725,7 +1725,7 @@
  01 = "Address Data Source..."
  44 = "Address Data Source..."
  49 = "Adress-Datenquelle..."
diff --git a/patches/OOO_1_1/i18n-lang-italian-fontooowizard.diff b/patches/OOO_1_1/i18n-lang-italian-fontooowizard.diff
new file mode 100644
index 000000000..b8bc31c61
--- /dev/null
+++ b/patches/OOO_1_1/i18n-lang-italian-fontooowizard.diff
@@ -0,0 +1,11 @@
+--- scp/source/office/profile.lng.ita	2004-09-25 10:54:15.143495568 +0200
++++ scp/source/office/profile.lng	2004-09-25 10:55:01.387437949 +0200
+@@ -1858,7 +1858,7 @@
+ 46 = "FontOOo Wizard..."
+ 45 = "Installer skrifttyper fra internettet..."
+ 49 = "Schriftarten aus dem Internet installieren..."
+-39 = "FontOOo Wizard..."
++39 = "Installa font da Internet..."
+ 35 = "FontOOo Wizard..."
+ 37 = "Instal·la tipus de lletra des d'Internet..."
+ 66 = "FontOOo Wizard..."
diff --git a/patches/OOO_1_1/i18n-lang-typo-italian.diff b/patches/OOO_1_1/i18n-lang-typo-italian.diff
new file mode 100644
index 000000000..da51f5932
--- /dev/null
+++ b/patches/OOO_1_1/i18n-lang-typo-italian.diff
@@ -0,0 +1,1542 @@
+--- basctl/source/basicide/basidesh.src.lang39	2004-09-09 19:50:02.000000000 +0200
++++ basctl/source/basicide/basidesh.src	2004-09-13 09:20:14.586837872 +0200
+@@ -557,7 +557,7 @@
+ 	Text[ dutch ] = "De naam van een bibliotheek mag maximaal 30 tekens lang zijn.";
+ 	Text[ french ] = "Le nom d'une biblioth�que peut contenir au maximum 30 caract�res.";
+ 	Text[ spanish ] = "El nombre de la biblioteca no debe contener m�s de 30 caracteres.";
+-	Text[ italian ] = "Il nome della librery pu� avere una lunghezza massima di 30 caratteri.";
++	Text[ italian ] = "Il nome di una libreria pu� avere una lunghezza massima di 30 caratteri.";
+ 	Text[ danish ] = "Navnet p� et bibliotek m� h�jst v�re p� 30 tegn.";
+ 	Text[ swedish ] = "Namnet p� ett bibliotek f�r maximalt inneh�lla 30 tecken.";
+ 	Text[ polish ] = "Nazwa biblioteki mo�e si� sk�ada� maksymalnie z 30 znak�w.";
+--- basic/source/classes/sb.src.lang39	2004-09-09 19:03:50.000000000 +0200
++++ basic/source/classes/sb.src	2004-09-13 09:20:14.580837752 +0200
+@@ -2345,7 +2345,7 @@
+ 		Text = "Zeit�berschreitung w�hrend des Wartens auf DDE-Antwort" ;
+ 		Text [ ENGLISH ] = "Timeout while waiting for DDE response" ;
+ 		Text [ norwegian ] = "Tidsgrense n�dd ved venting p� DDE-svar" ;
+-		Text [ italian ] = "Tempo d'attesa per la rispota DDE oltrepassato" ;
++		Text [ italian ] = "Tempo d'attesa per la risposta DDE oltrepassato" ;
+ 		Text [ portuguese_brazilian ] = "Tempo de espera esgotado durante a espera por uma resposta DDE" ;
+ 		Text [ portuguese ] = "Ultrapassado tempo de espera pela resposta DDE" ;
+ 		Text [ french ] = "Timeout pendant l'attente de la r�ponse DDE" ;
+@@ -4624,7 +4624,7 @@
+ 		Text = "Wert kann nicht zugewiesen werden" ;
+ 		Text [ ENGLISH ] = "Cannot set value" ;
+ 		Text [ norwegian ] = "Kan ikke bruke verdi" ;
+-		Text [ italian ] = "Impossibile attribuitre il valore" ;
++		Text [ italian ] = "Impossibile attribuire il valore" ;
+ 		Text [ portuguese_brazilian ] = "N�o � poss�vel aplicar o valor" ;
+ 		Text [ portuguese ] = "Imposs�vel atribuir o valor" ;
+ 		Text [ french ] = "Impossible d'attribuer la valeur" ;
+--- dbaccess/source/ui/control/tabletree.src.lang39	2004-09-09 18:23:10.000000000 +0200
++++ dbaccess/source/ui/control/tabletree.src	2004-09-13 09:20:14.294832048 +0200
+@@ -163,7 +163,7 @@
+ 			Text[ dutch ] = "Aflopend sorteren";
+ 			Text[ french ] = "Tri d�croissant";
+ 			Text[ spanish ] = "Orden descendente";
+-			Text[ italian ] = "Disponi in ordine descrescente";
++			Text[ italian ] = "Disponi in ordine decrescente";
+ 			Text[ danish ] = "Sorter faldende";
+ 			Text[ swedish ] = "Sortera fallande";
+ 			Text[ polish ] = "Sortuj malej�co";
+--- dbaccess/source/ui/dlg/RelationDlg.src.lang39	2004-09-09 18:24:09.000000000 +0200
++++ dbaccess/source/ui/dlg/RelationDlg.src	2004-09-13 09:20:14.295832068 +0200
+@@ -459,7 +459,7 @@
+ 		Text [ portuguese_brazilian ] = "~Sem a��o" ;
+ 		Text [ swedish ] = "Ing~en �tg�rd" ;
+ 		Text [ danish ] = "~Ingen handling" ;
+-		Text [ italian ] = "~Nessua operazione" ;
++		Text [ italian ] = "~Nessuna operazione" ;
+ 		Text [ spanish ] = "Ninguna a~cci�n" ;
+ 		Text [ french ] = "A~ucune action" ;
+ 		Text [ dutch ] = "G~een handeling" ;
+--- dbaccess/source/ui/dlg/dbadmin.src.lang39	2004-09-09 18:24:58.000000000 +0200
++++ dbaccess/source/ui/dlg/dbadmin.src	2004-09-13 09:20:14.302832207 +0200
+@@ -1622,7 +1622,7 @@
+ 		Text [ dutch ] = "Er bestaat reeds een andere gegevensbron met deze naam. Kies een andere naam.";
+ 		Text [ french ] = "Ce nom a d�j� �t� attribu� � une autre source de donn�es. �tant donn� que les sources de donn�es doivent avoir des noms globalement uniques, vous devez en choisir un autre.";
+ 		Text [ spanish ] = "Ya existe otra fuente de datos con este nombre. Debe elegir otro ya que el nombre de la fuente de datos debe ser globalmente �nico.";
+-		Text [ italian ] = "Esiste gi� una sorgente dati con questo nome. Poich� il nome delle sorgenti di dati dev'essere univoco, � necesario scegliere un altro nome.";
++		Text [ italian ] = "Esiste gi� una sorgente dati con questo nome. Poich� il nome delle sorgenti di dati dev'essere univoco, � necessario scegliere un altro nome.";
+ 		Text [ danish ] = "Der findes allerede en anden datakilde med dette navn. Da datakildenavne skal v�re unikke, skal du v�lge et andet navn.";
+ 		Text [ swedish ] = "Det finns redan en datak�lla med det h�r namnet. Eftersom namn p� datak�llor m�ste vara globalt unika b�r du v�lja ett annat namn.";
+ 		Text [ polish ] = "Istnieje inne �r�d�o danych o tej samej nazwie. Poniewa� nazwy �r�de� danych musz� by� globalnie jednoznaczne, nale�y wybra� inn� nazw�.";
+@@ -1843,7 +1843,7 @@
+ 		Text[ portuguese ] = "To adjust the settings, go to the MySQL tab page.";
+ 		Text[ russian ] = "��� ��������� �������� ��������� � �������� MySQL.";
+ 		Text[ spanish ] = "Vaya a la ficha MySQL para realizar la configuraci�n.";
+-		Text[ italian ] = "Per corregere le impostazioni andate alla scheda MySQL.";
++		Text[ italian ] = "Per correggere le impostazioni andate alla scheda MySQL.";
+ 		Text[ swedish ] = "G� till MySQL-fliken f�r att g�ra inst�llningarna.";
+ 		Text[ polish ] = "To adjust the settings, go to the MySQL tab page.";
+ 		Text[ portuguese_brazilian ] = "Para ajustar as configura��es, v� para a p�gina da guia MySQL.";
+@@ -5255,7 +5255,7 @@
+ 	Message[ dutch ] = "De naam van de gewiste gegevensbron heeft u reeds gebruikt voor een andere bron! Wilt u de gewiste gegevensbron weer herstellen, dan moet u eerst de naam van de andere bron wijzigen.";
+ 	Message[ french ] = "Le nom de la source de donn�es supprim�e a d�j� �t� attribu� � une autre source que vous devez commencer par renommer afin de pouvoir restaurer l'ancienne.";
+ 	Message[ spanish ] = "El nombre de la fuente de datos borrada se ha asignado ya a otra fuente. Deber� cambiarle el nombre para poder restaurar la antigua fuente de datos.";
+-	Message[ italian ] = "Il nome della sorgente dati eliiminata � gi� stato attribuito a un'altra. Prima di procedere, � necessario cambiare nome alla seconda sorgente dati prima di poter ripristinare quella eliminata.";
++	Message[ italian ] = "Il nome della sorgente dati eliminata � gi� stato attribuito a un'altra. Prima di procedere, � necessario cambiare nome alla seconda sorgente dati prima di poter ripristinare quella eliminata.";
+ 	Message[ danish ] = "Du har allerede givet en anden datakilde den slettede datakildes navn! Du skal omd�be den f�rste datakilde for at kunne gendanne den aktuelle.";
+ 	Message[ swedish ] = "Du har redan gett namnet p� den raderade datak�llan till en annan datak�lla! Du m�ste byta namn p� den andra datak�llan f�r att kunna �terst�lla den aktuella datak�llan.";
+ 	Message[ polish ] = "Nazwa usuni�tego �r�d�a danych zosta�a przypisana innemu �r�d�u danych. Aby mo�na by�o przywr�ci� usuni�te �r�d�o danych, nale�y zmieni� nazw� tego drugiego.";
+--- dbaccess/source/ui/dlg/AdabasPage.src.lang39	2004-09-09 18:23:40.000000000 +0200
++++ dbaccess/source/ui/dlg/AdabasPage.src	2004-09-13 09:20:14.304832247 +0200
+@@ -87,7 +87,7 @@
+ 		Text[ dutch ] = "~Grootte gegevensbuffer (MB)";
+ 		Text[ french ] = "~Taille du tampon de donn�es (Mo)";
+ 		Text[ spanish ] = "Tama�o de la ~memoria intermedia (MB):";
+-		Text[ italian ] = "Dimensione tamponamento dei dati (MB):";
++		Text[ italian ] = "Dimensione buffer dati (MB):";
+ 		Text[ danish ] = "Data~bufferst�rrelse (MB)";
+ 		Text[ swedish ] = "Datab~uffertstorlek (MB):";
+ 		Text[ polish ] = "Wielko�� ~bufora danych (MB)";
+--- desktop/source/app/desktop.src.lang39	2004-09-09 18:58:53.000000000 +0200
++++ desktop/source/app/desktop.src	2004-09-13 09:20:14.325832666 +0200
+@@ -265,7 +265,7 @@
+ 	Message[ french ] = "%PRODUCTNAME %PRODUCTVERSION n'a pas pu lancer le Setup de Java. Quittez %PRODUCTNAME et d�marrez le Setup de %PRODUCTNAME %PRODUCTVERSION. Choisissez 'R�paration'.";
+ 	Message[ spanish ] = "%PRODUCTNAME %PRODUCTVERSION no pudo iniciar el programa de instalaci�n de Java. Cierre %PRODUCTNAME e inicie el programa de instalaci�n de %PRODUCTNAME %PRODUCTVERSION. Seleccione 'Reparar'.";
+ 	Message[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION could not start the Java Setup. Exit %PRODUCTNAME and start the %PRODUCTNAME %PRODUCTVERSION Setup. Choose 'Repair'.";
+-	Message[ italian ] = "%PRODUCTNAME %PRODUCTVERSION non � riuscito ad avviare l'installazione di Java. Chiudete %PRODUCTNAME e avviate il programma di installazione di %PRODUCTNAME %PRODUCTVERSION. Sceliete l'opzione 'Riparazione'.";
++	Message[ italian ] = "%PRODUCTNAME %PRODUCTVERSION non � riuscito ad avviare l'installazione di Java. Chiudete %PRODUCTNAME e avviate il programma di installazione di %PRODUCTNAME %PRODUCTVERSION. Scegliete l'opzione 'Riparazione'.";
+ 	Message[ danish ] = "%PRODUCTNAME %PRODUCTVERSION kunne ikke starte Java-installationen. Afslut %PRODUCTNAME og start installationsprogrammet for %PRODUCTNAME %PRODUCTVERSION. V�lg 'Reparer'.";
+ 	Message[ swedish ] = "%PRODUCTNAME %PRODUCTVERSION kunde inte starta Java Setup. Avsluta %PRODUCTNAME och starta %PRODUCTNAME %PRODUCTVERSION Setup. V�lj 'Reparera'.";
+ 	Message[ polish ] = "%PRODUCTNAME %PRODUCTVERSION could not start the Java Setup. Exit %PRODUCTNAME and start the %PRODUCTNAME %PRODUCTVERSION Setup. Choose 'Repair'.";
+@@ -1379,7 +1379,7 @@
+ 	Text[ french ] = "Impossible d'�tablir une connexion � la configuration centrale ! ";
+ 	Text[ spanish ] = "No se ha podido establecer ninguna conexi�n con la configuraci�n central. ";
+ 	Text[ finnish ] = "A connection to the central configuration could not be established. ";
+-	Text[ italian ] = "impossibile realizzare un colleamento con la configurazione centrale. ";
++	Text[ italian ] = "impossibile realizzare un collegamento con la configurazione centrale. ";
+ 	Text[ danish ] = "Der kunne ikke oprettes forbindelse til den centrale konfiguration. ";
+ 	Text[ swedish ] = "Det gick inte att koppla till den centrala konfigurationen. ";
+ 	Text[ polish ] = "A connection to the central configuration could not be established. ";
+@@ -1751,7 +1751,7 @@
+ 	Text[ french ] = "Configuration d�fectueuse de java.ini";
+ 	Text[ spanish ] = "Configuraci�n defectuosa de java.ini ";
+ 	Text[ finnish ] = "Defective java.ini Configuration";
+-	Text[ italian ] = "Configurazione difettossa di java.ini";
++	Text[ italian ] = "Configurazione difettosa di java.ini";
+ 	Text[ danish ] = "Defekt konfiguration af java.ini";
+ 	Text[ swedish ] = "Felaktig java.ini-konfiguration";
+ 	Text[ polish ] = "Defective java.ini Configuration";
+@@ -2069,7 +2069,7 @@
+ 	Text[ portuguese ] = "The following internal error has occured: ";
+ 	Text[ russian ] = "The following internal error has occured: ";
+ 	Text[ spanish ] = "Se ha producido el error interno siguiente: ";
+-	Text[ italian ] = "Si � verficato il seguente errore interno: ";
++	Text[ italian ] = "Si � verificato il seguente errore interno: ";
+ 	Text[ swedish ] = "F�ljande interna fel har uppst�tt: ";
+ 	Text[ polish ] = "The following internal error has occured: ";
+ 	Text[ portuguese_brazilian ] = "O seguinte erro interno ocorreu: ";
+--- extensions/source/dbimport/importdialog.src.lang39	2004-09-09 18:32:25.000000000 +0200
++++ extensions/source/dbimport/importdialog.src	2004-09-13 09:20:14.644839029 +0200
+@@ -2905,7 +2905,7 @@
+ 	Text[ dutch ] = "Fout bij toegang tot $path$.";
+ 	Text[ french ] = "Erreur d'acc�s � $path$.";
+ 	Text[ spanish ] = "Error al acceder a $path$.";
+-	Text[ italian ] = "Impossibile acedere a $path$.";
++	Text[ italian ] = "Impossibile accedere a $path$.";
+ 	Text[ danish ] = "Der opstod en fejl, da du fors�gte at f� adgang til $path$.";
+ 	Text[ swedish ] = "�tkomst till $path$ �r inte m�jlig.";
+ 	Text[ polish ] = "B��d dost�pu do $path$.";
+@@ -3136,7 +3136,7 @@
+ 	Text[ dutch ] = "Document $name$ kan niet worden geladen.\nDe naam van de gegevensbron die gebruikt wordt voor het formulier kan niet worden aangepast. U kunt deze handmatig aanpassen.";
+ 	Text[ french ] = "Impossible de charger le document $name$ !\nIl n'a pas �t� possible d'ajuster le nom de la source de donn�es avec lequel le formulaire travaille, si bien que vous devrez �ventuellement le faire manuellement.";
+ 	Text[ spanish ] = "No se pudo cargar el documento $name$.\nEl nombre de la fuente de datos con el que trabaja el formulario no se pudo ajustar, por lo que quiz�s deber� hacerlo a mano.";
+-	Text[ italian ] = "Impossibile caricare il documento $name$.\nImpossibile adattare il nome della sorgente dati utilizzata dal formulario per questo � necesario effettuare l'operazione manualmente.";
++	Text[ italian ] = "Impossibile caricare il documento $name$.\nImpossibile adattare il nome della sorgente dati utilizzata dal formulario per questo � necessario effettuare l'operazione manualmente.";
+ 	Text[ danish ] = "Dokumentet $name$ kunne ikke indl�ses.\nNavnet p� den datakilde, som formularen arbejder med, kunne ikke tilpasses. Det skal du eventuelt g�re manuelt p� et senere tidspunkt.";
+ 	Text[ swedish ] = "Det gick inte att ladda dokumentet $name$.\nDet gick inte att anpassa namnet p� datak�llan som formul�ret arbetar med, s� eventuellt m�ste du g�ra detta manuellt i efterhand.";
+ 	Text[ polish ] = "Za�adowanie dokumentu $name$ nie by�o mo�liwe.\nNie uda�o si� dopasowa� nazwy �r�d�a danych, z kt�rym wsp�pracuje formularz. By� mo�e trzeba to b�dzie zrobi� samodzielnie.";
+--- extensions/source/dbpilots/listcombopages.src.lang39	2004-09-09 18:33:33.000000000 +0200
++++ extensions/source/dbpilots/listcombopages.src	2004-09-13 09:20:14.646839069 +0200
+@@ -391,7 +391,7 @@
+ 		Text [ dutch ] = "De inhoud van het geselecteerde veld wordt in de lijst onder het combinatieveld weergegeven.";
+ 		Text [ french ] = "Le contenu du champ s�lectionn� sera affich� dans la liste de la zone combin�e.";
+ 		Text [ spanish ] = "El contenido del campo seleccionado se mostrar� en la lista del cuadro combinado.";
+-		Text [ italian ] = "Il contenuto del campo selezionto viene mostrato nell'elenco della casella combinata.";
++		Text [ italian ] = "Il contenuto del campo selezionato viene mostrato nell'elenco della casella combinata.";
+ 		Text [ danish ] = "Indholdet af det valgte felt vises p� kombinationsfeltets liste.";
+ 		Text [ swedish ] = "Inneh�llet i det utvalda f�ltet visas i kombinationsf�ltets lista.";
+ 		Text [ polish ] = "Zawarto�� wybranego pola zostanie wy�wietlona na li�cie pola kombi.";
+--- offmgr/source/offapp/dialog/internationaloptions.src.lang39	2004-09-09 17:54:10.000000000 +0200
++++ offmgr/source/offapp/dialog/internationaloptions.src	2004-09-13 09:20:14.292832008 +0200
+@@ -329,7 +329,7 @@
+ 		Text[ french ] = "Uniquement pour le document actif";
+ 		Text[ spanish ] = "~S�lo para el documento actual";
+ 		Text[ finnish ] = "~Current document only";
+-		Text[ italian ] = "Solo per il docuemnto attivo";
++		Text[ italian ] = "Solo per il documento attivo";
+ 		Text[ danish ] = "~Kun for nuv�rende dokument";
+ 		Text[ swedish ] = "Bara f�r ~aktuellt dokument";
+ 		Text[ polish ] = "~Current document only";
+--- padmin/source/padialog.src.lang39	2004-09-09 18:58:00.000000000 +0200
++++ padmin/source/padialog.src	2004-09-13 09:20:14.653839209 +0200
+@@ -572,7 +572,7 @@
+ 		Text[ dutch ] = "Het lettertype wordt niet ge�nstalleerd omdat het lettertypenbestand \n %s\n niet kan worden gekopieerd."; \
+ 		Text[ french ] = "Copie du fichier de police\n   %s\n impossible, donc impossibilit� d'installer la police !"; \
+ 		Text[ spanish ] = "No se pudo copiar el archivo de fuente\n   %s\n, por lo que no se instalar� la fuente."; \
+-		Text[ italian ] = "Impossibile compiare il file del tipo di carattere\n   %s\n. Il tipo di carattere non � stato installato."; \
++		Text[ italian ] = "Impossibile copiare il file del tipo di carattere\n   %s\n. Il tipo di carattere non � stato installato."; \
+ 		Text[ danish ] = "Skrifttypefilen\n   %s\nkunne ikke kopieres. Skrifttypen bliver ikke installeret."; \
+ 		Text[ swedish ] = "Det gick inte att kopiera teckensnittsfilen\n   %s\n. Teckensnittet installeras inte."; \
+ 		Text[ polish ] = "Skopiowanie pliku czcionki\n   %s\nnie by�o mo�liwe. Czcionka nie zostanie zainstalowana."; \
+@@ -3938,7 +3938,7 @@
+ 	Text[ dutch ] = "Printer \"%s\" kan niet worden ge�mporteerd omdat deze geen geldige configuratie heeft."; \
+ 	Text[ french ] = "L'imprimante \"%s\" n'a pas �t� correctement configur�e et ne peut donc pas �tre import�e."; \
+ 	Text[ spanish ] = "La impresora \"%s\" no est� correctamente configurada, por lo que no se puede importar."; \
+-	Text[ italian ] = "La stampante \"%s\" ha una configuraziopne non valida e per questo non pu� essere importata."; \
++	Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non pu� essere importata."; \
+ 	Text[ danish ] = "Printeren \"%s\" har ingen gyldig konfiguration og kan derfor ikke importeres."; \
+ 	Text[ swedish ] = "Det g�r inte att importera skrivaren \"%s\" eftersom den inte �r fullst�ndigt konfigurerad."; \
+ 	Text[ polish ] = "Drukarki \"%s\" nie mo�na importowa�, poniewa� nie zosta�a prawid�owo skonfigurowana."; \
+@@ -4636,7 +4636,7 @@
+ 		Text[ french ] = "Connecter un p�riph�rique fax";
+ 		Text[ spanish ] = "Conectar a un fa~x";
+ 		Text[ finnish ] = "Kytke ~faksilaite";
+-		Text[ italian ] = "Aggingi un fa~x";
++		Text[ italian ] = "Aggiungi un fa~x";
+ 		Text[ danish ] = "Forbind en fa~xenhed";
+ 		Text[ swedish ] = "Anslut en fa~xl�sning";
+ 		Text[ polish ] = "Pod��cz ~faks";
+@@ -5773,7 +5773,7 @@
+ 		Text[ dutch ] = "een speciale ~driver voor het aanpassen van de opmaakattributen aan die van een andere printer";
+ 		Text[ french ] = "Pilote sp�cifique pour adaptation du formatage � une autre imprimante";
+ 		Text[ spanish ] = "~Controlador espec�fico para adaptar el formato a otra impresora";
+-		Text[ italian ] = "un driver specifico per adattare la formattazione a un'altra stamapante";
++		Text[ italian ] = "un driver specifico per adattare la formattazione a un'altra stampante";
+ 		Text[ danish ] = "en bestemt ~driver for at tilpasse formateringen til en anden printer";
+ 		Text[ swedish ] = "en specifik drivru~tin f�r att anpassa formateringen till en annan skrivare";
+ 		Text[ polish ] = "~Specjalny sterownik dostosowuj�cy format do wymaga� innej drukarki";
+--- padmin/source/rtsetup.src.lang39	2004-09-09 18:58:14.000000000 +0200
++++ padmin/source/rtsetup.src	2004-09-13 09:20:14.656839268 +0200
+@@ -1353,7 +1353,7 @@
+ 		Text[ dutch ] = "door ~printerlettertype";
+ 		Text[ french ] = "Par la police d'~imprimante";
+ 		Text[ spanish ] = "por la ~fuente de la impresora";
+-		Text[ italian ] = "da caratteri della stamapante";
++		Text[ italian ] = "da caratteri della stampante";
+ 		Text[ danish ] = "med ~printerskrifttype";
+ 		Text[ swedish ] = "med s~krivarteckensnitt";
+ 		Text[ polish ] = "na czcionk� ~drukarki";
+--- sc/addin/datefunc/dfa.src.lang39	2004-09-09 20:00:40.000000000 +0200
++++ sc/addin/datefunc/dfa.src	2004-09-13 09:20:14.518836516 +0200
+@@ -1267,7 +1267,7 @@
+ 		Text[ dutch ] = "Geeft als resultaat het aantal dagen in een jaar bij een bepaalde datum";
+ 		Text[ french ] = "Renvoie le nombre de jours dans l'ann�e en relation avec la date indiqu�e.";
+ 		Text[ spanish ] = "Devuelve el n�mero de d�as del a�o en relaci�n a la fecha introducida. ";
+-		Text[ italian ] = "Restituisce il numero dei giorni dell'anno per una deteminata data";
++		Text[ italian ] = "Restituisce il numero dei giorni dell'anno per una determinata data";
+ 		Text[ danish ] = "Returnerer antal dage i det angivne �r";
+ 		Text[ swedish ] = "Best�mmer antalet dagar i �ret till ett datum";
+ 		Text[ polish ] = "Zwraca liczb� dni w roku w odniesieniu do podanej daty";
+--- sc/source/ui/src/globstr.src.lang39	2004-09-09 20:08:16.000000000 +0200
++++ sc/source/ui/src/globstr.src	2004-09-13 09:20:14.536836875 +0200
+@@ -4064,7 +4064,7 @@
+ 		Text = "Der Bereich enth�lt keine Spaltenk�pfe.\nSoll die erste Zeile als Spaltenk�pfe verwendet werden?" ;
+ 		Text [ ENGLISH ] = "This area does not contain column headers.\nUse the first line as column headers?" ; \
+ 		Text [ norwegian ] = "Dette omr�det inneholder ingen kolonneoverskrifter.\nVil du bruke den f�rste linja som overskrift?" ; \
+-		Text [ italian ] = "L' area non contiene intestazioni per le colonne.\nUsare la prima riga come intestazione colonna?" ; \
++		Text [ italian ] = "L'area non contiene intestazioni per le colonne.\nUsare la prima riga come intestazione colonna?" ; \
+ 		Text [ portuguese_brazilian ] = "O intervalo n�o cont�m cabe�alhos de colunas.\nDeseja utilizar a primeira linha como cabe�alho de coluna?" ; \
+ 		Text [ portuguese ] = "Esta �rea n�o cont�m cabe�alhos de colunas.\nUtilizar a primeira linha como cabe�alho de coluna?" ; \
+ 		Text [ finnish ] = "Alue ei sis�ll� sarakeotsikoita.\nHaluatko ensimm�ist� rivi� k�ytett�v�n sarakeotsikkona?" ; \
+@@ -5698,7 +5698,7 @@
+ 		Text [ ENGLISH ] = "Error creating the Data Pilot Table." ;
+ 		Text [ dutch ] = "Fout bij het maken van DataPiloot-tabel" ;
+ 		Text [ english_us ] = "Error creating the Data Pilot Table." ;
+-		Text [ italian ] = "Erore nella creazione della tabella DataPilot" ;
++		Text [ italian ] = "Errore nella creazione della tabella DataPilot" ;
+ 		Text [ spanish ] = "Error al crear la tabla del Piloto de Datos." ;
+ 		Text [ french ] = "Erreur lors de la cr�ation de la table du pilote de donn�es" ;
+ 		Text [ swedish ] = "Fel n�r Datapilot-tabell skapades." ;
+@@ -6825,7 +6825,7 @@
+ 		Text = "Dieser Bereich wurde bereits eingef�gt." ;
+ 		Text [ ENGLISH ] = "This area already has been inserted." ;
+ 		Text [ norwegian ] = "Dette omr�det er alt satt inn." ;
+-		Text [ italian ] = "Ques'area � gi� stata inserita." ;
++		Text [ italian ] = "Quest'area � gi� stata inserita." ;
+ 		Text [ portuguese_brazilian ] = "Este intervalo j� foi inserido." ;
+ 		Text [ portuguese ] = "Esta �rea j� foi inserida." ;
+ 		Text [ finnish ] = "T�m� alue on jo lis�tty." ;
+@@ -12581,7 +12581,7 @@
+ 		Text [ ENGLISH ] = "Hide table" ;
+ 		Text [ dutch ] = "Werkblad verbergen" ;
+ 		Text [ english_us ] = "Hide sheet" ;
+-		Text [ italian ] = "Nacondi la tabella" ;
++		Text [ italian ] = "Nascondi la tabella" ;
+ 		Text [ spanish ] = "Ocultar hoja" ;
+ 		Text [ french ] = "Masquer feuille" ;
+ 		Text [ swedish ] = "D�lj tabell" ;
+--- sc/source/ui/src/scstring.src.lang39	2004-09-09 20:12:14.000000000 +0200
++++ sc/source/ui/src/scstring.src	2004-09-13 09:20:14.542836994 +0200
+@@ -5158,7 +5158,7 @@
+ 	Text[ french ] = "Les cellules dans lesquelles vous voulez ins�rer des donn�es contiennent d�j� des donn�es.\n�craser les donn�es existantes ?"; \
+ 	Text[ spanish ] = "Las celdas en las que quiere insertar datos ya contienen datos.\n�Desea sobrescribir los datos existentes?"; \
+ 	Text[ finnish ] = "Do you want to replace the contents of the destination cells?"; \
+-	Text[ italian ] = "Le celle in cui volete inserire i dati contengono gi� dei dati.\nVolete soprascriverli?"; \
++	Text[ italian ] = "Le celle in cui volete inserire i dati contengono gi� dei dati.\nVolete sovrascriverli?"; \
+ 	Text[ danish ] = "Du er ved at inds�tte data i celler, der allerede indeholder data.\nEr du sikker p�, at du vil overskrive eksisterende data?"; \
+ 	Text[ swedish ] = "Cellerna som du vill klistra in data i inneh�ller redan data.\nVill du verkligen skriva �ver dessa data?"; \
+ 	Text[ polish ] = "Do you want to replace the contents of the destination cells?"; \
+--- scaddins/source/analysis/analysis.src.lang39	2004-09-09 18:35:41.000000000 +0200
++++ scaddins/source/analysis/analysis.src	2004-09-13 09:20:14.571837573 +0200
+@@ -3011,7 +3011,7 @@
+ 			Text[ french ] = "Multiple auquel arrondir le nombre.";
+ 			Text[ spanish ] = "El valor al cual se desea redondear.";
+ 			Text[ finnish ] = "Luvun py�ristystarkkuus";
+-			Text[ italian ] = "Il multilpo a cui arrotondare il valore.";
++			Text[ italian ] = "Il multiplo a cui arrotondare il valore.";
+ 			Text[ danish ] = "V�rdien, hvis multiplum der skal afrundes til.";
+ 			Text[ swedish ] = "V�rdet vars multipel talet ska avrundas till.";
+ 			Text[ polish ] = "Wielokrotno��, do kt�rej nale�y zaokr�gli� liczb�.";
+@@ -6187,7 +6187,7 @@
+ 			Text[ french ] = "Nombre d�cimal";
+ 			Text[ spanish ] = "N�mero decimal";
+ 			Text[ finnish ] = "Muunnettava desimaaliluku";
+-			Text[ italian ] = "Numero deciamle";
++			Text[ italian ] = "Numero decimale";
+ 			Text[ danish ] = "Det decimaltal der skal konverteres";
+ 			Text[ swedish ] = "Decimaltal";
+ 			Text[ polish ] = "Liczba dziesi�tna do konwersji.";
+--- sch/source/core/glob.src.lang39	2004-09-09 19:16:31.000000000 +0200
++++ sch/source/core/glob.src	2004-09-13 09:20:14.374833643 +0200
+@@ -669,7 +669,7 @@
+ 	Text [ ENGLISH ] = "Negative and Zero-Values cannot be shown logarithmic." ;
+ 	Text [ dutch ] = "Negatieve waarden en nul-waarden kunnen niet logaritmisch worden weergegeven." ;
+ 	Text [ english_us ] = "Negative and zero values cannot be logarithmicaly portrayed." ;
+-	Text [ italian ] = "Valori nulli e negativi non possono essere rappresentati logaritmamente." ;
++	Text [ italian ] = "Valori nulli e negativi non possono essere rappresentati logaritmicamente." ;
+ 	Text [ spanish ] = "No es posible representar logar�tmicamente valores cero o valores negativos." ;
+ 	Text [ french ] = "Valeurs n�gatives et valeurs z�ro ne peuvent �tre affich�es sous forme de logarithme" ;
+ 	Text [ swedish ] = "Negativa v�rden och nollv�rden kan inte visas logaritmiskt." ;
+--- sch/source/ui/app/strings.src.lang39	2004-09-09 19:17:35.000000000 +0200
++++ sch/source/ui/app/strings.src	2004-09-13 09:20:14.381833783 +0200
+@@ -891,7 +891,7 @@
+ 	Text [ ENGLISH ] = "Normal with lines" ;
+ 	Text [ dutch ] = "Normaal met lijnen" ;
+ 	Text [ english_us ] = "Normal with lines" ;
+-	Text [ italian ] = "Normale con liee" ;
++	Text [ italian ] = "Normale con linee" ;
+ 	Text [ spanish ] = "Normal con l�neas" ;
+ 	Text [ french ] = "Normal avec lignes" ;
+ 	Text [ swedish ] = "Normal med linjer" ;
+--- sd/sdi/sdslots.src.lang39	2004-09-09 19:05:04.000000000 +0200
++++ sd/sdi/sdslots.src	2004-09-13 09:20:14.338832925 +0200
+@@ -4949,7 +4949,7 @@
+ 	SlotName[ dutch ] = "Plakpunt verticaal gecentreerd";
+ 	SlotName[ french ] = "Point de collage verticalement centr�";
+ 	SlotName[ spanish ] = "Punto de adhesi�n vertical centro";
+-	SlotName[ italian ] = "Punto di incollaggio cetrato in verticale";
++	SlotName[ italian ] = "Punto di incollaggio centrato in verticale";
+ 	SlotName[ danish ] = "Kl�bepunkt lodret centreret";
+ 	SlotName[ swedish ] = "F�stpunkt vertikalt centrerat";
+ 	SlotName[ polish ] = "Punkt sklejenia po�rodku w pionie";
+@@ -6080,7 +6080,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijl-/cirkeluiteinde";
+ 	SlotName[ french ] = "Ligne avec fl�che/cercle";
+ 	SlotName[ spanish ] = "L�nea con flecha/c�rculo al final";
+-	SlotName[ italian ] = "Linea con cerchio/freccia teminale";
++	SlotName[ italian ] = "Linea con cerchio/freccia terminale";
+ 	SlotName[ danish ] = "Streg med pilespids/cirkel";
+ 	SlotName[ swedish ] = "Linje med pil-/cirkelslut";
+ 	SlotName[ polish ] = "Linia ze strza�k�-k�kiem";
+@@ -6127,7 +6127,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijluiteinde";
+ 	SlotName[ french ] = "Ligne avec fl�che � la fin";
+ 	SlotName[ spanish ] = "L�nea con flecha al final";
+-	SlotName[ italian ] = "Linea con freccia teminale";
++	SlotName[ italian ] = "Linea con freccia terminale";
+ 	SlotName[ danish ] = "Streg med pilespids";
+ 	SlotName[ swedish ] = "Linje med pilslut";
+ 	SlotName[ polish ] = "Linia ze strza�k� na ko�cu";
+@@ -6174,7 +6174,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijl-/vierkantuiteinde";
+ 	SlotName[ french ] = "Ligne avec fl�che/carr�";
+ 	SlotName[ spanish ] = "L�nea con flecha/cuadrado al final";
+-	SlotName[ italian ] = "Linea con freccia/quadrato teminale";
++	SlotName[ italian ] = "Linea con freccia/quadrato terminale";
+ 	SlotName[ danish ] = "Streg med pilespids/kvadrat";
+ 	SlotName[ swedish ] = "Linje med pil-/kvadratslut";
+ 	SlotName[ polish ] = "Linia ze strza�k�-kwadratem";
+@@ -6268,7 +6268,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijluiteinden";
+ 	SlotName[ french ] = "Ligne avec fl�ches";
+ 	SlotName[ spanish ] = "L�nea con puntas de flechas";
+-	SlotName[ italian ] = "Linea con frecce teminale";
++	SlotName[ italian ] = "Linea con frecce terminali";
+ 	SlotName[ danish ] = "Streg med pilespidser";
+ 	SlotName[ swedish ] = "Linje med pilslut";
+ 	SlotName[ polish ] = "Linia ze strza�kami";
+@@ -6694,7 +6694,7 @@
+ 	SlotName[ dutch ] = "Paginalay-out wijzigen...";
+ 	SlotName[ french ] = "Modifier la mise en page...";
+ 	SlotName[ spanish ] = "Modificar dise�o de diapositiva...";
+-	SlotName[ italian ] = "Modifica layout di dispositiva...";
++	SlotName[ italian ] = "Modifica layout di diapositiva...";
+ 	SlotName[ danish ] = "Modificer diaslayout...";
+ 	SlotName[ swedish ] = "�ndra sidlayout...";
+ 	SlotName[ polish ] = "Modyfikuj uk�ad slajdu...";
+--- sd/source/ui/app/menuids.src.lang39	2004-09-09 19:06:17.000000000 +0200
++++ sd/source/ui/app/menuids.src	2004-09-13 09:20:14.346833085 +0200
+@@ -5067,7 +5067,7 @@
+         Text [ english_us ] = "Fixed Ver~tical Bottom" ; \
+         Text [ swedish ] = "Fixerad vertikalt ~nederkant" ; \
+         Text [ danish ] = "Fikseret lodret bund" ; \
+-        Text [ italian ] = "Fissato vertcalmente in ~basso" ; \
++        Text [ italian ] = "Fissato verticalmente in ~basso" ; \
+         Text [ spanish ] = "Fijado abajo ~verticalmente" ; \
+         Text [ french ] = "Fix� verticalement en bas" ; \
+         Text [ portuguese_brazilian ] = "Inferior Ver~tical Fixo" ; \
+--- sd/source/ui/app/sdstring.src.lang39	2004-09-09 19:07:57.000000000 +0200
++++ sd/source/ui/app/sdstring.src	2004-09-13 09:20:14.348833125 +0200
+@@ -569,7 +569,7 @@
+ 	Text = "Die Bitmap wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Bitmap �ndern \noder eine neue Bitmap hinzuf�gen." ;
+ 	Text [ ENGLISH ] = "The bitmap was modified without save. You can modify the selected bitmap or add a new bitmap" ;
+ 	Text [ norwegian ] = "Bildet ble endret uten at det ble lagret. \nDu kan endre det valgte bildet\neller legge til et nytt." ; \
+-	Text [ italian ] = "La bitmap � stata modificata senza esseere salvata.\nPotete modificare la bitmap selezionata o aggiungerne una nuova." ; \
++	Text [ italian ] = "La bitmap � stata modificata senza essere salvata.\nPotete modificare la bitmap selezionata o aggiungerne una nuova." ; \
+ 	Text [ portuguese_brazilian ] = "O bitmap foi modificado sem ser salvo. \nVoc� pode modificar o bitmap selecionado \\ou adicionar um novo." ; \
+ 	Text [ portuguese ] = "As modifica��es feitas no bitmap n�o foram guardadas. Poder� alterar o \nbitmap seleccionado ou adicionar um novo bitmap." ; \
+ 	Text [ finnish ] = "Bittikarttaa ei tallennettu muokkauksen j�lkeen. \nVoit vaihtaa valitun bittikartan tai lis�t� uuden." ; \
+--- sd/source/ui/app/strings.src.lang39	2004-09-09 19:08:22.000000000 +0200
++++ sd/source/ui/app/strings.src	2004-09-13 09:20:14.370833564 +0200
+@@ -7357,7 +7357,7 @@
+ 	Text [ ENGLISH ] = "The object name allready exists. Please choose another one" ;
+ 	Text [ dutch ] = "De objectnaam bestaat reeds. Typ een andere naam." ;
+ 	Text [ english_us ] = "The object name already exists. Please enter another name." ;
+-	Text [ italian ] = "Il nume dell'oggetto esiste gi�. Digitarne un altro." ;
++	Text [ italian ] = "Il nome dell'oggetto esiste gi�. Digitarne un altro." ;
+ 	Text [ spanish ] = "El nombre del objeto ya existe. Por favor escriba otro nombre." ;
+ 	Text [ french ] = "Le nom de cet objet existe d�j�. Veuillez entrer un autre nom." ;
+ 	Text [ swedish ] = "Objektnamnet finns redan. Mata in ett annat namn" ;
+@@ -9803,7 +9803,7 @@
+ 	Text = "Diese Aktion l�scht die Seite '$'. \nDie Seite enth�lt Zeichenobjekte!" ;
+ 	Text [ ENGLISH ] = "This action deletes the page '$'. \nThe page contains drawing objects!" ;
+ 	Text [ english_us ] = "This action deletes the page '$'. \nNote: the page contains drawing objects!" ;
+-	Text [ italian ] = "Tale operazione elimina la pagina $. \nLa paginacontiene oggetti di disegno!" ;
++	Text [ italian ] = "Tale operazione elimina la pagina $. \nLa pagina contiene oggetti di disegno!" ;
+ 	Text [ spanish ] = "Esta acci�n borrar� la p�gina $. \n�La p�gina contiene objetos de dibujo!" ;
+ 	Text [ french ] = "Cette op�ration supprime la page '$'. \nCette page contient des objets de dessin !" ;
+ 	Text [ dutch ] = "Door deze handeling wordt pagina '$' verwijderd.\nDeze pagina bevat tekenobjecten!" ;
+@@ -9966,7 +9966,7 @@
+ 		Text[ french ] = "Cette action supprime la liste des op�rations pouvant\n�tre annul�es. Ceci n'affecte pas les modifications\napport�es au document, mais emp�che de les annuler.\nVoulez-vous poursuivre et assigner\nle nouveau style de page ?";
+ 		Text[ spanish ] = "Esta orden borra la lista de los pasos que se\npuedan deshacer. En el documento se conservar�n las modificaciones\nrealizadas hasta ahora, pero no se podr�n\ndeshacer m�s. �Desea continuar y asignar el nuevo\ndise�o de diapositiva?";
+ 		Text[ finnish ] = "T�m� toiminto poistaa toimintojen luettelon,\neik� sit� voi kumota. Edelliset asiakirjaan tehdyt muutokset ovat yh� voimassa,\nmutta niit� ei voi kumota. Haluatko jatkaa ja\nm��ritt�� uuden diarakenteen?";
+-		Text[ italian ] = "Quest'azione elimina l'elenco delle fasi di lavoro da annullare./nLa modifiche effettuate fino a questo momento rimangono inalterate/nma non si possono pi� annullare. Volete proseguire/ne assegnare il nuovo modello di diapositiva?";
++		Text[ italian ] = "Quest'azione elimina l'elenco delle fasi di lavoro da annullare./nLe modifiche effettuate fino a questo momento rimangono inalterate/nma non si possono pi� annullare. Volete proseguire/ne assegnare il nuovo modello di diapositiva?";
+ 		Text[ danish ] = "Denne handling sletter listen over arbejdstrin, som kan fortrydes.\nTidligere �ndringer i dokumentet bibeholdes, men kan ikke l�ngere fortrydes.\nVil du forts�tte og tilf�je det nye diasdesign?";
+ 		Text[ swedish ] = "Den h�r �tg�rden raderar listan med arbetssteg som\ng�r att �ngra. �ndringar som har\ngjorts hittills i dokumentet finns kvar men g�r\ninte att �ngra l�ngre. Vill du forts�tta\noch tilldela den nya sidformatmallen?";
+ 		Text[ polish ] = "W wyniku tej akcji zostanie usuni�ta lista operacji, kt�re\nmo�na cofn��. Zmiany dokonane\nw dokumencie zostan� zachowane, nie mo�na\nich jednak cofn��. Czy chcesz kontynuowa�\ni tym samym przypisa� nowy uk�ad slajdu?";
+@@ -10380,7 +10380,7 @@
+ 	Text = "Diese Grafik ist mit dem Dokument verkn�pft. \nM�chten Sie die Verkn�pfung aufheben, um die Grafik zu bearbeiten?" ;
+ 	Text [ English ] = "This is a linked graphic. \nDo you want to unlink the graphic in order to edit the graphic?" ;
+ 	Text [ norwegian ] = "Denne grafikken er koblet til et dokument. \nVil du fjerne tilkoblingen til dokumentet slik at du kan redigere bildet?" ;
+-	Text [ italian ] = "Questra immagine � collegata con il documento. \nDesiderate scollegare l'immagine per poterla modificare?" ;
++	Text [ italian ] = "Questa immagine � collegata con il documento. \nDesiderate scollegare l'immagine per poterla modificare?" ;
+ 	Text [ portuguese_brazilian ] = "Esta figura esta vinculada a um documento. \nDeseja desvincular a figura para que seja poss�vel edit�-la?" ;
+ 	Text [ portuguese ] = "Esta imagem est� ligada ao documento. \nRemover a liga��o para editar a imagem?" ;
+ 	Text [ english_us ] = "This graphic is linked to a document. \nDo you want to unlink the graphic in order to edit it?" ;
+@@ -10562,7 +10562,7 @@
+ 	Text = "Die Version der Grafikdatei wird nicht unterst�tzt" ;
+ 	Text [ ENGLISH ] = "Version of graphic file not supported" ;
+ 	Text [ english_us ] = "This graphics file version is not supported" ;
+-	Text [ italian ] = "La verione del file grafico non � supportata" ;
++	Text [ italian ] = "La versione del file grafico non � supportata" ;
+ 	Text [ spanish ] = "La versi�n del archivo gr�fico no se admite" ;
+ 	Text [ french ] = "La version du fichier graphique n'est pas support�e" ;
+ 	Text [ dutch ] = "Deze versie van het grafische bestand wordt niet ondersteund" ;
+@@ -11700,7 +11700,7 @@
+ 	Text = "Originalgr��e" ;
+ 	Text [ ENGLISH ] = "Real Size" ;
+ 	Text [ norwegian ] = "Opprinnelig st�rrelse" ;
+-	Text [ italian ] = "Dimensione orginale" ;
++	Text [ italian ] = "Dimensione originale" ;
+ 	Text [ portuguese_brazilian ] = "Tamanho Original" ;
+ 	Text [ portuguese ] = "Tamanho real" ;
+ 	Text [ finnish ] = "Alkuper�inen koko" ;
+@@ -14549,7 +14549,7 @@
+ 	Text = "Schlangenlinie von links" ;
+ 	Text [ ENGLISH ] = "Wavyline from left" ;
+ 	Text [ english_us ] = "Wavy Line From Left" ;
+-	Text [ italian ] = "Serpentina da sinsitra" ;
++	Text [ italian ] = "Serpentina da sinistra" ;
+ 	Text [ spanish ] = "Serpentina desde la izquierda" ;
+ 	Text [ french ] = "Ligne ondul�e � partir de la gauche" ;
+ 	Text [ dutch ] = "Slangenlijn van links" ;
+@@ -20399,7 +20399,7 @@
+ 	Text [ portuguese_brazilian ] = "Deseja adicionar o som � Galeria?" ;
+ 	Text [ swedish ] = "Vill du l�gga till ljudet till Gallery-temat?" ;
+ 	Text [ danish ] = "Skal lyden tilf�jes til Galleriet?" ;
+-	Text [ italian ] = "Aggiungere lil suono all'argomento Gallery?" ;
++	Text [ italian ] = "Aggiungere il suono all'argomento Gallery?" ;
+ 	Text [ spanish ] = "�Desea a�adir el sonido al tema Gallery?" ;
+ 	Text [ french ] = "Voulez-vous ajouter le son au th�me de la Gallery ?" ;
+ 	Text [ dutch ] = "Wilt u het geluid opnemen in de gallery?" ;
+@@ -20941,7 +20941,7 @@
+ 	Text = "Diese Grafik ist mit dem Dokument verkn�pft. M�chten Sie die Verkn�pfung aufheben, um die Grafik zu bearbeiten?" ;
+ 	Text [ English ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ;
+ 	Text [ norwegian ] = "Denne grafikken er koblet til et dokument. Vil du koble den fra dokumentet for � redigere den?" ;
+-	Text [ italian ] = "Questra immagine � collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
++	Text [ italian ] = "Questa immagine � collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
+ 	Text [ portuguese_brazilian ] = "Esta figura est� vinculada a um documento. Deseja desvincul�-la para que se possa edit�-la?" ;
+ 	Text [ portuguese ] = "Esta imagem est� ligada ao documento. Deseja remover a liga��o para poder editar a imagem?" ;
+ 	Text [ english_us ] = "This graphic is linked to a document. Do you want to unlink the graphic in order to edit it?" ;
+@@ -21711,7 +21711,7 @@
+ {
+ 	Text = "Es existiert bereits ein Design mit diesem Namen\nSoll es �berschrieben werden?";
+ 	Text [ ENGLISH ] = "A design with the same name already exists\nShould it be replaced?";
+-	Text[ italian ] = "Un design con questo nome esiste gi�.\nVolete sovrasciverlo?";
++	Text[ italian ] = "Un progetto con questo nome esiste gi�.\nVolete sovrasciverlo?";
+ 	Text[ portuguese_brazilian ] = "J� existe um design com este nome.\nDeseja substitu�-lo?";
+ 	Text[ portuguese ] = "J� existe um Design com este mesmo nome\nSubstituir?";
+ 	Text[ danish ] = "Der findes allerede et design med dette navn.\nSkal det overskrives?";
+--- sd/source/ui/app/pseudo.src.lang39	2000-09-18 18:48:30.000000000 +0200
++++ sd/source/ui/app/pseudo.src	2004-09-13 09:20:14.372833603 +0200
+@@ -111,7 +111,7 @@
+ 	HelpText [ ENGLISH ] = "Insert a Checkbox" ;
+ 	Slotname [ english_us ] = "Insert Checkbox" ;
+ 	HelpText [ english_us ] = "Insert a checkbox" ;
+-	Slotname [ italian ] = "InserisciChekcBox" ;
++	Slotname [ italian ] = "InserisciCheckBox" ;
+ 	HelpText [ italian ] = "Inserisci una Checkbox" ;
+ 	Slotname [ spanish ] = "InsertarCasillaControl" ;
+ 	HelpText [ spanish ] = "Inserta un cuadro de verificaci�n" ;
+--- setup2/source/custom/jvmsetup/jvmdlg.src.lang39	2004-09-09 18:44:15.000000000 +0200
++++ setup2/source/custom/jvmsetup/jvmdlg.src	2004-09-13 09:20:14.462835399 +0200
+@@ -1359,7 +1359,7 @@
+ 	TEXT = "Mit diesem Dialog w�hlen Sie die Java Umgebung aus, die von %PRODUCTNAME verwendet werden soll. Wurde bei der automatischen Suche keine verwendbare Java Version gefunden, so k�nnen Sie �ber die Funktion \"Manuell Suchen...\" eine schon auf dem System vorhandene Java Umgebung angeben.\n\n\"Manuell suchen...\" �ffnet einen Dialog, mit dem Sie ein Verzeichnis selektieren k�nnen. Geben Sie hier das Stammverzeichnis der Java Installation (JavaHome) an. Nach der Best�tigung wird die getroffene Wahl verifiziert. Kann die angegeben VM benutzt werden, so wird ein entsprechender Eintrag an die Liste der vorhandenen Umgebungen geh�ngt. Tritt ein Fehler auf, so wird dies durch eine Meldung mitgeteilt.\n\nDie verwendete Laufzeitumgebung k�nnen Sie jederzeit nachtr�glich ver�ndern.\nRufen Sie daf�r, im Ordner ..\%PRODUCTNAME%PRODUCTVERSION\program, das Programm "jvmsetup.exe" auf. Wenn Sie keine Java Umgebung ausw�hlen, werden Java Applets, JavaScripte oder Datenbankzugriffe �ber JDBC ausgef�hrt werden." ;
+ 	TEXT[ ENGLISH ] = "In this dialog select the Java Environment which %PRODUCTNAME should run.\nIf Office cannot use any version, install a corresponding Environment.\nIn the README file in the Office folder you can find more information about the Java support in %PRODUCTNAME and about the installation of a Java Environment.\nThe Runtime Environment used can be modified any time later on.\n You can modify the Runtime Environment by selecting  the \"JVM Setup\" entry in the Bookmarks/Java folder of the Explorer.\nIf no Java Environment has been selected, neither Java (Applets) nor JavaScript will be executed." ; 
+ 	TEXT[ english_us ] = "Use this dialog to select the Java environment to be used by %PRODUCTNAME. If the automatic search found no usable Java version, use \"Browse...\" to select a Java environment already existing on the system.\n\n\"Browse...\" opens a dialog in which a directory can be selected. Enter the root directory of the Java installation (JavaHome). After confirmation the selection will be verified. If the VM entered can be used, a corresponding entry is added to the list of the existing environments. If an error occurs, a message appears. \n\nThe Runtime Environment used can be modified at any future point.\nGo to the Explorer and select the entry \"Java Setup\" in the Bookmarks/Java folder. If you do not select a Java environment neither Java (Applets) nor JavaScript can be run." ; 
+-	TEXT[ italian ] = "In questo dialogo potete selezionare il Java Environment che dovr� essere usato da %PRODUCTNAME. Se con la ricerca automatica non viene individuata nessuna versione Java utilizzabile, ricercate il Java Environment installato nel vostro sistema servendovi della funzione \"Sfoglia...\".\n\nCon \"Sfoglia...\" aprite un dialogo con il quale potete scegliere una cartella. Specificate qui il nome della cartella di origine (root) dell'installazione Java (JavaHome). Dopo la conferma, verr� verificata la scelta. Se la VM indicata pu� essere utilizzata verr� aggiunta la voce corrispondente all'elenco degli environment disponibili. In caso di errore apparir� un messaggio.\n\n� possibile modificare il Runtime Environment in qualsiasi momento.\nPer questa operazione nella cartella Bookmark/Java che si trova nell'Explorer, selezionate la voce \"Java setup\". Se non viene selezionato nessun Java Environment non verranno eseguiti n� Java (Applets) n� JavaScript.\n\nIl dialogo esegue tutte le modifiche necessarie nel file INI (soffice.ini). Con le relative modifiche manuali delle voci � possibile personalizzare il Java Environment in uso. Qui di seguito vengono illustrate le voci pi� importanti. Fate attenzione alle lettere maiuscole o miniscole delle voci:\n\nJava:\nattiva (1) o disattiva (0) il supporto Java. Se il valore � impostato sullo 0 tutte le altre impostazioni Java verranno ignorate.\n\nHome:\n indica la cartella in cui � stato installato il Runtime Environment (JavaHome).\n\nVersione:\nindica la versione Java installata.\n\nSystemClasspath:\ndefinisce il percorso di ricerca di tutte le classi Java (CLASSPATH) necessarie all'avvio del Java Environment (ad esempio classes.zip o rt.jar e r18i.jar). Le classi che non fanno parte del Runtime Environment generalmente vengono riportate nello UserClasspath.\n\nUserClasspath:\nqui appaiono tutte le classi che non appartengono direttamente al Runtime Environment. L'intero Classpath, che si trasmetter� al Java VM, � composto dal SystemClasspath e dall'UserCl sspath.\n\nRuntimeLib: indica il DLL Java (con il relativo percorso) che di solito � javai.dll (Java 1.1.x) oppure jvm.dll (Java 1.2.x). Il DLL deve contenere tutte le funzioni JNI necessarie all'inizializzazione e all'avvio di Java VM.\n\nPer ulteriori voci o informazioni pi� dettagliate sull'uso di Runtime Environment di Java in Office, leggete il file README."; 
++	TEXT[ italian ] = "In questo dialogo potete selezionare il Java Environment che dovr� essere usato da %PRODUCTNAME. Se con la ricerca automatica non viene individuata nessuna versione Java utilizzabile, ricercate il Java Environment installato nel vostro sistema servendovi della funzione \"Sfoglia...\".\n\nCon \"Sfoglia...\" aprite un dialogo con il quale potete scegliere una cartella. Specificate qui il nome della cartella di origine (root) dell'installazione Java (JavaHome). Dopo la conferma, verr� verificata la scelta. Se la VM indicata pu� essere utilizzata verr� aggiunta la voce corrispondente all'elenco degli environment disponibili. In caso di errore apparir� un messaggio.\n\n� possibile modificare il Runtime Environment in qualsiasi momento.\nPer questa operazione nella cartella Bookmark/Java che si trova nell'Explorer, selezionate la voce \"Java setup\". Se non viene selezionato nessun Java Environment non verranno eseguiti n� Java (Applets) n� JavaScript.\n\nIl dialogo esegue tutte le modifiche necessarie nel file INI (soffice.ini). Con le relative modifiche manuali delle voci � possibile personalizzare il Java Environment in uso. Qui di seguito vengono illustrate le voci pi� importanti. Fate attenzione alle lettere maiuscole o minuscole delle voci:\n\nJava:\nattiva (1) o disattiva (0) il supporto Java. Se il valore � impostato sullo 0 tutte le altre impostazioni Java verranno ignorate.\n\nHome:\n indica la cartella in cui � stato installato il Runtime Environment (JavaHome).\n\nVersione:\nindica la versione Java installata.\n\nSystemClasspath:\ndefinisce il percorso di ricerca di tutte le classi Java (CLASSPATH) necessarie all'avvio del Java Environment (ad esempio classes.zip o rt.jar e r18i.jar). Le classi che non fanno parte del Runtime Environment generalmente vengono riportate nello UserClasspath.\n\nUserClasspath:\nqui appaiono tutte le classi che non appartengono direttamente al Runtime Environment. L'intero Classpath, che si trasmetter� al Java VM, � composto dal SystemClasspath e dall'UserCl sspath.\n\nRuntimeLib: indica il DLL Java (con il relativo percorso) che di solito � javai.dll (Java 1.1.x) oppure jvm.dll (Java 1.2.x). Il DLL deve contenere tutte le funzioni JNI necessarie all'inizializzazione e all'avvio di Java VM.\n\nPer ulteriori voci o informazioni pi� dettagliate sull'uso di Runtime Environment di Java in Office, leggete il file README."; 
+ 	TEXT[ portuguese ] = "Seleccione nesta caixa de di�logo o ambiente Java a ser utilizado pelo %PRODUCTNAME.\nSe a procura autom�tica n�o encontrar nenhuma vers�o Java que possa ser utilizada, poder� indicar por meio da fun��o \"Pesquisar...\" um ambiente Java j� existente no sistema.\n\nEsta fun��o abrir� uma caixa de di�logo que lhe permite seleccionar um direct�rio. Indique aqui o direct�rio-ra�z (JavaHome) da instala��o Java. Depois de confirmar, a sua escolha ser� verificada. Se a m�quina virtual (VM) Java puder ser utilizada, a entrada correspondente ser� adicionada � lista dos ambientes existentes. Se surgir algum erro, ver� uma mensagem de erro.\n\nPoder� modificar o ambiente de execu��o Java a qualquer altura.\nPara isso bastar� seleccionar no Explorer a pasta \"Bookmarks/Java\" e aqui a entrada \"Java Setup\". Se n�o seleccionar nenhum ambiente Java, n�o ser� poss�vel executar nem Java (Apllets) nem JavaScript.\n\\Poder� fazer todas as modifica��es necess�rias no ficheiro INI (soffice.ini). Por meio de modifica��es manuais adequadas poder� personalizar o ambiente Java utilizado. A seguinte lista apresenta-lhe as entradas mais importantes. Tome em aten��o as mai�sculas e min�sculas:\n\nJava:\nActiva (1) ou Desactiva(0) o suporte Java. Se o valor for 0, ser�o ignoradas todas as outras predefini��es Java.\n\nHome:\nIndica o direct�rio da instala��o Java (JavaHome).\n\nVers�o:\nIndica a vers�o de Java instalada.\n\nSystemClasspath:\nDefine o atalho de procura para todas as classes de Java (CLASSPATH) absolutamente necess�rias ao ambiente Java (ex.: classes.zip ou rt.jar e r18i.jar). As classes n�o pertencentes ao ambiente de execu��o Java deveriam ser listadas em UserClasspath.\n\nUserClasspath:\nDever� incluir todas as classes que n�o perten�am ao ambiente de execu��o. O Classpath completo transmitido � m�quina virtual Java � composto pelos atalhos SystemClasspath e UserClasspath.\n\nRuntimeLib:\nIndica o ficheiro DLL de Java a ser utilizado (com indica��o dos atalhos). Geralmente estes s�o: javai.dll (Jav 1.1.x), jvm.dll (Java 1.2.x) O ficheiro DLL ter� que conter todas as fun��es JNI necess�rias � inicializa��o e arranque da m�quina virtual (VM) Java.\n\nEncontrar� outras entradas e informa��es mais detalhadas sobre a utiliza��o do ambiente de execu��o Java Runtime no Office no ficheiro README."; 
+ 	TEXT[ russian ] = "��� ������ ����� ������� ���������� ����� Java, ������� ������ �������������� ��� %PRODUCTNAME. ���� ��� ���������� ����������� ������ Java, �� �������, �� ��� ������ ������� \"����� �������...\" �� ������ ������ ��������� ��� � ������� ����� Java.\n\n\"����� �������...\" ��������� ������, � ������� �� ������� ������� �������. ������� ����� �������� ������� ��� ����������� Java (JavaHome). ����� ������������� ����� ����� ��������. ���� �������� VM ����� ���� ������������, �� ������ ��������� ���� ����� �������� ��������������� ���������. ���� ���������� ������, �� �� �������� ��������� �� ����.\n\n������������ ����� ���������� ����� ���� � ����� ����� ��������.\n��� ����� ���������� ������� � ���������� ��������/����� Java ������ \"��������� Java\". ���� �� �� �������� ����� Java, �� �� Java (�������), �� JavaScript ����������� �� �����.\n\n������ �������� ��� ����������� ��������� � ����� INI (soffice.ini). ��������� ����������� ������� �������� ��������������� ��������, �� ������ �� ������� ���������������� ������������ ����� Java. ����� ����� ��������� ��������� ��������. �������� �������� �� ��������� �������� � ��������� ����:\n\nJava:\n �������� (1) ��� ��������� (0) ��������� Java. ���� �������� ���������� �� 0, �� ��� ��������� ��������� Java ����� ��������������.n\nHome:\n������ �������, � ������� �������������� ����� ���������� Java (JavaHome).\n\n������:\n��������� �� ���������������� ������ Java.\n\nSystemClasspath:\n ������������� ���� ������ ��� ���� ������� Java (CLASSPATH), ������� ����������� ���������� ��� ������� ����� Java (������.,classes.zip ��� rt.jar � r18i.jar). ������, ������� �� ��������� � ����� ����������, ������ ���� ������������, ��� �������, � UserClasspath.\n\nUserClasspath:\n����� ������ ���������� ��� ������, ������� ����� �� ��������� � ����� ����������. ���� Classpath, ������� ���������� Java VM, ������� �� SystemClasspath � �� UserClasspath.\n\nRuntimeLib:\n������ Java DLL (� ��������� ����). ���, ��� �������, javai.dll (Java 1.1.x) ��� jvm.dll (Java 1.2.). � DLL ������ ����������� ��� ����������� ������� JNI, ������� ���������� ��� ������������� � ������� Java VM.\n\n��������� ��������, � ����� ��������� ���������� �� ���������� ������ ���������� Java � Office �� ������ �������� �� ������ README."; 
+ 	TEXT[ dutch ] = "In deze dialoog kiest u de Java-omgeving voor %PRODUCTNAME. Mocht er geen passende Java-versie te vinden zijn dan kunt u een reeds in uw systeem voorhanden Java-omgeving aangeven via de functie \"Handmatig zoeken...\".\n\nMet deze functie wordt er een dialoog geopend waarin u een directory kunt selecteren. Geef hier de homedirectory van de Java-installatie (JavaHome) aan en bevestig dit. Uw keuze wordt dan geverifieerd. Kan deze worden gebruikt dan wordt er een item toegevoegd aan de lijst van voorhanden omgevingen. Mocht er een fout optreden dan verschijnt er een melding.\n\nHet gebruikte runtime-environment kan te allen tijde worden gewijzigd.\nSelecteer hiervoor de optie \"Java Setup\" in de Bookmarks/Java-map in de explorer.\nSelecteert u geen Java omgeving dan wordt er geen Java (Applets) of JavaScript uitgevoerd.\n\nIn de dialoog komen alle noodzakelijke veranderingen van het INI-bestand (soffice.ini) voor. U kunt hierin handmatig veranderingen aanbrengen om de Java-omgeving aan te passen aan uw wensen, Hieronder vindt u een overzicht van de belangrijkste opties. Let op hoofdletters en kleine letters.\n\nJava:\ninschakelen (1) en uitschakelen (0) van de Java-ondersteuning. Staat de waarde op 0 dan worden alle andere Java-instellingen genegeerd.\n\nHome:\nde directory waarin Java Runtime Envireonment is ge�nstalleerd (JavaHome).\n\nVersion:\nde ge�nstalleerde versie.\n\nSystemClaspath:\\het zoekpad voor alle Java-klassen (CLASSPATH) die noodzakelijk zijn om de Java-omgeving te kunnen starten (bijv. classes.zip of rt.jar en r18i.jar). Klassen die niet tot het runtime-environment behoren moeten in de regel in het UserClasspath voorkomen.\n\nUserClasspath:\\hierin moeten alle klassen voorkomen die niet direct behoren tot het runtime environment. SystemClasspath en UserClasspath vormen samen het complete classpath dat wordt overgedragen aan Java VM.\n\\RuntimeLib:\nbevat de JavaDLL (met padaanduiding), meestal javai.dll (Java 1.1.x) of jvm.dll (Java 1.2.x). DLL moet alle JNI-functies bevatten ie noodzakelijk zijn voor het initialiseren en het starten van Java VM.\n\nAndere opties zoals gedetailleerde gegevens m.b.t. de besturing van het Java Runtime Environment onder Office vindt u in het README-bestand."; 
+--- setup2/source/ui/pages/maindlg.src.lang39	2004-09-09 18:46:33.000000000 +0200
++++ setup2/source/ui/pages/maindlg.src	2004-09-13 09:20:14.465835459 +0200
+@@ -556,7 +556,7 @@
+ 	Text = " KB ben�tigt. Bevor Sie die Installation erneut starten,\nstellen Sie bitte sicher, dass soviel Speicherplatz frei ist." ;
+ 	Text [ English ] = " KB. Before you start the installation again,\nplease make sure that there is enough memory.\n" ;
+ 	Text [ norwegian ] = " KB. Kontroller at det er nok ledig plass\nf�r du starter installasjonen p� nytt." ;
+-	Text [ italian ] = "KB. Prima di avviare di nuovo l'nstallazione,\nassicuratevi che vi sia memoria sufficiente." ;
++	Text [ italian ] = "KB. Prima di avviare di nuovo l'installazione,\nassicuratevi che vi sia memoria sufficiente." ;
+ 	Text [ portuguese_brazilian ] = "KB s�o necess�rios. Antes de reiniciar a instala��o,\ncertifique-se de que h� espa�o suficiente dispon�vel.\n." ;
+ 	Text [ portuguese ] = "KB. Antes de reiniciar a instala��o,\ncertifique-se de que existe mem�ria suficiente dispon�vel." ;
+ 	Text [ finnish ] = "kilotavua Ennen kuin k�ynnist�t asennuksen uudelleen,\nvarmista, ett� tallennustilaa on riitt�v�sti." ;
+@@ -1059,7 +1059,7 @@
+ 	Text [ portuguese_brazilian ] = "O %PRODUCTNAME %PRODUCTVERSION n�o pode ser instalado no diret�rio escolhido, por que o sistema de arquivos n�o tem suporte para v�nculos simb�licos. Escolha outro diret�rio. " ;
+ 	Text [ swedish ] = "Det g�r inte att installera %PRODUCTNAME %PRODUCTVERSION i katalogen som du har valt eftersom filsystemet inte har n�got st�d f�r symboliska l�nkar. V�lj en annan katalog." ;
+ 	Text [ danish ] = "%PRODUCTNAME %PRODUCTVERSION kan ikke installeres i det valgte katalog, da filsystemet ikke underst�tter symbolske henvisninger. V�lg et andet katalog." ;
+-	Text [ italian ] = "Impossibile installare %PRODUCTNAME %PRODUCTVERSION nella cartella indicata perch� il file system non supporta i collegamenti simbolici. Selezionate un'altra cartella." ;
++	Text [ italian ] = "Impossibile installare %PRODUCTNAME %PRODUCTVERSION nella cartella indicata perch� il file system non supporta i collegamenti simbolici. Selezionate un'altra cartella." ;
+ 	Text [ spanish ] = "%PRODUCTNAME %PRODUCTVERSION no se puede instalar en el directorio seleccionado porque el sistema de archivos no admite enlaces simb�licos. Seleccione otro directorio." ;
+ 	Text [ french ] = "Impossible d'installer %PRODUCTNAME %PRODUCTVERSION dans le r�pertoire s�lectionn� : ce syst�me de fichiers ne supporte pas les liens symboliques. Choisissez un autre r�pertoire." ;
+ 	Text [ dutch ] = "%PRODUCTNAME %PRODUCTVERSION kan niet in de opgegeven directory worden ge�nstalleerd, omdat dat bestandssysteem geen symbolische links ondersteunt. Kies a.u.b. een andere directory." ;
+--- setup2/source/ui/pages/passrv.src.lang39	2004-09-09 18:47:41.000000000 +0200
++++ setup2/source/ui/pages/passrv.src	2004-09-13 09:20:14.466835478 +0200
+@@ -168,7 +168,7 @@
+ 		Text [ portuguese_brazilian ] = "O nome do computador no qual o servidor %1 ser� executado." ;
+ 		Text [ swedish ] = "Namnet p� datorn d�r %1 servern skall k�ras." ;
+ 		Text [ danish ] = "Navnet p� computeren som %1 serveren udf�res p�." ;
+-		Text [ italian ] = "Il mome del computer nel quale in server %1 � in esecuzione." ;
++		Text [ italian ] = "Il nome del computer nel quale in server %1 � in esecuzione." ;
+ 		Text [ spanish ] = "El nombre del ordenador en el que se ejecutar� el servidor %1." ;
+ 		Text [ french ] = "Le nom de l'ordinateur sur lequel le serveur %1 va �tre lanc�." ;
+ 		Text [ dutch ] = "De naam van de computer waarop de %1 Server wordt uitgevoerd." ;
+--- setup2/source/ui/pages/pcrc.src.lang39	2004-09-09 18:49:01.000000000 +0200
++++ setup2/source/ui/pages/pcrc.src	2004-09-13 09:20:14.468835518 +0200
+@@ -173,7 +173,7 @@
+ 		Text [ portuguese_brazilian ] = "cont�m arquivos compactados %2. As somas CRC para estes arquivos ser�o agora verificadas." ;
+ 		Text [ swedish ] = "inneh�ller %2 komprimerade filer. F�r de h�r filerna kontolleras just nu CRC-checksummorna." ;
+ 		Text [ danish ] = "indeholder %2 komprimerede filer. For disse filer bliver CRC-summen kontrolleret nu." ;
+-		Text [ italian ] = "contiene %2 file compressi. Per questi file verranno adesso controllate le checksum CRC." ;
++		Text [ italian ] = "contiene %2 file compressi. Per questi file verranno adesso controllati i checksum CRC." ;
+ 		Text [ spanish ] = "contiene %2 archivos comprimidos. Para estos archivos se comprobar�n ahora las sumas CRC." ;
+ 		Text [ french ] = "contient %2 fichiers comprss�s. Les sommes de contr�le CRC vont maintenant �tre v�rifi�es pour ces fichiers." ;
+ 		Text [ dutch ] = "bevat %2 gecomprimeerde bestanden. Voor deze bestanden worden nu de CRC-checksommen gecontroleerd.." ;
+--- setup2/source/ui/pages/ppatch.src.lang39	2004-09-09 18:50:54.000000000 +0200
++++ setup2/source/ui/pages/ppatch.src	2004-09-13 09:20:14.469835538 +0200
+@@ -172,7 +172,7 @@
+ 		Text[ french ] = "Cliquez sur '%1' pour actualiser %PRODUCTNAME %PRODUCTVERSION.\n\nCliquez sur '%2' pour quitter le programme d'installation."; 
+ 		Text[ spanish ] = "Pulse '%1' para actualizar %PRODUCTNAME %PRODUCTVERSION.\n\nPulse '%2' para finalizar el programa de instalaci�n."; 
+ 		Text[ finnish ] = "Asenna %PRODUCTNAME %PRODUCTVERSION -korjaus napsauttamalla kohdetta %1.\n\nPoistu asennusohjelmasta napsauttamalla kohdetta %2."; 
+-		Text[ italian ] = "Fate clic su '%1' per aggiornare %PRODUCTNAME %PRODUCTVERSION.\n\nFate clic su '%2' per terminare il programma d'istallazione."; 
++		Text[ italian ] = "Fate clic su '%1' per aggiornare %PRODUCTNAME %PRODUCTVERSION.\n\nFate clic su '%2' per terminare il programma d'installazione."; 
+ 		Text[ danish ] = "Hvis du klikker p� '%1' for at opdatere %PRODUCTNAME %PRODUCTVERSION.\n\nKlik p� '%2' for at afslutte installationsprogrammet."; 
+ 		Text[ swedish ] = "Klicka p� '%1' om du vill uppdatera %PRODUCTNAME %PRODUCTVERSION.\n\nKlicka p� '%2' om du vill avsluta installationsprogrammet."; 
+ 		Text[ polish ] = "Kliknij przycisk �%1�, aby zainstalowa� poprawk� do programu %PRODUCTNAME %PRODUCTVERSION.\n\nKliknij przycisk �%2�, aby zako�czy� program instalacyjny."; 
+--- setup2/source/ui/pages/pprofile.src.lang39	2004-09-09 18:51:07.000000000 +0200
++++ setup2/source/ui/pages/pprofile.src	2004-09-13 09:20:14.471835578 +0200
+@@ -124,7 +124,7 @@
+ 		Text[ dutch ] = "Kies hier de installatieprofielen die u later met het responsbestand wilt installeren.";
+ 		Text[ french ] = "Compilez les diff�rents profils d'installation � installer avec le Response File.";
+ 		Text[ spanish ] = "Determine aqu� los diferentes perfiles de instalaci�n que desee instalar posteriormente con el Responsefile.";
+-		Text[ italian ] = "Raccogliete i diversi proifili di configurazione da installare in seguito con il response file.";
++		Text[ italian ] = "Raccogliete i diversi profili di configurazione da installare in seguito con il response file.";
+ 		Text[ danish ] = "Overs�t forskellige installationsprofiler, som du senere �nsker at installere med svarfile.";
+ 		Text[ swedish ] = "H�r sammanst�ller du dina olika installationsprofiler som du vill installera senare med svarsfilen.";
+ 		Text[ polish ] = "Po��cz r�ne profile instalacji, kt�re p�niej zostan� zainstalowane przy u�yciu pliku odpowiedzi.";
+--- setup2/source/ui/pages/preadygo.src.lang39	2004-09-09 18:51:35.000000000 +0200
++++ setup2/source/ui/pages/preadygo.src	2004-09-13 09:20:14.472835598 +0200
+@@ -169,7 +169,7 @@
+ 		Text[ french ] = "Une installation de %PRODUCTNAME %PRODUCTVERSION a �t� d�tect�e sous :";
+ 		Text[ spanish ] = "Se encontr� una instalaci�n de %PRODUCTNAME %PRODUCTVERSION en: ";
+ 		Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION -asennus on l�ydetty kohteesta:";
+-		Text[ italian ] = "� stata trovata un'istallazione di %PRODUCTNAME %PRODUCTVERSION nel seguente percorso:";
++		Text[ italian ] = "� stata trovata un'installazione di %PRODUCTNAME %PRODUCTVERSION nel seguente percorso:";
+ 		Text[ danish ] = "Installationen %PRODUCTNAME %PRODUCTVERSION blev fundet i f�lgende sti:";
+ 		Text[ swedish ] = "En %PRODUCTNAME %PRODUCTVERSION-installation har hittats under:";
+ 		Text[ polish ] = "Program %PRODUCTNAME %PRODUCTVERSION jest zainstalowany w:";
+@@ -319,7 +319,7 @@
+ 		Text[ french ] = "L'espace disponible sur l'unit� cible ne suffit pas pour l'installation de %PRODUCTPATCHNAME. L'installation requiert environ %SPACE_NEEDED Ko de plus.";
+ 		Text[ spanish ] = "La unidad de destino no dispone de espacio suficiente para instalar %PRODUCTPATCHNAME. Se requieren unos %SPACE_NEEDED KB m�s.";
+ 		Text[ finnish ] = "Kohdeasemalla ei ole tarpeeksi tilaa kohteen %PRODUCTPATCHNAME asentamiseen. Lis�tilaa tarvitaan noin %SPACE_NEEDED kt.";
+-		Text[ italian ] = "Il drive di destinazione non lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora  %SPACE_NEEDED KB.";
++		Text[ italian ] = "Il drive di destinazione non ha lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB.";
+ 		Text[ danish ] = "Der er ikke tilstr�kkelig ledig plads p� destinationsdrevet til at installere %PRODUCTPATCHNAME. Der kr�ves ca. %SPACE_NEEDED KB yderligere.";
+ 		Text[ swedish ] = "Det finns inte tillr�ckligt med utrymme p� m�lenheten f�r att %PRODUCTPATCHNAME ska kunna installeras. Det beh�vs ungef�r %SPACE_NEEDED KB ytterligare.";
+ 		Text[ polish ] = "Za ma�o miejsca na dysku docelowym, aby zainstalowa� aktualizacj� %PRODUCTPATCHNAME. Potrzeba jeszcze oko�o %SPACE_NEEDED KB.";
+--- setup2/source/ui/pages/preins.src.lang39	2004-09-09 18:52:16.000000000 +0200
++++ setup2/source/ui/pages/preins.src	2004-09-13 09:20:14.474835638 +0200
+@@ -414,7 +414,7 @@
+ 		Text[ french ] = "Restauration de l'�tat d'origine de votre installation de %1.";
+ 		Text[ spanish ] = "Restablece el estado original de la instalaci�n de %1.";
+ 		Text[ finnish ] = "Asentaa uudelleen kaikki ohjelmamoduulit, jotka asennettiin edellisen %1-asennuksen yhteydess�.";
+-		Text[ italian ] = "Reinstalla tutti i moduli di programma gi� presenti duranti l'installazione di %1.";
++		Text[ italian ] = "Reinstalla tutti i moduli di programma gi� presenti durante l'installazione di %1.";
+ 		Text[ danish ] = "Gendanner %1-installationens oprindelige tilstand.";
+ 		Text[ swedish ] = "�terst�ller din %1-installation till ursprungligt tillst�nd.";
+ 		Text[ polish ] = "Przywraca pierwotny stan instalacji %1.";
+--- setup2/source/ui/pages/prepair.src.lang39	2004-09-09 18:52:29.000000000 +0200
++++ setup2/source/ui/pages/prepair.src	2004-09-13 09:20:14.476835678 +0200
+@@ -237,7 +237,7 @@
+ 		Text[ dutch ] = "%1 vereist dit bestand om correct te kunnen worden uitgevoerd. Met het installatieprogramma kan dit bestand eventueel weer worden hersteld.";
+ 		Text[ french ] = "%1 ne peut pas �tre ex�cut� correctement sans ce fichier. Le programme d'installation peut essayer de le restaurer.";
+ 		Text[ spanish ] = "%1 necesita este archivo para poder ser ejecutado con �xito. El programa de instalaci�n puede intentar restaurar este archivo.";
+-		Text[ italian ] = "%1 richiede questo file per poter essere eseguito corretamente. Il programma d'installazione cercher� di ripristinare questo file.";
++		Text[ italian ] = "%1 richiede questo file per poter essere eseguito correttamente. Il programma d'installazione cercher� di ripristinare questo file.";
+ 		Text[ danish ] = "%1 har brug for denne fil for at kunne udf�res fejlfrit. Installationsprogrammet kan pr�ve p� at genoprette denne fil." ;
+ 		Text[ swedish ] = "Den h�r filen kr�ver %1 f�r att den skall kunna utf�ras utan n�gra fel. Installationsprogrammet kan f�rs�ka att �terskapa filen.";
+ 		Text[ polish ] = "%1 wymaga tego pliku do prawid�owego wykonania. Plik ten mo�na przywr�ci� przy u�yciu program instalacyjnego." ;
+--- setup2/source/ui/pages/pupdate.src.lang39	2004-09-09 18:53:34.000000000 +0200
++++ setup2/source/ui/pages/pupdate.src	2004-09-13 09:20:14.479835738 +0200
+@@ -641,7 +641,7 @@
+ 		Text[ french ] = "L'installation en r�seau existante de %PRODUCTNAME %PREVIOUSPRODUCTVERSION ne peut pas �tre actualis�e depuis une installation monoutilisateur.\nPour actualiser l'installation en r�seau, lancez le programme d'installation avec le param�tre '-net'. Cliquez sur '%CANCEL' pour quitter le programme d'installation ou sur '%OK' pour installer une version monoutilisateur dans un nouveau r�pertoire.";
+ 		Text[ spanish ] = "La instalaci�n de red existente de %PRODUCTNAME %PREVIOUSPRODUCTVERSION no se puede actualizar despu�s de la instalaci�n monousuario.\nPara actualizar la instalaci�n de red inicie el programa de instalaci�n con el par�metro '-net'. Para interrumpir la instalaci�n pulse en 'CANCELAR' y para instalar una versi�n monousuario en un directorio nuevo pulse en 'ACEPTAR'.";
+ 		Text[ finnish ] = "If you want to update a network installation start the setup with the parameter: -net.\nClick '%1', if you want to install a single user version into a new folder.\nTo abort the setup click '%2'.";
+-		Text[ italian ] = "Impossibile aggiornare l'installazione di rete %PRODUCTNAME %PREVIOUSPRODUCTVERSION da un'instalalzione monoutente.\nPer aggiornare un'installazione di rete avviate il programma di installazione con il parametro '-net'. Per interrompere l'installazione fate click su '%CANCEL'. Per installare una versione monoutente in un'altra cartella cliccate '%OK'.";
++		Text[ italian ] = "Impossibile aggiornare l'installazione di rete %PRODUCTNAME %PREVIOUSPRODUCTVERSION da un'installazione monoutente.\nPer aggiornare un'installazione di rete avviate il programma di installazione con il parametro '-net'. Per interrompere l'installazione fate click su '%CANCEL'. Per installare una versione monoutente in un'altra cartella cliccate '%OK'.";
+ 		Text[ danish ] = "Din netv�rksinstallation af %PRODUCTNAME %PREVIOUSPRODUCTVERSION kan ikke opdateres fra en enkeltbruger installation.\nFor at opdatere en netv�rksinstallation skal du starte installationsprogrammet med parameteren '-net'. Klik p� '%CANCEL' for at afbryde installationen eller '%OK' for at foretage en enkeltbruger installation i et andet katalog.";
+ 		Text[ swedish ] = "Det g�r inte att uppdatera din existerande n�tverksinstallation av %PRODUCTNAME %PREVIOUSPRODUCTVERSION fr�n en frist�ende installation.\nOm du vill uppdatera en n�tverksinstallation startar du installationsprogrammet med parametern '-net'. Om du vill avsluta installationsprogrammet klickar du p� '%CANCEL'. Annars klickar du p� '%OK' f�r att installera en frist�ende version i en ny katalog.";
+ 		Text[ polish ] = "If you want to update a network installation start the setup with the parameter: -net.\nClick '%1', if you want to install a single user version into a new folder.\nTo abort the setup click '%2'.";
+--- setup2/source/ui/app.src.lang39	2004-09-09 18:45:11.000000000 +0200
++++ setup2/source/ui/app.src	2004-09-13 09:20:14.484835837 +0200
+@@ -534,7 +534,7 @@
+ 	Text [ portuguese_brazilian ] = "Verificando configura��es locais" ;
+ 	Text [ swedish ] = "Kontrollerar de lokala inst�llningarna" ;
+ 	Text [ danish ] = "Kontrollerer lokale indstillinger" ;
+-	Text [ italian ] = "Verifica delle impostzioni locali" ;
++	Text [ italian ] = "Verifica delle impostazioni locali" ;
+ 	Text [ spanish ] = "Verifica la configuraci�n local" ;
+ 	Text [ french ] = "V�rification des param�tres locaux" ;
+ 	Text [ dutch ] = "Lokale instellingen worden gecontroleerd" ;
+@@ -816,7 +816,7 @@
+ 	Text = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ English ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ norwegian ] = "Setup \nOpphavsrett (c) 1993 - 1996 av Star Division GmbH" ;
+-	Text [ italian ] = "Setup \nCopyrigth (c) 1993 - 1996 by Star Division GmbH" ;
++	Text [ italian ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ portuguese_brazilian ] = "Instala��o \nCopyright (c) 1993 - 1996 - Star Division GmbH" ;
+ 	Text [ portuguese ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ finnish ] = "Asennus \nCopyright (c) 1993 - 1996 Star Division GmbH" ;
+--- setup2/source/ui/error.src.lang39	2004-09-09 18:45:27.000000000 +0200
++++ setup2/source/ui/error.src	2004-09-13 09:20:14.489835937 +0200
+@@ -973,7 +973,7 @@
+ Text = "Die Dateiliste f�r die Upgrade-Installation ist leer.\nEs wurde eine falsche oder fehlerhafte Skriptdatei benutzt.\nDas Programm wird abgebrochen." ;
+ Text [ English ] = "The upgrade filelist is emptyYou use a wrong or defect scriptfile.\nProgram aborted." ;
+ Text [ english_us ] = "The upgrade file list is empty. \nYou may have utilized a wrong or defect script file.\nProgram aborted." ;
+-Text [ italian ] = "L'elenco dei file per l'installazione di aggiormento � vuoto.\nIl file di script utiizzato � errato stato usato un file di script errato.\nIl programma viene interrotto." ;
++Text [ italian ] = "L'elenco dei file per l'installazione di aggiornamento � vuoto.\nPotreste avere usato un file di script errato o difettoso.\nIl programma viene interrotto." ;
+ Text [ spanish ] = "La lista de archivos para la instalaci�n de actualizaci�n est� vac�a.\nSe ha utilizado un archivo script err�neo o defectuoso.\nEl programa se cancelar�." ;
+ Text [ french ] = "La liste des fichiers pour l'installation de la mise � niveau est vide.\nVous vous �tes tromp� de fichier script ou avez utilis� un fichier script d�fectueux.\nInterruption du programme." ;
+ Text [ dutch ] = "De bestandslijst voor de Upgrade-installatie is leeg.\nEr is een verkeerd of foutief scriptbestand gebruikt.\nHet programma wordt geannuleerd." ;
+@@ -1202,7 +1202,7 @@
+ Text = "Das Installationsprogramm kann keine gemeinsam genutzten Dateien aktualisieren, wenn diese gerade verwendet werden.\nSchlie�en Sie bitte alle ge�ffneten Anwendungen, bevor Sie die Installation erneut starten." ;
+ Text [ English ] = "Setup cannot update shared files, when they are open.\nPlease close all applications before you start setup again." ;
+ Text [ english_us ] = "The setup program cannot update shared files when they are in use.\nPlease close all applications before restarting the setup." ;
+-Text [ italian ] = "Il programma di installazione non pu� aggionare i file comuni quando sono in uso.\nPrima di riavviare l'installazione chiudete tutte le applicazioni." ;
++Text [ italian ] = "Il programma di installazione non pu� aggiornare i file comuni quando sono in uso.\nPrima di riavviare l'installazione chiudete tutte le applicazioni." ;
+ Text [ spanish ] = "El programa de instalaci�n no puede actualizar archivos utilizados en com�n cuando estos est�n siendo utilizados.\n Cierre, por favor, todas las aplicaciones activas antes de volver a iniciar la instalaci�n." ;
+ Text [ french ] = "Le programme d'installation ne peut actualiser des fichiers communs alors qu'ils sont ouverts.\nFermez toutes les applications ouvertes avant de red�marrer l'installation." ;
+ Text [ dutch ] = "Het installatieprogramma kan geen gemeenschappelijk gebruikte bestanden bijwerken als deze reeds zijn geopend.\nSluit alle geopende toepassingen voordat u de installatie opnieuw start." ;
+@@ -1480,7 +1480,7 @@
+ Text [ English ] = "Wrong comman line parameter: %1" ;
+ Text [ english_us ] = "Wrong command line parameter: %1" ;
+ Text [ dutch ] = "Foutieve commandoregelparameter: %1" ;
+-Text [ italian ] = "Parametro della riga di comando errrato: %1" ;
++Text [ italian ] = "Parametro della riga di comando errato: %1" ;
+ Text [ spanish ] = "Par�metro de orden no v�lido: %1" ;
+ Text [ french ] = "Param�tre de ligne de commande incorrecte : %1" ;
+ Text [ swedish ] = "Fel kommandoradparameter: %1" ;
+@@ -1711,7 +1711,7 @@
+ Text[ french ] = "Param�tre incomplet dans la ligne de commande : %1";
+ Text[ spanish ] = "Par�metro en la l�nea de comando incompleto: %1";
+ Text[ finnish ] = "Incomplete command line parameter: %1";
+-Text[ italian ] = "Paramentro della riga di comando incompleto: %1";
++Text[ italian ] = "Parametro della riga di comando incompleto: %1";
+ Text[ danish ] = "Ufuldst�ndig kommandolinjeparameter: %1";
+ Text[ swedish ] = "Ofullst�ndig kommandoradsparameter: %1";
+ Text[ polish ] = "Incomplete command line parameter: %1";
+--- sfx2/sdi/sfxslots.src.lang39	2004-09-09 20:29:01.000000000 +0200
++++ sfx2/sdi/sfxslots.src	2004-09-13 09:20:14.311832387 +0200
+@@ -5751,7 +5751,7 @@
+ 	SlotName[ dutch ] = "Opniew";
+ 	SlotName[ french ] = "Restaurer";
+ 	SlotName[ spanish ] = "Restaurar";
+-	SlotName[ italian ] = "Riprtistina";
++	SlotName[ italian ] = "Ripristina";
+ 	SlotName[ danish ] = "Gendan";
+ 	SlotName[ swedish ] = "�terst�ll";
+ 	SlotName[ polish ] = "Pon�w";
+--- sfx2/source/appl/app.src.lang39	2004-09-09 20:29:32.000000000 +0200
++++ sfx2/source/appl/app.src	2004-09-13 09:20:14.318832526 +0200
+@@ -2335,7 +2335,7 @@
+ 	Message = "Die Anwendung kann zur Zeit nicht beendet werden.\nBitte warten Sie das Ende aller Druckauftr�ge und/oder\nOLE-Aktivierungen ab und schlie�en Sie alle Dialoge." ;
+ 	Message [ English ] = "Can't quit the application at this moment.\nPlease wait until all print jobs and/or\nOLE-activations are terminated and close\nall dialogs." ;
+ 	Message [ norwegian ] = "Kan ikke avslutte programmet for �yeblikket.\nVent til alle skriverjobber og/eller \nOLE-handlinger er avsluttet og lukk alle dialogbokser." ;
+-	Message [ italian ] = "Impossibile uscire dall'applicazione in questo momento.\nAttendendete la concluisione della stampa e/o\n tutte le attivazioni OLE, quindi chiudete\ntutti i dialoghi." ;
++	Message [ italian ] = "Impossibile uscire dall'applicazione in questo momento.\nAttendete la conclusione della stampa e/o\n tutte le attivazioni OLE, quindi chiudete\ntutti i dialoghi." ;
+ 	Message [ portuguese_brazilian ] = "N�o foi poss�vel finalizar o aplicativo no momento.\nAguarde at� que todas as \na��es OLE e/ou as tarefas de impress�o sejam conclu�das e feche todas as caixas de di�logo." ;
+ 	Message [ portuguese ] = "De momento � imposs�vel sair desta aplica��o.\nAguarde a impress�o de todos os documentos\n e/ou o fim das activa��es OLE e feche todos os di�logos." ;
+ 	Message [ french ] = "Impossible de quitter l'application maintenant.\nVeuillez attendre la fin des activit�s d'impression et/ou des activations OLE\net fermez tous les dialogues." ;
+--- sfx2/source/bastyp/fltfnc.src.lang39	2004-09-09 20:30:46.000000000 +0200
++++ sfx2/source/bastyp/fltfnc.src	2004-09-13 09:20:14.319832546 +0200
+@@ -209,7 +209,7 @@
+ 	Text[ dutch ] = "De gekozen filter $(FILTER) is niet ge�nstalleerd.\nWilt u dat nu doen?"; \
+ 	Text[ french ] = "Le filtre $(FILTER) que vous avez s�lectionn� n'est pas install�\nSouhaitez-vous l'installer ?"; \
+ 	Text[ spanish ] = "El filtro seleccionado $(FILTER) no ha sido instalado.\n�Desea instalarlo?"; \
+-	Text[ italian ] = "Il filtro selezionato $(FILTER) non � stato instalalto.\nVolete installarlo adesso?"; \
++	Text[ italian ] = "Il filtro selezionato $(FILTER) non � stato installato.\nVolete installarlo adesso?"; \
+ 	Text[ danish ] = "Det valgte filter $(FILTER) er ikke installeret.\nVil du installere det nu?"; \
+ 	Text[ swedish ] = "Det utvalda filtret $(FILTER) �r inte installerat.\nVill du g�ra det nu?"; \
+ 	Text[ polish ] = "Wybrany filtr $(FILTER) nie jest zainstalowany.\nCzy to teraz zrobi� ?"; \
+--- sfx2/source/bastyp/newhdl.src.lang39	2004-09-09 20:30:59.000000000 +0200
++++ sfx2/source/bastyp/newhdl.src	2004-09-13 09:20:14.320832566 +0200
+@@ -117,7 +117,7 @@
+ 	Text [ portuguese_brazilian ] = "Mem�ria principal insuficiente. Feche outros aplicativos ou janelas antes de continuar." ;
+ 	Text [ swedish ] = "Inte tillr�ckligt med arbetsminne. Avsluta andra program eller st�ng n�gra f�nster innan du forts�tter att arbeta." ;
+ 	Text [ danish ] = "Ikke tilstr�kkelig hukommelse. Afslut venligst andre programmer eller luk nogle vinduer, f�r du forts�tter." ;
+-	Text [ italian ] = "La memoria principale � scarsa. Prma di continuare a lavorare chiudere alcune applicazioni o alcune finestre." ;
++	Text [ italian ] = "La memoria principale � scarsa. Prima di continuare a lavorare chiudere alcune applicazioni o alcune finestre." ;
+ 	Text [ spanish ] = "No hay suficiente memoria. Cierre por favor otras aplicaciones o algunas ventanas antes de continuar." ;
+ 	Text [ french ] = "La m�moire centrale se fait rare. Veuillez quitter quelques applications ou fermer quelques fen�tres avant de poursuivre." ;
+ 	Text [ dutch ] = "Onvoldoende schijfruimte. Be�indig andere toepassingen of sluit een aantal vensters voordat u uw werk voortzet." ;
+--- so3/src/svuidlg.src.lang39	2004-09-09 19:00:01.000000000 +0200
++++ so3/src/svuidlg.src	2004-09-13 09:20:14.515836456 +0200
+@@ -2584,7 +2584,7 @@
+ 	Text [ english_us ] = "Insert Plug-in" ;
+ 	Text [ swedish ] = "Infoga plug-in" ;
+ 	Text [ danish ] = "Inds�t PlugIn" ;
+-	Text [ italian ] = "Inserischi PlugIn" ;
++	Text [ italian ] = "Inserisci PlugIn" ;
+ 	Text [ spanish ] = "Insertar Plug-in" ;
+ 	Text [ french ] = "Ins�rer un Plug-in" ;
+ 	Text [ dutch ] = "PlugIn invoegen" ;
+--- starmath/source/commands.src.lang39	2004-09-09 18:39:45.000000000 +0200
++++ starmath/source/commands.src	2004-09-13 09:20:14.613838411 +0200
+@@ -1750,7 +1750,7 @@
+ 						HelpId = HID_SMA_SBLANK;
+ 						Text = "kleiner Zwischenraum";
+ 						Text [ ENGLISH ] = "small space" ;
+-						Text[ italian ] = "Spazio intemedio piccolo";
++						Text[ italian ] = "Spazio intermedio piccolo";
+ 						Text[ portuguese_brazilian ] = "Pequeno Intervalo";
+ 						Text[ portuguese ] = "espa�amento pequeno";
+ 						Text[ danish ] = "Lille frirum";
+--- starmath/source/smres.src.lang39	2004-09-09 18:40:19.000000000 +0200
++++ starmath/source/smres.src	2004-09-13 09:20:14.629838730 +0200
+@@ -17545,7 +17545,7 @@
+ 	Text = "Linke Begrenzung erwartet" ;
+ 	Text [ ENGLISH ] = "Left delimiter expected" ;
+ 	Text [ english_us ] = "Left limit expected" ;
+-	Text [ italian ] = "Atteso limite sinisto" ;
++	Text [ italian ] = "Atteso limite sinistro" ;
+ 	Text [ spanish ] = "Se requiere el l�mite izquierdo" ;
+ 	Text [ french ] = "Limite gauche requise" ;
+ 	Text [ dutch ] = "Linkerbegrenzing verwacht" ;
+--- svtools/source/misc/errtxt.src.lang39	2004-09-09 19:57:20.000000000 +0200
++++ svtools/source/misc/errtxt.src	2004-09-13 09:20:14.638838909 +0200
+@@ -4075,7 +4075,7 @@
+ 		Text [ english_us ] = "The configuration of the icon display could not be deleted." ;
+ 		Text [ swedish ] = "Konfigurationen f�r symbolvisningen kunde inte raderas." ;
+ 		Text [ danish ] = "Det var ikke muligt at slette ikonvisningens konfiguration" ;
+-		Text [ italian ] = "Impossibile cancellare la configurazione della rappresentazione dei simbol" ;
++		Text [ italian ] = "Impossibile cancellare la configurazione della rappresentazione dei simboli." ;
+ 		Text [ spanish ] = "No se pudo borrar la configuraci�n del panel de s�mbolos." ;
+ 		Text [ french ] = "Impossible de supprimer les param�tres d'affichage de l'ic�ne" ;
+ 		Text [ portuguese ] = "Foi imposs�vel eliminar a configura��o do painel de �cones." ;
+--- svx/sdi/enumslot.src.lang39	2001-05-17 17:13:50.000000000 +0200
++++ svx/sdi/enumslot.src	2004-09-13 09:20:14.383833823 +0200
+@@ -208,7 +208,7 @@
+ 	Slotname [ danish ] = "Beziermodus" ;
+ 	HelpText [ danish ] = "V�lg tegnfunktion Bezier" ;
+ 	Slotname [ italian ] = "Modo Bezier" ;
+-	HelpText [ italian ] = "Scegli la funzione di disegno Bezier" ;
++	HelpText [ italian ] = "Scegli la funzione di disegno B�zier" ;
+ 	Slotname [ spanish ] = "ModoB�zier" ;
+ 	HelpText [ spanish ] = "Selecciona la funci�n de Bezier de dibujo" ;
+ 	Slotname [ french ] = "Mode B�zier" ;
+@@ -236,7 +236,7 @@
+ 	Slotname [ danish ] = "Freihandmodus" ;
+ 	HelpText [ danish ] = "Zeichenfunktion Freihandzeichnen ausw�hlen" ;
+ 	Slotname [ italian ] = "A mano libera" ;
+-	HelpText [ italian ] = "Zeichenfunktion Freihandzeichnen ausw�hlen" ;
++	HelpText [ italian ] = "Seleziona il modo di disegno a mano libera" ;
+ 	Slotname [ spanish ] = "Dibujo a mano alzada" ;
+ 	HelpText [ spanish ] = "Selecciona el modo de dibujo a mano alzada" ;
+ 	Slotname [ french ] = "Mode A main lev�e" ;
+@@ -262,7 +262,7 @@
+ 	Slotname [ danish ] = "Lauftext" ;
+ 	HelpText [ danish ] = "Zeichenfunktion Lauftext ausw�hlen" ;
+ 	Slotname [ italian ] = "Testo scorrevole" ;
+-	HelpText [ italian ] = "Zeichenfunktion Lauftext ausw�hlen" ;
++	HelpText [ italian ] = "Seleziona il modo di animazione del testo" ;
+ 	Slotname [ spanish ] = "Texto animado" ;
+ 	HelpText [ spanish ] = "Selecciona la funci�n de texto animado" ;
+ 	Slotname [ french ] = "D�filement de texte" ;
+--- svx/sdi/svxslots.src.lang39	2004-09-09 17:58:42.000000000 +0200
++++ svx/sdi/svxslots.src	2004-09-13 09:20:14.396834082 +0200
+@@ -481,7 +481,7 @@
+ 	SlotName[ dutch ] = "Uitgevuld";
+ 	SlotName[ french ] = "Justifi�";
+ 	SlotName[ spanish ] = "Justificado";
+-	SlotName[ italian ] = "Giustifcato";
++	SlotName[ italian ] = "Giustificato";
+ 	SlotName[ danish ] = "Lige margener";
+ 	SlotName[ swedish ] = "Marginaljustering";
+ 	SlotName[ polish ] = "Do lewej i prawej";
+@@ -13676,7 +13676,7 @@
+ 	SlotName[ french ] = "Champ num�rique";
+ 	SlotName[ spanish ] = "Campo num�rico";
+ 	SlotName[ finnish ] = "Numeerinen kentt�";
+-	SlotName[ italian ] = "Campo  numerico";
++	SlotName[ italian ] = "Campo numerico";
+ 	SlotName[ danish ] = "Numerisk felt";
+ 	SlotName[ swedish ] = "Numeriskt f�lt";
+ 	SlotName[ polish ] = "Pole liczbowe";
+--- svx/source/dialog/contdlg.src.lang39	2004-09-09 18:01:15.000000000 +0200
++++ svx/source/dialog/contdlg.src	2004-09-13 09:20:14.399834142 +0200
+@@ -1141,7 +1141,7 @@
+ 	Text = "Diese Grafik ist mit dem Dokument verkn�pft. M�chten Sie die Verkn�pfung aufheben, um die Grafik zu bearbeiten?" ;
+ 	Text [ English ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ;
+ 	Text [ norwegian ] = "Dette grafikkobjektet er lenket til dokumentet. Vil du oppheve lenken for � redigere grafikkobjektet?" ;
+-	Text [ italian ] = "Questra immagine � collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
++	Text [ italian ] = "Questa immagine � collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
+ 	Text [ portuguese_brazilian ] = "Este objeto gr�fico est� vinculado ao documento. Deseja desvincular este objeto para poder edit�-lo?" ;
+ 	Text [ portuguese ] = "Esta imagem est� ligada ao documento. Deseja remover a liga��o para poder editar a imagem?" ;
+ 	Text [ english_us ] = "This graphic object is linked to the document. Do you want to unlink the graphics in order to edit it?" ;
+--- svx/source/dialog/hyperdlg.src.lang39	2004-09-09 18:03:51.000000000 +0200
++++ svx/source/dialog/hyperdlg.src	2004-09-13 09:20:14.403834222 +0200
+@@ -4890,7 +4890,7 @@
+ 	Text[ french ] = "Cr�ez un lien vers un document existant ou une cible dans le document.";
+ 	Text[ spanish ] = "Crea un hiperenlace a un documento existente o a un destino dentro de un documento. ";
+ 	Text[ finnish ] = "This is where you create a hyperlink to an exisitng document or a target within a document.";
+-	Text[ italian ] = "Crea un hyperllink a un documento oppure a un punto interno di un file.";
++	Text[ italian ] = "Crea un hyperlink a un documento oppure a un punto interno di un file.";
+ 	Text[ danish ] = "Her opretter du et hyperlink til et eksisterende dokument eller et m�l inde i et dokument.";
+ 	Text[ swedish ] = "H�r kan du skapa en hyperl�nk till ett existerande dokument eller ett m�l inom ett dokument.";
+ 	Text[ polish ] = "This is where you create a hyperlink to an exisitng document or a target within a document.";
+--- svx/source/form/fmstring.src.lang39	2004-09-09 18:13:38.000000000 +0200
++++ svx/source/form/fmstring.src	2004-09-13 09:20:14.411834381 +0200
+@@ -160,7 +160,7 @@
+ 	Text [ portuguese_brazilian ] = "A entrada j� existe.\nEscolha outro nome." ; \
+ 	Text [ swedish ] = "Inmatningen finns redan.\nVar v�nlig och v�lj ett annat namn." ; \
+ 	Text [ danish ] = "Elementet findes allerede.\nV�lg venligst et andet navn." ; \
+-	Text [ italian ] = "La voce esiste gi�i.\nScegliete un altro nome." ; \
++	Text [ italian ] = "La voce esiste gi�.\nScegliete un altro nome." ; \
+ 	Text [ spanish ] = "El registro ya existe.\nPor favor elija otro nombre." ; \
+ 	Text [ french ] = "Cette entr�e existe d�j�.\nVeuillez choisir un autre nom." ; \
+ 	Text [ dutch ] = "Item bestaat reeds.\nKies een andere naam." ; \
+@@ -3892,7 +3892,7 @@
+ 	Text = "Ersetzen eines Containerelements" ;
+ 	Text [ English ] = "Movement of #" ;
+ 	Text [ english_us ] = "Replace a container element" ;
+-	TEXT[ italian ] = "Sostituzione di un elemnto di container";
++	TEXT[ italian ] = "Sostituzione di un elemento di container";
+ 	TEXT[ portuguese_brazilian ] = "Substituir um elemento do recipiente";
+ 	TEXT[ portuguese ] = "Substituir um elemento do contentor";
+ 	TEXT[ danish ] = "Erstat et containerelement";
+--- svx/source/items/svxerr.src.lang39	2004-09-09 18:14:48.000000000 +0200
++++ svx/source/items/svxerr.src	2004-09-13 09:20:14.413834421 +0200
+@@ -422,7 +422,7 @@
+ 		TEXT[ french ] = "$(ARG1) n'est pas support� par la v�rification ou n'est actuellement pas actif.\nV�rifiez l'installation et installez le cas �ch�ant le module de langue requis, ou activez-le sous 'Outils - Options - Param�tres linguistiques - Linguistique'."; \
+ 		TEXT[ spanish ] = "$(ARG1) no est� disponible para la revisi�n ortogr�fica o no est� activo en este momento.\n Examine la instalaci�n e instale en caso dado el idioma deseado\no active el m�dulo correspondiente en 'Herramientas - Opciones - Configuraci�n de idiomas - Ling��stica'."; \
+ 		TEXT[ finnish ] = "$(ARG1) ei ole k�ytett�viss� oikeinkirjoituksen tarkistusta varten.\nTarkista asennetut osat ja asenna haluttu kieli.\n"; \
+-		TEXT[ italian ] = "$(ARG1) non � supportato per il controllo oppure non � attivato al momento.\nControllate l'installazione ed installate, se necessario, la lingua desiderata\noppure impostate il modulo linquistico corrispondente in 'Strumenti - Opzioni - Impostazioni lingua - Linguistica'."; \
++		TEXT[ italian ] = "$(ARG1) non � supportato per il controllo oppure non � attivato al momento.\nControllate l'installazione ed installate, se necessario, la lingua desiderata\noppure impostate il modulo linguistico corrispondente in 'Strumenti - Opzioni - Impostazioni lingua - Linguistica'."; \
+ 		TEXT[ danish ] = "$(ARG1) underst�ttes ikke af stavekontrollen eller er ikke aktiveret i �jeblikket.\nKontroller venligst installationen, og installer eventuelt det n�dvendige sprogmodul,\neller aktiver det p�g�ldende sprogmodul under 'Funktioner - Indstillinger - Sprogindstillinger - Skrivehj�lp'."; \
+ 		TEXT[ swedish ] = "$(ARG1) st�ds inte av kontrollen resp., �r inte aktiverat f�r n�rvarande.\nKontrollera installationen och installera eventuellt den n�dv�ndiga spr�kmodulen\nresp. aktivera motsvarande spr�kmodul under \"Verktyg - Alternativ - Spr�kinst�llningar - Lingvistik\"."; \
+ 		TEXT[ polish ] = "$(ARG1) nie jest obs�ugiwany przez funkcj� sprawdzania pisowni albo nie jest teraz aktywny.\nSprawd� instalacj� i ewentualnie zainstaluj wymagany modu� j�zyka\nlub uaktywnij go, wydaj�c sekwencj� polece� 'Narz�dzia - Opcje - Konfiguracja j�zyk�w - Pisownia'."; \
+@@ -1073,7 +1073,7 @@
+ 		TEXT[ dutch ] = "De originele VBA Basic-code in dit document wordt niet opgeslagen.";
+ 		TEXT[ french ] = "Le code VBA basic d'origine contenu dans le document ne sera pas enregistr�.";
+ 		TEXT[ spanish ] = "No se guardar� el Basic Code VBA incluido en el documento.";
+-		TEXT[ italian ] = "Non � possibile salvare il codice VBA Basic contenuto nel documeto.";
++		TEXT[ italian ] = "Non � possibile salvare il codice VBA Basic contenuto nel documento.";
+ 		TEXT[ danish ] = "Den originale VBA Basic kode, som er indeholdt i dokumentet, gemmes ikke.";
+ 		TEXT[ swedish ] = "Original-VBA-Basic-koden som finns i dokumentet sparas inte.";
+ 		TEXT[ polish ] = "Zawarty w dokumencie oryginalny kod VBA nie zostanie zapisany.";
+--- svx/source/items/svxitems.src.lang39	2004-09-09 18:15:07.000000000 +0200
++++ svx/source/items/svxitems.src	2004-09-13 09:20:14.425834661 +0200
+@@ -3553,7 +3553,7 @@
+ 	Text[ dutch ] = "Onderstreept (golf)";
+ 	Text[ french ] = "Soulignage (ondulation)";
+ 	Text[ spanish ] = "Subrayado (ondulado)";
+-	Text[ italian ] = "Sottolienato (linea ondulata)";
++	Text[ italian ] = "Sottolineato (linea ondulata)";
+ 	Text[ danish ] = "Understreget (b�lger)";
+ 	Text[ swedish ] = "Understruken (v�g)";
+ 	Text[ polish ] = "Podkre�lenie (Fala)";
+@@ -13909,7 +13909,7 @@
+ 	Text[ dutch ] = "teken $(ARG1)� gedraaid";
+ 	Text[ french ] = "Rotation des caract�res : $(ARG1)�";
+ 	Text[ spanish ] = "Car�cter rodado en $(ARG1)�";
+-	Text[ italian ] = "Carattere rotato di $(ARG1)�";
++	Text[ italian ] = "Carattere ruotato di $(ARG1)�";
+ 	Text[ danish ] = "Tegn roteret med $(ARG1)�";
+ 	Text[ swedish ] = "Tecken roterat med $(ARG1)�";
+ 	Text[ polish ] = "Znaki obr�cone o $(ARG1)�";
+--- svx/source/options/optinet2.src.lang39	2004-09-09 18:17:29.000000000 +0200
++++ svx/source/options/optinet2.src	2004-09-13 09:20:14.430834760 +0200
+@@ -2035,7 +2035,7 @@
+ 		Text = "~�ndern" ;
+ 		Text [ English ] = "Chan~ge" ;
+ 		Text [ english_us ] = "~Modify" ;
+-		Text [ italian ] = "Modfica" ;
++		Text [ italian ] = "Modifica" ;
+ 		Text [ spanish ] = "Modificar" ;
+ 		Text [ french ] = "Modifier" ;
+ 		Text [ dutch ] = "Wij~zigen" ;
+--- svx/source/svdraw/svdstr.src.lang39	2004-09-09 18:19:40.000000000 +0200
++++ svx/source/svdraw/svdstr.src	2004-09-13 09:20:14.454835239 +0200
+@@ -2468,7 +2468,7 @@
+ 	Text = "B�zierkurve" ;
+ 	Text [ ENGLISH ] = "b�zier" ;
+ 	Text [ norwegian ] = "B�zierkurve" ;
+-	Text [ italian ] = "Curva di Bezier" ;
++	Text [ italian ] = "Curva di B�zier" ;
+ 	Text [ portuguese_brazilian ] = "Curva de B�zier" ;
+ 	Text [ portuguese ] = "Curvas B�zier" ;
+ 	Text [ finnish ] = "B�zier-k�yr�" ;
+@@ -2515,7 +2515,7 @@
+ 	Text = "B�zierkurven" ;
+ 	Text [ ENGLISH ] = "b�ziers" ;
+ 	Text [ norwegian ] = "B�zierkurver" ;
+-	Text [ italian ] = "Curve di Bezier" ;
++	Text [ italian ] = "Curve di B�zier" ;
+ 	Text [ portuguese_brazilian ] = "Curvas de B�zier" ;
+ 	Text [ portuguese ] = "Curvas B�zier" ;
+ 	Text [ finnish ] = "B�zier-k�yr�t" ;
+@@ -2562,7 +2562,7 @@
+ 	Text = "B�zierkurve" ;
+ 	Text [ ENGLISH ] = "b�zier" ;
+ 	Text [ norwegian ] = "B�zierkurve" ;
+-	Text [ italian ] = "Curva di Bezier" ;
++	Text [ italian ] = "Curva di B�zier" ;
+ 	Text [ portuguese_brazilian ] = "Curva de B�zier" ;
+ 	Text [ portuguese ] = "Curvas B�zier" ;
+ 	Text [ finnish ] = "B�zier-k�yr�" ;
+@@ -2609,7 +2609,7 @@
+ 	Text = "B�zierkurven" ;
+ 	Text [ ENGLISH ] = "b�ziers" ;
+ 	Text [ norwegian ] = "B�zierkurver" ;
+-	Text [ italian ] = "Curve di Bezier" ;
++	Text [ italian ] = "Curve di B�zier" ;
+ 	Text [ portuguese_brazilian ] = "Curvas de B�zier" ;
+ 	Text [ portuguese ] = "Curvas B�zier" ;
+ 	Text [ finnish ] = "B�zier-k�yr�t" ;
+@@ -10874,7 +10874,7 @@
+ 	Text [ portuguese_brazilian ] = "%N pontos de %O" ;
+ 	Text [ swedish ] = "%N punkter f�r %O" ;
+ 	Text [ danish ] = "%N punkt fra %O" ;
+-	Text [ italian ] = "%N punkti di %O" ;
++	Text [ italian ] = "%N punti di %O" ;
+ 	Text [ spanish ] = "%N Puntos de %O" ;
+ 	Text [ french ] = "%N points de %O" ;
+ 	Text [ dutch ] = "%N punten van %O" ;
+@@ -15720,7 +15720,7 @@
+ 	Text [ portuguese_brazilian ] = "Espa�amento da borda direita" ;
+ 	Text [ swedish ] = "H�ger ramavst�nd" ;
+ 	Text [ danish ] = "H�jre kantafstand" ;
+-	Text [ italian ] = "Distanta destra cornice" ;
++	Text [ italian ] = "Distanza destra cornice" ;
+ 	Text [ spanish ] = "Borde derecho del marco" ;
+ 	Text [ french ] = "Bord droit du cadre" ;
+ 	Text [ dutch ] = "Rechterkaderafstand" ;
+@@ -23894,7 +23894,7 @@
+ 	Text[ dutch ] = "Aantal verplaatsbare lijnen";
+ 	Text[ french ] = "Nombre de lignes d�pla�ables";
+ 	Text[ spanish ] = "N�m. l�neas desplazables";
+-	Text[ italian ] = "Numro linee mobili";
++	Text[ italian ] = "Numero linee mobili";
+ 	Text[ danish ] = "Antal flytbare linjer";
+ 	Text[ swedish ] = "Antal f�rflyttningsbara linjer";
+ 	Text[ polish ] = "Liczba linii przesuwalnych";
+@@ -25094,7 +25094,7 @@
+ 	Text[ dutch ] = "Maateenheid";
+ 	Text[ french ] = "Unit� de mesure";
+ 	Text[ spanish ] = "Unidad de medida";
+-	Text[ italian ] = "Unit� di musura";
++	Text[ italian ] = "Unit� di misura";
+ 	Text[ danish ] = "M�leenhed";
+ 	Text[ swedish ] = "M�ttenhet";
+ 	Text[ polish ] = "Jednostka miary";
+@@ -26532,7 +26532,7 @@
+ 	Text[ dutch ] = "Hoogte, totaal";
+ 	Text[ french ] = "Hauteur totale";
+ 	Text[ spanish ] = "Alto, todo";
+-	Text[ italian ] = "Alttezza completa";
++	Text[ italian ] = "Altezza completa";
+ 	Text[ danish ] = "H�jde, samlet";
+ 	Text[ swedish ] = "H�jd totalt";
+ 	Text[ polish ] = "Wysoko�� ��cznie";
+@@ -27300,7 +27300,7 @@
+ 	Text[ dutch ] = "Herschalen X, compleet";
+ 	Text[ french ] = "Redimensionner X pour tout";
+ 	Text[ spanish ] = "Redimensi�n X, todo";
+-	Text[ italian ] = "Risimensiona X completamente";
++	Text[ italian ] = "Ridimensiona X completamente";
+ 	Text[ danish ] = "Redimensioner X, samlet";
+ 	Text[ swedish ] = "�terst�ll X totalt";
+ 	Text[ polish ] = "Zmie� rozmiar X ��cznie";
+--- sw/sdi/swslots.src.lang39	2004-09-13 09:19:18.385716702 +0200
++++ sw/sdi/swslots.src	2004-09-13 09:20:14.602838191 +0200
+@@ -308,7 +308,7 @@
+ 	SlotName[ french ] = "AutoFormat pour la saisie";
+ 	SlotName[ spanish ] = "Formateado autom�tico mientras se escribe";
+ 	SlotName[ finnish ] = "Automaattinen muotoilu kirjoitettaessa";
+-	SlotName[ italian ] = "Foramttazione automatica durante la digitazione";
++	SlotName[ italian ] = "Formattazione automatica durante la digitazione";
+ 	SlotName[ danish ] = "Anvend AutoFormat mens der indtastes";
+ 	SlotName[ swedish ] = "AutoFormat vid inmatning";
+ 	SlotName[ polish ] = "Autoformatowanie podczas pisania";
+@@ -962,7 +962,7 @@
+ 	SlotName[ dutch ] = "Tot aan begin regel wissen";
+ 	SlotName[ french ] = "Supprimer jusqu'au d�but de la ligne";
+ 	SlotName[ spanish ] = "Borrar hasta el comienzo de la l�nea";
+-	SlotName[ italian ] = "Cancella fino all'inzio della riga";
++	SlotName[ italian ] = "Cancella fino all'inizio della riga";
+ 	SlotName[ danish ] = "Slet til begyndelsen af linjen";
+ 	SlotName[ swedish ] = "Radera till b�rjan av rad";
+ 	SlotName[ polish ] = "Usu� do pocz�tku wiersza";
+@@ -5282,7 +5282,7 @@
+ 	SlotName[ dutch ] = "Indexwijzer naar index";
+ 	SlotName[ french ] = "Marque d'index � l'index";
+ 	SlotName[ spanish ] = "Marca de �ndice al �ndice";
+-	SlotName[ italian ] = "Contrassegnno per l'indice";
++	SlotName[ italian ] = "Contrassegno per l'indice";
+ 	SlotName[ danish ] = "Indeksmarkering til indeks";
+ 	SlotName[ swedish ] = "Indexm�rke till index";
+ 	SlotName[ polish ] = "Znacznik indeksu do indeksu";
+--- sw/source/ui/app/mn.src.lang39	2004-09-09 19:25:14.000000000 +0200
++++ sw/source/ui/app/mn.src	2004-09-13 09:20:14.604838231 +0200
+@@ -192,7 +192,7 @@
+ 			Text = "Tabellenbegrenz~ung" ;
+ 			Text [ English ] = "Grid lines" ;
+ 			Text [ norwegian ] = "Tabellgrenser" ;
+-			Text [ italian ] = "Limte tabella" ;
++			Text [ italian ] = "Limiti tabella" ;
+ 			Text [ portuguese_brazilian ] = "Limites da Tabela" ;
+ 			Text [ portuguese ] = "~Limites da tabela" ;
+ 			Text [ finnish ] = "Taulukon rajat" ;
+@@ -669,7 +669,7 @@
+ 	Text = "Zeichenobjekt Text" ;
+ 	Text [ English ] = "Draw object text" ;
+ 	Text [ english_us ] = "Draw Object text" ;
+-	Text [ italian ] = "Oggetto di diesegno testo" ;
++	Text [ italian ] = "Oggetto di disegno testo" ;
+ 	Text [ spanish ] = "Texto del objeto de dibujo" ;
+ 	Text [ french ] = "Texte objet de dessin" ;
+ 	Text [ dutch ] = "Tekenobject tekst" ;
+--- sw/source/ui/uiview/view.src.lang39	2004-09-09 19:43:46.000000000 +0200
++++ sw/source/ui/uiview/view.src	2004-09-13 09:20:14.607838291 +0200
+@@ -278,7 +278,7 @@
+ 	MESSAGE = "Dieses Wort sollten Sie vermeiden! Thesaurus starten?" ;
+ 	MESSAGE [ English ] = "Please avoid this word! Start thesaurus?" ;
+ 	MESSAGE [ norwegian ] = "Dette ordet st�r p� lista over ord du vil unng�. Vil du starte synonymordlista?" ;
+-	MESSAGE [ italian ] = "Tale temine andrebbe evitato. Avviare il dizionario dei sinonimi?" ;
++	MESSAGE [ italian ] = "Tale termine andrebbe evitato. Avviare il dizionario dei sinonimi?" ;
+ 	MESSAGE [ portuguese_brazilian ] = "Esta palavra aparece na lista de palavras que voc� deseja evitar! Iniciar Dicion�rio de Correlatos?" ;
+ 	MESSAGE [ portuguese ] = "Evite esta palavra! Iniciar o dicion�rio de sin�nimos?" ;
+ 	MESSAGE [ finnish ] = "T�m� sana esiintyy v�ltett�vien sanojen luettelossa. Avataanko synonyymisanasto?" ;
+--- sw/source/ui/utlui/attrdesc.src.lang39	2004-09-09 19:43:59.000000000 +0200
++++ sw/source/ui/utlui/attrdesc.src	2004-09-13 09:20:14.610838351 +0200
+@@ -2332,7 +2332,7 @@
+ 	TEXT = "Trennlinienbreite:" ;
+ 	TEXT [ English ] = "limiter width:" ;
+ 	Text [ english_us ] = "Separator Width:" ;
+-	Text [ italian ] = "Spessore linea di sepazione" ;
++	Text [ italian ] = "Spessore linea di separazione" ;
+ 	Text [ spanish ] = "Ancho de la l�nea de separaci�n:" ;
+ 	Text [ french ] = "Largeur du trait de s�paration :" ;
+ 	Text [ dutch ] = "breedte scheidingslijn:" ;
+--- uui/source/cookiedg.src.lang39	2004-09-09 18:55:34.000000000 +0200
++++ uui/source/cookiedg.src	2004-09-13 09:20:14.632838790 +0200
+@@ -528,7 +528,7 @@
+ 	Text [ portuguese_brazilian ] = "O %PRODUCTNAME salvou no servidor '${HOST}' cookies que ser�o enviados quando voc� solicitar o documento ${PATH}.\nOs cookies cont�m informa��es referentes a certas classes de URLs. Eles s�o enviados por alguns servidores para o %PRODUCTNAME, onde ser�o salvos quando determinados documentos forem acessados. Se o %PRODUCTNAME carregar um documento que, de acordo com o URL, corresponda � classe de um dos Cookies anteriormente recebidos, o %PRODUCTNAME enviar� essas informa��es ao servidor. Isso permitir� que o servidor controle o status de um aplicativo WWW, por exemplo, quando fizer compras on-line.\n\nOs seguintes Cookies devem ser utilizados:\n\n" ; \
+ 	Text [ swedish ] = "%PRODUCTNAME har sparat cookies f�r servern '${HOST}, som skall skickas d� dokumentet ${PATH} laddas.\nCookies �r information som refererar till vissa URL-klasser. De skickas av vissa servrar till %PRODUCTNAME och sparas d�r n�r vissa dokument �ppnas. Denna information skickas av %PRODUCTNAME till servern om %PRODUCTNAME vid ett senare tillf�lle laddar ett dokument, som enligt URL:en motsvarar en klass fr�n en cookie som har mottagits tidigare. P� s� s�tt kan servern k�nna igen tillst�ndet f�r en WWW-till�mpning (t.ex. varor i en varukorg n�r Du handlar online).\n\nF�ljande cookies skall tilldelas:\n\n" ; \
+ 	Text [ danish ] = "%PRODUCTNAME har gemt cookies for serveren '${HOST}', som skal sendes, n�r dokmentet ${PATH} l�ses.\nCookies er informationer, som relaterer til bestemte URL-klasser. De bliver sendt til %PRODUCTNAME af nogle servere og gemt der, n�r bestemte dokumenter l�ses. L�ser %PRODUCTNAME senere et dokument, hvis URLs klasse svarer til en f�r modtaget cookie, sender %PRODUCTNAME denne information til serveren. S�ledes kan serveren kontrollere et WWW-programs tilstand (f.eks. varer i din indk�bskurv, n�r du handler online).\n\nF�lgende cookies skal s�ttes:\n\n" ; \
+-	Text [ italian ] = "%PRODUCTNAME ha salvato per il server '${HOST}' dei cookies da inviare al momento della richiesta del documento ${PATH}.\nI cookies sono informazioni che si riferiscono a determinate classi di URL. Vengono inviati da alcuni server quando si richiamano determinati documenti a %PRODUCTNAME e qui salvati. Se %PRODUCTNAME in seguito richiede un documento che corrisponde all'URL di una classe di un cookie precedentemente ricevuto, tale informazione viene inviata da %PRODUCTNAME al server. In tal modo i server possono memorizzare lo stato di un'applicazione WWW (ad esempio gli articoli introdotti nel \"carrello\" di un supermercato elettronico).\n\n� necessarion impostare i seguenti cookies:\n\n" ; \
++	Text [ italian ] = "%PRODUCTNAME ha salvato per il server '${HOST}' dei cookies da inviare al momento della richiesta del documento ${PATH}.\nI cookies sono informazioni che si riferiscono a determinate classi di URL. Vengono inviati da alcuni server quando si richiamano determinati documenti a %PRODUCTNAME e qui salvati. Se %PRODUCTNAME in seguito richiede un documento che corrisponde all'URL di una classe di un cookie precedentemente ricevuto, tale informazione viene inviata da %PRODUCTNAME al server. In tal modo i server possono memorizzare lo stato di un'applicazione WWW (ad esempio gli articoli introdotti nel \"carrello\" di un supermercato elettronico).\n\n� necessario impostare i seguenti cookies:\n\n" ; \
+ 	Text [ spanish ] = "%PRODUCTNAME ha guardado cookies para el servidor '${HOST}' que ser�n enviadas cuando se solicite el documento ${PATH}.\nLas cookies son informaciones referentes a determinadas clases de URLs. Cuando se solicita un documento, algunos servidores las env�an a %PRODUCTNAME y las guardan all�. Si %PRODUCTNAME solicita m�s tarde un documento que de acuerdo con su URL corresponda a una clase de una cookie recibida anteriormente, %PRODUCTNAME enviar� esta informaci�n al servidor. As�, los servidores pueden recordar el estado de una aplicaci�n www, como por ejemplo los art�culos en la cesta de un sistema de compras.\n\nEstas son las cookies a instalar:\n\n" ; \
+ 	Text [ french ] = "%PRODUCTNAME a enregistr� des Cookies pour le serveur '${HOST}', qui seront envoy�s au moment de la requ�te du document ${PATH}.\nLes Cookies sont des informations se rapportant � certaines classes d'URL. Plus tard, si %PRODUCTNAME requiert un document dont l'URL correspond � la classe d'un Cookie d�j� re�u, cette information est envoy�e au serveur. Ceci permet aux serveurs de reconna�tre l'�tat d'une application WWW (par ex. les articles plac�s dans le panier d'un syst�me d'achat).\n\nLes Cookies suivants vont �tre plac�s : \n\n" ; \
+ 	Text [ dutch ] = "%PRODUCTNAME heeft voor server '${HOST}' cookies opgeslagen die bij het opvragen van het document ${PATH} moeten worden verzonden.\nCookies zijn gegevens die betrekking hebben op bepaalde klassen URL's. Ze worden door veel servers bij het oproepen van bepaalde documenten naar %PRODUCTNAME verzonden en daar opgeslagen. Vraagt %PRODUCTNAME later een document op met een URL-klasse die overeenkomt met een klasse van een eerder ontvangen cookie, dan wordt deze informatie door %PRODUCTNAME naar de server verzonden. Zo kunnen servers de status van een WWW-toepassing onthouden (zoals de artikelen die in een winkel in een boodschappenmand zijn geplaatst).\n\nDe volgende cookies moeten worden toegepast:\n\n" ; \
+--- wizards/source/euro/euro.src.lang39	2004-09-09 20:17:23.000000000 +0200
++++ wizards/source/euro/euro.src	2004-09-13 09:20:14.493836017 +0200
+@@ -1326,7 +1326,7 @@
+ 	Text[ french ] = "Conversion �galement pour les champs et les tableaux des textes.";
+ 	Text[ spanish ] = "Convertir tambi�n campos y tablas en documentos de texto.";
+ 	Text[ finnish ] = "Muunna my�s tekstiasiakirjojen kent�t ja taulukot";
+-	Text[ italian ] = "Converti anche comadi di campo e tabelle nel documento di testo";
++	Text[ italian ] = "Converti anche comandi di campo e tabelle nel documento di testo";
+ 	Text[ danish ] = "Omregn ogs� felter og tabeller i tekstdokumenter";
+ 	Text[ swedish ] = "Konvertera �ven f�ltkommandon och tabeller i textdokument";
+ 	Text[ polish ] = "Konwertuj r�wnie� pola i tabele w dokumentach tekstowych";
+@@ -1558,7 +1558,7 @@
+ 	Text[ dutch ] = "Beveiliging van werkbladen wordt hersteld...";
+ 	Text[ french ] = "Restauration des protections des feuilles...";
+ 	Text[ spanish ] = "Se volver� a crear cada protecci�n de tabla...";
+-	Text[ italian ] = "Protezione tabella in corso di ripristinamento...";
++	Text[ italian ] = "Protezione tabella in corso di ripristino...";
+ 	Text[ danish ] = "Hver enkelt tabelbeskyttelse oprettes igen...";
+ 	Text[ swedish ] = "Varje enskilt tabellskydd �terst�lls igen...";
+ 	Text[ polish ] = "Zostanie przywr�cona ochrona poszczeg�lnych arkuszy...";
+--- wizards/source/formwizard/dbwizres.src.lang39	2004-09-09 20:17:43.000000000 +0200
++++ wizards/source/formwizard/dbwizres.src	2004-09-13 09:20:14.505836256 +0200
+@@ -401,7 +401,7 @@
+ 	Text[ dutch ] = "Er is geen database ge�nstalleerd. U heeft minstens ��n database nodig om de AutoPiloot voor formulieren te kunnen starten.";
+ 	Text[ french ] = "Aucune base de donn�es n'est install�e. Vous avez besoin d'au moins une base de donn�es afin de pouvoir lancer l'AutoPilote de formulaire.";
+ 	Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el Piloto autom�tico para formularios.";
+-	Text[ italian ] = "Non � stato installato nessun datase. Occorre almeno un database per poter avviare il Pilota automatico per i formulari.";
++	Text[ italian ] = "Non � stato installato nessun database. Occorre almeno un database per poter avviare il Pilota automatico per i formulari.";
+ 	Text[ danish ] = "Der er ikke installeret nogen database. Mindst �n database er n�dvendig for at kunne starte AutoPilot til formularer.";
+ 	Text[ swedish ] = "Ingen databas �r installerad. Du beh�ver minst en databas f�r att kunna starta AutoPiloten f�r formul�r.";
+ 	Text[ polish ] = "Nie zainstalowano �adnej bazy danych. Do uruchomienia AutoPilota formularzy jest wymagana co najmniej jedna baza danych.";
+--- wizards/source/importwizard/importwi.src.lang39	2004-09-09 20:18:01.000000000 +0200
++++ wizards/source/importwizard/importwi.src	2004-09-13 09:20:14.512836396 +0200
+@@ -3164,7 +3164,7 @@
+ 	Text[English] = "These will be exported in the following directory:";
+ 	Text[ English_us ] = "These will be exported to the following directory:";
+ 	Text[ french ] = "Ils seront export�s vers le r�pertoire suivant :";
+-	Text[ italian ] = "L'esportazione avver� nella seguente cartella:";
++	Text[ italian ] = "L'esportazione avverr� nella seguente cartella:";
+ 	Text[ spanish ] = "Se exportar�n al siguiente directorio:";
+ 	Text[ portuguese ] = "Estes ser�o exportados para o seguinte direct�rio:";
+ 	Text[ dutch ] = "Ze worden ge�xporteerd naar de volgende directory:";
+--- dbaccess/source/ui/dlg/indexdialog.src.orig	2004-09-24 11:54:26.719067593 +0200
++++ dbaccess/source/ui/dlg/indexdialog.src	2004-09-24 11:54:39.276313464 +0200
+@@ -326,7 +326,7 @@
+ 				Text[ dutch ] = "Huidig register opslaan";
+ 				Text[ french ] = "Enregistrer l'index actif";
+ 				Text[ spanish ] = "Guardar el �ndice actual";
+-				Text[ italian ] = "Salva l'indica attuale";
++				Text[ italian ] = "Salva l'indice attuale";
+ 				Text[ danish ] = "Gem aktuelt indeks";
+ 				Text[ swedish ] = "Spara aktuellt index";
+ 				Text[ polish ] = "Zapisz bie��cy indeks";
+--- extensions/source/installation/office/protchk/protdlg.src.orig	2004-09-24 12:06:44.595514043 +0200
++++ extensions/source/installation/office/protchk/protdlg.src	2004-09-24 12:07:23.832283586 +0200
+@@ -578,7 +578,7 @@
+ 		Text[ dutch ] = "Protocol voor gegevensoverdracht (FTP)";
+ 		Text[ french ] = "Protocole de transfert de fichier (FTP)";
+ 		Text[ spanish ] = "Protocolo para transferencia de archivo (FTP)";
+-		Text[ italian ] = "Protocollo per tranfer di file (FTP)";
++		Text[ italian ] = "Protocollo per la trasmissione di file (FTP)";
+ 		Text[ danish ] = "Protokol for filoverf�rsel (FTP)";
+ 		Text[ swedish ] = "Protokoll f�r fil�verf�ring (FTP)";
+ 		Text[ polish ] = "Protok� przesy�ania plik�w (FTP)";
+--- extensions/source/propctrlr/formres.src.orig	2004-09-24 12:09:26.592696374 +0200
++++ extensions/source/propctrlr/formres.src	2004-09-24 12:09:59.115335532 +0200
+@@ -2059,7 +2059,7 @@
+ 	Text [ portuguese ] = "Espa�o vazio � NULL" ;
+ 	Text [ english_us ] = "Empty string is NULL" ;
+ 	Text [ swedish ] = "Tom teckenstr�ng �r NULL" ;
+-	Text [ italian ] = "Lo string vuoto � ZERO" ;
++	Text [ italian ] = "Lo stringa vuota � NULL" ;
+ 	Text [ spanish ] = "Serie de caracteres vac�a es NULL" ;
+ 	Text [ french ] = "Espace vide �gale NULL" ;
+ 	Text [ dutch ] = "Opvullen met NUL" ;
+--- offmgr/source/offapp/dialog/treeopt.src.orig	2004-09-24 12:17:10.746815992 +0200
++++ offmgr/source/offapp/dialog/treeopt.src	2004-09-24 12:17:23.009056856 +0200
+@@ -418,7 +418,7 @@
+ 			< "Qui � possibile effettuare le impostazioni per i documenti di presentazione che vengono salvati la prima volta. Tra l'altro � possibile determinare i contenuti da visualizzare sulle pagine, l'unit� di misura standard da adottare, l'allineamento alla griglia e i contenuti da stampare." ; SID_SD_EDITOPTIONS; > ;
+ 			< "Qui � possibile effettuare diverse impostazioni per i disegni. Tra l'altro potete stabilire i contenuti da visualizzare sulle pagine, la scala standard da adottare, se e come allineare alla griglia e i contenuti da stampare." ; SID_SD_GRAPHIC_OPTIONS; > ;
+ 			< "Qui � possibile selezionare il formato e le opzioni di stampa per tutte le formule salvate di recente. Queste opzioni risulteranno utili nel momento in cui volete stampare una formula direttamente da %PRODUCTNAME Math." ; SID_SM_EDITOPTIONS; > ;
+-			< "Qui � possibile eseguire le installazioni fondamentali per %PRODUCTNAME Chart. Stabilite ie colori base per i nuovi diagrammi." ; SID_SCH_EDITOPTIONS; > ;
++			< "Qui � possibile eseguire le installazioni fondamentali per %PRODUCTNAME Chart. Stabilite i colori base per i nuovi diagrammi." ; SID_SCH_EDITOPTIONS; > ;
+ 			< "Qui � possibile eseguire le impostazioni per l'accesso a sorgenti dati esterne"; SID_SB_STARBASEOPTIONS; > ;
+ 			< "Qui � possibile eseguire le installazioni fondamentali per caricare e salvare i documenti da formati esterni. Potete modificare le macro e  gli oggetti OLE dei documenti MS Office oppure fare delle impostazioni per i documenti HTML." ; SID_FILTER_DLG; > ;
+ 		};
+--- padmin/source/padialog.src.typoita2	2004-09-24 12:42:29.686676409 +0200
++++ padmin/source/padialog.src	2004-09-24 12:43:41.694095186 +0200
+@@ -3938,7 +3938,7 @@
+ 	Text[ dutch ] = "Printer \"%s\" kan niet worden ge�mporteerd omdat deze geen geldige configuratie heeft."; \
+ 	Text[ french ] = "L'imprimante \"%s\" n'a pas �t� correctement configur�e et ne peut donc pas �tre import�e."; \
+ 	Text[ spanish ] = "La impresora \"%s\" no est� correctamente configurada, por lo que no se puede importar."; \
+-	Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non pu� essere importata."; \
++	Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non pu� essere importata."; \
+ 	Text[ danish ] = "Printeren \"%s\" har ingen gyldig konfiguration og kan derfor ikke importeres."; \
+ 	Text[ swedish ] = "Det g�r inte att importera skrivaren \"%s\" eftersom den inte �r fullst�ndigt konfigurerad."; \
+ 	Text[ polish ] = "Drukarki \"%s\" nie mo�na importowa�, poniewa� nie zosta�a prawid�owo skonfigurowana."; \
+--- readlicense_oo/docs/readme/readme.xrm.orig	2004-09-24 12:56:29.976222584 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-24 12:56:41.798455224 +0200
+@@ -2916,7 +2916,7 @@
+ 			<Text id="dew32f" xml:lang="fr">Si l&apos;activation du démarrage rapide d&apos;OpenOffice.org devait causer des problèmes (lien non valide) au moment du démarrage du système, il est probable que l&apos;unité réseau (sur laquelle l&apos;installation en réseau correspondante est installée) n&apos;est pas (ou pas encore) disponible.</Text>
+ 			<Text id="dew32f" xml:lang="es">Si durante el inicio del sistema se produjeran problemas al activar el inicio rápido de OpenOffice.org, p.ej. un vínculo no válido, esto puede ser debido a que la unidad de red en la que se instaló la instalación de red correspondiente aún no esté disponible o simplemente no esté disponible.</Text>
+ 			<Text id="dew32f" xml:lang="fi">Jos järjestelmää käynnistettäessä ilmenee ongelmia OpenOffice.orgn Pikakäynnistyksen avaamisessa (esim. virheellinen linkki), tämä johtuu mahdollisesti siitä, että verkkoasema, jolle verkkoasennus on tehty, ei ole vielä tai ollenkaan käytettävissä.</Text>
+-			<Text id="dew32f" xml:lang="it">Se durante l&apos;avvio del sistema dovessero verificarsi dei problemi nell&apos;aprire il QuickStart di OpenOffice.org (collegamento non valido) è dovuto al fatto che il driver di rete su cui è stata efffettuata l&apos;installazione non è oppure non è ancora a disposizione.</Text>
++			<Text id="dew32f" xml:lang="it">Se durante l&apos;avvio del sistema dovessero verificarsi dei problemi nell&apos;aprire il QuickStart di OpenOffice.org (collegamento non valido) è dovuto al fatto che il driver di rete su cui è stata effettuata l&apos;installazione non è oppure non è ancora a disposizione.</Text>
+ 			<Text id="dew32f" xml:lang="cs">Pokud se při startu systému objeví problémy s OpenOffice.org Quickstarterem (např. neplatný odkaz), může to být způsobeno, že v okamžiku spuštění síťové instalace není k dispozici síťový disk, na kterém se nachází síťová instalace.</Text>
+ 			<Text id="dew32f" xml:lang="sk">Pokiaľ sa pri štarte systému objavia problémy s OpenOffice.org Quickstar (napr. neplatný odkaz), môže to byť spôsobené tým, že v momente spustenia sieťovej inštalácie nie je k dispozícii sieťový disk, na ktorom sa nachádza sieťová inštalácia.</Text>
+ 			<Text id="dew32f" xml:lang="da">Hvis der under opstart af systemet opstår problemer med åbning af OpenOffice.org Hurtig start (f.eks. ugyldig genvej), skyldes dette sandsynligvis, at det netværksdrev, hvor den tilhørende netværksinstallation er installeret, ikke er tilgængelig.</Text>
+--- readlicense_oo/docs/readme/readme.xrm.orig1	2004-09-24 13:04:31.374692638 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-24 12:56:41.000000000 +0200
+@@ -2958,7 +2958,7 @@
+ 			<Text id="df3df" xml:lang="fr">La plupart du temps, ce type de cas se présente lorsque la connexion des unités réseau a lieu via un script de Login et que cette connexion a lieu en même temps que l&apos;exécution des programmes du groupe Autostart, depuis lequel le démarrage rapide est également activé.</Text>
+ 			<Text id="df3df" xml:lang="es">En la mayoría de los casos esto se produce cuando el registro de la unidad de red se realiza mediante un Script de Login y la conexión de la unidad de red tiene lugar de manera paralela a la ejecución de los programas del grupo Inicio, desde el que también se inicia el inicio rápido.</Text>
+ 			<Text id="df3df" xml:lang="fi">Monesti näin tapahtuu, kun verkkoasemiin kirjaudutaan sisään kirjautumisskriptillä, ja yhteys verkkoasemiin otetaan samaan aikaan sellaisten ohjelmien suorittamisen kanssa, jotka ovat automaattikäynnistysryhmässä, josta myös Pikakäynnistys aloitetaan.</Text>
+-			<Text id="df3df" xml:lang="it">Nella maggior parte dei casi questo accade quando si effettua la registrazione del driver di rete tramite uno script di login e quindi il collegamento del driver di rete si realizza contemporanemente all&apos;esecuzione del programma del gruppo di esecuzione automatica, da cui viene attivato QuickStart.</Text>
++			<Text id="df3df" xml:lang="it">Nella maggior parte dei casi questo accade quando si effettua la registrazione del driver di rete tramite uno script di login e quindi il collegamento del driver di rete si realizza contemporaneamente all&apos;esecuzione del programma del gruppo di esecuzione automatica, da cui viene attivato QuickStart.</Text>
+ 			<Text id="df3df" xml:lang="cs">Ve většině případů toto nastane v okamžiku, když se síťový disk připojuje pomocí login skriptu, a tudíž se připojuje ve stejný okamžik jako skupina autostart, z níž se spouští Quickstarter.</Text>
+ 			<Text id="df3df" xml:lang="sk">Vo väčšine prípadov toto nastane v okamihu, keď sa sieťový disk pripája pomocou login skriptu, a zároveň sa pripája v tom istom momente ako skupina autostart, z ktorej sa spúšťa Quickstarter.</Text>
+ 			<Text id="df3df" xml:lang="da">I de fleste tilfælde sker dette, når der logges på netværksdrev ved hjælp af et logind-script, og forbindelsen til netværksdrevene etableres parallelt med eksekveringen af programmerne i autostartgruppen, hvorfra også Hurtig start åbnes.</Text>
+@@ -3214,7 +3214,7 @@
+ 			<Text id="naso2" xml:lang="fr">Si vous deviez rencontrer des problèmes au démarrage d&apos;OpenOffice.org (la plupart du temps en relation avec Gnome), vous devez redéfinir la variable d&apos;environnement SESSION_MANAGER dans le shell utilisé pour le démarrage d&apos;OpenOffice.org : insérez &quot;unset SESSION_MANAGER&quot; au début du script shell de soffice placé dans le répertoire &quot;[office folder]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="es">Si surgen problemas durante la inicialización de OpenOffice.org (normalmente en conexión con Gnome) vuelva a definir la variable de entorno SESSION_MANAGER dentro de la cáscara (shell) que utiliza para iniciar OpenOffice.org. Esto se puede hacer añadiendo la línea &quot;unset SESSION_MANAGER&quot; al inicio del shell script de soffice que se encuentra en el directorio &quot;[carperta office]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="fi">If you experience OpenOffice.org startup problems (most notably while using Gnome) please &apos;unset&apos; the SESSION_MANAGER environment variable inside the shell you use to start OpenOffice.org. This can be done by adding the line &quot;unset SESSION_MANAGER&quot; to the beginning of the soffice shell script found in the &quot;[office folder]/program&quot; directory.</Text>
+-			<Text id="naso2" xml:lang="it">Se si presentassero problemi all&apos;avvio di OpenOffice.org (soprattutto sotto Gnome) è necessario ridefinire la varibile di ambiente SESSION_MANAGER nella shell che utilizzate per l&apos;avvio di OpenOffice.org. A questo proposito digitate &quot;unset SESSION_MANAGER&quot; all&apos;inizio dello script della shell che si trova nella cartella &quot;[office folder]/program&quot;.</Text>
++			<Text id="naso2" xml:lang="it">Se si presentassero problemi all&apos;avvio di OpenOffice.org (soprattutto sotto Gnome) è necessario ridefinire la variabile di ambiente SESSION_MANAGER nella shell che utilizzate per l&apos;avvio di OpenOffice.org. A questo proposito digitate &quot;unset SESSION_MANAGER&quot; all&apos;inizio dello script della shell che si trova nella cartella &quot;[office folder]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="cs">Pokud při startu OpenOffice.org pozorujete problémy (hlavně při používání Gnome), použijte v příkazovém interpretu, z něhož spouštíte OpenOffice.org, příkaz &apos;unset&apos; ke zrušení proměnné prostředí SESSION_MANAGER. Můžete to zařídit přidáním řádku &quot;unset SESSION_MANAGER&quot; na začátek skriptu soffice, který se nachází v adresáři &quot;[adresář OpenOffice.org]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="sk">Pokiaľ pri štarte OpenOffice.org spozorujete problémy (hlavne pri používaní Gnome), použite v príkazovom interpreteri, z ktorého spúšťate OpenOffice.org, príkaz &apos;unset&apos; pre zrušenie premennej prostredia SESSION_MANAGER. Môžete to zariadiť pridaním riadku &quot;unset SESSION_MANAGER&quot; na začiatok skriptu soffice, ktorý sa nachádza v adresári &quot;[adresár OpenOffice.org]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="da">Hvis du oplever opstartsproblemer (oftest i Gnome) skal du &apos;unset&apos; miljøvariablen SESSION MANAGER i den skal, du bruger til at starte OpenOffice.org. Dette kan gøres ved at tilføje linjen &quot;unset SESSION_MANAGER&quot; i begyndelsen af soffice skalscriptet, som findes i kataloget &quot;[office mappen]/program&quot;</Text>
+--- readlicense/docs/readme/readme.xrm~	2004-09-24 13:25:17.252442851 +0200
++++ readlicense/docs/readme/readme.xrm	2004-09-24 13:25:17.257442951 +0200
+@@ -4222,7 +4222,7 @@
+ 			<Text id="scs2" xml:lang="fr">Le système de fichier ReiserFS (version inférieure à 3.6) cause des problèmes si l&apos;ID d&apos;utilisateur est supérieur à 65535 : les fichiers temporaires créés par OpenOffice.org ne peuvent plus être supprimés par le programme, mais uniquement par l&apos;administrateur système (par ex. /tmp/OSL_PIPE_xxx ). Ceci a pour conséquence que OpenOffice.org ne démarre plus. Il s&apos;agit là d&apos;un problème du système de fichiers ReiserFS qui a toutefois disparu des versions 3.6 et plus.</Text>
+ 			<Text id="scs2" xml:lang="es">En versiones inferiores a la 3.6 el sistema de archivos ReiserFS puede ocasionar problemas si el ID del usuario es superior a 65535: los archivos temporales creados por OpenOffice.org ya no se podrán eliminar por el programa sino por el administrador del sistema (p.ej. /tmp/OSL_PIPE_xxx ). El resultado es que OpenOffice.org no se puede iniciar más. La situación aquí descrita es un problema del sistema de archivos ReiserFS que a partir de la versión 3.6 no se produce más.</Text>
+ 			<Text id="scs2" xml:lang="fi">Versiota 3.6 aikaisemmissa versioissa ReiserFS-tiedostojärjestelmä aiheuttaa ongelmia, jos käyttäjätunnus on pitempi kuin 65535. Ongelma on, että OpenOffice.orgn väliaikaisesti tallentamia tiedostoja ei voi poistaa ohjelmallisesti, vaan ainoastaan järjestelmän pääkäyttäjä voi tehdä sen (esim. /tmp/OSL_PIPE_xxx ). Sen vuoksi OpenOffice.orga ei voi käynnistää. Ongelma on ReiserFS-tiedostojärjestelmässä, ja se on korjattu versiossa 3.6 ja sitä uudemmissa versioissa.</Text>
+-			<Text id="scs2" xml:lang="it">Il sistema di file ReiserFS in una versione precedente alla 3.6 può causare dei problemi nei casi di un utente con un codice d&apos;identificazione superiore a 65535 e cioè che i file temporanei creati da OpenOffice.org (ad esempio /tmp/OSL_PIPE_xxx ) non vengano eliminati dal programma stesso ma solo dall&apos;amministratore del sistema. L&apos;effetto seguente è che non sarà possibile avviare OpenOffice.org. La sistuazione sopra descritta è un problema noto del sistema di file ReiserF3 ed è stato risolto a partire dalla versione 3.6.</Text>
++			<Text id="scs2" xml:lang="it">Il sistema di file ReiserFS in una versione precedente alla 3.6 può causare dei problemi nei casi di un utente con un codice d&apos;identificazione superiore a 65535 e cioè che i file temporanei creati da OpenOffice.org (ad esempio /tmp/OSL_PIPE_xxx ) non vengano eliminati dal programma stesso ma solo dall&apos;amministratore del sistema. L&apos;effetto seguente è che non sarà possibile avviare OpenOffice.org. La sistuazione sopra descritta è un problema noto del sistema di file ReiserFS ed è stato risolto a partire dalla versione 3.6.</Text>
+ 			<Text id="scs2" xml:lang="cs">V nižší verzi než 3.6 způsoboval ReiserFS problémy v okamžiku, kdy ID uživatele bylo vyšší než 65535. Problém byl ten, že dočasné soubory ukládané OpenOffice.org nemohly být již odstraněny, protože to mohl pouze správce systému (např. /tmp/OSL_PIPE_xxx). Výsledkem bylo, že nebylo možné spustit OpenOffice.org. Tento problém byl již ve verzi 3.6 a vyšší odstraněn.</Text>
+ 			<Text id="scs2" xml:lang="sk">V nižšej verzii ako 3.6 spôsoboval ReiserFS problémy v okamihu, keď ID užívateľa bolo vyššie ako 65535. Problém bol v tom, že dočasné súbory ukladané OpenOffice.org nemohli byť už odstránené, pretože to mohol len správca systému (napr. /tmp/OSL_PIPE_xxx). Výsledkom bolo, že nebolo možné spustiť OpenOffice.org. Tento problém bol už vo verzii 3.6 a vyššej odstránený.</Text>
+ 			<Text id="scs2" xml:lang="da">Filsystemet ReiserFS i versioner ældre end 3.6 giver problemer, når bruger-ID er større end 65535. Dette viser sig ved, at midlertidige filer oprettet af OpenOffice.org (f.eks. /tmp/OSL_PIPE_xxx ) ikke kan fjernes af programmet selv, men kun af systemadministratoren. Dette medfører, at OpenOffice.org ikke længere kan startes. Den beskrevne proces er et problem i filsystemet ReiserFS, og det er fjernet i version 3.6 og nyere.</Text>
+--- readlicense_oo/docs/readme/readme.xrm.orig2	2004-09-24 16:21:23.052730248 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-24 16:21:43.317124601 +0200
+@@ -3708,7 +3708,7 @@
+ 			<Text id="aw4333" xml:lang="fr">Le Java(TM) Access Bridge installé en même temps que cette version Early Access ne fonctionne éventuellement pas correctement avec les applications Java conventionnelles.</Text>
+ 			<Text id="aw4333" xml:lang="es">Puede suceder que el Java(TM) Access Bridge instalado con esta versión de early access no funcione correctamente con las aplicaciones de Java convencionales.</Text>
+ 			<Text id="aw4333" xml:lang="fi">The Java(TM) Access Bridge installed with this early access version does not work properly with conventional Java applications.</Text>
+-			<Text id="aw4333" xml:lang="it">Java (TM) Access Bridge, installato insieme a questa versione, non funziona correttamente con le normani applicazioni Java.</Text>
++			<Text id="aw4333" xml:lang="it">Java (TM) Access Bridge, installato insieme a questa versione, non funziona correttamente con le normali applicazioni Java.</Text>
+ 			<Text id="aw4333" xml:lang="cs">Java(TM) Access Bridge nainstalovaný se staršími verzemi nespolupracuje správně s běžnými Java aplikacemi.</Text>
+ 			<Text id="aw4333" xml:lang="sk">Java(TM) Access Bridge nainštalovaný so staršími verziami nespolupracuje správne s bežnými Java aplikáciami.</Text>
+ 			<Text id="aw4333" xml:lang="da">Udgaven af Java(TM) Access Bridge, som er installeret med denne tidlige version, virker ikke korrekt sammen med konventionelle Java-programmer</Text>
+--- sc/source/ui/src/globstr.src.orig	2004-09-24 17:10:00.456316975 +0200
++++ sc/source/ui/src/globstr.src	2004-09-24 17:10:10.729515783 +0200
+@@ -3477,7 +3477,7 @@
+ 		Text [ portuguese_brazilian ] = "Desproteger documento" ;
+ 		Text [ swedish ] = "Upph�v dokumentskydd" ;
+ 		Text [ danish ] = "Oph�v dokumentbeskyttelse" ;
+-		Text [ italian ] = "Disattiva protezione documentro" ;
++		Text [ italian ] = "Disattiva protezione documento" ;
+ 		Text [ spanish ] = "Desproteger documento" ;
+ 		Text [ french ] = "Annuler la protection de document" ;
+ 		Text [ dutch ] = "Beveiliging opheffen" ;
+--- sc/source/ui/src/scfuncs.src.orig2	2004-09-24 17:18:10.624794633 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-24 17:18:23.431041899 +0200
+@@ -12628,7 +12628,7 @@
+ 			Text = "F�lligkeit. F = 1 hei�t F�lligkeit am Anfang einer Periode, F = 0 am Ende." ;
+ 			Text [ english ] = "???" ;
+ 			Text [ norwegian ] = "Type=1 viser fortjenesten ved periodens begynnelse, =0 ved periodens slutt." ;
+-			Text [ italian ] = "Tipo di scadenze dei pagamaenti. 1 = all'inizio del periodo, 0 = alla fine." ;
++			Text [ italian ] = "Tipo di scadenze dei pagamenti. 1 = all'inizio del periodo, 0 = alla fine." ;
+ 			Text [ portuguese_brazilian ] = "Tipo = 1 denota a d�vida no in�cio do per�odo, = 0 no fim." ;
+ 			Text [ portuguese ] = "� o vencimento dos pagamentos de juros. 1 significa no �nicio do per�odo, 0 no final." ;
+ 			Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ;
+--- sc/source/ui/src/scfuncs.src.orig3	2004-09-24 17:43:29.216140105 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-24 17:44:17.603075732 +0200
+@@ -15233,7 +15233,7 @@
+ 			Text = "Berechnet die j�hrliche Effektivverzinsung zu einer Nominalverzinsung." ;
+ 			Text [ english ] = "???" ;
+ 			Text [ norwegian ] = "Beregner �rlig effektiv rente ut fra den nominelle renten." ;
+-			Text [ italian ] = "Restituisce l'interesse effettivo annuale per un'interesse nominale." ;
++			Text [ italian ] = "Restituisce l'interesse effettivo annuale per un interesse nominale." ;
+ 			Text [ portuguese_brazilian ] = "Calcula a taxa de juros anual l�quida para uma taxa de juros nominal." ;
+ 			Text [ portuguese ] = "Calcula a taxa de juros anual efectiva para uma taxa de juros nominal." ;
+ 			Text [ finnish ] = "Laskee nimellisen koron vuosittaisen nettosumman." ;
+--- sc/source/ui/src/scfuncs.src.orig4	2004-09-24 17:49:47.910463038 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-24 17:50:03.836770284 +0200
+@@ -31790,7 +31790,7 @@
+ 			Text = "Erste Matrix, deren Argumente quadriert summiert werden." ;
+ 			Text [ english ] = "is the first array or range of values." ;
+ 			Text [ norwegian ] = "Den f�rste matrisen der kvadratet av argumentene skal legges sammen." ;
+-			Text [ italian ] = "Prima matrice di cui si deve aggiundere l'elemento al quadrato." ;
++			Text [ italian ] = "Prima matrice di cui si deve aggiungere l'elemento al quadrato." ;
+ 			Text [ portuguese_brazilian ] = "Primeiro vetor no qual o quadrado dos argumentos � totalizado." ;
+ 			Text [ portuguese ] = "� a primeira matriz ou intervalo de valores." ;
+ 			Text [ finnish ] = "Ensimm�inen taulukko, jonka argumenttien neli�t lasketaan yhteen." ;
+--- scaddins/source/analysis/analysis.src.orig	2004-09-24 18:06:22.021667020 +0200
++++ scaddins/source/analysis/analysis.src	2004-09-24 18:07:12.741638289 +0200
+@@ -19010,7 +19010,7 @@
+ 			Text[ french ] = "Renvoie la dur�e de Macaulay modifi�e d'un titre pour une valeur nominale de 100 unit�s mon�taires.";
+ 			Text[ spanish ] = "Devuelve la duraci�n modificada de Macaulay de un t�tulo de un valor de 100 unidades monetarias.";
+ 			Text[ finnish ] = "Palauttaa arvopaperin Macaulay-keston oletetulla 100 valuuttayksik�n nimellisarvolla";
+-			Text[ italian ] = "Restituisce la durata Macauley modificata di un titolo con un valore nominale di 100 unit� monetarie.";
++			Text[ italian ] = "Restituisce la durata Macaulay modificata di un titolo con un valore nominale di 100 unit� monetarie.";
+ 			Text[ danish ] = "Returnerer den modificerede Macauley-varighed for et v�rdipapir med 100 valutaenheder p�lydende v�rdi.";
+ 			Text[ swedish ] = "Returnerar den modifierade Macauley-l�ptiden f�r ett v�rdepapper med ett nominellt v�rde p� 100 valutaenheter.";
+ 			Text[ polish ] = "Zwraca warto�� zmodyfikowanego okresu Macaulay'a w przypadku papieru warto�ciowego o za�o�onej warto�ci 100 jednostek.";
+--- scp/source/fonts/module_fonts.lng.orig	2004-09-24 11:37:51.000000000 +0200
++++ scp/source/fonts/module_fonts.lng	2004-09-24 18:16:06.912895565 +0200
+@@ -51,7 +51,7 @@
+ 33 = "Ce module permet d'�largir le choix des polices de caract�res. Ces polices suppl�mentaires sont �galement disponibles dans les mod�les et exemples de document."
+ 34 = "Seleccione este m�dulo para incluir fuentes adicionales y as� ampliar la gama de dise�os. Estas fuentes se utilizan tambi�n en las plantillas y ejemplos.  "
+ 35 = "Lis�fontit"
+-39 = "Selezionate questo modulo per aggiungere altri tipi di caratere per aumentarne la gamma a disposizione. Questi caratteri sono utilizzati anche da modelli ed esempi."
++39 = "Selezionate questo modulo per aggiungere altri tipi di carattere per aumentarne la gamma a disposizione. Questi caratteri sono utilizzati anche da modelli ed esempi."
+ 45 = "Yderligere skrifttyper."
+ 46 = "V�lj den h�r modulen om du vill ha ytterligare teckensnitt f�r mer designflexibilitet. De h�r teckensnitten anv�nds �ven i mallarna och exemplen."
+ 48 = "Dodatkowe czcionki."
+--- scp/source/office/setuphelp.lng.orig	2004-09-24 18:23:35.062535707 +0200
++++ scp/source/office/setuphelp.lng	2004-09-24 18:23:58.511988475 +0200
+@@ -99,7 +99,7 @@
+ 33 = "Une installation de station de travail n'installe que les fichiers utilisateur requis pour le fonctionnement de %PRODUCTNAME depuis une installation serveur.\n\nUne installation locale installe tous les fichiers requis pour l'ex�cution de %PRODUCTNAME sur l'ordinateur."
+ 34 = "Una instalaci�n de estaci�n de trabajo s�lo instala los archivos espec�ficos del usuario necesarios para ejecutar %PRODUCTNAME despu�s de una instalaci�n de servidor.\n\nUna instalaci�n local instala todos los archivos necesarios para ejecutar  %PRODUCTNAME en su ordenador."
+ 35 = "A workstation installation only installs user-specific files that are required to run %PRODUCTNAME from a server installation.\n\nA local installation installs all of the files that are required to run %PRODUCTNAME from your computer."
+-39 = "L'installazione per workstation installa solo quei file speciifci dell'utente necessari per il funzionamento di %PRODUCTNAME su un server.\n\nUn'installazione locale installa tutti i file necessari per il funzionamento di %PRODUCTNAME sul computer."
++39 = "L'installazione per workstation installa solo quei file specifici dell'utente necessari per il funzionamento di %PRODUCTNAME su un server.\n\nUn'installazione locale installa tutti i file necessari per il funzionamento di %PRODUCTNAME sul computer."
+ 45 = "En arbejdsstationsinstallation installerer kun de n�dvendige brugerspecifikke filer fra en serverinstallation. En enkeltbrugerinstallation installerer alle n�dvendige filer, s� %PRODUCTNAME kan k�res direkte p� din computer."
+ 46 = "En installation p� en arbetsstation installerar bara anv�ndarspecifika filer som kr�vs f�r att %PRODUCTNAME ska kunna k�ras fr�n en serverinstallation.\n\nEn lokal installation installerar alla filer som kr�vs f�r att %PRODUCTNAME ska kunna k�ras fr�n din dator."
+ 48 = "A workstation installation only installs user-specific files that are required to run %PRODUCTNAME from a server installation.\n\nA local installation installs all of the files that are required to run %PRODUCTNAME from your computer."
+--- setup2/source/custom/reg4msdoc/preg4msdoc.src.orig	2004-09-24 18:33:41.284269065 +0200
++++ setup2/source/custom/reg4msdoc/preg4msdoc.src	2004-09-24 18:33:51.474467256 +0200
+@@ -646,7 +646,7 @@
+ 	Text[ french ] = "Vous pouvez utiliser %PRODUCTNAME %PRODUCTVERSION comme application par d�faut pour l'ouverture et l'�dition des documents Microsoft Word, Excel et PowerPoint.\nSi vous n'en avez pas l'intention, supprimez le marquage des options.\nVous pouvez de plus d�finir %PRODUCTNAME %PRODUCTVERSION comme �diteur HTML par d�faut.\nEn cas contraire, supprimez le marquage de l'option '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ spanish ] = "Puede utilizar %PRODUCTNAME %PRODUCTVERSION como una aplicaci�n predeterminada para la apertura y edici�n de los archivos de Microsoft Word, Excel y PowerPoint files.\nSi esta no es su intenci�n anule la selecci�n de las opciones.\nAdem�s podr� registrar %PRODUCTNAME %PRODUCTVERSION como editor HTML predeterminado.\nSi �sta tampoco es su intenci�n borre la marca de la opci�n '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ finnish ] = "Voit k�ytt�� %PRODUCTNAME %PRODUCTVERSION -ohjelmaa oletussovelluksena Microsoft Word-, Excel- ja PowerPoint-asiakirjojen avaamiseen ja muokkaamiseen.\nEllet halua tehd� niin, poista valintamerkki.\nVoit my�s rekister�id� %PRODUCTNAME %PRODUCTVERSION -ohjelman j�rjestelm�si HTML-oletuseditoriksi.\nEllet halua rekister�id� %PRODUCTNAME %PRODUCTVERSION -ohjelmaa, poista valintamerkki kohdasta %PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+-	Text[ italian ] = "Potete utilizzare %PRODUCTNAME %PRODUCTVERSION quale applicazione standard per aprire documenti Microsoft Word, Excel e PowerPoint.\nSe preferite non usare il programma quale applicazione standard eliminate il contrassegno dall'opzione.\nPotete impostare %PRODUCTNAME %PRODUCTVERSION quale editor standard HTML\nIn caso contrario eliminate il contrassego dall'opzione '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
++	Text[ italian ] = "Potete utilizzare %PRODUCTNAME %PRODUCTVERSION quale applicazione standard per aprire documenti Microsoft Word, Excel e PowerPoint.\nSe preferite non usare il programma quale applicazione standard eliminate il contrassegno dall'opzione.\nPotete impostare %PRODUCTNAME %PRODUCTVERSION quale editor standard HTML\nIn caso contrario eliminate il contrassegno dall'opzione '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ danish ] = "Du kan bruge %PRODUCTNAME %PRODUCTVERSION som standardprogram til at �bne og redigere Microsoft Word-, Microsoft Excel- og Microsoft PowerPoint-dokumenter.\nHvis du ikke �nsker dette, skal du fjerne markeringen.\nDu kan ogs� v�lge, om %PRODUCTNAME %PRODUCTVERSION skal defineres som standard-HTML-editor p� computeren. Hvis du ikke �nsker at anvende %PRODUCTNAME %PRODUCTVERSION som standard-HTML-editor p� computeren, skal du fjerne markeringen af '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ swedish ] = "Du kan anv�nda %PRODUCTNAME %PRODUCTVERSION som standardprogram f�r att �ppna och redigera Microsoft Word-, Excel- och PowerPoint-dokument.\nOm du inte vill det tar du bort markeringen.\nDessutom kan du definiera om %PRODUCTNAME %PRODUCTVERSION ska st�llas in som standard-HTML-redigerare i ditt system.\nOm du inte vill anv�nda %PRODUCTNAME %PRODUCTVERSION som standard-HTML-redigerare i ditt system avmarkerar du '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ polish ] = "Mo�esz u�ywa� program�w %PRODUCTNAME %PRODUCTVERSION jako domy�lnych aplikacji do otwierania i edytowania plik�w w formacie Microsoft Word, Excel i PowerPoint files.\nJe�li tego nie chcesz, wyczy�� pole wyboru.\nMo�esz tak�e zarejestrowa� %PRODUCTNAME %PRODUCTVERSION jako domy�lny edytor HTML.\nJe�li nie chcesz rejestrowa� %PRODUCTNAME %PRODUCTVERSION jako domy�lnego edytora HTML, wyczy�� pole wyboru �%PRODUCTNAME %PRODUCTVERSION Writer/Web�.";
+--- sw/source/ui/app/app.src.orig	2004-09-24 18:37:04.577223727 +0200
++++ sw/source/ui/app/app.src	2004-09-24 18:37:13.204391591 +0200
+@@ -4190,7 +4190,7 @@
+     Message = "Zum Fortsetzen des Vorgangs, muss die R�ckg�ngig-Funktion abgeschaltet werden. Wollen Sie die R�ckg�ngig-Funktion abschalten?";
+ 	Message [ English ] = "This action needs for undo many memory.\nWould you disable undo?" ;
+ 	Message [ norwegian ] = "Du m� sl� av angrefunksjonen for � fortsette med denne handlingen. Vil du sl� av angrefunksjonen?" ;
+-	Message [ italian ] = "Per procedre con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilit� di annullare?" ;
++	Message [ italian ] = "Per procedere con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilit� di annullare?" ;
+ 	Message [ portuguese_brazilian ] = "Para prosseguir com esta a��o, voc� deve primeiro desativar a fun��o \"desfazer\".\nDeseja desativar a fun��o \"desfazer\"?" ;
+ 	Message [ portuguese ] = "Para poder anular esta ac��o � necess�ria muita mem�ria.\nDeseja cancelar esta fun��o?" ;
+ 	Message [ finnish ] = "T�m�n toiminnon kumoamiseen tarvitaan suuri m��r� muistia.\nHaluatko peruuttaa kumoamisen?" ;
+--- sw/source/ui/docvw/docvw.src.orig	2004-09-24 18:38:34.654976561 +0200
++++ sw/source/ui/docvw/docvw.src	2004-09-24 18:38:45.857194567 +0200
+@@ -1742,7 +1742,7 @@
+ 	Text [ portuguese_brazilian ] = "Formatado" ;
+ 	Text [ swedish ] = "Attributerat" ;
+ 	Text [ danish ] = "Formateret" ;
+-	Text [ italian ] = "Fomattato" ;
++	Text [ italian ] = "Formattato" ;
+ 	Text [ spanish ] = "Formateado" ;
+ 	Text [ french ] = "Format�" ;
+ 	Text [ dutch ] = "Opgemaakt" ;
+--- sw/source/ui/misc/glosbib.src.orig	2004-09-24 18:40:01.197660882 +0200
++++ sw/source/ui/misc/glosbib.src	2004-09-24 18:40:11.363858757 +0200
+@@ -316,7 +316,7 @@
+ 		Text[ french ] = "Chemin";
+ 		Text[ spanish ] = "Ruta";
+ 		Text[ finnish ] = "Polku";
+-		Text[ italian ] = "Percoso";
++		Text[ italian ] = "Percorso";
+ 		Text[ danish ] = "Sti";
+ 		Text[ swedish ] = "S�kv�g";
+ 		Text[ polish ] = "�cie�ka";
+--- scp/source/office/basic.lng.orig	2004-09-24 11:37:52.000000000 +0200
++++ scp/source/office/basic.lng	2004-09-25 09:35:36.216182919 +0200
+@@ -179,7 +179,7 @@
+ 33 = "%PRODUCTNAME n'a malheureusement pas r�ussi � d�tecter les fichiers destin�s � l'installation de la base de donn�es Adabas. Si vous souhaitez utiliser l'int�gration d'Adabas sous %PRODUCTNAME, lancez manuellement le programme d'installation d'Adabas, une fois l'installation de %PRODUCTNAME termin�e. Le jeu d'installation d'Adabas peut �tre t�l�charg� � partir de l'Internet."
+ 34 = "%PRODUCTNAME no pudo encontrar los archivos para la instalaci�n de la base de datos Adabas. Si desea usar la integraci�n de Adabas en %PRODUCTNAME, inicie 'manualmente' el programa de instalaci�n de Adabas despu�s de instalar %PRODUCTNAME. El programa de instalaci�n de Adabas lo puede descargar desde Internet."
+ 35 = "%PRODUCTNAME ei l�yt�nyt Adabas-tietokannan asennuksessa tarvittavia tiedostoja. Jos haluat integroida Adabas-tietokannan %PRODUCTNAMEen, suorita Adabas-asennusohjelma %PRODUCTNAMEn asennuksen j�lkeen. Adabas-asennusohjelma voidaan ladata Internetist�."
+-39 = "Non � stato possibile trovare i file per l'istallazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
++39 = "Non � stato possibile trovare i file per l'installazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
+ 45 = "%PRODUCTNAME kunne desv�rre ikke finde filerne til installation af Adabas-databasen. Hvis du �nsker at bruge Adabas-integration i %PRODUCTNAME, skal du starte installationsprogrammet til Adabas manuelt efter installation af %PRODUCTNAME. Adabas-installationsfilerne kan hentes p� Internet."
+ 46 = "Tyv�rr kunde %PRODUCTNAME inte hitta filerna f�r installation av Adabas-databasen. Om du vill anv�nda Adabas-integrationen i %PRODUCTNAME, startar du setupprogrammet f�r Adabas manuellt n�r installationen av %PRODUCTNAME �r avslutad. Adabas-installationsfilerna kan laddas ner fr�n Internet."
+ 48 = "Program %PRODUCTNAME nie znalaz� plik�w potrzebnych do zainstalowania bazy danych Adabas. Je�eli chcesz zintegrowa� baz� danych Adabas z programem %PRODUCTNAME, to uruchom jej program instalacyjny po zako�czeniu instalacji %PRODUCTNAME. Pliki instalacyjne bazy danych Adabas mo�na pobra� z Internetu."
+--- scp/source/office/unxbasic.lng.orig	2004-09-25 09:36:48.023647109 +0200
++++ scp/source/office/unxbasic.lng	2004-09-25 09:37:03.035953143 +0200
+@@ -93,7 +93,7 @@
+ 33 = "%PRODUCTNAME n'a malheureusement pas r�ussi � d�tecter les fichiers destin�s � l'installation de la base de donn�es Adabas. Si vous souhaitez utiliser l'int�gration d'Adabas sous %PRODUCTNAME, lancez manuellement le programme d'installation d'Adabas, une fois l'installation de %PRODUCTNAME termin�e. Le jeu d'installation d'Adabas peut �tre t�l�charg� � partir de l'Internet."
+ 34 = "%PRODUCTNAME no pudo encontrar los archivos para la instalaci�n de la base de datos Adabas. Si desea usar la integraci�n de Adabas en %PRODUCTNAME, inicie 'manualmente' el programa de instalaci�n de Adabas despu�s de instalar %PRODUCTNAME. El programa de instalaci�n de Adabas lo puede descargar desde Internet."
+ 35 = "%PRODUCTNAME ei l�yt�nyt Adabas-tietokannan asennuksessa tarvittavia tiedostoja. Jos haluat integroida Adabas-tietokannan %PRODUCTNAMEen, suorita Adabas-asennusohjelma %PRODUCTNAMEn asennuksen j�lkeen. Adabas-asennusohjelma voidaan ladata Internetist�."
+-39 = "Non � stato possibile trovare i file per l'istallazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
++39 = "Non � stato possibile trovare i file per l'installazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
+ 45 = "%PRODUCTNAME kunne desv�rre ikke finde filerne til installation af Adabas-databasen. Hvis du �nsker at bruge Adabas-integration i %PRODUCTNAME, skal du starte installationsprogrammet til Adabas manuelt efter installation af %PRODUCTNAME. Adabas-installationsfilerne kan hentes p� Internet."
+ 46 = "Tyv�rr kunde %PRODUCTNAME inte hitta filerna f�r installation av Adabas-databasen. Om du vill anv�nda Adabas-integrationen i %PRODUCTNAME, startar du setupprogrammet f�r Adabas manuellt n�r installationen av %PRODUCTNAME �r avslutad. Adabas-installationfilerna kan laddas ner fr�n Internet."
+ 48 = "Program %PRODUCTNAME nie znalaz� plik�w potrzebnych do zainstalowania bazy danych Adabas. Je�eli chcesz zintegrowa� baz� danych Adabas z programem %PRODUCTNAME, to uruchom jej program instalacyjny po zako�czeniu instalacji %PRODUCTNAME. Pliki instalacyjne bazy danych Adabas mo�na pobra� z Internetu."
+--- setup2/source/ui/pages/vefun.src.orig	2004-09-25 09:38:07.692270887 +0200
++++ setup2/source/ui/pages/vefun.src	2004-09-25 09:38:21.625554800 +0200
+@@ -642,7 +642,7 @@
+ 		Text [ portuguese_brazilian ] = "Para reiniciar agora, clique em '%1'. Utilize '%2' para concluir o programa de instala��o." ;
+ 		Text [ swedish ] = "F�r att g�ra en omstart klicka p� '%1'. Klickar du d�remot p� '%2', kommer installationsprogrammet att avslutas." ;
+ 		Text [ danish ] = "Klik p� '%1' for at genstarte. Hvis du klikker p� '%2' afsluttes installationsprogrammet derimod." ;
+-		Text [ italian ] = "Per effettuare adesso un riavvio, cliccate su '%1'. Cliccando invece su '%2', il programma di installazione verr� conlcuso." ;
++		Text [ italian ] = "Per effettuare adesso un riavvio, cliccate su '%1'. Cliccando invece su '%2', il programma di installazione verr� concluso." ;
+ 		Text [ spanish ] = "Pulse sobre '%1' para reiniciar el sistema. Pulse '%2' para terminar el programa de instalaci�n." ;
+ 		Text [ french ] = "Cliquez sur '%1' pour red�marrer imm�diatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ;
+ 		Text [ dutch ] = "Klik op '%1' om het systeem opnieuw op te starten. Klikt u echter op '%2', dan wordt het installeren be�indigd zonder opnieuw op te starten." ;
+--- sc/source/ui/src/scfuncs.src.orig5	2004-09-25 09:39:33.508019211 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-25 09:40:17.395913054 +0200
+@@ -10997,7 +10997,7 @@
+ 			Text = "Periode. Die Periode, f�r die die Tilgung berechnet wird. P = 1 hei�t f�r die erste Periode, P = ZZR f�r die letzte." ;
+ 			Text [ english ] = "specifies the period and must be in the range 1 to nper." ;
+ 			Text [ norwegian ] = "Periode. Perioden avdragene beregnes for. Per=1 gir f�rste periode, P=PERIODER gir siste periode." ;
+-			Text [ italian ] = "La durata per la quale si desidera calcolare l'ammortamento .  1 = primo periodo, Numero rate = ultimo periodo." ;
++			Text [ italian ] = "La durata per la quale si desidera calcolare l'ammortamento.  1 = primo periodo, Numero rate = ultimo periodo." ;
+ 			Text [ portuguese_brazilian ] = "Per�odo. O per�odo para o qual os reembolsos s�o calculados. Per = 1 denota o primeiro per�odo, P = NPER para o �ltimo" ;
+ 			Text [ portuguese ] = "� o per�odo para o qual se calcula a amortiza��o. 1 indica o primeiro per�odo, nper o �ltimo." ;
+ 			Text [ finnish ] = "Kausi Kausi, jonka maksut lasketaan. P = 1 tarkoittaa ensimm�ist� ja P = NPER viimeist� kautta" ;
+--- setup2/source/ui/pages/preadygo.src.orig	2004-09-24 11:38:02.000000000 +0200
++++ setup2/source/ui/pages/preadygo.src	2004-09-25 09:42:06.521134806 +0200
+@@ -319,7 +319,7 @@
+ 		Text[ french ] = "L'espace disponible sur l'unit� cible ne suffit pas pour l'installation de %PRODUCTPATCHNAME. L'installation requiert environ %SPACE_NEEDED Ko de plus.";
+ 		Text[ spanish ] = "La unidad de destino no dispone de espacio suficiente para instalar %PRODUCTPATCHNAME. Se requieren unos %SPACE_NEEDED KB m�s.";
+ 		Text[ finnish ] = "Kohdeasemalla ei ole tarpeeksi tilaa kohteen %PRODUCTPATCHNAME asentamiseen. Lis�tilaa tarvitaan noin %SPACE_NEEDED kt.";
+-		Text[ italian ] = "Il drive di destinazione non ha lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB.";
++		Text[ italian ] = "Il drive di destinazione non ha lo spazio sufficiente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB.";
+ 		Text[ danish ] = "Der er ikke tilstr�kkelig ledig plads p� destinationsdrevet til at installere %PRODUCTPATCHNAME. Der kr�ves ca. %SPACE_NEEDED KB yderligere.";
+ 		Text[ swedish ] = "Det finns inte tillr�ckligt med utrymme p� m�lenheten f�r att %PRODUCTPATCHNAME ska kunna installeras. Det beh�vs ungef�r %SPACE_NEEDED KB ytterligare.";
+ 		Text[ polish ] = "Za ma�o miejsca na dysku docelowym, aby zainstalowa� aktualizacj� %PRODUCTPATCHNAME. Potrzeba jeszcze oko�o %SPACE_NEEDED KB.";
+--- svx/source/dialog/page.src.orig	2004-09-25 09:45:15.537980791 +0200
++++ svx/source/dialog/page.src	2004-09-25 10:01:44.441194427 +0200
+@@ -4014,7 +4014,7 @@
+ 		< "C6" ; PAPERSIZE_C6 ; > ;
+ 		< "C65" ; PAPERSIZE_C65 ; > ;
+ 		< "DL" ; PAPERSIZE_DL ; > ;
+-		< "Diapoisitiva" ; PAPERSIZE_DIA ; > ;
++		< "Diapositiva" ; PAPERSIZE_DIA ; > ;
+ 		< "Schermo" ; PAPERSIZE_SCREEN ; > ;
+ 		< "16 kai" ; PAPERSIZE_KAI16; > ;
+ 		< "32 kai" ; PAPERSIZE_KAI32; > ;
+--- sc/idl/scalc.idl.orig	2000-09-18 18:44:47.000000000 +0200
++++ sc/idl/scalc.idl	2004-09-25 10:07:29.607258546 +0200
+@@ -5389,7 +5389,7 @@
+ 	//idlpp HelpText [ french ] = "Modifier les pr�d�finitions de format d'une ou plusieurs cellules" ;
+ 	//idlpp ConfigName [ spanish ] = "Formatear celda" ;
+ 	//idlpp HelpText [ spanish ] = "Editar formatos predeterminados para una o m�s celdas" ;
+-	//idlpp ConfigName [ italian ] = "Fromatta cella" ;
++	//idlpp ConfigName [ italian ] = "Formatta cella" ;
+ 	//idlpp HelpText [ italian ] = "Modifica le preimpostazioni per un o pi� celle" ;
+ 	//idlpp ConfigName [ danish ] = "FormatCell" ;
+ 	//idlpp HelpText [ danish ] = "Redig�r typografi for en eller flere celler" ;
+--- sc/sdi/scslots.src.orig	2004-09-24 11:37:31.000000000 +0200
++++ sc/sdi/scslots.src	2004-09-25 10:08:34.683588109 +0200
+@@ -258,7 +258,7 @@
+ 	SlotName[ dutch ] = "Cel opmaken";
+ 	SlotName[ french ] = "Formater la cellule";
+ 	SlotName[ spanish ] = "Formatear celda";
+-	SlotName[ italian ] = "Fromatta cella";
++	SlotName[ italian ] = "Formatta cella";
+ 	SlotName[ danish ] = "Formater celle";
+ 	SlotName[ swedish ] = "Formatera cell";
+ 	SlotName[ polish ] = "Formatuj kom�rk�";
+--- svx/source/dialog/sdstring.src.orig	2004-09-25 10:10:16.930675873 +0200
++++ svx/source/dialog/sdstring.src	2004-09-25 10:10:32.883001471 +0200
+@@ -582,7 +582,7 @@
+ 	Text = "Die Bitmap wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Bitmap �ndern \noder eine neue Bitmap hinzuf�gen." ;
+ 	Text [ ENGLISH ] = "The Bitmap was modified without Save? \nChange the selected Bitmap or add a new Bitmap." ;
+ 	Text [ norwegian ] = "Bildet ble endret, men ikke lagret. \nEndre det valgte bildet, eller legg til et nytt." ;
+-	Text [ italian ] = "La bitmap � stata modificata ma non salvata \nPotete cambiare la bitmap selezionata \no naggiungerne una nuova." ;
++	Text [ italian ] = "La bitmap � stata modificata ma non salvata \nPotete cambiare la bitmap selezionata \no aggiungerne una nuova." ;
+ 	Text [ portuguese_brazilian ] = "O bitmap foi modificado sem salvar. \nModifique o bitmap selecionado ou adicione um novo bitmap." ;
+ 	Text [ portuguese ] = "O bitmap foi alterado e n�o guardado? \nPoder� modificar o bitmap seleccionado \nou adicionar um novo." ;
+ 	Text [ finnish ] = "Bittikarttaa ei tallennettu muutoksen j�lkeen. \nMuuta valittua bittikarttaa tai lis�� uusi bittikartta." ;
+--- svx/source/dialog/sdstring.src.orig2	2004-09-25 10:10:32.883001000 +0200
++++ svx/source/dialog/sdstring.src	2004-09-25 10:11:54.267662092 +0200
+@@ -815,7 +815,7 @@
+ 	Text = "Der Linienstil wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Linienstil �ndern \noder einen neuen Linienstil hinzuf�gen." ;
+ 	Text [ ENGLISH ] = "The Linestyle was modified without Save? \nChange the selected Linestyle or add a new Linestyle." ;
+ 	Text [ norwegian ] = "Linjestilen ble endret, men ikke lagret. \nEndre den valgte linjestilen eller legg til en ny." ;
+-	Text [ italian ] = "Lo stile � stato modificato ma non salvato.\nPotetecambiare lo stile selezionato\\o aggiungerne uno nuovo." ;
++	Text [ italian ] = "Lo stile � stato modificato ma non salvato.\nPotete cambiare lo stile selezionato\\o aggiungerne uno nuovo." ;
+ 	Text [ portuguese_brazilian ] = "O estilo de linha foi modificado sem salvar. \nModifique o estilo de linha selecionado ou adicione um novo estilo de linha." ;
+ 	Text [ portuguese ] = "O fim de linha foi modificado e n�o guardado.\nPoder� modificar o fim de linha seleccionado\nou adicionar um novo." ;
+ 	Text [ finnish ] = "Viivatyyli� ei tallennettu muutoksen j�lkeen. \nMuuta valittua viivatyyli� tai lis�� uusi viivatyyli." ;
+--- svx/source/items/svxerr.src.orig2	2004-09-25 10:14:17.880590564 +0200
++++ svx/source/items/svxerr.src	2004-09-25 10:16:46.979628616 +0200
+@@ -801,7 +801,7 @@
+ 		Text[ swedish ] = "Formul�rskiktet laddades inte eftersom n�dv�ndig IO-service (stardiv.uno.io.*) inte kunde instantieras.";
+ 		Text[ language_user1 ] = "Plast obrazca se ni naložila, ker zahtevanih IO-storitev (stardiv.uno.io*) ni bilo mogoče uporabiti";
+ 		Text[ russian ] = "�� �������� ���� �����, ��� ��� �� ������� ������� ��������� ������ IO (stardiv.uno.io.*).";
+-		Text[ italian ] = "Lo strato del formulario non � stato caricato poich� stato possibile creare i servizi IO (strdiv.uno.io.*) necessari.";
++		Text[ italian ] = "Lo strato del formulario non � stato caricato poich� non � stato possibile creare i servizi IO (strdiv.uno.io.*) necessari.";
+ 		Text[ danish ] = "Formularlaget blev ikke indl�st, fordi det ikke var muligt at instantiere den n�dvendige IO-service (stardiv.uno.io.*)";
+ 		Text[ polish ] = "Warstwa formularza nie zosta�a za�adowana, poniewa� nie mo�na utworzy� instancji wymaganych us�ug we-wy (stardiv.uno.io.*)";
+ 		Text[ portuguese_brazilian ] = "A camada do formul�rio n�o foi carregada, pois n�o foi poss�vel criar uma inst�ncia dos servi�os de ES necess�rios (stardiv.uno.io.*)";
+--- readlicense_oo/docs/readme/readme.xrm.orig6	2004-09-25 10:23:19.245633102 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-25 10:23:51.604295424 +0200
+@@ -3668,7 +3668,7 @@
+ 			<Text id="aw453" xml:lang="fr">En raison d&apos;un problème rencontré dans le Java(TM) Access Bridge, vous devez définir &quot;Anglais (États-Unis)&quot; (ou &quot;EN-us&quot;) comme langue (environnement linguistique) du système d&apos;exploitation, ceci afin d&apos;activer la coopération avec des logiciels tels que ZoomText.(Attention ! Le programme WindowEyes ne fonctionne pas avec OpenOffice.org étant donné qu&apos;il ne supporte pas la Java Accessibility API.)</Text>
+ 			<Text id="aw453" xml:lang="es">Debido a un problema con Java(TM) Access Bridge, deberá establecer el idioma del sistema operativo local en &quot;Inglés (Reino Unido)&quot; o &quot;(EN-US)&quot;. Sólo con esta configuración podrá trabajar con programas como ZoomText.</Text>
+ 			<Text id="aw453" xml:lang="fi">Due to a problem within the Java(TM) Accessibility Bride it is necessary to set the operating system locale to &quot;English (United States)&quot;. Only this setting will enable co-operation with programs like ZoomText.</Text>
+-			<Text id="aw453" xml:lang="it">Dovuto a un problema di Java (TM) Access Bridge è necessario impostare la lingua del sistema operativo locale su &quot;Inglese (USA)&quot; (&quot;EN-US&quot;). In questo modo sarà possibile lavorare con programmi del tipo ZoomText. (Nota: il programma WindowEyes non funziona con OpenOffice.org perchè non supporta l&apos;API Java Accessibility).</Text>
++			<Text id="aw453" xml:lang="it">Dovuto a un problema di Java (TM) Access Bridge è necessario impostare la lingua del sistema operativo locale su &quot;Inglese (USA)&quot; (&quot;EN-US&quot;). In questo modo sarà possibile lavorare con programmi del tipo ZoomText. (Nota: il programma WindowEyes non funziona con OpenOffice.org perché non supporta l&apos;API Java Accessibility).</Text>
+ 			<Text id="aw453" xml:lang="cs">Vzhledem k potížím s Java(TM) Access Bridge musíte nastavit jazyk systému na &quot;Anglicky (Spojené státy)&quot; nebo &quot;(EN-us)&quot;. Jedině při tomto nastavení můžete používat programy, jako např. ZoomText. (Poznámka: Program WindowsEyes nespolupracuje s OpenOffice.org, protože nepodporuje Java Accessibility API.)</Text>
+ 			<Text id="aw453" xml:lang="sk">Vzhľadom k problémom s Java(TM) Access Bridge musíte nastaviť jazyk systému na &quot;Anglický (Spojené štáty)&quot; alebo &quot;(EN-us)&quot;. Iba pri tomto nastavení môžete používať programy, ako napr. ZoomText. (Poznámka: Program WindowsEyes nespolupracuje s OpenOffice.org, pretože nepodporuje Java Accessibility API.)</Text>
+ 			<Text id="aw453" xml:lang="da">På grund af et problem i Java(TM) Access Bridge skal du sætte operativsystemets lokalitetsindstilling til &quot;Engelsk (USA)&quot; eller &quot;(EN-us)&quot;. Kun under denne indstilling vil du kunne bruge programmer som ZoomText. (Bemærk, at programmet WindowEyes ikke virker sammen med OpenOffice.org, fordi det ikke understøtter Java Accessibility API.)</Text>
+--- sw/sdi/swslots.src.orig3	2004-09-25 10:25:27.253251316 +0200
++++ sw/sdi/swslots.src	2004-09-25 10:25:36.021430230 +0200
+@@ -2087,7 +2087,7 @@
+ 	SlotName[ dutch ] = "Naar einde volgende pagina";
+ 	SlotName[ french ] = "� la fin de la page suivante";
+ 	SlotName[ spanish ] = "Ir al final de la p�gina siguiente";
+-	SlotName[ italian ] = "Alla fine dell pagina successiva";
++	SlotName[ italian ] = "Alla fine della pagina successiva";
+ 	SlotName[ danish ] = "Til n�ste sides slutning";
+ 	SlotName[ swedish ] = "Till slutet av n�sta sida";
+ 	SlotName[ polish ] = "Do ko�ca nast�pnej strony";
+--- starmath/sdi/smslots.src.orig	2004-09-24 11:38:08.000000000 +0200
++++ starmath/sdi/smslots.src	2004-09-25 10:27:54.263250424 +0200
+@@ -866,7 +866,7 @@
+ 	SlotName[ dutch ] = "Symbolen";
+ 	SlotName[ french ] = "Symboles";
+ 	SlotName[ spanish ] = "S�mbolos";
+-	SlotName[ italian ] = "Symboli";
++	SlotName[ italian ] = "Simboli";
+ 	SlotName[ danish ] = "Symboler";
+ 	SlotName[ swedish ] = "Symboler";
+ 	SlotName[ polish ] = "Symbole";
+--- wizards/source/template/template.src.orig	2004-09-24 11:38:43.000000000 +0200
++++ wizards/source/template/template.src	2004-09-25 10:29:28.955181542 +0200
+@@ -683,7 +683,7 @@
+ 	Text[ dutch ] = "Fout";
+ 	Text[ french ] = "Une erreur est survenue !";
+ 	Text[ spanish ] = "Ha ocurrido un error.";
+-	Text[ italian ] = "Si � verificato un'errore.";
++	Text[ italian ] = "Si � verificato un errore.";
+ 	Text[ swedish ] = "Det har uppst�tt ett fel!";
+ 	Text[ russian ] = "������";
+ 	Text[ greek ] = "������";
+--- sysui/oounix/office/cde/impress.lng.orig	2004-09-25 10:30:36.604560864 +0200
++++ sysui/oounix/office/cde/impress.lng	2004-09-25 10:30:47.992793038 +0200
+@@ -51,7 +51,7 @@
+ 33 = "Mod�le de pr�sentation %PRODUCTNAME"
+ 34 = "Plantilla de presentaci�n %PRODUCTNAME"
+ 35 = "%PRODUCTNAME - Esitysmalli"
+-39 = "Modello di poresentazione %PRODUCTNAME"
++39 = "Modello di presentazione %PRODUCTNAME"
+ 45 = "%PRODUCTNAME-pr�sentationsskabelon"
+ 46 = "%PRODUCTNAME-presentationsmall"
+ 48 = "%PRODUCTNAME Presentation Template"
diff --git a/patches/OOO_1_1/iiimf-multilingual-extension-2-enable.diff b/patches/OOO_1_1/iiimf-multilingual-extension-2-enable.diff
index 54aa303c5..ff90f51eb 100644
--- a/patches/OOO_1_1/iiimf-multilingual-extension-2-enable.diff
+++ b/patches/OOO_1_1/iiimf-multilingual-extension-2-enable.diff
@@ -1,6 +1,8 @@
---- vcl/unx/inc/XIM.h	18 Sep 2000 17:05:40 -0000	1.1.1.1
-+++ vcl/unx/inc/XIM.h	24 Feb 2004 02:38:04 -0000
-@@ -155,6 +155,8 @@
+Index: vcl/unx/inc/XIM.h
+===================================================================
+--- vcl/unx/inc/XIM.h.orig	2000-09-18 19:05:40.000000000 +0200
++++ vcl/unx/inc/XIM.h	2004-10-06 16:20:54.713291328 +0200
+@@ -155,6 +155,8 @@ typedef	struct	_XIMSwitchIMNotifyCallbac
  /* XIM attributes for multilingual IM extension */
  #define XNMultiLingualInput "multiLingualInput"
  #define XNQueryUnicodeCharacterSubset "unicodeCharacterSubset"
@@ -9,10 +11,12 @@
  
  /* XIC attributes for multilingual IM extension */
  
---- vcl/unx/source/app/i18n_ic.cxx	2 Jul 2003 13:40:36 -0000	1.26
-+++ vcl/unx/source/app/i18n_ic.cxx	24 Feb 2004 02:38:04 -0000
-@@ -200,11 +200,9 @@
-                                 ),
+Index: vcl/unx/source/app/i18n_ic.cxx
+===================================================================
+--- vcl/unx/source/app/i18n_ic.cxx.orig	2004-10-06 16:12:46.417523568 +0200
++++ vcl/unx/source/app/i18n_ic.cxx	2004-10-06 16:20:54.714291176 +0200
+@@ -212,11 +212,9 @@ SalI18N_InputContext::SalI18N_InputConte
+         mpPreeditAttributes( NULL ),
          mpFocusFrame( NULL )
  {
 -#ifdef SOLARIS
@@ -23,12 +27,14 @@
  
      maClientData.aText.pUnicodeBuffer = NULL;
      maClientData.aText.pCharStyle     = NULL;
---- vcl/unx/source/app/i18n_im.cxx	28 Jan 2004 15:23:17 -0000	1.23.110.2
-+++ vcl/unx/source/app/i18n_im.cxx	24 Feb 2004 02:38:04 -0000
-@@ -438,11 +438,16 @@
- 			// get ml-input flag from input-method
+Index: vcl/unx/source/app/i18n_im.cxx
+===================================================================
+--- vcl/unx/source/app/i18n_im.cxx.orig	2004-10-06 16:12:46.447519008 +0200
++++ vcl/unx/source/app/i18n_im.cxx	2004-10-06 16:21:07.651324448 +0200
+@@ -416,11 +416,16 @@ SalI18N_InputMethod::CreateMethod ( Disp
  			if ( maMethod == (XIM)NULL )
  				mbMultiLingual = False;
+ 
 -#if !defined(LINUX)
  			else
 -			if ( XGetIMValues(maMethod,
@@ -42,10 +48,10 @@
 +					      XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
 +				mbMultiLingual = False;
 +			}
-             if( mbMultiLingual )
-             {
-                 XIMUnicodeCharacterSubsets* subsets;
-@@ -470,9 +475,6 @@
+ 
+              #if defined(MACOSX) &&  (BUILD_OS_MAJOR == 10) && (BUILD_OS_MINOR == 2)
+                 // [ed] 6/12/04 Reapply multilingual patch for MACOSX Jaguar 
+@@ -459,9 +464,6 @@ SalI18N_InputMethod::CreateMethod ( Disp
                      fprintf( stderr, "query subsets failed\n" );
  #endif
              }
diff --git a/patches/OOO_1_1/l10n-YTL.diff b/patches/OOO_1_1/l10n-YTL.diff
new file mode 100644
index 000000000..dbc646a89
--- /dev/null
+++ b/patches/OOO_1_1/l10n-YTL.diff
@@ -0,0 +1,26 @@
+===================================================================
+RCS file: /opt/sourcecast/data/ccvs/repository/l10n/i18npool/source/localedata/data/tr_TR.xml,v
+retrieving revision 1.7
+retrieving revision 1.7.130.1
+diff -u -r1.7 -r1.7.130.1
+--- i18npool/source/localedata/data/tr_TR.xml	2003/04/08 15:58:56	1.7
++++ i18npool/source/localedata/data/tr_TR.xml	2004/10/13 15:38:38	1.7.130.1
+@@ -342,10 +342,17 @@
+ </Calendar>
+ </LC_CALENDAR>
+ <LC_CURRENCY>
+-<Currency default="true" usedInCompatibleFormatCodes="true">
++<Currency default="false" usedInCompatibleFormatCodes="true">
+ <CurrencyID>TL</CurrencyID>
+ <CurrencySymbol>TL</CurrencySymbol>
+ <BankSymbol>TRL</BankSymbol>
++<CurrencyName>Lira</CurrencyName>
++<DecimalPlaces>2</DecimalPlaces>
++</Currency>
++<Currency default="true" usedInCompatibleFormatCodes="false">
++<CurrencyID>TRY</CurrencyID>
++<CurrencySymbol>YTL</CurrencySymbol>
++<BankSymbol>TRY</BankSymbol>
+ <CurrencyName>Lira</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
diff --git a/patches/OOO_1_1/libgl-soname.diff b/patches/OOO_1_1/libgl-soname.diff
new file mode 100644
index 000000000..b031b5253
--- /dev/null
+++ b/patches/OOO_1_1/libgl-soname.diff
@@ -0,0 +1,16 @@
+Index: unx/source/gdi/salogl.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/gdi/salogl.cxx,v
+retrieving revision 1.7
+diff -u -r1.7 salogl.cxx
+--- vcl/unx/source/gdi/salogl.cxx	15 Apr 2003 16:10:05 -0000	1.7
++++ vcl/unx/source/gdi/salogl.cxx	5 Jan 2005 15:34:37 -0000
+@@ -90,7 +90,7 @@
+ #ifdef MACOSX
+ #define OGL_LIBNAME "libGL.dylib"
+ #else
+-#define OGL_LIBNAME "libGL.so"
++#define OGL_LIBNAME "libGL.so.1"
+ #endif
+ 
+ // ----------
diff --git a/patches/OOO_1_1/lt-fixes.diff b/patches/OOO_1_1/lt-fixes.diff
new file mode 100644
index 000000000..1be5e2f65
--- /dev/null
+++ b/patches/OOO_1_1/lt-fixes.diff
@@ -0,0 +1,591 @@
+diff -urN basctl/source/basicide/basidesh.src basctl/source/basicide/basidesh.src
+--- basctl/source/basicide/basidesh.src	2004-09-09 20:50:02.000000000 +0300
++++ basctl/source/basicide/basidesh.src	2004-11-09 14:22:08.000000000 +0200
+@@ -5333,7 +5333,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Leba";
+ 			Text[ basque ] = "~Ikuspegia";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ kannada ] = "ನೋಟ";
+ 			Text[ galician ] = "~Ver";
+ 		};
+@@ -5822,7 +5822,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Leba";
+ 			Text[ basque ] = "~Ikuspegia";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ kannada ] = "ನೋಟ";
+ 			Text[ galician ] = "~Ver";
+ 		};
+diff -urN dbaccess/source/ui/browser/sbabrw.src dbaccess/source/ui/browser/sbabrw.src
+--- dbaccess/source/ui/browser/sbabrw.src	2004-09-09 19:22:28.000000000 +0300
++++ dbaccess/source/ui/browser/sbabrw.src	2004-11-09 14:22:08.000000000 +0200
+@@ -1853,7 +1853,7 @@
+ 		Text[ norwegian_nynorsk ] = "Vising av datakjelder";
+ 		Text[ tswana ] = "Mokwalo setlhagisi bona";
+ 		Text[ basque ] = "Datu-iturburuen ikuspegia";
+-		Text[ lithuanian ] = "Duomenų šaltinio rodinys";
++		Text[ lithuanian ] = "Duomenų šaltinio vaizdas";
+ 		Text[ kannada ] = "ದತ್ತಸಂಚಯ ನೋಟ";
+ 		Text[ galician ] = "Vista de fonte de datos";
+ 	};
+diff -urN dbaccess/source/ui/browser/sbagrid.src dbaccess/source/ui/browser/sbagrid.src
+--- dbaccess/source/ui/browser/sbagrid.src	2004-09-09 19:22:41.000000000 +0300
++++ dbaccess/source/ui/browser/sbagrid.src	2004-11-09 14:22:08.000000000 +0200
+@@ -510,7 +510,7 @@
+ 	Text[ norwegian_nynorsk ] = "Vising #";
+ 	Text[ tswana ] = "Leba #";
+ 	Text[ basque ] = "Ikuspegi #";
+-	Text[ lithuanian ] = "Rodinys #";
++	Text[ lithuanian ] = "Vaizdas #";
+ 	Text[ kannada ] = "ನೋಟ #";
+ 	Text[ galician ] = "Ver #";
+ };
+diff -urN dbaccess/source/ui/control/tabletree.src dbaccess/source/ui/control/tabletree.src
+--- dbaccess/source/ui/control/tabletree.src	2004-09-09 19:23:10.000000000 +0300
++++ dbaccess/source/ui/control/tabletree.src	2004-11-09 14:22:08.000000000 +0200
+@@ -513,7 +513,7 @@
+ 	Text[ norwegian_nynorsk ] = "Alle visingar";
+ 	Text[ tswana ] = "Tsotlhe ditebo";
+ 	Text[ basque ] = "Ikuspegi guztiak";
+-	Text[ lithuanian ] = "Visus rodinius";
++	Text[ lithuanian ] = "Visus vaizdus";
+ 	Text[ kannada ] = "ಎಲ್ಲಾ ನೋಟಗಳು";
+ 	Text[ galician ] = "Todas as visualizaci�ns de t�boas";
+ };
+@@ -558,7 +558,7 @@
+ 	Text[ norwegian_nynorsk ] = "Alle tabellar og visingar";
+ 	Text[ tswana ] = "Tsotlhe ditafole le ditebo";
+ 	Text[ basque ] = "Taula eta ikuspegi guztiak";
+-	Text[ lithuanian ] = "Visas lenteles ir rodinius";
++	Text[ lithuanian ] = "Visas lenteles ir vaizdus";
+ 	Text[ kannada ] = "ಎಲ್ಲಾ ಕೋಷ್ಟಕಗಳು ಮತ್ತು ನೋಟಗಳು";
+ 	Text[ galician ] = "Todas as t�boas e visualizaci�ns de t�boas";
+ };
+diff -urN dbaccess/source/ui/dlg/dlgsave.src dbaccess/source/ui/dlg/dlgsave.src
+--- dbaccess/source/ui/dlg/dlgsave.src	2004-09-09 19:25:54.000000000 +0300
++++ dbaccess/source/ui/dlg/dlgsave.src	2004-11-09 14:22:08.000000000 +0200
+@@ -362,7 +362,7 @@
+ 		Text[ norwegian_nynorsk ] = "~Namn p� tabellvising";
+ 		Text[ tswana ] = "~Leina la tafole tebo";
+ 		Text[ basque ] = "T~aula-ikuspegiaren izena";
+-		Text[ lithuanian ] = "~Lentelės rodinio pavadinimas";
++		Text[ lithuanian ] = "~Lentelės vaizdo pavadinimas";
+ 		Text[ kannada ] = "ಕೋಷ್ಟಕ ನೋಟದ ಹೆಸರು";
+ 		Text[ galician ] = "Nome do ~modo t�boa";
+ 	};
+diff -urN dbaccess/source/ui/inc/toolbox.hrc dbaccess/source/ui/inc/toolbox.hrc
+--- dbaccess/source/ui/inc/toolbox.hrc	2004-09-09 19:28:08.000000000 +0300
++++ dbaccess/source/ui/inc/toolbox.hrc	2004-11-09 14:22:08.000000000 +0200
+@@ -1288,7 +1288,7 @@
+ 	Text[ norwegian_nynorsk ] = "Ny ~visingsutforming";\
+ 	Text[ tswana ] = "Ntsha ~Leba Tlhama"; \
+ 	Text[ basque ] = "I~kuspegi-diseinu berria"; \
+-	Text[ lithuanian ] = "Naujas ~peržiūros apipavidalinimas"; \
++	Text[ lithuanian ] = "Naujo ~vaizdo projektavimas"; \
+ 	Text[ kannada ] = "ಜಾರುಫಲಕ ವಿನ್ಯಾಸ "; \
+ 	Text[ galician ] = "No~vo dese�o de visualizaci�n"; \
+ 
+@@ -1334,7 +1334,7 @@
+ 	Text[ norwegian_nynorsk ] = "Ny ~tabellutforming";\
+ 	Text[ tswana ] = "Ntsha ~Tafole Tlhama"; \
+ 	Text[ basque ] = "T~aula-diseinu berria"; \
+-	Text[ lithuanian ] = "Naujas ~lentelės apipavidalinimas"; \
++	Text[ lithuanian ] = "Naujos ~lentelės projektavimas"; \
+ 	Text[ kannada ] = "ಹೊಸಾ ಕೋಶಗವನ್ನು ವಿನ್ಯಾಸ"; \
+ 	Text[ galician ] = "Novo dese�o de ~t�boa"; \
+ 
+@@ -1380,7 +1380,7 @@
+ 	Text[ norwegian_nynorsk ] = "Ny ~sp�rjingsutforming";\
+ 	Text[ tswana ] = "Ntsha ~Ngongorego (Tlhama Tebo)"; \
+ 	Text[ basque ] = "K~ontsulta-diseinu berria"; \
+-	Text[ lithuanian ] = "Nauja ~užklausa (apipavidalinti rodinį)"; \
++	Text[ lithuanian ] = "Nauja ~užklausa (vizualus projektavimas)"; \
+ 	Text[ kannada ] = "New ~Query (Design View)"; \
+ 	Text[ galician ] = "Nova ~consulta (vista de dese�o)"; \
+ 
+@@ -1472,7 +1472,7 @@
+ 	Text[ norwegian_nynorsk ] = "Ny S~QL-kommando";\
+ 	Text[ tswana ] = "Ntsha Ngongorego (~SQL Tebo)"; \
+ 	Text[ basque ] = "SQL komando berria"; \
+-	Text[ lithuanian ] = "Nauja užklausa (~SQL rodinys)"; \
++	Text[ lithuanian ] = "Nauja užklausa (~SQL komandos)"; \
+ 	Text[ kannada ] = "ಹೊಸಾ  ಪ್ರಶ್ನೆ (SQL ನೋಟ)"; \
+ 	Text[ galician ] = "Nova consulta (vista ~SQL)"; \
+ 
+diff -urN dbaccess/source/ui/misc/WizardPages.src dbaccess/source/ui/misc/WizardPages.src
+--- dbaccess/source/ui/misc/WizardPages.src	2004-09-09 19:28:22.000000000 +0300
++++ dbaccess/source/ui/misc/WizardPages.src	2004-11-09 14:22:08.000000000 +0200
+@@ -1609,7 +1609,7 @@
+ 		Text[ norwegian_nynorsk ] = "~Som tabellvising";
+ 		Text[ tswana ] = "Ja~aaka tafole tebo";
+ 		Text[ basque ] = "Taula-ikuspegi gi~sa";
+-		Text[ lithuanian ] = "K~aip lentelės rodinys";
++		Text[ lithuanian ] = "K~aip lentelės vaizdas";
+ 		Text[ kannada ] = "ಕೋಷ್ಟಕ ನೋಟ";
+ 		Text[ galician ] = "Como visualizaci�n de t�bo~a";
+ 	};
+diff -urN dbaccess/source/ui/querydesign/query.src dbaccess/source/ui/querydesign/query.src
+--- dbaccess/source/ui/querydesign/query.src	2004-09-09 19:28:49.000000000 +0300
++++ dbaccess/source/ui/querydesign/query.src	2004-11-09 14:22:08.000000000 +0200
+@@ -2442,7 +2442,7 @@
+ 	Message[ norwegian_nynorsk ] = "Tabellvisinga er endra.\nVil du lagra endringane?";
+ 	Message[ tswana ] = "Tafole e fetotswe.\n\nA o batla go boloka diphetogo?";
+ 	Message[ basque ] = "Taula-ikuspegian aldaketak egin dira.\nGorde nahi dituzu?";
+-	Message[ lithuanian ] = "Lentelės rodinys pakeistas.\nAr įrašyti pakeitimus?";
++	Message[ lithuanian ] = "Lentelės vaizdas pakeistas.\nAr įrašyti pakeitimus?";
+ 	Message[ kannada ] = "The table view has been changed.\nDo you want to save the changes?";
+ 	Message[ galician ] = "Modificouse a visualizaci�n da t�boa.\n�Desexa gardar as modificaci�ns?";
+ };
+@@ -2536,7 +2536,7 @@
+ 	Text[ norwegian_nynorsk ] = "Denne databasen st�ttar ikkje tabellvising.";
+ 	Text[ tswana ] = "O mokwalo ga o tshegetse tafole ditebo!";
+ 	Text[ basque ] = "Datu-base honek ez du onartzen taula-ikuspegirik!";
+-	Text[ lithuanian ] = "Ši duomenų bazė nepalaiko lentelių rodinių!";
++	Text[ lithuanian ] = "Ši duomenų bazė nepalaiko lentelių vaizdų!";
+ 	Text[ galician ] = "�Esta base de datos non apoia ningunha visualizaci�n de t�boas!";
+ 	Text[ kannada ] = " ";
+ };
+@@ -2993,7 +2993,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Leba";
+ 			Text[ basque ] = "~Ikuspegia";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ kannada ] = "ನೋಟ";
+ 			Text[ galician ] = "~Ver";
+ 		};
+@@ -3448,7 +3448,7 @@
+ 	Text[ norwegian_nynorsk ] = "Visingsutforming:";
+ 	Text[ tswana ] = "Leba: Tlhama:";
+ 	Text[ basque ] = "Diseinu ikuspegia:";
+-	Text[ lithuanian ] = "Rodinio projektas:";
++	Text[ lithuanian ] = "Vaizdo projektas:";
+ 	Text[ kannada ] = "ವಿನ್ಯಾಸ ವೀಕ್ಷಿಸು:";
+ 	Text[ galician ] = "Dese�o de vista:";
+ };
+diff -urN offmgr/source/offapp/dialog/optgdlg.src offmgr/source/offapp/dialog/optgdlg.src
+--- offmgr/source/offapp/dialog/optgdlg.src	2004-09-09 18:54:38.000000000 +0300
++++ offmgr/source/offapp/dialog/optgdlg.src	2004-11-09 14:22:08.000000000 +0200
+@@ -2624,7 +2624,7 @@
+ 		Text[ norwegian_nynorsk ] = "3D-vising";
+ 		Text[ tswana ] = "3D leba";
+ 		Text[ basque ] = "3D ikuspegia";
+-		Text[ lithuanian ] = "Trimatis rodinys";
++		Text[ lithuanian ] = "Trimatis vaizdas";
+ 		Text[ kannada ] = "3D view";
+ 		Text[ galician ] = "Visualizaci�n 3D";
+ 	};
+diff -urN offmgr/source/offapp/dialog/treeopt.src offmgr/source/offapp/dialog/treeopt.src
+--- offmgr/source/offapp/dialog/treeopt.src	2004-09-09 18:55:21.000000000 +0300
++++ offmgr/source/offapp/dialog/treeopt.src	2004-11-09 14:34:27.000000000 +0200
+@@ -1588,7 +1588,7 @@
+ 		< "Vartotojo duomenys" ;  RID_SFXPAGE_GENERAL; > ;
+ 		< "Bendrosios parinktys" ;  OFA_TP_MISC; > ;
+ 		< "Atmintinė" ; OFA_TP_MEMORY; > ;
+-		< "Rodinys" ; OFA_TP_VIEW ; > ;
++		< "Rodymas" ; OFA_TP_VIEW ; > ;
+ 		< "Spausdinimas" ; RID_SFXPAGE_PRINTOPTIONS; > ;
+ 		< "Išorinės programos" ; OFA_TP_HELPERPROG; > ;
+ 		< "Bylų vietos" ;  RID_SFXPAGE_PATH; > ;
+@@ -2822,7 +2822,7 @@
+ 	{
+ 		 < "Rašyklės dokumentas" ; 0; > ;
+ 		< "Bendrosios parinktys" ;     RID_SW_TP_OPTLOAD_PAGE   ; > ;
+-		< "Rodinys" ;       RID_SW_TP_CONTENT_OPT   ;> ;
++		< "Rodymas" ;       RID_SW_TP_CONTENT_OPT   ;> ;
+ 		< "Formatavimas" ;        RID_SW_TP_OPTSHDWCRSR    ; > ;
+ 		< "Tinklelis" ;        RID_SVXPAGE_GRID        ; > ;
+ 		< "Pagrindiniai šriftai (Vakarų Europos)" ;RID_SW_TP_STD_FONT       ; > ;
+@@ -3256,7 +3256,7 @@
+ 	ItemList [ lithuanian ] =
+ 	{
+ 		 < "Tinklalapis" ; 0; > ;
+-		< "Rodinys" ;       RID_SW_TP_HTML_CONTENT_OPT      ;> ;
++		< "Rodymas" ;       RID_SW_TP_HTML_CONTENT_OPT      ;> ;
+ 		< "Formatavimo priemonės" ;        RID_SW_TP_HTML_OPTSHDWCRSR    ; > ;
+ 		< "Tinklelis" ;        RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
+ 		< "Spausdinimas" ;  		RID_SW_TP_HTML_OPTPRINT_PAGE  ; > ;
+@@ -3971,7 +3971,7 @@
+ 	{
+ 		 < "Skaičiuoklės dokumentas" ; 0; > ;
+ 		< "Bendrosios parinktys" ;			SID_SC_TP_LAYOUT			;> ;
+-		< "Rodinys" ;			SID_SC_TP_CONTENT			;> ;
++		< "Rodymas" ;			SID_SC_TP_CONTENT			;> ;
+ 		< "Skaičiuoti" ;		RID_OFA_TP_INTERNATIONAL	;> ;
+ 		< "Skaičiavimai" ;			SID_SC_TP_CALC				;> ;
+ 		< "Rikiavimas" ;		SID_SC_TP_USERLISTS			;> ;
+@@ -4322,7 +4322,7 @@
+ 	{
+ 		 < "Pateikties dokumentas" ; 0; > ;
+ 		< "Bendrosios parinktys";			SID_SI_TP_MISC					; > ;
+-		< "Rodinys" ;			SID_SI_TP_CONTENTS				; > ;
++		< "Rodymas" ;			SID_SI_TP_CONTENTS				; > ;
+ 		< "Tinklelis" ;			SID_SI_TP_SNAP					; > ;
+ 		< "Spausdinimas" ;			SID_SI_TP_PRINT					; > ;
+ 	};
+@@ -4661,7 +4661,7 @@
+ 	{
+ 		 < "Grafikos dokumentas" ; 0; > ;
+ 		< "Bendrosios parinktys" ;			SID_SD_TP_MISC				; > ;
+-		< "Rodinys" ;			SID_SD_TP_CONTENTS			; > ;
++		< "Rodymas" ;			SID_SD_TP_CONTENTS			; > ;
+ 		< "Tinklelis" ;			SID_SD_TP_SNAP				; > ;
+ 		< "Spausdinimas" ; 	 		SID_SD_TP_PRINT				; > ;
+ 	};
+diff -urN offmgr/source/offapp/intro/ooo.src offmgr/source/offapp/intro/ooo.src
+--- offmgr/source/offapp/intro/ooo.src	2004-09-09 18:57:08.000000000 +0300
++++ offmgr/source/offapp/intro/ooo.src	2004-11-09 14:34:59.000000000 +0200
+@@ -186,7 +186,7 @@
+ 		Text[ arabic ] = "���� ����� 2004 Sun Microsystems Inc.\n. ���� ��� ������ �� ��� " OOO_VENDOR " ��������� ��� OpenOffice.org ��������� " OOO_LICENSE ". \nOpenOffice.org ���� �� ����� ������ǡ ������ ����� ��������� ��� http://www.openoffice.org/welcome/credits.html."; 
+ 		Text[ tswana ] = "Copyright 2004 Letsatsi tsamaisonnye Inc.\n\nSe setlhagiswa se bopilwe ka \" OOO_VENDOR \" go tswa go OpenOffice.org \no dirisa \" OOO_LICENCE \" \n\nOpenOffice.org e netefaletsa botlhe maloko a setshaba,bogolo jang bao ba \numakilweng kwa http://www.openoffice.org/kamogelo/dikoloto.html."; 
+ 		Text[ basque ] = "Copyright 2002 Sun Microsystems Inc.\nOpenOffice.org komunitatearen laguntzarekin egin da produktu hau eta Sun Microsystem Inc. komunitate horren kide fundatzailea da.\nOpenOffice.org-ek komunitateko kide guztiei eskerrak ematen dizkie, bereziki http://www.openoffice.org/welcome/credits.html orrian aipatzen direnei."; 
+-		Text[ lithuanian ] = "(C) „Sun Microsystems Inc.“, 2002\nŠis programų paketas sukurtas bendradarbiaujant su „OpenOffice.org“ bendruomene, kurios įkūrėjas yra „Sun Microsystems Inc“.\nDėkojama visiems bendrijos nariams, išvardintiems internete http://www.openoffice.org/welcome/credits.html.\n\nAtvirojo kodo programų lietuvinimo projekto vykdytojai.\nVilnius, 2003 m. rugsėjo 17 d.\n\nEl. paštas: dagiene@ktl.mii.lt\nInformacija internete:http://www.ivpk.lt; http://aldona.mii.lt/pms"; 
++		Text[ lithuanian ] = "(C) „Sun Microsystems Inc.“, 2002\nŠis programų paketas sukurtas bendradarbiaujant su „OpenOffice.org“ bendruomene, kurios įkūrėjas yra „Sun Microsystems Inc“.\nDėkojama visiems bendrijos nariams, išvardintiems internete http://www.openoffice.org/welcome/credits.html.\n\nAtvirojo kodo programų lietuvinimo projekto vykdytojai. Vilnius, 2003 m. rugsėjo 17 d.\nEl. paštas: dagiene@ktl.mii.lt\n\nOpenOffice.lt projekto dalyviai, 2004\nEl. paštas: info@openoffice.lt\n\nInformacija internete:\nhttp://www.openoffice.lt\nhttp://www.ivpk.lt; http://aldona.mii.lt/pms"; 
+ 		Text[ kannada ] = "Copyright 2004 Sun Microsystems Inc.\nThis product has been created by " OOO_VENDOR " based on OpenOffice.org using the " OOO_LICENSE ".\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html."; 
+ 		Text[ galician ] = "Copyright 2002 Sun Microsystems Inc.\nEste produto creosuse coas contribuci�ns da comunidade de OpenOffice.org community, da que Sun Microsystem Inc. � o membro fundador.\nOpenOffice.org reco�ece especialmente aos membros da comunidade mencionados en http://www.openoffice.org/welcome/credits.html."; 
+ 	};
+diff -urN sc/source/ui/src/menue.src sc/source/ui/src/menue.src
+--- sc/source/ui/src/menue.src	2004-09-09 21:08:50.000000000 +0300
++++ sc/source/ui/src/menue.src	2004-11-09 14:22:08.000000000 +0200
+@@ -2362,7 +2362,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Leba";
+ 			Text[ basque ] = "~Ikusi";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ galician ] = "~Ver";
+ 			Text[ thai ] = "~มุมมอง";
+ 			Text[ kannada ] = "ನೋಟ";
+@@ -8407,7 +8407,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Leba";
+ 			Text[ basque ] = "~Ikusi";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ galician ] = "~Ver";
+ 			Text[ thai ] = "~มุมมอง";
+ 			Text[ kannada ] = "ನೋಟ";
+diff -urN sc/source/ui/src/scstring.src sc/source/ui/src/scstring.src
+--- sc/source/ui/src/scstring.src	2004-09-09 21:12:14.000000000 +0300
++++ sc/source/ui/src/scstring.src	2004-11-09 14:22:08.000000000 +0200
+@@ -4155,7 +4155,7 @@
+ 	Text[ norwegian_nynorsk ] = "Visingsval";
+ 	Text[ tswana ] = "Leba Dikgetho";
+ 	Text[ basque ] = "Ikusteko aukerak";
+-	Text[ lithuanian ] = "Rodinio parinktys";
++	Text[ lithuanian ] = "Rodymo parinktys";
+ 	Text[ galician ] = "Opci�ns de visualizaci�n";
+ 	Text[ thai ] = "ตัวเลือกมุมมอง";
+ 	Text[ kannada ] = "ನೋಟ ಆಯ್ಕೆಗಳು";
+@@ -5417,7 +5417,7 @@
+ 	Text[ norwegian_nynorsk ] = "Dokumentvising";
+ 	Text[ tswana ] = "Setlankana tebo";
+ 	Text[ basque ] = "Dokumentuaren ikuspegia";
+-	Text[ lithuanian ] = "Dokumento rodinys";
++	Text[ lithuanian ] = "Dokumento vaizdas";
+ 	Text[ galician ] = "Document view";
+ 	Text[ thai ] = "Document view";
+ 	Text[ kannada ] = "ದಸ್ತಾವೇಜು ನೋಟ";
+diff -urN sc/source/ui/src/toolbox.src sc/source/ui/src/toolbox.src
+--- sc/source/ui/src/toolbox.src	2004-09-09 21:14:03.000000000 +0300
++++ sc/source/ui/src/toolbox.src	2004-11-09 14:22:08.000000000 +0200
+@@ -1300,7 +1300,7 @@
+ 	Text[ norwegian_nynorsk ] = "Objektlinje for sidevising";
+ 	Text[ tswana ] = "Letlhare Tebo Sediriswa Bar";
+ 	Text[ basque ] = "Orrialde-ikuspegiaren objektu-barra";
+-	Text[ lithuanian ] = "Puslapio rodinių formatų juosta";
++	Text[ lithuanian ] = "Puslapio peržiūros mygtukų juosta";
+ 	Text[ galician ] = "Barra de vista previa";
+ 	Text[ thai ] = "แถบวัตถุมุมมองหน้า";
+ 	Text[ kannada ] = "ಪುಟ ನೋಟ ವಸ್ತು ಪಟ್ಟಿಕೆ";
+diff -urN sch/sdi/schslots.src sch/sdi/schslots.src
+--- sch/sdi/schslots.src	2004-09-09 20:16:17.000000000 +0300
++++ sch/sdi/schslots.src	2004-11-09 14:22:08.000000000 +0200
+@@ -102,7 +102,7 @@
+ 	SlotName[ norwegian_nynorsk ] = "Rediger 3D-rute";
+ 	SlotName[ tswana ] = "Kwala 3D tebo";
+ 	SlotName[ basque ] = "Editatu 3D ikuspegia";
+-	SlotName[ lithuanian ] = "Taisyti trimatį rodinį";
++	SlotName[ lithuanian ] = "Taisyti trimatį vaizdą";
+ 	SlotName[ kannada ] = "ಮೂರು ಆಯಾಮ ನೋಟ ಸಂಪಾದಿಸು";
+ 	SlotName[ galician ] = "Editar a vista 3D";
+ };
+@@ -760,7 +760,7 @@
+ 	SlotName[ norwegian_nynorsk ] = "Rediger diagramgolv";
+ 	SlotName[ tswana ] = "Kwala Chate Boalo";
+ 	SlotName[ basque ] = "Editatu diagramaren zorua";
+-	SlotName[ lithuanian ] = "Taisyti diagramos pargindą";
++	SlotName[ lithuanian ] = "Taisyti diagramos pagrindą";
+ 	SlotName[ kannada ] = "ನಕ್ಷೆಯ ನೆಲವನ್ನು ಸಂಪಾದಿಸು";
+ 	SlotName[ galician ] = "Editar plano inferior";
+ };
+diff -urN sch/source/ui/app/menuids.src sch/source/ui/app/menuids.src
+--- sch/source/ui/app/menuids.src	2004-09-09 20:17:08.000000000 +0300
++++ sch/source/ui/app/menuids.src	2004-11-09 14:22:08.000000000 +0200
+@@ -1594,7 +1594,7 @@
+ 		Text[ norwegian_nynorsk ] = "3~D-vising ...";\
+ 		Text[ tswana ] = "3~D Tebo...";\
+ 		Text[ basque ] = "3D ~ikuspegia...";\
+-		Text[ lithuanian ] = "70857325~Trimatis rodinys...";\
++		Text[ lithuanian ] = "~Trimatis vaizdas...";\
+ 		Text[ kannada ] = "ಮೂರು ಆಯಾಮ ನೋಟ";\
+ 		Text[ galician ] = "~Ver en 3D...";\
+ 	};
+diff -urN sch/source/ui/app/menu.src sch/source/ui/app/menu.src
+--- sch/source/ui/app/menu.src	2004-09-09 20:16:56.000000000 +0300
++++ sch/source/ui/app/menu.src	2004-11-09 14:22:08.000000000 +0200
+@@ -735,7 +735,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Tebo";
+ 			Text[ basque ] = "~Ikuspegia";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ kannada ] = "ನೋಟ";
+ 			Text[ galician ] = "~Ver";
+ 		};
+@@ -2660,7 +2660,7 @@
+ 						Text[ norwegian_nynorsk ] = "3~D-vising ...";
+ 						Text[ tswana ] = "3~D Tebo...";
+ 						Text[ basque ] = "3~D Ikuspegia...";
+-						Text[ lithuanian ] = "T~rimatis rodinys...";
++						Text[ lithuanian ] = "T~rimatis vaizdas...";
+ 						Text[ kannada ] = "ಮೂರು ಆಯಾಮ ನೋಟ";
+ 						Text[ galician ] = "Vista 3~D...";
+ 					};
+diff -urN sch/source/ui/app/strings.src sch/source/ui/app/strings.src
+--- sch/source/ui/app/strings.src	2004-09-09 20:17:35.000000000 +0300
++++ sch/source/ui/app/strings.src	2004-11-09 14:22:08.000000000 +0200
+@@ -3454,7 +3454,7 @@
+ 	Text[ norwegian_nynorsk ] = "Rediger 3D-rute";
+ 	Text[ tswana ] = "Kwala 3D tebo";
+ 	Text[ basque ] = "Editatu 3D ikuspegia";
+-	Text[ lithuanian ] = "Taisyti trimatį rodinį";
++	Text[ lithuanian ] = "Taisyti trimatį vaizdą";
+ 	Text[ kannada ] = "ಮೂರು ಆಯಾಮ ನೋಟ ಸಂಪಾದಿಸು";
+ 	Text[ galician ] = "Editar a visualizaci�n en 3D";
+ };
+diff -urN sch/source/ui/dlg/viewdlg.src sch/source/ui/dlg/viewdlg.src
+--- sch/source/ui/dlg/viewdlg.src	2004-09-09 20:21:07.000000000 +0300
++++ sch/source/ui/dlg/viewdlg.src	2004-11-09 14:22:08.000000000 +0200
+@@ -485,7 +485,7 @@
+ 	Text[ norwegian_nynorsk ] = "3D-rute";
+ 	Text[ tswana ] = "3D Tebo";
+ 	Text[ basque ] = "3D ikuspegia";
+-	Text[ lithuanian ] = "75927832Trimatis rodinys";
++	Text[ lithuanian ] = "Trimatis vaizdas";
+ 	Text[ kannada ] = "ಮೂರು ಆಯಾಮ ನೋಟ";
+ 	Text[ galician ] = "Ver en 3D";
+ };
+diff -urN sd/sdi/sdslots.src sd/sdi/sdslots.src
+--- sd/sdi/sdslots.src	2004-09-09 20:05:04.000000000 +0300
++++ sd/sdi/sdslots.src	2004-11-09 14:22:08.000000000 +0200
+@@ -1091,7 +1091,7 @@
+ 	SlotName[ norwegian_nynorsk ] = "Vising i svart-kvitt";
+ 	SlotName[ tswana ] = "Bontsho le Bosweu Tebo";
+ 	SlotName[ basque ] = "Zuri-beltzeko ikuspegia";
+-	SlotName[ lithuanian ] = "Nespalvotas rodinys";
++	SlotName[ lithuanian ] = "Nespalvotas vaizdas";
+ 	SlotName[ kannada ] = "ಕಪ್ಪು ಮತ್ತು ಬಿಳುಪು ನೋಟ";
+ 	SlotName[ galician ] = "Ver branco e negro";
+ };
+@@ -3577,7 +3577,7 @@
+ 	SlotName[ norwegian_nynorsk ] = "Lysbiletvising";
+ 	SlotName[ tswana ] = "Thoko Tebo";
+ 	SlotName[ basque ] = "Diapositiba-ikuspegia";
+-	SlotName[ lithuanian ] = "Skaidrės rodinys";
++	SlotName[ lithuanian ] = "Skaidrių vaizdas";
+ 	SlotName[ kannada ] = "ಜಾರುಫಲಕ ನೋಟ";
+ 	SlotName[ galician ] = "Modo Diapositivas";
+ };
+@@ -7242,7 +7242,7 @@
+ 	SlotName[ norwegian_nynorsk ] = "Disposisjonsvising";
+ 	SlotName[ tswana ] = "Molantle Tebo";
+ 	SlotName[ basque ] = "Eskema-ikuspegia";
+-	SlotName[ lithuanian ] = "Struktūros rodinys";
++	SlotName[ lithuanian ] = "Struktūros vaizdas";
+ 	SlotName[ kannada ] = "ಹೊರರೇಖೆಯ ನೋಟ";
+ 	SlotName[ galician ] = "Modo Esquema";
+ };
+diff -urN sd/source/ui/accessibility/accessibility.src sd/source/ui/accessibility/accessibility.src
+--- sd/source/ui/accessibility/accessibility.src	2004-09-09 20:05:48.000000000 +0300
++++ sd/source/ui/accessibility/accessibility.src	2004-11-09 14:22:08.000000000 +0200
+@@ -382,7 +382,7 @@
+ 	Text[ norwegian_nynorsk ] = "Lysbiletvising";
+ 	Text[ tswana ] = "Dikgogelothoko Tebo";
+ 	Text[ basque ] = "Diapositiba ikuspegia";
+-	Text[ lithuanian ] = "Skaidrių rodinys";
++	Text[ lithuanian ] = "Skaidrių vaizdas";
+ 	Text[ kannada ] = "ಜಾರುಫಲಕಗಳ ನೋಟ";
+ 	Text[ galician ] = "Slides View";
+ };
+diff -urN sd/source/ui/app/menuids2.src sd/source/ui/app/menuids2.src
+--- sd/source/ui/app/menuids2.src	2004-09-09 20:06:34.000000000 +0300
++++ sd/source/ui/app/menuids2.src	2004-11-09 14:22:08.000000000 +0200
+@@ -727,7 +727,7 @@
+ 		Text[ norwegian_nynorsk ] = "~Vis";\
+ 	Text[ tswana ] = "~Tebo"; \
+ 		Text[ basque ] = "~Ikusi"; \
+-		Text[ lithuanian ] = "~Rodinys"; \
++		Text[ lithuanian ] = "~Rodyti"; \
+ 		Text[ kannada ] = "ನೋಟ"; \
+ 		Text[ galician ] = "~Ver"; \
+ 				
+@@ -4734,7 +4734,7 @@
+ 		Text[ norwegian_nynorsk ] = "V~isingskvalitet";\
+ 		Text[ tswana ] = "~Pontsho Boleng";\
+ 		Text[ basque ] = "~Bistaratze-kalitatea";\
+-		Text[ lithuanian ] = "~Rodinio kokybė";\
++		Text[ lithuanian ] = "~Rodymo kokybė";\
+ 		Text[ kannada ] = "ಪ್ರದರ್ಶನ ಗುಣಮಟ್ಟ";\
+ 		Text[ galician ] = "Calidade de ~visualizaci�n";\
+ 	};
+diff -urN sd/source/ui/app/menuids.src sd/source/ui/app/menuids.src
+--- sd/source/ui/app/menuids.src	2004-09-09 20:06:17.000000000 +0300
++++ sd/source/ui/app/menuids.src	2004-11-09 14:22:08.000000000 +0200
+@@ -262,7 +262,7 @@
+ 		Text[ norwegian_nynorsk ] = "L~ysbiletvising";\
+ 		Text[ tswana ] = "~Dikgogelothoko Tebo";\
+ 		Text[ basque ] = "~Diapositiba-ikuspegia";\
+-		Text[ lithuanian ] = "S~kaidrių rodinys";\
++		Text[ lithuanian ] = "S~kaidrių vaizdas";\
+ 		Text[ kannada ] = "ಜಾರುಫಲಕಗಳ ನೋಟ";\
+ 		Text[ galician ] = "Modo ~diapositivas";\
+ 	};
+diff -urN sd/source/ui/app/strings.src sd/source/ui/app/strings.src
+--- sd/source/ui/app/strings.src	2004-09-09 20:08:22.000000000 +0300
++++ sd/source/ui/app/strings.src	2004-11-09 14:22:08.000000000 +0200
+@@ -4194,7 +4194,7 @@
+ 	Text[ norwegian_nynorsk ] = "Lysbiletvising";
+ 	Text[ tswana ] = "Thoko Tebo";
+ 	Text[ basque ] = "Diapositiba-ikuspegia";
+-	Text[ lithuanian ] = "Skaidrių rodinys";
++	Text[ lithuanian ] = "Skaidrių vaizdas";
+ 	Text[ kannada ] = "ಜಾರುಫಲಕ ನೋಟ";
+ 	Text[ galician ] = "Modo diapositivas";
+ };
+diff -urN sfx2/sdi/sfxslots.src sfx2/sdi/sfxslots.src
+--- sfx2/sdi/sfxslots.src	2004-09-09 21:29:01.000000000 +0300
++++ sfx2/sdi/sfxslots.src	2004-11-09 14:22:08.000000000 +0200
+@@ -5643,7 +5643,7 @@
+ 	SlotName[ norwegian_nynorsk ] = "F�rehandsvis sida";
+ 	SlotName[ tswana ] = "Tebo gape ya tsebe";
+ 	SlotName[ basque ] = "Orrialdearen aurrebista";
+-	SlotName[ lithuanian ] = "Užverti peržiūrą";
++	SlotName[ lithuanian ] = "Spaudinio peržiūra";
+ 	SlotName[ kannada ] = "ಪುಟ ಮುನ್ನೋಟ";
+ 	SlotName[ galician ] = "Ver a p�xina";
+ };
+diff -urN sfx2/source/appl/app.src sfx2/source/appl/app.src
+--- sfx2/source/appl/app.src	2004-09-09 21:29:32.000000000 +0300
++++ sfx2/source/appl/app.src	2004-11-09 14:22:08.000000000 +0200
+@@ -963,7 +963,7 @@
+ 	Text[ norwegian_nynorsk ] = "Vis";
+ 	Text[ tswana ] = "Tebo";
+ 	Text[ basque ] = "Ikusi";
+-	Text[ lithuanian ] = "Rodinys";
++	Text[ lithuanian ] = "Rodyti";
+ 	Text[ kannada ] = "ನೋಟ";
+ 	Text[ galician ] = "Ver";
+ };
+diff -urN starmath/source/menu.src starmath/source/menu.src
+--- starmath/source/menu.src	2004-09-09 19:39:59.000000000 +0300
++++ starmath/source/menu.src	2004-11-09 14:22:08.000000000 +0200
+@@ -1065,7 +1065,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Tebo";
+ 			Text[ basque ] = "~Ikusi";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ kannada ] = "ನೋಟ";
+ 			Text[ galician ] = "~Ver";
+ 		};
+@@ -2511,7 +2511,7 @@
+ 			Text[ norwegian_nynorsk ] = "~Vis";
+ 			Text[ tswana ] = "~Tebo";
+ 			Text[ basque ] = "~Ikusi";
+-			Text[ lithuanian ] = "~Rodinys";
++			Text[ lithuanian ] = "~Rodyti";
+ 			Text[ kannada ] = "ನೋಟ";
+ 			Text[ galician ] = "~Ver";
+ 		};
+diff -urN svx/source/gallery2/gallery.src svx/source/gallery2/gallery.src
+--- svx/source/gallery2/gallery.src	2004-09-09 19:14:20.000000000 +0300
++++ svx/source/gallery2/gallery.src	2004-11-09 14:22:08.000000000 +0200
+@@ -930,7 +930,7 @@
+ 		Text[ norwegian_nynorsk ] = "~F�rehandsvising";
+ 		Text[ tswana ] = "Leba~gape";
+ 		Text[ basque ] = "Aurr~ebista";
+-		Text[ lithuanian ] = "~Rodinys";
++		Text[ lithuanian ] = "~Rodyti";
+ 		Text[ kannada ] = "ಮುನ್ನೋಟ";
+ 		Text[ galician ] = "Pr~evisualizaci�n";
+ 	};
+@@ -3158,7 +3158,7 @@
+ 	Text[ norwegian_nynorsk ] = "Ikonvising";
+ 	Text[ tswana ] = "Setshwantso Leba";
+ 	Text[ basque ] = "Ikonoen ikuspegia";
+-	Text[ lithuanian ] = "Mygtuko rodinys";
++	Text[ lithuanian ] = "Ikonų peržiūra";
+ 	Text[ kannada ] = "ಲಾಂಛನ ನೋಟ";
+ 	Text[ galician ] = "Ver s�mbolos";
+ };
+diff -urN sw/source/ui/docvw/access.src sw/source/ui/docvw/access.src
+--- sw/source/ui/docvw/access.src	2004-09-09 20:29:38.000000000 +0300
++++ sw/source/ui/docvw/access.src	2004-11-09 14:22:08.000000000 +0200
+@@ -101,7 +101,7 @@
+ 	Text[ norwegian_nynorsk ] = "Dokumentvising";
+ 	Text[ tswana ] = "Setlankana lebelela";
+ 	Text[ basque ] = "Dokumentu-ikuspegia";
+-	Text[ lithuanian ] = "Dokumento rodinys";
++	Text[ lithuanian ] = "Dokumento vaizdas";
+ 	Text[ kannada ] = "ದಸ್ತಾವೇಜು ನೋಟ";
+ 	Text[ galician ] = "Document view";
+ };
+@@ -146,7 +146,7 @@
+ 	Text[ norwegian_nynorsk ] = "Dokumentvising";
+ 	Text[ tswana ] = "Setlankana lebelela";
+ 	Text[ basque ] = "Dokumentu-ikuspegia";
+-	Text[ lithuanian ] = "Dokumento rodinys";
++	Text[ lithuanian ] = "Dokumento vaizdas";
+ 	Text[ kannada ] = "ದಸ್ತಾವೇಜು ನೋಟ";
+ 	Text[ galician ] = "Document view";
+ };
+diff -urN sw/source/ui/inc/swmn.hrc sw/source/ui/inc/swmn.hrc
+--- sw/source/ui/inc/swmn.hrc	2004-09-09 20:36:08.000000000 +0300
++++ sw/source/ui/inc/swmn.hrc	2004-11-09 14:22:08.000000000 +0200
+@@ -7357,7 +7357,7 @@
+ 	Text[ norwegian_nynorsk ] = "~Vis";
+ 	Text[ tswana ] = "~Lebelela";
+ 	Text[ basque ] = "~Ikusi";
+-	Text[ lithuanian ] = "~Rodinys";
++	Text[ lithuanian ] = "~Rodyti";
+ 	Text[ kannada ] = "ನೋಟ";
+ 	Text[ galician ] = "~Ver";
+ };
+diff -urN sw/source/ui/misc/linenum.src sw/source/ui/misc/linenum.src
+--- sw/source/ui/misc/linenum.src	2004-09-09 20:38:35.000000000 +0300
++++ sw/source/ui/misc/linenum.src	2004-11-09 14:22:08.000000000 +0200
+@@ -802,7 +802,7 @@
+ 		Text[ norwegian_nynorsk ] = "Vis";
+ 		Text[ tswana ] = "Lebelela";
+ 		Text[ basque ] = "Ikusi";
+-		Text[ lithuanian ] = "Rodinys";
++		Text[ lithuanian ] = "Rodyti";
+ 		Text[ kannada ] = "ನೋಟ";
+ 		Text[ galician ] = "Visualizaci�n";
+ 	};
+diff -urN sw/source/ui/utlui/navipi.src sw/source/ui/utlui/navipi.src
+--- sw/source/ui/utlui/navipi.src	2004-09-09 20:44:42.000000000 +0300
++++ sw/source/ui/utlui/navipi.src	2004-11-09 14:22:08.000000000 +0200
+@@ -660,7 +660,7 @@
+ 			Text[ tswana ] = "shobokanyo Lebelela";
+ 			Text[ norwegian_nynorsk ] = "Innhaldsvising";
+ 			Text[ basque ] = "Edukiaren ikuspegia";
+-			Text[ lithuanian ] = "Turinio rodinys";
++			Text[ lithuanian ] = "Turinio vaizdas";
+ 			Text[ kannada ] = "ವಿಷಯದ ನೋಟ";
+ 			Text[ galician ] = "Conmutar vista do contido";
+ 		};
diff --git a/patches/OOO_1_1/mandrakelinux-splash.diff b/patches/OOO_1_1/mandrakelinux-splash.diff
new file mode 100644
index 000000000..3ee628668
--- /dev/null
+++ b/patches/OOO_1_1/mandrakelinux-splash.diff
@@ -0,0 +1,45 @@
+--- offmgr/source/offapp/intro/ooo.src.mdksplash	2004-04-27 18:19:18.000000000 +0200
++++ offmgr/source/offapp/intro/ooo.src	2004-09-01 19:00:08.793566108 +0200
+@@ -77,18 +77,18 @@
+ #include "intro.hrc"
+ 
+ #ifdef BUILD_SPECIAL
+-#define OOO_VENDOR "Sun Microsystems Inc."
++#define OOO_VENDOR "Mandrakesoft S.A."
+ #define OOO_LICENSE "LGPL"
+-#define OOO_INTRO "openintro_sun.bmp"
++#define OOO_INTRO "openintro_mandrakelinux.bmp"
+ #else
+-//#define OOO_VENDOR "my company"
++#define OOO_VENDOR "Mandrakesoft S.A."
+ #define OOO_LICENSE "LGPL"
+-#define OOO_INTRO "openintro.bmp"
++#define OOO_INTRO "openintro_mandrakelinux.bmp"
+ #endif
+ 
+ Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
+ {
+-	File = "openabout.bmp" ;
++	File = "openabout_mandrakelinux.bmp" ;
+ };
+ 
+ Bitmap RID_DEFAULTINTRO
+--- desktop/source/splash/splash.cxx.orig	2004-09-01 19:17:07.307088887 +0200
++++ desktop/source/splash/splash.cxx	2004-09-01 19:16:02.745484965 +0200
+@@ -254,6 +254,7 @@
+ 		if (length < 0) length = 0;
+ 		const Color cBlue(COL_BLUE);
+ 		const Color cGray(COL_LIGHTGRAY);
++		const Color cWhite(COL_WHITE);
+ 
+ 		// border
+ 		SetFillColor();
+@@ -262,7 +263,7 @@
+ 			_tly+_barheight));	
+ 
+ 		// progress bar
+-		SetFillColor(cBlue);
++		SetFillColor(cWhite);
+ 		SetLineColor();
+ 		DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, 
+ 			_tlx+_barspace+length, _tly+_barheight-_barspace));		
diff --git a/patches/OOO_1_1/ms-interoperability-email-attachment-as-xls-ppt.diff b/patches/OOO_1_1/ms-interoperability-email-attachment-as-xls-ppt.diff
new file mode 100644
index 000000000..61620584d
--- /dev/null
+++ b/patches/OOO_1_1/ms-interoperability-email-attachment-as-xls-ppt.diff
@@ -0,0 +1,505 @@
+--- sfx2/source/inc/mailmodel.hxx	2002-08-26 13:30:37.000000000 +0530
++++ sfx2/source/inc/mailmodel.hxx	2004-11-30 17:05:01.000000000 +0530
+@@ -90,6 +90,9 @@
+ 	enum MailDocType
+ 	{
+ 		TYPE_SELF,
++		TYPE_ASMSDOC,
++		TYPE_ASMSEXCEL,
++		TYPE_ASMSPOWERPOINT,
+ 		TYPE_ASPDF
+ 	};
+ 
+@@ -114,7 +117,7 @@
+ 	void				ClearList( AddressList_Impl* pList );
+ 	void				MakeValueList( AddressList_Impl* pList, String& rValueList );
+ 	SaveResult			SaveDocument( String& rFileName, String& rType );
+-	SaveResult			SaveDocAsPDF( String& rFileName, String& rType );
++	SaveResult			SaveDocAs( String& rFileName, String& rType,MailDocType mailDocType );
+ 
+ 	DECL_LINK( DoneHdl, void* );
+ 
+
+--- sfx2/source/dialog/mailmodel.cxx	2004-11-26 21:41:16.000000000 +0530
++++ sfx2/source/dialog/mailmodel.cxx	2004-11-30 17:09:23.000000000 +0530
+@@ -402,7 +402,7 @@
+ 	return eRet;
+ }
+ 
+-SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAsPDF( String& rFileName, String& rType )
++SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAs( String& rFileName, String& rType,MailDocType mailDocType )
+ {
+ 	SaveResult eRet = SAVE_CANCELLED;
+ 	SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame();
+@@ -422,9 +422,15 @@
+ 		SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer();
+ 		if ( pFilterContainer )
+ 		{
+-			String aPDFExtension = String::CreateFromAscii( ".pdf" );
++			String aExtension ;
++			switch (mailDocType){
++			case TYPE_ASPDF   : aExtension = String::CreateFromAscii( ".pdf" );break;
++			case TYPE_ASMSDOC : aExtension = String::CreateFromAscii( ".doc" );break;
++			case TYPE_ASMSEXCEL : aExtension = String::CreateFromAscii( ".xls" );break;
++			case TYPE_ASMSPOWERPOINT : aExtension = String::CreateFromAscii( ".ppt" );break;
++			}
+ 
+-			const SfxFilter*	pFilter		= pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT );
++			const SfxFilter*	pFilter		= pFilterContainer->GetFilter4Extension( aExtension, SFX_FILTER_EXPORT );
+ 			sal_Bool			bHasFilter	= pFilter ? sal_True : sal_False;
+ 
+ 			// create temp file name with leading chars and extension
+@@ -440,7 +446,7 @@
+ 				String aName;
+ 				if ( aFileObj.hasExtension() )
+ 				{
+-					pExt = new String( aPDFExtension );
++					pExt = new String( aExtension );
+ 					aFileObj.removeExtension();
+ 					aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+ 				//	aLeadingStr += String::CreateFromAscii( "_" );
+@@ -463,11 +469,25 @@
+ 			delete pExt;
+ 
+ 			rFileName = aTempFile.GetURL();
++		SfxBoolItem aPicklist( SID_PICKLIST, FALSE );
++		SfxBoolItem aSaveTo( SID_SAVETO, TRUE );
++		SfxStringItem* pFilterName = NULL;
++		if ( pFilter && bHasFilter )
++            pFilterName = new SfxStringItem( SID_FILTER_NAME, pFilter->GetFilterName() );
++		
++		SfxStringItem* pPassItem = NULL;
++		String aPasswd;
++		if ( GetPasswd_Impl( xDocShell->GetMedium()->GetItemSet(), aPasswd ) )
++			pPassItem = new SfxStringItem( SID_PASSWORD, aPasswd );
+ 
+ 			// save document to temp file
+ 			SfxStringItem aFileName( SID_FILE_NAME, rFileName );
+-			const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_EXPORTDOCASPDF, SFX_CALLMODE_SYNCHRON, &aFileName, 0L );
+-			BOOL bRet = pRet ? pRet->GetValue() : FALSE;
++  const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, &aFileName, &aPicklist, &aSaveTo,
++                                                                                                                                                 pFilterName ? pFilterName : pPassItem,
++                                                                                                                                                 pFilterName ? pPassItem : 0L, 0L );
++
++/*			const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_EXPORTDOCASPDF, SFX_CALLMODE_SYNCHRON, &aFileName, 0L );
++*/			BOOL bRet = pRet ? pRet->GetValue() : FALSE;
+ 			eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED;
+ 			
+ 			if ( pFilter )
+@@ -568,11 +590,16 @@
+ 	String aFileName, aContentType;
+ 
+ 	sal_Bool bSuccessfull = sal_False;
+-	if ( eMailDocType == TYPE_SELF )
+-		eSaveResult = SaveDocument( aFileName, aContentType );
+-	else
+-		eSaveResult = SaveDocAsPDF( aFileName, aContentType );
+-
++	switch (eMailDocType){
++	    case TYPE_ASMSDOC:
++	    case TYPE_ASMSPOWERPOINT:
++	    case TYPE_ASPDF:
++	    case TYPE_ASMSEXCEL:
++			 	eSaveResult = SaveDocAs( aFileName, aContentType,eMailDocType );
++				break;
++	    default:
++				eSaveResult = SaveDocument( aFileName, aContentType);
++	} 
+     if ( eSaveResult == SAVE_SUCCESSFULL )
+ 	{
+     	SfxFrame* pViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetFrame();
+
+--- sfx2/sdi/sfx.sdi	2004-03-30 18:26:27.000000000 +0530
++++ sfx2/sdi/sfx.sdi	2004-11-30 16:36:40.000000000 +0530
+@@ -6982,7 +6982,6 @@
+ 	ToolBoxConfig = TRUE,
+ 	GroupId = GID_DOCUMENT;
+ ]
+-
+ //--------------------------------------------------------------------------
+ SfxBoolItem SendMail SID_MAIL_SENDDOC
+ (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)
+@@ -7010,7 +7009,88 @@
+ 	ToolBoxConfig = TRUE,
+ 	GroupId = GID_DOCUMENT;
+ ]
++SfxBoolItem SendMailDocAsMSDoc SID_MAIL_SENDDOCASMSDOC
++(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)
++[
++	/* flags: */
++	AutoUpdate = FALSE,
++	Cachable = Cachable,
++	FastCall = FALSE,
++	HasCoreId = FALSE,
++	HasDialog = TRUE,
++	ReadOnlyDoc = TRUE,
++	Toggle = FALSE,
++	Container = FALSE,
++	RecordAbsolute = FALSE,
++	RecordPerSet;
++	Asynchron;
++
++	/* status: */
++	SlotType = SfxStringItem
+ 
++	/* config: */
++	AccelConfig = TRUE,
++	MenuConfig = TRUE,
++	StatusBarConfig = FALSE,
++	ToolBoxConfig = TRUE,
++	GroupId = GID_DOCUMENT;
++]
++//--------------------------------------------------------------------------
++SfxBoolItem SendMailDocAsMSExcel SID_MAIL_SENDDOCASMSEXCEL
++(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)
++[
++        /* flags: */
++        AutoUpdate = FALSE,
++        Cachable = Cachable,
++        FastCall = FALSE,
++        HasCoreId = FALSE,
++        HasDialog = TRUE,
++        ReadOnlyDoc = TRUE,
++        Toggle = FALSE,
++        Container = FALSE,
++        RecordAbsolute = FALSE,
++        RecordPerSet;
++        Asynchron;
++                                                                                                    
++        /* status: */
++        SlotType = SfxStringItem
++                                                                                                    
++        /* config: */
++        AccelConfig = TRUE,
++        MenuConfig = TRUE,
++        StatusBarConfig = FALSE,
++        ToolBoxConfig = TRUE,
++        GroupId = GID_DOCUMENT;
++]
++
++//--------------------------------------------------------------------------
++SfxBoolItem SendMailDocAsMSPowerPoint SID_MAIL_SENDDOCASMSPOWERPOINT
++(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)
++[
++        /* flags: */
++        AutoUpdate = FALSE,
++        Cachable = Cachable,
++        FastCall = FALSE,
++        HasCoreId = FALSE,
++        HasDialog = TRUE,
++        ReadOnlyDoc = TRUE,
++        Toggle = FALSE,
++        Container = FALSE,
++        RecordAbsolute = FALSE,
++        RecordPerSet;
++        Asynchron;
++                                                                                                    
++        /* status: */
++        SlotType = SfxStringItem
++                                                                                                    
++        /* config: */
++        AccelConfig = TRUE,
++        MenuConfig = TRUE,
++        StatusBarConfig = FALSE,
++        ToolBoxConfig = TRUE,
++        GroupId = GID_DOCUMENT;
++]
++//--------------------------------------------------------------------------
+ SfxBoolItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
+ (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)
+ [
+
+--- sfx2/sdi/sfxslots.src	2004-11-26 21:41:10.000000000 +0530
++++ sfx2/sdi/sfxslots.src	2004-11-30 16:56:29.000000000 +0530
+@@ -4756,6 +4756,24 @@
+ 	SlotName[ kannada ] = "ದಸ್ತಾವೇಜನ್ನು ಕಳಿಸು";
+ 	SlotName[ galician ] = "Enviar o documento";
+ };
++SfxSlotInfo SID_MAIL_SENDDOCASMSDOC
++{
++        SlotName  =  "Send document as MS-DOC Attachment";
++        SlotName [ english ] =  "Send document as MS-DOC Attachment";
++        SlotName [ english_us ] =  "Send document as MS-DOC Attachment";
++};
++SfxSlotInfo SID_MAIL_SENDDOCASMSEXCEL
++{
++        SlotName  =  "Send document as MS-EXCEL Attachment";
++        SlotName [ english ] =  "Send document as MS-EXCEL Attachment";
++        SlotName [ english_us ] =  "Send document as MS-EXCEL Attachment";
++};
++SfxSlotInfo SID_MAIL_SENDDOCASMSPOWERPOINT
++{
++        SlotName  =  "Send document as MS-POWERPOINT Attachment";
++        SlotName [ english ] =  "Send document as MS-POWERPOINT Attachment";
++        SlotName [ english_us ] =  "Send document as MS-POWERPOINT Attachment";
++};
+ SfxSlotInfo SID_MAIL_SENDDOCASPDF
+ {
+ 	SlotName = "Dokument als PDF-Anhang versenden";
+
+--- sfx2/inc/sfxsids.hrc	2004-11-26 21:41:02.000000000 +0530
++++ sfx2/inc/sfxsids.hrc	2004-11-30 16:30:43.000000000 +0530
+@@ -147,7 +147,10 @@
+ #define SID_MAIL_OPEN                       (SID_SFX_START + 329)
+ #define SID_MAIL_NOTIFY                     (SID_SFX_START + 330)
+ #define SID_MAIL_SENDDOC                    (SID_SFX_START + 331)
+-#define	SID_MAIL_SENDDOCASPDF				(SID_SFX_START + 1672)
++#define	SID_MAIL_SENDDOCASPDF			(SID_SFX_START + 1672)
++#define	SID_MAIL_SENDDOCASMSDOC			(SID_SFX_START + 1686)
++#define	SID_MAIL_SENDDOCASMSEXCEL		(SID_SFX_START + 1687)
++#define	SID_MAIL_SENDDOCASMSPOWERPOINT		(SID_SFX_START + 1688)
+ #define SID_MAIL_INBOX                      (SID_SFX_START + 332)
+ 
+ #define SID_MAIL_RECIPIENT					(SID_SFX_START + 334)
+@@ -554,7 +557,7 @@
+ #define SID_REPAIRPACKAGE          			(SID_SFX_START + 1683)
+ #define SID_ADDONHELP						(SID_SFX_START + 1684)
+ #define SID_OBJECTSHELL                     (SID_SFX_START + 1685)
+-#define SID_SFX_free_START                  (SID_SFX_START + 1686)
++#define SID_SFX_free_START                  (SID_SFX_START + 1689)
+ #define SID_SFX_free_END  					(SID_SFX_START + 3999)
+ 
+ #define SID_OPEN_NEW_VIEW                   (SID_SFX_START + 520)
+
+--- sfx2/sdi/viwslots.sdi	2002-08-26 13:02:06.000000000 +0530
++++ sfx2/sdi/viwslots.sdi	2004-11-30 22:05:45.000000000 +0530
+@@ -22,6 +22,21 @@
+ 		ExecMethod = ExecMisc_Impl ;
+ 		StateMethod = GetState_Impl ;
+ 	]
++	SID_MAIL_SENDDOCASMSDOC // ole(no) api(todo)
++	[
++		ExecMethod = ExecMisc_Impl ;
++		StateMethod = GetState_Impl ;
++	]
++	SID_MAIL_SENDDOCASMSEXCEL // ole(no) api(todo)
++	[
++		ExecMethod = ExecMisc_Impl ;
++		StateMethod = GetState_Impl ;
++	]
++	SID_MAIL_SENDDOCASMSPOWERPOINT // ole(no) api(todo)
++	[
++		ExecMethod = ExecMisc_Impl ;
++		StateMethod = GetState_Impl ;
++	]
+ 	 //---------------------------------------------------------------------
+ 	SID_PRINTDOC // ole(no) api(play/rec)
+ 	[
+
+--- sfx2/source/view/viewsh.cxx	2003-11-07 15:42:06.000000000 +0530
++++ sfx2/source/view/viewsh.cxx	2004-12-01 17:46:28.075380424 +0530
+@@ -185,6 +185,9 @@
+ 
+ 		case SID_MAIL_SENDDOCASPDF:
+ 		case SID_MAIL_SENDDOC:
++		case SID_MAIL_SENDDOCASMSDOC:
++		case SID_MAIL_SENDDOCASMSEXCEL:
++		case SID_MAIL_SENDDOCASMSPOWERPOINT:
+             if ( SvtInternalOptions().MailUIEnabled() )
+             {
+                 GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, TRUE );
+@@ -209,10 +212,18 @@
+ 				}
+ 
+ 				SfxMailModel_Impl::SendMailResult eResult = SfxMailModel_Impl::SEND_MAIL_ERROR;
+-				if ( nId == SID_MAIL_SENDDOCASPDF )
+-					eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASPDF );
+-				else
+-					eResult = aModel.Send( SfxMailModel_Impl::TYPE_SELF );
++				switch (nId) {
++					case SID_MAIL_SENDDOCASPDF: 
++						 eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASPDF );break;
++					case SID_MAIL_SENDDOCASMSDOC:
++						 eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSDOC );break;
++					case SID_MAIL_SENDDOCASMSEXCEL:  
++						eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSEXCEL );break;
++					case SID_MAIL_SENDDOCASMSPOWERPOINT: 
++						 eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSPOWERPOINT );break;
++					default:
++						eResult = aModel.Send( SfxMailModel_Impl::TYPE_SELF );
++				}
+ 
+ 				if ( eResult == SfxMailModel_Impl::SEND_MAIL_ERROR )
+ 				{
+@@ -325,6 +336,9 @@
+ 			// Mail-Funktionen
+ 			case SID_MAIL_SENDDOCASPDF:
+ 			case SID_MAIL_SENDDOC:
++			case SID_MAIL_SENDDOCASMSDOC:
++			case SID_MAIL_SENDDOCASMSEXCEL:
++			case SID_MAIL_SENDDOCASMSPOWERPOINT:
+ 			{
+                 BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );
+ 				if ( !bEnable )
+@@ -348,6 +362,60 @@
+ 					rSet.DisableItem( nSID );
+ 				}
+ 
++				else if ( nSID == SID_MAIL_SENDDOCASMSDOC )
++				{
++					SfxObjectShellRef xDocShell = GetViewFrame()->GetObjectShell();
++					if ( xDocShell.Is() )
++					{
++						// Get PDF Filter from container
++						SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer();
++						if ( pFilterContainer )
++						{
++							String aPDFExtension = String::CreateFromAscii( ".doc" );
++							const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT );
++							if ( pFilter != NULL )
++								break;
++						}
++					}
++
++					rSet.DisableItem( nSID );
++				}
++				else if ( nSID == SID_MAIL_SENDDOCASMSEXCEL )
++				{
++					SfxObjectShellRef xDocShell = GetViewFrame()->GetObjectShell();
++					if ( xDocShell.Is() )
++					{
++						// Get PDF Filter from container
++						SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer();
++						if ( pFilterContainer )
++						{
++							String aPDFExtension = String::CreateFromAscii( ".xls" );
++							const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT );
++							if ( pFilter != NULL )
++								break;
++						}
++					}
++
++					rSet.DisableItem( nSID );
++				}
++				else if ( nSID == SID_MAIL_SENDDOCASMSPOWERPOINT )
++				{
++					SfxObjectShellRef xDocShell = GetViewFrame()->GetObjectShell();
++					if ( xDocShell.Is() )
++					{
++						// Get PDF Filter from container
++						SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer();
++						if ( pFilterContainer )
++						{
++							String aPDFExtension = String::CreateFromAscii( ".ppt" );
++							const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT );
++							if ( pFilter != NULL )
++								break;
++						}
++					}
++
++					rSet.DisableItem( nSID );
++				}
+ 				break;
+ 			}
+ 
+
+--- svx/inc/globlmn.hrc	2004-11-26 21:40:58.000000000 +0530
++++ svx/inc/globlmn.hrc	2004-12-01 17:33:01.865942888 +0530
+@@ -3251,6 +3251,30 @@
+ 	Text[ kannada ] = "ಸ್ವಯಂಚಾಲಿತ ಅಂಚೆ"; \
+ 	Text[ galician ] = "~Correo autom�tico"; \
+ 
++#define ITEM_FILE_MAIL_SENDDOCASMSDOC \
++    Identifier = SID_MAIL_SENDDOCASMSDOC ; \
++	Command = ".uno:SendMailDocAsMSDoc" ; \
++    HelpID = SID_MAIL_SENDDOCASMSDOC ; \
++    Text = "Dokument als E-~Mail..." ; \
++    Text [ english ] = "Document as MS-~Doc Attachment..." ; \
++    Text [ english_us ] = "Document as MS-~Doc Attachment..." ; \
++
++#define ITEM_FILE_MAIL_SENDDOCASMSEXCEL \
++    Identifier = SID_MAIL_SENDDOCASMSEXCEL ; \
++	Command = ".uno:SendMailDocAsMSExcel" ; \
++    HelpID = SID_MAIL_SENDDOCASMSEXCEL ; \
++    Text = "Dokument als ~E-Mail..." ; \
++    Text [ english ] = "Document as MS-~Excel Attachment..." ; \
++    Text [ english_us ] = "Document as MS-~Excel Attachment..." ; \
++
++#define ITEM_FILE_MAIL_SENDDOCASMSPOWERPOINT \
++    Identifier = SID_MAIL_SENDDOCASMSPOWERPOINT ; \
++	Command = ".uno:SendMailDocAsMSPowerPoint" ; \
++    HelpID = SID_MAIL_SENDDOCASMSPOWERPOINT ; \
++    Text = "Dokument als E-Mail..." ; \
++    Text [ english ] = "Document as MS-~PPT Attachment..." ; \
++    Text [ english_us ] = "Document as MS-~PPT Attachment..." ; \
++
+ #define ITEM_FILE_MAIL_SENDDOC \
+     Identifier = SID_MAIL_SENDDOC ; \
+ 	Command = ".uno:SendMail" ; \
+
+--- sw/sdi/wviewsh.sdi	2003-03-27 21:09:12.000000000 +0530
++++ sw/sdi/wviewsh.sdi	2004-11-29 20:58:45.000000000 +0530
+@@ -223,6 +223,11 @@
+     [
+         StateMethod = GetState ;
+     ]
++    SID_MAIL_SENDDOCASMSDOC
++    [
++        ExecMethod = Execute ;
++        StateMethod = GetState ;
++    ]
+ }
+ 
+ shell SwSrcView : SfxViewShell
+
+--- sw/source/ui/inc/swmn.hrc	2004-11-26 21:41:10.000000000 +0530
++++ sw/source/ui/inc/swmn.hrc	2004-11-29 21:04:08.000000000 +0530
+@@ -5121,6 +5121,10 @@
+                                                 {
+                                                         ITEM_FILE_MAIL_SENDDOCASPDF
+                                                 };
++                                                MenuItem
++                                                {
++                                                        ITEM_FILE_MAIL_SENDDOCASMSDOC
++                                                };
+                                         };
+                                 };
+                         	Text[ english_us ] = "Send";
+@@ -5182,6 +5186,11 @@
+                                                 {
+                                                         ITEM_FILE_MAIL_SENDDOCASPDF
+                                                 };
++                                                MenuItem
++                                                {
++                                                        ITEM_FILE_MAIL_SENDDOCASMSDOC
++                                                };
++
+ 						SEPARATOR ;
+ 						MenuItem
+ 						{
+
+--- /home/mjayant/OOO_113_backup/ooo-build/build/OOO_1_1_3/sd/source/ui/app/menuids2.src	2004-11-26 21:41:10.000000000 +0530
++++ sd/source/ui/app/menuids2.src	2004-11-30 21:47:12.000000000 +0530
+@@ -249,6 +249,7 @@
+             {\
+                 MI ( ITEM_FILE_MAIL_SENDDOC ) \
+ 				MI ( ITEM_FILE_MAIL_SENDDOCASPDF ) \
++				MI ( ITEM_FILE_MAIL_SENDDOCASMSPOWERPOINT ) \
+             };\
+         };\
+         Text [ portuguese_brazilian ] = "~Enviar" ; \
+
+--- sc/source/ui/src/menue.src	2004-11-26 21:41:10.000000000 +0530
++++ sc/source/ui/src/menue.src	2004-12-01 18:05:15.435995560 +0530
+@@ -342,6 +342,10 @@
+ 								{
+ 									ITEM_FILE_MAIL_SENDDOCASPDF
+ 								};
++								MenuItem
++								{
++									ITEM_FILE_MAIL_SENDDOCASMSEXCEL
++								};
+ 							};
+ 						};
+ 						Text [ portuguese ] = "~Enviar" ;
+@@ -6397,6 +6401,10 @@
+ 								{
+ 									ITEM_FILE_MAIL_SENDDOCASPDF
+ 								};
++								MenuItem
++								{
++									ITEM_FILE_MAIL_SENDDOCASMSEXCEL
++								};
+ 							};
+ 						};
+ 						Text [ portuguese ] = "~Enviar" ;
diff --git a/patches/OOO_1_1/native-fpicker-not-default.diff b/patches/OOO_1_1/native-fpicker-not-default.diff
new file mode 100644
index 000000000..26de5a2de
--- /dev/null
+++ b/patches/OOO_1_1/native-fpicker-not-default.diff
@@ -0,0 +1,17 @@
+Index: Common.xcu
+===================================================================
+RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
+retrieving revision 1.13.34.2
+diff -u -r1.13.34.2 Common.xcu
+--- officecfg/registry/data/org/openoffice/Office/Common.xcu	6 Jul 2004 10:50:06 -0000	1.13.34.2
++++ officecfg/registry/data/org/openoffice/Office/Common.xcu	21 Dec 2004 15:40:02 -0000
+@@ -437,4 +437,9 @@
+       </node>
+     </node>
+   </node>
++  <node oor:name="Misc">
++    <prop oor:name="UseSystemFileDialog" oor:type="xs:boolean">
++      <value>false</value>
++    </prop>
++  </node> 
+ </oor:component-data>
diff --git a/patches/OOO_1_1/no-splash-takeover.patch b/patches/OOO_1_1/no-splash-takeover.patch
index 632e24458..167e44bd6 100644
--- a/patches/OOO_1_1/no-splash-takeover.patch
+++ b/patches/OOO_1_1/no-splash-takeover.patch
@@ -1,6 +1,6 @@
---- vcl/source/window/introwin.cxx.nosplashontop	2003-11-17 17:52:25.000000000 -0500
-+++ vcl/source/window/introwin.cxx	2003-11-17 17:52:36.000000000 -0500
-@@ -126,10 +126,10 @@
+--- vcl/source/window/introwin.cxx
++++ vcl/source/window/introwin.cxx
+@@ -114,10 +120,11 @@ void IntroWindow::ImplInitData()
  // -----------------------------------------------------------------------
  
  IntroWindow::IntroWindow( ) :
@@ -10,6 +10,7 @@
      ImplInitData();
 -    WorkWindow::ImplInit( 0, WB_INTROWIN, NULL );
 +    WorkWindow::ImplInit( 0, WB_NOBORDER, NULL );
++    SetText(XubString(RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org...")));
  }
  
  // -----------------------------------------------------------------------
diff --git a/patches/OOO_1_1/novell-japanese-fonts.diff b/patches/OOO_1_1/novell-japanese-fonts.diff
index 870f8103b..1d41ce06e 100644
--- a/patches/OOO_1_1/novell-japanese-fonts.diff
+++ b/patches/OOO_1_1/novell-japanese-fonts.diff
@@ -1,6 +1,6 @@
---- officecfg/registry/data/org/openoffice/VCL.xcu.orig	2004-09-23 17:24:21.660322994 +0200
-+++ officecfg/registry/data/org/openoffice/VCL.xcu	2004-09-23 17:33:21.481583768 +0200
-@@ -452,25 +452,25 @@
+--- officecfg/registry/data/org/openoffice/VCL.xcu	2005-01-18 13:36:29.538302380 -0800
++++ officecfg/registry/data/org/openoffice/VCL.xcu	2005-01-18 13:39:04.100290571 -0800
+@@ -457,25 +457,25 @@
      </node>
      <node oor:name="ja-jp" oor:op="replace">
        <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
@@ -13,11 +13,11 @@
        </prop>
        <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
 -        <value>Andale Sans UI;MS P ゴシック;TLPゴシック;LXゴシック;東風ゴシック;kochigothic;Gothic;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+        <value>Andale Sans UI;MS P ゴシック;HGPGothicB;TLPゴシック;LXゴシック;IPAPGothic;Sazanami Gothic;東風ゴシック;kochigothic;Gothic;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
++        <value>Andale Sans UI;MS P ゴシック;HGPGothicB;TLPゴシック;LXゴシック;IPAPGothic;Sazanami Gothic;東風ゴシック;kochigothic;Gothic;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>       
        </prop>
        <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
 -        <value>HG Mincho Light J;MS P 明朝;TLP明朝;LX明朝;東風明朝;Kochi Mincho;Mincho;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
-+        <value>HG Mincho Light J;MS P 明朝;HGPMinchoL;TLP明朝;LX明朝;IPAPMincho;Sazanami Mincho;東風明朝;Kochi Mincho;Mincho;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
++        <value>HG Mincho Light J;MS P 明朝;HGPMinchoL;TLP明朝;LX明朝;IPAPMincho;Sazanami Mincho;東風明朝;Kochi Mincho;Mincho;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>        
        </prop>
         <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
 -        <value>HG Mincho Light J;MS P ゴシック;TLPゴシック;LXゴシック;東風ゴシック;kochigothic;Gothic;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -29,16 +29,7 @@
         </prop>
        <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
 -        <value>Andale Sans UI;HG Mincho Light J;MS UI Gothic;TLPゴシック;LXゴシック;東風ゴシック;kochigothic;Gothic;gnu-unifont</value>
-+        <value>Andale Sans UI;HG Mincho Light J;MS UI Gothic;HGPGothicB;TLPゴシック;LXゴシック;IPAUIGothic;Sazanami Gothic;東風ゴシック;kochigothic;Gothic;gnu-unifont</value>
++        <value>方正宋体;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
        </prop>
        <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
          <value>HG Mincho Light J;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-@@ -502,7 +502,7 @@
-         <value>方正宋体;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-       </prop>
-       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
--        <value>Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
-+        <value>方正宋体;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
-       </prop>
-     </node>
-     <node oor:name="zh-tw" oor:op="replace">
diff --git a/patches/OOO_1_1/odk-fix-linux-archs.diff b/patches/OOO_1_1/odk-fix-linux-archs.diff
new file mode 100644
index 000000000..208d3501f
--- /dev/null
+++ b/patches/OOO_1_1/odk-fix-linux-archs.diff
@@ -0,0 +1,47 @@
+Index: settings/settings.mk
+===================================================================
+RCS file: /cvs/api/odk/settings/settings.mk,v
+retrieving revision 1.6.22.3
+diff -u -u -r1.6.22.3 settings.mk
+--- odk/settings/settings.mk	30 Mar 2004 14:31:46 -0000	1.6.22.3
++++ odk/settings/settings.mk	27 Nov 2004 21:09:09 -0000
+@@ -212,6 +212,21 @@
+ JAVA_PROC_TYPE=ppc
+ endif
+ 
++ifeq "$(PROCTYPE)" "arm"
++PACKAGE_LIB_DIR=linux_arm.plt
++JAVA_PROC_TYPE=arm
++endif
++
++ifeq "$(PROCTYPE)" "sparc"
++PACKAGE_LIB_DIR=linux_sparc.plt
++JAVA_PROC_TYPE=sparc
++endif
++
++ifeq "$(PROCTYOE)" "s390"
++PPACKAGE_LIB_DIR=linux_s390.plt
++JAVA_PROC_TYPE=s390
++endif
++
+ OS=LINUX
+ PS=/
+ CC=gcc
+@@ -265,7 +280,7 @@
+ CC_FLAGS=-c -O -fpic -fno-rtti
+ endif
+ 
+-ifeq "$(PROCTYPE)" "ppc"
++ifneq "$(PROCTYPE)" "i386" 
+ CC_FLAGS+=-fPIC
+ endif
+ 
+@@ -282,7 +297,7 @@
+ 
+ LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
+ 
+-ifeq "$(PROCTYPE)" "ppc"
++ifneq "$(PROCTYPE)" "i386"
+ LIBRARY_LINK_FLAGS+=-fPIC
+ endif
+ 
diff --git a/patches/OOO_1_1/officecfg-dont-deliver-report-wizard.diff b/patches/OOO_1_1/officecfg-dont-deliver-report-wizard.diff
new file mode 100644
index 000000000..441b30ad9
--- /dev/null
+++ b/patches/OOO_1_1/officecfg-dont-deliver-report-wizard.diff
@@ -0,0 +1,89 @@
+--- scp/source/office/profile.scp.report	2004-11-05 00:34:03.817000040 +0000
++++ scp/source/office/profile.scp	2004-11-05 00:41:47.927318603 +0000
+@@ -1171,42 +1171,6 @@
+         Styles           = (CFG_STRING, CREATE);
+ End
+ 
+-ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M9_URL
+-    #ifdef WEB_PRODUCT
+-        ModuleID         = GID_MODULE_PRG_WRT;
+-    #else
+-        ModuleID         = GID_MODULE_PRG_WRT_BIN;
+-    #endif
+-        Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m9']";
+-        Key              = "URL";
+-        Value            = "service:com.sun.star.wizards.report.CallReportWizard?start";
+-        Styles           = (CFG_STRING, CREATE);
+-End
+-
+-ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M9_TARGETNAME
+-    #ifdef WEB_PRODUCT
+-        ModuleID         = GID_MODULE_PRG_WRT;
+-    #else
+-        ModuleID         = GID_MODULE_PRG_WRT_BIN;
+-    #endif
+-        Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m9']";
+-        Key              = "TargetName";
+-        Value            = "_self";
+-        Styles           = (CFG_STRING, CREATE);
+-End
+-
+-ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M9_IMAGEIDENTIFIER
+-    #ifdef WEB_PRODUCT
+-        ModuleID         = GID_MODULE_PRG_WRT;
+-    #else
+-        ModuleID         = GID_MODULE_PRG_WRT_BIN;
+-    #endif
+-        Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m9']";
+-        Key              = "ImageIdentifier";
+-        Value            = "private:image/3216";
+-        Styles           = (CFG_STRING, CREATE);
+-End
+-
+ ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M10_URL
+         ModuleID         = GID_MODULE_SO_ROOT;
+         Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m10']";
+@@ -3464,43 +3428,6 @@
+ 	Styles		 = (CFG_STRING);
+ End
+ 
+-#ifdef FAT_PRODUCT
+-
+-StarRegistryItem GID_STARREGISTRYITEM_SERVICES_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/SERVICES/com.sun.star.wizards.report.CallReportWizard";
+-    SeqValue    = "com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation";
+-    Styles      = (NETWORK);
+-End
+-
+-StarRegistryItem GID_STARREGISTRYITEM_IMPLEMENTATIONS_SERVICES_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/IMPLEMENTATIONS/com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation/UNO/SERVICES/com.sun.star.wizards.report.CallReportWizard";
+-    Value       = "";
+-    Styles      = (NETWORK);
+-End
+-
+-StarRegistryItem GID_STARREGISTRYITEM_IMPLEMENTATIONS_ACTIVATOR_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/IMPLEMENTATIONS/com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation/UNO/ACTIVATOR";
+-    Value       = "com.sun.star.loader.Java2";
+-    Styles      = (NETWORK);
+-End
+-
+-StarRegistryItem GID_STARREGISTRYITEM_IMPLEMENTATIONS_LOCATION_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/IMPLEMENTATIONS/com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation/UNO/LOCATION";
+-    Value       = "vnd.sun.star.expand:$SYSBINDIR/classes/report.jar";
+-    Styles      = (NETWORK);
+-End
+-
+-#endif
+-
+-
+ // HACK: write accessibility bridge service info
+ 
+ #if ! ( defined (WEB_PRODUCT) || defined (SRV_PRODUCT) )
diff --git a/patches/OOO_1_1/padmin-ui-lang.diff b/patches/OOO_1_1/padmin-ui-lang.diff
new file mode 100644
index 000000000..0f94b2151
--- /dev/null
+++ b/patches/OOO_1_1/padmin-ui-lang.diff
@@ -0,0 +1,33 @@
+--- padmin/source/helper.cxx.lang-fix	2004-11-08 17:00:46.335593232 -0500
++++ padmin/source/helper.cxx	2004-11-08 17:02:21.028197768 -0500
+@@ -133,27 +133,10 @@
+ 	static ResMgr* pPaResMgr = NULL;
+ 	if( ! pPaResMgr )
+ 	{
+-		LanguageType nLang = LANGUAGE_SYSTEM;
+-       
+-        utl::OConfigurationNode aNode =
+-            utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
+-                    vcl::unohelper::GetMultiServiceFactory(),
+-                    OUString::createFromAscii( "org.openoffice.Setup/L10N" ) );
+-        if ( aNode.isValid() )
+-        {
+-            rtl::OUString aLoc;
+-            Any aValue = aNode.getNodeValue( OUString::createFromAscii( "ooLocale" ) );
+-            if( aValue >>= aLoc )
+-            {
+-                LanguageType nTmpLang = ConvertIsoStringToLanguage( aLoc );
+-                if( nTmpLang != LANGUAGE_DONTKNOW )
+-                    nLang = nTmpLang;
+-            }
+-        }
+-		pPaResMgr = ResMgr::SearchCreateResMgr( "spa" MAKE_NUMSTR(SUPD), nLang );
++		LanguageType nLang;
+ 		AllSettings aSettings = Application::GetSettings();
+-        aSettings.SetUILanguage( nLang );
+-        Application::SetSettings( aSettings );
++		nLang = aSettings.GetUILanguage();
++		pPaResMgr = ResMgr::SearchCreateResMgr( "spa" MAKE_NUMSTR(SUPD), nLang );
+ 	}
+ 	return ResId( nId, pPaResMgr );
+ }
diff --git a/patches/OOO_1_1/psprint-pdf-drivers.diff b/patches/OOO_1_1/psprint-pdf-drivers.diff
new file mode 100644
index 000000000..7cfd27cd2
--- /dev/null
+++ b/patches/OOO_1_1/psprint-pdf-drivers.diff
@@ -0,0 +1,172 @@
+--- psprint_config/configuration/letter/psprint.conf.psprint-pdf-drivers	2002-12-10 06:59:31.000000000 -0500
++++ psprint_config/configuration/letter/psprint.conf	2003-09-11 13:12:02.000000000 -0400
+@@ -96,3 +96,83 @@ SubstFont_Times New Roman=Times
+ SubstFont_Thorndale=Times
+ SubstFont_Timmons=Times
+ SubstFont_Cumberland=Courier
++
++; [gghibo] Entries to enable a PDF writer with PDF 1.4 output and
++; bitmap not downsampled (useful for press).
++[PDF 1.4 Converter Screen]
++Printer=ADISTILL/PDF 1.4 Converter Screen
++DefaultPrinter=0
++Location=
++Comment=
++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -sOutputFile="(OUTFILE)" -
++Features=pdf=
++Copies=1
++Scale=0
++Orientation=Portrait
++PSLevel=0
++ColorDevice=0
++ColorDepth=24
++MarginAdjust=0,0,0,0
++PPD_PageSize=Letter
++PerformFontSubstitution=true
++SubstFont_Arial=Helvetica
++SubstFont_Times New Roman=Times
++SubstFont_Cumberland=Courier
++SubstFont_Timmons=Times
++SubstFont_Helmet=Helvetica
++SubstFont_Thorndale=Times
++SubstFont_Albany=Helvetica
++SubstFont_Courier New=Courier
++
++[PDF 1.4 Converter Press]
++Printer=ADISTILL/PDF 1.4 Converter Press
++DefaultPrinter=0
++Location=
++Comment=
++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress -dAutoFilterColorImages=false -sColorImageFilter=FlateEncode -dAutoFilterGrayImages=false -sGrayImageFilter=FlateEncode -sOutputFile="(OUTFILE)" -
++Features=pdf=
++Copies=1
++Scale=0
++Orientation=Portrait
++PSLevel=0
++ColorDevice=0
++ColorDepth=24
++MarginAdjust=0,0,0,0
++PPD_PageSize=Letter
++PerformFontSubstitution=true
++SubstFont_Arial=Helvetica
++SubstFont_Times New Roman=Times
++SubstFont_Cumberland=Courier
++SubstFont_Timmons=Times
++SubstFont_Helmet=Helvetica
++SubstFont_Thorndale=Times
++SubstFont_Albany=Helvetica
++SubstFont_Courier New=Courier
++
++; [gghibo] entries to produce distillable PostScript output
++;
++[Generic PostScript output (distillable)]
++Printer=ADISTILL/Generic PostScript output (distillable)
++DefaultPrinter=0
++Location=
++Comment=
++Command=
++Features=
++Copies=1
++Scale=1
++Orientation=Portrait
++PSLevel=0
++ColorDevice=0
++ColorDepth=24
++MarginAdjust=0,0,0,0
++PPD_PageSize=Letter
++PPD_Resolution=600dpi
++PerformFontSubstitution=true
++SubstFont_Arial=Helvetica
++SubstFont_Times New Roman=Times
++SubstFont_Cumberland=Courier
++SubstFont_Timmons=Times
++SubstFont_Helmet=Helvetica
++SubstFont_Thorndale=Times
++SubstFont_Albany=Helvetica
++SubstFont_Courier New=Courier
+--- psprint_config/configuration/psprint.conf.psprint-pdf-drivers	2002-02-28 11:05:08.000000000 -0500
++++ psprint_config/configuration/psprint.conf	2003-09-09 17:39:45.000000000 -0400
+@@ -96,3 +96,83 @@ SubstFont_Times New Roman=Times
+ SubstFont_Thorndale=Times
+ SubstFont_Timmons=Times
+ SubstFont_Cumberland=Courier
++
++; [gghibo] Entries to enable a PDF writer with PDF 1.4 output and
++; bitmap not downsampled (useful for press).
++[PDF 1.4 Converter Screen]
++Printer=ADISTILL/PDF 1.4 Converter Screen
++DefaultPrinter=0
++Location=
++Comment=
++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -sOutputFile="(OUTFILE)" -
++Features=pdf=
++Copies=1
++Scale=0
++Orientation=Portrait
++PSLevel=0
++ColorDevice=0
++ColorDepth=24
++MarginAdjust=0,0,0,0
++PPD_PageSize=A4
++PerformFontSubstitution=true
++SubstFont_Arial=Helvetica
++SubstFont_Times New Roman=Times
++SubstFont_Cumberland=Courier
++SubstFont_Timmons=Times
++SubstFont_Helmet=Helvetica
++SubstFont_Thorndale=Times
++SubstFont_Albany=Helvetica
++SubstFont_Courier New=Courier
++
++[PDF 1.4 Converter Press]
++Printer=ADISTILL/PDF 1.4 Converter Press
++DefaultPrinter=0
++Location=
++Comment=
++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress -dAutoFilterColorImages=false -sColorImageFilter=FlateEncode -dAutoFilterGrayImages=false -sGrayImageFilter=FlateEncode -sOutputFile="(OUTFILE)" -
++Features=pdf=
++Copies=1
++Scale=0
++Orientation=Portrait
++PSLevel=0
++ColorDevice=0
++ColorDepth=24
++MarginAdjust=0,0,0,0
++PPD_PageSize=A4
++PerformFontSubstitution=true
++SubstFont_Arial=Helvetica
++SubstFont_Times New Roman=Times
++SubstFont_Cumberland=Courier
++SubstFont_Timmons=Times
++SubstFont_Helmet=Helvetica
++SubstFont_Thorndale=Times
++SubstFont_Albany=Helvetica
++SubstFont_Courier New=Courier
++
++; [gghibo] entries to produce distillable PostScript output
++;
++[Generic PostScript output (distillable)]
++Printer=ADISTILL/Generic PostScript output (distillable)
++DefaultPrinter=0
++Location=
++Comment=
++Command=
++Features=
++Copies=1
++Scale=1
++Orientation=Portrait
++PSLevel=0
++ColorDevice=0
++ColorDepth=24
++MarginAdjust=0,0,0,0
++PPD_PageSize=A4
++PPD_Resolution=600dpi
++PerformFontSubstitution=true
++SubstFont_Arial=Helvetica
++SubstFont_Times New Roman=Times
++SubstFont_Cumberland=Courier
++SubstFont_Timmons=Times
++SubstFont_Helmet=Helvetica
++SubstFont_Thorndale=Times
++SubstFont_Albany=Helvetica
++SubstFont_Courier New=Courier
diff --git a/patches/OOO_1_1/qpro-build.diff b/patches/OOO_1_1/qpro-build.diff
new file mode 100644
index 000000000..9613b6c25
--- /dev/null
+++ b/patches/OOO_1_1/qpro-build.diff
@@ -0,0 +1,125 @@
+--- sc/prj/build.lst	2004-07-21 19:19:39.000000000 +0100
++++ sc/prj/build.lst	2004-10-19 15:05:37.208057512 +0100
+@@ -39,6 +39,7 @@
+ sc	sc\source\filter\pch					get		-	all	sc_fpch sc_sdi NULL
+ sc	sc\source\filter\excel					nmake	-	all	sc_excel sc_sdi NULL
+ sc	sc\source\filter\lotus					nmake	-	all	sc_lotus sc_sdi NULL
++sc	sc\source\filter\qpro					nmake	-	all	sc_qpro sc_sdi NULL
+ sc	sc\source\filter\starcalc				nmake	-	all	sc_scalc sc_sdi NULL
+ sc	sc\source\filter\dif					nmake	-	all	sc_dif sc_sdi NULL
+ sc	sc\source\filter\rtf					nmake	-	all	sc_rtf sc_sdi NULL
+@@ -48,4 +49,4 @@
+ sc	sc\addin\datefunc						nmake	-	all	sc_addfu sc_sdi NULL
+ sc	sc\addin\rot13							nmake	-	all	sc_adrot sc_sdi NULL
+ sc	sc\addin\util							nmake	-	all	sc_adutil sc_addfu sc_adrot sc_sdi NULL
+-sc      sc\util                                                                 nmake   -       all     sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools NULL
++sc      sc\util                                                                 nmake   -       all     sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools NULL
+
+--- sc/util/makefile.mk	2004-07-21 19:20:30.000000000 +0100
++++ sc/util/makefile.mk	2004-10-19 15:06:02.413225744 +0100
+@@ -204,6 +204,7 @@
+ 	$(SLB)$/xcl97.lib \
+ 	$(SLB)$/html.lib \
+ 	$(SLB)$/lotus.lib \
++	$(SLB)$/qpro.lib \
+ 	$(SLB)$/rtf.lib \
+ 	$(SLB)$/xml.lib \
+ 	$(SLB)$/accessibility.lib \
+
+--- /dev/null	2004-08-25 18:34:59.000000000 +0100
++++ sc/source/filter/qpro/makefile.mk	2004-10-19 15:13:40.746548488 +0100
+@@ -0,0 +1,94 @@
++#*************************************************************************
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to the terms of
++#   either of the following licenses
++#
++#          - GNU Lesser General Public License Version 2.1
++#          - Sun Industry Standards Source License Version 1.1
++#
++#   Sun Microsystems Inc., October, 2000
++#
++#   GNU Lesser General Public License Version 2.1
++#   =============================================
++#   Copyright 2000 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
++#
++#
++#   Sun Industry Standards Source License Version 1.1
++#   =================================================
++#   The contents of this file are subject to the Sun Industry Standards
++#   Source License Version 1.1 (the "License"); You may not use this file
++#   except in compliance with the License. You may obtain a copy of the
++#   License at http://www.openoffice.org/license.html.
++#
++#   Software provided under this License is provided on an "AS IS" basis,
++#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
++#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
++#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
++#   See the License for the specific provisions governing your rights and
++#   obligations concerning the Software.
++#
++#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
++#
++#   Copyright: 2000 by Sun Microsystems, Inc.
++#
++#   All Rights Reserved.
++#
++#   Contributor(s): _______________________________________
++#
++#
++#
++#*************************************************************************
++
++PRJ=..$/..$/..
++
++PRJNAME=sc
++TARGET=qpro
++
++PROJECTPCH4DLL=TRUE
++PROJECTPCH=filt_pch
++PROJECTPCHSOURCE=..\pch\filt_pch
++
++AUTOSEG=true
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  scpre.mk
++.INCLUDE :  settings.mk
++.INCLUDE :  sc.mk
++.INCLUDE :  $(PRJ)$/util$/makefile.pmk
++
++# --- Files --------------------------------------------------------
++
++CXXFILES =				\
++		qpro.cxx		\
++		qproform.cxx
++
++SLOFILES =				\
++		$(SLO)$/qpro.obj	\
++		$(SLO)$/qproform.obj
++
++# --- Tagets -------------------------------------------------------
++
++.INCLUDE :  target.mk
++
diff --git a/patches/OOO_1_1/qpro-cxx.diff b/patches/OOO_1_1/qpro-cxx.diff
new file mode 100644
index 000000000..2a2569b3a
--- /dev/null
+++ b/patches/OOO_1_1/qpro-cxx.diff
@@ -0,0 +1,423 @@
+--- /dev/null	2004-08-25 23:04:59.000000000 +0530
++++ sc/source/filter/qpro/qpro.cxx	2004-12-15 14:43:15.017599352 +0530
+@@ -0,0 +1,420 @@
++#ifdef PCH
++#include "filt_pch.hxx"
++#endif
++
++#pragma hdrstop
++
++//------------------------------------------------------------------------
++
++#include <stdio.h>
++#include <sfx2/docfile.hxx>
++#include <rtl/math.hxx>
++
++
++#include "qproform.hxx"
++#include "qpro.hxx"
++
++#include <tools/color.hxx>
++#include "scitems.hxx"
++#include <svx/algitem.hxx>
++#include <svx/align.hxx>
++#include <svx/udlnitem.hxx>
++#include <svx/wghtitem.hxx>
++#include <svx/postitem.hxx>
++#include <svx/crsditem.hxx>
++#include <svx/fhgtitem.hxx>
++#include <svx/fontitem.hxx>
++#include <svx/colritem.hxx>
++#include <map>
++
++#include "global.hxx"
++#include "sc.hrc" 
++#include "globstr.hrc"
++#include "attrib.hxx"
++#include "stlsheet.hxx"
++#include "stlpool.hxx"
++#include "docpool.hxx" 
++#include "patattr.hxx"
++#include "flttools.hxx"
++#include "filter.hxx"
++#include "scerrors.hxx"
++#include "document.hxx"
++#include "cell.hxx"
++#include "math.h"
++
++extern std::map<UINT16, ScPatternAttr> aPatternPool;
++
++BiffReader::BiffReader( SfxMedium & rMedium ) :
++               mnId(0),
++               mnLength(0),
++               mnOffset(0),
++               meCharSet( RTL_TEXTENCODING_ISO_8859_1 ) // FIXME detect as we parse
++{
++       mpStream = rMedium.GetInStream();
++       if( mpStream )
++               mpStream->SetBufferSize( 65536 );
++}
++
++BiffReader::~BiffReader()
++{
++       if( mpStream )
++               mpStream->SetBufferSize( 0 );
++}
++
++SvStream& BiffReader::operator>>( sal_uInt8 &rByte )
++{
++       *mpStream >> rByte;
++}
++
++SvStream& BiffReader::operator>>( sal_Int8 &rByte )
++{
++       *mpStream >> rByte;
++}
++
++SvStream& BiffReader::operator>>(sal_uInt16 &rWord)
++{
++       *mpStream >> rWord;
++}
++
++bool BiffReader::nextRecord()
++{
++       if( !recordsLeft() )
++               return false;
++
++       if( EndOfFile )
++               return false;
++
++       sal_uInt32 nPos = mpStream->Tell();
++       if( nPos != mnOffset + mnLength )
++               mpStream->Seek( mnOffset + mnLength );
++
++       mnLength = mnId = 0;
++       *mpStream >> mnId >> mnLength;
++
++       mnOffset = mpStream->Tell();
++#ifdef DEBUG
++       fprintf( stderr, "Read record 0x%x length 0x%x at offset 0x%x\n",
++                        mnId, mnLength, mnOffset );
++
++ #if 1  // rather verbose
++       int len = mnLength;
++       while (len > 0) {
++               int i, chunk = len < 16 ? len : 16;
++               unsigned char data[16];
++               mpStream->Read( data, chunk );
++
++               for (i = 0; i < chunk; i++)
++                       fprintf( stderr, "%.2x ", data[i] );
++               fprintf( stderr, "| " );
++               for (i = 0; i < chunk; i++)
++                       fprintf( stderr, "%c", data[i] < 127 && data[i] > 30 ? data[i] : '.' );
++               fprintf( stderr, "\n" );
++
++               len -= chunk;
++       }
++       mpStream->Seek( mnOffset );
++#endif 
++#endif
++       return true;
++}
++
++void BiffReader::readString( String &rString, sal_uInt16 nLength )
++{
++       sal_Char* pText = new sal_Char[ nLength + 1 ];
++       mpStream->Read( pText, nLength );
++       pText[ nLength ] = 0;
++       rString = String( pText, meCharSet );
++}
++
++void BiffReader::SetFormat( ScDocument *pDoc, sal_uInt8 nCol, sal_uInt16 nRow, sal_uInt8 nTab, sal_uInt16 nStyle ){
++       ScPatternAttr aPattern(pDoc->GetPool()); 
++       SfxItemSet& rItemSet = aPattern.GetItemSet();
++       
++       sal_uInt8 nTmp = Align[ nStyle ];
++       sal_uInt8 nHor = ( nTmp & 0x07 );
++       sal_uInt8 nVer = ( nTmp & 0x18 );
++       sal_uInt8 nOrient = ( nTmp & 0x60 );
++ 
++
++       // Horizontal Alignment
++       SvxHorJustifyItem ejustify = SVX_HOR_JUSTIFY_STANDARD;
++       switch( nHor )
++       {
++
++            case 0x00:
++                       ejustify = SVX_HOR_JUSTIFY_STANDARD;
++                       break;
++  
++            case 0x01: 
++                       ejustify = SVX_HOR_JUSTIFY_LEFT;
++                       break;
++  
++            case 0x02: 
++                       ejustify = SVX_HOR_JUSTIFY_CENTER;
++                       break;
++
++            case 0x03:
++                       ejustify = SVX_HOR_JUSTIFY_RIGHT;
++                       break;
++ 
++            case 0x04: 
++                       ejustify = SVX_HOR_JUSTIFY_BLOCK;
++                       break;
++
++         }
++	  rItemSet.Put( ejustify );
++
++	// Vertical Alignment
++        SvxVerJustifyItem verJustify = SVX_VER_JUSTIFY_STANDARD;
++        switch( nVer )
++        {
++         
++           case 0x00:
++                     verJustify = SVX_VER_JUSTIFY_BOTTOM;
++                     break;
++            
++           case 0x08:
++                     verJustify = SVX_VER_JUSTIFY_CENTER;
++                     break; 
++           
++           case 0x10:
++                     verJustify = SVX_VER_JUSTIFY_TOP;
++                     break;
++      
++         }
++         rItemSet.Put( verJustify ); 
++         
++	 // Orientation
++         SvxOrientationItem orientItem = SVX_ORIENTATION_STANDARD;
++         switch( nOrient )
++         {
++
++           case 0x20: 
++                      orientItem = SVX_ORIENTATION_TOPBOTTOM;
++                      break;
++ 
++         } 
++	 rItemSet.Put( orientItem );
++
++        // Wrap cell contents
++        if( nTmp & 0x80 )
++        {
++            SfxBoolItem WrapItem( ATTR_LINEBREAK );
++            WrapItem.SetValue( TRUE );
++            rItemSet.Put( WrapItem );
++        }
++
++        // Font Attributes
++	sal_uInt16 nTmpFnt = FontRecord[ Font[ nStyle ] ];
++        BOOL bIsBold, bIsItalic, bIsUnderLine, bIsStrikeThrough;
++
++        bIsBold = ( nTmpFnt & 0x0001 );
++        bIsItalic = ( nTmpFnt & 0x0002 );
++        bIsUnderLine = ( nTmpFnt & 0x0004 );
++        bIsStrikeThrough = (nTmpFnt & 0x0020 );
++
++        if( bIsBold )
++             rItemSet.Put( SvxWeightItem( WEIGHT_BOLD,ATTR_FONT_WEIGHT) );
++        if( bIsItalic )
++             rItemSet.Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) );
++        if( bIsUnderLine )
++             rItemSet.Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) );
++        if( bIsStrikeThrough )
++             rItemSet.Put( SvxCrossedOutItem( STRIKEOUT_SINGLE, ATTR_FONT_CROSSEDOUT ) ); 
++     
++	String fntName = FontType[ Font[ nStyle ] ];
++        rItemSet.Put( SvxFontItem( FAMILY_SYSTEM, fntName, EMPTY_STRING ) );
++
++	pDoc->ApplyPattern( nCol, nRow, nTab, aPattern );
++} 
++
++ColorData BiffReader::MapIntToColor( sal_uInt16 ColorId )
++{
++       ColorData fColor;
++       switch( ColorId )
++       {
++               case 0x0000: fColor = COL_WHITE;
++                             break;
++  
++               case 0x1000: fColor = COL_LIGHTGRAY;
++                             break;
++
++               case 0x2000: fColor = COL_GRAY;
++                             break;
++
++               case 0x3000: fColor = COL_BLACK;
++                             break;
++
++               case 0x4000: fColor = COL_RED;
++                             break;
++   
++                case 0x5000: fColor = COL_GREEN;
++                             break;
++
++               case 0x6000: fColor = COL_BLUE;
++                            break;
++
++               case 0x7000: fColor = COL_CYAN;
++                             break;
++
++               case 0x8000: fColor = COL_MAGENTA;
++                             break;
++
++               case 0x9000: fColor = COL_YELLOW;
++                             break;
++
++               case 0xb000: fColor = COL_LIGHTGREEN;
++                             break;
++        }
++       
++       return fColor;
++}
++      
++readQProSheet( BiffReader &rReader, ScDocument *pDoc, sal_uInt16 nTab )
++{
++       sal_uInt8  nCol, nDummy;
++       sal_uInt16 nRow;
++       sal_uInt16 nStyle;
++       bool bEndOfSheet = false;
++
++#ifdef DEBUG
++       fprintf( stderr, "Read sheet (%d)\n", nTab );
++#endif
++
++       while( !bEndOfSheet && rReader.nextRecord() ) {
++               switch( rReader.getId() )
++               {
++               case 0x000f: { // Label cell
++                       String aLabel;
++                       rReader >> nCol >> nDummy >> nRow >> nStyle >> nDummy;
++                       rReader.readString( aLabel, rReader.getLength() - 7 );
++#ifdef DEBUG
++                       fprintf( stderr, "Put Cell %d %d %d '%s'\n",
++                                        nCol, nRow, nTab,
++                                        (const sal_Char *)rtl::OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ) );
++#endif
++                       nStyle = ( nStyle & 0xfff8 ) >> 3;
++                       rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle );
++                       pDoc->PutCell( nCol, nRow, nTab, new ScStringCell( aLabel ), (BOOL) TRUE );
++                       break;
++               }
++               case 0x00cb: // End of sheet;
++                       bEndOfSheet = true;
++                       break;
++		
++               case 0x000c: // Blank cell
++                        rReader >> nCol >> nDummy >> nRow >> nStyle; 
++                        rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle );
++			break; 
++               
++               case 0x000d:  { // Integer cell
++			sal_Int16 nValue;
++			rReader >> nCol >> nDummy >> nRow >> nStyle >> nValue;	
++ 			ScValueCell* aInteger = new ScValueCell( ( double ) nValue ); 
++#ifdef DEBUG
++                        fprintf( stderr, "Put Cell %d %d %d %f\n", nCol, nRow, nTab, nValue );
++#endif
++			rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle );
++			pDoc->PutCell(nCol ,nRow, nTab ,aInteger,(BOOL) TRUE);
++                        break;
++                       }
++
++               case 0x000e: { // Floating point cell
++                        double nValue;
++                        rReader >> nCol >> nDummy >> nRow >> nStyle >> nValue;
++                        ScValueCell* aFloat = new ScValueCell( nValue );
++#ifdef DEBUG
++                        fprintf( stderr, "Put Cell %d %d %d %f\n", nCol, nRow, nTab, nValue );
++#endif
++                        rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle );
++			pDoc->PutCell( nCol, nRow, nTab, aFloat, (BOOL) TRUE ); break;
++                       } 
++
++	       case 0x0010: { // Formula cell
++                        double nValue;
++                        sal_uInt16 nState, nLen; 
++                        rReader >> nCol >> nDummy >> nRow >> nStyle >> nValue >> nState >> nLen;
++                        ScAddress aAddr( nCol, nRow, nTab );
++                        const ScTokenArray *pErg;
++                        QProToSc aConv( rReader );
++                        aConv.Reset( aAddr );
++                        aConv.Convert( pErg, nLen );
++                        ScFormulaCell *pZelle = new ScFormulaCell( pDoc, aAddr, pErg );
++#ifdef DEBUG
++                        fprintf( stderr, "Put Cell %d %d %d %f\n", nCol, nRow, nTab, nValue );
++#endif
++                        pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
++			rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle );
++                        pDoc->PutCell( nCol, nRow, nTab, pZelle, ( BOOL ) TRUE );
++			break; } 
++    
++	       }
++       }
++       return eERR_OK;
++}
++
++FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc )
++{
++       FltError   eRet = eERR_OK;
++       BiffReader aReader( rMedium );
++       sal_uInt16 nVersion;
++       int nTab = 0, i = 1, j = 1;
++       aReader.EndOfFile = FALSE;
++
++       if( !aReader.recordsLeft() )
++               return eERR_OPEN;
++
++       while( aReader.nextRecord() && eRet == eERR_OK) {
++               switch( aReader.getId() )
++               {
++               case 0x0000: // Begginning of file
++                       aReader >> nVersion;
++                       break;
++
++               case 0x00ca: // Beginning of sheet
++                       if( nTab < 26 )
++                       {
++                               String aName;
++                               aName.Append( sal_Unicode( 'A' + nTab ) );
++                               pDoc->InsertTab( nTab, aName );
++                       }
++                       eRet = readQProSheet( aReader, pDoc, nTab );
++                       nTab++;
++                       break;
++
++               case 0x0001: // End of file
++                       aReader.EndOfFile = TRUE;
++                       break;
++          
++               case 0x00ce: { // Attribute cell
++                       sal_uInt8 nFormat, nAlign, nFont;
++                       sal_Int16 nTextColor, nColor;
++                       aReader >> nFormat >> nAlign >> nColor >> nFont;
++                       aReader.Align[ i ] = nAlign;
++                       aReader.Font[ i ] = nFont;
++                       nTextColor = nColor & 0xf000;
++                       aReader.FontColor[ i ] = nTextColor;
++                       i++;
++                       break;
++                       }
++                                                                                                                  
++                case 0x00cf: { // Font description
++                      sal_uInt16 nPtSize, nFontAttr;
++		      String Label;
++                      aReader >> nPtSize >> nFontAttr;
++                      aReader.FontSize[ j ] = nPtSize;
++                      aReader.FontRecord[ j ] = nFontAttr;
++                      aReader.readString( Label, aReader.getLength() - 4 );
++                      aReader.FontType[ j ] = Label;
++                      j++;
++                      break;
++                     }
++
++               }
++       }
++       pDoc->CalcAfterLoad();
++       return eRet;
++}
++
++
++
diff --git a/patches/OOO_1_1/qpro-detect.diff b/patches/OOO_1_1/qpro-detect.diff
new file mode 100644
index 000000000..2b8df69ba
--- /dev/null
+++ b/patches/OOO_1_1/qpro-detect.diff
@@ -0,0 +1,119 @@
+--- sc/source/ui/docshell/docsh.cxx	2004-12-16 13:27:05.842137808 +0530
++++ sc/source/ui/docshell/docsh.cxx	2004-12-16 13:29:38.516927712 +0530
+@@ -185,6 +185,7 @@
+ static const sal_Char __FAR_DATA pFilterXML[]		= "StarOffice XML (Calc)";
+ static const sal_Char __FAR_DATA pFilterAscii[]		= "Text - txt - csv (StarCalc)";
+ static const sal_Char __FAR_DATA pFilterLotus[]		= "Lotus";
++static const sal_Char __FAR_DATA pFilterQPro[]		= "QPro";
+ static const sal_Char __FAR_DATA pFilterExcel4[]	= "MS Excel 4.0";
+ static const sal_Char __FAR_DATA pFilterEx4Temp[]	= "MS Excel 4.0 Vorlage/Template";
+ static const sal_Char __FAR_DATA pFilterExcel5[]	= "MS Excel 5.0/95";
+@@ -977,6 +978,22 @@
+             // #93255# update of row height done inside of Excel filter to speed up chart import
+ //            bSetRowHeights = TRUE;      //  #75357# optimal row heights must be updated
+ 		}
++		else if (aFltName.EqualsAscii(pFilterQPro))
++		{
++			ScColumn::bDoubleAlloc = TRUE;
++			FltError eError = ScImportQuattroPro( rMedium, &aDocument );
++			ScColumn::bDoubleAlloc = FALSE;
++			if (eError != eERR_OK)
++			{
++			    if (!GetError())
++				    SetError( eError );
++
++				if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
++					bRet = TRUE;
++			}
++			else
++				bRet = TRUE;
++		}
+ 		else if (aFltName.EqualsAscii(pFilterAscii))
+ 		{
+ 			SfxItemSet*	 pSet = rMedium.GetItemSet();
+--- sc/source/ui/app/sclib.cxx	2004-12-16 13:26:32.229247744 +0530
++++ sc/source/ui/app/sclib.cxx	2004-12-16 13:29:38.527926040 +0530
+@@ -103,6 +103,7 @@
+ static const sal_Char __FAR_DATA pFilterXML[]		= "StarOffice XML (Calc)";
+ static const sal_Char __FAR_DATA pFilterAscii[]		= "Text - txt - csv (StarCalc)";
+ static const sal_Char __FAR_DATA pFilterLotus[]		= "Lotus";
++static const sal_Char __FAR_DATA pFilterQPro[]		= "QPro";
+ static const sal_Char __FAR_DATA pFilterExcel4[]	= "MS Excel 4.0";
+ static const sal_Char __FAR_DATA pFilterEx4Temp[]	= "MS Excel 4.0 Vorlage/Template";
+ static const sal_Char __FAR_DATA pFilterExcel5[]	= "MS Excel 5.0/95";
+@@ -557,6 +558,13 @@
+ 			  0x0000, 0x0000,
+ 			  M_ENDE };
+ 
++		const UINT16 pQPro[] =
++				{ 0x0000, 0x0000, 0x0002, 0x0000,
++				  M_ALT(4), 0x0001, 0x0002, // WB1, WB2
++				  0x0006, 0x0007,           // QPro 6/7 (?)
++				  0x0010,
++				  M_ENDE };
++
+ 		const UINT16 pDIF1[] =			// DIF mit CR-LF
+ 			{
+ 			'T', 'A', 'B', 'L', 'E',
+@@ -604,6 +612,7 @@
+ 			pDIF1,
+ 			pDIF2,
+ 			pSylk,
++			pQPro,
+ 			pLotus97,
+ 			pLotus2
+ 			};
+@@ -620,6 +629,7 @@
+ 			pFilterDif,
+ 			pFilterDif,
+ 			pFilterSylk,
++			pFilterQPro,
+ 			pFilterLotus,
+ 			pFilterLotus
+ 			};
+--- officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu	2004-12-16 13:26:44.706350936 +0530
++++ officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu	2004-12-16 13:29:38.560921024 +0530
+@@ -261,6 +261,14 @@
+         <value>1,,,,wk1;wks;123,0,</value>
+       </prop>
+     </node>
++    <node oor:name="calc_QPro" oor:op="replace">
++      <prop oor:name="UIName">
++        <value xml:lang="en-US">Quattro Pro</value>
++      </prop>
++      <prop oor:name="Data">
++        <value>1,,,,wb1;wb2,0,</value>
++      </prop>
++    </node>
+     <node oor:name="calc_MS_Excel_40" oor:op="replace">
+       <prop oor:name="UIName">
+         <value xml:lang="en-US">Microsoft Excel 4.0</value>
+@@ -4810,6 +4818,17 @@
+         <value>0,calc_Lotus,com.sun.star.sheet.SpreadsheetDocument,,268435649,,0,,com.sun.star.comp.Calc.FilterOptionsDialog</value>
+       </prop>
+     </node>
++    <node oor:name="QPro" oor:op="replace">
++      <prop oor:name="UIName">
++        <value xml:lang="en-US">Quattro Pro</value>
++      </prop>
++      <prop oor:name="Data">
++        <value>0,calc_QPro,com.sun.star.sheet.SpreadsheetDocument,,268435649,,0,,</value>
++      </prop>
++      <prop oor:name="Installed" oor:type="xs:boolean">
++        <value>true</value>
++      </prop>
++    </node>
+     <node oor:name="MS Excel 4.0" oor:op="replace">
+       <prop oor:name="Installed">
+         <value>false</value>
+--- sc/inc/filter.hxx	2004-12-16 13:27:16.969446200 +0530
++++ sc/inc/filter.hxx	2004-12-16 13:29:38.562920720 +0530
+@@ -122,6 +122,8 @@
+ 
+ FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW );
+ 
++FltError ScImportQuattroPro( SfxMedium&, ScDocument* );
++
+ FltError ScImportExcel( SvStream&, ScDocument* );
+ 
+ FltError ScImportExcel( SfxMedium&, ScDocument* );
diff --git a/patches/OOO_1_1/qpro-hxx.diff b/patches/OOO_1_1/qpro-hxx.diff
new file mode 100644
index 000000000..582cbb231
--- /dev/null
+++ b/patches/OOO_1_1/qpro-hxx.diff
@@ -0,0 +1,50 @@
+--- /dev/null	2004-08-25 23:04:59.000000000 +0530
++++ sc/source/filter/inc/qpro.hxx	2004-12-15 12:41:25.000000000 +0530
+@@ -0,0 +1,47 @@
++#ifndef _QPRO_HXX
++#define _QPRO_HXX
++
++#include "flttools.hxx"
++#include "filter.hxx"
++#include "scerrors.hxx"
++#include "document.hxx"
++#include "cell.hxx"
++#include "math.h"
++
++#include <vcl/color.hxx>
++                                                                                                                  
++                                                                                                                  
++// Stream wrapper class
++class BiffReader
++{
++  protected:
++       sal_uInt16  	mnId;
++       sal_uInt16  	mnLength;
++       sal_uInt32  	mnOffset;
++       rtl_TextEncoding meCharSet;
++                                                                                                                  
++  public:
++       sal_uInt8 	Align[ 256 ];
++       sal_uInt8 	Font[ 256 ];
++       sal_uInt16 	FontRecord[ 256 ];
++       sal_uInt16 	FontSize[ 256 ];
++       sal_Int16	FontColor[ 256 ];
++       String 		FontType[ 256 ];
++       bool 		EndOfFile;
++       SvStream   	*mpStream;
++        	        BiffReader( SfxMedium & rMedium );
++                        ~BiffReader();
++       bool     	recordsLeft() { return mpStream && !mpStream->IsEof(); }
++       bool       	nextRecord();
++       void 	  	SetFormat( ScDocument* pDoc, sal_uInt8 nCol, sal_uInt16 nRow, sal_uInt8 nTab, sal_uInt16 nStyle );
++       sal_uInt16 	getId() { return mnId; }
++       sal_uInt16 	getLength() { return mnLength; }
++       void       	readString( String &rString, sal_uInt16 nLength );
++       SvStream&  	operator>>( sal_uInt8 & rByte ); 
++       SvStream&  	operator>>( sal_uInt16 & rWord );
++       SvStream&        operator>>( sal_Int8 & rByte );
++       ColorData	MapIntToColor( sal_uInt16 nColor );
++       
++};
++#endif
++
diff --git a/patches/OOO_1_1/qproform-cxx.diff b/patches/OOO_1_1/qproform-cxx.diff
new file mode 100644
index 000000000..acf5a0f48
--- /dev/null
+++ b/patches/OOO_1_1/qproform-cxx.diff
@@ -0,0 +1,604 @@
+--- /dev/null	2004-08-25 23:04:59.000000000 +0530
++++ sc/source/filter/qpro/qproform.cxx	2004-12-15 14:04:52.678608080 +0530
+@@ -0,0 +1,601 @@
++#ifdef PCH
++#include "filt_pch.hxx"
++#endif
++                                                                                                                  
++#pragma hdrstop
++                                                                                                                  
++//------------------------------------------------------------------------
++                                                                                                                  
++#include "decl.h"
++
++#ifndef _QPRO_HXX
++#include "qpro.hxx"
++#endif
++
++#include "qproform.hxx"
++#include "compiler.hxx"
++#include "namebuff.hxx"
++#include "root.hxx"
++#include "ftools.hxx"
++#include "tool.h"
++#include <math.h>
++
++static const sal_Char*          GetAddInName( const UINT8 nIndex );
++                                                                                                                  
++static DefTokenId                       lcl_KnownAddIn( const ByteString& sTest );
++                                                                                                                  
++void QProToSc::ReadSRD( SingleRefData& rSRD, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 nRelBit )
++{
++
++	UINT16 nTmp = nRelBit & 0x1fff;
++	rSRD.InitAddress( ScAddress( nCol, (~nTmp + 1), 0 ) );
++	if( nRelBit & 0x4000 )
++	{
++                rSRD.nRelCol = nCol;
++        	rSRD.SetColRel( TRUE );
++	}
++	else
++	{
++		rSRD.nCol = nCol;
++        	rSRD.SetColRel( FALSE );
++	}
++	if( nRelBit & 0x2000 )
++	{
++		rSRD.nRelRow = (~nTmp + 1);
++		rSRD.nRelRow = (UINT16)(nTmp << 3);
++		rSRD.nRelRow /= 8;
++		
++        	rSRD.SetRowRel( TRUE );
++	}
++	else
++	{
++		rSRD.nRow = nTmp;
++        	rSRD.SetRowRel( FALSE );
++	}
++        if( nRelBit & 0x8000 )
++        {
++                rSRD.nRelTab = nPage;
++                rSRD.SetTabRel( TRUE );
++        }
++        else
++        {
++                rSRD.nTab = nPage;
++                rSRD.SetTabRel( FALSE );
++        }
++        
++}
++  
++void QProToSc::Reset( ScAddress aEingPos )
++{
++        QProConverterBase::Reset();
++                                                                                                                  
++        TokenId nEins = aPool.Store( 1.0 );
++                                                                                                                  
++        aPool << ocClose << ocAdd << nEins;
++        nAddToken = aPool.Store();
++                                                                                                                  
++        aPool << ocClose << ocSub << nEins;
++        nSubToken = aPool.Store();
++                                                                                                                  
++        n0Token = aPool.Store( 0.0 );
++}
++
++QProToSc::QProToSc( BiffReader& rStream ) :
++        QProConverterBase( rStream, 128 )
++{
++}
++void QProToSc::DoFunc( DefTokenId eOc, BYTE nArgs, const sal_Char* pExtString )
++{
++        TokenId                                         eParam[ 256 ];
++        INT32                                           nLauf;
++        TokenId                                         nPush, nPush1;
++                                                                                                                  
++        BOOL                                            bAddIn = FALSE;
++        BOOL                                            bNeg = FALSE;
++                                                                                                                  
++                if( eOc == ocNoName )
++                {
++                        bAddIn = TRUE;
++                        nPush = aPool.Store( eOc );
++                        aPool << nPush;
++                }
++        
++                                                                                                                  
++        for( nLauf = 0 ; nLauf < nArgs; nLauf++ )
++                aStack >> eParam[ nLauf ];
++                                                                                                                  
++        switch( eOc )
++        {
++                case ocIndex:
++                        nPush = eParam[ 0 ];
++                        eParam[ 0 ] = eParam[ 1 ];
++                        eParam[ 1 ] = nPush;
++                        IncToken( eParam[ 0 ] );
++                        IncToken( eParam[ 1 ] );
++                        break;
++                case ocIKV:
++                {
++                        nPush = eParam[ 0 ];
++                        eParam[ 0 ] = eParam[ 1 ];
++                        eParam[ 1 ] = nPush;
++                }
++                        break;
++                case ocGetYear:
++                {
++                        nPush = aPool.Store( 1900.0 );
++                        aPool << ocOpen;
++                }
++                        break;
++                case ocChose:
++                {
++                        IncToken( eParam[ nArgs- 1 ] );
++                }
++                        break;
++                case ocFind:
++                case ocHLookup:
++                case ocVLookup:
++                {
++                        IncToken( eParam[ 0 ] );
++                }
++                        break;
++                case ocMid:
++                case ocReplace:
++                {
++                        IncToken( eParam[ nArgs- 2 ] );
++                }
++                        break;
++                case ocZins:
++                {
++                        nArgs= 4;
++                        eParam[ 3 ] = eParam[ 0 ];      // 3. -> 1.
++                        eParam[ 0 ] = eParam[ 2 ];      // 1. -> 4.
++                        NegToken( eParam[ 1 ] );        // 2. -> -2. (+ 2. -> 3.)
++                        eParam[ 2 ] = n0Token;          //    -> 2. als Default
++                }
++                        break;
++        }
++                                                                                                                  
++        if( !bAddIn )
++                aPool << eOc;
++
++        aPool << ocOpen;
++                                                                                                                  
++        if( nArgs> 0 )
++        {
++                INT16 nNull = -1;       
++                                                                                                                  
++                INT16 nLast = nArgs- 1;
++                                                                                                                  
++                if( eOc == ocRMZ )
++                {        aPool << eParam[ 1 ] << ocSep << eParam[ 0 ] << ocSep
++                                << ocNegSub << eParam[ 2 ];
++                }
++                else
++                {        aPool << eParam[ nLast ];
++                                                                                                                  
++                        for( nLauf = nLast - 1 ; nLauf >= 0 ; nLauf-- )
++                        {
++                                if( nLauf != nNull )
++                                        aPool << ocSep << eParam[ nLauf ];
++                        }
++                }
++        }
++                                                                                                                  
++                                                                                                                  
++        if( eOc == ocGetYear )
++        {
++                aPool << ocClose << ocSub << nPush;
++        }
++        else if( eOc == ocFixed )
++        {
++                aPool << ocSep << ocTrue << ocOpen << ocClose;
++        }
++        else if( eOc == ocFind )
++        {
++                nPush1 = aPool.Store();
++                DecToken( nPush1 );
++                aPool << nPush1;
++        }
++                                                                                                                  
++        aPool << ocClose;
++                                                                                                                  
++        aPool >> aStack;
++                                                                                                                  
++        if( bNeg )
++        {
++                aPool << ocOpen << ocSub << aStack << ocClose;
++                aPool >> aStack;
++        }
++}
++
++void QProToSc::IncToken( TokenId &rParam )
++{
++        aPool << ocOpen << rParam << nAddToken;
++        rParam = aPool.Store();
++}
++                                                                                                                  
++                                                                                                                  
++void QProToSc::DecToken( TokenId &rParam )
++{
++        aPool << ocOpen << rParam << nSubToken;
++        rParam = aPool.Store();
++}
++                                                                                                                  
++                                                                                                                  
++void QProToSc::NegToken( TokenId &rParam )
++{
++        aPool << ocNegSub << ocOpen << rParam << ocClose;
++        rParam = aPool.Store();
++}
++                                                                                                                  
++
++ConvErr QProToSc::Convert( const ScTokenArray*& rpErg, sal_uInt16 nLen, const FORMULA_TYPE eFT = FT_CellFormula ) 
++{
++	sal_uInt8 nFmla[ 256 ];
++ 	sal_Int8  nCol, nPage;
++        sal_uInt16 nCRefCount = 0, nBRefCount = 0;
++  	sal_uInt16 nNote, nRef, nRelBits;
++  	TokenId  nPush;
++        BOOL FirstCRef = TRUE, FirstBRef = TRUE;
++ 	ComplRefData    aCRD;
++  	SingleRefData   aSRD;
++  	FUNC_TYPE       eType;
++  	DefTokenId	  eOc;
++  	const sal_Char* pExtName;
++ 
++  	aCRD.InitFlags();
++  	aSRD.InitFlags();
++  	aIn >> nRef;
++   
++  	for(int i=0; i < ( int )nRef; i++)
++    		aIn >> nFmla[i];
++        
++	i = 0;
++        
++	while( nFmla[ i ] != 0x03 )
++        { 
++    		eType = IndexToType( nFmla[ i ] );
++    		eOc = IndexToToken( nFmla[ i ] );
++    		if( eOc == ocNoName )
++       			pExtName = GetAddInName( eOc );
++                           
++    		switch( eType )
++    		{
++       			case FT_NotImpl:
++                        case FT_FuncFix0:       DoFunc( eOc, 0, pExtName ); break;
++                        case FT_FuncFix1:       DoFunc( eOc, 1, pExtName ); break;
++                        case FT_FuncFix2:       DoFunc( eOc, 2, pExtName ); break;
++                        case FT_FuncFix3:       DoFunc( eOc, 3, pExtName ); break;
++                        case FT_FuncFix4:       DoFunc( eOc, 4, pExtName ); break;
++
++			case FT_Cref : { // Single cell reference
++				aIn >> nNote >> nCol >> nPage >> nRelBits;  
++                       		ReadSRD( aSRD, nPage, nCol, nRelBits );
++                       		aStack << aPool.Store( aSRD );
++                       		break;
++                      		}
++    
++       			case FT_Range: { // Block reference
++				aIn >> nNote >> nCol >> nPage >> nRelBits;
++                   		ReadSRD( aCRD.Ref1, nPage, nCol, nRelBits );
++                   		aIn >> nCol >> nPage >> nRelBits;
++                   		ReadSRD( aCRD.Ref2, nPage, nCol, nRelBits );
++                   		aStack << aPool.Store( aCRD );
++                   		break;
++                  		}
++   
++       			case FT_FuncVar: { // Sum of a sequence of numbers
++                   		sal_uInt8 nArg;
++                                i++;
++                                nArg = nFmla[ i ];
++                   		DoFunc( eOc, nArg , pExtName );
++                   		break;
++		  		}
++
++       			case FT_Op: { // operators
++                   		aStack >> nPush;
++                   		aPool << aStack << eOc << nPush;
++                   		aPool >> aStack;
++                   		break; 
++                  		}
++      
++       			case FT_Braces: 
++                    		aPool << ocOpen << aStack << ocClose;
++                    		aPool >> aStack;
++                    		break;
++
++       			case FT_ConstInt:{
++                        	 sal_uInt16 nVal;
++                         	 aIn >> nVal;
++                         	 aStack << aPool.Store( ( double ) nVal );
++                        	}
++      
++       			case FT_Erref:
++                        	aPool << ocBad;
++                        	aPool >> aStack;
++                        	break;
++
++       			case FT_Ecref:
++                        	aPool << ocBad;
++                        	aPool >> aStack;
++                        	break;
++
++       			case FT_Econstant:
++                        	aPool << ocBad;
++                        	aPool >> aStack;
++                      	 	break;
++ 		}
++		i++;
++	}
++  
++
++   rpErg = aPool[ aStack.Get() ];
++   return ConvOK;
++}
++
++
++DefTokenId lcl_KnownAddIn( const ByteString& sTest )
++{
++        DefTokenId      eId = ocNoName;
++                                                                                                                  
++        if( sTest == "FACT" )
++    		eId = ocFact;
++        else if( sTest == "ISEMPTY")
++                 eId = ocIsEmpty;
++        else if( sTest == "DEGTORAD")
++                 eId = ocRad;
++        else if( sTest == "RADTODEG")
++                 eId = ocDeg;
++        else if( sTest == "SIGN")
++                 eId = ocPlusMinus;
++        else if( sTest == "ACOSH")
++                 eId = ocArcCosHyp;
++        else if( sTest == "ACOTH")
++                 eId = ocArcCotHyp;
++        else if( sTest == "ASINH")
++                 eId = ocArcSinHyp;
++        else if( sTest == "ATANH")
++                 eId = ocArcTanHyp;
++        else if( sTest == "COSH")
++                 eId = ocCosHyp;
++        else if( sTest == "COTH")
++                 eId = ocCotHyp;
++        else if( sTest == "SINH")
++                 eId = ocSinHyp;
++        else if( sTest == "TANH")
++                 eId = ocTanHyp;
++        else if( sTest == "EVEN")
++                 eId = ocIsEven;
++        else if( sTest == "ODD")
++                 eId = ocIsOdd;
++        else if( sTest == "ACOT")
++                 eId = ocArcCot;
++        else if( sTest == "COT")
++                 eId = ocCot;
++        else if( sTest == "ACOT")
++		 eId = ocArcCot;
++        else if( sTest == "TRUNC")
++                 eId = ocTrunc;
++        else if( sTest == "GEOMEAN")
++                 eId = ocGeoMean;
++        else if( sTest == "HARMEAN")
++                 eId = ocHarMean;
++        else if( sTest == "CORREL")
++                 eId = ocCorrel;
++        else if( sTest == "MEDIAN")
++                 eId = ocMedian;
++        else if( sTest == "COV")
++                 eId = ocCovar;
++        else if( sTest == "SKEWNESS")
++                 eId = ocSchiefe;
++        else if( sTest == "CHITEST")
++                 eId = ocChiTest;
++        else if( sTest == "FTEST")
++                 eId = ocFTest;
++        else if( sTest == "AVEDEV")
++                 eId = ocAveDev;
++        else if( sTest == "PRODUCT")
++                 eId = ocProduct;
++        else if( sTest == "PERMUT")
++                 eId = ocVariationen;
++        else if( sTest == "GAMMALN")
++                 eId = ocGammaLn;
++        else if( sTest == "POISSON")
++                 eId = ocPoissonDist;
++        else if( sTest == "NORMAL")
++                 eId = ocNormDist;
++        else if( sTest == "CRITBINOMIAL")
++                 eId = ocKritBinom;
++        
++	return  eId;
++}
++
++static const struct {
++	DefTokenId nToken;
++        FUNC_TYPE   nType;
++	const sal_Char *addInName;
++} aFuncMap[ 162 ] = {
++
++                { ocPush, FT_ConstFloat, NULL },                       
++                { ocPush, FT_Cref, NULL },                        
++		{ ocPush, FT_Range, NULL },                        
++	        { ocPush, FT_Return, NULL },                        
++                { ocPush, FT_Braces, NULL },                       
++                { ocPush, FT_ConstInt, NULL },                       
++                { ocPush, FT_ConstString, NULL },
++                { ocPush, FT_NOP, NULL },
++                { ocNegSub, FT_Neg, NULL },                       
++                { ocAdd, FT_Op, NULL },                           
++                { ocSub, FT_Op, NULL },                         
++                { ocMul, FT_Op, NULL },                         
++                { ocDiv, FT_Op, NULL },                         
++                { ocPow, FT_Op, NULL },                         
++                { ocEqual, FT_Op, NULL },                        
++                { ocNotEqual, FT_Op, NULL },                    
++                { ocLessEqual, FT_Op, NULL },           
++                { ocGreaterEqual, FT_Op, NULL },        
++                { ocLess, FT_Op, NULL },                
++                { ocGreater, FT_Op, NULL },             
++                { ocAnd, FT_Op, NULL },                 
++                { ocOr, FT_Op, NULL },                  
++                { ocNot, FT_FuncFix1, NULL },                 
++                { ocPush, FT_NOP, NULL },
++		{ ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },               
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoValue, FT_FuncFix0, NULL },              
++                { ocNoName, FT_FuncFix0, NULL },              
++                { ocAbs, FT_FuncFix1, NULL },                  
++                { ocInt, FT_FuncFix1, NULL },                 
++                { ocSqrt, FT_FuncFix1, NULL },                
++                { ocLog10, FT_FuncFix1, NULL },               
++                { ocLn, FT_FuncFix1, NULL },                  
++                { ocPi, FT_FuncFix0, NULL },                   
++		{ ocSin, FT_FuncFix1, NULL },                   
++                { ocCos, FT_FuncFix1, NULL },                 
++                { ocTan, FT_FuncFix1, NULL },                 
++                { ocArcTan2, FT_FuncFix2, NULL },              
++                { ocArcTan, FT_FuncFix1, NULL },              
++                { ocArcSin, FT_FuncFix1, NULL },              
++                { ocArcCos, FT_FuncFix1, NULL },              
++                { ocExp, FT_FuncFix1, NULL },                  
++                { ocMod, FT_FuncFix2, NULL },    
++                { ocChose, FT_FuncVar, NULL },                
++                { ocIsNV, FT_FuncFix1, NULL },                
++                { ocIsError, FT_FuncFix1, NULL },              
++                { ocFalse, FT_FuncFix0, NULL },               
++                { ocTrue, FT_FuncFix0, NULL },                
++                { ocRandom, FT_FuncFix0, NULL },                      
++                { ocGetDate, FT_FuncFix3, NULL },                    
++                { ocGetActDate, FT_FuncFix0, NULL },          
++                { ocRMZ, FT_FuncFix3, NULL },                
++                { ocBW, FT_FuncFix3, NULL },               
++                { ocZW, FT_FuncFix3, NULL },            
++                { ocIf, FT_FuncFix3, NULL },          
++                { ocGetDay, FT_FuncFix1, NULL },                     
++                { ocGetMonth, FT_FuncFix1, NULL },                   
++                { ocGetYear, FT_FuncFix1, NULL },                    
++                { ocRound, FT_FuncFix2, NULL },                      
++                { ocGetTime, FT_FuncFix3, NULL },                    
++                { ocGetHour, FT_FuncFix1, NULL },                    
++                { ocGetMin, FT_FuncFix1, NULL },                      
++                { ocGetSec, FT_FuncFix1, NULL },                     
++                { ocIsValue, FT_FuncFix1, NULL },                     
++                { ocIsString, FT_FuncFix1, NULL },                    
++                { ocLen, FT_FuncFix1, NULL },                        
++                { ocValue, FT_FuncFix1, NULL },    
++		{ ocFixed, FT_FuncFix2, NULL },                      
++                { ocMid, FT_FuncFix3, NULL },                         
++                { ocChar, FT_FuncFix1, NULL },                        
++                { ocCode, FT_FuncFix1, NULL },                       
++                { ocFind, FT_FuncFix3, NULL },                       
++                { ocGetDateValue, FT_FuncFix1, NULL },        
++		{ ocGetTimeValue, FT_FuncFix1, NULL },        
++                { ocNoName, FT_FuncFix1, "CELLPOINTER" },              
++		{ ocSum, FT_FuncVar, NULL },                 
++                { ocAverage, FT_FuncVar, NULL },              
++                { ocCount, FT_FuncVar, NULL },               
++                { ocMin, FT_FuncVar, NULL },                  
++                { ocMax, FT_FuncVar, NULL },                 
++                { ocVLookup, FT_FuncFix3, NULL },             
++                { ocNBW, FT_FuncFix2, NULL },                 
++                { ocVar, FT_FuncVar, NULL },                 
++                { ocNormDist, FT_FuncVar, NULL },           
++                { ocIKV, FT_FuncFix2, NULL },                  
++                { ocHLookup, FT_FuncFix3, NULL },              
++                { ocDBSum, FT_FuncFix3, NULL },                
++                { ocDBAverage, FT_FuncFix3, NULL },           
++                { ocDBCount, FT_FuncFix3, NULL },             
++                { ocDBMin, FT_FuncFix3, NULL },                
++		{ ocDBMax, FT_FuncFix3, NULL }, 
++                { ocDBVar, FT_FuncFix3, NULL },               
++                { ocDBStdDev, FT_FuncFix3, NULL },            
++                { ocIndex, FT_FuncFix3, NULL },               
++                { ocColumns, FT_FuncFix1, NULL },             
++                { ocRows, FT_FuncFix1, NULL },                 
++                { ocRept, FT_FuncFix2, NULL },                 
++                { ocUpper, FT_FuncFix1, NULL },               
++                { ocLower, FT_FuncFix1, NULL },               
++                { ocLeft, FT_FuncFix2, NULL },                
++                { ocRight, FT_FuncFix2, NULL },               
++                { ocReplace, FT_FuncFix4, NULL },              
++                { ocPropper, FT_FuncFix1, NULL },              
++                { ocNoName, FT_FuncFix2, "CELL" },              
++                { ocTrim, FT_FuncFix1, NULL },                
++                { ocClean, FT_FuncFix1, NULL },               
++                { ocFalse, FT_FuncFix1, "F" },               
++                { ocTrue, FT_FuncFix1, "W" },                 
++                { ocExact, FT_FuncFix2, NULL },               
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocIndirect, FT_FuncFix1, NULL },             
++                { ocZins, FT_FuncFix3, "RATE" },                
++		{ ocNoName, FT_FuncFix1, "TERM" },              
++                { ocNoName, FT_FuncFix1, "CTERM" },              
++        	{ ocLIA, FT_FuncFix3, NULL },
++		{ ocDIA, FT_FuncFix4, NULL },                  
++                { ocGDA, FT_FuncFix4, NULL },                 
++                { ocNoName, FT_NotImpl,"STDS" },         
++                { ocNoName, FT_NotImpl, "VARS" },          
++                { ocNoName, FT_NotImpl, "DSTDS" },              
++                { ocNoName, FT_NotImpl, "DVARS" },              
++                { ocNoName, FT_NotImpl, "PVAL" },              
++                { ocNoName, FT_NotImpl, "PAYMT" },              
++                { ocNoName, FT_NotImpl, "FVAL" },              
++                { ocNoName, FT_NotImpl, "NPER" },              
++                { ocNoName, FT_NotImpl, "IRATE" },              
++                { ocNoName, FT_NotImpl, "IPAYMT" },              
++                { ocNoName, FT_NotImpl, "PPAYMT" },              
++                { ocNoName, FT_NotImpl, "SUMPRODUCT" },              
++                { ocNoName, FT_NotImpl, "MEMAVAIL" },              
++                { ocNoName, FT_NotImpl, "MEMEMSAVAIL" },              
++                { ocNoName, FT_NotImpl, "FILEEXISTS" },              
++                { ocNoName, FT_NotImpl, "CURVALUE" },              
++                { ocNoName, FT_NotImpl, "DEGREES" },              
++                { ocNoName, FT_NotImpl, "RADIANS" },              
++                { ocNoName, FT_NotImpl, "HEXTONUM" },              
++                { ocNoName, FT_NotImpl, "NUMTOHEX" },              
++                { ocNoName, FT_NotImpl, "TODAY" },              
++                { ocNoName, FT_NotImpl, "NPV" },   
++		{ ocNoName, FT_NotImpl, "CELLINDEX2D" }, 
++		{ ocNoName, FT_NotImpl, "VERSION" }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++                { ocNoName, FT_NotImpl, NULL },
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, "SHEETS" }, 
++		{ ocNoName, FT_NotImpl, NULL },
++		{ ocNoName, FT_FuncVar, NULL },
++		{ ocNoName, FT_NotImpl, "INDEX3D" },
++		{ ocNoName, FT_NotImpl, "CELLINDEX3D" }, 
++		{ ocNoName, FT_NotImpl, "PROPERTY" },
++		{ ocNoName, FT_NotImpl, "DDELINK" },
++		{ ocNoName, FT_NotImpl, "COMMAND" }
++};
++
++DefTokenId QProToSc::IndexToToken( sal_uInt16 nIndex )
++{
++	if( nIndex >= 0 && nIndex <= 161 )
++      		return aFuncMap[ nIndex ].nToken;
++}
++                                                                                                                  
++FUNC_TYPE QProToSc::IndexToType( sal_uInt8 nIndex )
++{
++	if( nIndex >= 0 && nIndex <= 161 )	
++      		return aFuncMap[ nIndex ].nType;
++}
++
++const sal_Char* QProToSc::GetAddInName( const UINT8 nIndex )
++{
++	if( nIndex >= 0 && nIndex <= 161 )
++		return aFuncMap[ nIndex ].addInName;
++}
++                                                                                                                  
++
diff --git a/patches/OOO_1_1/qproform-hxx.diff b/patches/OOO_1_1/qproform-hxx.diff
new file mode 100644
index 000000000..3516f9977
--- /dev/null
+++ b/patches/OOO_1_1/qproform-hxx.diff
@@ -0,0 +1,74 @@
+--- /dev/null	2004-08-25 23:04:59.000000000 +0530
++++ sc/source/filter/inc/qproform.hxx	2004-12-15 14:21:27.642350600 +0530
+@@ -0,0 +1,71 @@
++#ifndef _QPROFORM_HXX
++#define _QPROFORM_HXX
++
++#ifndef SC_XLTOOLS_HXX
++#include "xltools.hxx"
++#endif                                                                                                                  
++#ifndef _FORMEL_HXX
++#include "formel.hxx"
++#endif
++#ifndef _STRING_HXX
++#include <tools/string.hxx>
++#endif
++#ifndef _QPRO_HXX
++#include "qpro.hxx"
++#endif
++
++enum FUNC_TYPE
++{
++        FT_Return,  
++        FT_FuncFix0,
++        FT_FuncFix1,   
++        FT_FuncFix2,  
++        FT_FuncFix3,    
++        FT_FuncFix4,    
++        FT_FuncVar,            
++        FT_Neg,               
++        FT_Op,              
++        FT_NotImpl,        
++        FT_ConstFloat,  
++        FT_Variable,   
++        FT_Range,   
++        FT_Braces,
++        FT_ConstInt,    
++        FT_ConstString,
++        FT_NOP,                 
++        FT_Cref,               
++        FT_Rref,               
++        FT_Nrref,              
++        FT_Absnref,            
++        FT_Erref,              
++        FT_Ecref,              
++        FT_Econstant,   
++        FT_Splfunc,    
++        FT_Const10Float,
++};
++                                                                                                                  
++class QProToSc : public QProConverterBase
++{
++private:
++        TokenId                         nAddToken;  
++        TokenId                         nSubToken;  
++        TokenId                         n0Token;  
++         
++        void 				ReadSRD( SingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); 
++public:
++	 				QProToSc( BiffReader& aStr );
++                                        ~QProToSc(){ };
++	ConvErr				Convert( const ScTokenArray*& rpErg, sal_uInt16 nLen,
++                                                                        const FORMULA_TYPE eFT = FT_CellFormula );
++	void				Reset( ScAddress aEingPos );
++	void	                        DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtString );
++
++        void                            IncToken( TokenId &rParam );
++        void                            DecToken( TokenId& rParam );
++        void                            NegToken( TokenId& rParam );
++        DefTokenId			IndexToToken( sal_uInt16 nToken );
++	FUNC_TYPE			IndexToType( sal_uInt8 nToken );
++	const sal_Char*			GetAddInName( const sal_uInt8 nId ); 
++};
++
++#endif
diff --git a/patches/OOO_1_1/recent-files.diff b/patches/OOO_1_1/recent-files.diff
index 41434beb4..6fb5fc797 100644
--- a/patches/OOO_1_1/recent-files.diff
+++ b/patches/OOO_1_1/recent-files.diff
@@ -270,7 +270,7 @@
 +#endif
 --- /dev/null	2003-09-23 18:59:22.000000000 +0100
 +++ svtools/source/config/recent-files.cxx	2004-03-12 14:54:33.000000000 +0000
-@@ -0,0 +1,817 @@
+@@ -0,0 +1,820 @@
 +#include <stdio.h>
 +#include <string.h>
 +#include <time.h>
@@ -1044,6 +1044,9 @@
 +
 +	uri.convertToString(&uriOString, osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS);
 +	mimeType.convertToString(&mimeTypeOString, osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS);
++ 
++       if (0 == mimeTypeOString.getLength())
++               mimeTypeOString = APPLICATION_OCTET_STREAM;
 +
 +	for (ItemList::iterator l = context.items.begin(); l != context.items.end(); l++) {
 +		Item *item;
diff --git a/patches/OOO_1_1/rpath-origin-desktop.diff b/patches/OOO_1_1/rpath-origin-desktop.diff
new file mode 100644
index 000000000..bdac803eb
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-desktop.diff
@@ -0,0 +1,57 @@
+--- desktop/scripts/soffice.sh
++++ desktop/scripts/soffice.sh
+@@ -137,36 +137,15 @@ case $sd_platform in
+     export LD_LIBRARYN32_PATH
+     ;;
+ 
++  Linux*)
++    #-rpath $ORIGIN is sufficient
++    ;;
+   *)
+     LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH
+     export LD_LIBRARY_PATH
+     ;;
+ esac
+ 
+-# 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"`
+-    if [ "$java_ld_library_path" != "" ] ; then
+-        case $sd_platform in
+-            AIX)
+-                LIBPATH=${java_ld_library_path}:${LIBPATH}
+-                ;;
+-            Darwin)
+-                DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+-                ;;
+-            HP-UX)
+-                SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
+-                ;;
+-            IRIX*)
+-                LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
+-                ;;
+-            *)
+-                LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+-                ;;
+-        esac
+-    fi
+-fi
+-
+ # set java environment variables
+ THREADS_TYPE=native_threads
+ 
+@@ -232,9 +211,12 @@ sd_pagein_args="${sd_pagein_args:+${sd_p
+ "${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args}
+ 
+ # set path so that other apps can be started from soffice just by name
+-PATH="$sd_prog":$PATH
++if [ $PATH ] ; then
++    PATH="$sd_prog":$PATH
++else
++    PATH="$sd_prog"
++fi
+ export PATH
+ 
+ # execute soffice binary
+ exec "$sd_prog/$sd_binary" "$@"
+-
diff --git a/patches/OOO_1_1/rpath-origin-icu.diff b/patches/OOO_1_1/rpath-origin-icu.diff
new file mode 100644
index 000000000..48fb593e9
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-icu.diff
@@ -0,0 +1,18 @@
+--- icu/icu-2.2.patch	17 May 2004 14:48:45 -0000	1.17.6.1.26.1
++++ icu/icu-2.2.patch	3 Nov 2004 10:41:48 -0000
+@@ -1127,3 +1127,15 @@
+           return tempGlyphCount;
+       };
+   
++*** misc/icu/source/data/icupkg.inc.in	2004-11-03 07:59:49.647342501 +0000
++--- misc/build/icu/source/data/icupkg.inc.in	2004-11-03 08:00:03.501366932 +0000
++***************
++*** 16,22 ****
++  include $(top_builddir)/icudefs.mk
++  
++  CPPFLAGS+= -I$(top_builddir)/common -I$(top_srcdir)/common
++- LDFLAGS=@LDFLAGS@ 
++  FFLAGS=@FFLAGS@
++  LIBS=@LIBS@ 
++  ICULIBS=$(LIBS) -licu-uc -licu-i18n
++--- 16,21 ----
diff --git a/patches/OOO_1_1/rpath-origin-stlport.diff b/patches/OOO_1_1/rpath-origin-stlport.diff
new file mode 100644
index 000000000..1126bc9b2
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-stlport.diff
@@ -0,0 +1,11 @@
+--- stlport/STLport-4.5.patch
++++ stlport/STLport-4.5.patch
+@@ -169,7 +169,7 @@
+ ! #
+ ! #
+ ! LINK=ar cr
+-! DYN_LINK=$(CXX) --fexceptions -shared -o
++! DYN_LINK=$(CXX) -Wl,-rpath,\''$$ORIGIN'\' --fexceptions -shared -o
+ ! 
+ ! OBJEXT=o
+ ! DYNEXT=so
diff --git a/patches/OOO_1_1/sc-autofilter-empty-nonempty.diff b/patches/OOO_1_1/sc-autofilter-empty-nonempty.diff
new file mode 100644
index 000000000..564dd650a
--- /dev/null
+++ b/patches/OOO_1_1/sc-autofilter-empty-nonempty.diff
@@ -0,0 +1,42 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/view/gridwin.cxx	2003-06-02 12:58:42.000000000 +0530
++++ sc/source/ui/view/gridwin.cxx	2004-10-11 11:22:24.000000000 +0530
+@@ -159,6 +159,8 @@
+ #define SC_AUTOFILTER_ALL		0
+ #define	SC_AUTOFILTER_CUSTOM	1
+ #define	SC_AUTOFILTER_TOP10		2
++#define	SC_AUTOFILTER_EMPTY		3
++#define	SC_AUTOFILTER_NOTEMPTY		4
+ 
+ //	Modi fuer die FilterListBox
+ enum ScFilterBoxMode
+@@ -711,7 +713,7 @@
+ 		long nMaxText = 0;
+ 
+ 		//	default entries
+-		static const USHORT nDefIDs[] = { SCSTR_ALL, SCSTR_STDFILTER, SCSTR_TOP10FILTER };
++		static const USHORT nDefIDs[] = { SCSTR_ALL, SCSTR_STDFILTER, SCSTR_TOP10FILTER, SCSTR_EMPTY, SCSTR_NOTEMPTY };
+ 		const USHORT nDefCount = sizeof(nDefIDs) / sizeof(USHORT);
+ 		for (i=0; i<nDefCount; i++)
+ 		{
+@@ -1087,6 +1089,21 @@
+ 						rNewEntry.eOp	= SC_TOPVAL;
+ 						*rNewEntry.pStr	= String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10"));
+ 					}
++					else if (nSel == SC_AUTOFILTER_EMPTY)
++					{
++						rNewEntry.pStr->Erase();
++						rNewEntry.bQueryByString = FALSE;
++						rNewEntry.eOp	= SC_EQUAL;
++						rNewEntry.nVal	= SC_EMPTYFIELDS;
++									
++					}
++					else if (nSel == SC_AUTOFILTER_NOTEMPTY)
++					{
++						rNewEntry.pStr->Erase();
++						rNewEntry.bQueryByString = FALSE;				
++						rNewEntry.eOp	= SC_EQUAL;
++						rNewEntry.nVal	= SC_NONEMPTYFIELDS;				
++					}				
+ 					else
+ 					{
+ 						rNewEntry.eOp	= SC_EQUAL;
diff --git a/patches/OOO_1_1/sc-cell-selection-i3875.diff b/patches/OOO_1_1/sc-cell-selection-i3875.diff
new file mode 100644
index 000000000..1c67ee2d9
--- /dev/null
+++ b/patches/OOO_1_1/sc-cell-selection-i3875.diff
@@ -0,0 +1,141 @@
+--- sc/source/ui/inc/viewdata.hxx	2004-10-19 11:08:50.000000000 +0530
++++ sc/source/ui/inc/viewdata.hxx	2004-10-19 11:31:25.222005216 +0530
+@@ -54,7 +54,7 @@
+  *
+  *  All Rights Reserved.
+  *
+- *  Contributor(s): _______________________________________
++ *  Contributor(s): Kohei Yoshida__________________________
+  *
+  *
+  ************************************************************************/
+@@ -218,6 +218,8 @@
+ 	BYTE				nFillMode;					// Modus
+ 	BOOL				bPagebreak;					// Seitenumbruch-Vorschaumodus
+ 
++	BOOL				bSelCtrlMouseClick;
++
+ 	DECL_LINK (EmptyEditHdl, EditStatus*);
+ 	DECL_LINK (EditEngineHdl, EditStatus*);
+ 
+@@ -307,6 +309,8 @@
+ 
+ 	void			SetZoom( const Fraction& rNewX, const Fraction& rNewY );
+ 
++	void			EnableSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; }
++
+ 	const Fraction&	GetZoomX() const		{ return bPagebreak ? aPageZoomX : aZoomX; }
+ 	const Fraction&	GetZoomY() const		{ return bPagebreak ? aPageZoomY : aZoomY; }
+ 
+@@ -464,6 +468,8 @@
+ 	const Size&		GetScenButSize() const				{ return aScenButSize; }
+ 	void			SetScenButSize(const Size& rNew)	{ aScenButSize = rNew; }
+ 
++	BOOL			IsSelCtrlMouseClickEnabled() { return bSelCtrlMouseClick; }
++
+ 	static inline long ToPixel( USHORT nTwips, double nFactor );
+ };
+ 
+--- sc/source/ui/view/select.cxx	2004-10-19 11:08:52.000000000 +0530
++++ sc/source/ui/view/select.cxx	2004-10-19 11:31:25.252000656 +0530
+@@ -54,7 +54,7 @@
+  *
+  *  All Rights Reserved.
+  *
+- *  Contributor(s): _______________________________________
++ *  Contributor(s): Kohei Yoshida__________________________
+  *
+  *
+  ************************************************************************/
+@@ -598,6 +598,28 @@
+ 				aAnchorPos.Put( nPosX, nPosY, nTab );
+ 				bStarted = TRUE;
+ 			}
++			// #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells, 
++			// it highlights that new cell as well as the old cell where the cursor is 
++			// positioned prior to the click.  A selection mode via Shift-F8 should also 
++			// follow the same behavior.
++			else if ( pViewData->IsSelCtrlMouseClickEnabled() )
++			{
++				USHORT nOldX = pViewData->GetCurX();
++				USHORT nOldY = pViewData->GetCurY();
++				
++				pView->InitBlockMode( nOldX, nOldY, nTab, TRUE );
++				pView->MarkCursor( (USHORT) nOldX, (USHORT) nOldY, nTab );
++				
++				if ( nOldX != nPosX || nOldY != nPosY )
++				{
++					pView->DoneBlockMode( TRUE );
++					pView->InitBlockMode( nPosX, nPosY, nTab, TRUE );
++					pView->MarkCursor( (USHORT) nPosX, (USHORT) nPosY, nTab );
++					aAnchorPos.Put( nPosX, nPosY, nTab );
++				}
++				
++				bStarted = TRUE;
++			}
+ 		}
+ 
+ 		pView->SetCursor( (USHORT) nPosX, (USHORT) nPosY );
+--- sc/source/ui/view/tabview3.cxx	2004-10-19 11:08:52.000000000 +0530
++++ sc/source/ui/view/tabview3.cxx	2004-10-19 11:31:25.273997312 +0530
+@@ -54,7 +54,7 @@
+  *
+  *  All Rights Reserved.
+  *
+- *  Contributor(s): _______________________________________
++ *  Contributor(s): Kohei Yoshida__________________________
+  *
+  *
+  ************************************************************************/
+@@ -917,12 +917,20 @@
+ BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt )
+ {
+ 	BOOL bRet = FALSE;
++	
++	// #i3875# *Hack*
++	BOOL bMod1Locked = aViewData.GetViewShell()->GetLockedModifiers() & KEY_MOD1 ? TRUE : FALSE;
++	aViewData.EnableSelCtrlMouseClick( rMEvt.IsMod1() || bMod1Locked ); 
++	
+ 	if ( pSelEngine )
+ 	{
+ 		bMoveIsShift = rMEvt.IsShift();
+ 		bRet = pSelEngine->SelMouseButtonDown( rMEvt );
+ 		bMoveIsShift = FALSE;
+ 	}
++	
++	aViewData.EnableSelCtrlMouseClick( FALSE ); // #i3875# *Hack*
++	
+ 	return bRet;
+ }
+ 
+--- sc/source/ui/view/viewdata.cxx	2004-10-19 11:08:52.000000000 +0530
++++ sc/source/ui/view/viewdata.cxx	2004-10-19 11:31:25.300993208 +0530
+@@ -54,7 +54,7 @@
+  *
+  *  All Rights Reserved.
+  *
+- *  Contributor(s): _______________________________________
++ *  Contributor(s): Kohei Yoshida__________________________
+  *
+  *
+  ************************************************************************/
+@@ -327,7 +327,8 @@
+ 		bDelMarkValid( FALSE ),
+ 		bActive		( TRUE ),					//! wie initialisieren?
+ 		bPagebreak	( FALSE ),
+-		pSpellingView ( NULL )
++		pSpellingView ( NULL ),
++		bSelCtrlMouseClick( FALSE )
+ {
+ 	SetGridMode		( TRUE );
+ 	SetSyntaxMode	( FALSE );
+@@ -389,7 +390,8 @@
+ 		bDelMarkValid( FALSE ),
+ 		bActive		( TRUE ),								//! wie initialisieren?
+ 		bPagebreak	( rViewData.bPagebreak ),
+-		pSpellingView ( rViewData.pSpellingView )
++		pSpellingView ( rViewData.pSpellingView ),
++		bSelCtrlMouseClick( rViewData.bSelCtrlMouseClick )
+ {
+ 	SetGridMode		( rViewData.IsGridMode() );
+ 	SetSyntaxMode	( rViewData.IsSyntaxMode() );
diff --git a/patches/OOO_1_1/sc-datapilot-autoformat.diff b/patches/OOO_1_1/sc-datapilot-autoformat.diff
new file mode 100644
index 000000000..d5d229b69
--- /dev/null
+++ b/patches/OOO_1_1/sc-datapilot-autoformat.diff
@@ -0,0 +1,406 @@
+diff -u -r ../OOO_1_1_3_bak/sc/idl/pivotsh.idl sc/idl/pivotsh.idl
+--- ../OOO_1_1_3_bak/sc/idl/pivotsh.idl	2004-10-20 10:04:47.000000000 +0530
++++ sc/idl/pivotsh.idl	2004-11-17 10:31:29.000000000 +0530
+@@ -64,6 +64,7 @@
+ 
+ 	SID_PIVOT_RECALC	[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+ 	SID_PIVOT_KILL		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
++	SID_PIVOT_AFMT		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+ }
+ 
+ shell ScPivotShell
+diff -u -r ../OOO_1_1_3_bak/sc/idl/scalc.idl sc/idl/scalc.idl
+--- ../OOO_1_1_3_bak/sc/idl/scalc.idl	2004-10-20 10:04:47.000000000 +0530
++++ sc/idl/scalc.idl	2004-11-17 11:26:06.000000000 +0530
+@@ -326,6 +326,63 @@
+ ]
+ 
+  //--------------------------------------------------------------------------
++SfxVoidItem AutoFormatPivotTable SID_PIVOT_AFMT
++( )
++[
++// ### ACHTUNG: Neuer ConfigName in Resource? "Datenpilottabelle l<94>schen" : "Datenpilottabelle l�schen"
++        ConfigName = "Datenpilottabelle l<94>schen" ;
++// ### ACHTUNG: Neuer Helptext in Resource? "Datenpilottabelle l<94>schen" : "Datenpilottabelle l�schen"
++        HelpText = "Datenpilottabelle l<94>schen" ;
++                                                                                                                             
++        /* flags: */
++        AutoUpdate = FALSE ,
++        Cachable = Cachable ,
++        FastCall = FALSE ,
++        HasCoreId = FALSE ,
++        HasDialog = FALSE ,
++        ReadOnlyDoc = TRUE ,
++        Toggle = FALSE ,
++        Synchron ;
++                                                                                                                             
++        /* plugin: */
++        Container = FALSE ,
++        PlugComm = FALSE ,
++                                                                                                                             
++        /* api: */
++        Export = TRUE ,
++        IsCollection = FALSE ,
++        RecordAbsolute = FALSE ,
++        RecordPerSet ;
++                                                                                                                             
++        /* config: */
++        AccelConfig = FALSE ,
++        MenuConfig = TRUE ,
++        StatusBarConfig = FALSE ,
++        ToolBoxConfig = FALSE ,
++        GroupId = GID_DATA ;
++        //idlpp ConfigName [ english_us ] = "Delete DataPilot Table" ;
++        //idlpp HelpText [ english_us ] = "Delete DataPilot table" ;
++        //idlpp ConfigName [ portuguese ] = "Eliminar tabela do Piloto de dados" ;
++        //idlpp HelpText [ portuguese ] = "Elimina a tabela do Piloto de dados" ;
++        //idlpp ConfigName [ dutch ] = "Datapiloottabel wissen" ;
++        //idlpp HelpText [ dutch ] = "Datapiloottabel wissen" ;
++        //idlpp ConfigName [ french ] = "Supprimer tableau analytique du DataPilote" ;
++        //idlpp HelpText [ french ] = "Supprime le tableau analytique du DataPilote" ;
++        //idlpp ConfigName [ spanish ] = "Eliminar tabla del Piloto de datos" ;
++        //idlpp HelpText [ spanish ] = "Eliminar la tabla del piloto de datos" ;
++        //idlpp ConfigName [ italian ] = "Elimina tabella DataPilot" ;
++        //idlpp HelpText [ italian ] = "Datenpilottabelle l�schen" ;
++        //idlpp ConfigName [ danish ] = "DeletePivotTable" ;
++        //idlpp HelpText [ danish ] = "Datenpilottabelle l�schen" ;
++        //idlpp ConfigName [ swedish ] = "Ta bort datapilottabell" ;
++        //idlpp HelpText [ swedish ] = "Ta bort datapilottabell" ;
++        //idlpp ConfigName [ portuguese_brazilian ] = "DeletePivotTable" ;
++        //idlpp HelpText [ portuguese_brazilian ] = "Datenpilottabelle l�schen" ;
++]
++                                                                                                                             
++
++
++ //--------------------------------------------------------------------------
+ SfxVoidItem DefineDBName SID_DEFINE_DBNAME
+ ( )
+ [
+diff -u -r ../OOO_1_1_3_bak/sc/inc/dpobject.hxx sc/inc/dpobject.hxx
+--- ../OOO_1_1_3_bak/sc/inc/dpobject.hxx	2004-10-20 10:04:48.000000000 +0530
++++ sc/inc/dpobject.hxx	2004-11-17 16:07:35.669577984 +0530
+@@ -131,7 +131,7 @@
+ 	ScDPOutput*				pOutput;
+ 	BOOL					bSettingsChanged;
+ 	BOOL					bAlive;			// FALSE if only used to hold settings
+-
++	USHORT					nAutoFormatIndex;
+ 
+ 	void				CreateObjects();
+ 	void				CreateOutput();
+@@ -157,6 +157,9 @@
+ 	void				SetOutRange(const ScRange& rRange);
+ 	const ScRange&		GetOutRange() const		{ return aOutRange; }
+ 
++	void 			SetAutoFormatIndex (const USHORT nIndex);
++	const USHORT		GetAutoFormatIndex ()	{ if (this == NULL) return 65535; else return nAutoFormatIndex; }
++
+ 	void				SetSheetDesc(const ScSheetSourceDesc& rDesc);
+ 	void				SetImportDesc(const ScImportSourceDesc& rDesc);
+ 	void				SetServiceData(const ScDPServiceDesc& rDesc);
+diff -u -r ../OOO_1_1_3_bak/sc/inc/sc.hrc sc/inc/sc.hrc
+--- ../OOO_1_1_3_bak/sc/inc/sc.hrc	2004-10-20 10:04:48.000000000 +0530
++++ sc/inc/sc.hrc	2004-11-17 14:08:31.000000000 +0530
+@@ -1575,6 +1575,7 @@
+ 
+ #define RID_SCDLG_LINKAREA				(SC_DIALOGS_START + 132)
+ 
++#define SID_PIVOT_AFMT					(SC_DIALOGS_START + 133)
+ #define SC_DIALOGS_END          (SC_DIALOGS_START + 150)
+ 
+ #ifndef STD_MASKCOLOR
+diff -u -r ../OOO_1_1_3_bak/sc/sdi/pivotsh.sdi sc/sdi/pivotsh.sdi
+--- ../OOO_1_1_3_bak/sc/sdi/pivotsh.sdi	2004-10-20 10:04:54.000000000 +0530
++++ sc/sdi/pivotsh.sdi	2004-11-17 14:55:13.000000000 +0530
+@@ -5,6 +5,7 @@
+ 	SID_PIVOT_RECALC	[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+ 	SID_PIVOT_KILL		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+         SID_DP_FILTER           [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
++	SID_PIVOT_AFMT		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+ }
+ 
+ shell ScPivotShell
+diff -u -r ../OOO_1_1_3_bak/sc/sdi/scalc.sdi sc/sdi/scalc.sdi
+--- ../OOO_1_1_3_bak/sc/sdi/scalc.sdi	2004-10-20 10:04:54.000000000 +0530
++++ sc/sdi/scalc.sdi	2004-11-17 14:59:48.000000000 +0530
+@@ -1846,6 +1846,31 @@
+ 	GroupId = GID_DATA;
+ ]
+ 
++SfxVoidItem AutoFormatPivotTable SID_PIVOT_AFMT
++()
++[
++        /* flags: */
++        AutoUpdate = FALSE,
++        Cachable = Cachable,
++        FastCall = FALSE,
++        HasCoreId = FALSE,
++        HasDialog = FALSE,
++        ReadOnlyDoc = TRUE,
++        Toggle = FALSE,
++        Container = FALSE,
++        RecordAbsolute = FALSE,
++        RecordPerSet;
++        Synchron;
++                                                                                                                             
++        /* config: */
++        AccelConfig = FALSE,
++        MenuConfig = TRUE,
++        StatusBarConfig = FALSE,
++        ToolBoxConfig = FALSE,
++        GroupId = GID_DATA;
++]
++
++
+ //--------------------------------------------------------------------------
+ SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA
+ ()
+diff -u -r ../OOO_1_1_3_bak/sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
+--- ../OOO_1_1_3_bak/sc/source/core/data/dpobject.cxx	2004-10-20 10:05:04.000000000 +0530
++++ sc/source/core/data/dpobject.cxx	2004-10-28 14:59:46.000000000 +0530
+@@ -171,6 +171,7 @@
+ 	pImpDesc( NULL ),
+ 	pServDesc( NULL ),
+ 	pOutput( NULL ),
++	nAutoFormatIndex(65535),
+ 	bSettingsChanged( FALSE )
+ {
+ }
+@@ -182,6 +183,7 @@
+ 	aTableName( r.aTableName ),
+ 	aTableTag( r.aTableTag ),
+ 	aOutRange( r.aOutRange ),
++	nAutoFormatIndex(r.nAutoFormatIndex),
+ 	pSheetDesc( NULL ),
+ 	pImpDesc( NULL ),
+ 	pServDesc( NULL ),
+@@ -226,6 +228,11 @@
+ 	InvalidateData();		// re-init source from SaveData
+ }
+ 
++void ScDPObject::SetAutoFormatIndex(const USHORT nIndex)
++{
++	nAutoFormatIndex	= nIndex;
++}
++
+ void ScDPObject::SetOutRange(const ScRange& rRange)
+ {
+ 	aOutRange = rRange;
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/docshell/dbdocfun.cxx sc/source/ui/docshell/dbdocfun.cxx
+--- ../OOO_1_1_3_bak/sc/source/ui/docshell/dbdocfun.cxx	2004-10-20 10:05:03.000000000 +0530
++++ sc/source/ui/docshell/dbdocfun.cxx	2004-10-29 09:10:47.000000000 +0530
+@@ -1357,6 +1357,37 @@
+ 	delete pNewUndoDoc;
+ 	delete pUndoDPObj;
+ 
++	if (const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() != 65535)
++	{
++		ScViewData* pViewData = rDocShell.GetViewData();
++  		ScDocument* pDoc = pViewData->GetDocument();
++		rDocShell.GetViewData()->GetViewShell()->GetDBData( TRUE, SC_DB_OLD );
++		const ScMarkData& rMark1 = pViewData->GetMarkData();
++		USHORT nStartCol;
++		USHORT nStartRow;
++		USHORT nStartTab;
++		USHORT nEndCol;
++		USHORT nEndRow;
++		USHORT nEndTab;
++
++		rDocShell.GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,
++											  nEndCol,nEndRow,nEndTab );
++		ScRange Outrange = pNewObj->GetOutRange();
++		if (( (Outrange.aStart.Col() <= nStartCol) && (nStartCol <= Outrange.aEnd.Col() )&& (nStartTab == Outrange.aStart.Tab()))
++			&& ( (Outrange.aStart.Row() <= nStartRow) && (nStartRow <= Outrange.aEnd.Row() )) )
++			{
++		
++			if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
++				rDocShell.GetViewData()->GetViewShell()->MarkDataArea( TRUE );
++			//FIXME: Autoformat even when clicked from a non-dp cell.
++			pViewData->MoveNextRow();		
++			rDocShell.GetViewData()->GetViewShell()->AutoFormat( const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex());
++			rDocShell.GetViewData()->GetViewShell()->AutoFormatPivotTable( const_cast<ScDPObject *>(pNewObj), const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() );		
++			pViewData->MovePrevRow();
++			}
++	}
++
++
+ 	if (bDone)
+ 		aModificator.SetDocumentModified();
+ 
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
+--- ../OOO_1_1_3_bak/sc/source/ui/inc/dbfunc.hxx	2004-10-20 10:04:56.000000000 +0530
++++ sc/source/ui/inc/dbfunc.hxx	2004-10-28 15:27:28.000000000 +0530
+@@ -112,7 +112,9 @@
+ 									const ScDPObject& rSource, BOOL bApi = FALSE );
+ 	void			DeletePivotTable();
+ 	void			RecalcPivotTable();
+-
++	void			AutoFormatPivotTable(USHORT nIndex);
++	void 		AutoFormatPivotTable(ScDPObject*	pDPObj, USHORT nIndex);
++		
+ 	void			MakeOutline( BOOL bColumns, BOOL bRecord = TRUE );
+ 	void			RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE );
+ 	void			RemoveAllOutlines( BOOL bRecord = TRUE );
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
+--- ../OOO_1_1_3_bak/sc/source/ui/inc/viewdata.hxx	2004-10-20 10:04:55.000000000 +0530
++++ sc/source/ui/inc/viewdata.hxx	2004-10-28 16:32:32.000000000 +0530
+@@ -321,6 +321,8 @@
+ 
+ 	BOOL			GetSimpleArea( USHORT& rStartCol, USHORT& rStartRow, USHORT& rStartTab,
+ 									USHORT& rEndCol, USHORT& rEndRow, USHORT& rEndTab );
++	void 			MoveNextRow();
++	void 			MovePrevRow();
+ 	BOOL			GetSimpleArea( ScRange& rRange );
+ 	void			GetMultiArea( ScRangeListRef& rRange );
+ 
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/src/popup.src sc/source/ui/src/popup.src
+--- ../OOO_1_1_3_bak/sc/source/ui/src/popup.src	2004-10-20 10:04:59.000000000 +0530
++++ sc/source/ui/src/popup.src	2004-11-17 15:36:31.310003720 +0530
+@@ -1040,6 +1040,14 @@
+ 			Text[ kannada ] = "ಆರಂಭ...";
+ 		};
+ 		MenuItem
++                {
++                        Identifier = SID_PIVOT_AFMT ;
++                        HelpId = SID_PIVOT_AFMT ;
++                        Text = "A~ktualisieren" ;
++                        Text [ ENGLISH ] = "~AutoFormat..." ;
++			Text [ english_us ] = "~AutoFormat..." ; 
++		};
++		MenuItem
+ 		{
+ 			Identifier = SID_PIVOT_RECALC ;
+ 			HelpId = SID_PIVOT_RECALC ;
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
+--- ../OOO_1_1_3_bak/sc/source/ui/view/dbfunc3.cxx	2004-10-20 10:05:00.000000000 +0530
++++ sc/source/ui/view/dbfunc3.cxx	2004-10-28 15:26:15.000000000 +0530
+@@ -679,7 +679,29 @@
+ 	else
+ 		ErrorMessage(STR_PIVOT_NOTFOUND);
+ }
++void ScDBFunc::AutoFormatPivotTable(USHORT nIndex)
++{
++	ScDocShell* pDocSh  = GetViewData()->GetDocShell();
++	ScDocument* pDoc	= GetViewData()->GetDocument();
++
++	//	old pivot not used any more
+ 
++	ScDPObject*	pDPObj	= pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
++												  GetViewData()->GetCurY(),
++												  GetViewData()->GetTabNo() );
++	if ( pDPObj )
++	{
++		pDPObj->SetAutoFormatIndex(nIndex);
++	}
++	else
++		ErrorMessage(STR_PIVOT_NOTFOUND);
++
++}
++
++void ScDBFunc::AutoFormatPivotTable(ScDPObject*	pDPObj, USHORT nIndex)
++{
++	pDPObj->SetAutoFormatIndex(nIndex);
++}
+ 
+ //
+ //			DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/view/pivotsh.cxx sc/source/ui/view/pivotsh.cxx
+--- ../OOO_1_1_3_bak/sc/source/ui/view/pivotsh.cxx	2004-10-20 10:05:00.000000000 +0530
++++ sc/source/ui/view/pivotsh.cxx	2004-11-17 10:29:37.000000000 +0530
+@@ -87,6 +87,9 @@
+ #include "dbdocfun.hxx"
+ #include "uiitems.hxx"
+ #include "pfiltdlg.hxx"
++#include "autoform.hxx"
++#include "autofmt.hxx"
++#include "editable.hxx"
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -125,13 +128,56 @@
+ {
+ 	switch ( rReq.GetSlot() )
+ 	{
+-		case SID_PIVOT_RECALC:
+-			pViewShell->RecalcPivotTable();
+-			break;
++		case SID_PIVOT_AFMT:
++			{
++			ScViewData* pViewData = pViewShell->GetViewData();
++
++			pViewShell->GetDBData( TRUE, SC_DB_OLD );
++			const ScMarkData& rMark1 = pViewData->GetMarkData();
++			if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
++				pViewShell->MarkDataArea( TRUE );
++			
++			Window* pDlgParent = pViewShell->GetDialogParent();
++			
++			pViewData->MoveNextRow();
++				
++			ScGlobal::ClearAutoFormat();
++			ScAutoFormatData* pNewEntry = pViewShell->CreateAutoFormatData();
++			ScAutoFormatDlg*  pDlg		= new ScAutoFormatDlg(
++													pDlgParent,
++													ScGlobal::GetAutoFormat(),
++				                                                               pNewEntry,
++                            				                                   pViewShell->GetViewData()->GetDocument() );
++
++			if ( pDlg->Execute() == RET_OK )
++			{
++				ScEditableTester aTester( pViewShell );
++				if ( !aTester.IsEditable() )
++				{
++					pViewShell->ErrorMessage(aTester.GetMessageId());
++				}
++				else
++				{
++					/* AutoFormat and Store the index */
++					pViewShell->AutoFormat( pDlg->GetIndex() );
++					pViewShell->AutoFormatPivotTable( pDlg->GetIndex() );
++				}
++			}
++			delete pDlg;
++			delete pNewEntry;
++
+ 
++			//pViewShell->DeletePivotTable();
++			//pViewShell->RecalcPivotTable();
++			break;
++			}
+ 		case SID_PIVOT_KILL:
+ 			pViewShell->DeletePivotTable();
+ 			break;
++		case SID_PIVOT_RECALC:
++			//pViewShell->DeletePivotTable();
++			pViewShell->RecalcPivotTable();
++			break;
+ 
+         case SID_DP_FILTER:
+         {
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+--- ../OOO_1_1_3_bak/sc/source/ui/view/viewdata.cxx	2004-10-20 10:05:00.000000000 +0530
++++ sc/source/ui/view/viewdata.cxx	2004-10-28 16:32:16.000000000 +0530
+@@ -645,6 +645,23 @@
+ 	aLogicMode.SetScaleY( GetZoomY() );
+ }
+ 
++void ScViewData::MoveNextRow()
++{
++	ScRange aMarkRange;
++	aMarkData.GetMarkArea(aMarkRange);
++	aMarkRange.aStart.Set(aMarkRange.aStart.Col(), aMarkRange.aStart.Row() +1, aMarkRange.aStart.Tab());
++	aMarkData.SetMarkArea(aMarkRange);
++}
++
++void ScViewData::MovePrevRow()
++{
++	ScRange aMarkRange;
++	aMarkData.GetMarkArea(aMarkRange);
++	aMarkRange.aStart.Set(aMarkRange.aStart.Col(), aMarkRange.aStart.Row() -1, aMarkRange.aStart.Tab());
++	aMarkData.SetMarkArea(aMarkRange);
++}
++
++
+ BOOL ScViewData::GetSimpleArea( USHORT& rStartCol, USHORT& rStartRow, USHORT& rStartTab,
+ 								USHORT& rEndCol, USHORT& rEndRow, USHORT& rEndTab )
+ {
diff --git a/patches/OOO_1_1/sc-datapilot-dynamic-range.diff b/patches/OOO_1_1/sc-datapilot-dynamic-range.diff
new file mode 100644
index 000000000..673215b32
--- /dev/null
+++ b/patches/OOO_1_1/sc-datapilot-dynamic-range.diff
@@ -0,0 +1,316 @@
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/dbgui/pivot.hrc sc/source/ui/dbgui/pivot.hrc
+--- ../OOO_1_1_3_bak/sc/source/ui/dbgui/pivot.hrc	2004-10-20 10:05:01.000000000 +0530
++++ sc/source/ui/dbgui/pivot.hrc	2004-10-25 13:40:18.000000000 +0530
+@@ -104,4 +104,6 @@
+ #define PIVOTSTR_DEV2			9
+ #define PIVOTSTR_VAR			10
+ #define PIVOTSTR_VAR2			11
+-
++#define FT_INAREA			40
++#define RB_INAREA			41
++#define ED_INAREA			42
+Only in sc/source/ui/dbgui: pivot.hrc.rej
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/dbgui/pivot.src sc/source/ui/dbgui/pivot.src
+--- ../OOO_1_1_3_bak/sc/source/ui/dbgui/pivot.src	2004-10-20 10:05:01.000000000 +0530
++++ sc/source/ui/dbgui/pivot.src	2004-10-25 13:40:18.000000000 +0530
+@@ -413,6 +413,42 @@
+ 		Text[ thai ] = "เค้าโครง";
+ 		Text[ kannada ] = "ರೂಪ ವಿನ್ಯಾಸ";
+ 	};
++
++	FixedText FT_INAREA
++        {
++        Pos = MAP_APPFONT ( 6 , 153 ) ;
++        Size = MAP_APPFONT ( 59 , 8 ) ;
++                Hide = FALSE ;
++	Text [ ENGLISH ] = "SelectionResult" ;
++	Text [ english_us ] = "Selection from" ;
++	};
++
++        Edit ED_INAREA
++        {
++                Border = TRUE ;
++        Pos = MAP_APPFONT ( 65 , 153 ) ;
++        Size = MAP_APPFONT ( 100 , 12 ) ;
++                TabStop = TRUE ;
++                Hide = FALSE ;
++        };
++        ImageButton RB_INAREA
++        {
++        Pos = MAP_APPFONT ( 172 , 153 ) ;
++                Size = MAP_APPFONT ( 12 , 12 ) ;
++        TabStop = TRUE ;
++        Hide = FALSE ;
++                QuickHelpText = "Verkleinern" ;
++                QuickHelpText [ ENGLISH ] = "Shrink" ;
++                QuickHelpText [ portuguese ] = "Afastar" ;
++                QuickHelpText [ english_us ] = "Shrink" ;
++                QuickHelpText [ portuguese_brazilian ] = "Encolher" ;
++                QuickHelpText [ swedish ] = "F�rminska" ;
++                QuickHelpText [ danish ] = "Formindsk" ;
++                QuickHelpText [ italian ] = "Zoom indietro" ;
++                QuickHelpText [ spanish ] = "Reducir" ;
++                QuickHelpText [ french ] = "R�duire" ;
++                QuickHelpText [ dutch ] = "Verkleinen" ;
++	};
+ 	OKButton BTN_OK
+ 	{
+         Pos = MAP_APPFONT ( 280 , 6 ) ;
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
+--- ../OOO_1_1_3_bak/sc/source/ui/dbgui/pvlaydlg.cxx	2004-10-20 10:05:02.000000000 +0530
++++ sc/source/ui/dbgui/pvlaydlg.cxx	2004-10-26 13:27:44.481470776 +0530
+@@ -90,6 +90,7 @@
+ #include "pivot.hrc"
+ #include "dpobject.hxx"
+ #include "dpsave.hxx"
++#include "dpshttab.hxx"
+ #include "scmod.hxx"
+ 
+ using namespace com::sun::star;
+@@ -150,6 +151,9 @@
+ 		aFtOutArea		( this, ScResId( FT_OUTAREA ) ),
+ 		aEdOutPos		( this, ScResId( ED_OUTAREA ) ),
+ 		aRbOutPos		( this, ScResId( RB_OUTAREA ), &aEdOutPos ),
++		aFtInArea			( this, ScResId( FT_INAREA) ),
++		aEdInPos			( this, ScResId( ED_INAREA) ),
++		aRbInPos			( this, ScResId( RB_INAREA ), &aEdInPos ),
+         aFlAreas        ( this, ScResId( FL_OUTPUT ) ),
+ 
+         aFtRow          ( this, ScResId( FT_ROW ) ),
+@@ -177,7 +181,7 @@
+ 								GetViewData() ),
+ 		pDoc			( ((ScTabViewShell*)SfxViewShell::Current())->
+ 								GetViewData()->GetDocument() ),
+-		bRefInputMode	( FALSE )
++		bRefInputMode	( TRUE )
+ {
+ 	if ( pDPObject )
+ 	{
+@@ -282,6 +286,12 @@
+ 	InitWnd( thePivotData.aRowArr,  thePivotData.nRowCount,  TYPE_ROW );
+ 	InitWnd( thePivotData.aDataArr, thePivotData.nDataCount, TYPE_DATA );
+ 
++	ScRange inRange;
++	String inString;
++	inRange = pDlgDPObject->GetSheetDesc()->aSourceRange;
++	inRange.Format( inString, STD_FORMAT, pDoc);
++	aEdInPos.SetText(inString);
++	
+     aSlider.SetPageSize( PAGE_SIZE );
+     aSlider.SetVisibleSize( PAGE_SIZE );
+     aSlider.SetLineSize( LINE_SIZE );
+@@ -299,6 +309,7 @@
+ 
+     aLbOutPos .SetSelectHdl( LINK( this, ScDPLayoutDlg, SelAreaHdl ) );
+     aEdOutPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdModifyHdl ) );
++    aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) );	
+     aBtnOk    .SetClickHdl ( LINK( this, ScDPLayoutDlg, OkHdl ) );
+     aBtnCancel.SetClickHdl ( LINK( this, ScDPLayoutDlg, CancelHdl ) );
+ 
+@@ -1218,17 +1229,34 @@
+ 
+ void ScDPLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDoc )
+ {
++	ScRefEdit *tmpREd;
++	ScRefButton *tmpRBtn;
++	
+ 	if ( bRefInputMode )
+ 	{
++		tmpRBtn = GetRefButton();
++		tmpREd = tmpRBtn->GetReferencesEdit();
+ 		if ( rRef.aStart != rRef.aEnd )
+-			RefInputStart( &aEdOutPos );
++			RefInputStart( tmpREd, tmpRBtn);
++
+ /*
+ 		ScAddress	aAdr( nStartCol, nStartRow, nStartTab );
+ 		aAdr.PutInOrder( ScAddress( nEndCol, nEndRow, nEndTab ) );
+ */
++
+ 		String aRefStr;
+-		rRef.aStart.Format( aRefStr, STD_FORMAT, pDoc );
+-		aEdOutPos.SetRefString( aRefStr );
++
++		if ( tmpREd== &aEdInPos)
++		{
++			USHORT	 	nFmt = SCR_ABS_3D;		 //!!! nCurTab fehlt noch		
++			if ( rRef.aStart.Tab() != rRef.aEnd.Tab() )
++				nFmt |= SCA_TAB2_3D;		
++			rRef.Format( aRefStr, nFmt, pDoc );
++		}
++		else			
++			rRef.aStart.Format( aRefStr, STD_FORMAT, pDoc );
++		
++		tmpREd->SetRefString( aRefStr );
+ 	}
+ }
+ 
+@@ -1389,7 +1417,7 @@
+ 	}
+ 	else
+ 	{
+-		bRefInputMode = FALSE;
++
+ 		//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
+ 		//SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+ 	}
+@@ -1426,6 +1455,95 @@
+ }
+ 
+ 
++IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG )
++{
++
++	String	theCurPosStr = aEdInPos.GetText();
++	ScSheetSourceDesc *inSheet = const_cast<ScSheetSourceDesc *>(pDlgDPObject->GetSheetDesc());
++	ScRefTripel start, end;
++	ConvertDoubleRef (pDoc, theCurPosStr, 1,  start, end );
++	inSheet->aSourceRange = ScRange(start, end);
++
++	pDlgDPObject->SetSheetDesc( *inSheet);
++	pDlgDPObject->InvalidateSource();
++	pDlgDPObject->Output();
++	pDlgDPObject->SetAlive( TRUE );		// needed to get structure information
++	pDlgDPObject->FillOldParam( thePivotData, FALSE );
++	pDlgDPObject->FillLabelData( thePivotData, bShowAll, MAX_LABELS );
++
++	
++	USHORT i;
++ 	for ( i=0; i<MAX_LABELS; i++ )
++		aSelectArr[i] = NULL;
++
++	for ( i=0; i<MAX_FIELDS; i++ )
++	{
++		aColArr[i]  = NULL;
++		aRowArr[i]  = NULL;
++		aDataArr[i] = NULL;
++	}
++
++	for ( i=0; i<nLabelCount; i++ )
++	{
++		delete aLabelDataArr[i];		
++	}	
++	delete [] aLabelDataArr;
++	
++	nLabelCount = 0;
++	aWndSelect.ClearFields();
++	
++	InitWndSelect( thePivotData.ppLabelArr, thePivotData.nLabels );
++	InitWnd( thePivotData.aColArr,  thePivotData.nColCount,  TYPE_COL );
++	InitWnd( thePivotData.aRowArr,  thePivotData.nRowCount,  TYPE_ROW );
++	InitWnd( thePivotData.aDataArr, thePivotData.nDataCount, TYPE_DATA );
++	aSlider.SetPageSize( PAGE_SIZE );
++	aSlider.SetVisibleSize( PAGE_SIZE );
++	aSlider.SetLineSize( LINE_SIZE );
++	aSlider.SetRange( Range( 0, ((thePivotData.nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE ) );
++
++	if ( thePivotData.nLabels > PAGE_SIZE )
++	{
++        aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
++		aSlider.Show();
++	}
++	else
++		aSlider.Hide();
++
++	if ( pViewData && pDoc )
++	{
++		/*
++		 * Aus den RangeNames des Dokumentes werden nun die
++		 * in einem Zeiger-Array gemerkt, bei denen es sich
++		 * um sinnvolle Bereiche handelt
++		 */
++
++		aLbOutPos.Clear();
++		aLbOutPos.InsertEntry( aStrUndefined, 0 );
++		aLbOutPos.InsertEntry( aStrNewTable,  1 );
++
++		ScAreaNameIterator aIter( pDoc );
++		String aName;
++		ScRange aRange;
++		String aRefStr;
++		while ( aIter.Next( aName, aRange ) )
++		{
++			if ( !aIter.WasDBName() )		// hier keine DB-Bereiche !
++			{
++				USHORT nInsert = aLbOutPos.InsertEntry( aName );
++
++				aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc );
++				aLbOutPos.SetEntryData( nInsert, new String( aRefStr ) );
++			}
++		}
++	}
++
++
++	
++	//Init();
++	return 0;
++}
++
++
+ //----------------------------------------------------------------------------
+ 
+ IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
+Only in sc/source/ui/dbgui: pvlaydlg.cxx.orig
+Only in sc/source/ui/dbgui: pvlaydlg.cxx.rej
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/inc/anyrefdg.hxx sc/source/ui/inc/anyrefdg.hxx
+--- ../OOO_1_1_3_bak/sc/source/ui/inc/anyrefdg.hxx	2004-10-20 10:04:56.000000000 +0530
++++ sc/source/ui/inc/anyrefdg.hxx	2004-10-25 15:34:23.000000000 +0530
+@@ -140,7 +140,7 @@
+                         ScRefButton( Window* pParent, const ResId& rResId );
+ 
+     void                SetReferences( ScAnyRefDlg* pDlg, ScRefEdit* pEdit );
+-
++    ScRefEdit* 	   GetReferencesEdit ();
+     void                SetStartImage();
+     void                SetEndImage();
+     inline void         DoRef() { Click(); }
+@@ -194,6 +194,7 @@
+                         ScAnyRefDlg( SfxBindings* pB, SfxChildWindow* pCW,
+                                      Window* pParent, USHORT nResId);
+     virtual             ~ScAnyRefDlg();
++    ScRefButton* GetRefButton()	{ return pRefBtn; }
+ 
+     virtual void        SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0;
+     virtual void        AddRefEntry();
+Only in sc/source/ui/inc: anyrefdg.hxx.orig
+Only in sc/source/ui/inc: anyrefdg.hxx.rej
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
+--- ../OOO_1_1_3_bak/sc/source/ui/inc/pvlaydlg.hxx	2004-10-20 10:04:56.000000000 +0530
++++ sc/source/ui/inc/pvlaydlg.hxx	2004-10-25 15:34:23.000000000 +0530
+@@ -163,8 +163,11 @@
+     FixedLine               aFlAreas;
+     ListBox                 aLbOutPos;
+     FixedText               aFtOutArea;
++    FixedText			aFtInArea;
+     ScRefEdit               aEdOutPos;
+     ScRefButton             aRbOutPos;
++    ScRefEdit               aEdInPos;
++    ScRefButton             aRbInPos;
+     CheckBox                aBtnIgnEmptyRows;
+     CheckBox                aBtnDetectCat;
+     CheckBox                aBtnTotalCol;
+@@ -243,6 +246,7 @@
+ 	DECL_LINK( SelAreaHdl, ListBox * );
+ 	DECL_LINK( MoreClickHdl, MoreButton * );
+ 	DECL_LINK( EdModifyHdl, Edit * );
++	DECL_LINK( EdInModifyHdl, Edit * );
+ 	DECL_LINK( OkHdl, OKButton * );
+ 	DECL_LINK( CancelHdl, CancelButton * );
+ #endif
+Only in sc/source/ui/inc: pvlaydlg.hxx.orig
+Only in sc/source/ui/inc: pvlaydlg.hxx.rej
+diff -u -r ../OOO_1_1_3_bak/sc/source/ui/miscdlgs/anyrefdg.cxx sc/source/ui/miscdlgs/anyrefdg.cxx
+--- ../OOO_1_1_3_bak/sc/source/ui/miscdlgs/anyrefdg.cxx	2004-10-20 10:05:03.000000000 +0530
++++ sc/source/ui/miscdlgs/anyrefdg.cxx	2004-10-25 15:34:23.000000000 +0530
+@@ -319,6 +319,11 @@
+     pRefEdit = pEdit;
+ }
+ 
++ScRefEdit* ScRefButton::GetReferencesEdit ()
++{
++    return pRefEdit;
++}
++
+ //----------------------------------------------------------------------------
+ 
+ void ScRefButton::Click()
diff --git a/patches/OOO_1_1/sc-filter-hide-filteredrows.diff b/patches/OOO_1_1/sc-filter-hide-filteredrows.diff
new file mode 100644
index 000000000..8afdfc01c
--- /dev/null
+++ b/patches/OOO_1_1/sc-filter-hide-filteredrows.diff
@@ -0,0 +1,15 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/core/data/table2.cxx	2003-04-08 21:50:02.000000000 +0530
++++ sc/source/core/data/table2.cxx	2004-10-13 15:01:58.814235896 +0530
+@@ -2251,8 +2251,10 @@
+ 		}
+ 
+ 		if (bShow)
+-			for (i=nStartRow; i<=nEndRow; i++)
+-				pRowFlags[i] &= ~(CR_HIDDEN | CR_FILTERED);
++			for (i=nStartRow; i<=nEndRow; i++){
++				if (! pRowFlags[i] & CR_FILTERED)
++					pRowFlags[i] &= ~(CR_HIDDEN);
++				}
+ 		else
+ 			for (i=nStartRow; i<=nEndRow; i++)
+ 				pRowFlags[i] |= CR_HIDDEN;
diff --git a/patches/OOO_1_1/sc-filters-fill-fix.diff b/patches/OOO_1_1/sc-filters-fill-fix.diff
new file mode 100644
index 000000000..9523c6924
--- /dev/null
+++ b/patches/OOO_1_1/sc-filters-fill-fix.diff
@@ -0,0 +1,20 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/core/data/table4.cxx	2003-03-26 23:34:00.000000000 +0530
++++ sc/source/core/data/table4.cxx	2004-10-14 11:12:38.050393488 +0530
+@@ -1286,6 +1286,8 @@
+ 				{
+ 					for (rInner = nIMin; rInner <= nIMax; rInner++)
+ 					{
++						if (pDocument->RowFiltered( rInner, nTab))
++							continue;					
+ 						USHORT nInd = nActFormCnt;
+ 						FillFormula(nInd, bFirst, (ScFormulaCell*)pSrcCell,
+ 							nCol, nRow, (rInner == nIEnd) );
+@@ -1297,6 +1299,8 @@
+ 				{
+ 					for (rInner = nIMin; rInner <= nIMax; rInner++)
+ 					{
++						if (pDocument->RowFiltered( rInner, nTab))
++							continue;
+ 						aCol[nCol].Insert(nRow, pSrcCell->Clone(pDocument));
+ 					}
+ 					nProgress += nIMax - nIMin + 1;
diff --git a/patches/OOO_1_1/sc-no-delete-filteredrows.diff b/patches/OOO_1_1/sc-no-delete-filteredrows.diff
new file mode 100644
index 000000000..eee9ed408
--- /dev/null
+++ b/patches/OOO_1_1/sc-no-delete-filteredrows.diff
@@ -0,0 +1,94 @@
+Index: sc/source/core/data/column.cxx
+===================================================================
+--- sc/source/core/data/column.cxx.orig	2004-11-26 13:35:37.996537216 +0000
++++ sc/source/core/data/column.cxx	2004-11-26 17:09:57.853541792 +0000
+@@ -1322,6 +1322,9 @@ void ScColumn::CopyToClip(USHORT nRow1, 
+ 	for (i = 0; i < nCount; i++)
+ 		if ((pItems[i].nRow >= nRow1) && (pItems[i].nRow <= nRow2))
+ 		{
++
++			if ( pDocument->RowFiltered( pItems[i].nRow , nTab))
++				continue;
+ 			if (!nBlockCount)
+ 				nStartIndex = i;
+ 			nEndIndex = i;
+@@ -1342,7 +1345,11 @@ void ScColumn::CopyToClip(USHORT nRow1, 
+ 	{
+ 		rColumn.Resize( rColumn.GetCellCount() + nBlockCount );
+ 		for (i = nStartIndex; i <= nEndIndex; i++)
++			{
++			if ( pDocument->RowFiltered( pItems[i].nRow , nTab))
++				continue;			
+ 			rColumn.Append(pItems[i].nRow, pItems[i].pCell->Clone(rColumn.pDocument));
++			}
+ 	}
+ }
+ 
+Index: sc/source/core/data/column3.cxx
+===================================================================
+--- sc/source/core/data/column3.cxx.orig	2004-11-26 13:35:37.999536760 +0000
++++ sc/source/core/data/column3.cxx	2004-11-26 17:09:57.867539664 +0000
+@@ -398,6 +398,17 @@ void ScColumn::DeleteRange( USHORT nStar
+ 	BOOL bSimple = ((nDelFlag & IDF_CONTENTS) == IDF_CONTENTS);
+ 	USHORT i;
+ 
++	/*
++	  *If we are deleting a range that has filtered column, let it not be simple 
++	  */
++	  
++	if (bSimple)
++	{
++		for (i = nStartIndex; i <= nEndIndex && bSimple; i++)
++			if ( pDocument->RowFiltered(pItems[i].nRow, nTab))
++				bSimple = FALSE;
++	}
++
+ 		//	Notiz-Zeichenobjekte
+ 	if (nDelFlag & IDF_NOTE)
+ 	{
+@@ -452,6 +463,16 @@ void ScColumn::DeleteRange( USHORT nStar
+ 			BOOL bDelete = FALSE;
+ 			ScBaseCell* pOldCell = pItems[j].pCell;
+ 			CellType eCellType = pOldCell->GetCellType();
++			
++			/*
++			  * If the rows are filtered continue instead deleting.
++			  */
++			if ( pDocument->RowFiltered( pItems[j].nRow, nTab))
++				{
++				++j;
++				continue;
++				}
++			
+ 			switch ( eCellType )
+ 			{
+ 				case CELLTYPE_VALUE:
+Index: sc/inc/document.hxx
+===================================================================
+--- sc/inc/document.hxx.orig	2004-11-26 13:35:38.064526880 +0000
++++ sc/inc/document.hxx	2004-11-26 17:10:55.795733240 +0000
+@@ -508,6 +508,8 @@ public:
+ 	long			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
+ 	ULONG			GetCodeCount() const;		// RPN-Code in Formeln
+ 	DECL_LINK( GetUserDefinedColor, USHORT * );
++	BOOL 		RowFiltered( USHORT nRow, USHORT nTab ) const;	// FillInfo
++	BOOL		ColFiltered( USHORT nCol, USHORT nTab ) const;	// FillInfo
+ 																// Numberformatter
+ 
+ public:
+@@ -1698,6 +1700,15 @@ inline BOOL ScDocument::RowHidden( USHOR
+ 	return ( pTab[nTab]->pRowFlags[nRow] & CR_HIDDEN ) != 0;
+ }
+ 
++inline BOOL ScDocument::ColFiltered( USHORT nCol, USHORT nTab ) const
++{
++	return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
++}
++
++inline BOOL ScDocument::RowFiltered( USHORT nRow, USHORT nTab ) const
++{
++	return pTab[nTab]->IsFiltered(nRow);
++}
+ 
+ 
+ #endif
diff --git a/patches/OOO_1_1/sc-paste-insert-rows.diff b/patches/OOO_1_1/sc-paste-insert-rows.diff
new file mode 100644
index 000000000..ef783c7d6
--- /dev/null
+++ b/patches/OOO_1_1/sc-paste-insert-rows.diff
@@ -0,0 +1,13 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/view/viewfun3.cxx	2003-10-31 21:40:15.000000000 +0530
++++ sc/source/ui/view/viewfun3.cxx	2004-10-14 13:29:36.754960480 +0530
+@@ -442,8 +442,8 @@
+ 
+ 	if (pOwnClip)
+ 		PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
+-						PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
+-						TRUE );		// allow warning dialog
++						PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_CELLSDOWN, IDF_NONE,
++						FALSE );		
+ 	else if (pDrawClip)
+ 		PasteDraw();
+ 	else
diff --git a/patches/OOO_1_1/sc-paste-limitedsize.diff b/patches/OOO_1_1/sc-paste-limitedsize.diff
new file mode 100644
index 000000000..57484236d
--- /dev/null
+++ b/patches/OOO_1_1/sc-paste-limitedsize.diff
@@ -0,0 +1,25 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/view/viewfun3.cxx	2003-10-31 21:40:15.000000000 +0530
++++ sc/source/ui/view/viewfun3.cxx	2004-10-13 14:23:56.248238672 +0530
+@@ -721,15 +721,14 @@
+ 			}
+ 		}
+ 
+-		if (nBlockAddX > nDestSizeX)
+-			nMarkAddX = nBlockAddX - nDestSizeX;			// fuer Merge-Test
+-		else
+-			nEndCol = nStartCol + nDestSizeX;
++		/*
++		  * Therz no use in copying lesser data multiple times in a bigger marked area
++		  * So Im just reducing the size of the marked area.
++		  */
++		nEndCol = nStartCol + nDestSizeX;
+ 
+-		if (nBlockAddY > nDestSizeY)
+-			nMarkAddY = nBlockAddY - nDestSizeY;			// fuer Merge-Test
+-		else
+-			nEndRow = nStartRow + nDestSizeY;
++		nEndRow = nStartRow + nDestSizeY;
++		
+ 	}
+ 	else
+ 	{
diff --git a/patches/OOO_1_1/sc-show-sensitize.diff b/patches/OOO_1_1/sc-show-sensitize.diff
index dfcf64840..cb8b85cec 100644
--- a/patches/OOO_1_1/sc-show-sensitize.diff
+++ b/patches/OOO_1_1/sc-show-sensitize.diff
@@ -4,7 +4,7 @@
  										ScMarkData* pMarkData = NULL );
  	void			SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips,
  										BOOL bRecord = TRUE, BOOL bPaint = TRUE );
-+	BOOL                    GetRowColHidden(BOOL col);
++	BOOL                    GetRowColHidden(BOOL col, USHORT nTab);
  	void			ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE );
  	void			ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE );
  
@@ -62,11 +62,11 @@ diff -u -p -u -r1.20 cellsh.cxx
 +				break;
 +
 +			case FID_ROW_SHOW:
-+				if( pDoc->IsTabProtected(nTab) || pDocSh->IsReadOnly() || !pTabViewShell->GetRowColHidden(FALSE) ) 
++				if( pDoc->IsTabProtected(nTab) || pDocSh->IsReadOnly() || !pTabViewShell->GetRowColHidden(FALSE, nTab) ) 
 +					rSet.DisableItem( nWhich );
 +				break;
 +			case FID_COL_SHOW:
-+				if( pDoc->IsTabProtected(nTab) || pDocSh->IsReadOnly() || !pTabViewShell->GetRowColHidden(TRUE) ) 
++				if( pDoc->IsTabProtected(nTab) || pDocSh->IsReadOnly() || !pTabViewShell->GetRowColHidden(TRUE, nTab) ) 
  					rSet.DisableItem( nWhich );
  				break;
  
@@ -143,11 +143,11 @@ diff -u -p -u -p -r1.19 viewfunc.cxx
  	rMark.MarkToSimple();
  }
  
-+BOOL ScViewFunc::GetRowColHidden(BOOL col)
++BOOL ScViewFunc::GetRowColHidden(BOOL col, USHORT nTab)
 +{
 +	ScDocument* pDoc = GetViewData()->GetDocument();
 +	ScMarkData& rMark = GetViewData()->GetMarkData();
-+	USHORT nCol = 0,nRow = 0,nTab = 0, nRangeCnt = 0;
++	USHORT nCol = 0,nRow = 0, nRangeCnt = 0;
 +	USHORT* pRanges = new USHORT[MAXROW+1];
 +	BOOL hidden = FALSE;
 +
diff --git a/patches/OOO_1_1/sc-standard-filter-options.diff b/patches/OOO_1_1/sc-standard-filter-options.diff
new file mode 100644
index 000000000..676d97b2d
--- /dev/null
+++ b/patches/OOO_1_1/sc-standard-filter-options.diff
@@ -0,0 +1,362 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/inc/global.hxx	2003-04-28 21:00:46.000000000 +0530
++++ sc/inc/global.hxx	2004-10-08 16:23:48.000000000 +0530
+@@ -1329,6 +1329,8 @@
+ 
+ enum ScQueryOp
+ 	{
++		SC_BEGINS_WITH,
++		SC_ENDS_WITH,
+ 		SC_EQUAL,
+ 		SC_LESS,
+ 		SC_GREATER,
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/filtdlg.cxx	2004-01-09 20:11:10.000000000 +0530
++++ sc/source/ui/dbgui/filtdlg.cxx	2004-10-08 16:24:56.000000000 +0530
+@@ -83,6 +83,7 @@
+ #include "viewdata.hxx"
+ #include "document.hxx"
+ #include "scresid.hxx"
++#include "docoptio.hxx"
+ 
+ #include "foptmgr.hxx"
+ 
+@@ -219,6 +220,7 @@
+ 							aBtnMore,
+ 							aBtnCase,
+ 							aBtnRegExp,
++							aBtnWholeWord,
+ 							aBtnHeader,
+ 							aBtnUnique,
+ 							aBtnCopyResult,
+@@ -573,6 +575,17 @@
+ 		bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) );
+ 	}
+ 
++	/*
++	  * The reg exp checkbutton read is moved up, since,
++	  * for begins and ends with query we are makeing them as re query transparently
++	  * Checking this later spoils the entire transparent work.
++	  */
++	theParam.bRegExp		= aBtnRegExp.IsChecked();
++
++	ScDocOptions pDocOpts = pDoc->GetDocOptions();
++	pDocOpts.SetMatchWholeCell(aBtnWholeWord.IsChecked());
++	pDoc->SetDocOptions(pDocOpts);
++
+ 	for ( USHORT i=0; i<3; i++ )
+ 	{
+ 		USHORT 		nField	= aFieldLbArr[i]->GetSelectEntryPos();
+@@ -606,6 +619,19 @@
+ 			}
+ 			else
+ 			{
++				if (eOp == SC_BEGINS_WITH ) {
++					String tmp ('^');
++					tmp .Append(aStrVal);
++					::rtl::OUString str (tmp);
++					aStrVal.Assign(tmp);
++					eOp = SC_EQUAL;
++					theParam.bRegExp		= TRUE;
++				}
++				else if (eOp == SC_ENDS_WITH ) {
++					aStrVal.Append (String('$'));
++					eOp = SC_EQUAL;
++					theParam.bRegExp		= TRUE;
++				}
+ 				*rEntry.pStr		  = aStrVal;
+ 				rEntry.nVal			  = 0;
+ 				rEntry.bQueryByString = TRUE;
+@@ -642,7 +668,7 @@
+ 	theParam.bByRow			= TRUE;
+ 	theParam.bDuplicate		= !aBtnUnique.IsChecked();
+ 	theParam.bCaseSens 		= aBtnCase.IsChecked();
+-	theParam.bRegExp		= aBtnRegExp.IsChecked();
++	
+ 	theParam.bDestPers		= aBtnDestPers.IsChecked();
+ 
+ 	//	nur die drei eingestellten - alles andere zuruecksetzen
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filtdlg.hxx	2001-09-24 22:59:58.000000000 +0530
++++ sc/source/ui/inc/filtdlg.hxx	2004-10-08 12:23:49.000000000 +0530
+@@ -101,6 +101,7 @@
+ 	CheckBox		aBtnCase; \
+ 	CheckBox		aBtnRegExp; \
+ 	CheckBox		aBtnHeader; \
++	CheckBox		aBtnWholeWord; \
+ 	CheckBox		aBtnUnique; \
+ 	CheckBox		aBtnCopyResult; \
+ 	ListBox			aLbCopyArea; \
+@@ -122,6 +123,7 @@
+     aFlOptions      ( this, ScResId( FL_OPTIONS ) ), \
+ 	aBtnCase		( this, ScResId( BTN_CASE ) ), \
+ 	aBtnRegExp		( this, ScResId( BTN_REGEXP ) ), \
++	aBtnWholeWord	( this, ScResId( BTN_MATCH) ), \
+ 	aBtnHeader		( this, ScResId( BTN_HEADER ) ), \
+ 	aBtnUnique		( this, ScResId( BTN_UNIQUE ) ), \
+ 	aBtnCopyResult	( this, ScResId( BTN_COPY_RESULT ) ), \
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filter.hrc	2001-05-21 14:52:56.000000000 +0530
++++ sc/source/ui/inc/filter.hrc	2004-10-08 12:27:21.000000000 +0530
+@@ -81,7 +81,7 @@
+ #define FT_DBAREA_LABEL		10
+ #define FT_DBAREA			11
+ #define BTN_DEST_PERS		12
+-
++#define BTN_MATCH		13
+ // Filter:
+ #define FT_OP				20
+ #define FT_FIELD			21
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/src/filter.src	2004-04-27 22:31:47.000000000 +0530
++++ sc/source/ui/src/filter.src	2004-10-08 14:55:38.000000000 +0530
+@@ -66,7 +66,7 @@
+ 	HelpId = SID_FILTER ;
+ 	Hide = TRUE ;
+ 	SVLook = TRUE ;
+-	Size = MAP_APPFONT ( 298 , 83 ) ;
++	Size = MAP_APPFONT ( 298 , 98 ) ;
+ 	Text = "Standardfilter" ;
+ 	Text [ ENGLISH ] = "Standard Filter" ;
+ 	Text [ norwegian ] = "Standardfilter" ;
+@@ -708,12 +708,14 @@
+ 		};
+ 		stringlist [ english_us ] =
+ 		{
+-			< "=" ; Default ; > ;
++			< "Begins with" ; Default ; > ;
++			< "Ends with" ; Default ; > ;
++			< "Equals" ; Default ; > ;
+ 			< "<" ; Default ; > ;
+ 			< ">" ; Default ; > ;
+ 			< "<=" ; Default ; > ;
+ 			< ">=" ; Default ; > ;
+-			< "<>" ; Default ; > ;
++			< "Not equals" ; Default ; > ;
+ 			< "Largest" ; Default ; > ;
+ 			< "Smallest" ; Default ; > ;
+ 			< "Largest %" ; Default ; > ;
+@@ -2278,6 +2280,14 @@
+ 		Text[ zulu ] = "Isisho esi~jwayelekile";
+ 		Text[ norwegian_nynorsk ] = "~Regul�rt uttrykk";
+ 	};
++
++        CheckBox BTN_MATCH
++        {
++        Pos = MAP_APPFONT ( 12 , 126 ) ;
++        Size = MAP_APPFONT ( 239 , 10 ) ;
++                Text [ english_us ] = "Search criteria must apply to ~whole cells" ;
++	};
++
+ 	CheckBox BTN_HEADER
+ 	{
+ 		Hide = TRUE ;
+@@ -2458,7 +2468,7 @@
+ 	{
+ 		Border = TRUE ;
+ 		Hide = TRUE ;
+-        Pos = MAP_APPFONT ( 21 , 126 ) ;
++        Pos = MAP_APPFONT ( 21 , 138 ) ;
+ 		Size = MAP_APPFONT ( 90 , 90 ) ;
+ 		TabStop = TRUE ;
+ 		DropDown = TRUE ;
+@@ -2467,7 +2477,7 @@
+ 	{
+ 		Border = TRUE ;
+ 		Hide = TRUE ;
+-        Pos = MAP_APPFONT ( 115 , 126 ) ;
++        Pos = MAP_APPFONT ( 115 , 138 ) ;
+         Size = MAP_APPFONT ( 104 , 12 ) ;
+ 		TabStop = TRUE ;
+ 	};
+@@ -2475,7 +2485,7 @@
+ 	{
+ 		QuickHelpText = "Verkleinern" ;
+ 		QuickHelpText [ ENGLISH ] = "Shrink" ;
+-        Pos = MAP_APPFONT ( 221 , 126 ) ;
++        Pos = MAP_APPFONT ( 221 , 138 ) ;
+ 		Size = MAP_APPFONT ( 12 , 12 ) ;
+ 		TabStop = FALSE ;
+ 		QuickHelpText [ english_us ] = "Shrink" ;
+@@ -2605,7 +2615,7 @@
+ 	FixedText FT_DBAREA_LABEL
+ 	{
+ 		Hide = TRUE ;
+-        Pos = MAP_APPFONT ( 6 , 144 ) ;
++        Pos = MAP_APPFONT ( 6 , 156 ) ;
+         Size = MAP_APPFONT ( 58 , 8 ) ;
+ 		Text = "Datenbereich:" ;
+ 		Text [ ENGLISH ] = "Data area:" ;
+@@ -3204,10 +3214,10 @@
+ 		Text [ danish ] = "dummy" ;
+ 		Text [ french ] = "factice" ;
+ 		Text [ swedish ] = "dummy" ;
++		Left = TRUE ;
+ 		Text [ dutch ] = "dummy" ;
+ 		Text [ spanish ] = "Texto ejemplo" ;
+ 		Text [ english_us ] = "dummy" ;
+-		Left = TRUE ;
+ 		Text[ chinese_simplified ] = "样本";
+ 		Text[ russian ] = "���������";
+ 		Text[ polish ] = "Za�lepka";
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/foptmgr.cxx	2001-10-23 14:35:11.000000000 +0530
++++ sc/source/ui/dbgui/foptmgr.cxx	2004-10-08 16:04:15.000000000 +0530
+@@ -76,6 +76,7 @@
+ #include "dbcolect.hxx"
+ #include "viewdata.hxx"
+ #include "document.hxx"
++#include "docoptio.hxx"
+ 
+ #define _FOPTMGR_CXX
+ #include "foptmgr.hxx"
+@@ -111,6 +111,7 @@
+ 		rBtnMore		( refBtnMore ),
+ 		rBtnCase		( refBtnCase ),
+ 		rBtnRegExp		( refBtnRegExp ),
++		rBtnWholeWord		( refBtnRegExp ),
+ 		rBtnHeader		( refBtnHeader ),
+ 		rBtnUnique		( refBtnUnique ),
+ 		rBtnCopyResult	( refBtnCopyResult ),
+@@ -123,9 +124,53 @@
+ 		rStrNoName		( refStrNoName ),
+ 		rStrUndefined	( refStrUndefined )
+ {
+-	Init();
++	Init(FALSE);
+ }
+ 
++ScFilterOptionsMgr::ScFilterOptionsMgr(
++								Dialog*				ptrDlg,
++								ScViewData*			ptrViewData,
++								const ScQueryParam&	refQueryData,
++								MoreButton&			refBtnMore,
++								CheckBox&			refBtnCase,
++								CheckBox&			refBtnRegExp,
++								CheckBox&			refBtnWholeWord,								
++								CheckBox&			refBtnHeader,
++								CheckBox&			refBtnUnique,
++								CheckBox&			refBtnCopyResult,
++								CheckBox&			refBtnDestPers,
++								ListBox&			refLbCopyArea,
++								Edit&				refEdCopyArea,
++								ScRefButton&		refRbCopyArea,
++								FixedText&			refFtDbAreaLabel,
++								FixedInfo&			refFtDbArea,
++                                FixedLine&          refFlOptions,
++								const String&		refStrNoName,
++								const String&		refStrUndefined )
++
++	:	pDlg			( ptrDlg ),
++		pViewData		( ptrViewData ),
++		pDoc			( ptrViewData ? ptrViewData->GetDocument() : NULL ),
++		rQueryData		( refQueryData ),
++		rBtnMore		( refBtnMore ),
++		rBtnCase		( refBtnCase ),
++		rBtnRegExp		( refBtnRegExp ),
++		rBtnWholeWord      ( refBtnWholeWord),
++		rBtnHeader		( refBtnHeader ),
++		rBtnUnique		( refBtnUnique ),
++		rBtnCopyResult	( refBtnCopyResult ),
++		rBtnDestPers	( refBtnDestPers ),
++		rLbCopyPos		( refLbCopyArea ),
++		rEdCopyPos		( refEdCopyArea ),
++		rRbCopyPos		( refRbCopyArea ),
++		rFtDbAreaLabel	( refFtDbAreaLabel ),
++		rFtDbArea		( refFtDbArea ),
++        rFlOptions      ( refFlOptions ),
++		rStrNoName		( refStrNoName ),
++		rStrUndefined	( refStrUndefined )
++{
++	Init(TRUE);
++}
+ 
+ //----------------------------------------------------------------------------
+ 
+@@ -141,7 +186,7 @@
+ 
+ //----------------------------------------------------------------------------
+ 
+-void ScFilterOptionsMgr::Init()
++void ScFilterOptionsMgr::Init(BOOL param)
+ {
+ 	DBG_ASSERT( pViewData && pDoc, "Init failed :-/" );
+ 
+@@ -151,6 +196,8 @@
+ 
+ 	rBtnMore.AddWindow( &rBtnCase );
+ 	rBtnMore.AddWindow( &rBtnRegExp );
++	if (param)
++		rBtnMore.AddWindow(&rBtnWholeWord);	
+ 	rBtnMore.AddWindow( &rBtnHeader );
+ 	rBtnMore.AddWindow( &rBtnUnique );
+ 	rBtnMore.AddWindow( &rBtnCopyResult );
+@@ -160,13 +207,18 @@
+ 	rBtnMore.AddWindow( &rRbCopyPos );
+ 	rBtnMore.AddWindow( &rFtDbAreaLabel );
+ 	rBtnMore.AddWindow( &rFtDbArea );
+-    rBtnMore.AddWindow( &rFlOptions );
++       rBtnMore.AddWindow( &rFlOptions );
++
+ 
+ 	rBtnCase	.Check( rQueryData.bCaseSens );
+ 	rBtnHeader	.Check( rQueryData.bHasHeader );
+ 	rBtnRegExp	.Check( rQueryData.bRegExp );
+ 	rBtnUnique	.Check( !rQueryData.bDuplicate );
+-
++	if (param) {
++		BOOL	bMatchWholeCell = pDoc->GetDocOptions().IsMatchWholeCell();
++		rBtnWholeWord.Check(bMatchWholeCell);
++	}
++	
+ 	if ( pViewData && pDoc )
+ 	{
+ 		String			theAreaStr;
+@@ -266,6 +318,7 @@
+ 	}
+ 	else
+ 		rEdCopyPos.SetText( EMPTY_STRING );
++	rFtDbArea.SetPosPixel(Point(158,331));
+ }
+ 
+ 
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/foptmgr.hxx	2001-05-21 14:52:56.000000000 +0530
++++ sc/source/ui/inc/foptmgr.hxx	2004-10-08 16:02:56.000000000 +0530
+@@ -108,6 +108,26 @@
+                                 FixedLine&          refFlOptions,
+ 								const String&		refStrNoName,
+ 								const String&		refStrUndefined );
++			ScFilterOptionsMgr( Dialog*				ptrDlg,
++								ScViewData*			ptrViewData,
++								const ScQueryParam&	refQueryData,
++								MoreButton&			refBtnMore,
++								CheckBox&			refBtnCase,
++								CheckBox&			refBtnRegExp,
++								CheckBox&			refBtnWholeWord,
++								CheckBox&			refBtnHeader,
++								CheckBox&			refBtnUnique,
++								CheckBox&			refBtnCopyResult,
++								CheckBox&			refBtnDestPers,
++								ListBox&			refLbCopyArea,
++								Edit&				refEdCopyArea,
++								ScRefButton&		refRbCopyArea,
++								FixedText&			refFtDbAreaLabel,
++								FixedInfo&			refFtDbArea,
++                                FixedLine&          refFlOptions,
++								const String&		refStrNoName,
++								const String&		refStrUndefined );
++			
+ 			~ScFilterOptionsMgr();
+ 
+ 	BOOL	VerifyPosStr ( const String& rPosStr ) const;
+@@ -119,6 +139,7 @@
+ 
+ 	MoreButton&		rBtnMore;
+ 	CheckBox&		rBtnCase;
++	CheckBox&		rBtnWholeWord;
+ 	CheckBox&		rBtnRegExp;
+ 	CheckBox&		rBtnHeader;
+ 	CheckBox&		rBtnUnique;
+@@ -138,7 +159,7 @@
+ 
+ #ifdef _FOPTMGR_CXX
+ private:
+-	void Init();
++	void Init(BOOL param);
+ 
+ 	// Handler:
+ 	DECL_LINK( EdPosModifyHdl,		Edit* );
diff --git a/patches/OOO_1_1/sd-export-html-translations.diff b/patches/OOO_1_1/sd-export-html-translations.diff
index 788cd7d9f..b88bb504a 100644
--- a/patches/OOO_1_1/sd-export-html-translations.diff
+++ b/patches/OOO_1_1/sd-export-html-translations.diff
@@ -1,12 +1,9 @@
-Index: source/filter/html/pubdlg.src
+Index: sd/source/filter/html/pubdlg.src
 ===================================================================
-RCS file: /cvs/graphics/sd/source/filter/html/pubdlg.src,v
-retrieving revision 1.13.14.4
-diff -u -r1.13.14.4 pubdlg.src
---- sd/source/filter/html/pubdlg.src	27 Apr 2004 16:42:59 -0000	1.13.14.4
-+++ sd/source/filter/html/pubdlg.src	9 Jun 2004 04:36:11 -0000
-@@ -1357,47 +1357,47 @@
- 		Text[ norwegian_nynorsk ] = "Lagra bilete som";
+--- sd/source/filter/html/pubdlg.src.orig	2004-09-09 20:18:37.000000000 +0200
++++ sd/source/filter/html/pubdlg.src	2004-09-12 14:19:41.194859600 +0200
+@@ -1487,52 +1487,52 @@ ModalDialog DLG_PUBLISHING
+ 		Text[ galician ] = "Save graphics as";
  	};
  
 -	RadioButton PAGE3_GIF
@@ -14,7 +11,7 @@ diff -u -r1.13.14.4 pubdlg.src
  	{
  		Pos = MAP_APPFONT( 12, 49 );
  		Size = MAP_APPFONT( 116, 10 );
- 		Text = "~GIF";
+-		Text = "~GIF";
 -		Text [ ENGLISH ] = "~GIF";
 -		Text[ italian ] = "~GIF";
 -		Text[ portuguese_brazilian ] = "~GIF";
@@ -32,8 +29,8 @@ diff -u -r1.13.14.4 pubdlg.src
 -		Text[ greek ] = "~GIF - Graphics Interchange Format";
 -		Text[ korean ] = "~GIF";
 -		Text[ chinese_traditional ] = "~GIF";
--		Text[ arabic ] = "GIF - Graphics Interchange-Format";
--		Text[ turkish ] = "~GIF";
+-		Text[ arabic ] = "~GIF";
+-		Text[ turkish ] = "GIF";
 -		Text[ catalan ] = "~GIF";
 -		Text[ finnish ] = "~GIF";
 -		Text[ thai ] = "~GIF - Graphics Interchange Format";
@@ -51,6 +48,12 @@ diff -u -r1.13.14.4 pubdlg.src
 -		Text[ afrikaans ] = "~GIF";
 -		Text[ zulu ] = "~GIF";
 -		Text[ norwegian_nynorsk ] = "~GIF";
+-		Text[ tswana ] = "~GIF";
+-		Text[ basque ] = "~GIF";
+-		Text[ lithuanian ] = "~GIF";
+-		Text[ kannada ] = "GIF";
+-		Text[ galician ] = "~GIF";
++		Text = "~PNG";
 +		Text [ ENGLISH ] = "~PNG";
 +		Text[ italian ] = "~PNG";
 +		Text[ portuguese_brazilian ] = "~PNG";
@@ -68,8 +71,8 @@ diff -u -r1.13.14.4 pubdlg.src
 +		Text[ greek ] = "~PNG";
 +		Text[ korean ] = "~PNG";
 +		Text[ chinese_traditional ] = "~PNG";
-+		Text[ arabic ] = "PNG";
-+		Text[ turkish ] = "~PNG";
++		Text[ arabic ] = "~PNG";
++		Text[ turkish ] = "PNG";
 +		Text[ catalan ] = "~PNG";
 +		Text[ finnish ] = "~PNG";
 +		Text[ thai ] = "~PNG";
@@ -87,6 +90,11 @@ diff -u -r1.13.14.4 pubdlg.src
 +		Text[ afrikaans ] = "~PNG";
 +		Text[ zulu ] = "~PNG";
 +		Text[ norwegian_nynorsk ] = "~PNG";
++		Text[ tswana ] = "~PNG";
++		Text[ basque ] = "~PNG";
++		Text[ lithuanian ] = "~PNG";
++		Text[ kannada ] = "PNG";
++		Text[ galician ] = "~PNG";
  	};
  
  	RadioButton PAGE3_JPG
diff --git a/patches/OOO_1_1/sd-slide-sorter-selector.diff b/patches/OOO_1_1/sd-slide-sorter-selector.diff
new file mode 100644
index 000000000..fc8abd4b2
--- /dev/null
+++ b/patches/OOO_1_1/sd-slide-sorter-selector.diff
@@ -0,0 +1,48 @@
+--- sd/source/ui/func/fuslsel.cxx	2003-03-27 16:27:51.000000000 +0530
++++ sd/source/ui/func/fuslsel.cxx	2004-12-10 11:33:40.395794208 +0530
+@@ -165,9 +165,34 @@
+ 	{
+ 		bPageHit = TRUE;		 // Seite getroffen, merken fuer MouseMove
+ 
+-		if (rMEvt.IsShift())
++		if( rMEvt.IsMod1() ) 
+             pSlView->Select( ( pHitPage->GetPageNum() - 1 ) / 2, !pHitPage->IsSelected() );
+-		else if( !pHitPage->IsSelected() )
++		else if( rMEvt.IsShift() ) 
++		{
++		    USHORT nCurrentPage = ( pHitPage->GetPageNum() - 1 ) / 2;
++		    USHORT nPageRange;
++		    BOOL bFound = FALSE;
++		    for (nPageRange = 0; nPageRange < nNoOfPages; nPageRange++)
++		    {
++			SdPage* pTestPage = pDoc->GetSdPage(nPageRange, PK_STANDARD);
++			if( pTestPage->IsSelected() )
++			{
++			    bFound = TRUE;
++			    break;
++			}
++		    }
++		    if( !bFound )
++			pSlView->Select( nCurrentPage, TRUE );
++		    else if( nCurrentPage != nPageRange )
++		    {
++			for (nPage =  ((nCurrentPage > nPageRange) ? nPageRange   : nCurrentPage);
++			     nPage <= ((nCurrentPage > nPageRange) ? nCurrentPage : nPageRange); 
++			     nPage++)
++			    pSlView->Select( nPage, TRUE );
++		    }			
++		    
++		}
++		else
+ 		{
+     		// einfache Selektion, alle selektierten deselektieren, getroffene Seite selektieren
+             pSlView->SelectAll( FALSE );
+@@ -207,7 +232,7 @@
+ 	if( !pHitPage && !bReturn )
+ 	{
+ 		// keine erweiterte Selektion: alle Seiten deselektieren
+-		if( !rMEvt.IsShift() )
++		if( !rMEvt.IsShift() && !rMEvt.IsMod1() ) 
+             pSlView->SelectAll( FALSE );
+ 
+ 		bDragSelection = TRUE;
diff --git a/patches/OOO_1_1/sfx2-no-summary-crash-fix.diff b/patches/OOO_1_1/sfx2-no-summary-crash-fix.diff
new file mode 100644
index 000000000..d55ee3bb5
--- /dev/null
+++ b/patches/OOO_1_1/sfx2-no-summary-crash-fix.diff
@@ -0,0 +1,16 @@
+Index: sfx2/source/doc/docinf.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/doc/docinf.cxx,v
+retrieving revision 1.24
+diff -u -p -r1.24 docinf.cxx
+--- sfx2/source/doc/docinf.cxx	26 May 2003 08:29:06 -0000	1.24
++++ sfx2/source/doc/docinf.cxx	1 Nov 2004 11:23:17 -0000
+@@ -924,7 +924,7 @@ ULONG SfxDocumentInfo::LoadPropertySet( 
+ {
+ 	SvStorageStreamRef aStrPropSet = pStorage->OpenStream(
+ 		String::CreateFromAscii( pPropSlot ), STREAM_STD_READ );
+-	if ( !aStrPropSet.Is() )
++	if ( !aStrPropSet.Is() || aStrPropSet->GetError() != SVSTREAM_OK)
+ 		return ERRCODE_IO_ACCESSDENIED;
+ 	aStrPropSet->SetBufferSize( STREAM_BUFFER_SIZE );
+ 	SfxPS_Impl* pPS = new SfxPS_Impl;
diff --git a/patches/OOO_1_1/svtools-default-CTL-on.diff b/patches/OOO_1_1/svtools-default-CTL-on.diff
new file mode 100644
index 000000000..b14f07169
--- /dev/null
+++ b/patches/OOO_1_1/svtools-default-CTL-on.diff
@@ -0,0 +1,11 @@
+--- svtools/source/config/ctloptions.cxx.default-on	2004-12-09 11:15:05.895615360 -0500
++++ svtools/source/config/ctloptions.cxx	2004-12-09 11:40:31.287720512 -0500
+@@ -165,7 +165,7 @@
+     utl::ConfigItem( ASCII_STR("Office.Common/I18N/CTL") ),
+ 
+ 	m_bIsLoaded				( sal_False ),
+-    m_bCTLFontEnabled		( sal_False ),
++    m_bCTLFontEnabled		( sal_True ),
+     m_bCTLSequenceChecking	( sal_False ),
+ 	m_eCTLCursorMovement	( SvtCTLOptions::MOVEMENT_LOGICAL ),
+     m_eCTLTextNumerals      ( SvtCTLOptions::NUMERALS_ARABIC ),
diff --git a/patches/OOO_1_1/svx-default-font-tracks-LANGUAGE_SYSTEM.diff b/patches/OOO_1_1/svx-default-font-tracks-LANGUAGE_SYSTEM.diff
new file mode 100644
index 000000000..c226c9710
--- /dev/null
+++ b/patches/OOO_1_1/svx-default-font-tracks-LANGUAGE_SYSTEM.diff
@@ -0,0 +1,75 @@
+Index: svx/source/items/textitem.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/items/textitem.cxx,v
+retrieving revision 1.52
+diff -u -p -r1.52 textitem.cxx
+--- svx/source/items/textitem.cxx	17 Apr 2003 09:57:58 -0000	1.52
++++ svx/source/items/textitem.cxx	9 Dec 2004 11:43:56 -0000
+@@ -3704,24 +3704,21 @@ void GetDefaultFonts( SvxFontItem& rLati
+ {
+ 	const USHORT nItemCnt = 3;
+ 
+-	static struct
++	USHORT aOutTypeArr[ nItemCnt ] =
+ 	{
+-		USHORT nFontType;
+-		USHORT nLanguage;
+-	}
+-	aOutTypeArr[ nItemCnt ] =
+-	{
+-		{  DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US },
+-		{  DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
+-		{  DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA }
++		DEFAULTFONT_LATIN_TEXT,
++		DEFAULTFONT_CJK_TEXT,
++		DEFAULTFONT_CTL_TEXT
+ 	};
+ 
++	LanguageType eLanguage = Application::GetSettings().GetLanguage(); 
++
+ 	SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
+ 
+ 	for ( USHORT n = 0; n < nItemCnt; ++n )
+ 	{
+-		Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType,
+-												  aOutTypeArr[ n ].nLanguage,
++		Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ],
++												  eLanguage,
+ 												  DEFAULTFONT_FLAGS_ONLYONE, 0 ) );
+ 		SvxFontItem* pItem = aItemArr[ n ];
+ 		pItem->GetFamily() = aFont.GetFamily();
+Index: svx/source/svdraw/svdmodel.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdmodel.cxx,v
+retrieving revision 1.48
+diff -u -p -r1.48 svdmodel.cxx
+--- svx/source/svdraw/svdmodel.cxx	24 Apr 2003 16:42:29 -0000	1.48
++++ svx/source/svdraw/svdmodel.cxx	9 Dec 2004 11:44:19 -0000
+@@ -935,19 +935,20 @@ void SdrModel::SetTextDefaults() const
+ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex)
+ {
+ 	const USHORT nItemCnt = 3;
+-	static struct {
+-		USHORT nFntType, nLanguage;
+-	}  aOutTypeArr[ nItemCnt ] = {
+-		{  DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US },
+-		{  DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
+-		{  DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA }
++	USHORT aOutTypeArr[ nItemCnt ] =
++	{
++		DEFAULTFONT_LATIN_TEXT,
++		DEFAULTFONT_CJK_TEXT,
++		DEFAULTFONT_CTL_TEXT
+ 	};
++
++	LanguageType eLanguage = Application::GetSettings().GetLanguage(); 
+ 	SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
+ 
+ 	for( USHORT n = 0; n < nItemCnt; ++n )
+ 	{
+ 		Font aFnt( OutputDevice::GetDefaultFont(
+-			aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage,
++			aOutTypeArr[ n ], eLanguage,
+ 			DEFAULTFONT_FLAGS_ONLYONE, 0 ));
+ 		SvxFontItem* pI = aItemArr[ n ];
+ 		pI->GetFamily() = aFnt.GetFamily();
diff --git a/patches/OOO_1_1/sw-autopilot-fallback-to-vor.diff b/patches/OOO_1_1/sw-autopilot-fallback-to-vor.diff
new file mode 100644
index 000000000..d68279b91
--- /dev/null
+++ b/patches/OOO_1_1/sw-autopilot-fallback-to-vor.diff
@@ -0,0 +1,43 @@
+--- sw/source/ui/wizard/wizgo2.cxx	2004-11-03 15:13:43.000000000 -0500
++++ sw/source/ui/wizard/wizgo2.cxx	2004-11-03 15:14:56.841265872 -0500
+@@ -155,18 +155,35 @@
+ {
+ 	SfxApplication *pSApp = SFX_APP();
+ 	BOOL bRet = FALSE;
++	BOOL success = FALSE;
+ 
+ 	String sTemplate( String::CreateFromAscii("wizard") );
+ 	sTemplate += INET_PATH_TOKEN;
+ 	sTemplate += rVorlage;
+-#ifndef MAC_WITHOUT_EXT
+-    sTemplate.AppendAscii(".stw");
+-#endif
+ 
+ 	const SfxFilter* pFilter = (SfxFilter*)-1;
+ 	SvtPathOptions aOpt;
+-    if( (aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ))
+-        &&  0 != (pFilter = SwIoSystem::GetFileFilter(sTemplate, aEmptyStr)) )
++
++	// Try first with .stw extension, then with .vor
++	String sTmp (sTemplate);
++	sTmp.AppendAscii(".stw");
++	if(aOpt.SearchFile (sTmp, SvtPathOptions::PATH_TEMPLATE))
++	{
++		success = TRUE;
++		sTemplate = sTmp;
++	}
++	else
++	{
++		sTmp.Assign (sTemplate);
++		sTmp.AppendAscii(".vor");
++		if(aOpt.SearchFile (sTmp, SvtPathOptions::PATH_TEMPLATE))
++		{
++			success = TRUE;
++			sTemplate = sTmp;
++		}
++	}
++
++	if (success && (0 != (pFilter = SwIoSystem::GetFileFilter (sTemplate, aEmptyStr))))
+ 	{
+         sTemplate = URIHelper::SmartRelToAbs( sTemplate );
+ 
diff --git a/patches/OOO_1_1/sw-escape-print-preview.diff b/patches/OOO_1_1/sw-escape-print-preview.diff
new file mode 100644
index 000000000..40c659ee3
--- /dev/null
+++ b/patches/OOO_1_1/sw-escape-print-preview.diff
@@ -0,0 +1,15 @@
+Index: sw/source/ui/uiview/pview.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/uiview/pview.cxx,v
+retrieving revision 1.43.156.1
+diff -u -r1.43.156.1 pview.cxx
+--- sw/source/ui/uiview/pview.cxx	9 Jan 2004 14:34:20 -0000	1.43.156.1
++++ sw/source/ui/uiview/pview.cxx	14 Oct 2004 09:54:39 -0000
+@@ -1125,6 +1125,7 @@
+         switch(nKey)
+         {
+             case KEY_ADD : nSlot = SID_ZOOM_OUT;         break;
++            case KEY_ESCAPE : nSlot = FN_CLOSE_PAGEPREVIEW; break;
+             case KEY_SUBTRACT : nSlot = SID_ZOOM_IN;    break;
+         }
+         if(nSlot)
diff --git a/patches/OOO_1_1/sw-menu-syntax-fix.diff b/patches/OOO_1_1/sw-menu-syntax-fix.diff
new file mode 100644
index 000000000..db53f6d6e
--- /dev/null
+++ b/patches/OOO_1_1/sw-menu-syntax-fix.diff
@@ -0,0 +1,113 @@
+--- sw/source/ui/inc/swmn.hrc.foo	2005-01-05 11:13:07.370837222 -0500
++++ sw/source/ui/inc/swmn.hrc	2005-01-05 11:17:04.509059558 -0500
+@@ -3984,6 +3984,53 @@
+ 
+  // Zusaetze Rahmen
+ 
++#define MN_MOUSE_FRAME_END \
++	MenuItem\
++	{\
++		Identifier = FN_WRAP_ANCHOR_ONLY ; \
++		HelpID = FN_WRAP_ANCHOR_ONLY ; \
++		Text = "~Erster Absatz" ; \
++		Text [ English ] = "First paragraph" ; \
++		Text [ english_us ] = "~First Paragraph" ; \
++		Text [ italian ] = "~Primo paragrafo" ; \
++		Text [ spanish ] = "~Primer p�rrafo" ; \
++		Text [ french ] = "~1er paragraphe" ; \
++		Text [ dutch ] = "~Eerste alinea" ; \
++		Text [ swedish ] = "~F�rsta stycket" ; \
++		Text [ danish ] = "F�rst~e afsnit" ; \
++		Text [ portuguese ] = "~Primeiro par�grafo" ; \
++		Text [ portuguese_brazilian ] = "Primeiro Par�gra~fo" ; \
++		Text[ chinese_simplified ] = "第一段落(~F)"; \
++		Text[ russian ] = "������ �����"; \
++		Text[ polish ] = "~Pierwszy akapit"; \
++		Text[ japanese ] = "最初の段落(~F)"; \
++		Text[ chinese_traditional ] = "第一段落(~F)"; \
++		Text[ arabic ] = "������ ������"; \
++		Text[ dutch ] = "~Eerste alinea"; \
++		Text[ chinese_simplified ] = "第一段落(~F)";	\
++		Text[ greek ] = "~����� ����������"; \
++		Text[ korean ] = "첫번째 단락(~F)"; \
++		Text[ turkish ] = "�lk paragraf"; \
++		Text[ language_user1 ] = "~Prvi odstavek";\
++		Text[ catalan ] = "~Primer par�graf";\
++		Text[ finnish ] = "~Ensimm�inen kappale";\
++		Text[ extern ] = "~First Paragraph";	\
++		Text[ thai ] = "ย่อหน้าแ~รก";\
++		Text[ czech ] = "První odstavec";  \
++		Text[ hebrew ] = "פיסקה ראשונה";   \
++		Text[ hindi ] = "~पहिला परिच्छेद";    \
++		Text[ slovak ] = "Pr~vý odstavec";\
++		Text[ hungarian ] = "~Első bekezdés";\
++		Text[ slovenian ] = "~Prvi odstavek";\
++		Text[ estonian ] = "~Esimene lõik";\
++		Text[ norwegian ] = "~F�rste avsnitt";\
++		Text[ welsh ] = "~Paragraff Cyntaf";\
++		Text[ northernsotho ] = "~Serapa sa Mathomo";\
++		Text[ afrikaans ] = "~Eerste paragraaf";\
++		Text[ zulu ] = "Indikimba Yokuq~ala";\
++		Text[ norwegian_nynorsk ] = "~F�rste avsnitt";\
++	};\
++
+ #define MN_MOUSE_FRAME_BEGIN \
+     MenuItem\
+     {\
+@@ -4297,54 +4344,8 @@
+ 					Text[ galician ] = "No ~fondo";\
+ 					Text[ kannada ] = " ";\
+ 				};\
+-                SEPARATOR ; 
+-	
+-#define MN_MOUSE_FRAME_END \
+-                MenuItem\
+-                {\
+-                    Identifier = FN_WRAP_ANCHOR_ONLY ; \
+-                    HelpID = FN_WRAP_ANCHOR_ONLY ; \
+-                    Text = "~Erster Absatz" ; \
+-                    Text [ English ] = "First paragraph" ; \
+-                    Text [ english_us ] = "~First Paragraph" ; \
+-                    Text [ italian ] = "~Primo paragrafo" ; \
+-                    Text [ spanish ] = "~Primer p�rrafo" ; \
+-                    Text [ french ] = "~1er paragraphe" ; \
+-                    Text [ dutch ] = "~Eerste alinea" ; \
+-                    Text [ swedish ] = "~F�rsta stycket" ; \
+-                    Text [ danish ] = "F�rst~e afsnit" ; \
+-                    Text [ portuguese ] = "~Primeiro par�grafo" ; \
+-                    Text [ portuguese_brazilian ] = "Primeiro Par�gra~fo" ; \
+-                	Text[ chinese_simplified ] = "第一段落(~F)"; \
+-					Text[ russian ] = "������ �����"; \
+-					Text[ polish ] = "~Pierwszy akapit"; \
+-					Text[ japanese ] = "最初の段落(~F)"; \
+-					Text[ chinese_traditional ] = "第一段落(~F)"; \
+-					Text[ arabic ] = "������ ������"; \
+-					Text[ dutch ] = "~Eerste alinea"; \
+-					Text[ chinese_simplified ] = "第一段落(~F)";	\
+-					Text[ greek ] = "~����� ����������"; \
+-					Text[ korean ] = "첫번째 단락(~F)"; \
+-					Text[ turkish ] = "�lk paragraf"; \
+-					Text[ language_user1 ] = "~Prvi odstavek";\
+-					Text[ catalan ] = "~Primer par�graf";\
+-					Text[ finnish ] = "~Ensimm�inen kappale";\
+-					Text[ extern ] = "~First Paragraph";	\
+-					Text[ thai ] = "ย่อหน้าแ~รก";\
+-					Text[ czech ] = "První odstavec";  \
+-					Text[ hebrew ] = "פיסקה ראשונה";   \
+-					Text[ hindi ] = "~पहिला परिच्छेद";    \
+-					Text[ slovak ] = "Pr~vý odstavec";\
+-					Text[ hungarian ] = "~Első bekezdés";\
+-						Text[ slovenian ] = "~Prvi odstavek";\
+-						Text[ estonian ] = "~Esimene lõik";\
+-						Text[ norwegian ] = "~F�rste avsnitt";\
+-						Text[ welsh ] = "~Paragraff Cyntaf";\
+-						Text[ northernsotho ] = "~Serapa sa Mathomo";\
+-						Text[ afrikaans ] = "~Eerste paragraaf";\
+-						Text[ zulu ] = "Indikimba Yokuq~ala";\
+-						Text[ norwegian_nynorsk ] = "~F�rste avsnitt";\
+-					};\
++                SEPARATOR ; \
++                MN_MOUSE_FRAME_END \
+             };\
+ 	};\
+ 	Text[ norwegian ] = "~Tekstbryting";\
diff --git a/patches/OOO_1_1/sw-online-layout-crash-fix.diff b/patches/OOO_1_1/sw-online-layout-crash-fix.diff
new file mode 100644
index 000000000..5e80568bd
--- /dev/null
+++ b/patches/OOO_1_1/sw-online-layout-crash-fix.diff
@@ -0,0 +1,19 @@
+Index: source/core/layout/fly.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/layout/fly.cxx,v
+retrieving revision 1.46.52.3
+diff -u -p -r1.46.52.3 fly.cxx
+--- sw/source/core/layout/fly.cxx	28 Apr 2004 10:29:47 -0000	1.46.52.3
++++ sw/source/core/layout/fly.cxx	5 Nov 2004 11:15:08 -0000
+@@ -1695,8 +1695,9 @@ void SwFlyFrm::MakeFlyPos()
+ 			const long nBottom = GetAnchor()->Frm().Top() + aRelPos.Y() + Frm().Height();
+ 			if ( nAnchorBottom < nBottom )
+ 			{
+-				((SwPageFrm*)GetAnchor())->FindBodyCont()->
+-                                    Grow( nBottom - nAnchorBottom PHEIGHT );
++				if (SwPageFrm *pOne = ((SwPageFrm*)GetAnchor()))
++						if (SwLayoutFrm *pTwo = pOne->FindBodyCont())
++							pTwo->Grow( nBottom - nAnchorBottom PHEIGHT );
+ 			}
+ 		}
+ 
diff --git a/patches/OOO_1_1/sw-template-fallback-to-english.diff b/patches/OOO_1_1/sw-template-fallback-to-english.diff
new file mode 100644
index 000000000..0dcc5a3bf
--- /dev/null
+++ b/patches/OOO_1_1/sw-template-fallback-to-english.diff
@@ -0,0 +1,46 @@
+--- sw/source/ui/index/cnttab.cxx.english-fallback	2004-11-03 15:38:01.000000000 -0500
++++ sw/source/ui/index/cnttab.cxx	2004-11-03 16:34:52.128271440 -0500
+@@ -677,17 +677,42 @@
+ #endif
+ 
+ 			SvtPathOptions aOpt;
++
++			// Add fallback to english templates
++			String searchPath = aOpt.GetTemplatePath();
++			if (searchPath.SearchAscii("template/english;") == STRING_NOTFOUND)
++			{
++				xub_StrLen start = searchPath.SearchAscii("/template/");
++				if (start != STRING_NOTFOUND)
++				{
++					String sTmp (searchPath, 0, start);
++					sTmp.AppendAscii ("/template/english;");
++					searchPath.AppendAscii (";");
++					searchPath.Append (sTmp);
++					aOpt.SetTemplatePath (searchPath);
++				}
++			}
++
++
+ 			// 6.0 (extension .sxw)
+ 			BOOL bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
+ 
+ #ifndef MAC_WITHOUT_EXT
+ 			if( !bExist )
+ 			{
+-				// 5.0 (extension .vor)
++				// 5.0 (extension .sdw)
+ 				sTemplate = sTemplateWithoutExt;
+ 				sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(".sdw") );
+ 				bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
+ 			}
++
++			if( !bExist )
++			{
++				// 5.0 (extension .vor)
++				sTemplate = sTemplateWithoutExt;
++				sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(".vor") );
++				bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
++			}
+ #endif
+ 
+ 			if(!bExist)
diff --git a/patches/OOO_1_1/symbol-pdf-fix.diff b/patches/OOO_1_1/symbol-pdf-fix.diff
new file mode 100644
index 000000000..47fcdd305
--- /dev/null
+++ b/patches/OOO_1_1/symbol-pdf-fix.diff
@@ -0,0 +1,19 @@
+Index: vcl/source/gdi/pdfwriter_impl.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/gdi/pdfwriter_impl.cxx,v
+retrieving revision 1.55.10.6
+diff -u -p -u -r1.55.10.6 pdfwriter_impl.cxx
+--- vcl/source/gdi/pdfwriter_impl.cxx	13 Feb 2004 13:20:46 -0000	1.55.10.6
++++ vcl/source/gdi/pdfwriter_impl.cxx	9 Nov 2004 12:01:48 -0000
+@@ -2585,9 +2585,9 @@ void PDFWriterImpl::registerGlyphs(
+                     }
+                 }
+                 else
+-                    cChar = 0;
++                    pEncoding = 0;
+             }
+-            else
++            if( !pEncoding )
+             {
+                 if( cChar & 0xff00 )
+                 {
diff --git a/patches/OOO_1_1/system-db.diff b/patches/OOO_1_1/system-db.diff
index 59ea89389..f46694941 100644
--- a/patches/OOO_1_1/system-db.diff
+++ b/patches/OOO_1_1/system-db.diff
@@ -1,49 +1,42 @@
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/external/berkeleydb/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- berkeleydb/makefile.mk	12 Jun 2003 09:50:38 -0000	1.13
-+++ berkeleydb/makefile.mk	29 Oct 2003 01:09:05 -0000
-@@ -77,6 +77,7 @@
- PATCH_FILE_NAME=db-3.2.9.patch
+--- berkeleydb/makefile.mk	2004-10-28 13:54:48.000000000 +0200
++++ berkeleydb/makefile.mk	2005-01-23 23:04:15.000000000 +0100
+@@ -76,6 +76,7 @@
+ # not needed for win32. comment out when causing problems...
  
  .IF "$(GUI)"=="UNX"
 +.IF "$(SYSTEM_DB)" != "YES"
  CONFIGURE_DIR=out
  #relative to CONFIGURE_DIR
  CONFIGURE_ACTION=..$/dist$/configure
-@@ -93,12 +94,30 @@ BUILD_ACTION=gmake
+@@ -91,12 +92,28 @@
+ .ELSE
  BUILD_ACTION=make
  .ENDIF
- 
 +.ENDIF
-+
+ 
 +.IF "$(SYSTEM_DB)" != "YES"
  OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
- 
  .IF "$(SOLAR_JAVA)"!=""
- OUT2BIN=java$/classes$/db.jar
+ OUT2BIN=$(BUILD_DIR)$/db.jar
+ OUT2CLASS=$(BUILD_DIR)$/db.jar
  .ENDIF
 +.ELSE
- 
 +DB_LIB = \
-+       $/usr$/lib$/libdb-$(DB_VERSION).so \
-+       $/usr$/lib$/libdb_cxx-$(DB_VERSION).so
-+.IF "$(SOLAR_JAVA)" != ""
-+       DB_LIB += $/usr$/lib$/libdb_java-$(DB_VERSION).so
++	$/usr$/lib$/libdb-$(DB_VERSION).so
++.IF "$(SOLAR_JAVA)"!=""
++	DB_LIB += $/usr$/lib$/libdb_java-$(DB_VERSION).so
 +.ENDIF
 +
 +all: $(DB_JAR) $(DB_INC) $(DB_LIB)
 +.IF "$(SOLAR_JAVA)" != ""
-+      +$(COPY) $(DB_JAR) $(BIN)/db.jar
-+      +$(COPY) $(DB_JAR) $(CLASSDIR)/db.jar
++	+$(COPY) $(DB_JAR) $(BIN)/db.jar
++	+$(COPY) $(DB_JAR) $(CLASSDIR)/db.jar
 +.ENDIF
 +
 +.ENDIF
+ 
  .ENDIF			# "$(GUI)"=="UNX"
  
- .IF "$(GUI)"=="WNT"
 Index: xmlhelp/source/cxxhelp/provider/makefile.mk
 ===================================================================
 --- xmlhelp/source/cxxhelp/provider/makefile.mk.orig	2003-04-28 18:19:35.000000000 +0200
@@ -58,142 +51,49 @@ Index: xmlhelp/source/cxxhelp/provider/makefile.mk
  
  .IF "$(GUI)"=="WNT"
  CFLAGS+=-GR
-Index: xmlhelp/source/cxxhelp/provider/databases.cxx
-===================================================================
---- xmlhelp/source/cxxhelp/provider/databases.cxx.orig	2003-04-04 19:09:36.000000000 +0200
-+++ xmlhelp/source/cxxhelp/provider/databases.cxx	2004-01-08 00:36:53.000000000 +0100
-@@ -60,7 +60,11 @@
-  ************************************************************************/
- 
- 
-+#ifdef SYSTEM_DB
-+#include <db_cxx.h>
-+#else
- #include <berkeleydb/db_cxx.h>
-+#endif
- #ifndef _VOS_DIAGNOSE_HXX_
- #include <vos/diagnose.hxx>
- #endif
-@@ -497,7 +501,12 @@ Db* Databases::getBerkeley( const rtl::O
- 		
- 		rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
- 		
--		if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 1)
-+		int db_open_failure = table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#else
-+		int db_open_failure = table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#endif
-+		if( db_open_failure )
- 		{
- 			table->close( 0 );
- 			delete table;
-@@ -711,7 +720,12 @@ KeywordInfo* Databases::getKeyword( cons
-                                osl_getThreadTextEncoding() );
- 		
- 		Db table(0,DB_CXX_NO_EXCEPTIONS);
--		if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 1)
-+		int db_open_failure = table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#else
-+		int db_open_failure = table.open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#endif
-+		if( 0 == db_open_failure )
- 		{   
- 			std::vector<KeywordInfo::KeywordElement> aVector;
- 			Db* idmap = getBerkeley( Database,Language );
-Index: xmlhelp/source/cxxhelp/provider/urlparameter.cxx
-===================================================================
---- xmlhelp/source/cxxhelp/provider/urlparameter.cxx.orig	2004-01-07 23:21:33.000000000 +0100
-+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx	2004-01-08 00:36:53.000000000 +0100
-@@ -94,8 +94,12 @@
- #include <sablot/shandler.h>
- #endif
- #ifndef _DB_CXX_H_
-+#ifdef SYSTEM_DB
-+#include <db_cxx.h>
-+#else
- #include <berkeleydb/db_cxx.h>
- #endif
-+#endif
- #ifndef _URLPARAMETER_HXX_
- #include <provider/urlparameter.hxx>
- #endif
-Index: solenv/inc/libs.mk
-===================================================================
---- solenv/inc/libs.mk.orig	2003-12-12 18:23:04.000000000 +0100
-+++ solenv/inc/libs.mk	2004-01-08 00:36:53.000000000 +0100
-@@ -180,8 +180,8 @@ ZLIB3RDLIB=-lzlib
+--- solenv/inc/libs.mk	2004-10-28 13:50:35.000000000 +0200
++++ solenv/inc/libs.mk	2005-01-23 22:56:49.000000000 +0100
+@@ -183,7 +183,7 @@
  .ENDIF
  JPEG3RDLIB=-ljpeglib
  NEON3RDLIB=-lneon
--BERKELEYLIB=-ldb-3.2
--BERKELEYCPPLIB=-ldb_cxx-3.2
+-BERKELEYLIB=-ldb-4.2
 +BERKELEYLIB=-ldb-$(DB_VERSION)
-+BERKELEYCPPLIB=-ldb_cxx-$(DB_VERSION)
  CURLLIB=-lcurl
  SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
  SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
-Index: files.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/files.scp,v
-retrieving revision 1.369.16.2.8.2
-diff -u -r1.369.16.2.8.2 files.scp
---- scp/source/office/files.scp	14 Oct 2003 15:44:57 -0000	1.369.16.2.8.2
-+++ scp/source/office/files.scp	2 Nov 2003 01:21:27 -0000
-@@ -960,42 +960,50 @@
+--- scp/source/office/files.scp	2005-01-23 22:51:55.000000000 +0100
++++ scp/source/office/files.scp	2005-01-23 22:56:14.000000000 +0100
+@@ -1019,12 +1019,13 @@
  
  #endif
  
 +#ifndef SYSTEM_DB
-+
- File GID_FILE_LIB_DB31
+ File GID_FILE_LIB_DB42
          TXT_FILE_BODY;
          Styles          = (PACKED);
          Dir             = GID_DIR_PROGRAM;
          #ifdef UNX
--        Name            = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
+-        Name            = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
 +        Name            = STRING(CONCAT3(libdb-,DB_VERSION,UNXSUFFIX));
          #else
-         Name            = "libdb32.dll";
+         Name            = "libdb42.dll";
          #endif
- End
- 
-+#endif
-+
- #ifdef SOLAR_JAVA
-+#ifndef SYSTEM_DB
- 
- File GID_FILE_LIB_DBJAVA31
-         TXT_FILE_BODY;
+@@ -1037,13 +1038,14 @@
          Styles          = (PACKED);
          Dir             = GID_DIR_PROGRAM;
          #ifdef UNX
--        Name            = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
+-        Name            = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
 +        Name            = STRING(CONCAT3(libdb_java-,DB_VERSION,UNXSUFFIX));
          #else
-         Name            = "libdb_java32.dll";
+         Name            = "libdb_java42.dll";
          #endif
  End
  
  #endif
 +#endif
  
- #ifdef UNX
-+#ifndef SYSTEM_DB
- 
- File GID_FILE_LIB_DB_CXX
-         TXT_FILE_BODY;
-         Styles          = (PACKED);
-         Dir             = GID_DIR_PROGRAM;
--        Name            = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
-+        Name            = STRING(CONCAT3(libdb_cxx-,DB_VERSION,UNXSUFFIX));
- End
- 
- #endif
-+#endif
- 
- #ifdef UNX
+ // Helpfiles for version src640
  
 --- /dev/null	2003-12-04 23:59:45.000000000 +0100
 +++ xmlhelp/source/com/sun/star/help/db4/CreateDb.java	2004-01-22 22:48:17.000000000 +0100
@@ -1810,3 +1710,18 @@ diff -u -r1.369.16.2.8.2 files.scp
  
  UNIXTEXT= \
  	$(MISC)$/helpserver.sh
+--- xmlhelp/inc/provider/db.hxx.ark	2005-01-24 00:46:03.000000000 +0100
++++ xmlhelp/inc/provider/db.hxx		2005-01-24 00:46:57.000000000 +0100
+@@ -2,8 +2,12 @@
+ #define _DB_HXX_
+ 
+ #ifndef _DB_H_
++#ifdef SYSTEM_DB
++#include <db.h>
++#else
+ #include <berkeleydb/db.h>
+ #endif
++#endif
+ 
+ 
+ namespace chelp {
diff --git a/patches/OOO_1_1/sysui-mimetypes.diff b/patches/OOO_1_1/sysui-mimetypes.diff
new file mode 100644
index 000000000..fa5909d92
--- /dev/null
+++ b/patches/OOO_1_1/sysui-mimetypes.diff
@@ -0,0 +1,55 @@
+Index: calc.desktop
+===================================================================
+RCS file: /cvs/gsl/sysui/desktop/gnome/calc.desktop,v
+retrieving revision 1.2.30.2
+diff -u -u -r1.2.30.2 calc.desktop
+--- sysui/desktop/gnome/calc.desktop	9 Jan 2004 19:02:26 -0000	1.2.30.2
++++ sysui/desktop/gnome/calc.desktop	14 Oct 2004 07:22:58 -0000
+@@ -8,3 +8,4 @@
+ Type=Application
+ Name=<productname> Calc
+ Comment=<productname> Spreadsheet
++MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.math;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.math;application/vnd.lotus-1-2-3;application/x-quattropro;application/x-quattto-win;application/x-qpro;text/x-comma-separated-values
+Index: draw.desktop
+===================================================================
+RCS file: /cvs/gsl/sysui/desktop/gnome/draw.desktop,v
+retrieving revision 1.2.30.2
+diff -u -u -r1.2.30.2 draw.desktop
+--- sysui/desktop/gnome/draw.desktop	9 Jan 2004 19:02:27 -0000	1.2.30.2
++++ sysui/desktop/gnome/draw.desktop	14 Oct 2004 07:22:58 -0000
+@@ -8,3 +8,4 @@
+ Type=Application
+ Name=<productname> Draw
+ Comment=<productname> Drawing
++MimeType=application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw
+Index: impress.desktop
+===================================================================
+RCS file: /cvs/gsl/sysui/desktop/gnome/impress.desktop,v
+retrieving revision 1.2.30.3
+diff -u -u -r1.2.30.3 impress.desktop
+--- sysui/desktop/gnome/impress.desktop	27 Aug 2004 10:27:44 -0000	1.2.30.3
++++ sysui/desktop/gnome/impress.desktop	14 Oct 2004 07:22:58 -0000
+@@ -8,3 +8,4 @@
+ Exec=<progpath_utf8>/program/simpress %U
+ Name=<productname> Impress
+ Comment=<productname> Presentation
++MimeType=application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint;application/vnd.stardivision.impress
+--- sysui/desktop/gnome/writer.desktop	2004-01-09 20:02:29.000000000 +0100
++++ sysui/desktop/gnome/writer.desktop	2004-11-24 23:04:17.000000000 +0100
+@@ -8,3 +8,4 @@
+ Type=Application
+ Name=<productname> Writer
+ Comment=<productname> Text Document
++MimeType=application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.ms-word;application/msword;application/x-doc;application/x-mswrite;application/vnd.stardivision.writer;application/vnd.wordperfect;application/wordperfect;application/rtf;text/rtf;text/richtext;text/plain
+Index: math.desktop
+===================================================================
+RCS file: /cvs/gsl/sysui/desktop/gnome/math.desktop,v
+retrieving revision 1.2.30.2
+diff -u -u -r1.2.30.2 math.desktop
+--- sysui/desktop/gnome/math.desktop	9 Jan 2004 19:02:27 -0000	1.2.30.2
++++ sysui/desktop/gnome/math.desktop	24 Nov 2004 22:18:33 -0000
+@@ -8,3 +8,4 @@
+ Type=Application
+ Name=<productname> Math
+ Comment=<productname> Formula
++MimeType=application/vnd.sun.xml.writer.math;application/vnd.stardivision.math
diff --git a/patches/OOO_1_1/sysui-translations.diff b/patches/OOO_1_1/sysui-translations.diff
index 177d20444..44a5720c4 100644
--- a/patches/OOO_1_1/sysui-translations.diff
+++ b/patches/OOO_1_1/sysui-translations.diff
@@ -1,11 +1,13 @@
+-*- coding: utf-8 -*-
+
 Index: documents.ulf
 ===================================================================
 RCS file: /cvs/gsl/sysui/desktop/share/documents.ulf,v
 retrieving revision 1.7.8.5
 Index: sysui/desktop/share/documents.ulf
 ===================================================================
---- sysui/desktop/share/documents.ulf.orig	2004-04-27 20:01:05.000000000 +0200
-+++ sysui/desktop/share/documents.ulf	2004-07-30 22:18:28.430804688 +0200
+--- sysui/desktop/share/documents.ulf.orig	2004-09-13 22:50:54.000000000 +0200
++++ sysui/desktop/share/documents.ulf	2004-09-14 15:46:59.389405928 +0200
 @@ -1,12 +1,11 @@
  [writer]
  en = "%PRODUCTNAME Text Document"
@@ -20,28 +22,24 @@ Index: sysui/desktop/share/documents.ulf
  hu = "%PRODUCTNAME-szövegesdokumentum"
  it = "%PRODUCTNAME Documento di testo"
  cs = "Textový dokument %PRODUCTNAME"
-@@ -21,45 +20,33 @@ zh-CN = "%PRODUCTNAME 文本文档"
+@@ -21,10 +20,8 @@ zh-CN = "%PRODUCTNAME 文本文档"
  zh-TW = "%PRODUCTNAME 文字文件"
  tr = "PRODUCTNAME Metin belgesi"
  ar = "%PRODUCTNAME مستند نص"
 -he = "%PRODUCTNAME Textdokument"
 -ca = "%PRODUCTNAME Document de text"
--th = "%PRODUCTNAME Textdokument"
--hi-IN = "%PRODUCTNAME Textdokument"
 +ca = "Document de text d'%PRODUCTNAME"
+ th = "%PRODUCTNAME เอกสารข้อความ"
+-hi-IN = "%PRODUCTNAME Textdokument"
  et = "%PRODUCTNAME-i tekstidokument"
  sl = "Dokument z besedilom programa %PRODUCTNAME"
  ru = "%PRODUCTNAME Текстовый документ"
- cy = "Dogfen Testun %PRODUCTNAME"
- ns = "%PRODUCTNAME Tokumente ya Sengwalwa"
- af = "%PRODUCTNAME-teksdokument"
--zu = "Ushicilelo Lombhalo lwe-%PRODUCTNAME 5.0"
-+zu = "Ushicilelo Lombhalo lwe-%PRODUCTNAME"
+@@ -42,31 +39,25 @@ gl = "%PRODUCTNAME Text Document"
  [writer-template]
  en = "%PRODUCTNAME Text Document Template"
  de = "%PRODUCTNAME Textdokumentvorlage"
 -pt = "%PRODUCTNAME Textdokumentvorlage"
--ru = "%PRODUCTNAME Textdokumentvorlage"
+ ru = "Шаблон текстового документа %PRODUCTNAME"
 -el = "%PRODUCTNAME Textdokumentvorlage"
  nl = "%PRODUCTNAME Tekstdocumentsjabloon"
  fr = "Modèle de texte %PRODUCTNAME"
@@ -60,22 +58,22 @@ Index: sysui/desktop/share/documents.ulf
  ko = "%PRODUCTNAME 텍스트 문서 서식 파일"
  zh-CN = "%PRODUCTNAME 文本文档样式"
  zh-TW = "%PRODUCTNAME 文字文件樣式"
--tr = "%PRODUCTNAME Textdokumentvorlage"
+ tr = "%PRODUCTNAME Metin Belgesi Şablonu"
 -ar = "%PRODUCTNAME Textdokumentvorlage"
 -he = "%PRODUCTNAME Textdokumentvorlage"
 -ca = "%PRODUCTNAME Textdokumentvorlage"
--th = "%PRODUCTNAME Textdokumentvorlage"
--hi-IN = "%PRODUCTNAME Textdokumentvorlage"
 +ca = "%PRODUCTNAME Plantilla de document de text d'%PRODUCTNAME"
+ th = "%PRODUCTNAME แม่แบบเอกสารข้อความ"
+-hi-IN = "%PRODUCTNAME Textdokumentvorlage"
  et = "%PRODUCTNAME-i tekstidokumendi mall"
  sl = "Predloga dokumenta z besedilom programa %PRODUCTNAME"
  ns = "%PRODUCTNAME Template ya Tokumente ya Sengwalwa"
-@@ -69,13 +56,12 @@ zu = "Uqwembe loshicilelo lombhalo lwe-%
+@@ -83,13 +74,12 @@ gl = "%PRODUCTNAME Text Document Templat
  [writer-global]
  en = "%PRODUCTNAME Master Document"
  de = "%PRODUCTNAME Globaldokument"
 -pt = "%PRODUCTNAME Globaldokument"
- ru = "%PRODUCTNAME Составной документ"
+ ru = "Составной документ %PRODUCTNAME"
  el = "%PRODUCTNAME Kύριο έγγραφο"
  nl = "%PRODUCTNAME Masterdocument"
  fr = "%PRODUCTNAME Document maître"
@@ -85,27 +83,30 @@ Index: sysui/desktop/share/documents.ulf
  hu = "%PRODUCTNAME-fődokumentum"
  it = "%PRODUCTNAME Documento master"
  cs = "Hlavní dokument %PRODUCTNAME"
-@@ -90,26 +76,22 @@ zh-CN = "%PRODUCTNAME 主控文档"
+@@ -104,15 +94,13 @@ zh-CN = "%PRODUCTNAME 主控文档"
  zh-TW = "%PRODUCTNAME 主控文件"
- tr = "%PRODUCTNAME Ana belge"
+ tr = "%PRODUCTNAME Ana Belge"
  ar = "%PRODUCTNAME مستند شام?"
 -he = "%PRODUCTNAME Globaldokument"
 -ca = "%PRODUCTNAME Globaldokument"
--th = "%PRODUCTNAME Globaldokument"
--hi-IN = "%PRODUCTNAME Globaldokument"
 +ca = "%PRODUCTNAME "Document mestre d'%PRODUCTNAME"
+ th = "%PRODUCTNAME ต้นแบบเอกสาร"
+-hi-IN = "%PRODUCTNAME Globaldokument"
  et = "%PRODUCTNAME-i põhidokument"
  sl = "Glavni dokument programa %PRODUCTNAME"
  ns = "Tokumente ya Master ya %PRODUCTNAME"
  af = "%PRODUCTNAME-meesterdokument"
 -zu = "Ushicilelo Olukhulu lwe-%PRODUCTNAME 5.0"
 +zu = "Ushicilelo Olukhulu lwe-%PRODUCTNAME"
- 
+ nb = "%PRODUCTNAME Master Document"
+ cy = "%PRODUCTNAME Master Document"
+ tn = "%PRODUCTNAME Master Document"
+@@ -125,13 +113,12 @@ gl = "%PRODUCTNAME Master Document"
  [writer-math]
  en = "%PRODUCTNAME Formula"
  de = "%PRODUCTNAME Formel"
 -pt = "%PRODUCTNAME Formel"
- ru = "%PRODUCTNAME Формула"
+ ru = "Формула %PRODUCTNAME"
  el = "%PRODUCTNAME Τύπος"
  nl = "%PRODUCTNAME Formule"
  fr = "%PRODUCTNAME Formule"
@@ -115,27 +116,30 @@ Index: sysui/desktop/share/documents.ulf
  hu = "%PRODUCTNAME-képlet"
  it = "%PRODUCTNAME Formula"
  cs = "Vzorec %PRODUCTNAME"
-@@ -124,26 +106,22 @@ zh-CN = "%PRODUCTNAME 公式"
+@@ -146,15 +133,13 @@ zh-CN = "%PRODUCTNAME 公式"
  zh-TW = "%PRODUCTNAME 公式"
  tr = "%PRODUCTNAME Formül"
  ar = "%PRODUCTNAME صيغة"
 -he = "%PRODUCTNAME Formel"
 -ca = "%PRODUCTNAME Formel"
--th = "%PRODUCTNAME Formel"
--hi-IN = "%PRODUCTNAME Formel"
 +ca = "Fòrmula d'%PRODUCTNAME"
+ th = "%PRODUCTNAME สมการ"
+-hi-IN = "%PRODUCTNAME Formel"
  et = "%PRODUCTNAME-i valem"
  sl = "Formula programa %PRODUCTNAME"
  ns = "Fomula ya %PRODUCTNAME"
  af = "%PRODUCTNAME-formule"
 -zu = "Indlela yokwenza ye-%PRODUCTNAME 5.0"
 +zu = "Indlela yokwenza ye-%PRODUCTNAME"
- 
+ nb = "%PRODUCTNAME Formula"
+ cy = "%PRODUCTNAME Formula"
+ tn = "%PRODUCTNAME Formula"
+@@ -167,13 +152,12 @@ gl = "%PRODUCTNAME Formula"
  [impress]
  en = "%PRODUCTNAME Presentation"
  de = "%PRODUCTNAME Präsentation"
 -pt = "%PRODUCTNAME Präsentation"
- ru = "%PRODUCTNAME Презентация"
+ ru = "Презентация %PRODUCTNAME"
  el = "%PRODUCTNAME Παρουσίαση"
  nl = "%PRODUCTNAME Presentatie"
  fr = "%PRODUCTNAME Présentation"
@@ -146,29 +150,31 @@ Index: sysui/desktop/share/documents.ulf
  hu = "%PRODUCTNAME-bemutató"
  it = "%PRODUCTNAME Presentazione"
  cs = "Prezentace %PRODUCTNAME"
-@@ -156,46 +134,32 @@ ja = "%PRODUCTNAME プレゼンテーシ
- ko = "%PRODUCTNAME 프레젠테이션"
+@@ -187,16 +171,13 @@ ko = "%PRODUCTNAME 프레젠테이션"
  zh-CN = "%PRODUCTNAME 演示文稿"
  zh-TW = "%PRODUCTNAME 簡報"
--tr = "%PRODUCTNAME Pr?sentation"
+ tr = "%PRODUCTNAME Sunu"
 -ar = "%PRODUCTNAME Pr?sentation"
 -he = "%PRODUCTNAME Präsentation"
 -ca = "%PRODUCTNAME Pr„sentation"
--th = "%PRODUCTNAME Präsentation"
--hi-IN = "%PRODUCTNAME Präsentation"
 +ca = "Presentació d'%PRODUCTNAME"
+ th = "%PRODUCTNAME การนำเสนอ"
+-hi-IN = "%PRODUCTNAME Präsentation"
  et = "%PRODUCTNAME-i esitlus"
  sl = "Predstavitev programa %PRODUCTNAME"
  ns = "Tlhagišo ya %PRODUCTNAME"
  af = "%PRODUCTNAME-voorlegging"
 -zu = "Ukunikezwa kolwazi kwe-%PRODUCTNAME 5.0"
 +zu = "Ukunikezwa kolwazi kwe-%PRODUCTNAME"
- 
+ nb = "%PRODUCTNAME Presentation"
+ cy = "%PRODUCTNAME Presentation"
+ tn = "%PRODUCTNAME Presentation"
+@@ -209,31 +190,25 @@ gl = "%PRODUCTNAME Presentation"
  [impress-template]
  en = "%PRODUCTNAME Presentation Template"
  de = "%PRODUCTNAME Präsentationsvorlage"
 -pt = "%PRODUCTNAME Präsentationsvorlage"
--ru = "%PRODUCTNAME Pr?sentationsvorlage"
+ ru = "Шаблон презентации %PRODUCTNAME"
 -el = "%PRODUCTNAME Pr?sentationsvorlage"
  nl = "%PRODUCTNAME Presentatiesjabloon"
  fr = "Modèle de présentation %PRODUCTNAME"
@@ -187,22 +193,22 @@ Index: sysui/desktop/share/documents.ulf
  ko = "%PRODUCTNAME 프레젠테이션 서식 파일"
  zh-CN = "%PRODUCTNAME 演示文稿样式"
  zh-TW = "%PRODUCTNAME 簡報樣式"
--tr = "%PRODUCTNAME Präsentationsvorlage"
+ tr = "%PRODUCTNAME Sunu Şablonu"
 -ar = "%PRODUCTNAME Pr?sentationsvorlage"
 -he = "%PRODUCTNAME Präsentationsvorlage"
 -ca = "%PRODUCTNAME Präsentationsvorlage"
--th = "%PRODUCTNAME Präsentationsvorlage"
--hi-IN = "%PRODUCTNAME Präsentationsvorlage"
 +ca = ""Plantilla de presentació d'%PRODUCTNAME"
+ th = "%PRODUCTNAME แม่แบบการนำเสนอ"
+-hi-IN = "%PRODUCTNAME Präsentationsvorlage"
  et = "%PRODUCTNAME-i esitluse mall"
  sl = "Predloga predstavitve programa %PRODUCTNAME"
  ns = "%PRODUCTNAME Template ya Tlhagišo"
-@@ -205,13 +169,12 @@ zu = "Uqwembe Lokunikezelwa kwe-%PRODUCT
+@@ -251,13 +226,12 @@ gl = "%PRODUCTNAME Presentation Template
  [draw]
  en = "%PRODUCTNAME Drawing"
  de = "%PRODUCTNAME Zeichnung"
 -pt = "%PRODUCTNAME Zeichnung"
- ru = "%PRODUCTNAME Рисунок"
+ ru = "Рисунок %PRODUCTNAME"
  el = "%PRODUCTNAME Σχέδιο"
  nl = "%PRODUCTNAME Tekening"
  fr = "%PRODUCTNAME Dessin"
@@ -212,27 +218,30 @@ Index: sysui/desktop/share/documents.ulf
  hu = "%PRODUCTNAME-rajz"
  it = "%PRODUCTNAME Disegno"
  cs = "Kresba %PRODUCTNAME"
-@@ -226,44 +189,32 @@ zh-CN = "%PRODUCTNAME 绘图"
+@@ -272,15 +246,13 @@ zh-CN = "%PRODUCTNAME 绘图"
  zh-TW = "%PRODUCTNAME 繪圖"
  tr = "%PRODUCTNAME Çizim"
  ar = "%PRODUCTNAME رسم"
 -he = "%PRODUCTNAME Zeichnung"
 -ca = "%PRODUCTNAME Dibuix"
--th = "%PRODUCTNAME Zeichnung"
--hi-IN = "%PRODUCTNAME Zeichnung"
 +ca = "Dibuix d'%PRODUCTNAME"
+ th = "%PRODUCTNAME รูปวาด"
+-hi-IN = "%PRODUCTNAME Zeichnung"
  et = "%PRODUCTNAME-i joonistus"
  sl = "Risba programa %PRODUCTNAME"
  ns = "Go thala ga %PRODUCTNAME"
  af = "%PRODUCTNAME-voorlegging"
 -zu = "Ukudweba nge-%PRODUCTNAME 5.0"
 +zu = "Ukudweba nge-%PRODUCTNAME"
- 
+ nb = "%PRODUCTNAME Drawing"
+ cy = "%PRODUCTNAME Drawing"
+ tn = "%PRODUCTNAME Drawing"
+@@ -293,31 +265,25 @@ gl = "%PRODUCTNAME Drawing"
  [draw-template]
  en = "%PRODUCTNAME Drawing Template"
  de = "%PRODUCTNAME Zeichnungsvorlage"
 -pt = "%PRODUCTNAME Zeichnungsvorlage"
--ru = "%PRODUCTNAME Zeichnungsvorlage"
+ ru = "Шаблон рисунка %PRODUCTNAME"
 -el = "%PRODUCTNAME Zeichnungsvorlage"
  nl = "%PRODUCTNAME Tekeningsjabloon"
  fr = "Modèle de dessin %PRODUCTNAME"
@@ -251,22 +260,22 @@ Index: sysui/desktop/share/documents.ulf
  ko = "%PRODUCTNAME 그리기 서식 파일"
  zh-CN = "%PRODUCTNAME 绘图样式"
  zh-TW = "%PRODUCTNAME 繪圖樣式"
--tr = "%PRODUCTNAME Zeichnungsvorlage"
+ tr = "%PRODUCTNAME Çizim Şablonu"
 -ar = "%PRODUCTNAME Zeichnungsvorlage"
 -he = "%PRODUCTNAME Zeichnungsvorlage"
 -ca = "%PRODUCTNAME Zeichnungsvorlage"
--th = "%PRODUCTNAME Zeichnungsvorlage"
--hi-IN = "%PRODUCTNAME Zeichnungsvorlage"
 +ca = "Plantilla de dibuix d'%PRODUCTNAME"
+ th = "%PRODUCTNAME แม่แบบรูปวาด"
+-hi-IN = "%PRODUCTNAME Zeichnungsvorlage"
  et = "%PRODUCTNAME-i joonistuse mall"
  sl = "Predloga risbe programa %PRODUCTNAME"
  ns = "%PRODUCTNAME Template ya go Thala"
-@@ -273,13 +224,12 @@ zu = "Uqwembe Lokudweba lwe-%PRODUCTNAME
+@@ -335,13 +301,12 @@ gl = "%PRODUCTNAME Drawing Template"
  [calc]
  en = "%PRODUCTNAME Spreadsheet"
  de = "%PRODUCTNAME Tabelle"
 -pt = "%PRODUCTNAME Tabelle"
- ru = "%PRODUCTNAME Электронная таблица"
+ ru = "Электронная таблица %PRODUCTNAME"
  el = "%PRODUCTNAME Πίνακας"
  nl = "%PRODUCTNAME Tabel"
  fr = "%PRODUCTNAME Classeur"
@@ -277,28 +286,31 @@ Index: sysui/desktop/share/documents.ulf
  hu = "%PRODUCTNAME-munkafüzet"
  it = "%PRODUCTNAME Tabella"
  cs = "Sešit %PRODUCTNAME"
-@@ -293,45 +243,32 @@ ko = "%PRODUCTNAME 스프레드시트"
+@@ -355,16 +320,13 @@ ko = "%PRODUCTNAME 스프레드시트"
  zh-CN = "%PRODUCTNAME 工作表"
  zh-TW = "%PRODUCTNAME 工作表"
- tr = "%PRODUCTNAME Tablo"
+ tr = "%PRODUCTNAME Hesap Tablosu"
 -ar = "%PRODUCTNAME Tabelle"
 -he = "%PRODUCTNAME Tabelle"
 -ca = "%PRODUCTNAME Tabelle"
--th = "%PRODUCTNAME Tabelle"
--hi-IN = "%PRODUCTNAME Tabelle"
 +ca = "Fulla de c�| lcul d'%PRODUCTNAME"
+ th = "%PRODUCTNAME ตารางคำนวณ"
+-hi-IN = "%PRODUCTNAME Tabelle"
  et = "%PRODUCTNAME-i arvutustabel"
  sl = "Preglednica programa %PRODUCTNAME"
  ns = "Pampiri ya go anega ya %PRODUCTNAME"
  af = "%PRODUCTNAME-sigblad"
 -zu = "Ikhasi lokubala %PRODUCTNAME 6.0"
 +zu = "Ikhasi lokubala %PRODUCTNAME"
- 
+ nb = "%PRODUCTNAME Spreadsheet"
+ cy = "%PRODUCTNAME Spreadsheet"
+ tn = "%PRODUCTNAME Spreadsheet"
+@@ -377,31 +339,25 @@ gl = "%PRODUCTNAME Spreadsheet"
  [calc-template]
  en = "%PRODUCTNAME Spreadsheet Template"
  de = "%PRODUCTNAME Tabellenvorlage"
 -pt = "%PRODUCTNAME Tabellenvorlage"
--ru = "%PRODUCTNAME Tabellenvorlage"
+ ru = "Шаблон электронной таблицы %PRODUCTNAME"
 -el = "%PRODUCTNAME Tabellenvorlage"
  nl = "%PRODUCTNAME Werkbladsjabloon"
  fr = "Modèle de classeur %PRODUCTNAME"
@@ -317,20 +329,20 @@ Index: sysui/desktop/share/documents.ulf
  ko = "%PRODUCTNAME 스프레드시트 서식 파일"
  zh-CN = "%PRODUCTNAME 工作表样式"
  zh-TW = "%PRODUCTNAME 工作表樣式"
--tr = "%PRODUCTNAME Tabellenvorlage"
+ tr = "%PRODUCTNAME Hesap Tablosu Şablonu"
 -ar = "%PRODUCTNAME Tabellenvorlage"
 -he = "%PRODUCTNAME Tabellenvorlage"
 -ca = "%PRODUCTNAME Tabellenvorlage"
--th = "%PRODUCTNAME Tabellenvorlage"
--hi-IN = "%PRODUCTNAME Tabellenvorlage"
 +ca = "Plantilla de fulla de c�| lcul d'%PRODUCTNAME"
+ th = "%PRODUCTNAME แม่แบบตารางคำนวณ"
+-hi-IN = "%PRODUCTNAME Tabellenvorlage"
  et = "%PRODUCTNAME-i arvutustabeli mall"
  sl = "Predloga preglednice programa %PRODUCTNAME"
  ns = "%PRODUCTNAME Template ya Pampiri ya go Anega"
 Index: sysui/desktop/share/launcher_comment.ulf
 ===================================================================
---- sysui/desktop/share/launcher_comment.ulf.orig	2004-07-30 21:43:44.479613424 +0200
-+++ sysui/desktop/share/launcher_comment.ulf	2004-07-30 22:29:34.378565240 +0200
+--- sysui/desktop/share/launcher_comment.ulf.orig	2004-09-13 22:50:54.000000000 +0200
++++ sysui/desktop/share/launcher_comment.ulf	2004-09-14 15:46:59.390405776 +0200
 @@ -1,12 +1,11 @@
  [writer]
  en = "%PRODUCTNAME Text Document"
@@ -346,28 +358,24 @@ Index: sysui/desktop/share/launcher_comment.ulf
  hu = "%PRODUCTNAME-szövegesdokumentum"
  it = "%PRODUCTNAME Documento di testo"
  cs = "Textový dokument %PRODUCTNAME"
-@@ -21,26 +20,22 @@ zh-CN = "%PRODUCTNAME 文本文档"
+@@ -21,10 +20,8 @@ zh-CN = "%PRODUCTNAME 文本文档"
  zh-TW = "%PRODUCTNAME 文字文件"
  tr = "PRODUCTNAME Metin belgesi"
  ar = "%PRODUCTNAME مستند نص"
 -he = "%PRODUCTNAME Textdokument"
 -ca = "%PRODUCTNAME Document de text"
--th = "%PRODUCTNAME Textdokument"
--hi-IN = "%PRODUCTNAME Textdokument"
 +ca = "Document de text d'%PRODUCTNAME"
+ th = "%PRODUCTNAME เอกสารข้อความ"
+-hi-IN = "%PRODUCTNAME Textdokument"
  et = "%PRODUCTNAME-i tekstidokument"
  sl = "Dokument z besedilom programa %PRODUCTNAME"
  cy = "Dogfen Testun %PRODUCTNAME"
- ns = "%PRODUCTNAME Tokumente ya Sengwalwa"
- af = "%PRODUCTNAME-teksdokument"
--zu = "Ushicilelo Lombhalo lwe-%PRODUCTNAME 5.0"
-+zu = "Ushicilelo Lombhalo lwe-%PRODUCTNAME"
- 
+@@ -42,12 +39,11 @@ gl = "%PRODUCTNAME Text Document"
  [web]
  en = "%PRODUCTNAME HTML Document"
  de = "%PRODUCTNAME HTML Dokument"
 -pt = "%PRODUCTNAME HTML Dokument"
- ru = "%PRODUCTNAME HTML-документ"
+ ru = "Документ HTML %PRODUCTNAME"
  nl = "%PRODUCTNAME HTML-document"
  fr = "%PRODUCTNAME Document HTML"
 -es = "Documento HTML %PRODUCTNAME "
@@ -377,26 +385,25 @@ Index: sysui/desktop/share/launcher_comment.ulf
  hu = "%PRODUCTNAME HTML-dokumentum"
  it = "%PRODUCTNAME Documento HTML"
  cs = "HTML dokument %PRODUCTNAME"
-@@ -53,12 +48,7 @@ ja = "%PRODUCTNAME HTML 形式ドキュ�
- ko = "%PRODUCTNAME HTML 문서"
+@@ -61,11 +57,8 @@ ko = "%PRODUCTNAME HTML 문서"
  zh-CN = "%PRODUCTNAME HTML 文档"
  zh-TW = "%PRODUCTNAME HTML 文件"
--tr = "%PRODUCTNAME HTML Dokument"
+ tr = "%PRODUCTNAME HTML Belgesi"
 -ar = "%PRODUCTNAME HTML Dokument"
 -he = "%PRODUCTNAME HTML Dokument"
 -ca = "%PRODUCTNAME HTML Dokument"
--th = "%PRODUCTNAME HTML Dokument"
--hi-IN = "%PRODUCTNAME HTML Dokument"
 +ca = "Document HTML d'%PRODUCTNAME"
+ th = "%PRODUCTNAME เอกสาร HTML"
+-hi-IN = "%PRODUCTNAME HTML Dokument"
  et = "%PRODUCTNAME-i HTML-dokument"
- sl = "HTML dokument programa %PRODUCTNAME"
+ sl = "Dokument HTML programa %PRODUCTNAME"
  ns = "Tokumente ya HTML ya %PRODUCTNAME"
-@@ -68,12 +58,11 @@ zu = "Ushicilelo lwe-%PRODUCTNAME HTML"
+@@ -81,12 +74,11 @@ gl = "%PRODUCTNAME HTML Document"
  [impress]
  en = "%PRODUCTNAME Presentation"
  de = "%PRODUCTNAME Präsentation"
 -pt = "%PRODUCTNAME Präsentation"
- ru = "%PRODUCTNAME Презентация"
+ ru = "Презентация %PRODUCTNAME"
  nl = "%PRODUCTNAME Presentatie"
  fr = "%PRODUCTNAME Présentation"
 -es = "Presentación %PRODUCTNAME "
@@ -406,21 +413,31 @@ Index: sysui/desktop/share/launcher_comment.ulf
  hu = "%PRODUCTNAME-bemutató"
  it = "%PRODUCTNAME Presentazione"
  cs = "Prezentace %PRODUCTNAME"
-@@ -85,12 +74,7 @@ ja = "%PRODUCTNAME プレゼンテーシ
- ko = "%PRODUCTNAME 프레젠테이션"
+@@ -99,16 +91,13 @@ ko = "%PRODUCTNAME 프레젠테이션"
  zh-CN = "%PRODUCTNAME 演示文稿"
  zh-TW = "%PRODUCTNAME 簡報"
--tr = "%PRODUCTNAME Pr?sentation"
+ tr = "%PRODUCTNAME Sunu"
 -ar = "%PRODUCTNAME Pr?sentation"
 -he = "%PRODUCTNAME Präsentation"
 -ca = "%PRODUCTNAME Pr„sentation"
--th = "%PRODUCTNAME Präsentation"
--hi-IN = "%PRODUCTNAME Präsentation"
 +ca = "Presentació d'%PRODUCTNAME"
+ th = "%PRODUCTNAME การนำเสนอ"
+-hi-IN = "%PRODUCTNAME Präsentation"
  et = "%PRODUCTNAME-i esitlus"
  sl = "Predstavitev programa %PRODUCTNAME"
  ns = "Tlhagišo ya %PRODUCTNAME"
-@@ -105,7 +89,7 @@ ru = "%PRODUCTNAME Рисунок"
+ af = "%PRODUCTNAME-voorlegging"
+-zu = "Ukunikezwa kolwazi kwe-%PRODUCTNAME 5.0"
++zu = "Ukunikezwa kolwazi kwe-%PRODUCTNAME"
+ da = "%PRODUCTNAME-præsentation"
+ nb = "%PRODUCTNAME Presentation"
+ nn = "%PRODUCTNAME Presentation"
+@@ -120,12 +109,11 @@ gl = "%PRODUCTNAME Presentation"
+ [draw]
+ en = "%PRODUCTNAME Drawing"
+ de = "%PRODUCTNAME Zeichnung"
+-pt = "%PRODUCTNAME Zeichnung"
+ ru = "Рисунок %PRODUCTNAME"
  nl = "%PRODUCTNAME Tekening"
  fr = "%PRODUCTNAME Dessin"
  es = "Dibujo %PRODUCTNAME"
@@ -429,21 +446,30 @@ Index: sysui/desktop/share/launcher_comment.ulf
  hu = "%PRODUCTNAME-rajz"
  it = "%PRODUCTNAME Disegno"
  cs = "Kresba %PRODUCTNAME"
-@@ -121,7 +105,7 @@ zh-TW = "%PRODUCTNAME 繪圖"
+@@ -140,15 +128,13 @@ zh-CN = "%PRODUCTNAME 绘图"
+ zh-TW = "%PRODUCTNAME 繪圖"
  tr = "%PRODUCTNAME Çizim"
  ar = "%PRODUCTNAME رسم"
- he = "%PRODUCTNAME Zeichnung"
+-he = "%PRODUCTNAME Zeichnung"
 -ca = "%PRODUCTNAME Dibuix"
 +ca = "Dibuix d'%PRODUCTNAME"
- th = "%PRODUCTNAME Zeichnung"
- hi-IN = "%PRODUCTNAME Zeichnung"
+ th = "%PRODUCTNAME รูปวาด"
+-hi-IN = "%PRODUCTNAME Zeichnung"
  et = "%PRODUCTNAME-i joonistus"
-@@ -133,12 +117,11 @@ zu = "Ukudweba nge-%PRODUCTNAME 5.0"
+ sl = "Risba programa %PRODUCTNAME"
+ ns = "Go thala ga %PRODUCTNAME"
+ af = "%PRODUCTNAME-voorlegging"
+-zu = "Ukudweba nge-%PRODUCTNAME 5.0"
++zu = "Ukudweba nge-%PRODUCTNAME"
+ nb = "%PRODUCTNAME Drawing"
+ nn = "%PRODUCTNAME Drawing"
+ eu = "%PRODUCTNAME Zeichnung"
+@@ -159,12 +145,11 @@ gl = "%PRODUCTNAME Drawing"
  [calc]
  en = "%PRODUCTNAME Spreadsheet"
  de = "%PRODUCTNAME Tabelle"
 -pt = "%PRODUCTNAME Tabelle"
- ru = "%PRODUCTNAME Электронная таблица"
+ ru = "Электронная таблица %PRODUCTNAME"
  nl = "%PRODUCTNAME Tabel"
  fr = "%PRODUCTNAME Classeur"
  es = "Hoja de cálculo %PRODUCTNAME"
@@ -452,25 +478,31 @@ Index: sysui/desktop/share/launcher_comment.ulf
  hu = "PRODUCTNAME-munkafüzet"
  it = "%PRODUCTNAME Tabella"
  cs = "Sešit %PRODUCTNAME"
-@@ -152,11 +135,7 @@ ko = "%PRODUCTNAME 스프레드시트"
+@@ -178,16 +163,13 @@ ko = "%PRODUCTNAME 스프레드시트"
  zh-CN = "%PRODUCTNAME 工作表"
  zh-TW = "%PRODUCTNAME 工作表"
- tr = "%PRODUCTNAME Tablo"
+ tr = "%PRODUCTNAME Hesap Tablosu"
 -ar = "%PRODUCTNAME Tabelle"
 -he = "%PRODUCTNAME Tabelle"
 -ca = "%PRODUCTNAME Tabelle"
--th = "%PRODUCTNAME Tabelle"
--hi-IN = "%PRODUCTNAME Tabelle"
 +ca = "Fulla de c�| lcul d'%PRODUCTNAME"
+ th = "%PRODUCTNAME ตารางคำนวณ"
+-hi-IN = "%PRODUCTNAME Tabelle"
  et = "%PRODUCTNAME-i arvutustabel"
  sl = "Preglednica programa %PRODUCTNAME"
  ns = "Pampiri ya go anega ya %PRODUCTNAME"
-@@ -166,12 +145,11 @@ zu = "Ikhasi lokubala %PRODUCTNAME 6.0"
+ af = "%PRODUCTNAME-sigblad"
+-zu = "Ikhasi lokubala %PRODUCTNAME 6.0"
++zu = "Ikhasi lokubala %PRODUCTNAME"
+ nb = "%PRODUCTNAME Spreadsheet"
+ nn = "%PRODUCTNAME Spreadsheet"
+ eu = "%PRODUCTNAME Tabelle"
+@@ -198,12 +180,11 @@ gl = "%PRODUCTNAME Spreadsheet"
  [math]
  en = "%PRODUCTNAME Formula"
  de = "%PRODUCTNAME Formel"
 -pt = "%PRODUCTNAME Formel"
- ru = "%PRODUCTNAME Формула"
+ ru = "Формула %PRODUCTNAME"
  nl = "%PRODUCTNAME Formule"
  fr = "%PRODUCTNAME Formule"
  es = "Fórmula %PRODUCTNAME "
@@ -479,28 +511,35 @@ Index: sysui/desktop/share/launcher_comment.ulf
  hu = "%PRODUCTNAME-képlet"
  it = "%PRODUCTNAME Formula"
  cs = "Vzorec %PRODUCTNAME"
-@@ -186,10 +164,7 @@ zh-CN = "%PRODUCTNAME 公式"
+@@ -218,15 +199,13 @@ zh-CN = "%PRODUCTNAME 公式"
  zh-TW = "%PRODUCTNAME 公式"
  tr = "%PRODUCTNAME Formül"
  ar = "%PRODUCTNAME صيغة"
 -he = "%PRODUCTNAME Formel"
 -ca = "%PRODUCTNAME Formel"
--th = "%PRODUCTNAME Formel"
--hi-IN = "%PRODUCTNAME Formel"
 +ca = "Fòrmula d'%PRODUCTNAME"
+ th = "%PRODUCTNAME สมการ"
+-hi-IN = "%PRODUCTNAME Formel"
  et = "%PRODUCTNAME-i valem"
  sl = "Formula programa %PRODUCTNAME"
  ns = "Fomula ya %PRODUCTNAME"
+ af = "%PRODUCTNAME-formule"
+-zu = "Indlela yokwenza ye-%PRODUCTNAME 5.0"
++zu = "Indlela yokwenza ye-%PRODUCTNAME"
+ nb = "%PRODUCTNAME Formula"
+ nn = "%PRODUCTNAME Formula"
+ eu = "%PRODUCTNAME Formel"
 Index: sysui/desktop/share/launcher_name.ulf
 ===================================================================
---- sysui/desktop/share/launcher_name.ulf.orig	2004-07-30 21:43:44.697580288 +0200
-+++ sysui/desktop/share/launcher_name.ulf	2004-07-30 22:29:21.309552032 +0200
-@@ -1,12 +1,11 @@
+--- sysui/desktop/share/launcher_name.ulf.orig	2004-09-13 22:50:54.000000000 +0200
++++ sysui/desktop/share/launcher_name.ulf	2004-09-14 15:46:59.395405016 +0200
+@@ -1,13 +1,11 @@
  [printeradmin]
  en = "%PRODUCTNAME Printer Administration"
  de = "%PRODUCTNAME Drucker Verwaltung"
 -pt = "%PRODUCTNAME Drucker Verwaltung"
  ru = "%PRODUCTNAME Управление принтером"
+-el = "%PRODUCTNAME Drucker Verwaltung"
  nl = "%PRODUCTNAME printerbeheer"
  fr = "%PRODUCTNAME Gestion des imprimantes"
 -es = "Administración de la impresora de %PRODUCTNAME "
@@ -510,25 +549,25 @@ Index: sysui/desktop/share/launcher_name.ulf
  hu = "%PRODUCTNAME Nyomtatókezelés"
  it = "%PRODUCTNAME Gestione stampanti"
  cs = "Administrace tiskáren %PRODUCTNAME"
-@@ -20,11 +19,7 @@ ko = "%PRODUCTNAME 프린터 관리"
- zh-CN = "%PRODUCTNAME 打印机管理"
+@@ -22,10 +20,8 @@ zh-CN = "%PRODUCTNAME 打印机管理"
  zh-TW = "%PRODUCTNAME 印表機管理"
- tr = "%PRODUCTNAME Printer Administration"
--ar = "%PRODUCTNAME Drucker Verwaltung"
+ tr = "%PRODUCTNAME Yazıcı Yönetimi"
+ ar = "مسئول طابعة %PRODUCTNAME"
 -he = "%PRODUCTNAME Drucker Verwaltung"
 -ca = "%PRODUCTNAME Drucker Verwaltung"
--th = "%PRODUCTNAME Drucker Verwaltung"
--hi-IN = "%PRODUCTNAME Drucker Verwaltung"
 +ca = "Administració d'impressó d'%PRODUCTNAME"
+ th = "%PRODUCTNAME ดูแลเครื่องพิมพ์"
+-hi-IN = "%PRODUCTNAME Drucker Verwaltung"
  et = "%PRODUCTNAME-i printerite haldamine"
  sl = "%PRODUCTNAME nastavitve tiskalnika"
  cy = "Gweinyddiad Argraffu %PRODUCTNAME"
-@@ -35,12 +30,11 @@ zu = "%PRODUCTNAME Ukuphathwa komshicile
+@@ -43,13 +39,12 @@ gl = "%PRODUCTNAME Printer Administratio
  [template]
  en = "%PRODUCTNAME From Template"
  de = "%PRODUCTNAME Aus Vorlage"
 -pt = "%PRODUCTNAME Aus Vorlage"
- ru = "%PRODUCTNAME Из шаблона"
+ ru = "%PRODUCTNAME из шаблона..."
+ el = "%PRODUCTNAME Από πρότυπο"
  nl = "%PRODUCTNAME Uit sjabloon"
  fr = "À partir d'un modèle %PRODUCTNAME"
  es = "A partir de una plantilla de %PRODUCTNAME"
@@ -537,17 +576,16 @@ Index: sysui/desktop/share/launcher_name.ulf
  hu = "%PRODUCTNAME sablonból"
  it = "%PRODUCTNAME Da modello"
  cs = "Ze šablony %PRODUCTNAME"
-@@ -53,12 +47,7 @@ ja = "%PRODUCTNAME テンプレートか
- ko = "%PRODUCTNAME 서식 파일로부터"
+@@ -63,11 +58,8 @@ ko = "%PRODUCTNAME 서식 파일로부�
  zh-CN = "%PRODUCTNAME 采用样式"
  zh-TW = "%PRODUCTNAME 採用樣式"
--tr = "%PRODUCTNAME Aus Vorlage"
+ tr = "%PRODUCTNAME Şablondan"
 -ar = "%PRODUCTNAME Aus Vorlage"
 -he = "%PRODUCTNAME Aus Vorlage"
 -ca = "%PRODUCTNAME Aus Vorlage"
--th = "%PRODUCTNAME Aus Vorlage"
--hi-IN = "%PRODUCTNAME Aus Vorlage"
 +ca = "Des d'una plantilla d'%PRODUCTNAME"
+ th = "%PRODUCTNAME จากแม่แบบ"
+-hi-IN = "%PRODUCTNAME Aus Vorlage"
  et = "%PRODUCTNAME mallist"
  sl = "%PRODUCTNAME iz predloge"
  ns = "%PRODUCTNAME go tšwa go Template"
diff --git a/patches/OOO_1_1/tools-options-pt_BR-fix.diff b/patches/OOO_1_1/tools-options-pt_BR-fix.diff
new file mode 100644
index 000000000..28e50fe49
--- /dev/null
+++ b/patches/OOO_1_1/tools-options-pt_BR-fix.diff
@@ -0,0 +1,33 @@
+Index: offmgr/source/offapp/dialog/treeopt.src
+===================================================================
+RCS file: /cvs/framework/offmgr/source/offapp/dialog/Attic/treeopt.src,v
+retrieving revision 1.132.10.4
+diff -u -p -r1.132.10.4 treeopt.src
+--- offmgr/source/offapp/dialog/treeopt.src	27 Apr 2004 16:17:20 -0000	1.132.10.4
++++ offmgr/source/offapp/dialog/treeopt.src	9 Nov 2004 10:07:12 -0000
+@@ -902,16 +902,16 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
+ 			< "%PRODUCTNAME" ; 0; > ;
+ 			< "Dados de utilizador" ;  RID_SFXPAGE_GENERAL; > ;
+ 			< "Geral" ;  OFA_TP_MISC; > ;
+-			< "Ver" ; OFA_TP_MEMORY; > ;
+-			< "Imprimir" ; OFA_TP_VIEW ; > ;
+-			< "Programas auxiliares" ; RID_SFXPAGE_PRINTOPTIONS; > ;
+-			< "Atalhos" ; OFA_TP_HELPERPROG; > ;
+-			< "Cores" ;  RID_SFXPAGE_PATH; > ;
+-			< "Substitui��o de caracteres" ;  RID_SVXPAGE_COLOR; > ;
+-			< "Seguran�a" ; RID_SVX_FONT_SUBSTITUTION ; > ;
++			< "Mem�ria" ; OFA_TP_MEMORY; > ;
++			< "Ver" ; OFA_TP_VIEW; > ;
++			< "Imprimir" ; RID_SFXPAGE_PRINTOPTIONS; > ;
++			< "Programas auxiliares" ; OFA_TP_HELPERPROG; > ;
++			< "Atalhos" ; RID_SFXPAGE_PATH; > ;
++			< "Cores" ;  RID_SVXPAGE_COLOR; > ;
++			< "Substitui��o de caracteres" ;  RID_SVX_FONT_SUBSTITUTION; > ;
+ 			< "Seguran�a" ; RID_SVXPAGE_INET_SCRIPTING ; > ;
+-			< "Java" ;        RID_SVXPAGE_COLORCONFIG        ; > ;
+-			< "Outros" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
++			< "Apar�ncia" ; RID_SVXPAGE_COLORCONFIG ; > ;
++			< "Acessibilidade" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
+ 			< "Netzwerkidentit�t" ; RID_SVXPAGE_SSO ; > ;
+ 		};
+ 		ItemList [ russian ] =
diff --git a/patches/OOO_1_1/transex3-gsi-format-fixes.diff b/patches/OOO_1_1/transex3-gsi-format-fixes.diff
new file mode 100644
index 000000000..d30c5e6c4
--- /dev/null
+++ b/patches/OOO_1_1/transex3-gsi-format-fixes.diff
@@ -0,0 +1,48 @@
+--- ./transex3/source/export.cxx.indic	2004-11-25 14:49:45.000000000 -0500
++++ ./transex3/source/export.cxx	2004-11-25 14:53:58.000000000 -0500
+@@ -585,7 +585,7 @@
+ 				// cur. line has macro line end
+ 				ByteString sTmpLine( sToken );
+ 				sTmpLine.EraseAllChars( '\t' ); sTmpLine.EraseAllChars( ' ' );
+-				if( sTmpLine.Len() < 0 ){
++				if( sTmpLine.Len() > 0 ){
+ 					if ( sTmpLine.GetChar(( USHORT )( sTmpLine.Len() - 1 )) != '\\' )
+ 						bNextMustBeDefineEOL = TRUE;
+ 				}
+@@ -2416,7 +2420,8 @@
+ 									if ( sLine.GetChar( nEnd ) == '\"' )
+ 										bFound = TRUE;
+ 								}
+-								nEnd --;
++								if (sLine.Search (" \"\\\"\" ;") == STRING_NOTFOUND)
++									nEnd --;
+ 								ByteString sPostFix( sLine.Copy( ++nEnd ));
+ 								sLine.Erase( nStart );
+ 
+--- ./transex3/source/merge.cxx.indic	2004-11-25 14:50:17.000000000 -0500
++++ ./transex3/source/merge.cxx	2004-11-25 14:53:58.000000000 -0500
+@@ -183,7 +183,8 @@
+ 		aInputStream.ReadLine( sLine );
+ 		sLine = sLine.Convert( RTL_TEXTENCODING_MS_1252, aCharSet );
+ 
+-		if ( sLine.GetTokenCount( '\t' ) == 15 ) {
++		int tcnt = sLine.GetTokenCount( '\t' );
++		if ( tcnt >= 13 && tcnt <= 16 ) {
+ 			if ( nFileFormat != FFORMAT_NEW ) {
+ 				nFileFormat = FFORMAT_NEW;
+ 				fprintf( stdout, "File detection: Version 2.0 detected!\n" );
+--- ./transex3/source/srclex.l.indic	2004-11-25 14:51:04.000000000 -0500
++++ ./transex3/source/srclex.l	2004-11-25 14:54:10.000000000 -0500
+@@ -129,6 +129,12 @@
+ 	WorkOnTokenSet( LEVELDOWN, yytext );
+ }
+ 
++"}"[ \t]*	{
++/* LEVELDOWN alternate */
++	YYWarning ("Missing ; at end of block (should be '};')");
++	WorkOnTokenSet( LEVELDOWN, yytext );
++}
++
+ [a-zA-Z0-9_]+[ \t]*"="[ \t]*"MAP_APPFONT"[ \t]*"(".+")".*	{
+ /* APPFONTMAPPING  Typ = MAP_APPFONT( ... ) */
+ 	WorkOnTokenSet( APPFONTMAPPING, yytext );
diff --git a/patches/OOO_1_1/unotools-image-paste-crash-fix.diff b/patches/OOO_1_1/unotools-image-paste-crash-fix.diff
new file mode 100644
index 000000000..5213bd0cb
--- /dev/null
+++ b/patches/OOO_1_1/unotools-image-paste-crash-fix.diff
@@ -0,0 +1,18 @@
+--- unotools/source/ucbhelper/makefile.mk	16 Dec 2003 11:43:22 -0000	1.13.4.1
++++ unotools/source/ucbhelper/makefile.mk	6 Nov 2004 00:37:31 -0000
+@@ -76,11 +76,13 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ .INCLUDE : settings.mk
+ 
+-.IF "$(OS)$(CPU)" == "SOLARISI"
++#.IF "$(OS)$(CPU)" == "SOLARISI"
+ # introduced because of bug 114346, pure virtual function call.
+ # only under solaris intel in nondebug version, compiler version
+ NOOPTFILES=$(SLO)$/ucblockbytes.obj
+-.ENDIF
++#.ENDIF
++#Actually I (cmc) can see this pure virtual call as well in linux ix86 fedora
++#1.1.2-10, i.e. #rh110934#
+ 
+ # --- Files -------------------------------------
+ 
diff --git a/patches/OOO_1_1/vba-sc-import.diff b/patches/OOO_1_1/vba-sc-import.diff
index 7c82c5c5d..0220906af 100644
--- a/patches/OOO_1_1/vba-sc-import.diff
+++ b/patches/OOO_1_1/vba-sc-import.diff
@@ -1,122 +1,3 @@
-Index: sc/source/filter/excel/excform8.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excform8.cxx,v
-retrieving revision 1.23.120.1
-diff -u -r1.23.120.1 excform8.cxx
---- sc/source/filter/excel/excform8.cxx	19 Jan 2004 16:41:36 -0000	1.23.120.1
-+++ sc/source/filter/excel/excform8.cxx	8 Sep 2004 10:00:13 -0000
-@@ -477,11 +477,17 @@
- 			case 0x43:
- 			case 0x63:
- 			case 0x23: // Name									[318 269]
-+			{
- 				aIn >> nUINT16;
- 				aIn.Ignore( 2 );
- 
--				aStack << aPool.Store( ( *pExcRoot->pRNameBuff )[ nUINT16 ] );
-+				const String *pStr = pExcRoot->pRNameBuff->GetMacro ( nUINT16 );
-+				if (pStr) {
-+						aStack << aPool.Store( ocMacro, *pStr );
-+				} else
-+						aStack << aPool.Store( ( *pExcRoot->pRNameBuff )[ nUINT16 ] );
- 				break;
-+			}
- 			case 0x44:
- 			case 0x64:
- 			case 0x24: // Cell Reference						[319 270]
-Index: sc/source/filter/excel/excimp8.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excimp8.cxx,v
-retrieving revision 1.84.18.2
-diff -u -r1.84.18.2 excimp8.cxx
---- sc/source/filter/excel/excimp8.cxx	19 Jan 2004 16:41:53 -0000	1.84.18.2
-+++ sc/source/filter/excel/excimp8.cxx	8 Sep 2004 10:00:14 -0000
-@@ -1019,6 +1019,32 @@
- 	ImportExcel::EndSheet();
- }
- 
-+void ImportExcel8::ReadBasic( void )
-+{
-+    if( bHasBasic ) return; bHasBasic = TRUE;
-+
-+    SfxObjectShell* pShell = GetDocShell();
-+
-+    if( pShell )
-+	{
-+		OfaFilterOptions*   pFiltOpt = OFF_APP()->GetFilterOptions();
-+
-+		if( pFiltOpt )
-+		{
-+			if( pFiltOpt->IsLoadExcelBasicCode() || pFiltOpt->IsLoadExcelBasicStorage() )
-+			{
-+				DBG_ASSERT( pExcRoot->pRootStorage, "-ImportExcel8::PostDocLoad(): no storage, no cookies!" );
-+
-+                SvxImportMSVBasic   aBasicImport( *pShell, *pExcRoot->pRootStorage,
-+													pFiltOpt->IsLoadExcelBasicCode(),
-+													pFiltOpt->IsLoadExcelBasicStorage() );
-+
-+				aBasicImport.Import( String::CreateFromAscii( pVBAStorageName ),
-+									 String::CreateFromAscii( pVBASubStorageName ) );
-+			}
-+		}
-+	}
-+}
- 
- void ImportExcel8::PostDocLoad( void )
- {
-Index: sc/source/filter/excel/read.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/read.cxx,v
-retrieving revision 1.39.80.1
-diff -u -r1.39.80.1 read.cxx
---- sc/source/filter/excel/read.cxx	19 Jan 2004 16:43:05 -0000	1.39.80.1
-+++ sc/source/filter/excel/read.cxx	8 Sep 2004 10:00:14 -0000
-@@ -1143,7 +1143,7 @@
- 					case 0x56:	Builtinfmtcnt(); break;	// BUILTINFMTCNT[  34    ]
- 					case 0x8D:	Hideobj(); break;		// HIDEOBJ		[  345   ]
- 					case 0x99:	Standardwidth(); break;	// STANDARDWIDTH[   45   ]
--					case 0xD3:	bHasBasic = TRUE; break;
-+					case 0xD3:	ReadBasic(); break;
- 					case 0xD5:	SXIdStm(); break;		// SXIDSTM                ##++##
-                     case 0xDE:  Olesize(); break;
-                     case 0xE0:  GetXFBuffer().ReadXF( maStrm );                 break;
-Index: sc/source/filter/excel/tokstack.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/tokstack.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 tokstack.cxx
---- sc/source/filter/excel/tokstack.cxx	23 Oct 2001 09:37:15 -0000	1.3
-+++ sc/source/filter/excel/tokstack.cxx	8 Sep 2004 10:00:15 -0000
-@@ -350,10 +350,12 @@
- 				UINT16			n = pElement[ nId ];
- 				EXTCONT*		p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
- 
--				if( p )
--					/*ScToken*	pTok = */pScToken->AddExternal( p->aText.GetBuffer() );
-+				if( p ) {
-+						ScToken *pTok = pScToken->AddExternal( p->aText );
-+						pTok->NewOpCode (p->eId);
- 				}
- 				break;
-+				}
- 			case T_Nlf:
- 				{
- 				UINT16			n = pElement[ nId ];
-@@ -417,9 +419,11 @@
- 					{
- 					UINT16		n = pElement[ ( TokenId ) *pAkt ];
- 					EXTCONT*	p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
--
--					if( p )
--						/*ScToken*	pTok = */pScToken->AddExternal( p->aText.GetBuffer() );
-+					
-+					if( p ) {
-+						ScToken *pTok = pScToken->AddExternal( p->aText );
-+						pTok->NewOpCode (p->eId);
-+					}
- 					}
- 					break;
- 				case T_Nlf:
 Index: sc/source/filter/excel/xilink.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/filter/excel/xilink.cxx,v
@@ -143,86 +24,3 @@ diff -u -r1.4 xilink.cxx
 +    DBG_ASSERT( nXclIndex > 0, "XclImpExtNameList::GetName - index must be >0" );
      return GetObject( nXclIndex - 1 );
  }
- 
-Index: sc/source/filter/excel/namebuff.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/namebuff.cxx,v
-retrieving revision 1.15
-diff -u -r1.15 namebuff.cxx
---- sc/source/filter/excel/namebuff.cxx	23 Apr 2003 17:29:11 -0000	1.15
-+++ sc/source/filter/excel/namebuff.cxx	8 Sep 2004 10:00:15 -0000
-@@ -167,7 +167,11 @@
- }
- 
- 
--
-+RangeNameBuffer::~RangeNameBuffer()
-+{
-+	for( ULONG i = 0; i < Count(); i++ )
-+		delete (String *) GetObject( i );
-+}
- 
- void RangeNameBuffer::Store( ByteString& r, const ScTokenArray* p, UINT16 n, const RangeType t)
- {
-@@ -191,6 +195,11 @@
- 			rName += String::CreateFromInt32( nAltSheet );
- 		}
- 
-+		if (pDef->GetLen() == 0) { /* Dummy method / function call */
-+				Insert( new String (rName), LIST_APPEND );
-+				return;
-+		}
-+
- 		ScRangeData*	pData = new ScRangeData( pExcRoot->pDoc, rName, *pDef );
- 
- 		pData->GuessPosition();
-@@ -205,10 +214,10 @@
- 
- 		pExcRoot->pScRangeName->Insert( pData );
- 
--		Insert( ( void* ) TRUE, LIST_APPEND );
-+		Insert( NULL, LIST_APPEND );
- 	}
- 	else
--		Insert( ( void* ) FALSE, LIST_APPEND );
-+		Insert( NULL, LIST_APPEND );
- }
- 
- 
-Index: sc/source/filter/inc/excimp8.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/excimp8.hxx,v
-retrieving revision 1.48.80.1
-diff -u -r1.48.80.1 excimp8.hxx
---- sc/source/filter/inc/excimp8.hxx	19 Jan 2004 16:45:37 -0000	1.48.80.1
-+++ sc/source/filter/inc/excimp8.hxx	8 Sep 2004 10:00:15 -0000
-@@ -193,6 +193,7 @@
- 		void					SXLi( void );					// 0xB5
- 		void					SXPi( void );					// 0xB6
- 		void					SXDi( void );					// 0xC5
-+		void					ReadBasic( void );				// 0xD3
- 		void					SXIdStm( void );				// 0xD5
- 		void					SXVs( void );					// 0xE3
- 		void					Cellmerging( void );			// 0xE5		geraten...
-Index: sc/source/filter/inc/namebuff.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/namebuff.hxx,v
-retrieving revision 1.6
-diff -u -r1.6 namebuff.hxx
---- sc/source/filter/inc/namebuff.hxx	26 Mar 2003 18:05:05 -0000	1.6
-+++ sc/source/filter/inc/namebuff.hxx	8 Sep 2004 10:00:15 -0000
-@@ -219,12 +219,14 @@
- public:
- 	inline					RangeNameBuffer( RootData* p );
- 											// Name, Definition
-+	virtual                 ~RangeNameBuffer();
- 	void					Store( ByteString&, const ScTokenArray*,
- 								UINT16 nAltSheet = 0, const RangeType eNameType = RT_ABSAREA );
- 	void					Store( String&, const ScTokenArray*,
- 								UINT16 nAltSheet = 0, const RangeType eNameType = RT_ABSAREA );
- 	inline UINT16			operator[]( UINT16 nExcInd ) const;
- 	inline UINT16			GetPos( void ) const;
-+	const String           *GetMacro( UINT16 nIdx ) const { return (const String *) GetObject( nIdx ); }
- };
- 
- 
diff --git a/patches/OOO_1_1/vfs-uno-register.diff b/patches/OOO_1_1/vfs-uno-register.diff
index 66788d2c3..82e38d230 100644
--- a/patches/OOO_1_1/vfs-uno-register.diff
+++ b/patches/OOO_1_1/vfs-uno-register.diff
@@ -148,7 +148,7 @@ diff -u -p -u -r1.4 Configuration.xcu
 +                <value>com.sun.star.ucb.GnomeVFSContentProvider</value>
 +              </prop>
 +              <prop oor:name="URLTemplate">
-+                <value>.*</value>
++                <value>://</value>
 +              </prop>
 +              <prop oor:name="Arguments">
 +                <value/>
diff --git a/patches/OOO_1_1/win32-build-fixes-1-1-3.diff b/patches/OOO_1_1/win32-build-fixes-1-1-3.diff
new file mode 100644
index 000000000..e5bd2a369
--- /dev/null
+++ b/patches/OOO_1_1/win32-build-fixes-1-1-3.diff
@@ -0,0 +1,34 @@
+--- stlport/win32_custom.sh.bak	2004-10-21 17:13:18.218750000 +0530
++++ stlport/win32_custom.sh	2004-10-21 15:03:01.718750000 +0530
+@@ -3,6 +3,8 @@
+ #rem - path to unpacked tarball
+ #rem - relative path back to module root
+ 
++/usr/bin/dos2unix.exe ./wntmsci9.pro/misc/build/STLport-4.0/src/vc_common.mak
++
+ cd $1
+ 
+ patch -i $2/dos_lineends.patch -b -p2
+--- solenv/inc/tg_ext.mk.bak	2004-10-28 14:40:56.671875000 +0530
++++ solenv/inc/tg_ext.mk	2004-10-28 14:47:41.531250000 +0530
+@@ -176,6 +176,9 @@
+ 	@+-$(MKDIR) $(PACKAGE_DIR)
+ 	+cd $(PACKAGE_DIR) && ( $(shell +$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
+ 	@+echo make writeable...
++.IF "$(TARFILE_NAME)"=="curl-7.9.8"
++	@+/usr/bin/dos2unix.exe $(PACKAGE_DIR)/curl-7.9.8/lib/Makefile.vc6
++.ENDIF
+ .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
+ 	@+cd $(PACKAGE_DIR) && chmod -R +rw * && $(TOUCH) $(UNTAR_FLAG_FILE)
+ 	@+cd $(PACKAGE_DIR) && find . -type d -exec chmod a+x {{}} \;
+--- berkeleydb/makefile.mk.bak	2004-12-01 15:35:24.093750000 +0530
++++ berkeleydb/makefile.mk	2004-12-01 15:37:43.812500000 +0530
+@@ -106,7 +106,7 @@
+ EXT_USE_STLPORT=TRUE
+ 
+ BUILD_DIR=build_win32
+-.IF "$(COMEX)"=="8"
++.IF "$(COMEX)"=="8" || "$(COMEX)"=="10"
+ CONFIGURE_DIR=build_win32
+ CONFIGURE_ACTION=wdevenv Berkeley_DB Release
+ .IF "$(USE_SHELL)"!="4nt"
diff --git a/patches/OOO_1_1/win32-gw-send-mail.diff b/patches/OOO_1_1/win32-gw-send-mail.diff
index d3e8c71ee..ae9322ac9 100755
--- a/patches/OOO_1_1/win32-gw-send-mail.diff
+++ b/patches/OOO_1_1/win32-gw-send-mail.diff
@@ -10,7 +10,7 @@
 -                aSysPath.getLength( ), 
 -                osl_getThreadTextEncoding( ) ) );
 -       
-+	OString aFullPath = OUStringToOString( aSysPath,
++	OString aFullPath = ::rtl::OUStringToOString( aSysPath,
 +					       osl_getThreadTextEncoding() );
 +	sal_Int32 nLastSlash = aFullPath.lastIndexOf('\\');
 +	OString aFileName = aFullPath.copy( nLastSlash + 1 );
diff --git a/patches/OOO_1_1/win32-msvs-2003-misc.diff b/patches/OOO_1_1/win32-msvs-2003-misc.diff
index 179bf20da..5c4c8890b 100644
--- a/patches/OOO_1_1/win32-msvs-2003-misc.diff
+++ b/patches/OOO_1_1/win32-msvs-2003-misc.diff
@@ -21,43 +21,10 @@ retrieving revision 1.4.10.1
 diff -u -p -u -w -r1.4.10.1 boost_1_27_0.patch
 --- boost/boost_1_27_0.patch	15 Aug 2003 11:47:26 -0000	1.4.10.1
 +++ boost/boost_1_27_0.patch	1 Apr 2004 22:44:43 -0000
-@@ -1,21 +1,66 @@
----- misc/boost_1_27_0/boost/config/compiler/gcc.hpp
--+++ misc/build/boost_1_27_0/boost/config/compiler/gcc.hpp
--@@ -49,10 +49,10 @@
-+*** misc/boost_1_27_0/boost/config/compiler/gcc.hpp	Thu Feb  7 16:26:06 2002
-+--- misc/build/boost_1_27_0/boost/config/compiler/gcc.hpp	Mon Sep 15 13:00:28 2003
-+***************
-+*** 49,58 ****
-+  #  error "Compiler not configured - please reconfigure"
-+  #endif
-+  //
-+! // last known and checked version is 3.1:
-+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 1))
-+  #  if defined(BOOST_ASSERT_CONFIG)
-+! #     error "Unknown compiler version - please run the configure tests and report the results"
-+  #  else
-+  #     warning "Unknown compiler version - please run the configure tests and report the results"
-+  #  endif
-+--- 49,58 ----
-  #  error "Compiler not configured - please reconfigure"
-  #endif
-  //
---// last known and checked version is 3.1:
---#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 1))
--+// last known and checked version is 3.3:
--+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
-+! // last known and checked version is 3.3:
-+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
-  #  if defined(BOOST_ASSERT_CONFIG)
---#     error "Unknown compiler version - please run the configure tests and report the results"
--+#     error "Unknown / untested compiler version - please run the configure tests and report the results"
-+! #     error "Unknown / untested compiler version - please run the configure tests and report the results"
-  #  else
-  #     warning "Unknown compiler version - please run the configure tests and report the results"
-  #  endif
--*** misc/boost_1_27_0/boost/config/user.hpp	Thu Feb  7 10:26:05 2002
----- misc/build/boost_1_27_0/boost/config/user.hpp	Fri Apr 11 17:50:51 2003
+@@ -23,6 +23,42 @@
+   #  else
+   #     warning "Unknown compiler version - please run the configure tests and report the results"
+   #  endif
 +*** misc/boost_1_27_0/boost/config/compiler/visualc.hpp	Thu Feb  7 16:26:08 2002
 +--- misc/build/boost_1_27_0/boost/config/compiler/visualc.hpp	Mon Sep 15 13:01:38 2003
 +***************
@@ -94,11 +61,9 @@ diff -u -p -u -w -r1.4.10.1 boost_1_27_0.patch
 +  #  if defined(BOOST_ASSERT_CONFIG)
 +  #     error "Unknown compiler version - please run the configure tests and report the results"
 +  #  else
-+*** misc/boost_1_27_0/boost/config/user.hpp	Thu Feb  7 16:26:05 2002
-+--- misc/build/boost_1_27_0/boost/config/user.hpp	Mon Sep 15 13:00:28 2003
+ *** misc/boost_1_27_0/boost/config/user.hpp	2002-02-07 16:26:05.000000000 +0100
+ --- misc/build/boost_1_27_0/boost/config/user.hpp	2004-10-04 19:33:26.631731992 +0200
  ***************
- *** 56,58 ****
- --- 56,68 ----
 Index: configmgr/source/api2/apiaccessobj.hxx
 ===================================================================
 RCS file: /cvs/util/configmgr/source/api2/apiaccessobj.hxx,v
@@ -674,39 +639,6 @@ diff -u -p -u -w -r1.62.20.1 makefile.mk
  
  DOCUSTUDIO4INTEGRATIONHTMLFILES= \
  	$(DESTDIRDOCU)$/DevStudioWizards$/CalcAddinWizard.html \
-@@ -238,7 +239,10 @@ INSTALLSCRIPT= \
- 	$(DESTDIR)$/setsdkenv_windows.bat
- .ENDIF
- 
--DIR_FILE_LIST=\
-+#--------------------------------------------------
-+# TARGETS
-+#--------------------------------------------------
-+all : \
- 	$(EXELIST) \
- 	$(XMLLIST) \
- 	$(SDKDLLLIST) \
-@@ -251,19 +255,9 @@ DIR_FILE_LIST=\
- 	$(DESTDIRDOCU)$/common$/spec$/xml_format$/xml_specification.pdf
- #	$(DESTDIRCLASSES)$/oosupport.nbm \
- 
--DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
--DIR_CREATE_FLAG=$(MISC)$/copying_dirs_created.txt
--DIR_FILE_FLAG=$(MISC)$/copying_files.txt
--
--#--------------------------------------------------
--# TARGETS
--#--------------------------------------------------
--all : \
--	$(DIR_FILE_LIST) \
--	$(DIR_FILE_FLAG)
--
- #--------------------------------------------------
- # use global rules
- #--------------------------------------------------   
- .INCLUDE: $(PRJ)$/util$/odk_rules.pmk
- 
-+    
 Index: python/makefile.mk
 ===================================================================
 RCS file: /cvs/external/python/makefile.mk,v
diff --git a/patches/OOO_1_1/word-count.diff b/patches/OOO_1_1/word-count.diff
index 4f3040435..953e0ca18 100644
--- a/patches/OOO_1_1/word-count.diff
+++ b/patches/OOO_1_1/word-count.diff
@@ -57,7 +57,7 @@ retrieving revision 1.109
 diff -u -p -u -r1.109 swslots.src
 --- sw/sdi/swslots.src	17 Jul 2003 11:48:28 -0000	1.109
 +++ sw/sdi/swslots.src	31 Jul 2003 17:01:27 -0000
-@@ -3685,6 +3685,55 @@ SfxSlotInfo FN_HYPHENATE_OPT_DLG
+@@ -3685,6 +3685,56 @@ SfxSlotInfo FN_HYPHENATE_OPT_DLG
  	SlotName[ hindi ] = "हाइफनेशन";
  	SlotName[ slovak ] = "Delenie slov";
  };
@@ -95,6 +95,7 @@ diff -u -p -u -r1.109 swslots.src
 +	SlotName[ thai ] = "Word count";
 +	SlotName[ hebrew ] = "Word count";
 +	SlotName[ estonian ] = "Word count";
++       SlotName[ lithuanian ] = "Dokumento statistika";
 +/*	--: "Word count" translations
 +	az:	"Kəlmə Miqdarı"
 +	bs:	"Zbir riječi"
@@ -138,93 +139,69 @@ Index: sw/source/ui/inc/swmn.hrc
 RCS file: /cvs/sw/sw/source/ui/inc/swmn.hrc,v
 retrieving revision 1.133
 diff --context=15 -c -r1.133 swmn.hrc
-*** sw/source/ui/inc/swmn.hrc.orig	2004-09-22 09:41:21.000000000 -0400
---- sw/source/ui/inc/swmn.hrc	2004-09-23 09:09:01.214282641 -0400
-***************
-*** 9189,9218 ****
---- 9189,9270 ----
-  				Text[ extern ] = "~Hyphenation...";
-  				Text[ thai ] = "ใ~ช้ยัติภังค์...";
-  				Text[ czech ] = "Dělení slov...";
-  				Text[ hebrew ] = "שבירת מלים...";
-  				Text[ hindi ] = "~हाइफनेशन...";
-  				Text[ slovak ] = "~Delenie slov...";
-  				Text[ hungarian ] = "~Elválasztás...";
-  				Text[ slovenian ] = "~Deljenje besed...";
-  				Text[ estonian ] = "~Poolitus...";
-  				Text[ welsh ] = "~Cyplysnodi...";
-  				Text[ northernsotho ] = "~Morathofatso...";
-  				Text[ afrikaans ] = "~Woordafbreking...";
-  				Text[ zulu ] = "~Ukwahlukaniswa kwamagama...";
-  				Text[ norwegian_nynorsk ] = "Orddeli~ng ...";
-  			};
-+  			MenuItem
-+  			{
-+  				Identifier = FN_WORD_COUNT_DLG ;
-+  				HelpID = FN_WORD_COUNT_DLG ;
-+  				Text = "W�rter z�hlen..." ;
-+ 				Text [ arabic ] = "��������...";
-+ 				Text [ english ] = "Word count...";
-+ 				Text [ english_us ] = "Word count...";
-+ 				Text [ catalan ] = "Comptador de paraules...";
-+ 				Text [ czech ] = "Počet slov...";
-+ 				Text [ danish ] = "Ordoptælling...";
-+ 				Text [ greek ] = "�������� ������";
-+ 				Text [ spanish ] = "Contar palabras...";
-+ 				Text [ estonian ] = "Sõnade arv...";
-+ 				Text [ finnish ] = "Laske sanat...";
-+ 				Text [ french ] = "Statistiques...";
-+ 				Text [ hindi ] = "शब्द गिनें...";
-+ 				Text [ italian ] = "Statistiche...";
-+ 				Text [ hungarian ] = "Szavak száma...";
-+ 				Text [ japanese ] = "ワードカウント...";
-+ 				Text [ korean ] = "통계...";
-+ 				Text [ norwegian ] = "Ordtelling...";
-+ 				Text [ dutch ] = "Woorden tellen...";
-+ 				Text [ polish ] = "Liczba s��w...";
-+ 				Text [ portuguese ] = "Contagem palavras...";
-+ 				Text [ portuguese_brazilian ] = "Contagem palavras...";
-+ 				Text [ russian ] = "���������� ����";
-+ 				Text [ slovak ] = "Počet slov...";
-+ 				Text [ swedish ] = "Ordräkning...";
-+ 				Text [ turkish ] = "�statistik...";
-+ 				Text [ chinese_simplified ] = "统计...";
-+ 				Text [ chinese_traditional ] = "統計...";
-+ 				Text [ slovenian ] = "Število besed";
-+ 				Text [ thai ] = "Word count...";
-+ 				Text [ hebrew ] = "Word count...";
-+ 				Text [ estonian ] = "Word count...";
-+ /*				--: "Word count" translations
-+ 				az:	"Kəlmə Miqdarı"
-+ 				bs:	"Zbir riječi"
-+ 				cy:	"Cyfrif geiriau"
-+ 				eu:	"Hitz kopurua"
-+ 				mk:	"Броење на зборови"
-+ 				mt:	"Għadd ta’ kliem"
-+ 				ro:	"Numără cuvintele"
-+ 				sl:	"Število besed"
-+ 				sq:	"Llogariti fjalët"
-+ 				ta:	"சொல் எண்ணி"
-+ 				uk:	"Кількість слів"
-+ 				vi:	"Đếm từ"
-+ 				wa:	"Contaedje des mots"
-+ */
-+   			};
-  #endif
-  			SEPARATOR ;
-  			MenuItem
-  			{
-                  Identifier = SID_AUTO_CORRECT_DLG;
-                  HelpID = SID_AUTO_CORRECT_DLG;
-  				Text = "~AutoKorrektur/AutoFormat..." ;
-  				Text [ English ] = "~AutoCorrect/AutoFormat..." ;
-  				Text [ portuguese ] = "~AutoCorrec��o/AutoFormato..." ;
-  				Text [ english_us ] = "~AutoCorrect/AutoFormat..." ;
-  				Text [ portuguese_brazilian ] = "~AutoCorre��o/AutoFormata��o..." ;
-  				Text [ swedish ] = "~AutoKorrigering/AutoFormat..." ;
-  				Text [ danish ] = "~AutoKorrektur/AutoFormat..." ;
-  				Text [ italian ] = "Correzione/Formattazione a~utomatica..." ;
-  				Text [ spanish ] = "~Correcci�n/Formateado autom�tico..." ;
+--- sw/source/ui/inc/swmn.hrc.orig	2004-09-22 09:41:21.000000000 -0400
++++ sw/source/ui/inc/swmn.hrc	2004-09-23 09:09:01.214282641 -0400
+@@ -9189,6 +9189,59 @@
++ 			MenuItem
++ 			{
++ 				Identifier = FN_WORD_COUNT_DLG ;
++ 				HelpID = FN_WORD_COUNT_DLG ;
++ 				Text = "W�rter z�hlen..." ;
++				Text [ arabic ] = "��������...";
++				Text [ english ] = "Word count...";
++				Text [ english_us ] = "Word count...";
++				Text [ catalan ] = "Comptador de paraules...";
++				Text [ czech ] = "Počet slov...";
++				Text [ danish ] = "Ordoptælling...";
++				Text [ greek ] = "�������� ������";
++				Text [ spanish ] = "Contar palabras...";
++				Text [ estonian ] = "Sõnade arv...";
++				Text [ finnish ] = "Laske sanat...";
++				Text [ french ] = "Statistiques...";
++				Text [ hindi ] = "शब्द गिनें...";
++				Text [ italian ] = "Statistiche...";
++				Text [ hungarian ] = "Szavak száma...";
++				Text [ japanese ] = "ワードカウント...";
++				Text [ korean ] = "통계...";
++				Text [ norwegian ] = "Ordtelling...";
++				Text [ dutch ] = "Woorden tellen...";
++				Text [ polish ] = "Liczba s��w...";
++				Text [ portuguese ] = "Contagem palavras...";
++				Text [ portuguese_brazilian ] = "Contagem palavras...";
++				Text [ russian ] = "���������� ����";
++				Text [ slovak ] = "Počet slov...";
++				Text [ swedish ] = "Ordräkning...";
++				Text [ turkish ] = "�statistik...";
++				Text [ chinese_simplified ] = "统计...";
++				Text [ chinese_traditional ] = "統計...";
++				Text [ slovenian ] = "Število besed";
++				Text [ thai ] = "Word count...";
++				Text [ hebrew ] = "Word count...";
++				Text [ estonian ] = "Word count...";
++				Text [ lithuanian ] = "Dokumento ~statistika...";
++/*				--: "Word count" translations
++				az:	"Kəlmə Miqdarı"
++				bs:	"Zbir riječi"
++				cy:	"Cyfrif geiriau"
++				eu:	"Hitz kopurua"
++				mk:	"Броење на зборови"
++				mt:	"Għadd ta’ kliem"
++				ro:	"Numără cuvintele"
++				sl:	"Število besed"
++				sq:	"Llogariti fjalët"
++				ta:	"சொல் எண்ணி"
++				uk:	"Кількість слів"
++				vi:	"Đếm từ"
++				wa:	"Contaedje des mots"
++*/
++  			};
+ #endif
+ 			SEPARATOR ;
+ 			MenuItem
+ 			{
+-                Identifier = SID_AUTO_CORRECT_DLG;
++                Identifier = SID_AUTO_CORRECT_DLG; /* foo */
+                 HelpID = SID_AUTO_CORRECT_DLG;
 Index: sw/source/ui/uiview/viewling.cxx
 ===================================================================
 RCS file: /cvs/sw/sw/source/ui/uiview/viewling.cxx,v
diff --git a/patches/OOO_1_1/writer-default-as-optimal-page-wrap.diff b/patches/OOO_1_1/writer-default-as-optimal-page-wrap.diff
new file mode 100644
index 000000000..6516c179c
--- /dev/null
+++ b/patches/OOO_1_1/writer-default-as-optimal-page-wrap.diff
@@ -0,0 +1,16 @@
+Index: source/core/doc/poolfmt.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/poolfmt.cxx,v
+retrieving revision 1.25.108.1
+diff -u -r1.25.108.1 poolfmt.cxx
+--- sw/source/core/doc/poolfmt.cxx	9 Jan 2004 14:31:26 -0000	1.25.108.1
++++ sw/source/core/doc/poolfmt.cxx	24 Oct 2004 14:25:15 -0000
+@@ -1516,7 +1516,7 @@
+ 			aSet.Put( SwFmtAnchor( FLY_AT_CNTNT ));
+ 			aSet.Put( SwFmtHoriOrient( 0, HORI_CENTER, FRAME ));
+ 			aSet.Put( SwFmtVertOrient( 0, VERT_TOP, FRAME ));
+-			aSet.Put( SwFmtSurround( SURROUND_NONE ));
++			aSet.Put( SwFmtSurround( SURROUND_IDEAL ));
+ 		}
+ 		break;
+ 	case RES_POOLFRM_FORMEL:
diff --git a/patches/OOO_1_1_2/.cvsignore b/patches/OOO_1_1_2/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/patches/OOO_1_1_2/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/patches/OOO_1_1_2/Makefile.am b/patches/OOO_1_1_2/Makefile.am
deleted file mode 100644
index 9c7adf699..000000000
--- a/patches/OOO_1_1_2/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = apply ${wildcard *.diff} ${wildcard *.patch}
diff --git a/patches/OOO_1_1_2/apply b/patches/OOO_1_1_2/apply
deleted file mode 100644
index 57edf4b01..000000000
--- a/patches/OOO_1_1_2/apply
+++ /dev/null
@@ -1,1157 +0,0 @@
-#
-# The format of this file is:
-#
-
-# -------- Options --------
-
-PATCHPATH=.:../OOO_1_1:../evo2:../vclplug:../wpd
-
-# -------- Functional sub-sets --------
-
-Minimal : MinimalOnly, BuildBits
-Common : Upstreamed, BuildBits, IconRender, Misc, MenuFixes, CalcFixes, DBFixes, WordPerfect
-LinuxCommon : Common, VCLPlug, FilePickers, FontBits, i18n, SystemBits, RecentFiles, LinuxOnly
-#DebianBase : DebianOnly, LinuxCommon
-DebianBase : DebianOnly, LinuxCommon
-Debian : DebianBase, XineramaPIC
-DebianWoody: DebianBase, OldLibArt
-
-NonDebianCommon : ODKFixes, VBABits, Lotus, StartupNotification
-RedHatBase : LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonDebianCommon, Evo2, RedHatOnly
-RHFedora : RedHatBase, RHFedoraOnly
-RHEL3    : RedHatBase, RHEL3Only, OldLibArt
-RHL9     : RedHatBase, RHL9Only, OldLibArt
-
-NovellBase : LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonDebianCommon, Evo2, NovellOnly
-SUSE : NovellBase, SUSEOnly
-NLD  : NovellBase, NLDOnly
-PLD  : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon
-KDE  : LinuxCommon, KDEOnly
-
-# Odd one, very few patches:
-Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles, ODKFixes, VBABits
-# somewhat odder:
-Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only
-
-# -------- [ Tag ], patch sets --------
-
-#######################################################
-
-#
-# These patches are already in a cws for OOo 1.1.3+ and are zeroth
-# so that more patches can be shared between 1_1_2 and later
-#
-[ Upstreamed ]
-# use system nas, 23779
-system-nas.diff
-
-# Xinerama linking 32066
-vcl-xinerama-link-dynamic.diff
-
-# KDE cut'n'paste problem fix, IZ# 29078, IZ# 28193
-kde-cut-paste-fix.diff
-
-#
-# VCL plug back-port is first, since we want to patch
-# against these (the state of HEAD), so our patches are
-# more easily up-streamable ...
-# 
-[ VCLPlug ]
-psprint-m46-backport.diff
-vcl-inc.diff
-vcl-prj.diff
-vcl-source-app.diff
-vcl-source-control.diff
-vcl-source-gdi.diff
-vcl-source-glyphs.diff
-vcl-source-helper.diff
-vcl-source-src.diff
-vcl-source-window.diff
-vcl-unx-dummy.diff
-vcl-unx-gtk.diff
-vcl-unx-inc.diff
-vcl-unx-inc-plugins.diff
-vcl-unx-source-app.diff
-vcl-unx-source-gdi.diff
-vcl-unx-source-inc.diff
-vcl-unx-source-plugadapt.diff
-vcl-unx-source-window.diff
-vcl-unx-kde-data-cxx.diff
-vcl-unx-kde-data-hxx.diff
-vcl-unx-kde-makefile.diff
-vcl-unx-kde-nwf.diff
-vcl-unx-kde-sm.diff
-vcl-util.diff
-svtools-bmpmaker.diff
-scp-plug.diff
-config-office-plug.diff
-solenv-inc-settings-mk.diff
-# Windows bits:
-vcl-win-inc.diff
-vcl-win-source-app.diff
-vcl-win-source-gdi.diff
-vcl-win-source-window.diff
-
-# Fix from IZ#28567 (should be in 1.1.3)
-vcl-arabic-fallback.diff
-
-# awful HMENU hacks (back-ported)
-framework-win-handle.diff
-sj2-win-handle.diff
-dbaccess-win-handle.diff
-
-# Use the right colors for menus/menuitems #?????
-vcl-unx-gtk-menu-style.diff
-
-# Fix for autocompletion of words that have an apostrophe in them- bug #63231
-vcl-gtk-keycode.diff
-
-# Allow forcing which desktop we run under to override autodetection - #????? (not reported yet)
-# Just export OOO_FORCE_DESKTOP=KDE|Gnome|CDE|none before running
-vcl-force-desktop.diff
-
-# grab from cvs; should really re-sync from new branch - X#64220
-vcl-dnd-fix.diff
-
-# get the font from fontconfig and set as per the locale - X#63129, #62272
-vcl-gtk-fontconfig-fonts.diff
-
-# back-port some more pieces
-vcl-unx-gtk-m46-to-m53.diff
-
-# fix from Stefan for #30335, X#63104
-vcl-m47-transparent-fix.diff
-
-# fix for crasher post frame deletion
-crash-deletion.diff
-
-# fix for ppds cups refuses to parse
-crash-ppd-parse.diff
-
-# Fix XIM a little (urgh, incomplete)
-xim-fixes.diff
-
-[ FilePickers ]
-
-#
-# Common part
-#
-
-# Back-port from HEAD. Current context's getValueByName() can return value of
-# the "system.desktop-environment".
-fpicker-desktop-environment.diff
-
-# Search for GtkFilePicker or KDEFilePicker service when running in one of
-# the environments to allow both file pickers to be installed at the same time.
-fpicker-svtools-gtk-or-kde.diff
-
-# Enable the folder picker to be launched from svtools
-fpicker-gnome-svtools-folderpicker.diff
-
-# Build bits
-fpicker-gnome-build.diff
-
-# Copying & registering stuff
-fpicker-gnome-scp.diff
-
-# Allow enabling/disabling of the native file picker in
-# Tools->Options...->OpenOffice.org->General
-fpicker-show-checkbox.diff
-
-#
-# Gtk file picker implementation
-#
-fpicker-gnome-entry.diff
-fpicker-gnome-eventnotification.diff
-fpicker-gnome-asynceventnotifier.diff
-fpicker-gnome-picker-hxx.diff
-fpicker-gnome-picker-cxx.diff
-fpicker-gnome-folderpicker-hxx.diff
-fpicker-gnome-folderpicker-cxx.diff
-fpicker-gnome-filepicker-hxx.diff
-fpicker-gnome-filepicker-cxx.diff
-fpicker-gnome-resource.diff
-fpicker-gnome-serviceinfo.diff
-fpicker-gnome-xml.diff
-# fix for the csv import filter bug #62833
-sfx2-fpicker-gnome-filter-fix.diff
-
-#
-# KDE file picker implementation
-#
-
-# Common code for out-of-process file picker implementation
-fpicker-common.diff
-
-# KDE specific code
-fpicker-kde.diff
-
-#######################################################
-
-[ BuildBits ]
-# don't touch a header unless it's really changed #8817
-deliver-compare.diff
-
-# do an optimizing link
-build-optimized-link.diff
-
-# fix daft cut / paste mess. #24917 - up-stream.
-flash-compile-fix.diff
-
-# help people get debugging
-debug-helper.diff
-
-# fix debug build in desktop/, #28330
-desktop-debug-fix.diff
-
-# do not build extras for icu, workaround for http://bugs.debian.org/210608
-icu-build-no-extras.diff
-
-# Use $ARCH_FLAGS env. var instead of hard-coded -mcpu=pentiumpro, #29537
-build-arch-flags.diff
-
-# Make NAS use $ARCH_FLAGS
-nas-use-arch-flags.diff
-
-# Dan's re-work
-build-pl-conditionals.diff
-
-# Blacklist some of the dirs during parallel dmake
-build-pl-parallel-dmake-blacklist.diff
-
-[ Misc ]
-# Fix double-free in rsc caused by fclose()-ing the same file stream
-# --- HACK ---
-rsc-double-free-fix.diff
-
-# Fix silly with gcc translating things unnecessarily - #33031
-gcc-i18n.diff
-
-# Allow building with new (4.6.x) STLport - #28564
-stlport-compile-fix.diff
-
-# Some people are unbelievable ;-)
-# spell-ximian.diff
-
-# don't do hundreds of sched_yields; each taking 100ms on RH 9.0 #9277: dafter fix
-thread-yield.diff
-
-# Insert symbol defaults to the Symbol font - not a random one #15512: rc3
-gui-sw-insert-symbol.diff
-
-# Make list boxes clickable on the right of the text's bounds # 17182: rc3
-list-box-click.diff
-
-# Use nicer colors for the charts X#64359
-sc-default-color-modify.diff
-
-# Make cut and paste nicer #15509
-gui-sc-paste.diff
-
-# Make cursor two lines
-gui-sc-cursor.diff
-
-# use fork in tools/source/solar.c to make it work with 2.5/2.6 kernels, #17241
-solar-use-fork.diff
-
-# speedup object movement
-speed-lang-cache.diff
-
-# speedup string compares #29154
-speed-sal-string.diff
-
-# speedup status notifications
-speed-status-bar.diff
-
-# Sensitize show in row/col depending on the selection  #24137 
-sc-show-sensitize.diff
-
-# Fix mind-mangled evo. addressbook path #26309
-evo-addrbook.diff
-
-# Fix disable java problem #27746
-disable-java.diff
-
-# Fix non-java build #31778
-java-build.diff
-
-# Fix build with IBM Java, version 1.4, #32524
-java_build_with_ibm_1_4.diff
-
-# If Java is enabled, ship the XSLT (docbook etc.) bits
-java-use-xslt-filters.diff
-
-# The blackdown .debs put the JDK in /usr/lib/j2se/1.4
-java-path-blackdown.diff
-
-# this is so brain damaged - guess a number/bitfield ...
-doc-defaults.diff
-
-# Allow the document to be re-titled to "" in properties #22340
-doc-retitle.diff
-
-# be a bit helpful ... #8581
-debug-appinit.diff
-
-# tweak Gtk+ theming a little
-# #28798 for the getstyle-gnome bit
-gtk-themeing.diff
-
-# prevent control characters from being included in the
-# reason_phrase field filled in by ne_parse_statusline(), and in
-# the session error string, #30051
-neon-control-characters.diff
-
-# Fix svtools build dependencies #28379
-build-svtools-dep.diff
-
-# Add an ooo-build version in ProductExtension
-version-strike.diff
-
-# Make officecfg parallel-build safe
-officecfg-parallel-build-fix.diff
-
-# dlopen libcrypt.so.1 / libpam.so.0, not librypt.so / libpam.so, #31187
-security-sonames.diff
-
-# do not pack any potential .orig files with ppds
-psprint_config-no-orig.diff
-
-# make libsal v8 on sparc, #30774
-sparc-v8-fixes.diff
-
-# fix lingucomponent memleaks, #30486
-lingucomponent-memleaks.diff
-
-# prompt for save options - X#62182, #33686
-gui-interop-warnings.diff
-
-# fix updating symlinks; the symlink must be removed before it is replaced [X#66902]
-setup2-update-symlink.diff
-
-[ ODKFixes ]
-
-# Fix ODK Java bits
-odk-java-wizpanel.diff
-
-[ IconRender ]
-
-# add support for 32-bit bitmaps and icons.
-bmp32.diff
-# Transfer alpha masks around
-icon-render.diff
-# Make insensitive icons look pleasant
-gui-insensitive.diff
-# high quality interpolate for tbx button selector
-gui-tbxcust.diff
-# image loading needs to split off the alpha mask
-gui-image-load.diff
-# fix some broken icon compositing foo #20470
-icon-masks.diff
-# Compositing fixes for alpha bg's - some (functional) hacks
-gui-icon-composite.diff
-gui-tbx-ctrl-bg.diff
-# Fix htmltoolbar image alpha
-gui-alpha-hypertoolbar.diff
-
-# replace uber-ugly symbols with corresponding images
-# gui-symbol-replace.diff
-
-# make the toolbox separators look saner, mouseover triangles
-# resize & make set large icons as the default.
-# Make tri-states look un-pressed - don't confuse the clients
-# Don't draw uber-ugly prelight mess
-gui-toolbox.diff
-gui-toolbox-large-icons.diff
-gui-toolbox-tristate.diff
-gui-toolbox-prelight.diff
-
-[ FontBits ]
-
-# Don't bloat the ruler et. al. at larger font sizes #22098
-gui-scale-ruler.diff
-
-# Fully destroy resolution adaptive DPI scaling
-gui-font-scale.diff
-
-gui-font-antialias-size.diff
-# undo some horrible mistake #16682
-gui-font-size-unbreak.diff
-
-# Default font size of 8pt is too small
-gui-font-default-size.diff
-
-# Get KDE font weight and size, and use menuFont for menus
-gui-fonts-kde.diff
-
-# These are not included in the OOO_STABLE_1 build
-# - Use the new Freetype API
-# - Use the hinting parameters that we use in the rest of the desktop
-gui-ft-21-compat.patch
-gui-ft-set-hint.patch
-
-[ Misc ]
-
-# fallback to the lang used for menu if we don't have the language
-# requested by LC_MESSAGES; utlimate fallback to the English help, #32505
-help-fallback.diff
-
-# Fix some keybindings
-gui-keybindings.diff
-
-# Don't clutter us with dialogs at startup
-gui-startup-declutter.diff
-
-# Always throw up a new window when we ask for one,
-# instead of brokenly re-using old ones #19712
-# Don't do a 'raise' after load: #19976
-# Disable for now - causes grief with multi-displays etc. pending #19976
-# gui-appear.diff
-
-# Try and make the installer slightly wise to [OO]DESTDIR # 12781
-inst-destdir.diff
-
-# Improve ergonomics of slide / sheet rename #21659
-gui-rename-dlg.diff
-
-# Make the default writer bullet larger #21829
-sw-default-bullet.diff
-
-# Fix loads of styles re-import crasher #26550
-sw-ms-fmt-import.diff
-
-# Fix unicode export to Word95 #33074
-sw-export-word95.diff
-
-# Dramatically improve MS import / export cf. #8276 et. al.
-ms-filter-convert.diff
-
-# A bullet is not a field - at least in MS land it isn't #21916
-sw-bullet-not-field.diff
-
-# The world need not see that I can't spell #21440
-sd-export-no-spell-check.diff
-
-# Save as menuitem for image context menus in impress #13816 gnome #127556
-sd-save-image-context-menu.diff
-
-# mozilla wrapper as complement to nswrapper..., #29514
-desktop-mozwrapper.diff
-
-# Knock 50ms+ off pagein time #23350
-pagein-speedup.diff
-
-# I'm assured this is faster #24997
-pagein-speedup-2.diff
-
-# disable the check box 'Tools/Options/OpenOffice.org/General/Document Status/Printing
-# sets "document modified" status' by default, #15395
-print-do-not-change-document.diff
-
-[ GnomeVFS ]
-
-# New VFS provider stuff ..
-vfs-offapi.diff
-vfs-provider.diff
-vfs-content.diff
-vfs-directory.diff
-vfs-stream.diff
-vfs-uno-register.diff
-vfs-ucp-setup.diff
-vfs-uno-uri.diff
-
-[ Misc ]
-# Some of the new help & other icons we need
-gui-new-icons.diff
-
-[ MenuFixes ]
-
-# Fix menu bloat / icon rendering / layout issues #17937
-gui-menu-fixes.diff
-# Use rendered images for check boxes instead of ugly symbols
-gui-menu-check-images.diff
-gui-menu-check-render.diff
-# Fix menu checkitems, disable rendering of icons when the items unchecked #17937
-gui-menu-checkitems.diff
-
-[ Misc ]
-# fix 'new' button sizing #15208
-gui-tbx-new-size.diff
-
-# Dialog remembers file save path, type & stores type right #17967
-print-dialog.diff
-
-[ FontBits ]
-
-# Disable X font usage (and horrific aliasing) completely
-gui-font-fontconfig-only.diff
-
-# disable font management dialog in padmin
-padmin-nofontconfig.diff
-
-# fix some brokenness with font sync settings #15507, #16683
-gui-ft-use-system-font.diff
-
-[ NovellOnly, RedHatOnly, PLDOnly ]
-# Disable broken crashdialog bits
-module-buildset-crashrep.diff
-
-[ GlobalDesktopFiles ]
-# DebianOnly: we use the generated desktop files by moving them to
-#         the right place in the filesystem
-# RH: we also use generated KDE desktop files and mime-types
-# don't install duff / ugly KDE/Gnome integration bits
-user-desktop-install.diff
-
-# still install the wrapper "fromtemplate", it is needed for SUSE at least
-fromtemplate-wrapper-install.diff
-
-[ Misc ]
-
-# stop the user having to fight ooimpress constantly
-capitalization.diff
-
-# warn the user about printer errors #17966
-print-error.diff
-
-# Add 'Word count' to the Tools menu - i18n issues ? #17964
-word-count.diff
-
-# Replace the Zoom icon with a Combo box in toolbars #11354
-zoom-combobox.diff
-
-# Hide the URI box
-gui-toolbox-cleanup.diff
-
-# Make the delete key happy again in starcalc #17965 - wontfix [!]
-gui-sc-delete.diff
-
-# Don't build simply huge language specific sets
-build-lang-no-pack.diff
-
-# Try to get the font mapping right
-gui-metric-fonts.diff
-# Describe the metric compatible fonts for export mappings
-gui-metric-fonts-descr.diff
-# Use 'Andy' after comicsansms, before kidprint
-font-andy.diff
-
-# use 'OOO_MS_DEFAULTS' to turn on MS compatible export as default
-app-compatible.diff
-
-# Translate File->New, ->Wizard menus when using langpacks #20537
-gui-menu-new-wizard-translations.diff
-
-[ RecentFiles ]
-
-# Add support for the freedesktop.org ~/.recently-used spec. #24253
-recent-files.diff
-
-[ NovellOnly, MinimalOnly, RedHatOnly, PLDOnly ]
-# This needs binning in favour of the debian version I think.
-build-instsetoo-lang.diff
-
-[ DebianOnly ]
-# Temporary until above patch adapted for DebianOnly's needs
-build-instsetoo-langext.diff
-
-[ i18n ]
-
-# Use the environment to determine locale #21191
-i18n-sal.diff
-i18n-rehash.diff
-
-#18157
-i18n-cleanup.diff
-
-# package hungarian help, #29528
-hungarian-help.diff
-
-# build bindi and thai stuff
-i18n-build-hindi-thai.diff
-
-# add translations to sysui and remove bogus ones, #28201
-sysui-translations.diff
-
-# shrink exported ISO_8859_2 & MS_1250 html
-# most people will use UTF-8 and never see this, #19514
-html-8bit-export-shrink.diff
-
-# fix calc .lng file encoding for lang 03, #29504
-i18n-calc-encoding.diff
-
-# Fix silly brokenness in langtab lists - #18826
-translation-shift.diff
-
-[ SystemBits ]
-
-# use system db. 23779 
-system-db.diff
-# use system curl, 23779
-system-curl.diff
-# use system sane.h, 23779
-system-sane.diff
-# use system myspell, 23779
-system-myspell.diff
-# use system altlinuxhyph, 23779
-system-altlinuxhyph.diff
-# use system neon, 23779
-system-neon.diff
-# use system xrender
-system-xrender.diff
-# use system freetype, 23779, 29765
-system-freetype.diff
-# use system unixODBC headers, 23779
-system-unixodbc.diff
-# use system python, not yet complete
-system-python.diff
-# disable FontOOo if we want and build with system mspack
-disable-fontooo.diff
-disable-msfontextract-build.diff
-system-mspack.diff
-
-[ BuildBits ]
-# add --without-fonts, --with-python, --disable-rpath,
-# --enable-mozilla, --enable-fontconfig, --with-system-{zlib,nas,db,freetype}
-# config switches #21920, #23779
-config-switches.diff
-
-# add --without-myspell-dictionaries, #29937
-disable-myspell-dicts.diff
-
-# update aclocal, for AM_PATH_PYTHON
-config-aclocal.diff
-
-# Disable old installation language comparison when upgrading
-setup-no-langcheck.diff
-
-# do not extract vera fonts when we don't want them :-)
-disable-vera-extraction.diff
-
-# Fix the splash to not screwup on redraw #19646
-gui-splash-redraw.diff
-
-# Don't let the splash screen take over #23609
-no-splash-takeover.patch
-
-[ Misc ]
-
-# Icu was patched to include rpath - remove it.
-icu-no-rpath.diff
-
-# Improve the web bullet export / export to png not gif. #23353
-sd-export-html-theme.diff
-sd-export-html.diff
-sd-export-html-translations.diff
-sd-export-html-descr.diff
-
-# Fix the nasty default palette sizing #19158
-gui-tbx-palette.diff
-
-# Don't die with some strange incoming scp #19496
-crash-mapmode.diff
-
-# don't crash re-configuring the status bar #31837
-crash-statusbar.diff
-
-# Fix doc load crasher X#59373, #27243
-crash-sw-import.diff
-
-# Fix .doc import crasher #29731
-crash-sw-redline.diff
-
-# Fix impress spellcheck #32320
-crash-sd-spellcheck.diff
-
-# Fix doc load crasher X#59375
-sw-crash-fix.diff
-
-# Fix doc load crasher X#64030
-sw-import-crash.diff
-
-# Fix checkbox field crash #33980
-crash-sw-checkbox-field.diff
-
-# back-port accelerated bootstrap behavior #8359
-# speed-bootstrap-cache.diff
-
-# Initialize some values
-# cf. #20184 & back-ported from cws_src680_valgrind01
-valgrind-clean.diff
-
-# Make valgrinding easier
-valgrind-alloc.diff
-
-# Make the scroll-wheel / page popup more sane #20826
-gui-sw-scroll.diff
-
-# Disable style-list popup on first startup
-gui-startup-style.diff
-
-# Use 'utility' type for floaters - fixes click-on-panel-task-switch bug
-wm-dialog-utility.diff
-
-# Fix some incorrect assumptions about registers (x86-only)
-asm-fixes.patch
-
-# File->New->Spreadsheet freezes on some versions of GCC
-svx-freeze-fix.patch
-
-# Fix silly crash in escher code & improve export - #26747
-crash-escherex.diff
-
-# fix pyuno for pythons which were compiled with ucs-4 support
-pyuno-ucs-4-fixes.diff
-
-# update pyuno docs from www.oo.o
-pyuno-update-docs.diff
-
-# Make the GUI installer less painful
-setup-license.diff
-
-# Address data source ordering X#62860
-addrbk-datasrc-ordering.diff
-
-[ LinuxOnly ]
-
-# do not pack .orig and .bak files to the english help content
-helpcontent-no-bak.diff
-
-# Optimize linkage of some xmlhelp libraries
-xmlhelp-optimize-linkage.patch
-
-# Fix silly security problem - #33357, X#60965 (CAN-2004-0752)
-security-tmp-dir.diff
-
-[ StartupNotification ]
-
-# Startup notification fixes #18970
-startup-fix.diff
-
-[ DBFixes ]
-# enlarge the mail-merge database view pane - #34297
-db-mail-merge-size.diff
-# don't create duplicate table names in SQL - #34306
-db-duplicate-tables.diff
-
-[ CalcFixes ]
-# egregious calc bug fixes - #25883, #25890
-sc-fn-eng.diff
-# start of improved value compatibility - #25898
-sc-xl-io.diff
-# don't be silly with A1=B2:B2 - #25924
-sc-singleton-intersect.diff
-# allow biff dumping - #25430
-sc-biffdump.diff
-# csv importing copes with embedded new-lines - X#62446, #32966
-sc-csv-newline.diff
-sc-csv-gui.diff
-# add 'merge & center' toolbar button - #33126
-sc-merge-cell.diff
-# Precision improvements - #22811
-sc-precision-var.diff
-sc-precision-skew.diff
-
-[ VBABits ]
-
-# Don't split macro files up gratuitously - #26345
-vba-scanner-fix.diff
-
-# Do a better job of importing Excel macros - #26402, X#64115
-vba-not-comments.diff
-vba-sc-import.diff
-vba-sc-export.diff
-
-# Parse (but ignore) VBA attribute statements
-vba-attribute.diff
-
-# Be VBA compatible always at the expense of StarBasic compatibility
-vba-compatible.diff
-
-# Alt-F11 does something useful - #29138
-vba-keybinding-f11.diff
-
-# Add foreach - #<tocome>
-vba-foreach.diff
-
-# Add bit-shift - #<tocome>
-vba-bitshift.diff
-
-# Export VBA macros - but only to office XP, and that unconditionally
-# vba-export.diff
-# vba-export-dir.diff
-
-#######################################################
-# Patches applied in limited cases
-
-[ XineramaPIC ]
-# use libXinerama_pic.a on all archs
-xinerama-pic-on-all-archs.diff
-
-[ MinimalOnly ]
-# disable odk build since we removed it from the tarball
-disable-odk-build.diff
-
-[ NovellOnly, RedHatOnly ]
-
-# Use bug buddy
-bug-buddy.diff
-
-[ DebianOnly, NovellOnly, RedHatOnly ]
-# Bin nasty bitstream fonts from most (English) mappings
-font-de-bitstreamize-en.diff
-
-# save everything to ~/Documents by default
-path-home-documents.diff
-
-[ OldLibArt ]
-# add missing libart functions for older backports
-build-use-old-libart.diff
-
-#######################################################
-
-[ DebianOnly ]
-
-# Don't statically link setup to libstlport
-stlport-dynamic-link.diff
-
-# set OOO_DEBUG to strace or gdb soffice.bin
-debug-ooo.diff
-
-# readd LZW code since we originally removed the file from the .orig.tar.gz
-readd-lzwc.diff
-
-# compile msgbox-gnome every time (we have to support ppc, s390, ... too)
-# #28798
-compile-msgbox-gnome.diff
-
-# Debian splashscreen
-debian-splash.diff
-
-# disable odk build since we removed it from the tarball
-disable-odk-build.diff
-
-# use sensible-browser
-sensible-browser.diff
-
-# Blackdown JDK doesn't have _01 version suffix
-java-blackdown-ver.diff
-
-#######################################################
-
-[ RedHatOnly ]
-# Munge default fonts to match Red Hat-shipped ones
-#redhat-default-fonts.patch
-
-# Patch to point gnome-vfs to correct RH OOo icons
-redhat-nautilus-icons.patch
-
-# Red Hat splash screen
-redhat-splash.diff
-
-# Use gnome-open to open URIs
-helper-programs-redhat.diff
-
-# Fix up IIIMF support (RH #124538)
-iiimf-multilingual-extension-2-enable.diff
-
-# hackish system-libstdc++ patch
-system-libstdcpp.diff
-
-# mark the files in share/template/<lang>/wizard/bitmap as lang specific
-build-wizard-bitmap-scp.diff
-
-# Push fonts into the ps stream always
-print-type42.diff
-
-# resolution independant printing bits, #29483
-print-resolution-generic.diff
-
-# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is
-# not installed or broken; used for example if OOo is installed from an
-# installation set by ./install --interactive
-gui-font-paranoid-fallback.diff
-
-# Replace "Sun x" colors with "Red Hat x" colors.  Sigh.
-redhat-standard-colors.diff
-
-
-#######################################################
-
-[ NLDOnly ]
-
-# Some branding action
-nld-splash.diff
-
-#######################################################
-
-[ SUSEOnly ]
-
-# some branding
-suse-splash.diff
-
-#######################################################
-
-[ NovellOnly ]
-
-# Integrate external programs; an attempt to propose a vendor independent solution
-# Preset Tools->Options->OpenOffice.org->External
-# programs->(HTTP|HTTPS|FTP|MAILTO) to "desktop-launch"
-helper-programs.diff
-
-# Help -> support X65554
-help-support.diff
-
-# hackish system-libstdc++ patch
-system-libstdcpp.diff
-
-# FIXME: ooo-res seems to be needed only for "Local Installation"
-# which is not well supported with multiple localizations anyway
-# ooo-res is copied to the really used iso-res by gid_Procedure_Copy_Iso_Res
-# this patch updates the procedure to delete the unused ooo-res
-# won't be needed in OOo, version 2.0, #28285
-scp-no-ooo-res.diff
-
-# configure some Japanese fonts used on Novell products
-# (patch by Mike Fabian mfabian@suse.de)
-# FIXME: We should rename this one to novell-cjk-fonts.diff
-novell-japanese-fonts.diff
-
-#######################################################
-
-[ NovellOnly, PLDOnly ]
-
-# mark the files in share/template/<lang>/wizard/bitmap as lang specific
-build-wizard-bitmap-scp.diff
-
-# An hack to install KDE amd Ximian's icons in paralel
-# 1) search also the path defined by the variable OOO_PREFERRED_RESOURCE_PATH
-# for resource files. This path is preferred over the default one.
-# Allows to switch between two versions of resource files at runtime.
-# 2) add one more default path for resources (program/resource.default)
-# This allows to make a symlink to the default resource path which is different
-# from the original resource path. It is needed to allow update of RPM packages.
-# RPM is not able to replace a directory with the symlink within an update.
-resmgr-resource-path.diff
-
-# Push fonts into the ps stream always
-print-type42.diff
-
-# resolution independant printing bits, #29483
-print-resolution-generic.diff
-
-# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is
-# not installed or broken; used for example if OOo is installed from an
-# installation set by ./install --interactive
-gui-font-paranoid-fallback.diff
-
-#######################################################
-
-[ PLDOnly ]
-
-# splash
-pld-splash.diff
-
-#######################################################
-[ ArkOnly ]
-
-# splash / branding
-ark-splash.diff
-
-# hackish system-libstdc++ patch
-system-libstdcpp.diff
-
-#######################################################
-[ Win32Only ]
-
-# A number of nasty VS.Net 2003 fixes #27980
-win32-msvs-2003-configure.diff
-win32-msvs-2003-misc.diff
-win32-msvs-2003-misc2.diff
-win32-msvs-2003-misc3.diff
-win32-msvs-2003-vclplug.diff
-
-# Build berkeleydb with dmake not crack-rock-make #27400
-win32-berkeleydb-toplevel.diff
-win32-berkeleydb-make-patch.diff
-
-# Odd sj2 / sjlib behavior on Win32 - badly fitted for no-java too.
-win32-sjlib.diff
-
-# libart on win32 hack - needs scp support
-win32-libart-build.diff
-win32-internal-libart.diff
-
-# Stephan's fixes from alphaart cws - should be merged with above patches
-win32-bmp32-ssa-fixes.diff
-
-# Accelerate / cache DIB creation ( don't keep doing it )
-win32-bmp32-speedup.diff
-
-# Disable odk build
-disable-odk-build.diff
-
-# Novell splash - prolly belongs in a NovellWin32Only section but ...
-novell-splash.diff
-
-# A number of nasty MSVC6 fixes
-win32-sd-vc6.diff
-
-# This is a pretty nasty IE problem #19510
-win32-activex-disable.diff
-
-# Misc. fixes for java disabled on win32
-win32-nojava.diff
-
-# ODMA support, back-ported from HEAD
-win32-odma.diff
-win32-odma-build.diff
-
-# Scott Clayton's fixes for recent G/W development #32741
-win32-odma-gw-fix.diff
-
-# Novell internal support / file-bug page
-novell-filebug.diff
-
-# Try to trace some strange bug in this
-win32-stlport-build.diff
-
-# Fix alpha cut/paste problem
-win32-transfer-alpha.diff
-
-# Work around stupidity in GW #34264
-win32-gw-send-mail.diff
-
-#######################################################
-
-[ Win32BinConvertDSW ]
-# Attempt to work around ICU evilness ...
-# Not-yet-functional, but desirable:
-win32-icu-config.diff
-win32-icu-make.diff
-win32-icu-build.diff
-
-[ TestGtkIntegration ]
-# Glib / gtk+ integration
-glib-integration.diff
-gtk-integration-salinst.diff
-gtk-integration-saldata.diff
-gtk-integration-saldisp.diff
-
-#######################################################
-
-[ Evo2 ]
-# evolution addressbook driver version 2
-connectivity-source-drivers-evoab1-5-dataaccess-xcu.diff
-connectivity-source-drivers-evoab1-5-evoab1-5-map.diff
-connectivity-source-drivers-evoab1-5-evoab-xml.diff
-connectivity-source-drivers-evoab1-5-makefile-mk.diff
-connectivity-source-drivers-evoab1-5-nconnection-cxx.diff
-connectivity-source-drivers-evoab1-5-nconnection-hxx.diff
-connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff
-connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff
-connectivity-source-drivers-evoab1-5-ndebug-cxx.diff
-connectivity-source-drivers-evoab1-5-ndebug-hxx.diff
-connectivity-source-drivers-evoab1-5-ndriver-cxx.diff
-connectivity-source-drivers-evoab1-5-ndriver-hxx.diff
-connectivity-source-drivers-evoab1-5-npreparedstatement-cxx.diff
-connectivity-source-drivers-evoab1-5-npreparedstatement-hxx.diff
-connectivity-source-drivers-evoab1-5-nresultset-cxx.diff
-connectivity-source-drivers-evoab1-5-nresultset-hxx.diff
-connectivity-source-drivers-evoab1-5-nresultsetmetadata-cxx.diff
-connectivity-source-drivers-evoab1-5-nresultsetmetadata-hxx.diff
-connectivity-source-drivers-evoab1-5-nservices-cxx.diff
-connectivity-source-drivers-evoab1-5-nstatement-cxx.diff
-connectivity-source-drivers-evoab1-5-nstatement-hxx.diff
-connectivity-source-drivers-evoab1-5-ncatalog-cxx.diff
-connectivity-source-drivers-evoab1-5-ncatalog-hxx.diff
-connectivity-source-drivers-evoab1-5-ntables-cxx.diff
-connectivity-source-drivers-evoab1-5-ntables-hxx.diff
-evoab2_default.diff
-evoab2_prj.diff
-evoab2_scp.diff
-
-#######################################################
-
-[ Lotus ]
-# detect SmartSuite97 files
-sc-lotus-filter.diff
-# read basics from SmartSuite97 files
-sc-lotus-code.diff
-
-#######################################################
-
-[ WordPerfect ]
-wpd-scp.diff
-wpd-win32.diff
-wpd-sw-prj.diff
-wpd-sw-iodetect.diff
-wpd-officecfg-typedetection.diff
-libwpd-makefile-mk.diff
-libwpd-prj-d-lst.diff
-libwpd-prj-build-lst.diff
-writerperfect-prj-d-lst.diff
-writerperfect-prj-build-lst.diff
-writerperfect-source-filter-documentelement-cxx.diff
-writerperfect-source-filter-documentelement-hxx.diff
-writerperfect-source-filter-filterinternal-hxx.diff
-writerperfect-source-filter-fontmap-cxx.diff
-writerperfect-source-filter-fontmap-hxx.diff
-writerperfect-source-filter-fontstyle-cxx.diff
-writerperfect-source-filter-fontstyle-hxx.diff
-writerperfect-source-filter-genericfilter-cxx.diff
-writerperfect-source-filter-liststyle-cxx.diff
-writerperfect-source-filter-liststyle-hxx.diff
-writerperfect-source-filter-makefile-mk.diff
-writerperfect-source-filter-pagespan-cxx.diff
-writerperfect-source-filter-pagespan-hxx.diff
-writerperfect-source-filter-sectionstyle-cxx.diff
-writerperfect-source-filter-sectionstyle-hxx.diff
-writerperfect-source-filter-style-hxx.diff
-writerperfect-source-filter-tablestyle-cxx.diff
-writerperfect-source-filter-tablestyle-hxx.diff
-writerperfect-source-filter-textrunstyle-cxx.diff
-writerperfect-source-filter-textrunstyle-hxx.diff
-writerperfect-source-filter-wordperfectcollector-cxx.diff
-writerperfect-source-filter-wordperfectcollector-hxx.diff
-writerperfect-source-filter-wordperfectimportfilter-cxx.diff
-writerperfect-source-filter-wordperfectimportfilter-hxx.diff
-writerperfect-source-filter-writerproperties-hxx.diff
-writerperfect-source-stream-makefile-mk.diff
-writerperfect-source-stream-wpxsvstream-cxx.diff
-writerperfect-source-stream-wpxsvstream-h.diff
-writerperfect-util-makefile-mk.diff
-writerperfect-util-wpft-map.diff
-
-########################################################
-
-[ KDEOnly ]
-# Some "branding"
-kde-splash.diff
-
-########################################################
-
-[ KDEOnly, PLDOnly ]
-# Preset Tools->Options->OpenOffice.org->External
-# programs->(HTTP|HTTPS|FTP|MAILTO) to "kfmclient exec"
-helper-programs-kde.diff
-
-########################################################
-
-[ KDECommon, NovellOnly ]
-# Allow parameters in Tools->Options->OpenOffice.org->External
-# programs->(HTTP|HTTPS|FTP|MAILTO) - #28720
-shellexec_allow_params.diff
-
-########################################################
-
-[ TestLayout ]
-# the beginnings of layout
-gui-window-layout.diff
-gui-control-layout.diff
-# the ends of layout
-layout-ids.diff
-layout-rsc.diff
-layout-vcl-layout.diff
-layout-vcl-window.diff
-layout-test.diff
diff --git a/patches/OOO_1_1_2/config-switches.diff b/patches/OOO_1_1_2/config-switches.diff
deleted file mode 100644
index f23efdfda..000000000
--- a/patches/OOO_1_1_2/config-switches.diff
+++ /dev/null
@@ -1,655 +0,0 @@
-Index: config_office/configure.in
-===================================================================
---- config_office/configure.in.orig	2004-08-14 01:19:26.245183120 +0200
-+++ config_office/configure.in	2004-08-14 01:22:21.372559712 +0200
-@@ -97,6 +97,68 @@ AC_ARG_ENABLE(kde,
- 
-                           Usage: --enable-kde
- ],,)
-+AC_ARG_WITH(system-nas,
-+[  --with-system-nas       Use nas already on system
-+],,)
-+AC_ARG_WITH(system-freetype,
-+   --with-system-freetype  Use freetype already on system
-+],,)
-+AC_ARG_WITH(system-db,
-+[  --with-system-db        Use berkeleydb already on system
-+],,)
-+AC_ARG_WITH(db-version,
-+[  --with-db-version=VERSION       Specify db version manually ],
-+[	DB_VERSION="$withval"
-+	DB_VERSION_MAJOR=$(echo $DB_VERSION | cut -d"." -f1)
-+])
-+AC_ARG_WITH(db-jar,
-+[  --with-db-jar=JARFILE          Specify path to jarfile manually ],
-+[ DB_JAR="$withval"
-+])
-+AC_ARG_WITH(system-sane,
-+[  --with-system-sane-headers      Use sane.h already on system
-+],,)
-+AC_ARG_WITH(system-x11ext,
-+[  --with-system-x11-extensions-headers  Use X11 extensions headers on system
-+],,)
-+AC_ARG_WITH(system-unixodbc,
-+[   --with-system-unixodbc-headers  Use unixODBC headers on system
-+],,)
-+AC_ARG_WITH(system-curl,
-+[  --with-system-curl      Use curl already on system
-+],,)
-+AC_ARG_WITH(system-myspell,
-+[  --with-system-myspell      Use myspell already on system
-+],,)
-+AC_ARG_WITH(system-altlinuxhyph,
-+[  --with-system-altlinuxhyph      Use altlinuxhyph already on system
-+],,)
-+AC_ARG_WITH(system-neon,
-+[  --with-system-neon	    Use system neon 0.23.x
-+],,)
-+AC_ARG_WITH(system-xrender,
-+[  --with-system-xrender           Use system Xrender
-+],,)
-+AC_ARG_WITH(system-libs,
-+[  --with-system-libs      Use libs already on system (enables all
-+                           --with-system-* (_not_ -headers)
-+],,)
-+AC_ARG_WITH(myspell-dicts,
-+[  --without-myspell-dicts   Removes myspell dictionaries from openoffice.org
-+                         installation set, for people building for specific
-+                         distributions where the myspell dictionaries are
-+                         installed from other sources
-+],,)
-+AC_ARG_ENABLE(fontconfig,
-+[  --enable-fontconfig     Enables the use of fontconfig
-+],,)
-+AC_ARG_ENABLE(fontooo,
-+[  --disable-fontooo       Disables FontOOo
-+                           (useful for distributions using fontconfig for OOo)
-+],,enable_fontooo="yes")
-+AC_ARG_WITH(system-mspack,
-+[  --with-system-mspack      Use libmspack already on system
-+],,)
- AC_ARG_WITH(stlport4-home,
- [  --with-stlport4-home    The location that STLport4 is installed in. The STL
-                           header files are assumed to be in stlport4-home/stlport
-@@ -138,6 +200,12 @@ AC_ARG_WITH(perl-home,
-  
-                           Usage: --with-perl-home=<absolute path to Perl 5 home>
- ],,)
-+AC_ARG_WITH(python,
-+[  --with-python           If you want to use the Python on your system, instead of
-+                          the internal version included in the source, use this flag.
-+
-+                          Usage: --with-python[=path-to-python]
-+],,)
- AC_ARG_WITH(cl-home,
- [  --with-cl-home          For Windows NT users, please supply the path
-                           for the Microsoft C/C++ compiler. 
-@@ -869,16 +937,11 @@ if test "$_os" != "WINNT" -o "$WITH_MING
- fi
- 
- dnl ===================================================================
--dnl Check if pam-appl.h is available on Linux or FreeBSD
-+dnl Check if pam_appl.h is available on Linux or FreeBSD
- dnl ===================================================================
- if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
--   AC_MSG_CHECKING([pam_appl.h])
--   if test -f "/usr/include/security/pam_appl.h"; then
--      AC_MSG_RESULT([yes])
--   else
--      AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security])
--      echo "pam_appl.h could not be found in /usr/include/security" >> warn
--   fi
-+   AC_CHECK_HEADER(security/pam_appl.h, [],
-+   [AC_MSG_ERROR([pam_appl.h could not be found. libpam-dev missing?])], [])
- fi
- 
- dnl ===================================================================
-@@ -1321,6 +1384,8 @@ dnl Check whether there's a C++ pre-proc
- if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
-    AC_PROG_CXXCPP
- fi
-+#AC_SUBST(CPP)
-+#AC_SUBST(CXXCPP)
- 
- dnl ===================================================================
- dnl Check whether xmkmf program can be used, x systems only
-@@ -1420,6 +1485,183 @@ fi
- AC_SUBST(SYSTEM_ZLIB)
- 
- dnl ===================================================================
-+dnl Check for system python
-+dnl ===================================================================
-+AC_MSG_CHECKING([which python to use])
-+if test -n "$with_python"; then
-+    AC_MSG_RESULT([external])
-+    if test "$with_python" != "yes"; then
-+        PYTHON="$with_python"
-+    fi
-+    AM_PATH_PYTHON([2.2])
-+
-+    py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+    py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-+
-+    PYTHONHOME="$py_prefix"
-+    PYTHON_CFLAGS="-I$py_prefix/include/python$PYTHON_VERSION"
-+    if test "$py_prefix" != "$py_exec_prefix"; then
-+      PYTHONHOME="$PYTHONHOME:$py_exec_prefix"
-+      PYTHON_CFLAGS="$PYTHON_CFLAGS -I$py_exec_prefix/include/python$PYTHON_VERSION"
-+    fi
-+    save_CPPFLAGS="$CPPFLAGS"
-+    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-+    AC_CHECK_HEADER(Python.h, [],
-+        [AC_MSG_ERROR(Python.h not found. Install python headers/development package.)], [])
-+    CPPFLAGS="$save_CPPFLAGS"
-+
-+    PYMAJOR=$($PYTHON -c "import sys; print sys.version_info[[0]]")
-+    PYMINOR=$($PYTHON -c "import sys; print sys.version_info[[1]]")
-+    PYMICRO=$($PYTHON -c "import sys; print sys.version_info[[2]]")
-+    PYVERSION=$($PYTHON -c "import sys; print '%d.%d.%d' % sys.version_info[[:3]]")
-+else
-+    AC_MSG_RESULT([internal])
-+    SCPDEFS="$SCPDEFS -DWITH_PYTHON"
-+fi
-+AC_SUBST(PYTHON)
-+AC_SUBST(PYTHONHOME)
-+AC_SUBST(PYTHON_CFLAGS)
-+AC_SUBST(PYMAJOR)
-+AC_SUBST(PYMINOR)
-+AC_SUBST(PYMICRO)
-+AC_SUBST(PYVERSION)
-+
-+dnl ===================================================================
-+dnl Check for system db
-+dnl ===================================================================
-+AC_MSG_CHECKING([which db to use])
-+if test -n "$with_system_db" -o -n "$with_system_libs"; then
-+    SYSTEM_DB=YES
-+    AC_MSG_RESULT([external])
-+    if test -z $DB_VERSION && test -z $DB_VERSION_MAJOR; then
-+      AC_CHECK_FILE(/usr/lib/libdb_cxx.so, [],
-+         [AC_MSG_ERROR(no. install db)])
-+      # (almost) all db packages (rpm/deb) I saw have this link pointing to
-+      # libdb-cxx_X.so where X is the first two digits of the db version ..
-+      # and because of that two versions cannot be installed at the same time..
-+      DB_VERSION=$(readlink /usr/lib/libdb_cxx.so \
-+	  | $SED -e s/libdb_cxx-// | $SED -e s/\.so//)
-+      DB_VERSION_MAJOR=$(echo $DB_VERSION | cut -d"." -f1)
-+    fi
-+    AC_MSG_CHECKING([which db version to use])
-+    AC_MSG_RESULT(db$DB_VERSION_MAJOR version $DB_VERSION)
-+    AC_LANG(C++)
-+    AC_CHECK_HEADER(db_cxx.h, [ DB_INCLUDES=/usr/include ],
-+        [
-+             CFLAGS=-I/usr/include/db$DB_VERSION_MAJOR
-+             AC_CHECK_HEADER(db$DB_VERSION_MAJOR/db_cxx.h,
-+             [ DB_INCLUDES=/usr/include/db$DB_VERSION_MAJOR ],
-+             [ AC_MSG_ERROR(no. install the dbDB_VERSION_MAJOR libraries) ], []
-+             )
-+        ], []
-+    )
-+     if test "$enable_java" != "no"; then
-+       if test -z $DB_JAR; then
-+	  # three different naming methods *grumble* Are there even more?
-+         AC_CHECK_FILE(/usr/share/java/db.jar, [ JARVER=0 ],
-+           [
-+             AC_CHECK_FILE(/usr/share/java/db-$DB_VERSION.jar, [ JARVER=1 ],
-+               [ AC_CHECK_FILE(/usr/share/java/libdb$DB_VERSION-java.jar,
-+                   [ JARVER_LONGSTYLE=1 ],
-+                   [ AC_MSG_ERROR(db$DB_VERSION_MAJOR Java bindings not found)]
-+                 )
-+               ]
-+             )
-+           ]
-+         )
-+         if test "$JARVER" = "1"; then
-+           DB_JAR=jar-$DB_VERSION.jar
-+         else
-+           DB_JAR=db.jar
-+         fi
-+         if test "$JARVER_LONGSTYLE" = "1"; then
-+           DB_JAR=libdb$DB_VERSION-java.jar
-+         fi
-+       fi
-+    fi
-+    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_DB=NO
-+    DB_VERSION=$(ls -1 ../berkeleydb/download/db* \
-+       | $SED -e s,\.\./berkeleydb/download/db-,, | $SED -e s,\.tar\.gz,, \
-+       | cut -d"." -f1,2)
-+    DB_VERSION_MAJOR=$(echo $DB_VERSION | cut -d"." -f1)
-+    DB_JAR=db.jar
-+fi
-+SCPDEFS="$SCPDEFS -DDB_VERSION=$DB_VERSION"
-+AC_SUBST(SYSTEM_DB)
-+AC_SUBST(DB_INCLUDES)
-+AC_SUBST(DB_VERSION)
-+AC_SUBST(DB_VERSION_MAJOR)
-+AC_SUBST(DB_JAR)
-+AC_SUBST(SCPDEFS)
-+
-+dnl ===================================================================
-+dnl Check for system neon
-+dnl ===================================================================
-+AC_MSG_CHECKING([which neon to use])
-+if test -z "$without_system_neon"; then
-+    if test -n "$with_system_neon" -o -n "$with_system_libs"; then
-+        AC_MSG_RESULT([external])
-+        AC_PATH_PROG(NEON_CONFIG, neon-config, no)
-+        AC_MSG_CHECKING([whether neon version is 0.23.x])
-+        # check whether we have 0.23.x. 0.24.x is API-incompatible....
-+        NEON_VER=$($NEON_CONFIG --version | $AWK '{print $2}' \
-+            | cut -d"." -f1,2)
-+        if test "$NEON_VER" = "0.23"; then
-+            AC_MSG_RESULT([yes])
-+            SYSTEM_NEON=YES
-+            NEON_CFLAGS="$($NEON_CONFIG --cflags) -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-+            NEON_LIBS=$($NEON_CONFIG --libs)
-+        else
-+            AC_MSG_ERROR([no. neon 0.24.x is API-incompatible. use 0.23.x])
-+        fi
-+    else
-+        AC_MSG_RESULT([internal])
-+        SYSTEM_NEON=NO
-+        NEON_LIBS=-lneon
-+        NEON_CFLAGS=
-+    fi
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_NEON=NO
-+    NEON_LIBS=-lneon
-+    NEON_CFLAGS=
-+fi
-+AC_SUBST(SYSTEM_NEON)
-+AC_SUBST(NEON_LIBS)
-+AC_SUBST(NEON_CFLAGS)
-+
-+dnl ===================================================================
-+dnl Check for system sane
-+dnl ===================================================================
-+AC_MSG_CHECKING([which sane.h to use])
-+if test -n "$with_system_sane_headers"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_SANE_H=YES
-+    AC_CHECK_HEADER(sane/sane.h, [],
-+        [AC_MSG_ERROR(sane.h not found. install the sane headers)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+fi
-+AC_SUBST(SYSTEM_SANE_H)
-+
-+dnl ===================================================================
-+dnl Check for system unixODBC
-+dnl ===================================================================
-+AC_MSG_CHECKING([which unixODBC headers to use])
-+if test -n "$with_system_unixodbc_headers"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_UNIXODBC_H=YES
-+    AC_CHECK_HEADER(sqlext.h, [],
-+        [AC_MSG_ERROR(unixODBC's aqlext.h not found. install the headers)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+fi
-+AC_SUBST(SYSTEM_UNIXODBC_H)
-+
-+dnl ===================================================================
- dnl Check whether the gtk 2.0 libraries are available.
- dnl ===================================================================
- if test -n "$ENABLE_CRASHDUMP" ; then
-@@ -1431,6 +1673,101 @@ if test -n "$ENABLE_CRASHDUMP" ; then
- fi
- 
- dnl ===================================================================
-+dnl Check whether we want to use fontconfig and if the library is
-+dnl available.
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to use fontconfig])
-+if test -n "$enable_fontconfig"; then
-+    AC_MSG_RESULT([yes])
-+    PKG_CHECK_MODULES( FONTCONFIG, fontconfig >= 1.0.1 )
-+    FONTCONFIG_FONTS=YES
-+else
-+    AC_MSG_RESULT([no])
-+    FONTCONFIG_FONTS=NO
-+fi
-+AC_SUBST(FONTCONFIG_FONTS)
-+AC_SUBST(FONTCONFIG_LIBS)
-+
-+dnl ===================================================================
-+dnl Check for system freetype
-+dnl ===================================================================
-+AC_MSG_CHECKING([which freetype to use])
-+if test -n "$with_system_freetype" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_FREETYPE=YES
-+    USE_FREETYPE_CONFIG=NO
-+    PKG_CHECK_MODULES( FREETYPE, freetype2,
-+        [ USE_FREETYPE_CONFIG=NO ],
-+        [ 
-+            AC_PATH_PROG( FREETYPE_CONFIG, freetype-config )
-+            if test -f "$FREETYPE_CONFIG"; then
-+                USE_FREETYPE_CONFIG=YES
-+            fi
-+        ]
-+    )
-+    if test "$USE_FREETYPE_CONFIG" = "YES"; then
-+        FREETYPE_LIBS=$(freetype-config --libs)
-+        FREETYPE_CFLAGS=$(freetype-config --cflags)
-+    fi
-+    SCPDEFS="$SCPDEFS -DSYSTEM_FREETYPE"
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_FREETYPE=NO
-+fi
-+AC_SUBST(SYSTEM_FREETYPE)
-+AC_SUBST(FREETYPE_LIBS)
-+AC_SUBST(FREETYPE_CFLAGS)
-+AC_SUBST(SCPDEFS)
-+
-+dnl ===================================================================
-+dnl Check for system myspell
-+dnl ===================================================================
-+AC_MSG_CHECKING([which myspell to use])
-+if test -n "$with_system_myspell" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_MYSPELL=YES
-+    PKG_CHECK_MODULES( MYSPELL, myspell,
-+      [ MYSPELL_PKGCONFIG=YES ],
-+      [
-+         AC_CHECK_HEADER(myspell/myspell.hxx, [],
-+	     [AC_MSG_ERROR(myspell headers not found.)], [])
-+         MYSPELL_CFLAGS=-I/usr/include/myspell
-+         AC_LANG(C++)
-+         AC_CHECK_LIB(myspell, main, [],
-+           [ AC_MSG_ERROR(myspell library not found.) ], [])
-+         MYSPELL_LIBS=-lmyspell
-+      ]
-+    )
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_MYSPELL=NO
-+    MYSPELL_LIBS=-lmyspell
-+fi
-+AC_SUBST(SYSTEM_MYSPELL)
-+AC_SUBST(MYSPELL_CFLAGS)
-+AC_SUBST(MYSPELL_LIBS)
-+
-+dnl ===================================================================
-+dnl Checking for altlinuxhyph
-+dnl ===================================================================
-+AC_MSG_CHECKING([which altlinuxhyph to use])
-+if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_HYPH=YES
-+    AC_CHECK_HEADER(hyphen.h, [],
-+       [ AC_MSG_ERROR(altlinuxhyph headers not found.)], [])
-+    AC_CHECK_MEMBER(struct _HyphenDict.cset, [],
-+       [ AC_MSG_ERROR(no. You are sure you have altlinuyhyph headers?)],
-+       [#include <hyphen.h>])
-+    AC_CHECK_LIB(hyph, hnj_hyphen_hyphenate, [],
-+        [ AC_MSG_ERROR(altlinuxhyph library not found.)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_HYPH=NO
-+fi
-+AC_SUBST(SYSTEM_HYPH)
-+
-+dnl ===================================================================
- dnl Checks for libraries.
- dnl ===================================================================
- dnl Check for Mac OS X native GUI, which may be used instead of X11.
-@@ -1917,6 +2254,182 @@ AC_SUBST(WITH_FONTS)
- AC_SUBST(SCPDEFS)
- 
- dnl ===================================================================
-+dnl ===================================================================
-+dnl Check whether to build with system XRender
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to use system XRender])
-+if test -n "$with_system_xrender"; then
-+  AC_MSG_RESULT([yes])
-+  SYSTEM_XRENDER=YES
-+  AC_CHECK_LIB(Xrender, XRenderQueryVersion, [],
-+     [AC_MSG_ERROR(Xrender not found or functional)], [])
-+else
-+  AC_MSG_RESULT([no])
-+  SYSTEM_XRENDER=NO
-+fi
-+AC_SUBST(SYSTEM_XRENDER)
-+
-+dnl Test whether to include MySpell dictionaries
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to include MySpell dictionaries])
-+if test -z "$with_myspell_dicts"; then
-+  AC_MSG_RESULT([yes])
-+  WITH_MYSPELL_DICTS=YES
-+else
-+  AC_MSG_RESULT([no])
-+  WITH_MYSPELL_DICTS=NO
-+fi
-+AC_SUBST(WITH_MYSPELL_DICTS)
-+
-+dnl ===================================================================
-+dnl Test whether to include FontOOo
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to include FontOOo])
-+if test -n "$enable_fontooo"; then
-+  if test "$enable_fontooo" = "no"; then
-+    AC_MSG_RESULT([no])
-+    WITH_FONTOOO=NO
-+    SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-+  else
-+    AC_MSG_RESULT([yes])
-+    WITH_FONTOOO=YES
-+  fi
-+else
-+  AC_MSG_RESULT([no])
-+  WITH_FONTOOO=NO
-+  SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-+fi
-+AC_SUBST(WITH_FONTOOO)
-+
-+if test "$WITH_FONTOOO" = "YES"; then
-+  dnl ===============================================================
-+  dnl Check whether to use libmspack from system
-+  dnl ===============================================================
-+  AC_MSG_CHECKING([whether to use system libmspack])
-+  if test -n "$with_system_mspack" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([yes])
-+    SYSTEM_MSPACK=YES
-+    AC_CHECK_HEADER(mspack.h, [],
-+      [AC_MSG_ERROR(mspack.h not found, install libmspack)], [])
-+    AC_CHECK_LIB(mspack, mspack_create_cab_decompressor, [],
-+      [AC_MSG_ERROR(libmspack not installed or functional)], [])
-+  else
-+    AC_MSG_RESULT([no])
-+    SYSTEM_MSPACK=NO
-+  fi
-+fi
-+AC_SUBST(SYSTEM_MSPACK)
-+
-+dnl ==================================================================
-+dnl Check for system nas
-+dnl ===================================================================
-+AC_MSG_CHECKING([which nas to use])
-+if test -n "$with_system_nas" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_NAS=YES
-+    AC_CHECK_HEADER(audio/audiolib.h, [ NAS_INCLUDES=/usr/include ],
-+        [
-+             CFLAGS=-I/usr/X11R6/include
-+             AC_CHECK_HEADER(audio/audiolib.h,
-+                 [ NAS_INCLUDES=/usr/X11R6/include ],
-+                 [ AC_MSG_ERROR(no. install nas) ], []
-+             )
-+        ], []
-+    )
-+    AC_CHECK_LIB(audio, AuOpenServer, [],
-+        [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_NAS=NO
-+fi
-+AC_SUBST(SYSTEM_NAS)
-+AC_SUBST(NAS_INCLUDES)
-+
-+dnl ===================================================================
-+dnl Check for system curl
-+dnl ===================================================================
-+AC_MSG_CHECKING([which curl to use])
-+if test -n "$with_system_curl" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_CURL=YES
-+    AC_CHECK_HEADER(curl/curl.h, [],
-+    [ AC_MSG_ERROR([curl headers not found. install curl])], [])
-+    AC_CHECK_LIB(curl, curl_easy_setopt, [],
-+       [AC_MSG_ERROR(curl not found or functional)], [-L$XLIB -lXt])
-+    SCPDEFS="$SCPDEFS -DSYSTEM_CURL"
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_CURL=NO
-+fi
-+AC_SUBST(SYSTEM_CURL)
-+AC_SUBST(SCPDEFS)
-+
-+dnl ===================================================================
-+dnl Check for system X11 extensions
-+dnl ===================================================================
-+AC_MSG_CHECKING([which X11 extensions headers to use])
-+if test -n "$with_system_x11_extensions_headers"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_X11EXT_H=YES
-+    AC_CHECK_HEADER(X11/extensions/render.h, [],
-+        [AC_MSG_ERROR(X11's render.h not found.)], [])
-+    AC_CHECK_HEADER(X11/extensions/renderproto.h, [],
-+        [AC_MSG_ERROR(X11's renderproto.h not found.)], [])
-+    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
-+        [AC_MSG_ERROR(X11's Xrender.h not found.)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+fi
-+AC_SUBST(SYSTEM_X11EXT_H)
-+
-+AC_MSG_CHECKING([whether and how to use Xinerama])
-+if test "$_os" = "Darwin"; then
-+   USE_XINERAMA=YES
-+   AC_MSG_RESULT([yes])
-+elif test "$_os" = "Linux"; then
-+   if test -f "$XLIB/libXinerama.so" -a -f "$XLIB/libXinerama.a"; then
-+      # we have both versions, let the user decide but use the static one
-+      # per default
-+      USE_XINERAMA=YES
-+      if test -n "$with_dynamic_xinerama" -o "$with_system_libs"; then
-+         XINERAMA_LINK=dynamic
-+      else
-+         XINERAMA_LINK=static
-+      fi
-+   elif test -f "$XLIB/libXinerama.so" -a ! -f "XLIB/libXinerama.a"; then
-+      # we have only the dynamic version
-+      USE_XINERAMA=YES
-+      XINERAMA_LINK=dynamic
-+   elif test -f "$XLIB/libXinerama.a"; then
-+      # static version
-+      if test "`uname -m`" = "i586" -o "`uname -m`" = "i686"; then
-+         USE_XINERAMA=YES
-+         XINERAMA_LINK=static
-+      else
-+         USE_XINERAMA_=NO
-+         XINERAMA_LINK=none
-+      fi
-+   else
-+      # no Xinerama
-+      USE_XINERAMA=NO
-+      XINERAMA_LINK=none
-+   fi
-+   if test "$USE_XINERAMA" = "YES"; then
-+      AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
-+      AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
-+          [AC_MSG_ERROR(Xinerama header not found.)], [])
-+      AC_CHECK_LIB(Xinerama, XineramaIsActive, [],
-+          [AC_MSG_ERROR(Xinerama not functional?)], [-L$XLIB -lXext])
-+   else
-+      AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
-+   fi
-+else
-+   AC_MSG_RESULT([no])
-+fi
-+AC_SUBST(USE_XINERAMA)
-+AC_SUBST(XINERAMA_LINK)
-+
-+dnl ===================================================================
- dnl Test for the presence of Ant and that it works
- dnl ===================================================================
- 
-Index: config_office/set_soenv.in
-===================================================================
---- config_office/set_soenv.in.orig	2004-08-14 01:19:51.354365944 +0200
-+++ config_office/set_soenv.in	2004-08-14 01:23:23.676088136 +0200
-@@ -1310,7 +1310,14 @@ else
- }
- 
- $PYTHONPATH           = '.'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ds.'lib-dynload';
--$PYTHONHOME           = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH';
-+if ("@PYTHON@" eq "")
-+{
-+  $PYTHONHOME           = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH';
-+}
-+else
-+{
-+  $PYTHONHOME		= '@PYTHONHOME@';
-+}
- 
- #
- print "done\n";
-@@ -1734,11 +1741,50 @@ ToFile( "LIBSN_CFLAGS",      "@LIBSN_CFL
- ToFile( "LIBSN_LIBS",        "@LIBSN_LIBS@",       "e" );
- ToFile( "WITH_MOZILLA",      "@WITH_MOZILLA@",     "e" );
- ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
-+ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
-+ToFile( "WITH_FONTOOO",      "@WITH_FONTOOO@",     "e" );
-+ToFile( "SYSTEM_MSPACK",     "@SYSTEM_MSPACK@",    "e" );
-+ToFile( "SYSTEM_PYTHON",     "@PYTHON@",           "e" );
-+ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
-+ToFile( "PYMAJOR",           "@PYMAJOR@",          "e" );
-+ToFile( "PYMINOR",           "@PYMINOR@",          "e" );
-+ToFile( "PYMICRO",           "@PYMICRO@",          "e" );
-+ToFile( "PYVERSION",         "@PYVERSION@",        "e" );
- if ( '@ENABLE_RPATH@' eq "no" ) {
-   ToFile( "LINKFLAGSRUNPATH",'',                   "e" );
- }
- ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
- ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
-+ToFile( "ENABLE_CUPS",       "YES",                "e" );
-+ToFile( "SYSTEM_NAS",        "@SYSTEM_NAS@",       "e" );
-+ToFile( "NAS_INCLUDES",      "@NAS_INCLUDES@",     "e" );
-+ToFile( "FONTCONFIG_FONTS",  "@FONTCONFIG_FONTS@", "e" );
-+ToFile( "FONTCONFIG_LIBS",   "@FONTCONFIG_LIBS@",  "e" );
-+ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
-+ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
-+ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
-+ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
-+ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
-+ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
-+ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
-+ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
-+ToFile( "SYSTEM_SANE_H",     "@SYSTEM_SANE_H@",    "e" );
-+ToFile( "SYSTEM_X11EXT_H",   "@SYSTEM_X11EXT_H@",  "e" );
-+ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
-+ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
-+ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-+ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
-+ToFile( "SYSTEM_MYSPELL",    "@SYSTEM_MYSPELL@",   "e" );
-+ToFile( "MYSPELL_CFLAGS",    "@MYSPELL_CFLAGS@",   "e" );
-+ToFile( "MYSPELL_LIBS",      "@MYSPELL_LIBS@",     "e" );
-+ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
-+ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
-+ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
-+ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
-+ToFile( "SYSTEM_UNIXODBC_H", "@SYSTEM_UNIXODBC_H@","e" );
-+ToFile( "SYSTEM_XRENDER",    "@SYSTEM_XRENDER@",   "e" );
-+#ToFile( "CPP",               "@CPP@",              "e" );
-+#ToFile( "CPPCXX",            "@CPPCXX@",           "e" );
- ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@", "e" );
- ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );
- ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
diff --git a/patches/OOO_1_1_2/crash-statusbar.diff b/patches/OOO_1_1_2/crash-statusbar.diff
deleted file mode 100644
index b9dd962bc..000000000
--- a/patches/OOO_1_1_2/crash-statusbar.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: sfx2/source/statbar/stbmgr.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/statbar/stbmgr.cxx,v
-retrieving revision 1.5
-diff -u -p -u -r1.5 stbmgr.cxx
---- sfx2/source/statbar/stbmgr.cxx	27 Mar 2003 11:28:54 -0000	1.5
-+++ sfx2/source/statbar/stbmgr.cxx	21 Jul 2004 11:26:19 -0000
-@@ -143,6 +143,7 @@ friend class SfxStatusBarManager;
- 
- private:
- 	SfxStatusBarControl* GetItemAt( const MouseEvent &rEvt );
-+    DECL_LINK( ItemRemoved_Impl, void* );
- 
- protected:
- 	virtual void    Click();
-@@ -157,6 +158,7 @@ protected:
- public:
- 					SfxStatusBar_Impl( Window* pParent,
- 									   SfxStatusBarManager& rMgr );
-+					~SfxStatusBar_Impl();
- 	void			Init( SfxStatusBarManager* rMgr );
- 
- 	void			CaptureMouse( SfxStatusBarControl &rCtrl );
-@@ -182,6 +184,29 @@ SfxStatusBar_Impl::SfxStatusBar_Impl( Wi
- 	pLastFocusWin(0)
- {
- 	SetUniqueId( HID_STATUSBAR );
-+
-+	AddEventListener( LINK( this, SfxStatusBar_Impl, ItemRemoved_Impl ) );
-+}
-+
-+SfxStatusBar_Impl::~SfxStatusBar_Impl()
-+{
-+	RemoveEventListener( LINK( this, SfxStatusBar_Impl, ItemRemoved_Impl ) );
-+}
-+
-+IMPL_LINK( SfxStatusBar_Impl, ItemRemoved_Impl, void*, pVoid )
-+{
-+	VclWindowEvent *pEvent = (VclWindowEvent *) pVoid;
-+
-+	if (pEvent)
-+	{
-+		if( pEvent->GetId() == VCLEVENT_STATUSBAR_ITEMREMOVED ||
-+			pEvent->GetId() == VCLEVENT_STATUSBAR_ALLITEMSREMOVED )
-+		{
-+			pLastControl = 0;
-+		}
-+	}
-+
-+    return 0L;
- }
- 
- void SfxStatusBar_Impl::Init( SfxStatusBarManager* p  )
diff --git a/patches/OOO_1_1_2/fpicker-build.diff b/patches/OOO_1_1_2/fpicker-build.diff
deleted file mode 100644
index 02b96fde4..000000000
--- a/patches/OOO_1_1_2/fpicker-build.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: fpicker/prj/build.lst
-===================================================================
-RCS file: /cvs/gsl/fpicker/prj/build.lst,v
-retrieving revision 1.6
-diff -u -p -r1.6 build.lst
---- fpicker/prj/build.lst	14 Feb 2002 13:30:37 -0000	1.6
-+++ fpicker/prj/build.lst	15 Jun 2004 09:22:42 -0000
-@@ -2,4 +2,6 @@ fp	fpicker	:	rdbmaker svtools NULL
- fp	fpicker\source\win32\filepicker		nmake	-	w	fp_win32_filepicker NULL
- fp	fpicker\source\win32\folderpicker	nmake	-	w	fp_win32_folderpicker NULL
- fp  fpicker\source\win32\misc			nmake	-	w	fp_win32_misc fp_win32_filepicker.w fp_win32_folderpicker.w NULL
--fp	fpicker\util						nmake	-	w	fp_util fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
-+fp	fpicker\source\unx					nmake	-	u	fp_unx_common NULL
-+fp	fpicker\source\unx\kde				nmake	-	u	fp_unx_kde_filepicker NULL
-+fp	fpicker\util						nmake	-	all	fp_util fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w fp_unx_common.u fp_unx_kde_filepicker.u NULL
-Index: fpicker/prj/d.lst
-===================================================================
-RCS file: /cvs/gsl/fpicker/prj/d.lst,v
-retrieving revision 1.1
-diff -u -p -r1.1 d.lst
---- fpicker/prj/d.lst	28 Jun 2001 11:06:44 -0000	1.1
-+++ fpicker/prj/d.lst	15 Jun 2004 09:22:42 -0000
-@@ -1,4 +1,8 @@
- ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*
-+..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-+..\%__SRC%\bin\kdefilepicker %_DEST%\bin%_EXT%\kdefilepicker
- 
- ..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
- ..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-+..\source\unx\*.xml %_DEST%\xml%_EXT%\*.xml
-Index: fpicker/util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/fpicker/util/makefile.mk,v
-retrieving revision 1.3
-diff -u -p -r1.3 makefile.mk
---- fpicker/util/makefile.mk	26 Aug 2002 14:03:30 -0000	1.3
-+++ fpicker/util/makefile.mk	15 Jun 2004 09:22:43 -0000
-@@ -143,6 +143,52 @@ DEF2EXPORTFILE=	exports.dxp
- # "$(GUI)"=="WNT"
- .ENDIF			
- 
-+# --- unx -----------------------------------------------------
-+
-+.IF "$(GUIBASE)" == "unx"
-+
-+.IF "$(ENABLE_FPICKER_KDE)" == "TRUE"
-+
-+SHL1TARGET=$(TARGET1)
-+
-+SHL1STDLIBS=$(CPPULIB)\
-+			$(CPPUHELPERLIB)\
-+			$(SALLIB)\
-+			$(VCLLIB)\
-+			$(TOOLSLIB)\
-+			$(SVTOOLLIB)
-+
-+SHL1DEPN=
-+SHL1IMPLIB=i$(SHL1TARGET)
-+
-+SHL1LIBS=$(SLB)$/fps.lib
-+
-+SHL1OBJS=$(SLOFILES)
-+			
-+#SHL1RES=$(RES)$/$(TARGET1).res
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+
-+DEF1NAME=$(SHL1TARGET)
-+DEF1EXPORTFILE=	exports.dxp
-+
-+# kdefilepicker binary
-+
-+APP2TARGET=kdefilepicker
-+
-+APP2STDLIBS=\
-+			$(SALLIB) \
-+			$(FPICKER_KDE_LIBS) -lkio
-+
-+APP2OBJS=\
-+			$(SLO)$/kdecommandthread.obj \
-+			$(SLO)$/kdefilepicker.obj \
-+			$(SLO)$/kdefilepicker.moc.obj \
-+			$(SLO)$/kdefpmain.obj \
-+			$(SLO)$/kdemodalityfilter.obj
-+
-+.ENDIF # "$(ENABLE_FPICKER_KDE)" == "TRUE"
-+
-+.ENDIF # "$(GUIBASE)" == "unx"
- 
- .INCLUDE :  target.mk
- 
diff --git a/patches/OOO_1_1_2/gcc-i18n.diff b/patches/OOO_1_1_2/gcc-i18n.diff
deleted file mode 100644
index a6adc53f2..000000000
--- a/patches/OOO_1_1_2/gcc-i18n.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: solenv/bin/gccinstlib.pl
-===================================================================
-RCS file: /cvs/tools/solenv/bin/gccinstlib.pl,v
-retrieving revision 1.2.50.1
-diff -u -r1.2.50.1 gccinstlib.pl
---- solenv/bin/gccinstlib.pl	16 Mar 2004 10:15:42 -0000	1.2.50.1
-+++ solenv/bin/gccinstlib.pl	16 Aug 2004 10:07:34 -0000
-@@ -74,8 +74,7 @@
- $Dest = pop(@ARGV) || die "No destination to copy to";
- 
- if ($Dest =~ /--help/ || @ARGV < 1) {
--	printf ("Syntax:\n  gcc-instlib <library-in-libpath ...>
--		<destination-dir>\n");
-+    print "Syntax:\n  gcc-instlib <library-in-libpath ...> <destination-dir>\n";
-     exit (0);
- }
- foreach $File (@ARGV) {
-@@ -105,7 +104,7 @@
- 
-     $cc = $ENV{'CC'} || die "No CC environment set";
- 
--    open (GCCOut, "$cc -print-search-dirs|") || die "Failed to exec $cc -print-search-dirs: $!";
-+    open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-search-dirs|") || die "Failed to exec $cc -print-search-dirs: $!";
- 
-     while (<GCCOut>) {
-         if (/^([a-zA-Z]+): [=]{0,1}(.*)/) {
diff --git a/patches/OOO_1_1_2/hungarian-help.diff b/patches/OOO_1_1_2/hungarian-help.diff
deleted file mode 100644
index d1c478ff4..000000000
--- a/patches/OOO_1_1_2/hungarian-help.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- scp/source/office/dir.scp
-+++ scp/source/office/dir.scp
-@@ -967,6 +967,11 @@
-     DosName         = "35";
- End
- 
-+Directory GID_DIR_HELP_36
-+	ParentID		= GID_DIR_HELP;
-+    DosName         = "36";
-+End
-+
- Directory GID_DIR_HELP_37
- 	ParentID		= GID_DIR_HELP;
-     DosName         = "37";
-
---- scp/inc/gid.inc
-+++ scp/inc/gid.inc
-@@ -329,6 +329,7 @@
- #define GID_DIR_HELP_33								gid_Dir_Help_33
- #define GID_DIR_HELP_34                             gid_Dir_Help_34
- #define GID_DIR_HELP_35                             gid_Dir_Help_35
-+#define GID_DIR_HELP_36                             gid_Dir_Help_36
- #define GID_DIR_HELP_37                             gid_Dir_Help_37
- #define GID_DIR_HELP_50                             gid_Dir_Help_50
- #define GID_DIR_HELP_39								gid_Dir_Help_39
diff --git a/patches/OOO_1_1_2/i18n-build-hindi-thai.diff b/patches/OOO_1_1_2/i18n-build-hindi-thai.diff
deleted file mode 100644
index 2fcd9e4df..000000000
--- a/patches/OOO_1_1_2/i18n-build-hindi-thai.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.10.6.8
-diff -u -r1.10.6.8 set_soenv.in
---- config_office/set_soenv.in	3 May 2004 15:26:57 -0000	1.10.6.8
-+++ config_office/set_soenv.in	10 Jun 2004 21:36:25 -0000
-@@ -50,7 +50,7 @@
- #
- # Platform independent constant values.
- my @LANGUAGES = ("AFRIK", "ARAB", "CAT", "CHINSIM", "CHINTRAD", "CZECH", "DAN", "DTCH", "ENUS", "ESTONIAN", "FINN", "FREN", "GREEK", "HEBREW", "HUNG", "ITAL",
--"JAPN", "KOREAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "TURK", "WELSH", "ZULU" ); 
-+"JAPN", "KOREAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "TURK", "WELSH", "ZULU", "THAI", "HINDI" ); 
- my @DICTIONARIES = ("DADK", "DEDE", "ENGB", "ENUS", "ITIT", "RURU" );
- my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
-      $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
diff --git a/patches/OOO_1_1_2/java_build_with_ibm_1_4.diff b/patches/OOO_1_1_2/java_build_with_ibm_1_4.diff
deleted file mode 100644
index 125dae1d3..000000000
--- a/patches/OOO_1_1_2/java_build_with_ibm_1_4.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- config_office/configure.in
-+++ config_office/configure.in
-@@ -1335,6 +1335,14 @@
-         AC_MSG_RESULT([checked (JDK $_jdk)])
-       fi
-       JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
-+
-+      dnl test for the jar archive with core classes
-+      dnl IBM Java, verison 1.4 uses core.jar instead of rt.jar
-+      if test -f "$JAVA_HOME/jre/lib/core.jar" ; then
-+        CORECLASS="core.jar"
-+      else
-+        CORECLASS="rt.jar"
-+      fi
-    else
-       AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
-    fi
-@@ -1351,6 +1359,7 @@
- fi
- AC_SUBST(JAVA_HOME)
- AC_SUBST(JDK)
-+AC_SUBST(CORECLASS)
- AC_SUBST(XSLTPROC)
- 
- dnl ===================================================================
---- config_office/set_soenv.in
-+++ config_office/set_soenv.in
-@@ -374,9 +374,15 @@
-       $CPU            = "I";
-       $CPUNAME        = "INTEL";
-       $DLLSUFFIX      = "li";
--      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
--      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
--      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      if ( '@JDK@' eq 'IBM') {
-+         $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
-+         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-+         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
-+      } else {
-+         $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-+         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-+         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      }
-    }
-    elsif (($machine_type eq "sparc") or ($machine_type eq "sparc64"))
-  
-@@ -868,10 +874,11 @@
- $DMAKEROOT            = '$SOLARENVINC'.$ds."startup";
- # Location of JDK classes .zip file.
- # but in jdk 1.2 it is called rt.jar and it lives in jre/lib
--$CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
-+# and IBM Java, version 1.4 uses core.jar instead of rt.jar
-+$CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds.'@CORECLASS@'.$ps.'.';
- # 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.'.';
-+$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds.'@CORECLASS@'.$ps.'.';
- 
- # Paths to run time shared libraries.
- if ($platform eq "$Solaris") 
diff --git a/patches/OOO_1_1_2/kde-cut-paste-fix.diff b/patches/OOO_1_1_2/kde-cut-paste-fix.diff
deleted file mode 100644
index a938cf67c..000000000
--- a/patches/OOO_1_1_2/kde-cut-paste-fix.diff
+++ /dev/null
@@ -1,257 +0,0 @@
-Index: dtrans/source/X11/X11_selection.hxx
-===================================================================
-RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.hxx,v
-retrieving revision 1.23.10.2
-retrieving revision 1.23.10.2.18.1
-diff -u -p -r1.23.10.2 -r1.23.10.2.18.1
---- dtrans/source/X11/X11_selection.hxx	15 Jan 2004 12:46:17 -0000	1.23.10.2
-+++ dtrans/source/X11/X11_selection.hxx	12 May 2004 12:40:07 -0000	1.23.10.2.18.1
-@@ -236,17 +236,15 @@ namespace x11 {
- 		// property used to transfer the data
- 		struct IncrementalTransfer
- 		{
--			Sequence< sal_Int8 >
--											m_aData;
-+			Sequence< sal_Int8 >			m_aData;
- 			int								m_nBufferPos;
- 			Window							m_aRequestor;
- 			Atom							m_aProperty;
- 			Atom							m_aTarget;
- 			int								m_nFormat;
- 			int								m_nTransferStartTime;
--
--			IncrementalTransfer( const Sequence< sal_Int8 >& rData, Window aRequestor, Atom aProperty, Atom aTarget, int nFormat );
- 		};
-+        int m_nIncrementalThreshold;
- 
- 		// a struct to hold the data associated with a selection
- 		struct Selection
-@@ -431,7 +429,7 @@ namespace x11 {
- 		::std::hash_map< Atom, Selection* >
- 									m_aSelections;
- 		// IncrementalTransfers in progress
--		::std::hash_map< Window, ::std::list< IncrementalTransfer > >
-+		std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >
- 									m_aIncrementals;
- 		
- 		// do not use X11 multithreading capabilities
-Index: dtrans/source/X11/X11_selection.cxx
-===================================================================
-RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.cxx,v
-retrieving revision 1.64.6.3
-retrieving revision 1.64.6.3.12.1
-diff -u -p -r1.64.6.3 -r1.64.6.3.12.1
---- dtrans/source/X11/X11_selection.cxx	26 Jan 2004 17:38:29 -0000	1.64.6.3
-+++ dtrans/source/X11/X11_selection.cxx	12 May 2004 12:40:07 -0000	1.64.6.3.12.1
-@@ -109,7 +109,6 @@
- #include <rtl/tencinfo.h>
- #endif
- 
--#define INCR_MIN_SIZE	1024
- #define INCR_TIMEOUT		5
- 
- #define DRAG_EVENT_MASK	ButtonPressMask			|\
-@@ -238,26 +237,8 @@ rtl_TextEncoding x11::getTextPlainEncodi
- 
- // ------------------------------------------------------------------------
- 
--SelectionManager::IncrementalTransfer::IncrementalTransfer(
--                                                           const Sequence< sal_Int8 >& rData,
--                                                           Window aRequestor,
--                                                           Atom aProperty,
--                                                           Atom aTarget,
--                                                           int nFormat
--                                                           ) :
--		m_aData( rData ),
--		m_aRequestor( aRequestor ),
--		m_aProperty( aProperty ),
--		m_aTarget( aTarget ),
--		m_nFormat( nFormat ),
--		m_nBufferPos( 0 ),
--		m_nTransferStartTime( time( NULL ) )
--{
--}
--
--// ------------------------------------------------------------------------
--
- SelectionManager::SelectionManager() :
-+        m_nIncrementalThreshold( 15*1024 ),
-         m_pDisplay( NULL ),
-         m_aWindow( None ),
-         m_aDropWindow( None ),
-@@ -436,6 +417,11 @@ void SelectionManager::initialize( const
- 			m_aWindow = XCreateSimpleWindow( m_pDisplay, DefaultRootWindow( m_pDisplay ),
- 											 10, 10, 10, 10, 0, 0, 1 );
- 
-+            // initialize threshold for incremetal transfers
-+            // ICCCM says it should be smaller that the max request size
-+            // which in turn is guaranteed to be at least 16k bytes
-+            m_nIncrementalThreshold = XMaxRequestSize( m_pDisplay ) - 1024;
-+
- 			if( m_aWindow )
- 			{
- 				// initialize default cursors
-@@ -1546,24 +1532,43 @@ bool SelectionManager::sendData( Selecti
-     if( bConverted )
-     {
-         // conversion succeeded
--        if( aData.getLength() > INCR_MIN_SIZE )
-+        if( aData.getLength() > m_nIncrementalThreshold )
-         {
- #if OSL_DEBUG_LEVEL > 1
-             fprintf( stderr, "using INCR protocol\n" );
-+            std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor );
-+            if( win_it != m_aIncrementals.end() )
-+            {
-+                std::hash_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property );
-+                if( inc_it != win_it->second.end() )
-+                {
-+                    const IncrementalTransfer& rInc = inc_it->second;
-+                    fprintf( stderr, "premature end and new start for INCR transfer for window 0x%x, property %s, type %s\n",
-+                             rInc.m_aRequestor,
-+                             OUStringToOString( getString( rInc.m_aProperty ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-+                             OUStringToOString( getString( rInc.m_aTarget ), RTL_TEXTENCODING_ISO_8859_1 ).getStr()
-+                             );
-+                }
-+            }
- #endif
--            // use incr protocol
-+
-+            // insert IncrementalTransfer
-+            IncrementalTransfer& rInc	= m_aIncrementals[ requestor ][ property ];
-+            rInc.m_aData				= aData;
-+            rInc.m_nBufferPos			= 0;
-+            rInc.m_aRequestor			= requestor;
-+            rInc.m_aProperty			= property;
-+            rInc.m_aTarget				= target;
-+            rInc.m_nFormat				= nFormat;
-+            rInc.m_nTransferStartTime	= time( NULL );
-+
-+            // use incr protocol, signal start to requestor
-             int nBufferPos = 0;
--            int nMinSize = INCR_MIN_SIZE;
-+            int nMinSize = m_nIncrementalThreshold;
-+            XSelectInput( m_pDisplay, requestor, PropertyChangeMask );
-             XChangeProperty( m_pDisplay, requestor, property,
-                              m_nINCRAtom, 32,  PropModeReplace, (unsigned char*)&nMinSize, 1 );
--            XSelectInput( m_pDisplay, requestor, PropertyChangeMask );
--            IncrementalTransfer aTransfer( aData,
--                                           requestor,
--                                           property,
--                                           target,
--                                           nFormat
--                                           );
--            m_aIncrementals[ requestor ].push_back( aTransfer );
-+            XFlush( m_pDisplay );
-         }
-         else
-             XChangeProperty( m_pDisplay,
-@@ -1907,43 +1912,80 @@ void SelectionManager::handleSendPropert
-     // feed incrementals
-     if( rNotify.state == PropertyDelete )
-     {
--        ::std::hash_map< Window, ::std::list< IncrementalTransfer > >::iterator it;
-+        std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >::iterator it;
-         it = m_aIncrementals.find( rNotify.window );
--        int nCurrentTime = time( NULL );
-         if( it != m_aIncrementals.end() )
-         {
--            ::std::list< IncrementalTransfer >::iterator inc_it = it->second.begin();
--            while( inc_it != it->second.end() )
-+            int nCurrentTime = time( NULL );
-+            std::hash_map< Atom, IncrementalTransfer >::iterator inc_it;
-+            // throw out aborted transfers
-+            std::list< Atom > aTimeouts;
-+            for( inc_it = it->second.begin(); inc_it != it->second.end(); ++inc_it )
-             {
--                bool bDone = false;
--                if( inc_it->m_aProperty == rNotify.atom )
-+                if( (nCurrentTime - inc_it->second.m_nTransferStartTime) > INCR_TIMEOUT )
-                 {
--                    int nBytes = inc_it->m_aData.getLength() - inc_it->m_nBufferPos;
--                    nBytes = nBytes > INCR_MIN_SIZE ? INCR_MIN_SIZE : nBytes;
--                    XChangeProperty(
--                                    m_pDisplay,
--                                    inc_it->m_aRequestor,
--                                    inc_it->m_aProperty,
--                                    inc_it->m_aTarget,
--                                    inc_it->m_nFormat,
--                                    PropModeReplace,
--                                    (const unsigned char*)inc_it->m_aData.getConstArray()+inc_it->m_nBufferPos,
--                                    nBytes/(inc_it->m_nFormat/8) );
--                    inc_it->m_nBufferPos += nBytes;
--                    if( nBytes == 0 )
--                        bDone = true;
-+                    aTimeouts.push_back( inc_it->first );
-+#if OSL_DEBUG_LEVEL > 1
-+                    const IncrementalTransfer& rInc = inc_it->second;
-+                    fprintf( stderr, "timeout on INCR transfer for window 0x%x, property %s, type %s\n",
-+                             rInc.m_aRequestor,
-+                             OUStringToOString( getString( rInc.m_aProperty ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-+                             OUStringToOString( getString( rInc.m_aTarget ), RTL_TEXTENCODING_ISO_8859_1 ).getStr()
-+                             );
-+#endif
-                 }
--                else if( nCurrentTime - inc_it->m_nTransferStartTime > INCR_TIMEOUT )
--                    bDone = true;
--                if( bDone )
-+            }
-+
-+            while( aTimeouts.begin() != aTimeouts.end() )
-+            {
-+                // transfer broken, might even be a new client with the
-+                // same window id
-+                it->second.erase( aTimeouts.front() );
-+                aTimeouts.pop_front();
-+            }
-+
-+            inc_it = it->second.find( rNotify.atom );
-+            if( inc_it != it->second.end() )
-+            {
-+                IncrementalTransfer& rInc = inc_it->second;
-+
-+                int nBytes = rInc.m_aData.getLength() - rInc.m_nBufferPos;
-+                nBytes = (nBytes > m_nIncrementalThreshold) ? m_nIncrementalThreshold : nBytes;
-+                if( nBytes < 0 )  // sanity check
-+                    nBytes = 0;
-+#if OSL_DEBUG_LEVEL > 1
-+                fprintf( stderr, "pushing %d bytes: \"%.*s\"...\n",
-+                         nBytes, nBytes > 32 ? 32 : nBytes,
-+                         (const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos );
-+#endif
-+                
-+                XChangeProperty( m_pDisplay,
-+                                 rInc.m_aRequestor,
-+                                 rInc.m_aProperty,
-+                                 rInc.m_aTarget,
-+                                 rInc.m_nFormat,
-+                                 PropModeReplace,
-+                                 (const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos,
-+                                 nBytes/(rInc.m_nFormat/8) );
-+                rInc.m_nBufferPos += nBytes;
-+                rInc.m_nTransferStartTime = nCurrentTime;
-+
-+                if( nBytes == 0 ) // transfer finished
-                 {
--                    ::std::list< IncrementalTransfer >::iterator temp_it = inc_it;
--                    ++inc_it;
--                    it->second.erase( temp_it );
-+#if OSL_DEBUG_LEVEL > 1
-+                    fprintf( stderr, "finished INCR transfer for window 0x%x, property %s, type %s\n",
-+                             rInc.m_aRequestor,
-+                             OUStringToOString( getString( rInc.m_aProperty ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-+                             OUStringToOString( getString( rInc.m_aTarget ), RTL_TEXTENCODING_ISO_8859_1 ).getStr()
-+                             );
-+#endif
-+                    it->second.erase( inc_it );
-                 }
--                else
--                    ++inc_it;
-+
-             }
-+            // eventually clean up the hash map
-+            if( it->second.begin() == it->second.end() )
-+                m_aIncrementals.erase( it );
-         }
-     }
- }
diff --git a/patches/OOO_1_1_2/lingucomponent-memleaks.diff b/patches/OOO_1_1_2/lingucomponent-memleaks.diff
deleted file mode 100644
index 8c474c25a..000000000
--- a/patches/OOO_1_1_2/lingucomponent-memleaks.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- lingucomponent/source/spellcheck/myspell/affixmgr.cxx.~1.12.14.1.~	Fri May  7 11:48:19 2004
-+++ lingucomponent/source/spellcheck/myspell/affixmgr.cxx	Sun Jun  6 10:34:16 2004
-@@ -763,7 +763,7 @@
- char * AffixMgr::get_compound()
- {
-   if (! compound ) return NULL;
--  return mystrdup(compound);
-+  return compound;
- }
- 
- // utility method to look up root words in hash table
---- lingucomponent/source/spellcheck/myspell/suggestmgr.cxx.~1.7.14.3.~	Fri May  7 11:48:19 2004
-+++ lingucomponent/source/spellcheck/myspell/suggestmgr.cxx	Sat Jun  5 17:08:29 2004
-@@ -375,21 +375,28 @@
-                                         rp->astr, rp->alen);
-         for (int k = 0; k < nw; k++) {
-            sc = ngram(n, word, glst[k].word, NGRAM_ANY_MISMATCH);
--           if (sc > thresh) {
--              if (sc > gscore[lp]) {
--	         if (guess[lp]) free (guess[lp]);
--                 gscore[lp] = sc;
--                 guess[lp] = glst[k].word;
--                 lval = sc;
--                 for (j=0; j < MAX_GUESS; j++)
--	            if (gscore[j] < lval) {
--	               lp = j;
--                       lval = gscore[j];
--	            }
--	      } else {
--                 free (glst[k].word);  
--              }
--	   }            
-+	   if (sc > thresh)
-+	   {
-+		if (sc > gscore[lp])
-+		{
-+			if (guess[lp]) free(guess[lp]);
-+			gscore[lp] = sc;
-+			guess[lp] = glst[k].word;
-+			glst[k].word = NULL;
-+			lval = sc;
-+			for (j=0; j < MAX_GUESS; j++)
-+			{
-+				if (gscore[j] < lval)
-+				{
-+					lp = j;
-+					lval = gscore[j];
-+				}
-+			}
-+		}
-+	   }
-+	   free (glst[k].word);
-+	   glst[k].word = NULL;
-+	   glst[k].allow = 0;
- 	}
-       }
-   }
diff --git a/patches/OOO_1_1_2/neon-control-characters.diff b/patches/OOO_1_1_2/neon-control-characters.diff
deleted file mode 100644
index 473f8b709..000000000
--- a/patches/OOO_1_1_2/neon-control-characters.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- neon/neon.patch.orig	2004-06-08 20:32:52.000000000 +0200
-+++ neon/neon.patch	2004-06-08 20:33:00.369904697 +0200
-@@ -438,3 +438,88 @@
-       /* RFC850/1036 style dates: Sunday, 06-Nov-94 08:49:37 GMT */
-       n = sscanf(date, RFC1036_FORMAT,
-   		wkday, &gmt.tm_mday, mon, &gmt.tm_year,
-+*** misc/neon-0.23.5/src/ne_session.c	2002-09-17 22:08:01.000000000 +0200
-+--- misc/build/neon-0.23.5/src/ne_session.c	2004-06-08 19:21:04.683116987 +0200
-+***************
-+*** 33,38 ****
-+--- 33,40 ----
-+  #include <errno.h>
-+  #endif
-+  
-++ #include <ctype.h> /* for cleanse() */
-++ 
-+  #ifdef NEON_SSL
-+  #include <openssl/ssl.h>
-+  #include <openssl/err.h>
-+***************
-+*** 242,250 ****
-+      uri->scheme = ne_strdup(sess->scheme);
-+  }
-+  
-+  const char *ne_get_error(ne_session *sess)
-+  {
-+!     return sess->error;
-+  }
-+  
-+  void ne_close_connection(ne_session *sess)
-+--- 244,263 ----
-+      uri->scheme = ne_strdup(sess->scheme);
-+  }
-+  
-++ /* Cleanse 'str' of non-printable characters.  Duplicated in
-++  * ne_utils.c for the duration of neon 0.23.x to prevent ABI
-++  * change. */
-++ static char *cleanse(char *str)
-++ {
-++     char *pnt;
-++     for (pnt = str; *pnt; pnt++)
-++         if (iscntrl(*pnt) || !isprint(*pnt)) *pnt = ' ';
-++     return str;
-++ }
-++ 
-+  const char *ne_get_error(ne_session *sess)
-+  {
-+!     return cleanse(sess->error);
-+  }
-+  
-+  void ne_close_connection(ne_session *sess)
-+diff -cr misc/neon-0.23.5/src/ne_utils.c misc/build/neon-0.23.5/src/ne_utils.c
-+*** misc/neon-0.23.5/src/ne_utils.c	2002-07-18 00:19:46.000000000 +0200
-+--- misc/build/neon-0.23.5/src/ne_utils.c	2004-06-08 19:21:04.684116818 +0200
-+***************
-+*** 129,134 ****
-+--- 129,145 ----
-+  #endif
-+  }
-+  
-++ /* Cleanse 'str' of non-printable characters.  Duplicated in
-++  * ne_session.c for the duration of neon 0.23.x to prevent ABI
-++  * change. */
-++ static char *cleanse(char *str)
-++ {
-++     char *pnt;
-++     for (pnt = str; *pnt; pnt++)
-++         if (iscntrl(*pnt) || !isprint(*pnt)) *pnt = ' ';
-++     return str;
-++ }
-++ 
-+  int ne_parse_statusline(const char *status_line, ne_status *st)
-+  {
-+      const char *part;
-+***************
-+*** 177,183 ****
-+      /* Fill in the results */
-+      st->major_version = major;
-+      st->minor_version = minor;
-+!     st->reason_phrase = ne_strdup(part);
-+      st->code = status_code;
-+      st->klass = klass;
-+      return 0;
-+--- 188,194 ----
-+      /* Fill in the results */
-+      st->major_version = major;
-+      st->minor_version = minor;
-+!     st->reason_phrase = cleanse(ne_strdup(part));
-+      st->code = status_code;
-+      st->klass = klass;
-+      return 0;
diff --git a/patches/OOO_1_1_2/readd-lzwc.diff b/patches/OOO_1_1_2/readd-lzwc.diff
deleted file mode 100644
index a11b24fb0..000000000
--- a/patches/OOO_1_1_2/readd-lzwc.diff
+++ /dev/null
@@ -1,290 +0,0 @@
---- /dev/null	2004-04-29 03:59:24.000000000 +0200
-+++ goodies/source/filter.vcl/egif/giflzwc.cxx	2000-09-18 18:30:11.000000000 +0200
-@@ -0,0 +1,287 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 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
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <tools/stream.hxx>
-+#include "giflzwc.hxx"
-+
-+// ----------------------------
-+// - GIFImageDataOutputStream -
-+// ----------------------------
-+
-+class GIFImageDataOutputStream
-+{
-+private:
-+
-+	void		FlushBlockBuf();
-+	inline void	FlushBitsBufsFullBytes();
-+
-+	SvStream&	rStream;
-+	BYTE*		pBlockBuf;
-+	BYTE		nBlockBufSize;
-+	ULONG		nBitsBuf;
-+	USHORT		nBitsBufSize;
-+
-+public:
-+
-+				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
-+				~GIFImageDataOutputStream();
-+
-+	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
-+};
-+
-+// ------------------------------------------------------------------------
-+
-+inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
-+{
-+	while (nBitsBufSize>=8)
-+	{
-+		if( nBlockBufSize==255 )
-+			FlushBlockBuf();
-+
-+		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
-+		nBitsBuf >>= 8;
-+		nBitsBufSize -= 8;
-+	}
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
-+{
-+	if( nBitsBufSize+nCodeLen>32 )
-+		FlushBitsBufsFullBytes();
-+
-+	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
-+	nBitsBufSize += nCodeLen;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
-+		rStream(rGIF)
-+{
-+	pBlockBuf = new BYTE[ 255 ];
-+	nBlockBufSize = 0;
-+	nBitsBufSize = 0;
-+	nBitsBuf = 0;
-+	rStream << nLZWDataSize;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+
-+GIFImageDataOutputStream::~GIFImageDataOutputStream()
-+{
-+	WriteBits(0,7);
-+	FlushBitsBufsFullBytes();
-+	FlushBlockBuf();
-+	rStream << (BYTE)0;
-+	delete[] pBlockBuf;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFImageDataOutputStream::FlushBlockBuf()
-+{
-+	if( nBlockBufSize )
-+	{
-+		rStream << (BYTE) nBlockBufSize;
-+		rStream.Write( pBlockBuf,nBlockBufSize );
-+		nBlockBufSize = 0;
-+	}
-+}
-+
-+// -------------------
-+// - GIFLZWCTreeNode -
-+// -------------------
-+
-+struct GIFLZWCTreeNode
-+{
-+
-+	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
-+	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
-+	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
-+	USHORT				nValue;			// Der Pixelwert
-+};
-+
-+// --------------------
-+// - GIFLZWCompressor -
-+// --------------------
-+
-+GIFLZWCompressor::GIFLZWCompressor()
-+{
-+	pIDOS=NULL;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+GIFLZWCompressor::~GIFLZWCompressor()
-+{
-+	if (pIDOS!=NULL) EndCompression();
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
-+{
-+	if( !pIDOS )
-+	{
-+		USHORT i;
-+
-+		nDataSize = nPixelSize;
-+
-+		if( nDataSize < 2 )
-+			nDataSize=2;
-+
-+		nClearCode=1<<nDataSize;
-+		nEOICode=nClearCode+1;
-+		nTableSize=nEOICode+1;
-+		nCodeSize=nDataSize+1;
-+
-+		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
-+		pTable=new GIFLZWCTreeNode[4096];
-+
-+		for (i=0; i<4096; i++)
-+		{
-+			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
-+			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
-+		}
-+
-+		pPrefix = NULL;
-+		pIDOS->WriteBits( nClearCode,nCodeSize );
-+	}
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
-+{
-+	if( pIDOS )
-+	{
-+		GIFLZWCTreeNode*	p;
-+		USHORT				i;
-+		BYTE				nV;
-+
-+		if( !pPrefix && nSize )
-+		{
-+			pPrefix=pTable+(*pSrc++);
-+			nSize--;
-+		}
-+
-+		while( nSize )
-+		{
-+			nSize--;
-+			nV=*pSrc++;
-+			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
-+			{
-+				if (p->nValue==nV)
-+					break;
-+			}
-+
-+			if( p)
-+				pPrefix=p;
-+			else
-+			{
-+				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-+
-+				if (nTableSize==4096)
-+				{
-+					pIDOS->WriteBits(nClearCode,nCodeSize);
-+
-+					for (i=0; i<nClearCode; i++)
-+						pTable[i].pFirstChild=NULL;
-+
-+					nCodeSize=nDataSize+1;
-+					nTableSize=nEOICode+1;
-+				}
-+				else
-+				{
-+					if(nTableSize==(USHORT)(1<<nCodeSize))
-+						nCodeSize++;
-+
-+					p=pTable+(nTableSize++);
-+					p->pBrother=pPrefix->pFirstChild;
-+					pPrefix->pFirstChild=p;
-+					p->nValue=nV;
-+					p->pFirstChild=NULL;
-+				}
-+
-+				pPrefix=pTable+nV;
-+			}
-+		}
-+	}
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::EndCompression()
-+{
-+	if( pIDOS )
-+	{
-+		if( pPrefix )
-+			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-+
-+		pIDOS->WriteBits( nEOICode,nCodeSize );
-+		delete[] pTable;
-+		delete pIDOS;
-+		pIDOS=NULL;
-+	}
-+}
diff --git a/patches/OOO_1_1_2/security-sonames.diff b/patches/OOO_1_1_2/security-sonames.diff
deleted file mode 100644
index bf907067f..000000000
--- a/patches/OOO_1_1_2/security-sonames.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- sal/osl/unx/security.c-old	2004-05-29 22:10:26.000000000 +0200
-+++ sal/osl/unx/security.c	2004-05-29 22:15:28.000000000 +0200
-@@ -248,7 +248,7 @@
- 		   (but not for PAM-0.66 RH 6.0) */
- 		void *pam_hdl;
- 		
--		pam_hdl = dlopen( "libpam.so", RTLD_GLOBAL | RTLD_LAZY );  
-+		pam_hdl = dlopen( "libpam.so.0" , RTLD_GLOBAL | RTLD_LAZY );  
- 		
- 		if ( pam_hdl != NULL )
- 			pam_module = (sal_PamModule*)calloc( 1, sizeof(sal_PamModule) );
-@@ -341,7 +345,7 @@
- 	{
- 		oslModule crypt_library;
- 
--		crypt_library = osl_psz_loadModule( "libcrypt.so", SAL_LOADMODULE_DEFAULT );  /* never closed */
-+		crypt_library = osl_psz_loadModule( "libcrypt.so.1", SAL_LOADMODULE_DEFAULT );  /* never closed */
- 		if ( crypt_library != NULL )
- 			crypt_sym = (char* (*)(const char *, const char *)) osl_psz_getSymbol(crypt_library, "crypt" );
- 		if ( crypt_sym == NULL ) /* no libcrypt or libcrypt without crypt */
diff --git a/patches/OOO_1_1_2/shellexec_allow_params.diff b/patches/OOO_1_1_2/shellexec_allow_params.diff
deleted file mode 100644
index bdb203306..000000000
--- a/patches/OOO_1_1_2/shellexec_allow_params.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- shell/source/unix/exec/shellexec.cxx	2004-05-04 14:17:59.740508616 +0200
-+++ shell/source/unix/exec/shellexec.cxx	2004-05-04 15:23:15.561213384 +0200
-@@ -294,6 +294,15 @@ void SAL_CALL ShellExec::execute( const 
-         
-         if( aHandler.getLength() )
-         {
-+            OUString aHandlerParams;
-+            
-+            sal_Int32 nParamsIdx = aHandler.indexOf( (sal_Unicode) ' ' );
-+            if ( nParamsIdx > 0 && nParamsIdx < aHandler.getLength() )
-+            {
-+                aHandlerParams = aHandler.copy( nParamsIdx + 1, aHandler.getLength() - nParamsIdx - 1 );
-+                aHandler = aHandler.copy( 0, nParamsIdx );
-+            }
-+	    
-             // search handler in system path if no absolute path given
-             FileBase::searchFileURL( aHandler, OUString(), aHandler );
-             
-@@ -302,12 +311,17 @@ void SAL_CALL ShellExec::execute( const 
-             
-             // due to a possible convertion to file url, 
-             // rebuild command line from scratch
--            OUStringBuffer aBuffer( aHandler.getLength() + aURL.getLength() + 5 );
-+            OUStringBuffer aBuffer( aHandler.getLength() + aURL.getLength() + 6 );
-             
-             aBuffer.append( (sal_Unicode) '\"' );
-             aBuffer.append( aHandler );
-             aBuffer.append( (sal_Unicode) '\"' );
-             aBuffer.append( (sal_Unicode) ' ' );
-+            if ( aHandlerParams.getLength() )
-+            {
-+                aBuffer.append( aHandlerParams );
-+                aBuffer.append( (sal_Unicode) ' ' );
-+            }
-             aBuffer.append( (sal_Unicode) '\'' );
-             aBuffer.append( aURL );
-             aBuffer.append( (sal_Unicode) '\'' );
diff --git a/patches/OOO_1_1_2/sparc-v8-fixes.diff b/patches/OOO_1_1_2/sparc-v8-fixes.diff
deleted file mode 100644
index 6a3e7d095..000000000
--- a/patches/OOO_1_1_2/sparc-v8-fixes.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: sal/osl/unx/util.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/util.c,v
-retrieving revision 1.5
-diff -u -u -r1.5 util.c
---- sal/osl/unx/util.c	2 Jul 2003 13:35:19 -0000	1.5
-+++ sal/osl/unx/util.c	12 Jul 2004 08:02:39 -0000
-@@ -398,3 +398,23 @@
- 
- #endif
- 
-+#if defined ( LINUX ) && defined ( SPARC )
-+#include <sys/utsname.h>
-+void osl_InitSparcV9(void)  __attribute__((constructor));
-+void osl_InterlockedCountSetV9(sal_Bool bV9);
-+/* Determine which machine we are running on (sparc or sparc64)
-+ * The approach is very similar to Solaris.
-+ */
-+void osl_InitSparcV9(void)
-+{
-+	struct utsname name;
-+	int rc;	
-+	rc = uname(&name);
-+	if ( rc != -1 ) {
-+		if ( !strcmp( "sparc", name.machine )) 
-+			return;
-+	osl_InterlockedCountSetV9(sal_True);
-+	}
-+}
-+
-+#endif
-Index: sal/osl/unx/asm/interlck_sparc.s
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/asm/interlck_sparc.s,v
-retrieving revision 1.3
-diff -u -u -r1.3 interlck_sparc.s
---- sal/osl/unx/asm/interlck_sparc.s	28 Apr 2003 17:13:44 -0000	1.3
-+++ sal/osl/unx/asm/interlck_sparc.s	12 Jul 2004 08:02:39 -0000
-@@ -248,7 +248,9 @@
- 
- 1:      ld      [%o0], %o1
-         add     %o1, 1, %o2
--        cas     [%o0], %o1, %o2
-+!       allow linux to build for v8
-+        .word 0xD5E21009 
-+!       cas     [%o0], %o1, %o2
-         cmp     %o1, %o2
-         bne     1b
-         nop                         ! delay slot
-@@ -267,7 +269,9 @@
- 
- 1:      ld      [%o0], %o1
-         sub     %o1, 1, %o2
--        cas     [%o0], %o1, %o2
-+!       allow linux to build for v8
-+        .word 0xD5E21009            
-+!       cas     [%o0], %o1, %o2
-         cmp     %o1, %o2
-         bne     1b
-         nop                         ! delay slot
-@@ -276,4 +280,3 @@
- 
-  .type  osl_decrementInterlockedCountV9,#function
-  .size  osl_decrementInterlockedCountV9,.-osl_decrementInterlockedCountV9
--
-Index: sc/source/core/data/makefile.mk
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/makefile.mk,v
-retrieving revision 1.6.260.3
-diff -u -u -r1.6.260.3 makefile.mk
---- sc/source/core/data/makefile.mk	28 Jan 2004 10:02:07 -0000	1.6.260.3
-+++ sc/source/core/data/makefile.mk	12 Jul 2004 08:02:42 -0000
-@@ -205,7 +205,8 @@
- 		$(SLO)$/table3.obj \
- 		$(SLO)$/table4.obj  \
- 		$(SLO)$/documen4.obj \
--		$(SLO)$/conditio.obj
-+		$(SLO)$/conditio.obj \
-+		$(SLO)$/validat.obj
- .ENDIF
- 
- EXCEPTIONSFILES= \
-Index: solenv/inc/unxlngs.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxlngs.mk,v
-retrieving revision 1.2.50.2
-diff -u -u -r1.2.50.2 unxlngs.mk
---- solenv/inc/unxlngs.mk	30 Mar 2004 13:17:38 -0000	1.2.50.2
-+++ solenv/inc/unxlngs.mk	12 Jul 2004 08:02:55 -0000
-@@ -62,7 +62,7 @@
- 
- # mk file for unxlngs
- ASM=$(CC)
--AFLAGS=-Wa,-Av8plus,-K,PIC -c $(CDEFS)
-+AFLAGS=-Wa,-K,PIC -c $(CDEFS)
- 
- SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
diff --git a/patches/OOO_1_1_2/stlport-compile-fix.diff b/patches/OOO_1_1_2/stlport-compile-fix.diff
deleted file mode 100644
index 282dc11cf..000000000
--- a/patches/OOO_1_1_2/stlport-compile-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- sw/source/ui/frmdlg/frmpage.cxx.orig	2004-03-31 14:55:12.000000000 +0000
-+++ sw/source/ui/frmdlg/frmpage.cxx	2004-03-31 14:55:23.000000000 +0000
-@@ -551,7 +551,7 @@
-     const ::std::vector< String >& rPrev, const ::std::vector< String >& rThis,
-     const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain)
- {
--    ::std::vector< const String >::iterator aIt;
-+    ::std::vector< String >::const_iterator aIt;
-     USHORT nEntry = 0;
-     for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++)
-         nEntry = rBox.InsertEntry(*aIt);
-
diff --git a/patches/OOO_1_1_2/system-curl.diff b/patches/OOO_1_1_2/system-curl.diff
deleted file mode 100644
index ddeca044e..000000000
--- a/patches/OOO_1_1_2/system-curl.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- curl/makefile.mk	16 Jul 2003 17:24:06 -0000	1.8
-+++ curl/makefile.mk	22 Dec 2003 15:07:10 -0000
-@@ -71,6 +71,12 @@
- 
- # --- Files --------------------------------------------------------
- 
-+.IF "$(SYSTEM_CURL)" == "YES"
-+@all:
-+
-+	echo "Using curl already installed on system."
-+.ENDIF
-+
- TARFILE_NAME=curl-7.9.8
- 
- .IF "$(GUI)"=="UNX"
-Index: office/files.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/files.scp,v
-retrieving revision 1.369.16.3.12.3
-diff -u -r1.369.16.3.12.3 files.scp
---- scp/source/office/files.scp	13 Dec 2003 15:36:15 -0000	1.369.16.3.12.3
-+++ scp/source/office/files.scp	22 Dec 2003 19:38:30 -0000
-@@ -938,6 +938,8 @@
-         #endif
- End
- 
-+#ifndef SYSTEM_CURL
-+
- File GID_FILE_LIB_CURL
-         TXT_FILE_BODY;
-         Styles          = (PACKED);
-@@ -949,6 +951,7 @@
-         #endif
- End
- 
-+#endif
- 
- File GID_FILE_LIB_I18NREGEXP
-         TXT_FILE_BODY;
-Index: ftpurl.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftpurl.hxx,v
-retrieving revision 1.11
-diff -u -r1.11 ftpurl.hxx
---- ucb/source/ucp/ftp/ftpurl.hxx	27 Mar 2003 17:26:48 -0000	1.11
-+++ ucb/source/ucp/ftp/ftpurl.hxx	15 Jan 2004 03:16:09 -0000
-@@ -80,6 +80,9 @@
- #include "ftpdirp.hxx"
- #include "ftpcfunc.hxx"
- 
-+#define TRUE 1
-+#define FALSE 0
-+
- namespace ftp {
- 
- 	/** Forward declarations.
-Index: ftphandleprovider.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftphandleprovider.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 ftphandleprovider.hxx
---- ucb/source/ucp/ftp/ftphandleprovider.hxx	15 Oct 2002 09:21:17 -0000	1.2
-+++ ucb/source/ucp/ftp/ftphandleprovider.hxx	20 Jul 2004 22:02:48 -0000
-@@ -1,5 +1,5 @@
- #include <rtl/ustring.hxx>
--#include <curl/types.h>
-+#include <curl/curl.h>
- 
- namespace ftp {
- 	
-Index: ftploaderthread.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftploaderthread.hxx,v
-retrieving revision 1.5
-diff -u -r1.5 ftploaderthread.hxx
---- ucb/source/ucp/ftp/ftploaderthread.hxx	28 Aug 2002 07:23:14 -0000	1.5
-+++ ucb/source/ucp/ftp/ftploaderthread.hxx	20 Jul 2004 22:02:48 -0000
-@@ -71,11 +71,10 @@
- #ifndef _OSL_THREAD_H_
- #include <osl/thread.h>
- #endif
--#ifndef __CURL_TYPES_H
--#include <curl/types.h>
-+#ifndef __CURL_CURL_H
-+#include <curl/curl.h>
- #endif
- 
--
- namespace ftp {
- 	
- 	/** A loaderthread acts as factory for CURL-handles,
diff --git a/patches/OOO_1_1_2/system-freetype.diff b/patches/OOO_1_1_2/system-freetype.diff
deleted file mode 100644
index f60d6a2c7..000000000
--- a/patches/OOO_1_1_2/system-freetype.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- solenv/inc/libs.mk	31 Oct 2003 16:23:21 -0000	1.66.14.1
-+++ solenv/inc/libs.mk	9 Dec 2003 11:50:20 -0000
-@@ -135,9 +135,12 @@
- BSTRPLIB=-lbtstrp
- VCLLIBST=-lvcl
- VCLLIB=$(SVLIB)
--FREETYPELIB=-lfreetype
--FREETYPELIBST=$(STATIC) -lfreetype $(DYNAMIC)
-+.IF "$(SYSTEM_FREETYPE)"!="YES"
-+  FREETYPE_LIBS=-lfreetype
-+.ENDIF
-+FREETYPELIB=$(FREETYPE_LIBS)
-+FREETYPELIBST=$(STATIC) $(FREETYPE_LIBS) $(DYNAMIC)
- XPLIB=-l_xp
- TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
- SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
-
---- vcl/source/glyphs/makefile.mk	15 Feb 2002 15:52:27 -0000	1.5
-+++ vcl/source/glyphs/makefile.mk	9 Dec 2003 11:50:47 -0000
-@@ -73,6 +73,7 @@
- # --- Files --------------------------------------------------------
- 
- .IF "$(USE_BUILTIN_RASTERIZER)" != ""
-+CFLAGS += $(FREETYPE_CFLAGS)
- SLOFILES=\
- 		$(SLO)$/glyphcache.obj		\
- 		$(SLO)$/gcach_rbmp.obj		\
-Index: freetype/makefile.mk
-===================================================================
---- freetype/makefile.mk.orig	2003-05-28 14:41:19.000000000 +0200
-+++ freetype/makefile.mk	2004-01-08 00:48:40.000000000 +0100
-@@ -75,12 +75,12 @@ TARGET=so_freetype
- # the X11 port because there are some header conflicts
- # and linktime conflicts as well.  It is simply less of
- # a headache to use the one provided.
--.IF "$(OS)" == "MACOSX"
-+.IF "$(OS)" == "MACOSX" || "$(SYSTEM_FREETYPE)" == "YES"
- 
- dummy:
--	@echo "Nothing to build for MACOSX"
-+	@echo "Nothing to build for OS $(OS)"
- 
--.ELSE	# "$(OS)" == "MACOSX"
-+.ELSE	# "$(OS)" == "MACOSX" || "$(SYSTEM_FREETYPE)" == "YES"
- 
- TARFILE_NAME=freetype-2.1.4
- 
-Index: scp/source/global/setupzip.scp
-===================================================================
---- scp/source/global/setupzip.scp.orig	2003-12-12 21:11:03.000000000 +0100
-+++ scp/source/global/setupzip.scp	2004-01-08 00:49:26.000000000 +0100
-@@ -556,6 +556,8 @@ End
- 
- #ifdef UNX
- 
-+#ifndef SYSTEM_FREETYPE
-+
- #ifndef MACOSX
- File GID_FILE_LIB_FREETYPE
-     #if defined (LINUX)  &&  ( defined (CLASSIC_FAT_PRODUCT) || defined (OSL_PRODUCT) || defined (FAM_PRODUCT) )
-@@ -573,6 +575,8 @@ File GID_FILE_LIB_FREETYPE
- End
- #endif
- 
-+#endif
-+
- #if defined (OSL_PRODUCT) && !defined(WITHOUT_FONTS)
- STD_FONTUNX_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans)
- #endif
diff --git a/patches/OOO_1_1_2/system-nas.diff b/patches/OOO_1_1_2/system-nas.diff
deleted file mode 100644
index 18eb6a81f..000000000
--- a/patches/OOO_1_1_2/system-nas.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- vcl/unx/source/app/makefile.mk	15 Aug 2003 11:25:34 -0000	1.9.250.1
-+++ vcl/unx/source/app/makefile.mk	6 Dec 2003 19:16:55 -0000
-@@ -116,6 +116,11 @@
- CDEFS+=-DHAVE_LIBSN
- CFLAGS+=$(LIBSN_CFLAGS)
- .ENDIF
- 
-+.IF "$(SYSTEM_NAS)"=="YES"
-+CDEFS+=-DSYSTEM_NAS
-+CFLAGS+=-I$(NAS_INCLUDES)
-+.ENDIF
-+
- .IF "$(OS)$(CPU)" == "SOLARISS"
- .IF "$(COM)"!="GCC"
-
-Index: nas/makefile.mk
-===================================================================
---- nas/makefile.mk.orig	2003-06-12 11:45:13.000000000 +0200
-+++ nas/makefile.mk	2004-08-13 20:36:27.571942400 +0200
-@@ -71,13 +71,14 @@ TARGET=nas
- 
- # --- Files --------------------------------------------------------
- 
--.IF "$(OS)" == "MACOSX" || "$(OS)" == "IRIX"
-+.IF "$(GUI)"!="UNX" || "$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
- 
- dummy:
- 	@echo "Nothing to build for OS $(OS)"
- 
--.ELSE	"$(OS)" == "MACOSX" || "$(OS)" == "IRIX"
-+.ELSE	"$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
- 
-+.IF "$(SYSTEM_NAS)"!="YES"
- TARFILE_NAME=nas-1.6
- 
- PATCH_FILE_NAME=nas-1.6.patch
-@@ -101,11 +102,15 @@ BUILD_FLAGS=CC="$(CC)" CXX="$(CXX)" -j$(
- BUILD_FLAGS=CC="$(CC)" CXX="$(CXX)" 
- .ENDIF
- 
-+.ENDIF
-+
-+.IF "$(SYSTEM_NAS)"!="YES"
- OUT2LIB= \
- 	lib/audio/libaudio.a
- 	
- OUT2INC= \
- 	include/audio/*.h
-+.ENDIF
- 
- .ENDIF			# "$(GUI)"=="UNX"
- 
-Index: vcl/util/makefile.mk
-===================================================================
---- vcl/util/makefile.mk.orig	2004-03-03 15:33:18.000000000 +0100
-+++ vcl/util/makefile.mk	2004-08-13 20:38:35.327520600 +0200
-@@ -311,6 +311,8 @@ SHL1STDLIBS += -lXinerama
- .ENDIF
- 
- .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
-+# some nas versions need -lXt, too
-+SHL1STDLIBS += -lXt
- SHL1STDLIBS += -laudio
- .IF "$(OS)"=="SOLARIS"
- # needed by libaudio.a
diff --git a/patches/OOO_1_1_2/system-neon.diff b/patches/OOO_1_1_2/system-neon.diff
deleted file mode 100644
index e4cd1c01a..000000000
--- a/patches/OOO_1_1_2/system-neon.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- neon/makefile.mk	24 Oct 2002 11:50:58 -0000	1.5
-+++ neon/makefile.mk	3 Mar 2004 01:30:41 -0000
-@@ -71,6 +71,11 @@
- 
- # --- Files --------------------------------------------------------
- 
-+.IF "$(SYSTEM_NEON)" == "YES"
-+@all:
-+	@echo "Using system neon...."
-+.ENDIF
-+
- NEON_NAME=neon-0.23.5
- 
- TARFILE_NAME=$(NEON_NAME)
---- ucb/source/ucp/webdav/makefile.mk	28 Jan 2004 10:15:32 -0000	1.20.4.1
-+++ ucb/source/ucp/webdav/makefile.mk	3 Mar 2004 23:18:51 -0000
-@@ -84,8 +84,12 @@
- .INCLUDE: settings.mk
- .INCLUDE: sv.mk
- 
-+.IF "$(SYSTEM_NEON)" == "YES"
-+CFLAGS+= $(NEON_CFLAGS)
-+.ELSE
- NEONINCDIR=external$/neon
- CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR)
-+.ENDIF
- 
- # --- General -----------------------------------------------------
- 
-Index: NeonSession.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v
-retrieving revision 1.28.4.1
-diff -u -r1.28.4.1 NeonSession.cxx
---- ucb/source/ucp/webdav/NeonSession.cxx	9 Jan 2004 19:07:09 -0000	1.28.4.1
-+++ ucb/source/ucp/webdav/NeonSession.cxx	4 Mar 2004 00:07:29 -0000
-@@ -63,7 +63,11 @@
- 
- #include <string.h>
- 
-+#ifndef USE_DAV_LOCKS
-+#ifndef SYSTEM_NEON
- #include <neon/config.h> /* for USE_DAV_LOCKS */
-+#endif
-+#endif
- 
- #ifndef NE_AUTH_H
- #include <neon/ne_auth.h>
diff --git a/patches/OOO_1_1_2/sysui-translations.diff b/patches/OOO_1_1_2/sysui-translations.diff
deleted file mode 100644
index 126a704fd..000000000
--- a/patches/OOO_1_1_2/sysui-translations.diff
+++ /dev/null
@@ -1,537 +0,0 @@
-Index: documents.ulf
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/share/documents.ulf,v
-retrieving revision 1.7.8.5
-diff -u -r1.7.8.5 documents.ulf
---- sysui/desktop/share/documents.ulf	27 Apr 2004 18:01:05 -0000	1.7.8.5
-+++ sysui/desktop/share/documents.ulf	10 Jun 2004 17:51:01 -0000
-@@ -1,12 +1,11 @@
- [writer]
- en = "%PRODUCTNAME Text Document"
- de = "%PRODUCTNAME Textdokument"
--pt = "%PRODUCTNAME Textdokument"
- el = "%PRODUCTNAME Έγγραφο κειμένου"
- nl = "%PRODUCTNAME Tekstdocument"
- fr = "%PRODUCTNAME Texte"
- es = "Documento de texto de %PRODUCTNAME "
--fi = "%PRODUCTNAME Textdokument"
-+fi = "%PRODUCTNAME Tekstiasiakirja"
- hu = "%PRODUCTNAME-szövegesdokumentum"
- it = "%PRODUCTNAME Documento di testo"
- cs = "Textový dokument %PRODUCTNAME"
-@@ -21,10 +20,7 @@
- zh-TW = "%PRODUCTNAME 文字文件"
- tr = "PRODUCTNAME Metin belgesi"
- ar = "%PRODUCTNAME مستند نص"
--he = "%PRODUCTNAME Textdokument"
--ca = "%PRODUCTNAME Document de text"
--th = "%PRODUCTNAME Textdokument"
--hi-IN = "%PRODUCTNAME Textdokument"
-+ca = "Document de text d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i tekstidokument"
- sl = "Dokument z besedilom programa %PRODUCTNAME"
- ru = "%PRODUCTNAME Текстовый документ"
-@@ -35,13 +31,10 @@
- [writer-template]
- en = "%PRODUCTNAME Text Document Template"
- de = "%PRODUCTNAME Textdokumentvorlage"
--pt = "%PRODUCTNAME Textdokumentvorlage"
--ru = "%PRODUCTNAME Textdokumentvorlage"
--el = "%PRODUCTNAME Textdokumentvorlage"
- nl = "%PRODUCTNAME Tekstdocumentsjabloon"
- fr = "Modèle de texte %PRODUCTNAME"
- es = "Plantilla de documento de texto de %PRODUCTNAME"
--fi = "%PRODUCTNAME Textdokumentvorlage"
-+fi = "%PRODUCTNAME Tekstiasiakirjamalli"
- hu = "%PRODUCTNAME-szövegesdokumentumsablon"
- it = "Modello di documento di testo %PRODUCTNAME"
- cs = "Šablona textového dokumentu %PRODUCTNAME"
-@@ -54,12 +47,7 @@
- ko = "%PRODUCTNAME 텍스트 문서 서식 파일"
- zh-CN = "%PRODUCTNAME 文本文档样式"
- zh-TW = "%PRODUCTNAME 文字文件樣式"
--tr = "%PRODUCTNAME Textdokumentvorlage"
--ar = "%PRODUCTNAME Textdokumentvorlage"
--he = "%PRODUCTNAME Textdokumentvorlage"
--ca = "%PRODUCTNAME Textdokumentvorlage"
--th = "%PRODUCTNAME Textdokumentvorlage"
--hi-IN = "%PRODUCTNAME Textdokumentvorlage"
-+ca = "%PRODUCTNAME Plantilla de document de text d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i tekstidokumendi mall"
- sl = "Predloga dokumenta z besedilom programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya Tokumente ya Sengwalwa"
-@@ -69,13 +57,12 @@
- [writer-global]
- en = "%PRODUCTNAME Master Document"
- de = "%PRODUCTNAME Globaldokument"
--pt = "%PRODUCTNAME Globaldokument"
- ru = "%PRODUCTNAME Составной документ"
- el = "%PRODUCTNAME Kύριο έγγραφο"
- nl = "%PRODUCTNAME Masterdocument"
- fr = "%PRODUCTNAME Document maître"
- es = "Documento maestro de %PRODUCTNAME "
--fi = "%PRODUCTNAME Globaldokument"
-+fi = "%PRODUCTNAME Pääasiakirja"
- hu = "%PRODUCTNAME-fődokumentum"
- it = "%PRODUCTNAME Documento master"
- cs = "Hlavní dokument %PRODUCTNAME"
-@@ -90,10 +77,7 @@
- zh-TW = "%PRODUCTNAME 主控文件"
- tr = "%PRODUCTNAME Ana belge"
- ar = "%PRODUCTNAME مستند شام?"
--he = "%PRODUCTNAME Globaldokument"
--ca = "%PRODUCTNAME Globaldokument"
--th = "%PRODUCTNAME Globaldokument"
--hi-IN = "%PRODUCTNAME Globaldokument"
-+ca = "%PRODUCTNAME "Document mestre d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i põhidokument"
- sl = "Glavni dokument programa %PRODUCTNAME"
- ns = "Tokumente ya Master ya %PRODUCTNAME"
-@@ -103,13 +87,12 @@
- [writer-math]
- en = "%PRODUCTNAME Formula"
- de = "%PRODUCTNAME Formel"
--pt = "%PRODUCTNAME Formel"
- ru = "%PRODUCTNAME Формула"
- el = "%PRODUCTNAME Τύπος"
- nl = "%PRODUCTNAME Formule"
- fr = "%PRODUCTNAME Formule"
- es = "Fórmula %PRODUCTNAME "
--fi = "%PRODUCTNAME Formel"
-+fi = "%PRODUCTNAME Kaava"
- hu = "%PRODUCTNAME-képlet"
- it = "%PRODUCTNAME Formula"
- cs = "Vzorec %PRODUCTNAME"
-@@ -124,10 +107,7 @@
- zh-TW = "%PRODUCTNAME 公式"
- tr = "%PRODUCTNAME Formül"
- ar = "%PRODUCTNAME صيغة"
--he = "%PRODUCTNAME Formel"
--ca = "%PRODUCTNAME Formel"
--th = "%PRODUCTNAME Formel"
--hi-IN = "%PRODUCTNAME Formel"
-+ca = "Fòrmula d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i valem"
- sl = "Formula programa %PRODUCTNAME"
- ns = "Fomula ya %PRODUCTNAME"
-@@ -137,13 +117,12 @@
- [impress]
- en = "%PRODUCTNAME Presentation"
- de = "%PRODUCTNAME Präsentation"
--pt = "%PRODUCTNAME Präsentation"
- ru = "%PRODUCTNAME Презентация"
- el = "%PRODUCTNAME Παρουσίαση"
- nl = "%PRODUCTNAME Presentatie"
- fr = "%PRODUCTNAME Présentation"
--es = "Presentación %PRODUCTNAME "
--fi = "%PRODUCTNAME Präsentation"
-+es = "Presentación %PRODUCTNAME"
-+fi = "%PRODUCTNAME Esitys"
- hu = "%PRODUCTNAME-bemutató"
- it = "%PRODUCTNAME Presentazione"
- cs = "Prezentace %PRODUCTNAME"
-@@ -156,12 +135,7 @@
- ko = "%PRODUCTNAME 프레젠테이션"
- zh-CN = "%PRODUCTNAME 演示文稿"
- zh-TW = "%PRODUCTNAME 簡報"
--tr = "%PRODUCTNAME Pr?sentation"
--ar = "%PRODUCTNAME Pr?sentation"
--he = "%PRODUCTNAME Präsentation"
--ca = "%PRODUCTNAME Pr„sentation"
--th = "%PRODUCTNAME Präsentation"
--hi-IN = "%PRODUCTNAME Präsentation"
-+ca = "Presentació d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i esitlus"
- sl = "Predstavitev programa %PRODUCTNAME"
- ns = "Tlhagišo ya %PRODUCTNAME"
-@@ -171,31 +145,22 @@
- [impress-template]
- en = "%PRODUCTNAME Presentation Template"
- de = "%PRODUCTNAME Präsentationsvorlage"
--pt = "%PRODUCTNAME Präsentationsvorlage"
--ru = "%PRODUCTNAME Pr?sentationsvorlage"
--el = "%PRODUCTNAME Pr?sentationsvorlage"
- nl = "%PRODUCTNAME Presentatiesjabloon"
- fr = "Modèle de présentation %PRODUCTNAME"
- es = "Plantilla de presentación de %PRODUCTNAME"
--fi = "%PRODUCTNAME Präsentationsvorlage"
-+fi = "%PRODUCTNAME Esitysmalli"
- hu = "%PRODUCTNAME-bemutatósablon"
- it = "Modello di presentazione %PRODUCTNAME"
- cs = "Šablona prezentace %PRODUCTNAME"
- sk = "Šablóna prezentácie %PRODUCTNAME"
- da = "%PRODUCTNAME-præsentationsskabelon"
- sv = "%PRODUCTNAME-presentationsmall"
--pl = "%PRODUCTNAME Präsentationsvorlage"
- pt-BR = "Modelo de apresentação %PRODUCTNAME"
- ja = "%PRODUCTNAME プレゼンテーション テンプレート"
- ko = "%PRODUCTNAME 프레젠테이션 서식 파일"
- zh-CN = "%PRODUCTNAME 演示文稿样式"
- zh-TW = "%PRODUCTNAME 簡報樣式"
--tr = "%PRODUCTNAME Präsentationsvorlage"
--ar = "%PRODUCTNAME Pr?sentationsvorlage"
--he = "%PRODUCTNAME Präsentationsvorlage"
--ca = "%PRODUCTNAME Präsentationsvorlage"
--th = "%PRODUCTNAME Präsentationsvorlage"
--hi-IN = "%PRODUCTNAME Präsentationsvorlage"
-+ca = ""Plantilla de presentació d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i esitluse mall"
- sl = "Predloga predstavitve programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya Tlhagišo"
-@@ -205,13 +170,12 @@
- [draw]
- en = "%PRODUCTNAME Drawing"
- de = "%PRODUCTNAME Zeichnung"
--pt = "%PRODUCTNAME Zeichnung"
- ru = "%PRODUCTNAME Рисунок"
- el = "%PRODUCTNAME Σχέδιο"
- nl = "%PRODUCTNAME Tekening"
- fr = "%PRODUCTNAME Dessin"
- es = "Dibujo %PRODUCTNAME"
--fi = "%PRODUCTNAME Zeichnung"
-+fi = "%PRODUCTNAME Piirros"
- hu = "%PRODUCTNAME-rajz"
- it = "%PRODUCTNAME Disegno"
- cs = "Kresba %PRODUCTNAME"
-@@ -226,10 +190,7 @@
- zh-TW = "%PRODUCTNAME 繪圖"
- tr = "%PRODUCTNAME Çizim"
- ar = "%PRODUCTNAME رسم"
--he = "%PRODUCTNAME Zeichnung"
--ca = "%PRODUCTNAME Dibuix"
--th = "%PRODUCTNAME Zeichnung"
--hi-IN = "%PRODUCTNAME Zeichnung"
-+ca = "Dibuix d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i joonistus"
- sl = "Risba programa %PRODUCTNAME"
- ns = "Go thala ga %PRODUCTNAME"
-@@ -239,31 +200,22 @@
- [draw-template]
- en = "%PRODUCTNAME Drawing Template"
- de = "%PRODUCTNAME Zeichnungsvorlage"
--pt = "%PRODUCTNAME Zeichnungsvorlage"
--ru = "%PRODUCTNAME Zeichnungsvorlage"
--el = "%PRODUCTNAME Zeichnungsvorlage"
- nl = "%PRODUCTNAME Tekeningsjabloon"
- fr = "Modèle de dessin %PRODUCTNAME"
- es = "Plantilla de dibujo de %PRODUCTNAME"
--fi = "%PRODUCTNAME Zeichnungsvorlage"
-+fi = "%PRODUCTNAME Piirrosmalli"
- hu = "%PRODUCTNAME-rajzsablon"
- it = "Modello di disegno %PRODUCTNAME"
- cs = "Šablona kresby %PRODUCTNAME"
- sk = "Šablóna kresby %PRODUCTNAME"
- da = "%PRODUCTNAME-tegningsskabelon"
- sv = "%PRODUCTNAME-teckningsmall"
--pl = "%PRODUCTNAME Zeichnungsvorlage"
- pt-BR = "Modelo de desenho %PRODUCTNAME"
- ja = "%PRODUCTNAME 図形描画テンプレート"
- ko = "%PRODUCTNAME 그리기 서식 파일"
- zh-CN = "%PRODUCTNAME 绘图样式"
- zh-TW = "%PRODUCTNAME 繪圖樣式"
--tr = "%PRODUCTNAME Zeichnungsvorlage"
--ar = "%PRODUCTNAME Zeichnungsvorlage"
--he = "%PRODUCTNAME Zeichnungsvorlage"
--ca = "%PRODUCTNAME Zeichnungsvorlage"
--th = "%PRODUCTNAME Zeichnungsvorlage"
--hi-IN = "%PRODUCTNAME Zeichnungsvorlage"
-+ca = "Plantilla de dibuix d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i joonistuse mall"
- sl = "Predloga risbe programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya go Thala"
-@@ -273,13 +225,12 @@
- [calc]
- en = "%PRODUCTNAME Spreadsheet"
- de = "%PRODUCTNAME Tabelle"
--pt = "%PRODUCTNAME Tabelle"
- ru = "%PRODUCTNAME Электронная таблица"
- el = "%PRODUCTNAME Πίνακας"
- nl = "%PRODUCTNAME Tabel"
- fr = "%PRODUCTNAME Classeur"
--es = "Hoja de cálculo de %PRODUCTNAME "
--fi = "%PRODUCTNAME Tabelle"
-+es = "Hoja de cálculo de %PRODUCTNAME"
-+fi = "%PRODUCTNAME Laskentataulukko"
- hu = "%PRODUCTNAME-munkafüzet"
- it = "%PRODUCTNAME Tabella"
- cs = "Sešit %PRODUCTNAME"
-@@ -293,11 +244,7 @@
- zh-CN = "%PRODUCTNAME 工作表"
- zh-TW = "%PRODUCTNAME 工作表"
- tr = "%PRODUCTNAME Tablo"
--ar = "%PRODUCTNAME Tabelle"
--he = "%PRODUCTNAME Tabelle"
--ca = "%PRODUCTNAME Tabelle"
--th = "%PRODUCTNAME Tabelle"
--hi-IN = "%PRODUCTNAME Tabelle"
-+ca = "Fulla de c�| lcul d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i arvutustabel"
- sl = "Preglednica programa %PRODUCTNAME"
- ns = "Pampiri ya go anega ya %PRODUCTNAME"
-@@ -307,31 +254,22 @@
- [calc-template]
- en = "%PRODUCTNAME Spreadsheet Template"
- de = "%PRODUCTNAME Tabellenvorlage"
--pt = "%PRODUCTNAME Tabellenvorlage"
--ru = "%PRODUCTNAME Tabellenvorlage"
--el = "%PRODUCTNAME Tabellenvorlage"
- nl = "%PRODUCTNAME Werkbladsjabloon"
- fr = "Modèle de classeur %PRODUCTNAME"
- es = "Plantilla de hoja de cálculo de %PRODUCTNAME"
--fi = "%PRODUCTNAME Tabellenvorlage"
-+fi = "%PRODUCTNAME Laskentataulukkomalli"
- hu = "%PRODUCTNAME-munkafüzetsablon"
- it = "Modello di foglio elettronico %PRODUCTNAME"
- cs = "Šablona sešitu %PRODUCTNAME"
- sk = "Šablóna tabuľky %PRODUCTNAME"
- da = "%PRODUCTNAME-regnearksskabelon"
- sv = "%PRODUCTNAME-tabellmall"
--pl = "%PRODUCTNAME Tabellenvorlage"
- pt-BR = "Modelo de planilha %PRODUCTNAME"
- ja = "%PRODUCTNAME 表計算テンプレート"
- ko = "%PRODUCTNAME 스프레드시트 서식 파일"
- zh-CN = "%PRODUCTNAME 工作表样式"
- zh-TW = "%PRODUCTNAME 工作表樣式"
--tr = "%PRODUCTNAME Tabellenvorlage"
--ar = "%PRODUCTNAME Tabellenvorlage"
--he = "%PRODUCTNAME Tabellenvorlage"
--ca = "%PRODUCTNAME Tabellenvorlage"
--th = "%PRODUCTNAME Tabellenvorlage"
--hi-IN = "%PRODUCTNAME Tabellenvorlage"
-+ca = "Plantilla de fulla de c�| lcul d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i arvutustabeli mall"
- sl = "Predloga preglednice programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya Pampiri ya go Anega"
-Index: launcher_comment.ulf
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/share/launcher_comment.ulf,v
-retrieving revision 1.8.8.6
-diff -u -r1.8.8.6 launcher_comment.ulf
---- sysui/desktop/share/launcher_comment.ulf	27 Apr 2004 18:01:17 -0000	1.8.8.6
-+++ sysui/desktop/share/launcher_comment.ulf	10 Jun 2004 17:51:01 -0000
-@@ -1,13 +1,12 @@
- [writer]
- en = "%PRODUCTNAME Text Document"
- de = "%PRODUCTNAME Textdokument"
--pt = "%PRODUCTNAME Textdokument"
- ru = "%PRODUCTNAME Текстовый документ"
- el = "%PRODUCTNAME Έγγραφο κειμένου"
- nl = "%PRODUCTNAME Tekstdocument"
- fr = "%PRODUCTNAME Texte"
--es = "Documento de texto %PRODUCTNAME "
--fi = "%PRODUCTNAME Textdokument"
-+es = "Documento de texto %PRODUCTNAME"
-+fi = "%PRODUCTNAME Tekstiasiakirja"
- hu = "%PRODUCTNAME-szövegesdokumentum"
- it = "%PRODUCTNAME Documento di testo"
- cs = "Textový dokument %PRODUCTNAME"
-@@ -22,10 +21,7 @@
- zh-TW = "%PRODUCTNAME 文字文件"
- tr = "PRODUCTNAME Metin belgesi"
- ar = "%PRODUCTNAME مستند نص"
--he = "%PRODUCTNAME Textdokument"
--ca = "%PRODUCTNAME Document de text"
--th = "%PRODUCTNAME Textdokument"
--hi-IN = "%PRODUCTNAME Textdokument"
-+ca = "Document de text d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i tekstidokument"
- sl = "Dokument z besedilom programa %PRODUCTNAME"
- cy = "Dogfen Testun %PRODUCTNAME"
-@@ -36,13 +32,12 @@
- [web]
- en = "%PRODUCTNAME HTML Document"
- de = "%PRODUCTNAME HTML Dokument"
--pt = "%PRODUCTNAME HTML Dokument"
- ru = "%PRODUCTNAME HTML-документ"
- el = "%PRODUCTNAME Έγγραφο HTML"
- nl = "%PRODUCTNAME HTML-document"
- fr = "%PRODUCTNAME Document HTML"
--es = "Documento HTML %PRODUCTNAME "
--fi = "%PRODUCTNAME HTML Dokument"
-+es = "Documento HTML %PRODUCTNAME"
-+fi = "%PRODUCTNAME HTML-asiakirja"
- hu = "%PRODUCTNAME HTML-dokumentum"
- it = "%PRODUCTNAME Documento HTML"
- cs = "HTML dokument %PRODUCTNAME"
-@@ -55,12 +50,7 @@
- ko = "%PRODUCTNAME HTML 문서"
- zh-CN = "%PRODUCTNAME HTML 文档"
- zh-TW = "%PRODUCTNAME HTML 文件"
--tr = "%PRODUCTNAME HTML Dokument"
--ar = "%PRODUCTNAME HTML Dokument"
--he = "%PRODUCTNAME HTML Dokument"
--ca = "%PRODUCTNAME HTML Dokument"
--th = "%PRODUCTNAME HTML Dokument"
--hi-IN = "%PRODUCTNAME HTML Dokument"
-+ca = "Document HTML d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i HTML-dokument"
- sl = "HTML dokument programa %PRODUCTNAME"
- ns = "Tokumente ya HTML ya %PRODUCTNAME"
-@@ -70,13 +60,12 @@
- [impress]
- en = "%PRODUCTNAME Presentation"
- de = "%PRODUCTNAME Präsentation"
--pt = "%PRODUCTNAME Präsentation"
- ru = "%PRODUCTNAME Презентация"
- el = "%PRODUCTNAME Παρουσίαση"
- nl = "%PRODUCTNAME Presentatie"
- fr = "%PRODUCTNAME Présentation"
--es = "Presentación %PRODUCTNAME "
--fi = "%PRODUCTNAME Präsentation"
-+es = "Presentación %PRODUCTNAME"
-+fi = "%PRODUCTNAME Esitys"
- hu = "%PRODUCTNAME-bemutató"
- it = "%PRODUCTNAME Presentazione"
- cs = "Prezentace %PRODUCTNAME"
-@@ -89,12 +78,7 @@
- ko = "%PRODUCTNAME 프레젠테이션"
- zh-CN = "%PRODUCTNAME 演示文稿"
- zh-TW = "%PRODUCTNAME 簡報"
--tr = "%PRODUCTNAME Pr?sentation"
--ar = "%PRODUCTNAME Pr?sentation"
--he = "%PRODUCTNAME Präsentation"
--ca = "%PRODUCTNAME Pr„sentation"
--th = "%PRODUCTNAME Präsentation"
--hi-IN = "%PRODUCTNAME Präsentation"
-+ca = "Presentació d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i esitlus"
- sl = "Predstavitev programa %PRODUCTNAME"
- ns = "Tlhagišo ya %PRODUCTNAME"
-@@ -110,7 +94,7 @@
- nl = "%PRODUCTNAME Tekening"
- fr = "%PRODUCTNAME Dessin"
- es = "Dibujo %PRODUCTNAME"
--fi = "%PRODUCTNAME Zeichnung"
-+fi = "%PRODUCTNAME Pirros"
- hu = "%PRODUCTNAME-rajz"
- it = "%PRODUCTNAME Disegno"
- cs = "Kresba %PRODUCTNAME"
-@@ -126,7 +110,7 @@
- tr = "%PRODUCTNAME Çizim"
- ar = "%PRODUCTNAME رسم"
- he = "%PRODUCTNAME Zeichnung"
--ca = "%PRODUCTNAME Dibuix"
-+ca = "Dibuix d'%PRODUCTNAME"
- th = "%PRODUCTNAME Zeichnung"
- hi-IN = "%PRODUCTNAME Zeichnung"
- et = "%PRODUCTNAME-i joonistus"
-@@ -138,13 +122,12 @@
- [calc]
- en = "%PRODUCTNAME Spreadsheet"
- de = "%PRODUCTNAME Tabelle"
--pt = "%PRODUCTNAME Tabelle"
- ru = "%PRODUCTNAME Электронная таблица"
- el = "%PRODUCTNAME Πίνακας"
- nl = "%PRODUCTNAME Tabel"
- fr = "%PRODUCTNAME Classeur"
- es = "Hoja de cálculo %PRODUCTNAME"
--fi = "%PRODUCTNAME Tabelle"
-+fi = "%PRODUCTNAME Laskentataulukko"
- hu = "PRODUCTNAME-munkafüzet"
- it = "%PRODUCTNAME Tabella"
- cs = "Sešit %PRODUCTNAME"
-@@ -158,11 +141,7 @@
- zh-CN = "%PRODUCTNAME 工作表"
- zh-TW = "%PRODUCTNAME 工作表"
- tr = "%PRODUCTNAME Tablo"
--ar = "%PRODUCTNAME Tabelle"
--he = "%PRODUCTNAME Tabelle"
--ca = "%PRODUCTNAME Tabelle"
--th = "%PRODUCTNAME Tabelle"
--hi-IN = "%PRODUCTNAME Tabelle"
-+ca = "Fulla de c�| lcul d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i arvutustabel"
- sl = "Preglednica programa %PRODUCTNAME"
- ns = "Pampiri ya go anega ya %PRODUCTNAME"
-@@ -172,13 +151,12 @@
- [math]
- en = "%PRODUCTNAME Formula"
- de = "%PRODUCTNAME Formel"
--pt = "%PRODUCTNAME Formel"
- ru = "%PRODUCTNAME Формула"
- el = "%PRODUCTNAME Τύπος"
- nl = "%PRODUCTNAME Formule"
- fr = "%PRODUCTNAME Formule"
- es = "Fórmula %PRODUCTNAME "
--fi = "%PRODUCTNAME Formel"
-+fi = "%PRODUCTNAME Kaava"
- hu = "%PRODUCTNAME-képlet"
- it = "%PRODUCTNAME Formula"
- cs = "Vzorec %PRODUCTNAME"
-@@ -193,10 +171,7 @@
- zh-TW = "%PRODUCTNAME 公式"
- tr = "%PRODUCTNAME Formül"
- ar = "%PRODUCTNAME صيغة"
--he = "%PRODUCTNAME Formel"
--ca = "%PRODUCTNAME Formel"
--th = "%PRODUCTNAME Formel"
--hi-IN = "%PRODUCTNAME Formel"
-+ca = "Fòrmula d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i valem"
- sl = "Formula programa %PRODUCTNAME"
- ns = "Fomula ya %PRODUCTNAME"
-Index: launcher_name.ulf
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/share/launcher_name.ulf,v
-retrieving revision 1.7.8.5
-diff -u -r1.7.8.5 launcher_name.ulf
---- sysui/desktop/share/launcher_name.ulf	27 Apr 2004 18:01:32 -0000	1.7.8.5
-+++ sysui/desktop/share/launcher_name.ulf	10 Jun 2004 17:51:01 -0000
-@@ -1,13 +1,11 @@
- [printeradmin]
- en = "%PRODUCTNAME Printer Administration"
- de = "%PRODUCTNAME Drucker Verwaltung"
--pt = "%PRODUCTNAME Drucker Verwaltung"
- ru = "%PRODUCTNAME Управление принтером"
--el = "%PRODUCTNAME Drucker Verwaltung"
- nl = "%PRODUCTNAME printerbeheer"
- fr = "%PRODUCTNAME Gestion des imprimantes"
--es = "Administración de la impresora de %PRODUCTNAME "
--fi = "%PRODUCTNAME Drucker Verwaltung"
-+es = "Administración de la impresora de %PRODUCTNAME
-+fi = "%PRODUCTNAME Tulostinhallinta"
- hu = "%PRODUCTNAME Nyomtatókezelés"
- it = "%PRODUCTNAME Gestione stampanti"
- cs = "Administrace tiskáren %PRODUCTNAME"
-@@ -21,11 +19,7 @@
- zh-CN = "%PRODUCTNAME 打印机管理"
- zh-TW = "%PRODUCTNAME 印表機管理"
- tr = "%PRODUCTNAME Printer Administration"
--ar = "%PRODUCTNAME Drucker Verwaltung"
--he = "%PRODUCTNAME Drucker Verwaltung"
--ca = "%PRODUCTNAME Drucker Verwaltung"
--th = "%PRODUCTNAME Drucker Verwaltung"
--hi-IN = "%PRODUCTNAME Drucker Verwaltung"
-+ca = "Administració d'impressó d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i printerite haldamine"
- sl = "%PRODUCTNAME nastavitve tiskalnika"
- cy = "Gweinyddiad Argraffu %PRODUCTNAME"
-@@ -36,13 +30,12 @@
- [template]
- en = "%PRODUCTNAME From Template"
- de = "%PRODUCTNAME Aus Vorlage"
--pt = "%PRODUCTNAME Aus Vorlage"
- ru = "%PRODUCTNAME Из шаблона"
- el = "%PRODUCTNAME Από πρότυπο"
- nl = "%PRODUCTNAME Uit sjabloon"
- fr = "À partir d'un modèle %PRODUCTNAME"
- es = "A partir de una plantilla de %PRODUCTNAME"
--fi = "%PRODUCTNAME Aus Vorlage"
-+fi = "%PRODUCTNAME Asiakirjamallipohjasta"
- hu = "%PRODUCTNAME sablonból"
- it = "%PRODUCTNAME Da modello"
- cs = "Ze šablony %PRODUCTNAME"
-@@ -55,12 +48,7 @@
- ko = "%PRODUCTNAME 서식 파일로부터"
- zh-CN = "%PRODUCTNAME 采用样式"
- zh-TW = "%PRODUCTNAME 採用樣式"
--tr = "%PRODUCTNAME Aus Vorlage"
--ar = "%PRODUCTNAME Aus Vorlage"
--he = "%PRODUCTNAME Aus Vorlage"
--ca = "%PRODUCTNAME Aus Vorlage"
--th = "%PRODUCTNAME Aus Vorlage"
--hi-IN = "%PRODUCTNAME Aus Vorlage"
-+ca = "Des d'una plantilla d'%PRODUCTNAME"
- et = "%PRODUCTNAME mallist"
- sl = "%PRODUCTNAME iz predloge"
- ns = "%PRODUCTNAME go tšwa go Template"
diff --git a/patches/OOO_1_1_2/vcl-arabic-fallback.diff b/patches/OOO_1_1_2/vcl-arabic-fallback.diff
deleted file mode 100644
index 33cc5574f..000000000
--- a/patches/OOO_1_1_2/vcl-arabic-fallback.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-===================================================================
-RCS file: /opt/sourcecast/data/ccvs/repository/gsl/vcl/source/gdi/sallayout.cxx,v
-retrieving revision 1.46.10.6
-retrieving revision 1.46.10.6.8.1
-diff -u -r1.46.10.6 -r1.46.10.6.8.1
---- vcl/source/gdi/sallayout.cxx	2004/04/07 11:02:20	1.46.10.6
-+++ vcl/source/gdi/sallayout.cxx	2004/05/03 11:04:49	1.46.10.6.8.1
-@@ -822,9 +822,10 @@
-                 nXPosMax = nXPos;
-         }
- 
--        // rightmost cluster edge is leftmost edge of next cluster
-+        // when the current cluster overlaps with the next one assume
-+        // rightmost cluster edge is the leftmost edge of next cluster
-         if( (i > 0) && (nXPosMax > pG[1].maLinearPos.X()) )
--            nXPosMax = pG->maLinearPos.X();
-+            nXPosMax = pG[1].maLinearPos.X();
- 
-         // character width is sum of glyph cluster widths
-         pCharWidths[n] += nXPosMax - nXPosMin;
diff --git a/patches/OOO_1_1_2/vcl-xinerama-link-dynamic.diff b/patches/OOO_1_1_2/vcl-xinerama-link-dynamic.diff
deleted file mode 100644
index 3f239eb7c..000000000
--- a/patches/OOO_1_1_2/vcl-xinerama-link-dynamic.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: vcl/unx/source/app/makefile.mk
-===================================================================
---- vcl/unx/source/app/makefile.mk.orig	2004-08-13 21:12:07.124680944 +0200
-+++ vcl/unx/source/app/makefile.mk	2004-08-14 01:13:03.649346528 +0200
-@@ -116,6 +116,11 @@ CDEFS+=-DHAVE_LIBSN
- CFLAGS+=$(LIBSN_CFLAGS)
- .ENDIF
- 
-+
-+.IF "$(USE_XINERAMA)" != "NO"
-+CDEFS+=-DUSE_XINERAMA
-+.ENDIF
-+
- .IF "$(OS)$(CPU)" == "SOLARISS"
- .IF "$(COM)"!="GCC"
- SLOFILES+=$(SLO)$/getfpsols.obj
-Index: vcl/unx/source/app/saldisp.cxx
-===================================================================
---- vcl/unx/source/app/saldisp.cxx.orig	2004-08-13 21:12:07.142678208 +0200
-+++ vcl/unx/source/app/saldisp.cxx	2004-08-14 01:13:03.670343336 +0200
-@@ -235,7 +235,7 @@ extern "C" { int gethostname(char*,int);
- 
- #include <X11/Xatom.h>
- #ifndef SOLARIS
--#if defined(X86) || defined(MACOSX)
-+#ifdef USE_XINERAMA
- #include <X11/extensions/Xinerama.h>
- #endif
- #endif
-@@ -3029,6 +3029,7 @@ void SalDisplay::GetScreenFontResolution
- 
- void SalDisplay::InitXinerama()
- {
-+#ifdef USE_XINERAMA
- #if defined( SOLARIS )
-     // do this load on call for benefit of Solaris < 8
-     rtl::OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libXext.so" ) );
-@@ -3088,6 +3089,7 @@ void SalDisplay::InitXinerama()
-     }
- #endif
- #endif
-+#endif
- #ifdef DEBUG
-     if( m_bXinerama )
-     {
-Index: vcl/util/makefile.mk
-===================================================================
---- vcl/util/makefile.mk.orig	2004-08-14 01:12:59.544970488 +0200
-+++ vcl/util/makefile.mk	2004-08-14 01:13:03.672343032 +0200
-@@ -298,9 +298,13 @@ SHL1STDLIBS += -lXext -lSM -lICE -lX11
- .IF "$(USE_XPRINT)" == "TRUE"
- SHL1STDLIBS += -lXp -lXext -lSM -lICE -lX11
- .ELSE
--.IF "$(CPU)" == "I"
-+.IF "$(USE_XINERAMA)" != "NO"
-+.IF "$(XINERAMA_LINK)" == "dynamic"
-+SHL1STDLIBS += -lXinerama
-+.ELSE
- SHL1STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic 
--.ENDIF
-+.ENDIF          # $(XINERAMA_LINK)
-+.ENDIF          # $(USE_XINERAMA)
- SHL1STDLIBS += -lXext -lSM -lICE -lX11
- .ENDIF          # "$(USE_XPRINT)" == "TRUE"
- .ENDIF          # "$(OS)"=="SOLARIS"
diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-makefile-mk.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-makefile-mk.diff
index 9ca8e7d35..754a87a76 100644
--- a/patches/evo2/connectivity-source-drivers-evoab1-5-makefile-mk.diff
+++ b/patches/evo2/connectivity-source-drivers-evoab1-5-makefile-mk.diff
@@ -124,7 +124,7 @@
 +.IF "$(DBFILELIB)" == ""
 +SHL1STDLIBS+= ifile$(UPD).lib
 +.ENDIF
-+SHL1STDLIBS+=`pkg-config --libs libebook-1.0 `
++SHL1STDLIBS+=`pkg-config --libs libebook-1.0` -lgobject-2.0
 +
 +SHL1DEPN=
 +SHL1IMPLIB=	i$(TARGET)
diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-ndriver-cxx.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-ndriver-cxx.diff
index f600c983f..59964db9a 100644
--- a/patches/evo2/connectivity-source-drivers-evoab1-5-ndriver-cxx.diff
+++ b/patches/evo2/connectivity-source-drivers-evoab1-5-ndriver-cxx.diff
@@ -1,6 +1,6 @@
---- /dev/null	
-+++ connectivity/source/drivers/evoab1.5/NDriver.cxx	
-@@ -0,0 +1,283 @@
+--- /dev/null	2004-07-26 17:21:14.000000000 +0530
++++ connectivity/source/drivers/evoab1.5/NDriver.cxx	2004-11-05 18:21:39.405400816 +0530
+@@ -0,0 +1,270 @@
 +/*************************************************************************
 + *
 + *  The Contents of this file are made available subject to the terms of
@@ -201,19 +201,7 @@
 +sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const ::rtl::OUString& url )
 +	throw(SQLException, RuntimeException)
 +{
-+	
-+	sal_Bool bRet;
-+	bRet = sal_False;
-+	
-+	//return acceptsURL_Stat(url);
-+	//raise(SIGSTOP);
-+	/* verfiy the corrent evo  api version and check the uri parsing in it */
-+	// here we have to look if we support this url format
-+	
-+	acceptsURL_Stat(url);
-+	return sal_True;
-+	
-+	//	return bRet; 
++	return acceptsURL_Stat(url);
 +}
 +
 +// --------------------------------------------------------------------------------
@@ -259,8 +247,7 @@
 +	else
 +		aAddrbookScheme = aAddrbookURI.copy(0, nLen);
 +	
-+	if  ( ( aAddrbookScheme.compareToAscii( getSDBC_SCHEME_EVOLUTION() ) == 0 ) || 
-+	      ( aAddrbookScheme.compareToAscii( getSDBC_SCHEME_LDAP() ) == 0 )  ) 
++	if  ( aAddrbookScheme.compareToAscii( getSDBC_SCHEME_EVOLUTION() ) == 0 )  
 +		return sal_True;
 +	else
 +		return sal_False;
diff --git a/patches/mscodec/mscodec-sw-11x.diff b/patches/mscodec/mscodec-sw-11x.diff
new file mode 100644
index 000000000..f12b88c3b
--- /dev/null
+++ b/patches/mscodec/mscodec-sw-11x.diff
@@ -0,0 +1,601 @@
+--- sw/source/filter/ww8/ww8par.hxx	2004-07-21 19:26:51.000000000 +0100
++++ sw/source/filter/ww8/ww8par.hxx	2004-09-02 13:24:39.507825616 +0100
+@@ -1173,8 +1173,10 @@
+ 	//This converts MS Asian Typography information into OOo's
+ 	void ImportDopTypography(const WW8DopTypography &rTypo);
+ 
+-	ULONG LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss);
++    ULONG LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss);
++    ULONG SetSubStreams(SvStorageStreamRef &rTableStream, SvStorageStreamRef &rDataStream);
++    ULONG CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos);
+ 
+ 	bool StartTable(WW8_CP nStartCp);
+     bool InEqualApo(int nLvl) const;
+
+--- sw/source/filter/ww8/ww8scan.hxx	2004-07-21 19:26:52.000000000 +0100
++++ sw/source/filter/ww8/ww8scan.hxx	2004-09-02 13:26:15.593218416 +0100
+@@ -1052,8 +1052,8 @@
+ 
+ 
+ 	UINT16 nFibBack; 	// 0xc
+-	INT16 lKey1; 			// 0xe  file encrypted key, only valid if fEncrypted.
+-	INT16 lKey2; 			// 0x10  key in 2 Portionen wg. Misalignment
++    UINT16 nHash;       // 0xe  file encrypted hash
++    UINT16 nKey;        // 0x10  file encrypted key
+ 	UINT8 envr;			// 0x12 environment in which file was created
+ 									//      0 created by Win Word / 1 created by Mac Word
+ 	BYTE fMac              :1;			// 0x13 when 1, this file was last saved in the Mac environment
+
+--- sw/source/filter/ww8/ww8scan.cxx	2004-07-21 19:26:52.000000000 +0100
++++ sw/source/filter/ww8/ww8scan.cxx	2004-09-02 13:28:42.632864992 +0100
+@@ -4952,8 +4952,8 @@
+ 	rSt >> aBits1;
+ 	rSt >> aBits2;
+ 	rSt >> nFibBack;
+-	rSt >> lKey1;
+-	rSt >> lKey2;
++	rSt >> nHash;
++	rSt >> nKey;
+ 	rSt >> envr;
+ 	rSt >> aVer8Bits1;		// unter Ver67  nur leeres Reservefeld
+                             // Inhalt von aVer8Bits1
+@@ -5319,8 +5319,8 @@
+ 	Set_UInt16( pData, nBits16 );
+ 
+ 	Set_UInt16( pData, nFibBack );
+-	Set_UInt16( pData, lKey1 );
+-	Set_UInt16( pData, lKey2 );
++	Set_UInt16( pData, nHash );
++	Set_UInt16( pData, nKey );
+ 	Set_UInt8( pData, envr );
+ 
+ 	BYTE nBits8 = 0;
+
+--- sw/source/filter/ww8/ww8par.cxx	2004-11-04 03:25:37.000000000 +0000
++++ sw/source/filter/ww8/ww8par.cxx	2004-11-04 04:09:55.379687045 +0000
+@@ -75,13 +75,28 @@
+ #include <rtl/tencinfo.h>
+ #endif
+ 
+-#ifndef _SVSTOR_HXX //autogen
++#ifndef _SVSTOR_HXX
+ #include <so3/svstor.hxx>
+ #endif
+ 
+-#ifndef _SFXDOCINF_HXX //autogen
++#ifndef _SFXDOCINF_HXX
+ #include <sfx2/docinf.hxx>
+ #endif
++#ifndef _SFXDOCFILE_HXX
++#include <sfx2/docfile.hxx>
++#endif
++
++#ifndef _URLOBJ_HXX
++#include <tools/urlobj.hxx>
++#endif
++#ifndef _UNOTOOLS_TEMPFILE_HXX
++#include <unotools/tempfile.hxx>
++#endif
++#ifndef _SFXECODE_HXX
++#include <svtools/sfxecode.hxx>
++#endif
++
++#include <svtools/docpasswdrequest.hxx>
+ 
+ #ifndef _OFA_FLTRCFG_HXX
+ #include <offmgr/fltrcfg.hxx>
+@@ -127,6 +142,12 @@
+ #ifndef _MSDFFIMP_HXX
+ #include <svx/msdffimp.hxx>
+ #endif
++#ifndef _SVXERR_HXX
++#include <svx/svxerr.hxx>
++#endif
++#ifndef SVX_MSCODEC_HXX
++#include <svx/mscodec.hxx>
++#endif
+ 
+ #ifndef _FMTFLD_HXX
+ #include <fmtfld.hxx>
+@@ -234,6 +255,12 @@
+ #ifndef _COM_SUN_STAR_I18N_FORBIDDENCHARACTERS_HPP_
+ #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
+ #endif
++#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
++#include <com/sun/star/task/XInteractionHandler.hpp>
++#endif
++#ifndef _COM_SUN_STAR_TASK_XINTERACTIONREQUEST_HPP_
++#include <com/sun/star/task/XInteractionRequest.hpp>
++#endif
+ #ifndef _COMPHELPER_EXTRACT_HXX_
+ #include <comphelper/extract.hxx>
+ #endif
+@@ -2758,14 +2785,14 @@
+     }
+ }
+ 
+-ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss)
++ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
+ {
+ 	ULONG nErrRet = 0;
+ 
+ 	if (mbNewDoc && pStg && !pGloss)
+ 		ReadDocInfo();
+ 
+-	pPaM = new SwPaM( *rPaM.GetPoint() );
++	pPaM = new SwPaM( rPos );
+ 
+ 	pCtrlStck = new SwWW8FltControlStack( &rDoc, nFieldFlags, *this );
+ 
+@@ -2786,33 +2813,6 @@
+ 
+ 	USHORT eMode = REDLINE_SHOW_INSERT;
+ 
+-	// enum-para mitgeben, welche Versions-Nummern erlaubt sind: ww6, ww8, ...
+-
+-	if (pGloss)
+-		pWwFib = pGloss->GetFib();
+-	else
+-		pWwFib = new WW8Fib( *pStrm, nWantedVersion );	// Fib einlesen
+-
+-	if ( pWwFib->nFibError )
+-	{			// ERR_NO_WW8_FILE
+-		nErrRet = ERR_SWG_READ_ERROR;				// oder ERR_SW6_READ_ERROR
+-	}
+-	else if( pWwFib->fEncrypted )
+-	{
+-		nErrRet = ERR_SW6_PASSWD;					// gecryptet geht nicht
+-
+-
+-
+-		// Annotation:  Crypted files  C O U L D  be imported if we used the methods
+-		//              provided by Caolan Mc Nammara.
+-		//              Written permission (my e-mail) was given by him
+-		//              but no special document has been signed...
+-		//              27. Sept. 1999, K.-H. Zimmer
+-
+-
+-	}
+-	else
+-	{
+         mpSprmParser = new wwSprmParser(pWwFib->nVersion);
+ 
+ 		// praktische Hilfsvariablen besetzen:
+@@ -2823,68 +2823,20 @@
+ 		bVer7  =  (7 == pWwFib->nVersion);
+ 		bVer8  =  (8 == pWwFib->nVersion);
+ 
+-		SvStorageStreamRef xTableStream, xDataStream;
+-
+-		// Nachdem wir nun den FIB eingelesen haben, wissen wir ja,
+-		// welcher Table-Stream gueltig ist.
+-		// Diesen oeffnen wir nun.
+-
+-		// 6 stands for "6 OR 7",  7 stand for "ONLY 7"
+-		switch( pWwFib->nVersion )
+-		{
+-		case 6:
+-		case 7: pTableStream = pStrm;
+-				pDataStream = pStrm;
+-				break;
+-
+-        case 8:
+-                {
+-            if( !pStg )
+-            {
+-                ASSERT( pStg, "Version 8 muss immer einen Storage haben!" );
+-                nErrRet = ERR_SWG_READ_ERROR;
+-                break;
+-            }
+-
+-            xTableStream = pStg->OpenStream( String::CreateFromAscii(
+-                pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table),
+-                STREAM_STD_READ );
+-
+-            pTableStream = &xTableStream;
+-            pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+-
+-            xDataStream = pStg->OpenStream(CREATE_CONST_ASC(SL::aData),
+-                STREAM_STD_READ | STREAM_NOCREATE );
+-
+-            if( xDataStream.Is() && SVSTREAM_OK == xDataStream->GetError() )
+-            {
+-                pDataStream = &xDataStream;
+-                pDataStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+-            }
+-            else
+-                pDataStream = pStrm;
++            eTextCharSet = WW8Fib::GetFIBCharset(pWwFib->chse);
++            eStructCharSet = WW8Fib::GetFIBCharset(pWwFib->chseTables);
+ 
+-            if( pWwFib->lcbPlcfspaHdr || pWwFib->lcbPlcfspaMom )
++            if (bVer8)
+             {
+-                pMSDffManager = new SwMSDffManager( *this );
+-                //#79055# Now the dff manager always needs a controls
+-                //converter as well, but a control converter may still exist
+-                //without a dffmanager. cmc
+-                pFormImpl = new SwMSConvertControls(mpDocShell, pPaM);
+-            }
++                if( pWwFib->lcbPlcfspaHdr || pWwFib->lcbPlcfspaMom )
++                {
++                    pMSDffManager = new SwMSDffManager( *this );
++                    //#79055# Now the dff manager always needs a controls
++                    //converter as well, but a control converter may still exist
++                    //without a dffmanager. cmc
++                    pFormImpl = new SwMSConvertControls(mpDocShell, pPaM);
+                 }
+-            break;
+-		default:
+-            // Programm-Fehler!
+-			ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+-			nErrRet = ERR_SWG_READ_ERROR;
+-            break;
+-		}
+-
+-		if( ERR_SWG_READ_ERROR != nErrRet )
+-		{
+-            eTextCharSet = WW8Fib::GetFIBCharset(pWwFib->chse);
+-            eStructCharSet = WW8Fib::GetFIBCharset(pWwFib->chseTables);
++            }
+ 
+ 			bWWBugNormal = pWwFib->nProduct == 0xc03d;
+ 
+@@ -3018,7 +2970,7 @@
+ 			// loop for each glossary entry and add dummy section node
+ 			if (pGloss)
+ 			{
+-				WW8PLCF aPlc(&xTableStream,pWwFib->fcPlcfglsy,
++				WW8PLCF aPlc(pTableStream, pWwFib->fcPlcfglsy,
+ 								pWwFib->lcbPlcfglsy,0 );
+ 
+ 				WW8_CP nStart, nEnd;
+@@ -3160,13 +3112,10 @@
+             DELETEZ( pTabNode );
+             delete mpSprmParser;
+ 			::EndProgress( mpDocShell );
+-		}
++
+ 		pDataStream = 0;
+ 		pTableStream = 0;
+-	}
+ 
+-	if (!pGloss)
+-		DELETEZ(pWwFib);
+ 	DeleteCtrlStk();
+     mpRedlineStack->closeall(*pPaM->GetPoint());
+     delete mpRedlineStack;
+@@ -3203,6 +3152,314 @@
+     }
+ };
+ 
++ULONG SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
++    SvStorageStreamRef &rDataStream)
++{
++    ULONG nErrRet = 0;
++    // 6 stands for "6 OR 7",  7 stand for "ONLY 7"
++    switch (pWwFib->nVersion)
++    {
++        case 6:
++        case 7:
++            pTableStream = pStrm;
++            pDataStream = pStrm;
++            break;
++        case 8:
++            if(!pStg)
++            {
++                ASSERT( pStg, "Version 8 muss immer einen Storage haben!" );
++                nErrRet = ERR_SWG_READ_ERROR;
++                break;
++            }
++
++            rTableStream = pStg->OpenStream(String::CreateFromAscii(
++                pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table),
++                STREAM_STD_READ);
++
++            pTableStream = &rTableStream;
++            pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
++
++            rDataStream = pStg->OpenStream(CREATE_CONST_ASC(SL::aData),
++                STREAM_STD_READ | STREAM_NOCREATE );
++
++            if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
++            {
++                pDataStream = &rDataStream;
++                pDataStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
++            }
++            else
++                pDataStream = pStrm;
++            break;
++        default:
++            // Programm-Fehler!
++            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
++            nErrRet = ERR_SWG_READ_ERROR;
++            break;
++    }
++    return nErrRet;
++}
++
++namespace
++{
++    utl::TempFile *MakeTemp(SvFileStream &rSt)
++    {
++        utl::TempFile *pT = new utl::TempFile;
++        pT->EnableKillingFile();
++        rSt.Open(pT->GetFileName(), STREAM_READWRITE | STREAM_SHARE_DENYWRITE);
++        return pT;
++    }
++
++#define WW_BLOCKSIZE 0x200
++
++    void DecryptRC4(svx::MSCodec_Std97& rCtx, SvStream &rIn, SvStream &rOut)
++    {
++        rIn.Seek(STREAM_SEEK_TO_END);
++        ULONG nLen = rIn.Tell();
++        rIn.Seek(0);
++
++        sal_uInt8 in[WW_BLOCKSIZE];
++        for (ULONG nI = 0, nBlock = 0; nI < nLen; nI += WW_BLOCKSIZE, ++nBlock)
++        {
++            ULONG nBS = (nLen - nI > WW_BLOCKSIZE) ? WW_BLOCKSIZE : nLen - nI;
++            rIn.Read(in, nBS);
++            rCtx.InitCipher(nBlock);
++            rCtx.Decode(in, nBS, in, nBS);
++            rOut.Write(in, nBS);
++        }
++    }
++
++    void DecryptXOR(svx::MSCodec_XorWord95 &rCtx, SvStream &rIn, SvStream &rOut)
++    {
++        ULONG nSt = rIn.Tell();
++        rIn.Seek(STREAM_SEEK_TO_END);
++        ULONG nLen = rIn.Tell();
++        rIn.Seek(nSt);
++
++        rCtx.InitCipher();
++        rCtx.Skip(nSt);
++
++        sal_uInt8 in[0x4096];
++        for (ULONG nI = nSt; nI < nLen; nI += 0x4096)
++        {
++            ULONG nBS = (nLen - nI > 0x4096 ) ? 0x4096 : nLen - nI;
++            rIn.Read(in, nBS);
++            rCtx.Decode(in, nBS);
++            rOut.Write(in, nBS);
++        }
++    }
++
++    //moan, copy and paste :-(
++    String QueryPasswordForMedium(SfxMedium& rMedium)
++    {
++        String aPassw;
++
++        using namespace com::sun::star;
++        try
++        {
++            uno::Reference< task::XInteractionHandler > xHandler( rMedium.GetInteractionHandler() );
++            if( xHandler.is() )
++            {
++                RequestDocumentPassword* pRequest = new RequestDocumentPassword(
++                    task::PasswordRequestMode_PASSWORD_ENTER,
++                    INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET ) );
++                uno::Reference< task::XInteractionRequest > xRequest( pRequest );
++
++                xHandler->handle( xRequest );
++
++                if( pRequest->isPassword() )
++                    aPassw = pRequest->getPassword();
++            }
++        }
++        catch( uno::Exception& )
++        {
++        }
++
++        return aPassw;
++    }
++
++}
++
++ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss)
++{
++    ULONG nErrRet = 0;
++    if (pGloss)
++        pWwFib = pGloss->GetFib();
++    else
++        pWwFib = new WW8Fib(*pStrm, nWantedVersion);
++
++    if (pWwFib->nFibError)
++        nErrRet = ERR_SWG_READ_ERROR;
++
++    SvStorageStreamRef xTableStream, xDataStream;
++
++    if (!nErrRet)
++        nErrRet = SetSubStreams(xTableStream, xDataStream);
++
++    utl::TempFile *pTempMain = 0;
++    utl::TempFile *pTempTable = 0;
++    utl::TempFile *pTempData = 0;
++    SvFileStream aDecryptMain;
++    SvFileStream aDecryptTable;
++    SvFileStream aDecryptData;
++
++    bool bDecrypt = false;
++    enum {RC4, XOR, Other} eAlgo = Other;
++    if (pWwFib->fEncrypted && !nErrRet)
++    {
++        if (!pGloss)
++        {
++            bDecrypt = true;
++            if (8 != pWwFib->nVersion)
++                eAlgo = XOR;
++            else
++            {
++                if (pWwFib->nKey != 0)
++                    eAlgo = XOR;
++                else
++                {
++                    pTableStream->Seek(0);
++                    sal_uInt32 nEncType;
++                    *pTableStream >> nEncType;
++                    if (nEncType == 0x10001)
++                        eAlgo = RC4;
++                }
++            }
++        }
++    }
++
++    if (bDecrypt)
++    {
++        nErrRet = ERRCODE_SVX_WRONGPASS;
++        switch (eAlgo)
++        {
++            default:
++                nErrRet = ERRCODE_SVX_READ_FILTER_CRYPT;
++                break;
++            case XOR:
++            {
++                String sUniPassword =
++                    QueryPasswordForMedium(*(mpDocShell->GetMedium()));
++
++                ByteString sPassword(sUniPassword,
++                    WW8Fib::GetFIBCharset(pWwFib->chseTables));
++
++                xub_StrLen nLen = sPassword.Len();
++                // DR: do not cut a wrong (too long) password
++                if( nLen <= 15 )
++                {
++                    sal_uInt8 aPassword[16] = {0};
++
++                    for (xub_StrLen nChar = 0; nChar < sPassword.Len(); ++nChar )
++                        aPassword[nChar] = sPassword.GetChar(nChar);
++
++                    svx::MSCodec_XorWord95 aCtx;
++                    aCtx.InitKey(aPassword);
++                    if (aCtx.VerifyKey(pWwFib->nKey, pWwFib->nHash))
++                    {
++                        nErrRet = 0;
++                        pTempMain = MakeTemp(aDecryptMain);
++
++                        pStrm->Seek(0);
++                        size_t nUnencryptedHdr =
++                            (8 == pWwFib->nVersion) ? 0x44 : 0x34;
++                        sal_uInt8 *pIn = new sal_uInt8[nUnencryptedHdr];
++                        pStrm->Read(pIn, nUnencryptedHdr);
++                        aDecryptMain.Write(pIn, nUnencryptedHdr);
++                        delete pIn;
++
++                        DecryptXOR(aCtx, *pStrm, aDecryptMain);
++
++                        if (!pTableStream || pTableStream == pStrm)
++                            pTableStream = &aDecryptMain;
++                        else
++                        {
++                            pTempTable = MakeTemp(aDecryptTable);
++                            DecryptXOR(aCtx, *pTableStream, aDecryptTable);
++                            pTableStream = &aDecryptTable;
++                        }
++
++                        if (!pDataStream || pDataStream == pStrm)
++                            pDataStream = &aDecryptMain;
++                        else
++                        {
++                            pTempData = MakeTemp(aDecryptData);
++                            DecryptXOR(aCtx, *pDataStream, aDecryptData);
++                            pDataStream = &aDecryptData;
++                        }
++                    }
++                }
++            }
++            break;
++            case RC4:
++            {
++                String sUniPassword =
++                    QueryPasswordForMedium(*(mpDocShell->GetMedium()));
++
++                xub_StrLen nLen = sUniPassword.Len();
++                // DR: do not cut a wrong (too long) password
++                if (nLen <= 15)
++                {
++                    sal_Unicode aPassword[16] = {0};
++                    for (xub_StrLen nChar = 0; nChar < nLen; ++nChar )
++                        aPassword[nChar] = sUniPassword.GetChar(nChar);
++
++                    sal_uInt8 aDocId[ 16 ];
++                    pTableStream->Read(aDocId, 16);
++                    sal_uInt8 aSaltData[ 16 ];
++                    pTableStream->Read(aSaltData, 16);
++                    sal_uInt8 aSaltHash[ 16 ];
++                    pTableStream->Read(aSaltHash, 16);
++
++                    svx::MSCodec_Std97 aCtx;
++                    aCtx.InitKey(aPassword, aDocId);
++                    if (aCtx.VerifyKey(aSaltData, aSaltHash))
++                    {
++                        nErrRet = 0;
++
++                        pTempTable = MakeTemp(aDecryptTable);
++                        DecryptRC4(aCtx, *pTableStream, aDecryptTable);
++                        pTableStream = &aDecryptTable;
++
++                        pTempMain = MakeTemp(aDecryptMain);
++                        DecryptRC4(aCtx, *pStrm, aDecryptMain);
++
++                        if (!pDataStream || pDataStream == pStrm)
++                            pDataStream = &aDecryptMain;
++                        else
++                        {
++                            pTempData = MakeTemp(aDecryptData);
++                            DecryptRC4(aCtx, *pDataStream, aDecryptData);
++                            pDataStream = &aDecryptData;
++                        }
++                    }
++                }
++            }
++            break;
++        }
++
++        if (nErrRet == 0)
++        {
++            pStrm = &aDecryptMain;
++
++            delete pWwFib;
++            pWwFib = new WW8Fib(*pStrm, nWantedVersion);
++            if (pWwFib->nFibError)
++                nErrRet = ERR_SWG_READ_ERROR;
++        }
++    }
++
++    if (!nErrRet)
++        nErrRet = CoreLoad(pGloss, *rPaM.GetPoint());
++
++    delete pTempMain;
++    delete pTempTable;
++    delete pTempData;
++
++    if (!pGloss)
++        delete pWwFib;
++    return nErrRet;
++}
++
+ class outlineeq : public std::unary_function<const SwTxtFmtColl*, bool>
+ {
+ private:
+@@ -3414,9 +3671,6 @@
+ {
+ 	ULONG nErrRet = 0;
+ 
+-	pAktColl    = 0;
+-	pAktItemSet = 0;
+-
+ 	{
+ 		static const sal_Char* aNames[ 12 ] = {
+ 			"WinWord/WW", "WinWord/WW8", "WinWord/WWFT",
+@@ -3497,7 +3751,7 @@
+ 	}
+ 
+ 	if (!nErrRet)
+-        nErrRet = LoadDoc1(rPaM ,pGloss);
++        nErrRet = LoadThroughDecryption(rPaM ,pGloss);
+ 
+ 	return nErrRet;
+ }
diff --git a/patches/vclplug/crash-ppd-parse.diff b/patches/vclplug/crash-ppd-parse.diff
index 8c41014b0..6d0edd6cc 100644
--- a/patches/vclplug/crash-ppd-parse.diff
+++ b/patches/vclplug/crash-ppd-parse.diff
@@ -1,22 +1,28 @@
---- psprint.good/source/printer/cupsmgr.cxx	2004-09-27 04:24:33.000000000 +0100
-+++ psprint/source/printer/cupsmgr.cxx	2004-09-29 17:19:32.578417056 +0100
-@@ -495,11 +495,14 @@
- 
-             rInfo.m_pParser = pNewParser;
-             rInfo.m_aContext.setParser( pNewParser );
--            for( int i = 0; i < pPPD->num_groups; i++ )
--                updatePrinterContextInfo( pPPD->groups + i, rInfo );
--
--            // clean up the mess
--            m_pCUPSWrapper->ppdClose( pPPD );
-+			if (pPPD)
-+			{
-+				for( int i = 0; i < pPPD->num_groups; i++ )
-+					updatePrinterContextInfo( pPPD->groups + i, rInfo );
-+
-+				// clean up the mess
-+				m_pCUPSWrapper->ppdClose( pPPD );
-+			}
- 
-             // remove temporary PPD file
-             unlink( pPPDFile );
+diff -urd psprint/source/printer/cupsmgr.cxx psprint-fixppdcrash/source/printer/cupsmgr.cxx
+--- psprint/source/printer/cupsmgr.cxx	2004-11-09 16:37:51.000000000 +0000
++++ psprint-fixppdcrash/source/printer/cupsmgr.cxx	2004-11-24 21:42:59.000000000 +0000
+@@ -601,14 +601,20 @@
+                     // remember the default context for later use
+                     PPDContext& rContext = m_aDefaultContexts[ aPrinter ];
+                     rContext.setParser( pNewParser );
+-                    for( int i = 0; i < pPPD->num_groups; i++ )
+-                        updatePrinterContextInfo( pPPD->groups + i, rContext );
++					if(pPPD)
++					{
++						for( int i = 0; i < pPPD->num_groups; i++ )
++							updatePrinterContextInfo( pPPD->groups + i, rContext );
++					}
+                     
+                     rInfo.m_pParser = pNewParser;
+                     rInfo.m_aContext = rContext;
+                     
+-                    // clean up the mess
+-                    m_pCUPSWrapper->ppdClose( pPPD );
++					if(pPPD)
++					{
++						// clean up the mess
++						m_pCUPSWrapper->ppdClose( pPPD );
++					}
+                 }
+ #if OSL_DEBUG_LEVEL > 1
+                 else
diff --git a/patches/vclplug/psprint-defaultencoding.diff b/patches/vclplug/psprint-defaultencoding.diff
new file mode 100644
index 000000000..8a5f39b54
--- /dev/null
+++ b/patches/vclplug/psprint-defaultencoding.diff
@@ -0,0 +1,27 @@
+--- psprint/source/fontmanager/fontmanager.cxx	2004-10-13 09:22:36.000000000 +0100
++++ psprint-patched/source/fontmanager/fontmanager.cxx	2004-11-25 18:10:05.000000000 +0000
+@@ -829,10 +829,10 @@
+ 
+         if( m_aEncoding == RTL_TEXTENCODING_DONTKNOW )
+             m_aEncoding = nAdobeEncoding == 1 ?
+-                RTL_TEXTENCODING_ADOBE_STANDARD : RTL_TEXTENCODING_SYMBOL;
++                RTL_TEXTENCODING_MS_1252 : RTL_TEXTENCODING_SYMBOL;
+     }
+     else if( m_aEncoding == RTL_TEXTENCODING_DONTKNOW )
+-        m_aEncoding = RTL_TEXTENCODING_ADOBE_STANDARD;
++        m_aEncoding = RTL_TEXTENCODING_MS_1252;
+ 
+     // try to parse the font name and decide wether it might be a
+     // japanese font. Who invented this PITA ?
+@@ -1669,10 +1669,7 @@
+     const char* pEnc = rtl_getBestUnixCharsetFromTextEncoding( pFont->m_aEncoding );
+     if( ! pEnc )
+     {
+-        if( pFont->m_aEncoding == RTL_TEXTENCODING_ADOBE_STANDARD )
+-            pEnc = "adobe-standard";
+-        else
+-            pEnc = "iso8859-1";
++        pEnc = "iso8859-1";
+     }
+     aXLFD .append( pEnc );
+ 
diff --git a/patches/vclplug/psprint-fontconfigvar.diff b/patches/vclplug/psprint-fontconfigvar.diff
new file mode 100644
index 000000000..c951eae0c
--- /dev/null
+++ b/patches/vclplug/psprint-fontconfigvar.diff
@@ -0,0 +1,11 @@
+--- psprint/source/fontmanager/makefile.mk	2004-03-15 12:03:52.000000000 +0000
++++ psprint-patched/source/fontmanager/makefile.mk	2004-11-25 23:01:53.000000000 +0000
+@@ -72,7 +72,7 @@
+ 
+ CFLAGS+= -I..$/fontsubset
+ 
+-.IF "$(ENABLE_FONTCONFIG)" != ""
++.IF "$(FONTCONFIG_FONTS)" != ""
+ CDEFS += -DENABLE_FONTCONFIG
+ .ENDIF
+ 
diff --git a/patches/vclplug/psprint-m46-to-m53.diff b/patches/vclplug/psprint-m46-to-m53.diff
deleted file mode 100644
index 3c474399f..000000000
--- a/patches/vclplug/psprint-m46-to-m53.diff
+++ /dev/null
@@ -1,1618 +0,0 @@
-Index: inc/cupsmgr.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/cupsmgr.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -w -u -r1.2 -r1.3
---- psprint/inc/cupsmgr.hxx	17 Mar 2004 10:47:45 -0000	1.2
-+++ psprint/inc/cupsmgr.hxx	23 Jul 2004 10:07:09 -0000	1.3
-@@ -64,6 +64,8 @@
- 
- #include <psprint/printerinfomanager.hxx>
- #include <osl/module.h>
-+#include <osl/thread.h>
-+#include <osl/mutex.hxx>
- 
- namespace psp
- {
-@@ -83,7 +85,7 @@
-     std::hash_map< FILE*, rtl::OString, FPtrHash >				m_aSpoolFiles;
-     int															m_nDests;
-     void*														m_pDests;
--    bool														m_bFirstDest;
-+    bool														m_bNewDests;
-     std::hash_map< rtl::OUString, int, rtl::OUStringHash >		m_aCUPSDestMap;
- 
-     rtl::OString												m_aUser;
-@@ -92,10 +94,16 @@
-     // the password, so this cannot be helped
-     rtl::OString												m_aPassword;
- 
--    CUPSManager( CUPSWrapper*, int nDests = 0, void* pDests = NULL );
-+    osl::Mutex													m_aCUPSMutex;
-+    oslThread													m_aDestThread;
-+
-+    CUPSManager( CUPSWrapper* );
-     virtual ~CUPSManager();
- 
-     virtual void initialize();
-+
-+    void runDests();
-+    static void runDestThread(void* pMgr);
- public:
- 
-     static CUPSManager* tryLoadCUPS();
-Index: inc/psprint/fontcache.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/fontcache.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -w -u -r1.3 -r1.4
---- psprint/inc/psprint/fontcache.hxx	2 Feb 2004 18:52:33 -0000	1.3
-+++ psprint/inc/psprint/fontcache.hxx	5 Jul 2004 09:21:57 -0000	1.4
-@@ -108,6 +108,7 @@
-     void clearCache();
- 
-     void copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFontManager::PrintFont* pTo ) const;
-+    bool equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight ) const;
-     PrintFontManager::PrintFont* clonePrintFont( const PrintFontManager::PrintFont* pFont ) const;
- 
-     void createCacheDir( int nDirID );
-Index: inc/psprint/fontmanager.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
-retrieving revision 1.18
-retrieving revision 1.19
-diff -w -u -r1.18 -r1.19
---- psprint/inc/psprint/fontmanager.hxx	17 Jun 2004 13:50:47 -0000	1.18
-+++ psprint/inc/psprint/fontmanager.hxx	5 Jul 2004 09:22:12 -0000	1.19
-@@ -191,6 +191,17 @@
-     weight::type            				m_eWeight;
-     pitch::type             				m_ePitch;
-     rtl_TextEncoding        				m_aEncoding;
-+
-+    FastPrintFontInfo() :
-+            m_nID( 0 ),
-+            m_eType( fonttype::Unknown ),
-+            m_eFamilyStyle( family::Unknown ),
-+            m_eItalic( italic::Unknown ),
-+            m_eWidth( width::Unknown ),
-+            m_eWeight( weight::Unknown ),
-+            m_ePitch( pitch::Unknown ),
-+            m_aEncoding( RTL_TEXTENCODING_DONTKNOW )
-+    {}
- };
- 
- struct PrintFontInfo : public FastPrintFontInfo
-@@ -199,6 +210,14 @@
-     int                     				m_nDescend;
-     int                     				m_nLeading;
-     int                     				m_nWidth;
-+
-+    PrintFontInfo() :
-+            FastPrintFontInfo(),
-+            m_nAscend( 0 ),
-+            m_nDescend( 0 ),
-+            m_nLeading( 0 ),
-+            m_nWidth( 0 )
-+    {}
- };
- 
- // the values are per thousand of the font size
-@@ -208,6 +227,10 @@
-     short int width, height;
- 
-     CharacterMetric() : width( 0 ), height( 0 ) {}
-+    bool operator==( const CharacterMetric& rOther ) const
-+    { return rOther.width == width && rOther.height == height; }
-+    bool operator!=( const CharacterMetric& rOther ) const
-+    { return rOther.width != width || rOther.height != height; }
- };
- 
- struct KernPair
-@@ -421,11 +444,18 @@
- 
-     void getServerDirectories(); // get font server directories on e.g. redhat
- 
--    // try to initialize from libfontconfig
--    // returns true if at least one font was added by libfontconfig,
--    // else returns false (e.g. no libfontconfig found
--    // called from initialize()
-+    /* try to initialize fonts from libfontconfig
-+
-+    called from <code>initialize()</code>
-+
-+    @returns
-+    true if at least one font was added by libfontconfig
-+    false else (e.g. no libfontconfig found)
-+    */
-     bool initFontconfig();
-+    /* deinitialize fontconfig
-+     */
-+    void deinitFontconfig();
- 
-     static bool parseXLFD( const rtl::OString& rXLFD, XLFDEntry& rEntry );
-     void parseXLFD_appendAliases( const std::list< rtl::OString >& rXLFDs, std::list< XLFDEntry >& rEntries ) const;
-@@ -657,6 +687,36 @@
- 
-     // returns false if there were not any
-     bool getAlternativeFamilyNames( fontID nFont, std::list< rtl::OUString >& rNames ) const;
-+
-+    /*  system dependendent font matching
-+
-+    <p>
-+    <code>matchFont</code> matches a pattern of font characteristics
-+    and returns the closest match if possibe. If a match was found
-+    the <code>FastPrintFontInfo</code> passed in as parameter
-+    will be update to the found matching font.
-+    </p>
-+    <p>
-+    implementation note: currently the function is only implemented
-+    for fontconfig.
-+    </p>
-+
-+    @param rInfo
-+    out of the FastPrintFontInfo structure the following
-+    fields will be used for the match:
-+    <ul>
-+    <li>family name</li>
-+    <li>italic</li>
-+    <li>width</li>
-+    <li>weight</li>
-+    <li>pitch</li>
-+    </ul>
-+
-+    @returns
-+    true if a match was found
-+    false else
-+     */
-+    bool matchFont( FastPrintFontInfo& rInfo );
- };
- 
- } // namespace
-Index: inc/psprint/ppdparser.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -w -u -r1.5 -r1.6
---- psprint/inc/psprint/ppdparser.hxx	17 Mar 2004 10:48:09 -0000	1.5
-+++ psprint/inc/psprint/ppdparser.hxx	23 Jul 2004 10:07:44 -0000	1.6
-@@ -223,7 +223,7 @@
-     static void initPPDFiles();
-     static String getPPDFile( const String& rFile );
- public:
--    static const PPDParser* getParser( String aFile );
-+    static const PPDParser* getParser( const String& rFile );
-     static String getPPDPrinterName( const String& rFile );
-     static void freeAll();
- 
-Index: inc/psprint/printerinfomanager.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -w -u -r1.6 -r1.7
---- psprint/inc/psprint/printerinfomanager.hxx	17 Mar 2004 10:48:31 -0000	1.6
-+++ psprint/inc/psprint/printerinfomanager.hxx	23 Jul 2004 09:58:25 -0000	1.7
-@@ -143,6 +143,11 @@
-     m_aFontSubstitutes;
-     std::hash_map< fontID, fontID >
-     m_aFontSubstitutions;
-+
-+    PrinterInfo() :
-+            JobData(),
-+            m_bPerformFontSubstitution( false )
-+    {}
- };
- 
- class PrinterInfoManager
-Index: source/fontmanager/fontcache.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
-retrieving revision 1.10
-retrieving revision 1.11
-diff -w -u -r1.10 -r1.11
---- psprint/source/fontmanager/fontcache.cxx	17 Mar 2004 10:48:54 -0000	1.10
-+++ psprint/source/fontmanager/fontcache.cxx	5 Jul 2004 09:22:24 -0000	1.11
-@@ -549,6 +549,73 @@
- }
- 
- /*
-+ *  FontCache::equalsPrintFont
-+ */
-+bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight ) const
-+{
-+    if( pLeft->m_eType != pRight->m_eType )
-+        return false;
-+    switch( pLeft->m_eType )
-+    {
-+        case fonttype::TrueType:
-+        {
-+            const PrintFontManager::TrueTypeFontFile* pLT = static_cast<const PrintFontManager::TrueTypeFontFile*>(pLeft);
-+            const PrintFontManager::TrueTypeFontFile* pRT = static_cast<const PrintFontManager::TrueTypeFontFile*>(pRight);
-+            if( pRT->m_nDirectory		!= pLT->m_nDirectory		||
-+                pRT->m_aFontFile		!= pLT->m_aFontFile			||
-+                pRT->m_nCollectionEntry	!= pLT->m_nCollectionEntry	||
-+                pRT->m_nTypeFlags		!= pLT->m_nTypeFlags )
-+                return false;
-+        }
-+        break;
-+        case fonttype::Type1:
-+        {
-+            const PrintFontManager::Type1FontFile* pLT = static_cast<const PrintFontManager::Type1FontFile*>(pLeft);
-+            const PrintFontManager::Type1FontFile* pRT = static_cast<const PrintFontManager::Type1FontFile*>(pRight);
-+            if( pRT->m_nDirectory		!= pLT->m_nDirectory		||
-+                pRT->m_aFontFile		!= pLT->m_aFontFile			||
-+                pRT->m_aMetricFile		!= pLT->m_aMetricFile )
-+                return false;
-+        }
-+        break;
-+        case fonttype::Builtin:
-+        {
-+            const PrintFontManager::BuiltinFont* pLT = static_cast<const PrintFontManager::BuiltinFont*>(pLeft);
-+            const PrintFontManager::BuiltinFont* pRT = static_cast<const PrintFontManager::BuiltinFont*>(pRight);
-+            if( pRT->m_nDirectory		!= pLT->m_nDirectory		||
-+                pRT->m_aMetricFile		!= pLT->m_aMetricFile )
-+                return false;
-+        }
-+        break;
-+        default: break;
-+    }
-+    if( pRight->m_nFamilyName		!= pLeft->m_nFamilyName		||
-+        pRight->m_nPSName			!= pLeft->m_nPSName			||
-+        pRight->m_eItalic			!= pLeft->m_eItalic			||
-+        pRight->m_eWeight			!= pLeft->m_eWeight			||
-+        pRight->m_eWidth			!= pLeft->m_eWidth			||
-+        pRight->m_ePitch			!= pLeft->m_ePitch			||
-+        pRight->m_aEncoding			!= pLeft->m_aEncoding		||
-+        pRight->m_aGlobalMetricX	!= pLeft->m_aGlobalMetricX	||
-+        pRight->m_aGlobalMetricY	!= pLeft->m_aGlobalMetricY	||
-+        pRight->m_nAscend			!= pLeft->m_nAscend			||
-+        pRight->m_nDescend			!= pLeft->m_nDescend		||
-+        pRight->m_nLeading			!= pLeft->m_nLeading		||
-+        pRight->m_nXMin				!= pLeft->m_nXMin			||
-+        pRight->m_nYMin				!= pLeft->m_nYMin			||
-+        pRight->m_nXMax				!= pLeft->m_nXMax			||
-+        pRight->m_nYMax				!= pLeft->m_nYMax			||
-+        pRight->m_bHaveVerticalSubstitutedGlyphs != pLeft->m_bHaveVerticalSubstitutedGlyphs )
-+        return false;
-+    std::list< int >::const_iterator lit, rit;
-+    for( lit = pLeft->m_aAliases.begin(), rit = pRight->m_aAliases.begin();
-+         lit != pLeft->m_aAliases.end() && rit != pRight->m_aAliases.end() && (*lit) == (*rit);
-+         ++lit, ++rit )
-+        ;
-+    return lit == pLeft->m_aAliases.end() && rit == pRight->m_aAliases.end();
-+}
-+
-+/*
-  *  FontCache::clonePrintFont
-  */
- PrintFontManager::PrintFont* FontCache::clonePrintFont( const PrintFontManager::PrintFont* pOldFont ) const
-@@ -650,7 +717,13 @@
-         createCacheDir( nDirID );
- 
-     if( pCacheFont )
-+    {
-+        if( ! equalsPrintFont( pFont, pCacheFont ) )
-+        {
-         copyPrintFont( pFont, pCacheFont );
-+            m_bDoFlush = true;
-+        }
-+    }
-     else
-     {
-         pCacheFont = clonePrintFont( pFont );
-@@ -662,8 +735,8 @@
-         struct stat aStat;
-         if( ! stat( aPath.GetBuffer(), &aStat ) )
-             m_aCache[nDirID].m_aEntries[aFile].m_nTimestamp = (sal_Int64)aStat.st_mtime;
--    }
-     m_bDoFlush = true;
-+    }
-     if( bFlush )
-         flush();
- }
-Index: source/fontmanager/fontconfig.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
-retrieving revision 1.4
-retrieving revision 1.6
-diff -w -u -r1.4 -r1.6
---- psprint/source/fontmanager/fontconfig.cxx	1 Jun 2004 09:35:26 -0000	1.4
-+++ psprint/source/fontmanager/fontconfig.cxx	23 Jul 2004 10:08:07 -0000	1.6
-@@ -61,6 +61,10 @@
- 
- #ifdef ENABLE_FONTCONFIG
- #include <fontconfig/fontconfig.h>
-+// be compatible with fontconfig 2.2.0 release
-+#ifndef FC_WEIGHT_BOOK
-+#define FC_WEIGHT_BOOK 75
-+#endif
- #else
- typedef void FcConfig;
- typedef void FcObjectSet;
-@@ -68,8 +72,8 @@
- typedef void FcFontSet;
- typedef int FcResult;
- typedef int FcBool;
-+typedef int FcMatchKind;
- typedef char FcChar8;
--
- #endif
- 
- #include <cstdio>
-@@ -98,6 +102,7 @@
- class FontCfgWrapper
- {
-     void*			m_pLib;
-+    FcConfig*		m_pDefConfig;
- 
-     FcConfig*		(*m_pFcInitLoadConfigAndFonts)();
-     FcObjectSet*	(*m_pFcObjectSetVaBuild)(const char*,va_list);
-@@ -105,20 +110,34 @@
-     FcPattern*		(*m_pFcPatternCreate)();
-     void			(*m_pFcPatternDestroy)(FcPattern*);
-     FcFontSet*		(*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
-+    FcFontSet*		(*m_pFcFontSetCreate)();
-     void			(*m_pFcFontSetDestroy)(FcFontSet*);
-+    FcBool			(*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
-     FcResult		(*m_pFcPatternGetString)(const FcPattern*,const char*,int,FcChar8**);
-     FcResult		(*m_pFcPatternGetInteger)(const FcPattern*,const char*,int,int*);
-     FcResult		(*m_pFcPatternGetDouble)(const FcPattern*,const char*,int,double*);
-     FcResult		(*m_pFcPatternGetBool)(const FcPattern*,const char*,int,FcBool*);
-+    void			(*m_pFcDefaultSubstitute)(FcPattern *);
-+    FcPattern*		(*m_pFcFontMatch)(FcConfig*,FcPattern*,FcResult*);    
-+    FcBool			(*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
-+    FcBool			(*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
-+    FcBool			(*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
-     
-     void* loadSymbol( const char* );
--public:
-+
-     FontCfgWrapper();
-     ~FontCfgWrapper();
- 
-+public:
-+    static FontCfgWrapper& get();
-+    static void release();
-+
-     bool isValid() const 
-     { return m_pLib != NULL;}
- 
-+    FcConfig* getDefConfig() { return m_pDefConfig; }
-+
-+
-     FcConfig* FcInitLoadConfigAndFonts()
-     { return m_pFcInitLoadConfigAndFonts(); }
- 
-@@ -143,8 +162,12 @@
-     FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
-     { return m_pFcFontList( pConfig, pPattern, pSet ); }
-     
-+    FcFontSet* FcFontSetCreate()
-+    { return m_pFcFontSetCreate(); }
-     void FcFontSetDestroy( FcFontSet* pSet )
-     { m_pFcFontSetDestroy( pSet );}
-+    FcBool FcFontSetAdd( FcFontSet* pSet, FcPattern* pPattern )
-+    { return m_pFcFontSetAdd( pSet, pPattern ); }
- 
-     FcResult FcPatternGetString( const FcPattern* pPattern, const char* object, int n, FcChar8** s )
-     { return m_pFcPatternGetString( pPattern, object, n, s ); }
-@@ -157,6 +180,16 @@
- 
-     FcResult FcPatternGetBool( const FcPattern* pPattern, const char* object, int n, FcBool* s )
-     { return m_pFcPatternGetBool( pPattern, object, n, s ); }
-+    void FcDefaultSubstitute( FcPattern* pPattern )
-+    { m_pFcDefaultSubstitute( pPattern ); }
-+    FcPattern* FcFontMatch( FcConfig* pConfig, FcPattern* pPattern, FcResult* pResult )
-+    { return m_pFcFontMatch( pConfig, pPattern, pResult ); }
-+    FcBool FcConfigSubstitute( FcConfig* pConfig, FcPattern* pPattern, FcMatchKind eKind )
-+    { return m_pFcConfigSubstitute( pConfig, pPattern, eKind ); }
-+    FcBool FcPatternAddInteger( FcPattern* pPattern, const char* pObject, int nValue )
-+    { return m_pFcPatternAddInteger( pPattern, pObject, nValue ); }
-+    FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString )
-+    { return m_pFcPatternAddString( pPattern, pObject, pString ); }
- };
- 
- void* FontCfgWrapper::loadSymbol( const char* pSymbol )
-@@ -170,7 +203,8 @@
- }
- 
- FontCfgWrapper::FontCfgWrapper()
--        : m_pLib( NULL )
-+        : m_pLib( NULL ),
-+          m_pDefConfig( NULL )
- {
- #ifdef ENABLE_FONTCONFIG
-     OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
-@@ -202,8 +236,12 @@
-         loadSymbol( "FcPatternDestroy" );
-     m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*))
-         loadSymbol( "FcFontList" );
-+    m_pFcFontSetCreate = (FcFontSet*(*)())
-+        loadSymbol( "FcFontSetCreate" );
-     m_pFcFontSetDestroy = (void(*)(FcFontSet*))
-         loadSymbol( "FcFontSetDestroy" );
-+    m_pFcFontSetAdd = (FcBool(*)(FcFontSet*,FcPattern*))
-+        loadSymbol( "FcFontSetAdd" );
-     m_pFcPatternGetString = (FcResult(*)(const FcPattern*,const char*,int,FcChar8**))
-         loadSymbol( "FcPatternGetString" );
-     m_pFcPatternGetInteger = (FcResult(*)(const FcPattern*,const char*,int,int*))
-@@ -212,6 +250,16 @@
-         loadSymbol( "FcPatternGetDouble" );
-     m_pFcPatternGetBool = (FcResult(*)(const FcPattern*,const char*,int,FcBool*))
-         loadSymbol( "FcPatternGetBool" );
-+    m_pFcDefaultSubstitute = (void(*)(FcPattern *))
-+        loadSymbol( "FcDefaultSubstitute" );
-+    m_pFcFontMatch = (FcPattern*(*)(FcConfig*,FcPattern*,FcResult*))
-+        loadSymbol( "FcFontMatch" );
-+    m_pFcConfigSubstitute = (FcBool(*)(FcConfig*,FcPattern*,FcMatchKind))
-+        loadSymbol( "FcConfigSubstitute" );
-+    m_pFcPatternAddInteger = (FcBool(*)(FcPattern*,const char*,int))
-+        loadSymbol( "FcPatternAddInteger" );
-+    m_pFcPatternAddString = (FcBool(*)(FcPattern*,const char*,const FcChar8*))
-+        loadSymbol( "FcPatternAddString" );
- 
-     if( ! (
-             m_pFcInitLoadConfigAndFonts		&&
-@@ -220,11 +268,18 @@
-             m_pFcPatternCreate				&&
-             m_pFcPatternDestroy				&&
-             m_pFcFontList					&&
-+            m_pFcFontSetCreate				&&
-             m_pFcFontSetDestroy				&&
-+            m_pFcFontSetAdd					&&
-             m_pFcPatternGetString			&&
-             m_pFcPatternGetInteger			&&
-             m_pFcPatternGetDouble			&&
--            m_pFcPatternGetBool
-+            m_pFcPatternGetBool				&&
-+            m_pFcDefaultSubstitute			&&
-+            m_pFcFontMatch					&&
-+            m_pFcConfigSubstitute			&&
-+            m_pFcPatternAddInteger			&&
-+            m_pFcPatternAddString
-             ) )
-      {
-          osl_unloadModule( m_pLib );
-@@ -233,6 +288,13 @@
-          fprintf( stderr, "not all needed symbols were found in libfontconfig\n" );
- #endif
-      }
-+
-+    m_pDefConfig = FcInitLoadConfigAndFonts();
-+    if( ! m_pDefConfig )
-+    {
-+        osl_unloadModule( m_pLib );
-+        m_pLib = NULL;
-+    }
- }
- 
- FontCfgWrapper::~FontCfgWrapper()
-@@ -241,6 +303,24 @@
-         osl_unloadModule( m_pLib );
- }
- 
-+static FontCfgWrapper* pOneInstance = NULL;
-+
-+FontCfgWrapper& FontCfgWrapper::get()
-+{
-+    if( ! pOneInstance )
-+        pOneInstance = new FontCfgWrapper();
-+    return *pOneInstance;
-+}
-+
-+void FontCfgWrapper::release()
-+{
-+    if( pOneInstance )
-+    {
-+        delete pOneInstance;
-+        pOneInstance = NULL;
-+    }
-+}
-+
- /*
-  * PrintFontManager::initFontconfig
-  */
-@@ -249,24 +329,22 @@
-     int nFonts = 0;
- 
- #ifdef ENABLE_FONTCONFIG    
--    FontCfgWrapper aWrapper;
--    if( ! aWrapper.isValid() )
-+    FontCfgWrapper& rWrapper = FontCfgWrapper::get();
-+    if( ! rWrapper.isValid() )
-         return false;
- 
--    FcConfig* pConfig = aWrapper.FcInitLoadConfigAndFonts();
--    if( ! pConfig )
--        return false;
--
--    FcObjectSet* pOSet = aWrapper.FcObjectSetBuild( FC_FAMILY,
-+    FcConfig* pConfig = rWrapper.getDefConfig();
-+    FcObjectSet* pOSet = rWrapper.FcObjectSetBuild( FC_FAMILY,
-                                                     FC_STYLE,
-                                                     FC_SLANT,
-                                                     FC_WEIGHT,
-                                                     FC_SPACING,
-                                                     FC_FILE,
-                                                     FC_OUTLINE,
-+                                                    FC_INDEX,
-                                                     NULL );
--    FcPattern* pPattern = aWrapper.FcPatternCreate();
--    FcFontSet* pFSet = aWrapper.FcFontList( pConfig, pPattern, pOSet );
-+    FcPattern* pPattern = rWrapper.FcPatternCreate();
-+    FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet );
- 
-     if( pFSet )
-     {
-@@ -281,16 +359,17 @@
-             int slant = 0;
-             int weight = 0;
-             int spacing = 0;
-+            int nCollectionEntry = -1;
-             FcBool outline = false;
-             
--            FcResult eFileRes	= aWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
--            FcResult eFamilyRes	= aWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
--            FcResult eStyleRes	= aWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
--            FcResult eSlantRes	= aWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
--            FcResult eWeightRes	= aWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
--            FcResult eSpacRes	= aWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
--            FcResult eOutRes	= aWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
--            
-+            FcResult eFileRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
-+            FcResult eFamilyRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
-+            FcResult eStyleRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
-+            FcResult eSlantRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
-+            FcResult eWeightRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
-+            FcResult eSpacRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
-+            FcResult eOutRes	= rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
-+            FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );            
-             
-             if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
-                 continue;
-@@ -327,81 +406,132 @@
-                 // not described by fontconfig (e.g. alias names, PSName)
-                 std::list< OString > aDummy;
-                 analyzeFontFile( nDirID, aBase, true, aDummy, aFonts );
--            }
- #if OSL_DEBUG_LEVEL > 1
--            if( aFonts.size() > 1 )
--                fprintf( stderr, "Warning: file contains more than one font, updating all to fontconfig data\n" );
--            else if( aFonts.empty() )
-+                if( aFonts.empty() )
-                 fprintf( stderr, "Warning: file is unusable to psprint\n" );
- #endif
-+            }
-+            if( aFonts.empty() )
-+                continue;
-+
-             int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), osl_getThreadTextEncoding() ), sal_True );
-+            PrintFont* pUpdate = aFonts.front();
-+            if( ++aFonts.begin() != aFonts.end() ) // more than one font
-+            {
-+                // a collection entry, get the correct index
-+                if( eIndexRes == FcResultMatch && nCollectionEntry != -1 )
-+                {
-+                    for( std::list< PrintFont* >::iterator it = aFonts.begin(); it != aFonts.end(); ++it )
-+                    {
-+                        if( (*it)->m_eType == fonttype::TrueType &&
-+                            static_cast<TrueTypeFontFile*>(*it)->m_nCollectionEntry == nCollectionEntry )
-+                        {
-+                            pUpdate = *it;
-+                            break;
-+                        }
-+                    }
-+                    // update collection entry
-+                    // additional entries will be created in the cache
-+                    // if this is a new index (that is if the loop above
-+                    // ran to the end of the list)
-+                    if( pUpdate->m_eType == fonttype::TrueType ) // sanity check, this should always be the case here
-+                        static_cast<TrueTypeFontFile*>(pUpdate)->m_nCollectionEntry = nCollectionEntry;
-+                }
-+                else
-+                {
-+#if OSL_DEBUG_LEVEL > 1
-+                    fprintf( stderr, "multiple fonts for file, but no index in fontconfig pattern ! (index res = %d collection entry = %d\nfile will not be used\n", eIndexRes, nCollectionEntry );
-+#endif
-+                    // we have found more than one font in this file
-+                    // but fontconfig will not tell us which index is meant
-+                    // -> something is in disorder, do not use this font
-+                    pUpdate = NULL;
-+                }
-+            }
-             
--            for( std::list< PrintFont* >::iterator it = aFonts.begin();
--                 it != aFonts.end(); ++it )
-+            if( pUpdate )
-             {
-                 // set family name
--                if( (*it)->m_nFamilyName != nFamilyName )
-+                if( pUpdate->m_nFamilyName != nFamilyName )
-                 {
--                    (*it)->m_aAliases.remove( (*it)->m_nFamilyName );
--                    (*it)->m_aAliases.push_back( (*it)->m_nFamilyName );
--                    (*it)->m_aAliases.remove( nFamilyName );
--                    (*it)->m_nFamilyName = nFamilyName;
-+                    pUpdate->m_aAliases.remove( pUpdate->m_nFamilyName );
-+                    pUpdate->m_aAliases.push_back( pUpdate->m_nFamilyName );
-+                    pUpdate->m_aAliases.remove( nFamilyName );
-+                    pUpdate->m_nFamilyName = nFamilyName;
-                 }
-                 if( eWeightRes == FcResultMatch )
-                 {
-                     // set weight
--                    if( weight == FC_WEIGHT_LIGHT )
--                        (*it)->m_eWeight = weight::Light;
--                    else if( weight == FC_WEIGHT_MEDIUM )
--                        (*it)->m_eWeight = weight::Medium;
--                    else if( weight == FC_WEIGHT_DEMIBOLD )
--                        (*it)->m_eWeight = weight::SemiBold;
--                    else if( weight == FC_WEIGHT_BOLD )
--                        (*it)->m_eWeight = weight::Bold;
--                    else if( weight == FC_WEIGHT_BLACK )
--                        (*it)->m_eWeight = weight::Black;
-+                    if( weight <= FC_WEIGHT_THIN )
-+                        pUpdate->m_eWeight = weight::Thin;
-+                    else if( weight <= FC_WEIGHT_ULTRALIGHT )
-+                        pUpdate->m_eWeight = weight::UltraLight;
-+                    else if( weight <= FC_WEIGHT_LIGHT )
-+                        pUpdate->m_eWeight = weight::Light;
-+                    else if( weight <= FC_WEIGHT_BOOK )
-+                        pUpdate->m_eWeight = weight::SemiLight;
-+                    else if( weight <= FC_WEIGHT_NORMAL )
-+                        pUpdate->m_eWeight = weight::Normal;
-+                    else if( weight <= FC_WEIGHT_MEDIUM )
-+                        pUpdate->m_eWeight = weight::Medium;
-+                    else if( weight <= FC_WEIGHT_SEMIBOLD )
-+                        pUpdate->m_eWeight = weight::SemiBold;
-+                    else if( weight <= FC_WEIGHT_BOLD )
-+                        pUpdate->m_eWeight = weight::Bold;
-+                    else if( weight <= FC_WEIGHT_ULTRABOLD )
-+                        pUpdate->m_eWeight = weight::UltraBold;
-+                    else
-+                        pUpdate->m_eWeight = weight::Black;
-                 }
-                 if( eSpacRes == FcResultMatch )
-                 {
-                     // set pitch
-                     if( spacing == FC_PROPORTIONAL )
--                        (*it)->m_ePitch = pitch::Variable;
-+                        pUpdate->m_ePitch = pitch::Variable;
-                     else if( spacing == FC_MONO || spacing == FC_CHARCELL )
--                        (*it)->m_ePitch = pitch::Fixed;
-+                        pUpdate->m_ePitch = pitch::Fixed;
-                 }
-                 if( eSlantRes == FcResultMatch )
-                 {
-                     // set italic
-                     if( slant == FC_SLANT_ROMAN )
--                        (*it)->m_eItalic = italic::Upright;
-+                        pUpdate->m_eItalic = italic::Upright;
-                     else if( slant == FC_SLANT_ITALIC )
--                        (*it)->m_eItalic = italic::Italic;
-+                        pUpdate->m_eItalic = italic::Italic;
-                     else if( slant == FC_SLANT_OBLIQUE )
--                        (*it)->m_eItalic = italic::Oblique;
-+                        pUpdate->m_eItalic = italic::Oblique;
-                 }
-                 
-                 // update font cache
--                m_pFontCache->updateFontCacheEntry( *it, false );
-+                m_pFontCache->updateFontCacheEntry( pUpdate, false );
-                 // sort into known fonts
-                 fontID aFont = m_nNextFontID++;
--                m_aFonts[ aFont ] = *it;
-+                m_aFonts[ aFont ] = pUpdate;
-                 m_aFontFileToFontID[ aBase ].insert( aFont );
-                 nFonts++;
- #if OSL_DEBUG_LEVEL > 1
-                 fprintf( stderr, "inserted font %s as fontID %d\n", family, aFont );
- #endif
-             }
-+            // clean up the fonts we did not put into the list
-+            for( std::list< PrintFont* >::iterator it = aFonts.begin(); it != aFonts.end(); ++it )
-+            {
-+                if( *it != pUpdate )
-+                {
-+                    m_pFontCache->updateFontCacheEntry( *it, false ); // prepare a cache entry for a collection item
-+                    delete *it;
-+                }
-+            }
-         }
-     }
--    
-     
-     // cleanup
-     if( pPattern )
--        aWrapper.FcPatternDestroy( pPattern );
-+        rWrapper.FcPatternDestroy( pPattern );
-     if( pFSet )
--        aWrapper.FcFontSetDestroy( pFSet );
-+        rWrapper.FcFontSetDestroy( pFSet );
-     if( pOSet )
--        aWrapper.FcObjectSetDestroy( pOSet );
-+        rWrapper.FcObjectSetDestroy( pOSet );
-     
-     // how does one get rid of the config ?
- #if OSL_DEBUG_LEVEL > 1
-@@ -409,4 +539,125 @@
- #endif
- #endif // ENABLE_FONTCONFIG
-     return nFonts != 0;
-+}
-+
-+void PrintFontManager::deinitFontconfig()
-+{
-+    FontCfgWrapper::release();
-+}
-+
-+bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo )
-+{
-+#ifdef ENABLE_FONTCONFIG
-+    FontCfgWrapper& rWrapper = FontCfgWrapper::get();
-+    if( ! rWrapper.isValid() )
-+        return false;
-+
-+    FcConfig* pConfig = rWrapper.getDefConfig();
-+    FcPattern* pPattern = rWrapper.FcPatternCreate();
-+
-+    // populate pattern with font characteristics
-+    OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
-+    if( aFamily.getLength() )
-+        rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
-+    if( rInfo.m_eItalic != italic::Unknown )
-+    {
-+        int nSlant = FC_SLANT_ROMAN;
-+        switch( rInfo.m_eItalic )
-+        {
-+            case italic::Italic:	 	nSlant = FC_SLANT_ITALIC;break;
-+            case italic::Oblique:	 	nSlant = FC_SLANT_OBLIQUE;break;
-+            default:
-+                break;
-+        }
-+        rWrapper.FcPatternAddInteger( pPattern, FC_SLANT, nSlant );
-+    }
-+    if( rInfo.m_eWeight != weight::Unknown )
-+    {
-+        int nWeight = FC_WEIGHT_NORMAL;
-+        switch( rInfo.m_eWeight )
-+        {
-+            case weight::Thin:			nWeight = FC_WEIGHT_THIN;break;
-+            case weight::UltraLight:	nWeight = FC_WEIGHT_ULTRALIGHT;break;
-+            case weight::Light:			nWeight = FC_WEIGHT_LIGHT;break;
-+            case weight::SemiLight:		nWeight = FC_WEIGHT_BOOK;break;
-+            case weight::Normal:		nWeight = FC_WEIGHT_NORMAL;break;
-+            case weight::Medium:		nWeight = FC_WEIGHT_MEDIUM;break;
-+            case weight::SemiBold:		nWeight = FC_WEIGHT_SEMIBOLD;break;
-+            case weight::Bold:			nWeight = FC_WEIGHT_BOLD;break;
-+            case weight::UltraBold:		nWeight	= FC_WEIGHT_ULTRABOLD;break;
-+            case weight::Black:			nWeight	= FC_WEIGHT_BLACK;break;
-+            default:
-+                break;
-+        }
-+        rWrapper.FcPatternAddInteger( pPattern, FC_WEIGHT, nWeight );
-+    }
-+    if( rInfo.m_eWidth != width::Unknown )
-+    {
-+        int nWidth = FC_WIDTH_NORMAL;
-+        switch( rInfo.m_eWidth )
-+        {
-+            case width::UltraCondensed:	nWidth = FC_WIDTH_ULTRACONDENSED;break;
-+            case width::ExtraCondensed: nWidth = FC_WIDTH_EXTRACONDENSED;break;
-+            case width::Condensed:		nWidth = FC_WIDTH_CONDENSED;break;
-+            case width::SemiCondensed:	nWidth = FC_WIDTH_SEMICONDENSED;break;
-+            case width::Normal:			nWidth = FC_WIDTH_NORMAL;break;
-+            case width::SemiExpanded:	nWidth = FC_WIDTH_SEMIEXPANDED;break;
-+            case width::Expanded:		nWidth = FC_WIDTH_EXPANDED;break;
-+            case width::ExtraExpanded:	nWidth = FC_WIDTH_EXTRAEXPANDED;break;
-+            case width::UltraExpanded:	nWidth = FC_WIDTH_ULTRACONDENSED;break;
-+            default:
-+                break;
-+        }
-+        rWrapper.FcPatternAddInteger( pPattern, FC_WIDTH, nWidth );
-+    }
-+    if( rInfo.m_ePitch != pitch::Unknown )
-+    {
-+        int nSpacing = FC_PROPORTIONAL;
-+        switch( rInfo.m_ePitch )
-+        {
-+            case pitch::Fixed:			nSpacing = FC_MONO;break;
-+            case pitch::Variable:		nSpacing = FC_PROPORTIONAL;break;
-+            default:
-+                break;
-+        }
-+        rWrapper.FcPatternAddInteger( pPattern, FC_SPACING, nSpacing );
-+    }
-+
-+    rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
-+    rWrapper.FcDefaultSubstitute( pPattern );
-+    FcResult eResult = FcResultNoMatch;
-+    FcPattern* pResult = rWrapper.FcFontMatch( pConfig, pPattern, &eResult );
-+    bool bSuccess = false;
-+    if( pResult )
-+    {
-+        FcFontSet* pSet = rWrapper.FcFontSetCreate();
-+        rWrapper.FcFontSetAdd( pSet, pResult );
-+        if( pSet->nfont > 0 )
-+        {
-+            //extract the closest match
-+            FcChar8* file = NULL;
-+            FcResult eFileRes	= rWrapper.FcPatternGetString( pSet->fonts[0], FC_FILE, 0, &file );
-+            if( eFileRes == FcResultMatch )
-+            {
-+                OString aDir, aBase, aOrgPath( (sal_Char*)file );
-+                splitPath( aOrgPath, aDir, aBase );
-+                int nDirID = getDirectoryAtom( aDir, true );
-+                fontID aFont = findFontFileID( nDirID, aBase );
-+                if( aFont > 0 )
-+                    bSuccess = getFontFastInfo( aFont, rInfo );
-+            }
-+        }
-+        // info: destroying the pSet destroys pResult implicitly
-+        // since pResult was "added" to pSet
-+        rWrapper.FcFontSetDestroy( pSet );
-+    }
-+
-+    // cleanup
-+    rWrapper.FcPatternDestroy( pPattern );
-+
-+    return bSuccess;
-+#else
-+    return false;
-+#endif
- }
-Index: source/fontmanager/fontmanager.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
-retrieving revision 1.50
-retrieving revision 1.51
-diff -w -u -r1.50 -r1.51
---- psprint/source/fontmanager/fontmanager.cxx	17 Jun 2004 13:51:09 -0000	1.50
-+++ psprint/source/fontmanager/fontmanager.cxx	5 Jul 2004 09:22:51 -0000	1.51
-@@ -581,10 +581,10 @@
-                         case 2:
-                         {
-                             const sal_uInt8* pSubTable = pTable;
--                            sal_uInt16 nRowWidth    = getUInt16BE( pTable );
-+                            /*sal_uInt16 nRowWidth    =*/ getUInt16BE( pTable );
-                             sal_uInt16 nOfLeft      = getUInt16BE( pTable );
-                             sal_uInt16 nOfRight     = getUInt16BE( pTable );
--                            sal_uInt16 nOfArray     = getUInt16BE( pTable );
-+                            /*sal_uInt16 nOfArray     =*/ getUInt16BE( pTable );
-                             const sal_uInt8* pTmp = pSubTable + nOfLeft;
-                             sal_uInt16 nFirstLeft   = getUInt16BE( pTmp );
-                             sal_uInt16 nLastLeft    = getUInt16BE( pTmp ) + nFirstLeft - 1;
-@@ -592,7 +592,7 @@
-                             sal_uInt16 nFirstRight  = getUInt16BE( pTmp );
-                             sal_uInt16 nLastRight   = getUInt16BE( pTmp ) + nFirstRight -1;
- 
--                            int nPairs = (int)(nLastLeft-nFirstLeft+1)*(int)(nLastRight-nFirstRight+1);
-+                            // int nPairs = (int)(nLastLeft-nFirstLeft+1)*(int)(nLastRight-nFirstRight+1);
-                             for( aPair.first = nFirstLeft; aPair.first < nLastLeft; aPair.first++ )
-                             {
-                                 for( aPair.second = 0; aPair.second < nLastRight; aPair.second++ )
-@@ -634,18 +634,18 @@
-                 
-                 // Loop through each of the 'kern' subtables
-                 KernPair aPair;
--                for( i = 0; i < pImplTTFont->nkern; i++ )
-+                for( i = 0; (unsigned int)i < pImplTTFont->nkern; i++ )
-                 {
-                     const sal_uInt8* pTable = pImplTTFont->kerntables[i];
-                     
--                    sal_uInt32 nLength      = getUInt32BE( pTable );
-+                    /*sal_uInt32 nLength      =*/ getUInt32BE( pTable );
-                     sal_uInt16 nCoverage    = getUInt16BE( pTable );
--                    sal_uInt16 nTupleIndex  = getUInt16BE( pTable );
-+                    /*sal_uInt16 nTupleIndex  =*/ getUInt16BE( pTable );
- 
-                     // Get kerning type
--                    sal_Bool bKernVertical     = nCoverage & 0x8000;
--                    sal_Bool bKernCrossStream  = nCoverage & 0x4000;
--                    sal_Bool bKernVariation    = nCoverage & 0x2000;
-+                    // sal_Bool bKernVertical     = nCoverage & 0x8000;
-+                    // sal_Bool bKernCrossStream  = nCoverage & 0x4000;
-+                    // sal_Bool bKernVariation    = nCoverage & 0x2000;
- 
-                     // Kerning sub-table format, 0 through 3
-                     sal_uInt8 nSubTableFormat  = nCoverage & 0x00FF;
-@@ -1154,6 +1154,7 @@
- 
- PrintFontManager::~PrintFontManager()
- {
-+    deinitFontconfig();
-     for( ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it )
-         delete (*it).second;
-     delete m_pAtoms;
-@@ -1238,7 +1239,7 @@
-         // first look for an adjacent file
-         static const char* pSuffix[] = { ".afm", ".AFM" };
-         
--        for( int i = 0; i < sizeof(pSuffix)/sizeof(pSuffix[0]); i++ )
-+        for( unsigned int i = 0; i < sizeof(pSuffix)/sizeof(pSuffix[0]); i++ )
-         {
-             ByteString aName( rFontFile );
-             aName.Erase( aName.Len()-4 );
-@@ -1549,6 +1550,8 @@
-                     break;
-                 case fonttype::TrueType:
-                     static_cast<TrueTypeFontFile*>(pFont)->m_aXLFD = rXLFDs.front();
-+                    break;
-+                default:
-                     break;
-             }
-         }
-Index: source/helper/ppdparser.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/helper/ppdparser.cxx,v
-retrieving revision 1.14
-retrieving revision 1.16
-diff -w -u -r1.14 -r1.16
---- psprint/source/helper/ppdparser.cxx	18 May 2004 10:45:57 -0000	1.14
-+++ psprint/source/helper/ppdparser.cxx	30 Jul 2004 15:14:16 -0000	1.16
-@@ -68,7 +68,7 @@
- namespace psp { class PPDKey; }
- 
- namespace  _STL {
--struct hash< const psp::PPDKey* >
-+template<> struct hash< const psp::PPDKey* >
- {
-     size_t operator()( const psp::PPDKey * pKey) const
-     { return (size_t)pKey; }
-@@ -268,16 +268,19 @@
-     return aName;
- }
- 
--const PPDParser* PPDParser::getParser( String aFile )
-+const PPDParser* PPDParser::getParser( const String& rFile )
- {
-     static ::osl::Mutex aMutex;
-     ::osl::Guard< ::osl::Mutex > aGuard( aMutex );
- 
--    if( aFile.CompareToAscii( "CUPS:", 5 ) != COMPARE_EQUAL )
--        aFile = getPPDFile( aFile );
-+    String aFile = rFile;
-+    if( rFile.CompareToAscii( "CUPS:", 5 ) != COMPARE_EQUAL )
-+        aFile = getPPDFile( rFile );
-     if( ! aFile.Len() )
-     {
--        fprintf( stderr, "Could not get printer PPD file!\n" );
-+#if OSL_DEBUG_LEVEL > 1
-+        fprintf( stderr, "Could not get printer PPD file \"%s\" !\n", OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() );
-+#endif
-         return NULL;
-     }
- 
-@@ -294,12 +297,16 @@
-         if( rMgr.getType() == PrinterInfoManager::CUPS )
-         {
-             pNewParser = const_cast<PPDParser*>(static_cast<CUPSManager&>(rMgr).createCUPSParser( aFile ));
--            if( pNewParser )
--                pNewParser->m_aFile = aFile;
-         }
-     }
-     if( pNewParser )
--        aAllParsers.push_back( pNewParser );
-+    {
-+        // this may actually be the SGENPRT parser,
-+        // so ensure uniquness here
-+        aAllParsers.remove( pNewParser );
-+        // insert new parser to list
-+        aAllParsers.push_front( pNewParser );
-+    }
-     return pNewParser;
- }
- 
-
-
-Index: source/printer/printerinfomanager.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/printerinfomanager.cxx,v
-retrieving revision 1.23
-retrieving revision 1.25
-diff -w -u -r1.23 -r1.25
---- psprint/source/printer/printerinfomanager.cxx	17 Mar 2004 10:51:45 -0000	1.23
-+++ psprint/source/printer/printerinfomanager.cxx	23 Jul 2004 10:09:11 -0000	1.25
-@@ -133,6 +133,9 @@
- 
-         if( pManager )
-             pManager->initialize();
-+#if OSL_DEBUG_LEVEL > 1
-+        fprintf( stderr, "PrinterInfoManager::get create Manager of type %d\n", pManager->getType() );
-+#endif
-     }
- 
-     return *pManager;
-@@ -1161,7 +1164,7 @@
-                 if( nSubstitute != -1 )
-                 {
-                     rInfo.m_aFontSubstitutions[ it->m_nID ] = nSubstitute;
--#if OSL_DEBUG_LEVEL > 1
-+#if OSL_DEBUG_LEVEL > 2
-                     FastPrintFontInfo aInfo;
-                     rFontManager.getFontFastInfo( nSubstitute, aInfo );
-                     fprintf( stderr,
-@@ -1220,7 +1223,8 @@
- {
-     const PrinterInfo&   rPrinterInfo	= getPrinterInfo (rPrintername);
-     const rtl::OUString& rCommand		= rPrinterInfo.m_aCommand;
--    const rtl::OString aShellCommand	= OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1);
-+    rtl::OString aShellCommand	= OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1);
-+    aShellCommand += rtl::OString( " 2>/dev/null" );
- 													  
-     return popen (aShellCommand.getStr(), "w");
- }
-@@ -1282,7 +1286,7 @@
-     const char*		pPrintCommand;
-     const char*		pForeToken;
-     const char*		pAftToken;
--    int					nForeTokenCount;
-+    unsigned int	nForeTokenCount;
- };
- 
- static const struct SystemCommandParameters aParms[] =
-@@ -1312,7 +1316,7 @@
- {
-     char pBuffer[1024];
-     ByteString aPrtQueueCmd, aForeToken, aAftToken, aString;
--    int nForeTokenCount = 0, i;
-+    unsigned int nForeTokenCount = 0, i;
-     FILE *pPipe;
-     bool bSuccess = false;
-     std::list< ByteString > aLines;
-@@ -1355,6 +1359,7 @@
-         else
- #endif
-         {
-+			aPrtQueueCmd += ByteString( " 2>/dev/null" );	
-             if( pPipe = popen( aPrtQueueCmd.GetBuffer(), "r" ) )
-             {
-                 while( fgets( pBuffer, 1024, pPipe ) )
-@@ -1403,7 +1408,7 @@
-                 ByteString aOutLine( aLines.front() );
-                 aLines.pop_front();
-             
--                for( int i = 0; i < nForeTokenCount && nPos != STRING_NOTFOUND; i++ )
-+                for( i = 0; i < nForeTokenCount && nPos != STRING_NOTFOUND; i++ )
-                 {
-                     nPos = aOutLine.Search( aForeToken, nPos );
-                     if( nPos != STRING_NOTFOUND && aOutLine.Len() >= nPos+aForeToken.Len() )
-@@ -1496,6 +1501,7 @@
-      return( applePrintSysType );
- }
- 
-+#if 0
- /*
-  * macxp_GetSystemPrintFormat()
-  *
-@@ -1509,7 +1515,7 @@
-  * therefore the environment variable OOO_PRINT_PS_DIRECTLY, if set,
-  * forces OOo to NOT undergo the PS -> PDF translation by default.
-  */
--/*sal_Int32 macxp_GetSystemPrintFormat( void )
-+sal_Int32 macxp_GetSystemPrintFormat( void )
- {
-      int			printFormat;
-      int			err;
-@@ -1520,15 +1526,15 @@
- 	
-      /* Check for presence of OSAScript executable, which is
-       * believed to be MacOS X only (ie not present on Darwin).
--      *
-+      */
-      err = stat( "/usr/bin/osascript", &status );
-      if ( err == 0 )
-      {
--          /* Check to see if the user wants to print PS anyway *
-+         /* Check to see if the user wants to print PS anyway */
-           pPDFOverride = getenv( "OOO_PRINT_PS_DIRECTLY" );
-           if ( pPDFOverride == NULL )
-           {
--               /* Now we have to check for ps2pdf to make sure we can do the conversion *
-+          /* Now we have to check for ps2pdf to make sure we can do the conversion */
-                err = stat( kApplePS2PDFLocation, &status );
-                if ( err == 0 )
-                {
-@@ -1541,6 +1547,7 @@
-      }
- 	
-      return( printFormat );
--}*/
-+}
-+#endif
- #endif
- 
---- ../OOO_1_1_3_fix2/psprint/source/printer/cupsmgr.cxx	2004-08-30 16:46:55.000000000 +0100
-+++ psprint/source/printer/cupsmgr.cxx	2004-09-07 11:18:11.200669640 +0100
-@@ -1,10 +1,10 @@
- /*************************************************************************
-  *
-- *  
-+ *  $RCSfile$
-  *
-- *  
-+ *  $Revision$
-  *
-- *  
-+ *  last change: $Author$ $Date$
-  *
-  *  The Contents of this file are made available subject to the terms of
-  *  either of the following licenses
-@@ -70,6 +70,7 @@
- 
- #include <osl/thread.h>
- #include <osl/diagnose.h>
-+#include <osl/conditn.hxx>
- #include <rtl/ustrbuf.hxx>
- #include <cupsmgr.hxx>
- 
-@@ -78,20 +79,21 @@
- class CUPSWrapper
- {
-     oslModule		m_pLib;
-+    osl::Mutex		m_aGetPPDMutex;
- 
-     int				(*m_pcupsPrintFile)(const char*, const char*, const char*, int, cups_option_t*);
-     int				(*m_pcupsGetDests)(cups_dest_t**);
-     void			(*m_pcupsSetDests)(int,cups_dest_t*);
-     void			(*m_pcupsFreeDests)(int,cups_dest_t*);
--    const char*	(*m_pcupsGetPPD)(const char*);
-+    const char*		(*m_pcupsGetPPD)(const char*);
-     int				(*m_pcupsMarkOptions)(ppd_file_t*,int,cups_option_t*);
-     int				(*m_pcupsAddOption)(const char*,const char*,int,cups_option_t**);
-     void			(*m_pcupsFreeOptions)(int,cups_option_t*);
-     ppd_file_t*		(*m_pppdOpenFile)(const char* pFile);
-     void			(*m_pppdClose)(ppd_file_t*);
--    const char*	(*m_pcupsServer)();
-+    const char*		(*m_pcupsServer)();
-     void			(*m_pcupsSetPasswordCB)(const char*(cb)(const char*));
--    const char*	(*m_pcupsUser)();
-+    const char*		(*m_pcupsUser)();
-     void			(*m_pcupsSetUser)(const char*);
- 
-     void* loadSymbol( const char* );
-@@ -117,8 +119,7 @@
-                    cups_option_t* pOptions )
-     { return m_pcupsPrintFile( pPrinter, pFileName, pTitle, nOptions, pOptions ); }
- 
--    const char* cupsGetPPD( const char* pPrinter )
--    { return m_pcupsGetPPD( pPrinter ); }
-+    const char* cupsGetPPD( const char* pPrinter );
- 
-     int cupsMarkOptions(ppd_file_t* pPPD, int nOptions, cups_option_t* pOptions )
-     { return m_pcupsMarkOptions(pPPD, nOptions, pOptions); }
-@@ -251,6 +252,70 @@
-     return m_pLib != NULL;
- }
- 
-+static struct GetPPDAttribs
-+{
-+    const char* (*pFunction)(const char*);
-+    osl::Condition		m_aCondition;
-+    const char*			m_pParameter;
-+    const char*			m_pResult;
-+    oslThread			m_aThread;
-+} *pAttribs = NULL;
-+
-+extern "C" {
-+    static void getPPDWorker(void*)
-+    {
-+        pAttribs->m_pResult = pAttribs->pFunction( pAttribs->m_pParameter );
-+        if( pAttribs->m_aCondition.check() )
-+        {
-+            // timed out, unlink file
-+            if( pAttribs->m_pResult )
-+                unlink( pAttribs->m_pResult );
-+            delete pAttribs;
-+            pAttribs = NULL;
-+        }
-+        else
-+            pAttribs->m_aCondition.set();
-+    }
-+}
-+
-+const char* CUPSWrapper::cupsGetPPD( const char* pPrinter )
-+{
-+    const char* pResult = NULL;
-+
-+    // if one thread hangs in cupsGetPPD already, don't start another
-+    if( ! pAttribs )
-+    {
-+        pAttribs = new GetPPDAttribs();
-+        pAttribs->pFunction			= m_pcupsGetPPD;
-+        pAttribs->m_aCondition.reset();
-+        pAttribs->m_pParameter		= pPrinter;
-+        pAttribs->m_pResult			= NULL;
-+        pAttribs->m_aThread			= osl_createThread( getPPDWorker, NULL );
-+
-+        TimeValue aValue;
-+        aValue.Seconds = 5;
-+        aValue.Nanosec = 0;
-+        if( pAttribs->m_aCondition.wait( &aValue ) == Condition::result_ok )
-+        {
-+            osl_destroyThread( pAttribs->m_aThread );
-+            pResult = pAttribs->m_pResult;
-+            delete pAttribs;
-+            pAttribs = NULL;
-+        }
-+        else
-+        {
-+#if OSL_DEBUG_LEVEL > 1
-+            fprintf( stderr, "cupsGetPPD %s timed out\n", pPrinter );
-+#endif
-+            // should the thread awake again notify it to clean up itself
-+            pAttribs->m_aCondition.set();
-+            osl_destroyThread( pAttribs->m_aThread );
-+        }
-+    }
-+
-+    return pResult;
-+}
-+
- static const char* setPasswordCallback( const char* pIn )
- {
-     const char* pRet = NULL;
-@@ -276,66 +341,91 @@
-         // try to load CUPS
-         CUPSWrapper* pWrapper = new CUPSWrapper();
-         if( pWrapper->isValid() )
--        {
--            // check if there are any dests; if not
--            // CUPS is unconfigured (at least) and
--            // should not be used
--            cups_dest_t* pDests = NULL;
--            int nDests = pWrapper->cupsGetDests( &pDests );
--            if( nDests && pDests )
--                pManager = new CUPSManager( pWrapper, nDests, pDests );
--#if OSL_DEBUG_LEVEL > 1
--            else
--                fprintf( stderr, "CUPS loaded but no dests -> CUPS disabled\n" );
--#endif
--        }
--        // something failed, don't use CUPS
--        if( ! pManager )
-+            pManager = new CUPSManager( pWrapper );
-+        else
-             delete pWrapper;
-     }
- #endif
-     return pManager;
- }
- 
--CUPSManager::CUPSManager( CUPSWrapper* pWrapper, int nDests, void* pDests ) :
-+CUPSManager::CUPSManager( CUPSWrapper* pWrapper ) :
-         PrinterInfoManager( CUPS ),
-         m_pCUPSWrapper( pWrapper ),
--        m_nDests( nDests ),
--        m_pDests( pDests )
-+        m_nDests( 0 ),
-+        m_pDests( NULL ),
-+        m_bNewDests( false )
- {
--        m_bFirstDest = (nDests && pDests);
-+    m_aDestThread = osl_createThread( runDestThread, this );
- }
- 
- CUPSManager::~CUPSManager()
- {
-+    if( m_aDestThread )
-+    {
-+        // if the thread is still running here, then
-+        // cupsGetDests is hung; terminate the thread instead of joining
-+        osl_terminateThread( m_aDestThread );
-+        osl_destroyThread( m_aDestThread );
-+    }
-+
-     if( m_nDests && m_pDests )
-         m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
-     delete m_pCUPSWrapper;
- }
- 
-+void CUPSManager::runDestThread( void* pThis )
-+{
-+    ((CUPSManager*)pThis)->runDests();
-+}
-+
-+void CUPSManager::runDests()
-+{
-+#if OSL_DEBUG_LEVEL > 1
-+    fprintf( stderr, "starting cupsGetDests\n" );
-+#endif
-+    osl::MutexGuard aGuard( m_aCUPSMutex );
-+
-+    m_nDests = m_pCUPSWrapper->cupsGetDests( (cups_dest_t**)&m_pDests );
-+    m_bNewDests = true;
-+#if OSL_DEBUG_LEVEL > 1
-+    fprintf( stderr, "finished cupsGetDests\n" );
-+#endif
-+}
-+
- void CUPSManager::initialize()
- {
-+    // get normal printers, clear printer list
-+    PrinterInfoManager::initialize();
-+
- #ifdef ENABLE_CUPS
--    // there may have been a previous run
--    if( m_nDests && m_pDests && !m_bFirstDest )
--        m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
--    m_aPrinters.clear();
-+    // check whether thread has completed
-+    // if not behave like old printing system
-+    osl::MutexGuard aGuard( m_aCUPSMutex );
-+
-+    if( ! (m_nDests && m_pDests ) )
-+        return;
-+
-+    // dest thread has run, clean up
-+    if( m_aDestThread )
-+    {
-+        osl_joinWithThread( m_aDestThread );
-+        osl_destroyThread( m_aDestThread );
-+        m_aDestThread = NULL;
-+    }
-+
-+    // clear old stuff
-     m_aCUPSDestMap.clear();
- 
--    // get normal printers
--    PrinterInfoManager::initialize();
-+#if 0
-+    // update dests
-+    m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
-+    m_nDests = m_pCUPSWrapper->cupsGetDests( (cups_dest_t**)&m_pDests );
-+#endif
-+    m_bNewDests = false;
- 
-     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
--    int nPrinter = 0;
--
--    // get CUPS dests if this is not the first run after the constructor
--    // in which case m_pDests was already intialized
--    if( m_bFirstDest && m_nDests && m_pDests )
--        nPrinter = m_nDests;
--    else
--        m_nDests = nPrinter = m_pCUPSWrapper->cupsGetDests( (cups_dest_t**)&m_pDests );
--    
--    m_bFirstDest = false;
-+    int nPrinter = m_nDests;
- 
-     // add CUPS printers, should there be a printer
-     // with the same name as a CUPS printer, overwrite it
-@@ -464,53 +554,60 @@
-         aPrinter = rPrinter;
- 
- #ifdef ENABLE_CUPS
--    std::hash_map< OUString, int, OUStringHash >::iterator dest_it =
--        m_aCUPSDestMap.find( aPrinter );
--    if( dest_it != m_aCUPSDestMap.end() )
-+    if( m_aCUPSMutex.tryToAcquire() && m_nDests && m_pDests )
-     {
--        cups_dest_t* pDest = ((cups_dest_t*)m_pDests) + dest_it->second;
--        const char* pPPDFile = m_pCUPSWrapper->cupsGetPPD( pDest->name );
-+        std::hash_map< OUString, int, OUStringHash >::iterator dest_it =
-+            m_aCUPSDestMap.find( aPrinter );
-+        if( dest_it != m_aCUPSDestMap.end() )
-+        {
-+            cups_dest_t* pDest = ((cups_dest_t*)m_pDests) + dest_it->second;
-+            const char* pPPDFile = m_pCUPSWrapper->cupsGetPPD( pDest->name );
- #if OSL_DEBUG_LEVEL > 1
--        fprintf( stderr, "PPD for %s is %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr(), pPPDFile );
-+            fprintf( stderr, "PPD for %s is %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr(), pPPDFile );
- #endif
--        if( pPPDFile )
--        {
--            rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
--            OUString aFileName( OStringToOUString( pPPDFile, aEncoding ) );
--            // create the new parser
--            pNewParser = new PPDParser( aFileName );
--
--            // update the printer info with context information
--            ppd_file_t* pPPD = m_pCUPSWrapper->ppdOpenFile( pPPDFile );
--            /*int nConflicts =*/ m_pCUPSWrapper->cupsMarkOptions( pPPD, pDest->num_options, pDest->options );
--#if OSL_DEBUG_LEVEL > 1
--            fprintf( stderr, "processing the following options for printer %s (instance %s):\n",
--                     pDest->name, pDest->instance );
--            for( int k = 0; k < pDest->num_options; k++ )
--                fprintf( stderr, "   \"%s\" = \"%s\"\n",
--                         pDest->options[k].name,
--                         pDest->options[k].value );
--#endif
--            PrinterInfo& rInfo = m_aPrinters[ aPrinter ].m_aInfo;
--
--            rInfo.m_pParser = pNewParser;
--            rInfo.m_aContext.setParser( pNewParser );
--            for( int i = 0; i < pPPD->num_groups; i++ )
--                updatePrinterContextInfo( pPPD->groups + i, rInfo );
-+            if( pPPDFile )
-+            {
-+                rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-+                OUString aFileName( OStringToOUString( pPPDFile, aEncoding ) );
-+                // create the new parser
-+                PPDParser* pCUPSParser =  new PPDParser( aFileName );
-+                pCUPSParser->m_aFile = rPrinter;
-+                pNewParser = pCUPSParser;
-+
-+                // update the printer info with context information
-+                ppd_file_t* pPPD = m_pCUPSWrapper->ppdOpenFile( pPPDFile );
-+                /*int nConflicts =*/ m_pCUPSWrapper->cupsMarkOptions( pPPD, pDest->num_options, pDest->options );
-+#if OSL_DEBUG_LEVEL > 1
-+                fprintf( stderr, "processing the following options for printer %s (instance %s):\n",
-+                         pDest->name, pDest->instance );
-+                for( int k = 0; k < pDest->num_options; k++ )
-+                    fprintf( stderr, "   \"%s\" = \"%s\"\n",
-+                             pDest->options[k].name,
-+                             pDest->options[k].value );
-+#endif
-+                PrinterInfo& rInfo = m_aPrinters[ aPrinter ].m_aInfo;
-+
-+                rInfo.m_pParser = pNewParser;
-+                rInfo.m_aContext.setParser( pNewParser );
-+                for( int i = 0; i < pPPD->num_groups; i++ )
-+                    updatePrinterContextInfo( pPPD->groups + i, rInfo );
- 
--            // clean up the mess
--            m_pCUPSWrapper->ppdClose( pPPD );
-+                // clean up the mess
-+                m_pCUPSWrapper->ppdClose( pPPD );
- 
--            // remove temporary PPD file
--            unlink( pPPDFile );
--        }
-+                // remove temporary PPD file
-+                unlink( pPPDFile );
-+            }
- #if OSL_DEBUG_LEVEL > 1
--        else
--            fprintf( stderr, "no dest found for printer %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr() );
-+            else
-+                fprintf( stderr, "no dest found for printer %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr() );
- #endif
-+        }
-+        m_aCUPSMutex.release();
-     }
--    if( ! pNewParser )
- #endif // ENABLE_CUPS
-+
-+    if( ! pNewParser )
-     {
-         // get the default PPD
-         pNewParser = PPDParser::getParser( String( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) );
-@@ -583,6 +680,8 @@
-         fclose( pFile );
-         rtl_TextEncoding aEnc = osl_getThreadTextEncoding();
- 
-+        osl::MutexGuard aGuard( m_aCUPSMutex );
-+
-         std::hash_map< OUString, int, OUStringHash >::iterator dest_it =
-             m_aCUPSDestMap.find( rPrintername );
-         if( dest_it != m_aCUPSDestMap.end() )
-@@ -625,7 +724,18 @@
- 
- bool CUPSManager::checkPrintersChanged()
- {
--    return PrinterInfoManager::checkPrintersChanged();
-+    bool bChanged = false;
-+    if( m_aCUPSMutex.tryToAcquire() )
-+    {
-+        bChanged = m_bNewDests;
-+        m_aCUPSMutex.release();
-+        initialize();
-+    }
-+
-+    if( ! bChanged )
-+        bChanged = PrinterInfoManager::checkPrintersChanged();
-+
-+    return bChanged;
- }
- 
- bool CUPSManager::addPrinter( const OUString& rName, const OUString& rDriver )
-@@ -648,23 +758,23 @@
- 
- bool CUPSManager::setDefaultPrinter( const OUString& rName )
- {
-+    bool bSuccess = false;
- #ifdef ENABLE_CUPS
-     std::hash_map< OUString, int, OUStringHash >::iterator nit =
-         m_aCUPSDestMap.find( rName );
--    if( nit == m_aCUPSDestMap.end() )
--        return false;
--
--    cups_dest_t* pDests = (cups_dest_t*)m_pDests;
--    for( int i = 0; i < m_nDests; i++ )
--        pDests[i].is_default = 0;
--    pDests[ nit->second ].is_default = 1;
--    m_pCUPSWrapper->cupsSetDests( m_nDests, (cups_dest_t*)m_pDests );
--    m_aDefaultPrinter = rName;
--
--    return true;
--#else
--    return false;
-+    if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() )
-+    {
-+        cups_dest_t* pDests = (cups_dest_t*)m_pDests;
-+        for( int i = 0; i < m_nDests; i++ )
-+            pDests[i].is_default = 0;
-+        pDests[ nit->second ].is_default = 1;
-+        m_pCUPSWrapper->cupsSetDests( m_nDests, (cups_dest_t*)m_pDests );
-+        m_aDefaultPrinter = rName;
-+        m_aCUPSMutex.release();
-+        bSuccess = true;
-+    }
- #endif
-+    return bSuccess;
- }
- 
- bool CUPSManager::writePrinterConfig()
-@@ -684,32 +794,39 @@
-         if( ! prt->second.m_bModified )
-             continue;
- 
--        bDestModified = true;
--        cups_dest_t* pDest = ((cups_dest_t*)m_pDests) + nit->second;
--        PrinterInfo& rInfo = prt->second.m_aInfo;
--
--        // create new option list
--        int nNewOptions = 0;
--        cups_option_t* pNewOptions = NULL; 
--        int nValues = rInfo.m_aContext.countValuesModified();
--        for( int i = 0; i < nValues; i++ )
-+        if( m_aCUPSMutex.tryToAcquire() )
-         {
--            const PPDKey* pKey = rInfo.m_aContext.getModifiedKey( i );
--            const PPDValue* pValue = rInfo.m_aContext.getValue( pKey );
--            if( pKey && pValue ) // sanity check
-+            bDestModified = true;
-+            cups_dest_t* pDest = ((cups_dest_t*)m_pDests) + nit->second;
-+            PrinterInfo& rInfo = prt->second.m_aInfo;
-+
-+            // create new option list
-+            int nNewOptions = 0;
-+            cups_option_t* pNewOptions = NULL; 
-+            int nValues = rInfo.m_aContext.countValuesModified();
-+            for( int i = 0; i < nValues; i++ )
-             {
--                OString aName = OUStringToOString( pKey->getKey(), aEncoding );
--                OString aValue = OUStringToOString( pValue->m_aOption, aEncoding );
--                nNewOptions = m_pCUPSWrapper->cupsAddOption( aName.getStr(), aValue.getStr(), nNewOptions, &pNewOptions );
-+                const PPDKey* pKey = rInfo.m_aContext.getModifiedKey( i );
-+                const PPDValue* pValue = rInfo.m_aContext.getValue( pKey );
-+                if( pKey && pValue ) // sanity check
-+                {
-+                    OString aName = OUStringToOString( pKey->getKey(), aEncoding );
-+                    OString aValue = OUStringToOString( pValue->m_aOption, aEncoding );
-+                    nNewOptions = m_pCUPSWrapper->cupsAddOption( aName.getStr(), aValue.getStr(), nNewOptions, &pNewOptions );
-+                }
-             }
-+            // set PPD options on CUPS dest
-+            m_pCUPSWrapper->cupsFreeOptions( pDest->num_options, pDest->options );
-+            pDest->num_options = nNewOptions;
-+            pDest->options = pNewOptions;
-+            m_aCUPSMutex.release();
-         }
--        // set PPD options on CUPS dest
--        m_pCUPSWrapper->cupsFreeOptions( pDest->num_options, pDest->options );
--        pDest->num_options = nNewOptions;
--        pDest->options = pNewOptions;
-     }
--    if( bDestModified )
-+    if( bDestModified && m_aCUPSMutex.tryToAcquire() )
-+    {
-         m_pCUPSWrapper->cupsSetDests( m_nDests, (cups_dest_t*)m_pDests );
-+        m_aCUPSMutex.release();
-+    }
- #endif // ENABLE_CUPS
- 
-     return PrinterInfoManager::writePrinterConfig();
-@@ -731,6 +848,8 @@
-             (bool(*)(const OString&,OString&,OString&))osl_getSymbol( pLib, aSym.pData );
-         if( getpw )
-         {
-+            osl::MutexGuard aGuard( m_aCUPSMutex );
-+
-             OString aUser = m_pCUPSWrapper->cupsUser();
-             OString aServer = m_pCUPSWrapper->cupsServer();
-             OString aPassword;
diff --git a/patches/vclplug/psprint-nojvmfwk.diff b/patches/vclplug/psprint-nojvmfwk.diff
new file mode 100644
index 000000000..d18d9622f
--- /dev/null
+++ b/patches/vclplug/psprint-nojvmfwk.diff
@@ -0,0 +1,146 @@
+Index: psprint/source/helper/helper.cxx
+===================================================================
+--- psprint/source/helper/helper.cxx.orig	2004-12-03 12:51:50.722009016 +0000
++++ psprint/source/helper/helper.cxx	2004-12-03 12:52:00.583509840 +0000
+@@ -73,7 +73,7 @@
+ #include <rtl/bootstrap.hxx>
+ #include <sal/config.h>
+ #ifdef SOLAR_JAVA
+-#include <jvmfwk/framework.h>
++#include "jvmaccess/javainfo.hxx"
+ #endif // SOLAR_JAVA
+ 
+ #ifdef MACOSX
+@@ -247,36 +247,87 @@ const OUString& psp::getFontPath()
+ 
+         // append jre/jdk fonts if possible
+         OString aJREpath;
+-
+-#ifdef SOLAR_JAVA        
+-        JavaInfo * pInfo = NULL;
+-        javaFrameworkError jerr = jfw_getSelectedJRE( & pInfo);
+-        if (jerr == JFW_E_NONE && pInfo != NULL)
+-        {
+-            OUString aSys;
+-            if( osl_getSystemPathFromFileURL( pInfo->sLocation, &aSys.pData ) == osl_File_E_None )
+-                aJREpath = OUStringToOString( aSys, osl_getThreadTextEncoding() );
+-        }
+-        jfw_freeJavaInfo(pInfo);
+-#endif
+-            
+-        if( aJREpath.getLength() > 0 )
++        if( aUserPath.getLength() )
+         {
+-            OString aTestPath( aJREpath );
+-            aTestPath += "/jre/lib/fonts";
+-            if( access( aTestPath.getStr(), R_OK ) )
++            OUString aJavaRc( aUserPath );
++            aJavaRc += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/config/" SAL_CONFIGFILE( "java" ) ) );
++            Config aConfig( aJavaRc );
++            aConfig.SetGroup( "Java" );
++            aJREpath = aConfig.ReadKey( "Home" );
++            if( ! aJREpath.getLength() )
++            {
++                aJavaRc = aNetPath;
++                aJavaRc += OUString( RTL_CONSTASCII_USTRINGPARAM( "/share/config/" SAL_CONFIGFILE("java") ) );
++                Config aShareConfig( aJavaRc );
++                aShareConfig.SetGroup( "Java" );
++                aJREpath = aShareConfig.ReadKey( "Home" );
++            }
++                
++            if( aJREpath.compareTo( "file:", 5 ) == 0 )
+             {
+-                aTestPath = aJREpath;
+-                aTestPath += "/lib/fonts";
++                OUString aURL( OStringToOUString( aJREpath, osl_getThreadTextEncoding() ) );
++                OUString aSys;
++                if( osl_getSystemPathFromFileURL( aURL.pData, &aSys.pData ) == osl_File_E_None )
++                    aJREpath = OUStringToOString( aSys, osl_getThreadTextEncoding() );
++            }
++            
++            if( aJREpath.getLength() > 0 )
++            {
++                OString aTestPath( aJREpath );
++                aTestPath += "/jre/lib/fonts";
+                 if( access( aTestPath.getStr(), R_OK ) )
+-                    aJREpath = OString();
++                {
++                    aTestPath = aJREpath;
++                    aTestPath += "/lib/fonts";
++                    if( access( aTestPath.getStr(), R_OK ) )
++                        aJREpath = OString();
++                    else
++                        aJREpath = aTestPath;
++                }
+                 else
+                     aJREpath = aTestPath;
+             }
+-            else
+-                aJREpath = aTestPath;
+         }
+ 
++#ifdef SOLAR_JAVA
++        // if no javarc (e.g. in setup) exists or it failed try the UDK method
++        if( ! aJREpath.getLength() )
++        {
++            OString aJavaLib;
++            try
++            {
++                OUString aLib;
++                if (osl::FileBase::getSystemPathFromFileURL(
++                            jvmaccess::JavaInfo::createBestInfo(true).
++                                getRuntimeLibLocation(),
++                            aLib)
++                        == osl::FileBase::E_None)
++                    aLib.convertToString(
++                        &aJavaLib, osl_getThreadTextEncoding(),
++                        RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
++                            | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR);
++            }
++            catch (jvmaccess::JavaInfo::InitException &)
++            {}
++
++            if (aJavaLib.getLength() != 0)
++            {
++                sal_Int32 nIndex;
++                while( ( nIndex = aJavaLib.lastIndexOf( '/' ) ) != -1 )
++                {
++                    aJavaLib = aJavaLib.copy( 0, nIndex );
++                    OString aTmpPath = aJavaLib;
++                    aTmpPath += "/lib/fonts";
++                    if( access( aTmpPath.getStr(), R_OK ) == 0 )
++                    {
++                        aJREpath = aTmpPath;
++                        break;
++                    }
++                }
++            }
++        }
++#endif // SOLAR_JAVA
++
+         if( aJREpath.getLength() )
+         {
+             aPath += OUString( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
+Index: psprint/prj/build.lst
+===================================================================
+--- psprint/prj/build.lst.orig	2004-12-03 12:40:47.820785320 +0000
++++ psprint/prj/build.lst	2004-12-03 12:52:14.974322104 +0000
+@@ -1,4 +1,4 @@
+-pp	psprint	:	tools unotools cpputools jvmaccess SO:print_header jvmfwk NULL
++pp	psprint	:	tools unotools cpputools jvmaccess SO:print_header NULL
+ pp	psprint									usr1	-	all	pp_mkout NULL
+ pp	psprint\source\fontsubset				nmake	-	all	pp_fontsset NULL
+ pp	psprint\source\printer					nmake	-	u	pp_printer NULL
+Index: psprint/util/makefile.mk
+===================================================================
+--- psprint/util/makefile.mk.orig	2004-12-03 12:40:47.863778784 +0000
++++ psprint/util/makefile.mk	2004-12-03 13:10:17.206797760 +0000
+@@ -105,7 +105,7 @@ SHL1STDLIBS=$(UNOTOOLSLIB)		\
+ 			$(SALLIB)			\
+ 			-lX11
+ .IF "$(SOLAR_JAVA)"!=""
+-SHL1STDLIBS+=$(JVMFWKLIB)
++SHL1STDLIBS+=$(JVMACCESSLIB)
+ .ENDIF
+ 
+ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
diff --git a/patches/vclplug/vcl-inc.diff b/patches/vclplug/vcl-inc.diff
index 9abbee81a..9888e8296 100644
--- a/patches/vclplug/vcl-inc.diff
+++ b/patches/vclplug/vcl-inc.diff
@@ -1,9 +1,7 @@
 Index: vcl/inc/abstdlg.hxx
 ===================================================================
-RCS file: vcl/inc/abstdlg.hxx
-diff -N vcl/inc/abstdlg.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/abstdlg.hxx	3 Feb 2004 17:13:21 -0000	1.3
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/abstdlg.hxx	2004-09-12 14:54:44.784065432 +0200
 @@ -0,0 +1,101 @@
 +/*************************************************************************
 + *
@@ -108,12 +106,8 @@ diff -N vcl/inc/abstdlg.hxx
 +
 Index: vcl/inc/accel.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/accel.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/accel.hxx	7 Dec 2000 13:37:15 -0000	1.2
-+++ vcl/inc/accel.hxx	6 Jan 2004 12:50:31 -0000	1.3
+--- vcl/inc/accel.hxx.orig	2004-09-12 14:26:21.659979648 +0200
++++ vcl/inc/accel.hxx	2004-09-12 14:54:44.785065280 +0200
 @@ -65,11 +65,11 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -166,13 +160,9 @@ diff -u -p -u -r1.2 -r1.3
  	virtual void	Deactivate();
 Index: vcl/inc/alpha.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/alpha.hxx,v
-retrieving revision 1.3
-retrieving revision 1.6
-diff -u -p -u -r1.3 -r1.6
---- vcl/inc/alpha.hxx	12 Sep 2002 09:30:19 -0000	1.3
-+++ vcl/inc/alpha.hxx	21 May 2004 16:20:16 -0000	1.6
-@@ -70,15 +70,15 @@
+--- vcl/inc/alpha.hxx.orig	2004-09-12 14:26:21.659979648 +0200
++++ vcl/inc/alpha.hxx	2004-09-12 14:54:44.786065128 +0200
+@@ -70,16 +70,16 @@
  // - AlphaMask -
  // -------------
  
@@ -185,21 +175,18 @@ diff -u -p -u -r1.3 -r1.6
 +	friend SvStream& operator<<( SvStream&, const ImageList& );
  
  private:
--
+ 
 -	long					nDummy1;
 -	long					nDummy2;
- 
+-
  	const Bitmap&			ImplGetBitmap() const;
  	void					ImplSetBitmap( const Bitmap& rBitmap );
+ 
 Index: vcl/inc/apptypes.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/apptypes.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/apptypes.hxx	11 Jul 2001 08:32:52 -0000	1.3
-+++ vcl/inc/apptypes.hxx	6 Jan 2004 12:51:37 -0000	1.4
-@@ -62,12 +62,12 @@
+--- vcl/inc/apptypes.hxx.orig	2004-09-12 14:26:21.660979496 +0200
++++ vcl/inc/apptypes.hxx	2004-09-12 14:54:44.786065128 +0200
+@@ -62,14 +62,14 @@
  #ifndef _VCL_APPTYPES_HXX
  #define _VCL_APPTYPES_HXX
  
@@ -209,21 +196,19 @@ diff -u -p -u -r1.3 -r1.4
 -
  #ifndef _SV_SV_H
  #include <sv.h>
-+#endif
-+
-+#ifndef _RTTI_HXX
-+#include <tools/rtti.hxx>
  #endif
  
++#ifndef _RTTI_HXX
++#include <tools/rtti.hxx>
++#endif
++
+ // ---------------------
+ // - Application-Types -
  // ---------------------
 Index: vcl/inc/bitmap.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/bitmap.hxx,v
-retrieving revision 1.8
-retrieving revision 1.13
-diff -u -p -u -r1.8 -r1.13
---- vcl/inc/bitmap.hxx	24 Apr 2003 14:56:11 -0000	1.8
-+++ vcl/inc/bitmap.hxx	10 Jun 2004 17:36:43 -0000	1.13
+--- vcl/inc/bitmap.hxx.orig	2004-09-12 14:26:21.662979192 +0200
++++ vcl/inc/bitmap.hxx	2004-09-12 14:54:44.787064976 +0200
 @@ -68,8 +68,8 @@
  #ifndef _SV_MAPMOD_HXX
  #include <mapmod.hxx>
@@ -287,12 +272,8 @@ diff -u -p -u -r1.8 -r1.13
  public:
 Index: vcl/inc/bitmapex.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/bitmapex.hxx,v
-retrieving revision 1.5
-retrieving revision 1.9
-diff -u -p -u -r1.5 -r1.9
---- vcl/inc/bitmapex.hxx	22 Oct 2002 17:07:54 -0000	1.5
-+++ vcl/inc/bitmapex.hxx	21 May 2004 16:20:50 -0000	1.9
+--- vcl/inc/bitmapex.hxx.orig	2004-09-12 14:26:21.663979040 +0200
++++ vcl/inc/bitmapex.hxx	2004-09-12 14:54:44.788064824 +0200
 @@ -68,8 +68,8 @@
  #ifndef _SV_ALPHA_HXX
  #include <alpha.hxx>
@@ -330,12 +311,8 @@ diff -u -p -u -r1.5 -r1.9
      ImpBitmap*			ImplGetBitmapImpBitmap() const { return aBitmap.ImplGetImpBitmap(); }
 Index: vcl/inc/brdwin.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/brdwin.hxx,v
-retrieving revision 1.2
-retrieving revision 1.4
-diff -u -p -u -r1.2 -r1.4
---- vcl/inc/brdwin.hxx	16 Feb 2001 11:09:45 -0000	1.2
-+++ vcl/inc/brdwin.hxx	17 Jun 2004 12:01:23 -0000	1.4
+--- vcl/inc/brdwin.hxx.orig	2004-09-12 14:26:21.665978736 +0200
++++ vcl/inc/brdwin.hxx	2004-09-12 14:54:44.789064672 +0200
 @@ -156,14 +156,12 @@ private:
  	BOOL					mbHelpBtn;
  	BOOL					mbDisplayActive;
@@ -436,12 +413,8 @@ diff -u -p -u -r1.2 -r1.4
  };
 Index: vcl/inc/btndlg.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/btndlg.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/btndlg.hxx	7 Dec 2000 13:37:15 -0000	1.2
-+++ vcl/inc/btndlg.hxx	6 Jan 2004 12:53:29 -0000	1.3
+--- vcl/inc/btndlg.hxx.orig	2004-09-12 14:26:21.666978584 +0200
++++ vcl/inc/btndlg.hxx	2004-09-12 14:54:44.790064520 +0200
 @@ -101,20 +101,15 @@ private:
  	BOOL				mbFormat;
  	Link				maClickHdl;
@@ -466,12 +439,8 @@ diff -u -p -u -r1.2 -r1.3
  						ButtonDialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
 Index: vcl/inc/button.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/button.hxx,v
-retrieving revision 1.8
-retrieving revision 1.11
-diff -u -p -u -r1.8 -r1.11
---- vcl/inc/button.hxx	17 Apr 2003 17:55:12 -0000	1.8
-+++ vcl/inc/button.hxx	10 May 2004 15:40:59 -0000	1.11
+--- vcl/inc/button.hxx.orig	2004-09-12 14:26:21.667978432 +0200
++++ vcl/inc/button.hxx	2004-09-12 14:54:44.791064368 +0200
 @@ -78,6 +78,10 @@
  #include <bitmap.hxx>
  #endif
@@ -520,7 +489,7 @@ diff -u -p -u -r1.8 -r1.11
      virtual void    UserDraw( const UserDrawEvent& rUDEvt );
  
      virtual void    Toggle();
-@@ -253,10 +246,8 @@ inline BOOL PushButton::IsChecked() cons
+@@ -253,10 +253,8 @@ inline BOOL PushButton::IsChecked() cons
  
  class OKButton : public PushButton
  {
@@ -531,7 +500,7 @@ diff -u -p -u -r1.8 -r1.11
  
  public:
                      OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON );
-@@ -271,10 +262,8 @@ public:
+@@ -271,10 +269,8 @@ public:
  
  class CancelButton : public PushButton
  {
@@ -542,7 +511,7 @@ diff -u -p -u -r1.8 -r1.11
  
  public:
                      CancelButton( Window* pParent, WinBits nStyle = 0 );
-@@ -289,10 +278,8 @@ public:
+@@ -289,10 +285,8 @@ public:
  
  class HelpButton : public PushButton
  {
@@ -553,7 +522,7 @@ diff -u -p -u -r1.8 -r1.11
  
  public:
                      HelpButton( Window* pParent, WinBits nStyle = 0 );
-@@ -318,12 +305,9 @@ private:
+@@ -318,12 +312,9 @@ private:
      BOOL            mbSaveValue;
      BOOL            mbRadioCheck;
      BOOL            mbStateChanged;
@@ -566,7 +535,7 @@ diff -u -p -u -r1.8 -r1.11
      void            ImplInitData();
      WinBits         ImplInitStyle( const Window* pPrevWindow, WinBits nStyle );
      void            ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-@@ -336,7 +320,6 @@ private:
+@@ -336,7 +327,6 @@ private:
                                bool bLayout = false );
      void            ImplDrawRadioButton( bool bLayout = false );
      void            ImplUncheckAllOther();
@@ -574,7 +543,7 @@ diff -u -p -u -r1.8 -r1.11
  
  protected:
      void            ImplInit( Window* pParent, WinBits nStyle );
-@@ -376,6 +359,7 @@ public:
+@@ -376,6 +366,7 @@ public:
      virtual void    LoseFocus();
      virtual void    StateChanged( StateChangedType nType );
      virtual void    DataChanged( const DataChangedEvent& rDCEvt );
@@ -582,7 +551,7 @@ diff -u -p -u -r1.8 -r1.11
  
      virtual void    Toggle();
  
-@@ -428,7 +412,6 @@ private:
+@@ -428,7 +419,6 @@ private:
      Link            maToggleHdl;
  
  #if _SOLAR__PRIVATE
@@ -590,7 +559,7 @@ diff -u -p -u -r1.8 -r1.11
      void            ImplInitData();
      WinBits         ImplInitStyle( const Window* pPrevWindow, WinBits nStyle );
      void            ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-@@ -439,7 +422,6 @@ private:
+@@ -439,7 +429,6 @@ private:
                                Rectangle& rStateRect,
                                Rectangle& rMouseRect, Rectangle& rFocusRect, bool bLayout );
      void            ImplDrawCheckBox( bool bLayout = false );
@@ -598,7 +567,7 @@ diff -u -p -u -r1.8 -r1.11
  
  protected:
      void            ImplInit( Window* pParent, WinBits nStyle );
-@@ -465,6 +447,7 @@ public:
+@@ -465,6 +454,7 @@ public:
      virtual void    LoseFocus();
      virtual void    StateChanged( StateChangedType nType );
      virtual void    DataChanged( const DataChangedEvent& rDCEvt );
@@ -608,12 +577,8 @@ diff -u -p -u -r1.8 -r1.11
  
 Index: vcl/inc/cmdevt.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/cmdevt.hxx,v
-retrieving revision 1.10.250.1
-retrieving revision 1.12
-diff -u -p -u -r1.10.250.1 -r1.12
---- vcl/inc/cmdevt.hxx	9 Jan 2004 18:13:38 -0000	1.10.250.1
-+++ vcl/inc/cmdevt.hxx	6 Jan 2004 12:54:08 -0000	1.12
+--- vcl/inc/cmdevt.hxx.orig	2004-09-12 14:26:21.668978280 +0200
++++ vcl/inc/cmdevt.hxx	2004-09-12 14:54:44.792064216 +0200
 @@ -101,7 +101,6 @@ private:
      xub_StrLen          mnOldTextLen;
      USHORT              mnCursorFlags;
@@ -624,12 +589,8 @@ diff -u -p -u -r1.10.250.1 -r1.12
                          CommandExtTextInputData();
 Index: vcl/inc/combobox.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/combobox.hxx,v
-retrieving revision 1.12
-retrieving revision 1.14
-diff -u -p -u -r1.12 -r1.14
---- vcl/inc/combobox.hxx	11 Apr 2003 17:24:42 -0000	1.12
-+++ vcl/inc/combobox.hxx	18 May 2004 10:47:56 -0000	1.14
+--- vcl/inc/combobox.hxx.orig	2004-09-12 14:26:21.669978128 +0200
++++ vcl/inc/combobox.hxx	2004-09-12 14:54:44.792064216 +0200
 @@ -192,6 +192,7 @@ public:
      BOOL            IsUserDrawEnabled() const;
  
@@ -640,12 +601,8 @@ diff -u -p -u -r1.12 -r1.14
      void            SetSeparatorPos();
 Index: vcl/inc/controllayout.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/controllayout.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/controllayout.hxx	16 May 2002 11:52:49 -0000	1.3
-+++ vcl/inc/controllayout.hxx	18 May 2004 10:48:10 -0000	1.4
+--- vcl/inc/controllayout.hxx.orig	2004-09-12 14:26:21.670977976 +0200
++++ vcl/inc/controllayout.hxx	2004-09-12 14:54:44.793064064 +0200
 @@ -103,6 +103,20 @@ struct ControlLayoutData
      // returns the interval [start,end] of line nLine
      // returns [-1,-1] for an invalid line
@@ -669,12 +626,8 @@ diff -u -p -u -r1.3 -r1.4
  } // namespace vcl
 Index: vcl/inc/ctrl.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/ctrl.hxx,v
-retrieving revision 1.5
-retrieving revision 1.8
-diff -u -p -u -r1.5 -r1.8
---- vcl/inc/ctrl.hxx	16 May 2002 11:52:49 -0000	1.5
-+++ vcl/inc/ctrl.hxx	18 May 2004 10:48:23 -0000	1.8
+--- vcl/inc/ctrl.hxx.orig	2004-09-12 14:26:21.671977824 +0200
++++ vcl/inc/ctrl.hxx	2004-09-12 14:54:44.794063912 +0200
 @@ -73,6 +73,10 @@
  #include <window.hxx>
  #endif
@@ -749,12 +702,8 @@ diff -u -p -u -r1.5 -r1.8
  	void			SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; }
 Index: vcl/inc/cursor.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/cursor.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/cursor.hxx	27 Mar 2003 17:57:20 -0000	1.3
-+++ vcl/inc/cursor.hxx	6 Jan 2004 12:55:28 -0000	1.4
+--- vcl/inc/cursor.hxx.orig	2004-09-12 14:26:21.672977672 +0200
++++ vcl/inc/cursor.hxx	2004-09-12 14:54:44.795063760 +0200
 @@ -66,6 +66,10 @@
  #include <tools/gen.hxx>
  #endif
@@ -780,12 +729,8 @@ diff -u -p -u -r1.3 -r1.4
  	void			ImplNew();
 Index: vcl/inc/cvtsvm.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/cvtsvm.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/cvtsvm.hxx	7 Dec 2000 13:37:15 -0000	1.3
-+++ vcl/inc/cvtsvm.hxx	6 Jan 2004 12:55:49 -0000	1.4
+--- vcl/inc/cvtsvm.hxx.orig	2004-09-12 14:26:21.672977672 +0200
++++ vcl/inc/cvtsvm.hxx	2004-09-12 14:54:44.795063760 +0200
 @@ -129,7 +129,6 @@ class SVMConverter
  {
  private:
@@ -804,12 +749,8 @@ diff -u -p -u -r1.3 -r1.4
  						SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, ULONG nConvertMode  );
 Index: vcl/inc/decoview.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/decoview.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/decoview.hxx	27 Mar 2003 17:57:20 -0000	1.3
-+++ vcl/inc/decoview.hxx	10 May 2004 15:41:25 -0000	1.4
+--- vcl/inc/decoview.hxx.orig	2004-09-12 14:26:21.674977368 +0200
++++ vcl/inc/decoview.hxx	2004-09-12 14:54:44.796063608 +0200
 @@ -88,6 +88,7 @@ class OutputDevice;
  #define FRAME_DRAW_DOUBLEIN 				((USHORT)0x0004)
  #define FRAME_DRAW_DOUBLEOUT				((USHORT)0x0005)
@@ -820,12 +761,8 @@ diff -u -p -u -r1.3 -r1.4
  #define FRAME_DRAW_STYLE					((USHORT)0x000F)
 Index: vcl/inc/dialog.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/dialog.hxx,v
-retrieving revision 1.7.252.1
-retrieving revision 1.10
-diff -u -p -u -r1.7.252.1 -r1.10
---- vcl/inc/dialog.hxx	31 Oct 2003 15:43:22 -0000	1.7.252.1
-+++ vcl/inc/dialog.hxx	17 Jun 2004 12:02:16 -0000	1.10
+--- vcl/inc/dialog.hxx.orig	2004-09-12 14:26:21.675977216 +0200
++++ vcl/inc/dialog.hxx	2004-09-12 14:54:44.796063608 +0200
 @@ -81,20 +81,16 @@ class Dialog : public SystemWindow
  {
  private:
@@ -860,12 +797,8 @@ diff -u -p -u -r1.7.252.1 -r1.10
  	void			SetModalInputMode( BOOL bModal, BOOL bSubModalDialogs );
 Index: vcl/inc/dockwin.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/dockwin.hxx,v
-retrieving revision 1.4
-retrieving revision 1.6
-diff -u -p -u -r1.4 -r1.6
---- vcl/inc/dockwin.hxx	24 Apr 2002 15:41:07 -0000	1.4
-+++ vcl/inc/dockwin.hxx	17 Jun 2004 12:02:29 -0000	1.6
+--- vcl/inc/dockwin.hxx.orig	2004-09-12 14:26:21.676977064 +0200
++++ vcl/inc/dockwin.hxx	2004-09-12 14:54:44.797063456 +0200
 @@ -89,10 +89,10 @@ private:
  	long			mnTrackY;
  	long			mnTrackWidth;
@@ -900,12 +833,8 @@ diff -u -p -u -r1.4 -r1.6
  	void			ImplInit( Window* pParent, WinBits nStyle );
 Index: vcl/inc/edit.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/edit.hxx,v
-retrieving revision 1.11
-retrieving revision 1.13
-diff -u -p -u -r1.11 -r1.13
---- vcl/inc/edit.hxx	27 Mar 2003 17:57:20 -0000	1.11
-+++ vcl/inc/edit.hxx	10 May 2004 15:41:45 -0000	1.13
+--- vcl/inc/edit.hxx.orig	2004-09-12 14:26:21.676977064 +0200
++++ vcl/inc/edit.hxx	2004-09-12 14:54:44.798063304 +0200
 @@ -139,7 +139,6 @@ private:
  	Link				maAutocompleteHdl;
  
@@ -932,12 +861,8 @@ diff -u -p -u -r1.11 -r1.13
  
 Index: vcl/inc/field.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/field.hxx,v
-retrieving revision 1.9
-retrieving revision 1.12
-diff -u -p -u -r1.9 -r1.12
---- vcl/inc/field.hxx	5 Nov 2001 13:00:00 -0000	1.9
-+++ vcl/inc/field.hxx	2 Apr 2004 10:35:02 -0000	1.12
+--- vcl/inc/field.hxx.orig	2004-09-12 14:26:21.679976608 +0200
++++ vcl/inc/field.hxx	2004-09-12 14:54:44.800063000 +0200
 @@ -105,17 +105,10 @@ private:
      BOOL                    mbEmptyFieldValue;
      BOOL                    mbEmptyFieldValueEnabled;
@@ -965,7 +890,7 @@ diff -u -p -u -r1.9 -r1.12
  
      const LocaleDataWrapper& GetLocaleDataWrapper() const;
  
-@@ -174,21 +163,16 @@ private:
+@@ -174,21 +167,16 @@ private:
      XubString               maFieldString;
      XubString               maLiteralMask;
      USHORT                  mnFormatFlags;
@@ -987,7 +912,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              ~PatternFormatter();
-@@ -217,9 +201,7 @@ public:
+@@ -217,9 +205,7 @@ public:
  class NumericFormatter : public FormatterBase
  {
  private:
@@ -997,7 +922,7 @@ diff -u -p -u -r1.9 -r1.12
  
  protected:
      long                    mnFieldValue;
-@@ -233,8 +215,6 @@ protected:
+@@ -233,8 +219,6 @@ protected:
      USHORT                  mnDumym2;
      BOOL                    mbThousandSep;
      BOOL                    mbShowTrailingZeros;
@@ -1006,7 +931,7 @@ diff -u -p -u -r1.9 -r1.12
  
      // Eigentlich nur am entsprechenden Feld einstellbar (fuer Interaktion),
      // wird aber in allen Verschiedenen Ableitungen benoetigt
-@@ -255,12 +235,10 @@ protected:
+@@ -255,12 +239,10 @@ protected:
      void                    FieldFirst();
      void                    FieldLast();
  
@@ -1019,7 +944,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              ~NumericFormatter();
-@@ -308,9 +286,7 @@ public:
+@@ -308,9 +290,7 @@ public:
  class MetricFormatter : public NumericFormatter
  {
  private:
@@ -1029,7 +954,7 @@ diff -u -p -u -r1.9 -r1.12
  
  protected:
      XubString               maCustomUnitText;
-@@ -324,10 +300,8 @@ protected:
+@@ -324,10 +304,8 @@ protected:
  
      virtual XubString       CreateFieldText( long nValue ) const;
  
@@ -1040,7 +965,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              ~MetricFormatter();
-@@ -368,23 +342,13 @@ class CurrencyFormatter : public Numeric
+@@ -368,23 +346,13 @@ class CurrencyFormatter : public Numeric
  {
  private:
      String                  maCurrencySymbol;
@@ -1064,7 +989,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              ~CurrencyFormatter();
-@@ -417,19 +381,13 @@ private:
+@@ -417,19 +385,13 @@ private:
      BOOL                    mbShowDateCentury;
      USHORT                  mnDateFormat;
      ULONG                   mnExtDateFormat;
@@ -1085,7 +1010,7 @@ diff -u -p -u -r1.9 -r1.12
      void                    ImplLoadRes( const ResId& rResId );
      const Date&             ImplGetFieldDate() const    { return maFieldDate; }
      BOOL                    ImplDateReformat( const XubString& rStr, XubString& rOutStr,
-@@ -440,7 +398,8 @@ protected:
+@@ -440,7 +402,8 @@ protected:
                                                 const AllSettings& rSettings ) const;
      void                    ImplNewFieldValue( const Date& rDate );
      CalendarWrapper&        GetCalendarWrapper() const;
@@ -1095,7 +1020,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              ~DateFormatter();
-@@ -450,11 +409,6 @@ public:
+@@ -450,11 +413,6 @@ public:
  
      virtual void            SetLocale( const ::com::sun::star::lang::Locale& rLocale );
  
@@ -1107,7 +1032,7 @@ diff -u -p -u -r1.9 -r1.12
  
      void                    SetExtDateFormat( ExtDateFieldFormat eFormat );
      ExtDateFieldFormat      GetExtDateFormat( BOOL bResolveSystemFormat = FALSE ) const;
-@@ -489,6 +443,23 @@ public:
+@@ -489,6 +447,23 @@ public:
  
      static void             ExpandCentury( Date& rDate );
      static void             ExpandCentury( Date& rDate, USHORT nTwoDigitYearStart );
@@ -1131,7 +1056,7 @@ diff -u -p -u -r1.9 -r1.12
  };
  
  
-@@ -507,27 +478,20 @@ private:
+@@ -507,27 +482,20 @@ private:
      USHORT                  mnTimeFormat;
      BOOL                    mbDuration;
      BOOL                    mbEmptyTime;
@@ -1161,7 +1086,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              ~TimeFormatter();
-@@ -557,6 +521,23 @@ public:
+@@ -557,6 +525,23 @@ public:
      void                    SetEmptyTime() { FormatterBase::SetEmptyFieldValue(); }
      BOOL                    IsEmptyTime() const { return FormatterBase::IsEmptyFieldValue(); }
      Time                    GetCorrectedTime() const { return maCorrectedTime; }
@@ -1185,7 +1110,7 @@ diff -u -p -u -r1.9 -r1.12
  };
  
  
-@@ -583,10 +564,8 @@ public:
+@@ -583,10 +568,8 @@ public:
  
  class NumericField : public SpinField, public NumericFormatter
  {
@@ -1196,7 +1121,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              NumericField( Window* pParent, WinBits nWinStyle );
-@@ -612,10 +591,8 @@ public:
+@@ -612,10 +595,8 @@ public:
  
  class MetricField : public SpinField, public MetricFormatter
  {
@@ -1207,7 +1132,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              MetricField( Window* pParent, WinBits nWinStyle );
-@@ -663,10 +640,8 @@ public:
+@@ -663,10 +644,8 @@ public:
  
  class CurrencyField : public SpinField, public CurrencyFormatter
  {
@@ -1218,7 +1143,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              CurrencyField( Window* pParent, WinBits nWinStyle );
-@@ -696,11 +671,9 @@ private:
+@@ -696,11 +675,9 @@ private:
      Date                    maFirst;
      Date                    maLast;
  
@@ -1230,7 +1155,7 @@ diff -u -p -u -r1.9 -r1.12
  
  public:
                              DateField( Window* pParent, WinBits nWinStyle );
-@@ -739,11 +707,9 @@ private:
+@@ -739,11 +716,9 @@ private:
      Time                    maFirst;
      Time                    maLast;
  
@@ -1244,12 +1169,8 @@ diff -u -p -u -r1.9 -r1.12
                              TimeField( Window* pParent, WinBits nWinStyle );
 Index: vcl/inc/fixbrd.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/fixbrd.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/fixbrd.hxx	7 Dec 2000 13:37:15 -0000	1.2
-+++ vcl/inc/fixbrd.hxx	6 Jan 2004 12:57:59 -0000	1.3
+--- vcl/inc/fixbrd.hxx.orig	2004-09-12 14:26:21.680976456 +0200
++++ vcl/inc/fixbrd.hxx	2004-09-12 14:54:44.800063000 +0200
 @@ -91,18 +91,13 @@ class FixedBorder : public Control
  private:
  	USHORT			mnType;
@@ -1271,12 +1192,8 @@ diff -u -p -u -r1.2 -r1.3
  					FixedBorder( Window* pParent, WinBits nStyle = 0 );
 Index: vcl/inc/fixed.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/fixed.hxx,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -p -u -r1.5 -r1.6
---- vcl/inc/fixed.hxx	29 Apr 2002 17:46:17 -0000	1.5
-+++ vcl/inc/fixed.hxx	6 Jan 2004 12:58:20 -0000	1.6
+--- vcl/inc/fixed.hxx.orig	2004-09-12 14:26:21.681976304 +0200
++++ vcl/inc/fixed.hxx	2004-09-12 14:54:44.801062848 +0200
 @@ -84,14 +84,12 @@ class UserDrawEvent;
  class FixedText : public Control
  {
@@ -1355,12 +1272,8 @@ diff -u -p -u -r1.5 -r1.6
                      FixedImage( Window* pParent, WinBits nStyle = 0 );
 Index: vcl/inc/floatwin.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/floatwin.hxx,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -p -u -r1.5 -r1.6
---- vcl/inc/floatwin.hxx	31 Oct 2001 19:28:50 -0000	1.5
-+++ vcl/inc/floatwin.hxx	6 Jan 2004 12:58:54 -0000	1.6
+--- vcl/inc/floatwin.hxx.orig	2004-09-12 14:26:21.682976152 +0200
++++ vcl/inc/floatwin.hxx	2004-09-12 14:54:44.802062696 +0200
 @@ -114,7 +114,6 @@ private:
  	FloatingWindow* mpNextFloat;
  	Window* 		mpFirstPopupModeWin;
@@ -1382,12 +1295,8 @@ diff -u -p -u -r1.5 -r1.6
  	void			ImplInit( Window* pParent, WinBits nStyle );
 Index: vcl/inc/fntstyle.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/fntstyle.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/fntstyle.hxx	23 Mar 2001 11:44:51 -0000	1.2
-+++ vcl/inc/fntstyle.hxx	6 Jan 2004 12:59:13 -0000	1.3
+--- vcl/inc/fntstyle.hxx.orig	2004-09-12 14:26:21.682976152 +0200
++++ vcl/inc/fntstyle.hxx	2004-09-12 14:54:44.802062696 +0200
 @@ -62,6 +62,7 @@
  #ifndef _VCL_FNTSTYLE_HXX
  #define _VCL_FNTSTYLE_HXX
@@ -1398,12 +1307,8 @@ diff -u -p -u -r1.2 -r1.3
  // --------------
 Index: vcl/inc/font.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/font.hxx,v
-retrieving revision 1.6
-retrieving revision 1.8
-diff -u -p -u -r1.6 -r1.8
---- vcl/inc/font.hxx	1 Aug 2001 12:32:45 -0000	1.6
-+++ vcl/inc/font.hxx	6 Jan 2004 12:59:38 -0000	1.8
+--- vcl/inc/font.hxx.orig	2004-09-12 14:26:21.684975848 +0200
++++ vcl/inc/font.hxx	2004-09-12 14:54:44.803062544 +0200
 @@ -71,8 +71,8 @@
  #ifndef _TOOLS_LANG_HXX
  #include <tools/lang.hxx>
@@ -1428,7 +1333,7 @@ diff -u -p -u -r1.6 -r1.8
  class SvStream;
  #define FontAlign TextAlign
  
-@@ -226,16 +220,4 @@ public:
+@@ -226,18 +220,6 @@ public:
  
  	friend SvStream&	operator>>( SvStream& rIStm, Font& rFont );
  	friend SvStream&	operator<<( SvStream& rOStm, const Font& rFont );
@@ -1445,15 +1350,12 @@ diff -u -p -u -r1.6 -r1.8
 -#endif
 -
  };
-
+ 
+ #ifndef NOOLDSV
 Index: vcl/inc/fontcfg.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/fontcfg.hxx,v
-retrieving revision 1.3
-retrieving revision 1.5
-diff -u -p -u -r1.3 -r1.5
---- vcl/inc/fontcfg.hxx	29 May 2002 13:37:05 -0000	1.3
-+++ vcl/inc/fontcfg.hxx	25 Jun 2004 15:24:19 -0000	1.5
+--- vcl/inc/fontcfg.hxx.orig	2004-09-12 14:26:21.685975696 +0200
++++ vcl/inc/fontcfg.hxx	2004-09-12 14:54:44.806062088 +0200
 @@ -66,43 +66,70 @@
  #ifndef _UTL_CONFIGITEM_HXX_
  #include <unotools/configitem.hxx>
@@ -1607,12 +1509,8 @@ diff -u -p -u -r1.3 -r1.5
  
 Index: vcl/inc/gdimtf.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/gdimtf.hxx,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -p -u -r1.5 -r1.6
---- vcl/inc/gdimtf.hxx	18 Nov 2002 13:42:14 -0000	1.5
-+++ vcl/inc/gdimtf.hxx	6 Jan 2004 13:00:30 -0000	1.6
+--- vcl/inc/gdimtf.hxx.orig	2004-09-12 14:26:21.686975544 +0200
++++ vcl/inc/gdimtf.hxx	2004-09-12 14:54:44.807061936 +0200
 @@ -98,6 +98,7 @@ class Gradient;
  #ifndef METAFILE_END
  #define METAFILE_END					GDI_METAFILE_END
@@ -1646,21 +1544,9 @@ diff -u -p -u -r1.5 -r1.6
  	BOOL			operator==( const GDIMetaFile& rMtf ) const;
 Index: vcl/inc/glyphcache.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/glyphcache.hxx,v
-retrieving revision 1.19
-retrieving revision 1.22
-diff -u -p -u -r1.19 -r1.22
---- vcl/inc/glyphcache.hxx	2 Jul 2003 13:38:54 -0000	1.19
-+++ vcl/inc/glyphcache.hxx	18 May 2004 10:48:36 -0000	1.22
-@@ -72,6 +72,7 @@ class ServerFontLayout;
- 
- #include <tools/gen.hxx>
- #include <hash_map>
-+#include <map>
- #include <hash_set>
- 
- struct ImplFontSelectData;
-@@ -90,14 +91,20 @@ bool operator==( const ImplFontSelectDat
+--- vcl/inc/glyphcache.hxx.orig	2004-09-12 14:46:23.370291912 +0200
++++ vcl/inc/glyphcache.hxx	2004-09-12 14:58:34.432153616 +0200
+@@ -91,14 +92,17 @@ bool operator==( const ImplFontSelectDat
  
  // =======================================================================
  
@@ -1674,28 +1560,12 @@ diff -u -p -u -r1.19 -r1.22
  
 +}
 +
+ typedef std::map< sal_Unicode, std::map< sal_Unicode, int > > unicodeKernMap;
+ typedef std::map< int, std::map< int, int > > glyphKernMap;
+ 
  //--------
  
-+typedef std::map< sal_Unicode, std::map< sal_Unicode, int > > unicodeKernMap;
-+typedef std::map< int, std::map< int, int > > glyphKernMap;
-+
- class GlyphCache
- {
- public:
-@@ -110,7 +117,11 @@ public:
-     void                        ClearFontPath();
-     void                        AddFontPath( const String& rFontPath );
-     void                        AddFontFile( const rtl::OString& rNormalizedName,
--                                    int nFaceNum, int nFontId, const ImplFontData* );
-+                                             int nFaceNum,
-+                                             int nFontId,
-+                                             const ImplFontData*,
-+                                             const unicodeKernMap* pUniKernPairs = NULL
-+                                             );
-     long                        FetchFontList( ImplDevFontList* ) const;
- 
-     ServerFont*                 CacheFont( const ImplFontSelectData& );
-@@ -118,7 +129,7 @@ public:
+@@ -124,7 +131,7 @@ public:
      void                        RemoveFont( const ImplFontData* );
  
  private:
@@ -1704,7 +1574,7 @@ diff -u -p -u -r1.19 -r1.22
      // used by ServerFont class only
      void                        AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphData );
      void                        RemovingGlyph( ServerFont& rSF, GlyphData& rGD, int nGlyphIndex );
-@@ -156,7 +167,7 @@ public:
+@@ -162,7 +169,7 @@ public:
      long                    GetCharWidth() const { return mnAdvanceWidth; }
  
  protected:
@@ -1713,51 +1583,10 @@ diff -u -p -u -r1.19 -r1.22
      void                    SetOffset( int nX, int nY ) { maOffset = Point( nX, nY); }
      void                    SetDelta( int nX, int nY )  { maDelta = Point( nX, nY); }
      void                    SetSize( const Size& s )    { maSize = s; }
-@@ -218,8 +229,8 @@ public:
-     const ImplFontSelectData&   GetFontSelData() const      { return maFontSelData; }
- 
-     virtual void                FetchFontMetric( ImplFontMetricData&, long& rFactor ) const = 0;
--    virtual ULONG               GetKernPairs( struct ImplKernPairData** ) const = 0;
--    virtual int                 GetGlyphKernValue( int, int ) const = 0;
-+    virtual ULONG               GetKernPairs( struct ImplKernPairData** ) const;
-+    virtual int                 GetGlyphKernValue( int, int ) const;
-     virtual ULONG               GetFontCodeRanges( sal_uInt32* pCodes ) const { return 0; }
-     Point                       TransformPoint( const Point& ) const;
- 
-@@ -238,9 +249,9 @@ public:
-     void*                       GetExtPointer() { return mpExtData; }
- 
- protected:
--friend GlyphCache;
--friend ServerFontLayout;
--                                ServerFont( const ImplFontSelectData& );
-+    friend class GlyphCache;
-+    friend class ServerFontLayout;
-+                                ServerFont( const ImplFontSelectData&, const glyphKernMap* pGlyphKern = NULL, const unicodeKernMap* pUniKern = NULL  );
-     virtual                     ~ServerFont();
- 
-     void                        AddRef() const      { ++mnRefCount; }
-@@ -273,6 +284,12 @@ private:
- protected:
-     long                        nCos;
-     long                        nSin;
-+
-+    // maps left glyph id to map of right glyphid
-+    // the inner map maps right glyphid to kern value
-+    const glyphKernMap*			mpKernPairs;
-+    const unicodeKernMap*		mpUnicodeKernPairs;
-+
- };
- 
- // =======================================================================
 Index: vcl/inc/gradient.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/gradient.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -p -u -r1.1.1.1 -r1.3
---- vcl/inc/gradient.hxx	19 Sep 2000 10:23:04 -0000	1.1.1.1
-+++ vcl/inc/gradient.hxx	6 Jan 2004 13:01:22 -0000	1.3
+--- vcl/inc/gradient.hxx.orig	2004-09-12 14:26:21.688975240 +0200
++++ vcl/inc/gradient.hxx	2004-09-12 14:54:44.810061480 +0200
 @@ -62,7 +62,10 @@
  #ifndef _SV_GRADIENT_HXX
  #define _SV_GRADIENT_HXX
@@ -1802,12 +1631,8 @@ diff -u -p -u -r1.1.1.1 -r1.3
  #endif  // _SV_GRADIENT_HXX
 Index: vcl/inc/graph.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/graph.hxx,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -p -u -r1.6 -r1.7
---- vcl/inc/graph.hxx	27 Mar 2003 17:57:21 -0000	1.6
-+++ vcl/inc/graph.hxx	20 Apr 2004 13:53:29 -0000	1.7
+--- vcl/inc/graph.hxx.orig	2004-09-12 14:26:21.689975088 +0200
++++ vcl/inc/graph.hxx	2004-09-12 14:54:44.811061328 +0200
 @@ -143,6 +143,8 @@ public:
      Bitmap              GetBitmap( const Size* pSizePixel ) const;
      BitmapEx            GetBitmapEx() const;
@@ -1819,12 +1644,8 @@ diff -u -p -u -r1.6 -r1.7
  
 Index: vcl/inc/group.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/group.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/group.hxx	8 May 2002 16:01:29 -0000	1.2
-+++ vcl/inc/group.hxx	6 Jan 2004 13:01:39 -0000	1.3
+--- vcl/inc/group.hxx.orig	2004-09-12 14:26:21.690974936 +0200
++++ vcl/inc/group.hxx	2004-09-12 14:54:44.811061328 +0200
 @@ -75,16 +75,15 @@
  
  class GroupBox : public Control
@@ -1846,12 +1667,8 @@ diff -u -p -u -r1.2 -r1.3
                      GroupBox( Window* pParent, const ResId& rResId );
 Index: vcl/inc/hatch.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/hatch.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -p -u -r1.1.1.1 -r1.3
---- vcl/inc/hatch.hxx	19 Sep 2000 10:23:04 -0000	1.1.1.1
-+++ vcl/inc/hatch.hxx	6 Jan 2004 13:01:57 -0000	1.3
+--- vcl/inc/hatch.hxx.orig	2004-09-12 14:26:21.690974936 +0200
++++ vcl/inc/hatch.hxx	2004-09-12 14:54:44.812061176 +0200
 @@ -62,7 +62,10 @@
  #ifndef _SV_HATCH_HXX
  #define _SV_HATCH_HXX
@@ -1897,12 +1714,8 @@ diff -u -p -u -r1.1.1.1 -r1.3
  #endif  // _SV_HATCH_HXX
 Index: vcl/inc/help.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/help.hxx,v
-retrieving revision 1.3.284.1
-retrieving revision 1.5
-diff -u -p -u -r1.3.284.1 -r1.5
---- vcl/inc/help.hxx	9 Jan 2004 18:13:39 -0000	1.3.284.1
-+++ vcl/inc/help.hxx	6 Jan 2004 13:02:14 -0000	1.5
+--- vcl/inc/help.hxx.orig	2004-09-12 14:26:21.691974784 +0200
++++ vcl/inc/help.hxx	2004-09-12 14:54:44.812061176 +0200
 @@ -103,6 +103,7 @@ private:
  
  public:
@@ -1913,12 +1726,8 @@ diff -u -p -u -r1.3.284.1 -r1.5
  	const String&		GetHelpFile() const { return maHelpFile; }
 Index: vcl/inc/ilstbox.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/ilstbox.hxx,v
-retrieving revision 1.20
-retrieving revision 1.23
-diff -u -p -u -r1.20 -r1.23
---- vcl/inc/ilstbox.hxx	24 Apr 2003 16:29:18 -0000	1.20
-+++ vcl/inc/ilstbox.hxx	18 May 2004 10:48:51 -0000	1.23
+--- vcl/inc/ilstbox.hxx.orig	2004-09-12 14:26:21.693974480 +0200
++++ vcl/inc/ilstbox.hxx	2004-09-12 14:54:44.814060872 +0200
 @@ -244,7 +244,7 @@ private:
  	USHORT			mnBorder;		 // Abstand Rahmen - Text
  	USHORT			mnTextHeight;	 // Texthoehe
@@ -2113,12 +1922,8 @@ diff -u -p -u -r1.20 -r1.23
  
 Index: vcl/inc/imgcons.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/imgcons.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/imgcons.hxx	19 Sep 2000 10:23:04 -0000	1.1.1.1
-+++ vcl/inc/imgcons.hxx	6 Jan 2004 13:03:07 -0000	1.2
+--- vcl/inc/imgcons.hxx.orig	2004-09-12 14:26:21.694974328 +0200
++++ vcl/inc/imgcons.hxx	2004-09-12 14:54:44.815060720 +0200
 @@ -85,7 +85,6 @@ private:
  	Bitmap				maBitmap;
  	Bitmap				maMask;
@@ -2140,12 +1945,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  						
 Index: vcl/inc/imgctrl.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/imgctrl.hxx,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -p -u -r1.4 -r1.5
---- vcl/inc/imgctrl.hxx	15 Aug 2002 14:49:14 -0000	1.4
-+++ vcl/inc/imgctrl.hxx	6 Jan 2004 13:03:24 -0000	1.5
+--- vcl/inc/imgctrl.hxx.orig	2004-09-12 14:26:21.695974176 +0200
++++ vcl/inc/imgctrl.hxx	2004-09-12 14:54:44.816060568 +0200
 @@ -74,7 +74,7 @@ class ImageControl : public FixedImage
  private:
  	BitmapEx		maBmp;
@@ -2157,12 +1958,8 @@ diff -u -p -u -r1.4 -r1.5
  					ImageControl( Window* pParent, WinBits nStyle = 0 );
 Index: vcl/inc/impbmp.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/impbmp.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/impbmp.hxx	7 Dec 2000 13:37:15 -0000	1.2
-+++ vcl/inc/impbmp.hxx	1 Dec 2003 12:53:44 -0000	1.3
+--- vcl/inc/impbmp.hxx.orig	2004-09-12 14:26:21.696974024 +0200
++++ vcl/inc/impbmp.hxx	2004-09-12 14:54:44.816060568 +0200
 @@ -92,11 +92,7 @@ private:
      ULONG				mnRefCount;
  	ULONG				mnChecksum;
@@ -2219,12 +2016,8 @@ diff -u -p -u -r1.2 -r1.3
  
 Index: vcl/inc/impgraph.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/impgraph.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/impgraph.hxx	24 Aug 2001 14:07:49 -0000	1.3
-+++ vcl/inc/impgraph.hxx	20 Apr 2004 13:53:44 -0000	1.4
+--- vcl/inc/impgraph.hxx.orig	2004-09-12 14:26:21.697973872 +0200
++++ vcl/inc/impgraph.hxx	2004-09-12 14:54:44.817060416 +0200
 @@ -144,8 +144,8 @@ private:
  	BOOL				ImplIsAlpha() const;
  	BOOL				ImplIsAnimated() const;
@@ -2238,12 +2031,8 @@ diff -u -p -u -r1.3 -r1.4
  
 Index: vcl/inc/jobset.h
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/jobset.h,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -p -u -r1.5 -r1.6
---- vcl/inc/jobset.h	6 Mar 2002 11:13:54 -0000	1.5
-+++ vcl/inc/jobset.h	6 Jan 2004 13:03:42 -0000	1.6
+--- vcl/inc/jobset.h.orig	2004-09-12 14:26:21.697973872 +0200
++++ vcl/inc/jobset.h	2004-09-12 14:54:44.817060416 +0200
 @@ -72,7 +72,7 @@
  #ifndef _SV_PRNTYPES_HXX
  #include <prntypes.hxx>
@@ -2255,12 +2044,8 @@ diff -u -p -u -r1.5 -r1.6
  #ifndef _RTL_USTRING_
 Index: vcl/inc/jobset.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/jobset.hxx,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -p -u -r1.4 -r1.5
---- vcl/inc/jobset.hxx	19 Dec 2001 14:43:31 -0000	1.4
-+++ vcl/inc/jobset.hxx	1 Dec 2003 12:54:41 -0000	1.5
+--- vcl/inc/jobset.hxx.orig	2004-09-12 14:26:21.698973720 +0200
++++ vcl/inc/jobset.hxx	2004-09-12 14:54:44.818060264 +0200
 @@ -75,10 +75,6 @@
  class SvStream;
  struct ImplJobSetup;
@@ -2285,12 +2070,8 @@ diff -u -p -u -r1.4 -r1.5
  	BOOL				operator!=( const JobSetup& rJobSetup ) const
 Index: vcl/inc/keycod.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/keycod.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/keycod.hxx	27 Feb 2002 12:11:26 -0000	1.2
-+++ vcl/inc/keycod.hxx	6 Jan 2004 13:03:58 -0000	1.3
+--- vcl/inc/keycod.hxx.orig	2004-09-12 14:26:21.699973568 +0200
++++ vcl/inc/keycod.hxx	2004-09-12 14:54:44.818060264 +0200
 @@ -69,8 +69,8 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -2304,12 +2085,8 @@ diff -u -p -u -r1.2 -r1.3
  #include <keycodes.hxx>
 Index: vcl/inc/keycodes.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/keycodes.hxx,v
-retrieving revision 1.2.250.1
-retrieving revision 1.5
-diff -u -p -u -r1.2.250.1 -r1.5
---- vcl/inc/keycodes.hxx	9 Jan 2004 18:13:39 -0000	1.2.250.1
-+++ vcl/inc/keycodes.hxx	17 Mar 2004 10:04:17 -0000	1.5
+--- vcl/inc/keycodes.hxx.orig	2004-09-12 14:26:21.700973416 +0200
++++ vcl/inc/keycodes.hxx	2004-09-12 14:54:44.819060112 +0200
 @@ -70,7 +70,7 @@
  // - KeyCode-Types -
  // -----------------
@@ -2329,12 +2106,8 @@ diff -u -p -u -r1.2.250.1 -r1.5
  
 Index: vcl/inc/lineinfo.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/lineinfo.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/lineinfo.hxx	19 Sep 2000 10:23:05 -0000	1.1.1.1
-+++ vcl/inc/lineinfo.hxx	4 Sep 2003 07:41:49 -0000	1.2
+--- vcl/inc/lineinfo.hxx.orig	2004-09-12 14:26:21.701973264 +0200
++++ vcl/inc/lineinfo.hxx	2004-09-12 14:54:44.819060112 +0200
 @@ -140,31 +140,6 @@ public:
  
      friend SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo );
@@ -2369,12 +2142,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  #endif  // _SV_LINEINFO_HXX
 Index: vcl/inc/longcurr.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/longcurr.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/longcurr.hxx	29 Jun 2001 10:17:29 -0000	1.3
-+++ vcl/inc/longcurr.hxx	6 Jan 2004 13:04:51 -0000	1.4
+--- vcl/inc/longcurr.hxx.orig	2004-09-12 14:26:21.702973112 +0200
++++ vcl/inc/longcurr.hxx	2004-09-12 14:54:44.820059960 +0200
 @@ -77,12 +77,9 @@ class LocaleDataWrapper;
  
  class LongCurrencyFormatter : public FormatterBase
@@ -2400,24 +2169,21 @@ diff -u -p -u -r1.3 -r1.4
  							LongCurrencyFormatter();
  	void					ImplLoadRes( const ResId& rResId );
  
-@@ -141,9 +135,7 @@ public:
+@@ -141,10 +135,8 @@ public:
  class LongCurrencyField : public SpinField, public LongCurrencyFormatter
  {
  #if _SOLAR__PRIVATE
 -#ifdef VCL_LONGCURR_CXX
  	friend void ImplNewLongCurrencyFieldValue( LongCurrencyField*, BigInt );
--#endif
  #endif
+-#endif
  
  private:
+ 	BigInt			mnSpinSize;
 Index: vcl/inc/lstbox.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/lstbox.hxx,v
-retrieving revision 1.12
-retrieving revision 1.14
-diff -u -p -u -r1.12 -r1.14
---- vcl/inc/lstbox.hxx	1 Nov 2002 09:00:27 -0000	1.12
-+++ vcl/inc/lstbox.hxx	18 May 2004 10:49:04 -0000	1.14
+--- vcl/inc/lstbox.hxx.orig	2004-09-12 14:26:21.703972960 +0200
++++ vcl/inc/lstbox.hxx	2004-09-12 14:54:44.821059808 +0200
 @@ -232,6 +232,9 @@ public:
  	USHORT			GetMaxMRUCount() const;
  
@@ -2428,15 +2194,10 @@ diff -u -p -u -r1.12 -r1.14
  };
  
  
-
 Index: vcl/inc/mapmod.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/mapmod.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/mapmod.hxx	19 Sep 2000 10:23:05 -0000	1.1.1.1
-+++ vcl/inc/mapmod.hxx	7 Jan 2004 09:06:47 -0000	1.2
+--- vcl/inc/mapmod.hxx.orig	2004-09-12 14:26:21.704972808 +0200
++++ vcl/inc/mapmod.hxx	2004-09-12 14:54:44.821059808 +0200
 @@ -72,8 +72,8 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -2472,12 +2233,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  					MapMode();
 Index: vcl/inc/menu.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/menu.hxx,v
-retrieving revision 1.26.112.1
-retrieving revision 1.30
-diff -u -p -u -r1.26.112.1 -r1.30
---- vcl/inc/menu.hxx	13 Nov 2003 16:48:20 -0000	1.26.112.1
-+++ vcl/inc/menu.hxx	25 Feb 2004 17:29:29 -0000	1.30
+--- vcl/inc/menu.hxx.orig	2004-09-12 14:26:21.706972504 +0200
++++ vcl/inc/menu.hxx	2004-09-12 14:54:44.823059504 +0200
 @@ -66,20 +66,20 @@
  #include <sv.h>
  #endif
@@ -2505,8 +2262,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  #endif
  
  #ifndef _VCL_VCLEVENT_HXX
-@@ -103,7 +103,9 @@ class KeyEvent;
- class AppBarWindow;
+@@ -104,6 +104,8 @@ class AppBarWindow;
  class MenuFloatingWindow;
  class Window;
  class AccessObjectRef;
@@ -2515,7 +2271,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  
  namespace com {
  namespace sun {
-@@ -126,11 +127,11 @@ namespace vcl { struct MenuLayoutData; }
+@@ -126,11 +128,11 @@ namespace vcl { struct MenuLayoutData; }
  #define POPUPMENU_EXECUTE_LEFT	((USHORT)0x0004)
  #define POPUPMENU_EXECUTE_RIGHT ((USHORT)0x0008)
  
@@ -2529,7 +2285,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  typedef USHORT MenuItemBits;
  #define MIB_CHECKABLE			((MenuItemBits)0x0001)
  #define MIB_RADIOCHECK			((MenuItemBits)0x0002)
-@@ -151,12 +152,10 @@ struct MenuLogo
+@@ -151,12 +153,10 @@ struct MenuLogo
  	BitmapEx	aBitmap;
  	Color		aStartColor;
  	Color		aEndColor;
@@ -2542,7 +2298,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  	friend class MenuBar;
  	friend class MenuBarWindow;
  	friend class MenuFloatingWindow;
-@@ -164,6 +163,7 @@ class Menu : public Resource
+@@ -164,6 +164,7 @@ class Menu : public Resource
  	friend class SystemWindow;
  
  private:
@@ -2550,7 +2306,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  	MenuItemList*		pItemList;			// Liste mit den MenuItems
  	MenuLogo*			pLogo;
  	Menu*				pStartedFrom;
-@@ -180,7 +180,7 @@ private:
+@@ -180,7 +181,7 @@ private:
  	XubString			aTitleText; 		// PopupMenu-Text
  
  	ULONG				nEventId;
@@ -2559,7 +2315,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  	USHORT				nMenuFlags;
  	USHORT				nDefaultItem;		// Id vom Default-Item
  	USHORT				nSelectedId;
-@@ -197,16 +197,14 @@ private:
+@@ -197,16 +198,14 @@ private:
  
      ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
  	mutable vcl::MenuLayoutData* mpLayoutData;
@@ -2578,7 +2334,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  	Size				ImplCalcSize( Window* pWin );
  	BOOL				ImplIsVisible( USHORT nPos ) const;
  	USHORT				ImplGetVisibleItemCount() const;
-@@ -220,11 +218,16 @@ protected:
+@@ -220,11 +219,16 @@ protected:
  						DECL_LINK( ImplCallSelect, Menu* );
  
      void				ImplFillLayoutData() const;
@@ -2595,7 +2351,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  	Window* 			ImplGetWindow() const { return pWindow; }
  
  public:
-@@ -315,7 +318,10 @@ public:
+@@ -315,7 +319,10 @@ public:
  	void				SetTipHelpText( USHORT nItemId, const XubString& rString );
  	const XubString&	GetTipHelpText( USHORT nItemId ) const;
  
@@ -2607,7 +2363,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  	ULONG				GetHelpId( USHORT nItemId ) const;
  
  	void				SetActivateHdl( const Link& rLink ) 	{ aActivateHdl = rLink; }
-@@ -342,6 +348,9 @@ public:
+@@ -347,6 +354,9 @@ public:
  	// Fuer Menu-'Funktionen'
  	MenuItemList*		GetItemList() const 					{ return pItemList; }
  
@@ -2617,7 +2373,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  
      // accessibility helpers
  
-@@ -393,14 +400,13 @@ public:
+@@ -393,14 +403,13 @@ public:
  
  class MenuBar : public Menu
  {
@@ -2633,7 +2389,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  
  #if _SOLAR__PRIVATE
  	friend class Application;
-@@ -431,6 +437,10 @@ public:
+@@ -431,6 +440,10 @@ public:
  	void				ShowButtons( BOOL bClose, BOOL bFloat, BOOL bHide );
  
  	void				SelectEntry( USHORT nId );
@@ -2644,7 +2400,7 @@ diff -u -p -u -r1.26.112.1 -r1.30
  
  	void				SetCloserHdl( const Link& rLink )			{ maCloserHdl = rLink; }
  	const Link& 		GetCloserHdl() const						{ return maCloserHdl; }
-@@ -438,6 +448,14 @@ public:
+@@ -438,6 +451,14 @@ public:
  	const Link& 		GetFloatButtonClickHdl() const				{ return maFloatHdl; }
  	void				SetHideButtonClickHdl( const Link& rLink )	{ maHideHdl = rLink; }
  	const Link& 		GetHideButtonClickHdl() const				{ return maHideHdl; }
@@ -2661,12 +2417,8 @@ diff -u -p -u -r1.26.112.1 -r1.30
  inline MenuBar& MenuBar::operator =( const MenuBar& rMenu )
 Index: vcl/inc/menubtn.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/menubtn.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/menubtn.hxx	19 Sep 2000 10:23:05 -0000	1.1.1.1
-+++ vcl/inc/menubtn.hxx	7 Jan 2004 09:07:50 -0000	1.2
+--- vcl/inc/menubtn.hxx.orig	2004-09-12 14:26:21.707972352 +0200
++++ vcl/inc/menubtn.hxx	2004-09-12 14:54:44.823059504 +0200
 @@ -86,7 +86,6 @@ class MenuButton : public PushButton
  {
  private:
@@ -2689,12 +2441,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  	void			ImplInit( Window* pParent, WinBits nStyle );
 Index: vcl/inc/metaact.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/metaact.hxx,v
-retrieving revision 1.4.252.1
-retrieving revision 1.7
-diff -u -p -u -r1.4.252.1 -r1.7
---- vcl/inc/metaact.hxx	9 Jan 2004 18:13:40 -0000	1.4.252.1
-+++ vcl/inc/metaact.hxx	17 Jun 2004 12:05:02 -0000	1.7
+--- vcl/inc/metaact.hxx.orig	2004-09-12 14:26:21.709972048 +0200
++++ vcl/inc/metaact.hxx	2004-09-12 14:54:44.825059200 +0200
 @@ -74,8 +74,8 @@
  #ifndef _SV_FONT_HXX
  #include <font.hxx>
@@ -2735,12 +2483,8 @@ diff -u -p -u -r1.4.252.1 -r1.7
  // -------------------------
 Index: vcl/inc/msgbox.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/msgbox.hxx,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -p -u -r1.5 -r1.6
---- vcl/inc/msgbox.hxx	24 Oct 2002 10:56:12 -0000	1.5
-+++ vcl/inc/msgbox.hxx	7 Jan 2004 09:08:49 -0000	1.6
+--- vcl/inc/msgbox.hxx.orig	2004-09-12 14:26:21.710971896 +0200
++++ vcl/inc/msgbox.hxx	2004-09-12 14:54:44.826059048 +0200
 @@ -118,12 +118,9 @@ protected:
      XubString           maCheckBoxText;
      BOOL                mbCheck;
@@ -2800,12 +2544,8 @@ diff -u -p -u -r1.5 -r1.6
  						QueryBox( Window* pParent, WinBits nStyle,
 Index: vcl/inc/opengl.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/opengl.hxx,v
-retrieving revision 1.3
-retrieving revision 1.5
-diff -u -p -u -r1.3 -r1.5
---- vcl/inc/opengl.hxx	15 Mar 2002 17:10:25 -0000	1.3
-+++ vcl/inc/opengl.hxx	7 Jan 2004 09:09:11 -0000	1.5
+--- vcl/inc/opengl.hxx.orig	2004-09-12 14:26:21.711971744 +0200
++++ vcl/inc/opengl.hxx	2004-09-12 14:54:44.827058896 +0200
 @@ -80,22 +80,13 @@ class RmOpenGL;
  class OpenGL
  {
@@ -2832,12 +2572,8 @@ diff -u -p -u -r1.3 -r1.5
  					OpenGL( OutputDevice* pOutDev );
 Index: vcl/inc/outdata.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/outdata.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -p -u -r1.1.1.1 -r1.3
---- vcl/inc/outdata.hxx	19 Sep 2000 10:23:05 -0000	1.1.1.1
-+++ vcl/inc/outdata.hxx	7 Jan 2004 09:09:31 -0000	1.3
+--- vcl/inc/outdata.hxx.orig	2004-09-12 14:26:21.712971592 +0200
++++ vcl/inc/outdata.hxx	2004-09-12 14:54:44.827058896 +0200
 @@ -66,8 +66,8 @@
  #include <sv.h>
  #endif
@@ -2864,12 +2600,8 @@ diff -u -p -u -r1.1.1.1 -r1.3
  {
 Index: vcl/inc/outdev.h
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/outdev.h,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -p -u -r1.13 -r1.14
---- vcl/inc/outdev.h	27 Mar 2003 17:57:25 -0000	1.13
-+++ vcl/inc/outdev.h	7 Jan 2004 09:09:50 -0000	1.14
+--- vcl/inc/outdev.h.orig	2004-09-12 14:26:21.713971440 +0200
++++ vcl/inc/outdev.h	2004-09-12 14:54:44.828058744 +0200
 @@ -263,7 +263,6 @@ private:
      ImplFontEntry*      mpFirstEntry;
      USHORT              mnRef0Count;
@@ -2880,12 +2612,8 @@ diff -u -p -u -r1.13 -r1.14
                          ImplFontCache( BOOL bPrinter );
 Index: vcl/inc/outdev.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/outdev.hxx,v
-retrieving revision 1.40
-retrieving revision 1.51
-diff -u -p -u -r1.40 -r1.51
---- vcl/inc/outdev.hxx	6 Jun 2003 10:29:59 -0000	1.40
-+++ vcl/inc/outdev.hxx	17 Jun 2004 12:05:32 -0000	1.51
+--- vcl/inc/outdev.hxx.orig	2004-09-12 14:26:21.717970832 +0200
++++ vcl/inc/outdev.hxx	2004-09-12 14:54:44.832058136 +0200
 @@ -71,11 +71,11 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -2921,8 +2649,7 @@ diff -u -p -u -r1.40 -r1.51
  class Gradient;
  class Hatch;
  class Bitmap;
-@@ -139,7 +138,10 @@ namespace awt {
- typedef std::vector< Rectangle > MetricVector;
+@@ -147,6 +146,9 @@ typedef std::vector< Rectangle > MetricV
  
  namespace vcl { class PDFWriterImpl; }
  
@@ -2932,7 +2659,7 @@ diff -u -p -u -r1.40 -r1.51
  // ---------------------
  // - OutputDevice-Data -
  // ---------------------
-@@ -196,7 +194,9 @@ struct KerningPair
+@@ -196,7 +198,9 @@ struct KerningPair
  #define PUSH_TEXTALIGN                  ((USHORT)0x0100)
  #define PUSH_REFPOINT                   ((USHORT)0x0200)
  #define PUSH_TEXTLINECOLOR              ((USHORT)0x0400)
@@ -2943,7 +2670,7 @@ diff -u -p -u -r1.40 -r1.51
  #define PUSH_ALLFONT                    (PUSH_ALLTEXT | PUSH_FONT)
  #define PUSH_ALL                        ((USHORT)0xFFFF)
  
-@@ -224,10 +224,11 @@ struct KerningPair
+@@ -224,10 +228,11 @@ struct KerningPair
  #define IMAGE_DRAW_DISABLE              ((USHORT)0x0001)
  #define IMAGE_DRAW_HIGHLIGHT            ((USHORT)0x0002)
  #define IMAGE_DRAW_DEACTIVE             ((USHORT)0x0004)
@@ -2957,7 +2684,7 @@ diff -u -p -u -r1.40 -r1.51
  #define IMAGE_DRAW_BTNLOOK              0
  
  // WaveLine
-@@ -327,20 +328,24 @@ enum OutDevViewType { OUTDEV_VIEWTYPE_DO
+@@ -327,20 +332,24 @@ enum OutDevViewType { OUTDEV_VIEWTYPE_DO
  
  class OutputDevice : public Resource
  {
@@ -2993,7 +2720,7 @@ diff -u -p -u -r1.40 -r1.51
      mutable OutputDevice*       mpPrevGraphics;
      mutable OutputDevice*       mpNextGraphics;
      GDIMetaFile*        mpMetaFile;
-@@ -354,7 +359,10 @@ private:
+@@ -354,7 +363,10 @@ private:
      List*               mpUnoGraphicsList;
      OutDev3D*           mp3DContext;
      vcl::PDFWriterImpl* mpPDFWriter;
@@ -3005,7 +2732,7 @@ diff -u -p -u -r1.40 -r1.51
      /// Additional output pixel offset, applied in LogicToPixel (used by SetPixelOffset/GetPixelOffset)
      long				mnOutOffOrigX;
      /// Additional output offset in _logical_ coordinates, applied in PixelToLogic (used by SetPixelOffset/GetPixelOffset)
-@@ -369,8 +377,8 @@ private:
+@@ -369,8 +381,8 @@ private:
      long                mnOutOffY;
      long                mnOutWidth;
      long                mnOutHeight;
@@ -3016,7 +2743,7 @@ diff -u -p -u -r1.40 -r1.51
      /// Output offset for text alignment in pixel
      long                mnTextOffX;
      /// Output offset for text alignment in pixel
-@@ -379,7 +387,6 @@ private:
+@@ -379,7 +391,6 @@ private:
      long                mnEmphasisDescent;
      ULONG               mnDrawMode;
      ULONG               mnTextLayoutMode;
@@ -3024,7 +2751,7 @@ diff -u -p -u -r1.40 -r1.51
      ImplMapRes          maMapRes;
      ImplThresholdRes    maThresRes;
      OutDevType          meOutDevType;
-@@ -389,7 +396,6 @@ private:
+@@ -389,7 +400,6 @@ private:
      Color               maFillColor;
      Font                maFont;
      Color               maTextColor;
@@ -3032,7 +2759,7 @@ diff -u -p -u -r1.40 -r1.51
      Color               maTextLineColor;
      TextAlign           meTextAlign;
      RasterOp            meRasterOp;
-@@ -399,8 +405,6 @@ private:
+@@ -399,8 +409,6 @@ private:
      Point               maRefPoint;
      USHORT              mnAntialiasing;
      LanguageType        meTextLanguage;
@@ -3041,7 +2768,7 @@ diff -u -p -u -r1.40 -r1.51
      mutable BOOL       mbMap:1,
                          mbMapIsDefault:1,
                          mbClipRegion:1,
-@@ -421,12 +425,121 @@ private:
+@@ -421,12 +429,121 @@ private:
                          mbTextLines:1,
                          mbTextSpecial:1,
                          mbRefPoint:1,
@@ -3167,7 +2894,7 @@ diff -u -p -u -r1.40 -r1.51
  #endif
  
  protected:
-@@ -459,15 +572,15 @@ public:
+@@ -459,15 +576,15 @@ public:
                                        xub_StrLen nLen = STRING_LEN ) const;
      long                GetTextHeight() const;
      void                DrawTextArray( const Point& rStartPt, const XubString& rStr,
@@ -3187,7 +2914,7 @@ diff -u -p -u -r1.40 -r1.51
                                        BOOL bCellBreaking = TRUE ) const;
      void                DrawStretchText( const Point& rStartPt, ULONG nWidth,
                                           const XubString& rStr,
-@@ -505,10 +618,10 @@ public:
+@@ -505,10 +622,10 @@ public:
                              xub_StrLen nLen = STRING_LEN ) const;
      BOOL                GetTextOutline( PolyPolygon&,
                              const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0,
@@ -3200,7 +2927,7 @@ diff -u -p -u -r1.40 -r1.51
      BOOL				GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex,
                              int nLen, int nBase, MetricVector& rVector );
  
-@@ -517,10 +630,52 @@ public:
+@@ -526,10 +643,52 @@ public:
      void                DrawLine( const Point& rStartPt, const Point& rEndPt );
      void                DrawLine( const Point& rStartPt, const Point& rEndPt,
                                    const LineInfo& rLineInfo );
@@ -3253,7 +2980,7 @@ diff -u -p -u -r1.40 -r1.51
      void                DrawPolyPolygon( const PolyPolygon& rPolyPoly );
      void                DrawRect( const Rectangle& rRect );
      void                DrawRect( const Rectangle& rRect,
-@@ -606,17 +755,21 @@ public:
+@@ -606,17 +765,21 @@ public:
  
      Bitmap              GetBitmap( const Point& rSrcPt, const Size& rSize ) const;
  
@@ -3278,7 +3005,7 @@ diff -u -p -u -r1.40 -r1.51
      BOOL                IsOutputEnabled() const { return mbOutput; }
      BOOL                IsDeviceOutput() const { return mbDevOutput; }
      BOOL                IsDeviceOutputNecessary() const { return (mbOutput && mbDevOutput); }
-@@ -676,7 +829,7 @@ public:
+@@ -676,7 +839,7 @@ public:
      void                SetFont( const Font& rNewFont );
      const Font&         GetFont() const { return maFont; }
      void                SetTextColor( const Color& rColor );
@@ -3287,7 +3014,7 @@ diff -u -p -u -r1.40 -r1.51
      void                SetTextFillColor();
      void                SetTextFillColor( const Color& rColor );
  
-@@ -689,6 +842,6 @@ public:
+@@ -689,7 +852,7 @@ public:
      void                SetTextAlign( TextAlign eAlign );
      TextAlign           GetTextAlign() const { return maFont.GetAlign(); }
  
@@ -3295,7 +3022,8 @@ diff -u -p -u -r1.40 -r1.51
 +    void                SetSettings( const AllSettings& rSettings );
      const AllSettings&  GetSettings() const { return maSettings; }
  
-@@ -811,6 +953,11 @@ public:
+ #ifndef NOOLDSV
+@@ -811,6 +974,11 @@ public:
  
      Size                GetOutputSizePixel() const
                              { return Size( mnOutWidth, mnOutHeight ); }
@@ -3307,7 +3035,9 @@ diff -u -p -u -r1.40 -r1.51
      Size                GetOutputSize() const
                              { return PixelToLogic( GetOutputSizePixel() ); }
  
-@@ -831,9 +978,22 @@ public:
+@@ -836,11 +1004,24 @@ public:
+ #endif
+ 
      USHORT              GetBitCount() const;
 +
 +    /** Query the existence and depth of the alpha channel
@@ -3330,15 +3060,10 @@ diff -u -p -u -r1.40 -r1.51
      void                DrawEPS( const Point& rPt, const Size& rSz,
                                   const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL );
  
-
 Index: vcl/inc/pdfwriter.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/pdfwriter.hxx,v
-retrieving revision 1.6
-retrieving revision 1.8
-diff -u -p -u -r1.6 -r1.8
---- vcl/inc/pdfwriter.hxx	28 May 2003 12:29:54 -0000	1.6
-+++ vcl/inc/pdfwriter.hxx	17 Jun 2004 12:05:47 -0000	1.8
+--- vcl/inc/pdfwriter.hxx.orig	2004-09-12 14:26:21.718970680 +0200
++++ vcl/inc/pdfwriter.hxx	2004-09-12 14:54:44.833057984 +0200
 @@ -73,7 +73,7 @@
  #ifndef _STRING_HXX
  #include <tools/string.hxx>
@@ -3359,10 +3084,8 @@ diff -u -p -u -r1.6 -r1.8
      void				DrawStretchText( const Point& rStartPt, ULONG nWidth,
 Index: vcl/inc/pngread.hxx
 ===================================================================
-RCS file: vcl/inc/pngread.hxx
-diff -N vcl/inc/pngread.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/pngread.hxx	28 Jun 2004 16:05:43 -0000	1.3
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/pngread.hxx	2004-09-12 14:54:44.833057984 +0200
 @@ -0,0 +1,101 @@
 +/*************************************************************************
 + *
@@ -3467,10 +3190,8 @@ diff -N vcl/inc/pngread.hxx
 +#endif // _SV_PNGREAD_HXX
 Index: vcl/inc/pngwrite.hxx
 ===================================================================
-RCS file: vcl/inc/pngwrite.hxx
-diff -N vcl/inc/pngwrite.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/pngwrite.hxx	28 Jun 2004 16:05:57 -0000	1.3
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/pngwrite.hxx	2004-09-12 14:54:44.834057832 +0200
 @@ -0,0 +1,106 @@
 +/*************************************************************************
 + *
@@ -3580,12 +3301,8 @@ diff -N vcl/inc/pngwrite.hxx
 +#endif // _SV_PNGWRITE_HXX
 Index: vcl/inc/print.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/print.hxx,v
-retrieving revision 1.17
-retrieving revision 1.19
-diff -u -p -u -r1.17 -r1.19
---- vcl/inc/print.hxx	27 Mar 2003 17:57:29 -0000	1.17
-+++ vcl/inc/print.hxx	7 Jan 2004 09:11:49 -0000	1.19
+--- vcl/inc/print.hxx.orig	2004-09-12 14:26:21.721970224 +0200
++++ vcl/inc/print.hxx	2004-09-12 14:54:44.835057680 +0200
 @@ -85,12 +85,9 @@
  #include <tools/stream.hxx>
  #endif
@@ -3685,12 +3402,8 @@ diff -u -p -u -r1.17 -r1.19
  public:
 Index: vcl/inc/regband.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/regband.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/regband.hxx	19 Sep 2000 10:23:06 -0000	1.1.1.1
-+++ vcl/inc/regband.hxx	7 Jan 2004 09:13:14 -0000	1.2
+--- vcl/inc/regband.hxx.orig	2004-09-12 14:26:21.722970072 +0200
++++ vcl/inc/regband.hxx	2004-09-12 14:54:44.836057528 +0200
 @@ -65,8 +65,8 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -3704,12 +3417,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  /* =======================================================================
 Index: vcl/inc/region.h
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/region.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/region.h	19 Sep 2000 10:23:06 -0000	1.1.1.1
-+++ vcl/inc/region.h	7 Jan 2004 09:13:32 -0000	1.2
+--- vcl/inc/region.h.orig	2004-09-12 14:26:21.722970072 +0200
++++ vcl/inc/region.h	2004-09-12 14:54:44.836057528 +0200
 @@ -68,8 +68,8 @@
  #ifndef _SV_REGBAND_HXX
  #include <regband.hxx>
@@ -3723,12 +3432,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  #ifndef _SV_REGION_HXX
 Index: vcl/inc/region.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/region.hxx,v
-retrieving revision 1.3
-retrieving revision 1.5
-diff -u -p -u -r1.3 -r1.5
---- vcl/inc/region.hxx	18 Jun 2001 12:53:13 -0000	1.3
-+++ vcl/inc/region.hxx	7 Jan 2004 09:13:51 -0000	1.5
+--- vcl/inc/region.hxx.orig	2004-09-12 14:26:21.728969160 +0200
++++ vcl/inc/region.hxx	2004-09-12 14:54:44.837057376 +0200
 @@ -91,11 +91,30 @@ typedef long RegionHandle;
  
  class Region
@@ -3775,10 +3480,8 @@ diff -u -p -u -r1.3 -r1.5
  #endif	// _SV_REGION_HXX
 Index: vcl/inc/salbmp.hxx
 ===================================================================
-RCS file: vcl/inc/salbmp.hxx
-diff -N vcl/inc/salbmp.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/salbmp.hxx	18 Nov 2003 14:28:29 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/salbmp.hxx	2004-09-12 14:54:44.838057224 +0200
 @@ -0,0 +1,96 @@
 +/*************************************************************************
 + *
@@ -3878,10 +3581,8 @@ diff -N vcl/inc/salbmp.hxx
 +#endif
 Index: vcl/inc/salctrlhandle.hxx
 ===================================================================
-RCS file: vcl/inc/salctrlhandle.hxx
-diff -N vcl/inc/salctrlhandle.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/salctrlhandle.hxx	10 May 2004 15:42:11 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/salctrlhandle.hxx	2004-09-12 14:54:44.838057224 +0200
 @@ -0,0 +1,82 @@
 +/*************************************************************************
 + *
@@ -3967,12 +3668,8 @@ diff -N vcl/inc/salctrlhandle.hxx
 +#endif
 Index: vcl/inc/salframe.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salframe.hxx,v
-retrieving revision 1.16
-retrieving revision 1.19
-diff -u -p -u -r1.16 -r1.19
---- vcl/inc/salframe.hxx	24 Apr 2003 15:16:48 -0000	1.16
-+++ vcl/inc/salframe.hxx	10 May 2004 15:42:24 -0000	1.19
+--- vcl/inc/salframe.hxx.orig	2004-09-12 14:26:21.732968552 +0200
++++ vcl/inc/salframe.hxx	2004-09-12 14:54:44.839057072 +0200
 @@ -80,9 +80,6 @@
  #ifndef _SV_SALWTYPE_HXX
  #include <salwtype.hxx>
@@ -4202,12 +3899,8 @@ diff -u -p -u -r1.16 -r1.19
  
 Index: vcl/inc/salgdi.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salgdi.hxx,v
-retrieving revision 1.20.116.1
-retrieving revision 1.24
-diff -u -p -u -r1.20.116.1 -r1.24
---- vcl/inc/salgdi.hxx	9 Jan 2004 18:13:40 -0000	1.20.116.1
-+++ vcl/inc/salgdi.hxx	17 Jun 2004 12:07:14 -0000	1.24
+--- vcl/inc/salgdi.hxx.orig	2004-09-12 14:26:21.735968096 +0200
++++ vcl/inc/salgdi.hxx	2004-09-12 14:54:44.842056616 +0200
 @@ -72,15 +72,21 @@
  #ifndef _SV_SALGTYPE_HXX
  #include <salgtype.hxx>
@@ -4713,10 +4406,8 @@ diff -u -p -u -r1.20.116.1 -r1.24
  #endif // _SV_SALGDI_HXX
 Index: vcl/inc/salimestatus.hxx
 ===================================================================
-RCS file: vcl/inc/salimestatus.hxx
-diff -N vcl/inc/salimestatus.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/salimestatus.hxx	18 Nov 2003 14:29:06 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/salimestatus.hxx	2004-09-12 14:54:44.843056464 +0200
 @@ -0,0 +1,77 @@
 +/*************************************************************************
 + *
@@ -4797,12 +4488,8 @@ diff -N vcl/inc/salimestatus.hxx
 +#endif
 Index: vcl/inc/salinst.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salinst.hxx,v
-retrieving revision 1.6.280.1
-retrieving revision 1.10
-diff -u -p -u -r1.6.280.1 -r1.10
---- vcl/inc/salinst.hxx	2 Mar 2004 10:00:22 -0000	1.6.280.1
-+++ vcl/inc/salinst.hxx	18 May 2004 10:49:17 -0000	1.10
+--- vcl/inc/salinst.hxx.orig	2004-09-12 14:26:21.738967640 +0200
++++ vcl/inc/salinst.hxx	2004-09-12 14:54:44.845056160 +0200
 @@ -67,15 +67,11 @@
  #ifndef _STRING_HXX
  #include <tools/string.hxx>
@@ -5029,12 +4716,8 @@ diff -u -p -u -r1.6.280.1 -r1.10
  void DeInitSalMain();
 Index: vcl/inc/sallayout.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/sallayout.hxx,v
-retrieving revision 1.31.68.1
-retrieving revision 1.36
-diff -u -p -u -r1.31.68.1 -r1.36
---- vcl/inc/sallayout.hxx	9 Jan 2004 18:13:41 -0000	1.31.68.1
-+++ vcl/inc/sallayout.hxx	17 Jun 2004 12:07:38 -0000	1.36
+--- vcl/inc/sallayout.hxx.orig	2004-09-12 14:26:21.739967488 +0200
++++ vcl/inc/sallayout.hxx	2004-09-12 14:54:44.846056008 +0200
 @@ -63,10 +63,10 @@
  #define _SV_SALLAYOUT_HXX
  
@@ -5151,10 +4834,8 @@ diff -u -p -u -r1.31.68.1 -r1.36
      GlyphItem*      mpGlyphItems;   // TODO: change to GlyphList
 Index: vcl/inc/salmenu.hxx
 ===================================================================
-RCS file: vcl/inc/salmenu.hxx
-diff -N vcl/inc/salmenu.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/salmenu.hxx	7 Jan 2004 09:17:01 -0000	1.4
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/salmenu.hxx	2004-09-12 14:54:44.846056008 +0200
 @@ -0,0 +1,122 @@
 +/*************************************************************************
 + *
@@ -5280,10 +4961,8 @@ diff -N vcl/inc/salmenu.hxx
 +
 Index: vcl/inc/salnativewidgets.hxx
 ===================================================================
-RCS file: vcl/inc/salnativewidgets.hxx
-diff -N vcl/inc/salnativewidgets.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/salnativewidgets.hxx	10 May 2004 15:42:51 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/salnativewidgets.hxx	2004-09-12 14:54:44.848055704 +0200
 @@ -0,0 +1,367 @@
 +/*************************************************************************
 + *
@@ -5654,12 +5333,8 @@ diff -N vcl/inc/salnativewidgets.hxx
 +
 Index: vcl/inc/salobj.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salobj.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/salobj.hxx	19 Sep 2000 10:23:06 -0000	1.1.1.1
-+++ vcl/inc/salobj.hxx	18 Nov 2003 14:29:32 -0000	1.2
+--- vcl/inc/salobj.hxx.orig	2004-09-12 14:26:21.742967032 +0200
++++ vcl/inc/salobj.hxx	2004-09-12 14:54:44.848055704 +0200
 @@ -71,9 +71,6 @@
  #ifndef _SV_SALWTYPE_HXX
  #include <salwtype.hxx>
@@ -5735,10 +5410,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  #endif // _SV_SALOBJ_HXX
 Index: vcl/inc/salogl.hxx
 ===================================================================
-RCS file: vcl/inc/salogl.hxx
-diff -N vcl/inc/salogl.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/salogl.hxx	18 Nov 2003 14:29:40 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/salogl.hxx	2004-09-12 14:54:44.849055552 +0200
 @@ -0,0 +1,109 @@
 +/*************************************************************************
 + *
@@ -5851,12 +5524,8 @@ diff -N vcl/inc/salogl.hxx
 +#endif
 Index: vcl/inc/salprn.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salprn.hxx,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -p -u -r1.4 -r1.5
---- vcl/inc/salprn.hxx	20 Nov 2002 12:03:33 -0000	1.4
-+++ vcl/inc/salprn.hxx	18 Nov 2003 14:29:49 -0000	1.5
+--- vcl/inc/salprn.hxx.orig	2004-09-12 14:26:21.746966424 +0200
++++ vcl/inc/salprn.hxx	2004-09-12 14:54:44.850055400 +0200
 @@ -69,9 +69,6 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -5984,13 +5653,10 @@ diff -u -p -u -r1.4 -r1.5
  };
  
  #endif // _SV_SALPRN_HXX
-
 Index: vcl/inc/salsound.hxx
 ===================================================================
-RCS file: vcl/inc/salsound.hxx
-diff -N vcl/inc/salsound.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/salsound.hxx	18 Nov 2003 14:29:57 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/salsound.hxx	2004-09-12 14:54:44.851055248 +0200
 @@ -0,0 +1,119 @@
 +/*************************************************************************
 + *
@@ -6113,12 +5779,8 @@ diff -N vcl/inc/salsound.hxx
 +#endif
 Index: vcl/inc/salsys.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salsys.hxx,v
-retrieving revision 1.7
-retrieving revision 1.9
-diff -u -p -u -r1.7 -r1.9
---- vcl/inc/salsys.hxx	20 Nov 2002 15:45:04 -0000	1.7
-+++ vcl/inc/salsys.hxx	7 Jan 2004 09:17:24 -0000	1.9
+--- vcl/inc/salsys.hxx.orig	2004-09-12 14:26:21.748966120 +0200
++++ vcl/inc/salsys.hxx	2004-09-12 14:54:44.851055248 +0200
 @@ -65,44 +65,9 @@
  #ifndef _STRING_HXX
  #include <tools/string.hxx>
@@ -6253,12 +5915,8 @@ diff -u -p -u -r1.7 -r1.9
  #endif // _SV_SALSYS_HXX
 Index: vcl/inc/saltimer.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/saltimer.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/saltimer.hxx	19 Sep 2000 10:23:06 -0000	1.1.1.1
-+++ vcl/inc/saltimer.hxx	18 Nov 2003 14:30:19 -0000	1.2
+--- vcl/inc/saltimer.hxx.orig	2004-09-12 14:26:21.749965968 +0200
++++ vcl/inc/saltimer.hxx	2004-09-12 14:54:44.852055096 +0200
 @@ -73,15 +73,34 @@
  // - SalTimer -
  // ------------
@@ -6300,12 +5958,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  #endif // _SV_SALTIMER_HXX
 Index: vcl/inc/salvd.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salvd.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/salvd.hxx	19 Sep 2000 10:23:06 -0000	1.1.1.1
-+++ vcl/inc/salvd.hxx	18 Nov 2003 14:30:29 -0000	1.2
+--- vcl/inc/salvd.hxx.orig	2004-09-12 14:26:21.750965816 +0200
++++ vcl/inc/salvd.hxx	2004-09-12 14:54:44.852055096 +0200
 @@ -65,9 +65,6 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -6351,12 +6005,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  #endif // _SV_SALVD_HXX
 Index: vcl/inc/salwtype.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/salwtype.hxx,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -p -u -r1.11 -r1.12
---- vcl/inc/salwtype.hxx	27 Mar 2003 17:57:31 -0000	1.11
-+++ vcl/inc/salwtype.hxx	18 Nov 2003 14:56:54 -0000	1.12
+--- vcl/inc/salwtype.hxx.orig	2004-09-12 14:26:21.751965664 +0200
++++ vcl/inc/salwtype.hxx	2004-09-12 14:54:44.853054944 +0200
 @@ -147,7 +147,11 @@ struct ImplFontSelectData;
  #define SALEVENT_CLOSEPOPUPS            ((USHORT)30)
  #define SALEVENT_EXTERNALKEYINPUT       ((USHORT)31)
@@ -6370,28 +6020,24 @@ diff -u -p -u -r1.11 -r1.12
  
  // MOUSELEAVE must send, when the pointer leave the client area and
  // the mouse is not captured
-@@ -169,6 +173,13 @@ struct SalKeyEvent
-     USHORT          mnCode;         // SV-KeyCode (KEY_xxx | KEY_SHIFT | KEY_MOD1 | KEY_MOD2)
-     USHORT          mnCharCode;     // SV-CharCode
+@@ -171,6 +175,13 @@ struct SalKeyEvent
      USHORT          mnRepeat;       // Repeat-Count (KeyInputs-1)
-+};
-+
+ };
+ 
 +// MENUEVENT
 +struct SalMenuEvent
 +{
 +    USHORT          mnId;           // Menu item ID
 +    void*           mpMenu;         // pointer to VCL menu (class Menu)
- };
- 
++};
++
  // KEYMODCHANGE
+ struct SalKeyModEvent
+ {
 Index: vcl/inc/scrbar.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/scrbar.hxx,v
-retrieving revision 1.5
-retrieving revision 1.10
-diff -u -p -u -r1.5 -r1.10
---- vcl/inc/scrbar.hxx	25 Jul 2001 11:39:21 -0000	1.5
-+++ vcl/inc/scrbar.hxx	10 May 2004 15:43:03 -0000	1.10
+--- vcl/inc/scrbar.hxx.orig	2004-09-12 14:26:21.752965512 +0200
++++ vcl/inc/scrbar.hxx	2004-09-12 14:54:44.854054792 +0200
 @@ -69,6 +69,8 @@
  #include <ctrl.hxx>
  #endif
@@ -6478,12 +6124,8 @@ diff -u -p -u -r1.5 -r1.10
                      ScrollBarBox( Window* pParent, WinBits nStyle = 0 );
 Index: vcl/inc/settings.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/settings.hxx,v
-retrieving revision 1.19
-retrieving revision 1.23
-diff -u -p -u -r1.19 -r1.23
---- vcl/inc/settings.hxx	17 Apr 2003 15:16:59 -0000	1.19
-+++ vcl/inc/settings.hxx	10 Jun 2004 17:17:43 -0000	1.23
+--- vcl/inc/settings.hxx.orig	2004-09-12 14:26:21.756964904 +0200
++++ vcl/inc/settings.hxx	2004-09-12 14:54:44.858054184 +0200
 @@ -69,8 +69,8 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -6790,12 +6432,8 @@ diff -u -p -u -r1.19 -r1.23
  // ---------------
 Index: vcl/inc/slider.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/slider.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/slider.hxx	19 Sep 2000 10:23:07 -0000	1.1.1.1
-+++ vcl/inc/slider.hxx	7 Jan 2004 09:18:32 -0000	1.2
+--- vcl/inc/slider.hxx.orig	2004-09-12 14:26:21.757964752 +0200
++++ vcl/inc/slider.hxx	2004-09-12 14:54:44.859054032 +0200
 @@ -106,7 +106,6 @@ private:
  	Link			maSlideHdl;
  	Link			maEndSlideHdl;
@@ -6814,12 +6452,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  					Slider( Window* pParent, WinBits nStyle = WB_HORZ );
 Index: vcl/inc/sound.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/sound.hxx,v
-retrieving revision 1.3
-retrieving revision 1.5
-diff -u -p -u -r1.3 -r1.5
---- vcl/inc/sound.hxx	13 Jun 2001 10:52:47 -0000	1.3
-+++ vcl/inc/sound.hxx	7 Jan 2004 09:19:13 -0000	1.5
+--- vcl/inc/sound.hxx.orig	2004-09-12 14:26:21.758964600 +0200
++++ vcl/inc/sound.hxx	2004-09-12 14:54:44.859054032 +0200
 @@ -92,15 +92,10 @@ class Sound
  {
  private:
@@ -6857,12 +6491,8 @@ diff -u -p -u -r1.3 -r1.5
      void				Play();
 Index: vcl/inc/spin.h
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/spin.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/spin.h	19 Sep 2000 10:23:07 -0000	1.1.1.1
-+++ vcl/inc/spin.h	11 Dec 2003 11:51:45 -0000	1.2
+--- vcl/inc/spin.h.orig	2004-09-12 14:26:21.759964448 +0200
++++ vcl/inc/spin.h	2004-09-12 14:54:44.860053880 +0200
 @@ -82,6 +82,6 @@ void ImplDrawSpinButton( OutputDevice* p
                           BOOL bUpperIn, BOOL bLowerIn,
                           BOOL bUpperEnabled = TRUE,
@@ -6873,12 +6503,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  #endif  // _SV_SPIN_H
 Index: vcl/inc/spin.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/spin.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.4
-diff -u -p -u -r1.1.1.1 -r1.4
---- vcl/inc/spin.hxx	19 Sep 2000 10:23:07 -0000	1.1.1.1
-+++ vcl/inc/spin.hxx	10 May 2004 15:43:29 -0000	1.4
+--- vcl/inc/spin.hxx.orig	2004-09-12 14:26:21.760964296 +0200
++++ vcl/inc/spin.hxx	2004-09-12 14:54:44.861053728 +0200
 @@ -82,19 +82,24 @@ private:
      AutoTimer       maRepeatTimer;
      Rectangle       maUpperRect;
@@ -6960,12 +6586,8 @@ diff -u -p -u -r1.1.1.1 -r1.4
  #endif  // _SV_SPIN_HXX
 Index: vcl/inc/spinfld.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/spinfld.hxx,v
-retrieving revision 1.3
-retrieving revision 1.6
-diff -u -p -u -r1.3 -r1.6
---- vcl/inc/spinfld.hxx	3 May 2002 13:04:10 -0000	1.3
-+++ vcl/inc/spinfld.hxx	10 May 2004 15:43:41 -0000	1.6
+--- vcl/inc/spinfld.hxx.orig	2004-09-12 14:26:21.761964144 +0200
++++ vcl/inc/spinfld.hxx	2004-09-12 14:54:44.861053728 +0200
 @@ -97,16 +97,12 @@ protected:
  					mbLowerIn:1,
  					mbInDropDown:1;
@@ -7001,12 +6623,8 @@ diff -u -p -u -r1.3 -r1.6
  	const Link& 	GetUpHdl() const { return maUpHdlLink; }
 Index: vcl/inc/split.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/split.hxx,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -p -u -r1.7 -r1.8
---- vcl/inc/split.hxx	14 Aug 2002 14:06:39 -0000	1.7
-+++ vcl/inc/split.hxx	7 Jan 2004 09:20:22 -0000	1.8
+--- vcl/inc/split.hxx.orig	2004-09-12 14:26:21.761964144 +0200
++++ vcl/inc/split.hxx	2004-09-12 14:54:44.862053576 +0200
 @@ -92,7 +92,6 @@ private:
      Link                maStartSplitHdl;
      Link                maSplitHdl;
@@ -7025,12 +6643,8 @@ diff -u -p -u -r1.7 -r1.8
  	void 				ImplInit( Window* pParent, WinBits nWinStyle );
 Index: vcl/inc/splitwin.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/splitwin.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/splitwin.hxx	27 Mar 2003 17:57:33 -0000	1.2
-+++ vcl/inc/splitwin.hxx	7 Jan 2004 09:20:41 -0000	1.3
+--- vcl/inc/splitwin.hxx.orig	2004-09-12 14:26:21.762963992 +0200
++++ vcl/inc/splitwin.hxx	2004-09-12 14:54:44.862053576 +0200
 @@ -141,10 +141,7 @@ private:
  						mbFadeInPressed:1,
  						mbFadeOutPressed:1,
@@ -7061,12 +6675,8 @@ diff -u -p -u -r1.2 -r1.3
  						SplitWindow( Window* pParent, WinBits nStyle = 0 );
 Index: vcl/inc/status.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/status.hxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/inc/status.hxx	27 Mar 2003 17:57:33 -0000	1.3
-+++ vcl/inc/status.hxx	7 Jan 2004 09:20:58 -0000	1.4
+--- vcl/inc/status.hxx.orig	2004-09-12 14:26:21.764963688 +0200
++++ vcl/inc/status.hxx	2004-09-12 14:54:44.863053424 +0200
 @@ -128,23 +128,17 @@ private:
  	long				mnCalcHeight;
  	long				mnTextY;
@@ -7101,12 +6711,8 @@ diff -u -p -u -r1.3 -r1.4
  						StatusBar( Window* pParent,
 Index: vcl/inc/svapp.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/svapp.hxx,v
-retrieving revision 1.27
-retrieving revision 1.30
-diff -u -p -u -r1.27 -r1.30
---- vcl/inc/svapp.hxx	10 Jun 2003 14:29:14 -0000	1.27
-+++ vcl/inc/svapp.hxx	10 May 2004 12:57:43 -0000	1.30
+--- vcl/inc/svapp.hxx.orig	2004-09-12 14:26:21.765963536 +0200
++++ vcl/inc/svapp.hxx	2004-09-12 14:54:44.865053120 +0200
 @@ -74,9 +74,6 @@
  #ifndef _UNQID_HXX
  #include <tools/unqid.hxx>
@@ -7117,9 +6723,7 @@ diff -u -p -u -r1.27 -r1.30
  #ifndef _SV_SV_H
  #include <sv.h>
  #endif
-@@ -100,13 +97,8 @@ class Window;
- class Reflection;
- class KeyCode;
+@@ -106,11 +103,6 @@ class KeyCode;
  class NotifyEvent;
  class KeyEvent;
  
@@ -7131,7 +6735,7 @@ diff -u -p -u -r1.27 -r1.30
  namespace vos { class IMutex; }
  
  #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
-@@ -327,7 +291,7 @@ class Application
+@@ -327,7 +319,7 @@ class Application
  {
  public:
                                  Application();
@@ -7140,8 +6744,7 @@ diff -u -p -u -r1.27 -r1.30
  
      virtual void                Main() = 0;
  
-@@ -406,8 +370,9 @@ public:
- 
+@@ -435,7 +427,8 @@ public:
  #ifndef NO_GETAPPWINDOW
      static WorkWindow*          GetAppWindow();
  #endif
@@ -7151,7 +6754,7 @@ diff -u -p -u -r1.27 -r1.30
      static OutputDevice*        GetDefaultDevice();
  
      static Window*              GetFirstTopLevelWindow();
-@@ -562,6 +482,11 @@ public:
+@@ -562,6 +555,11 @@ public:
          Can be called without the Solar mutex locked.
       */
      static bool GetShowImeStatusWindowDefault();
@@ -7165,12 +6768,8 @@ diff -u -p -u -r1.27 -r1.30
  Application* GetpApp();
 Index: vcl/inc/svdata.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/svdata.hxx,v
-retrieving revision 1.38.88.2
-retrieving revision 1.45
-diff -u -p -u -r1.38.88.2 -r1.45
---- vcl/inc/svdata.hxx	2 Mar 2004 10:00:45 -0000	1.38.88.2
-+++ vcl/inc/svdata.hxx	25 Jun 2004 17:08:32 -0000	1.45
+--- vcl/inc/svdata.hxx.orig	2004-09-12 14:26:21.767963232 +0200
++++ vcl/inc/svdata.hxx	2004-09-12 14:54:44.866052968 +0200
 @@ -147,80 +147,13 @@ class ImplVDevCache;
  class UnoWrapperBase;
  class GraphicConverter;
@@ -7264,7 +6863,7 @@ diff -u -p -u -r1.38.88.2 -r1.45
      ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    mxMSF;
      String*                 mpMSFTempFileName;
      AllSettings*            mpSettings;         // Application settings
-@@ -337,7 +266,6 @@ struct ImplSVWinData
+@@ -337,7 +267,6 @@ struct ImplSVWinData
      USHORT                  mnAutoScrollFlags;  // auto scroll flags
      BOOL                    mbNoDeactivate;     // TRUE: keine Deactivate durchfuehren
  	BOOL					mbNoSaveFocus;		// TRUE: menues must not save/restore focus
@@ -7272,7 +6871,7 @@ diff -u -p -u -r1.38.88.2 -r1.45
  };
  
  
-@@ -387,17 +315,6 @@ struct ImplSVHelpData
+@@ -387,17 +316,6 @@ struct ImplSVHelpData
  };
  
  
@@ -7290,7 +6889,7 @@ diff -u -p -u -r1.38.88.2 -r1.45
  // --------------
  // - ImplSVData -
  // --------------
-@@ -412,6 +329,9 @@ struct ImplSVData
+@@ -412,6 +330,9 @@ struct ImplSVData
      ULONG                   mnThreadCount;      // is VCL MultiThread enabled
      ImplConfigData*         mpFirstConfigData;  // Zeiger auf ersten Config-Block
      ImplTimerData*          mpFirstTimerData;   // list of all running timers
@@ -7300,7 +6899,7 @@ diff -u -p -u -r1.38.88.2 -r1.45
      ResMgr*                 mpResMgr;           // SV-Resource-Manager
      ULONG                   mnTimerPeriod;      // current timer period
      ULONG                   mnTimerUpdate;      // TimerCallbackProcs on stack
-@@ -422,35 +342,12 @@ struct ImplSVData
+@@ -422,35 +343,12 @@ struct ImplSVData
      ImplSVWinData           maWinData;          // indepen data for Windows classes
      ImplSVCtrlData          maCtrlData;         // indepen data for Control classes
      ImplSVHelpData          maHelpData;         // indepen data for Help classes
@@ -7336,7 +6935,7 @@ diff -u -p -u -r1.38.88.2 -r1.45
      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxAccessBridge;
      com::sun::star::uno::Reference< com::sun::star::frame::XSessionManagerClient > xSMClient;
      ::vcl::SettingsConfigItem*			mpSettingsConfigItem;
-@@ -465,10 +362,8 @@ ResMgr*     ImplGetResMgr();
+@@ -465,10 +363,8 @@ ResMgr*     ImplGetResMgr();
  void        ImplWindowAutoMnemonic( Window* pWindow );
  void        ImplTimerCallbackProc();
  
@@ -7349,12 +6948,8 @@ diff -u -p -u -r1.38.88.2 -r1.45
  BOOL        ImplCallHotKey( const KeyCode& rKeyCode );
 Index: vcl/inc/sysdata.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/sysdata.hxx,v
-retrieving revision 1.2
-retrieving revision 1.4
-diff -u -p -u -r1.2 -r1.4
---- vcl/inc/sysdata.hxx	9 Feb 2001 14:51:45 -0000	1.2
-+++ vcl/inc/sysdata.hxx	7 Jan 2004 09:22:49 -0000	1.4
+--- vcl/inc/sysdata.hxx.orig	2004-09-12 14:26:21.768963080 +0200
++++ vcl/inc/sysdata.hxx	2004-09-12 14:54:44.867052816 +0200
 @@ -69,11 +69,8 @@
  struct SystemEnvData
  {
@@ -7407,12 +7002,8 @@ diff -u -p -u -r1.2 -r1.4
  
 Index: vcl/inc/syswin.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/syswin.hxx,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -p -u -r1.12 -r1.13
---- vcl/inc/syswin.hxx	27 Mar 2003 17:57:34 -0000	1.12
-+++ vcl/inc/syswin.hxx	7 Jan 2004 09:23:35 -0000	1.13
+--- vcl/inc/syswin.hxx.orig	2004-09-12 14:26:21.769962928 +0200
++++ vcl/inc/syswin.hxx	2004-09-12 14:54:44.868052664 +0200
 @@ -219,12 +219,9 @@ private:
      BOOL            mbDockBtn;
      BOOL            mbHideBtn;
@@ -7428,12 +7019,8 @@ diff -u -p -u -r1.12 -r1.13
                      SystemWindow( WindowType nType );
 Index: vcl/inc/tabctrl.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/tabctrl.hxx,v
-retrieving revision 1.4
-retrieving revision 1.7
-diff -u -p -u -r1.4 -r1.7
---- vcl/inc/tabctrl.hxx	4 Jun 2003 11:21:18 -0000	1.4
-+++ vcl/inc/tabctrl.hxx	10 May 2004 15:43:53 -0000	1.7
+--- vcl/inc/tabctrl.hxx.orig	2004-09-12 14:26:21.770962776 +0200
++++ vcl/inc/tabctrl.hxx	2004-09-12 14:54:44.868052664 +0200
 @@ -110,8 +110,6 @@ private:
      Link                maActivateHdl;
      Link                maDeactivateHdl;
@@ -7473,12 +7060,8 @@ diff -u -p -u -r1.4 -r1.7
      virtual long        DeactivatePage();
 Index: vcl/inc/tabdlg.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/tabdlg.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/tabdlg.hxx	19 Sep 2000 10:23:07 -0000	1.1.1.1
-+++ vcl/inc/tabdlg.hxx	7 Jan 2004 09:24:21 -0000	1.2
+--- vcl/inc/tabdlg.hxx.orig	2004-09-12 14:26:21.770962776 +0200
++++ vcl/inc/tabdlg.hxx	2004-09-12 14:54:44.869052512 +0200
 @@ -83,10 +83,8 @@ private:
  	WindowAlign 		meViewAlign;
  	BOOL				mbPosControls;
@@ -7492,13 +7075,9 @@ diff -u -p -u -r1.1.1.1 -r1.2
  						TabDialog( Window* pParent,
 Index: vcl/inc/tabpage.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/tabpage.hxx,v
-retrieving revision 1.3
-retrieving revision 1.5
-diff -u -p -u -r1.3 -r1.5
---- vcl/inc/tabpage.hxx	24 Apr 2003 16:30:10 -0000	1.3
-+++ vcl/inc/tabpage.hxx	20 Feb 2004 08:49:19 -0000	1.5
-@@ -75,15 +75,15 @@
+--- vcl/inc/tabpage.hxx.orig	2004-09-12 14:26:21.771962624 +0200
++++ vcl/inc/tabpage.hxx	2004-09-12 14:54:44.869052512 +0200
+@@ -75,16 +75,16 @@
  
  class TabPage : public Window
  {
@@ -7511,19 +7090,16 @@ diff -u -p -u -r1.3 -r1.5
  public:
  					TabPage( Window* pParent, WinBits nStyle = 0 );
  					TabPage( Window* pParent, const ResId& rResId );
-+
-+    virtual void    Paint( const Rectangle& rRect );
  
++    virtual void    Paint( const Rectangle& rRect );
++
  	virtual void	StateChanged( StateChangedType nStateChange );
  	virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+ 
 Index: vcl/inc/threadex.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/threadex.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/threadex.hxx	19 Sep 2000 10:23:07 -0000	1.1.1.1
-+++ vcl/inc/threadex.hxx	7 Jan 2004 09:24:56 -0000	1.2
+--- vcl/inc/threadex.hxx.orig	2004-09-12 14:26:21.772962472 +0200
++++ vcl/inc/threadex.hxx	2004-09-12 14:54:44.870052360 +0200
 @@ -74,7 +74,7 @@ namespace vcl
  		static void SAL_CALL worker( void* );
  	public:
@@ -7544,12 +7120,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  		long execute();
 Index: vcl/inc/timer.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/timer.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/timer.hxx	19 Sep 2000 10:23:07 -0000	1.1.1.1
-+++ vcl/inc/timer.hxx	7 Jan 2004 09:25:18 -0000	1.2
+--- vcl/inc/timer.hxx.orig	2004-09-12 14:26:21.772962472 +0200
++++ vcl/inc/timer.hxx	2004-09-12 14:54:44.870052360 +0200
 @@ -89,7 +89,7 @@ protected:
  public:
                      Timer();
@@ -7561,13 +7133,9 @@ diff -u -p -u -r1.1.1.1 -r1.2
  
 Index: vcl/inc/toolbox.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/toolbox.hxx,v
-retrieving revision 1.24
-retrieving revision 1.26
-diff -u -p -u -r1.24 -r1.26
---- vcl/inc/toolbox.hxx	17 Apr 2003 15:17:11 -0000	1.24
-+++ vcl/inc/toolbox.hxx	20 Jan 2004 11:55:53 -0000	1.26
-@@ -202,7 +201,6 @@ private:
+--- vcl/inc/toolbox.hxx.orig	2004-09-12 14:26:21.775962016 +0200
++++ vcl/inc/toolbox.hxx	2004-09-12 14:54:44.872052056 +0200
+@@ -202,7 +202,6 @@ private:
      Rectangle           maPaintRect;
      FloatingWindow*     mpFloatWin;
      USHORT              mnKeyModifier;
@@ -7575,7 +7143,7 @@ diff -u -p -u -r1.24 -r1.26
      long                mnDX;
      long                mnDY;
      long                mnItemWidth;
-@@ -250,10 +248,9 @@ private:
+@@ -250,10 +249,9 @@ private:
                          mbDragging:1,
                          mbHideStatusText:1,
                          mbMenuStrings:1,
@@ -7589,7 +7157,7 @@ diff -u -p -u -r1.24 -r1.26
      WindowAlign         meAlign;
      WindowAlign         meDockAlign;
      ButtonType          meButtonType;
-@@ -267,8 +264,6 @@ private:
+@@ -267,8 +265,6 @@ private:
      Link                maSelectHdl;
      Link                maNextToolBoxHdl;
  
@@ -7598,7 +7166,7 @@ diff -u -p -u -r1.24 -r1.26
      void                ImplInit( Window* pParent, WinBits nStyle );
      void                ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
      void                ImplLoadRes( const ResId& rResId );
-@@ -298,12 +293,16 @@ private:
+@@ -298,12 +294,16 @@ private:
  	void				ImplUpdateInputEnable();
      void				ImplFillLayoutData() const;
                          DECL_LINK( ImplUpdateHdl, void* );
@@ -7616,7 +7184,7 @@ diff -u -p -u -r1.24 -r1.26
  public:
                          ToolBox( Window* pParent, WinBits nStyle = 0 );
                          ToolBox( Window* pParent, const ResId& rResId );
-@@ -510,9 +509,9 @@ public:
+@@ -513,9 +513,9 @@ public:
      void                GetAccessObject( AccessObjectRef& rAcc ) const;
  
      // allow Click Handler to detect special key
@@ -7630,13 +7198,9 @@ diff -u -p -u -r1.24 -r1.26
  
 Index: vcl/inc/unobrok.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/unobrok.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/unobrok.hxx	19 Sep 2000 10:23:07 -0000	1.1.1.1
-+++ vcl/inc/unobrok.hxx	1 Dec 2003 13:02:17 -0000	1.2
-@@ -62,62 +62,8 @@
+--- vcl/inc/unobrok.hxx.orig	2004-09-12 14:26:21.776961864 +0200
++++ vcl/inc/unobrok.hxx	2004-09-12 14:54:44.872052056 +0200
+@@ -62,63 +62,9 @@
  #ifndef _UNOBROK_HXX
  #define _UNOBROK_HXX
  
@@ -7644,7 +7208,7 @@ diff -u -p -u -r1.1.1.1 -r1.2
 -
  #include <svdata.hxx>
  #include <vos/thread.hxx>
--
+ 
 -//  #include <com/sun/star/connection/XAcceptor.hpp>
 -
 -//  class UnoBrokerThread : public ::vos::OThread
@@ -7696,17 +7260,14 @@ diff -u -p -u -r1.1.1.1 -r1.2
 -//  	::com::sun::star::uno::Reference< ::com::sun::star::connection::XAcceptor  > m_rAcceptor;
 -//  	::rtl::OUString m_sAcceptorDescription;
 -//  };
- 
+-
  namespace vcl_accept
  {
+ 	sal_Bool accept(const ::rtl::OUString & accDcp, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rSMgr);
 Index: vcl/inc/unohelp2.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/unohelp2.hxx,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1 -r1.2
---- vcl/inc/unohelp2.hxx	18 Mar 2002 17:34:51 -0000	1.1
-+++ vcl/inc/unohelp2.hxx	7 Jan 2004 09:25:54 -0000	1.2
+--- vcl/inc/unohelp2.hxx.orig	2004-09-12 14:26:21.776961864 +0200
++++ vcl/inc/unohelp2.hxx	2004-09-12 14:54:44.873051904 +0200
 @@ -74,6 +74,9 @@
  #include <tools/string.hxx>
  #endif
@@ -7717,11 +7278,10 @@ diff -u -p -u -r1.1 -r1.2
  
  namespace vcl { namespace unohelper {
  
-@@ -98,6 +101,14 @@ namespace vcl { namespace unohelper {
- 		::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+@@ -99,6 +102,14 @@ namespace vcl { namespace unohelper {
  		::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(::com::sun::star::uno::RuntimeException);
  		sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException);
-+	};
+ 	};
 +	
 +	struct MutexHelper
 +	{
@@ -7729,17 +7289,14 @@ diff -u -p -u -r1.1 -r1.2
 +	        ::osl::Mutex maMutex;
 +	    public:
 +	        ::osl::Mutex& GetMutex() { return maMutex; }
- 	};
++	};
  
  }}	// namespace vcl::unohelper
+ 
 Index: vcl/inc/vclevent.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/vclevent.hxx,v
-retrieving revision 1.30
-retrieving revision 1.31
-diff -u -p -u -r1.30 -r1.31
---- vcl/inc/vclevent.hxx	12 Jun 2003 07:50:37 -0000	1.30
-+++ vcl/inc/vclevent.hxx	19 May 2004 13:50:40 -0000	1.31
+--- vcl/inc/vclevent.hxx.orig	2004-09-12 14:26:21.777961712 +0200
++++ vcl/inc/vclevent.hxx	2004-09-12 14:54:44.874051752 +0200
 @@ -178,6 +178,7 @@ class Menu;
  #define VCLEVENT_TOOLBOX_ITEMENABLED        1168        // pData = itempos
  #define VCLEVENT_TOOLBOX_ITEMDISABLED       1169        // pData = itempos
@@ -7815,12 +7372,8 @@ diff -u -p -u -r1.30 -r1.31
  
 Index: vcl/inc/virdev.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/virdev.hxx,v
-retrieving revision 1.3
-retrieving revision 1.7
-diff -u -p -u -r1.3 -r1.7
---- vcl/inc/virdev.hxx	1 Apr 2003 09:43:53 -0000	1.3
-+++ vcl/inc/virdev.hxx	7 Jan 2004 09:26:54 -0000	1.7
+--- vcl/inc/virdev.hxx.orig	2004-09-12 14:26:21.778961560 +0200
++++ vcl/inc/virdev.hxx	2004-09-12 14:54:44.875051600 +0200
 @@ -78,40 +78,52 @@ class RmVirtualDevice;
  
  class VirtualDevice : public OutputDevice
@@ -7892,12 +7445,8 @@ diff -u -p -u -r1.3 -r1.7
  #endif // _SV_VIRDEV_HXX
 Index: vcl/inc/wall.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/wall.hxx,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -p -u -r1.1.1.1 -r1.2
---- vcl/inc/wall.hxx	19 Sep 2000 10:23:08 -0000	1.1.1.1
-+++ vcl/inc/wall.hxx	7 Jan 2004 09:27:34 -0000	1.2
+--- vcl/inc/wall.hxx.orig	2004-09-12 14:26:21.779961408 +0200
++++ vcl/inc/wall.hxx	2004-09-12 14:54:44.876051448 +0200
 @@ -65,13 +65,14 @@
  #ifndef _SV_SV_H
  #include <sv.h>
@@ -8000,10 +7549,8 @@ diff -u -p -u -r1.1.1.1 -r1.2
  	BOOL			IsScrollable() const;
 Index: vcl/inc/wall2.hxx
 ===================================================================
-RCS file: vcl/inc/wall2.hxx
-diff -N vcl/inc/wall2.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/wall2.hxx	7 Jan 2004 09:27:49 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/inc/wall2.hxx	2004-09-12 14:54:44.876051448 +0200
 @@ -0,0 +1,96 @@
 +/*************************************************************************
 + *
@@ -8103,12 +7650,8 @@ diff -N vcl/inc/wall2.hxx
 +#endif	// _SV_WALL2_HXX
 Index: vcl/inc/windata.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/windata.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/windata.hxx	27 Jun 2001 08:23:42 -0000	1.2
-+++ vcl/inc/windata.hxx	1 Dec 2003 13:02:52 -0000	1.3
+--- vcl/inc/windata.hxx.orig	2004-09-12 14:26:21.781961104 +0200
++++ vcl/inc/windata.hxx	2004-09-12 14:54:44.877051296 +0200
 @@ -72,15 +72,7 @@ class SalFrame;
  // - Prototypes -
  // --------------
@@ -8128,12 +7671,8 @@ diff -u -p -u -r1.2 -r1.3
  // - HitTest -
 Index: vcl/inc/window.h
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/window.h,v
-retrieving revision 1.11.136.1
-retrieving revision 1.15
-diff -u -p -u -r1.11.136.1 -r1.15
---- vcl/inc/window.h	9 Jan 2004 18:13:41 -0000	1.11.136.1
-+++ vcl/inc/window.h	17 Jun 2004 12:10:38 -0000	1.15
+--- vcl/inc/window.h.orig	2004-09-12 14:26:21.782960952 +0200
++++ vcl/inc/window.h	2004-09-12 14:54:44.878051144 +0200
 @@ -86,6 +86,7 @@ class VirtualDevice;
  struct SalPaintEvent;
  class ImplDevFontList;
@@ -8178,12 +7717,8 @@ diff -u -p -u -r1.11.136.1 -r1.15
      long                mnLastMouseWinX;    // last x mouse position, rel. to pMouseMoveWin
 Index: vcl/inc/window.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/window.hxx,v
-retrieving revision 1.47.112.1
-retrieving revision 1.55
-diff -u -p -u -r1.47.112.1 -r1.55
---- vcl/inc/window.hxx	26 Jan 2004 17:20:36 -0000	1.47.112.1
-+++ vcl/inc/window.hxx	17 Jun 2004 12:10:54 -0000	1.55
+--- vcl/inc/window.hxx.orig	2004-09-12 14:26:21.786960344 +0200
++++ vcl/inc/window.hxx	2004-09-12 14:54:44.881050688 +0200
 @@ -68,8 +68,8 @@
  #ifndef _SV_OUTDEV_HXX
  #include <outdev.hxx>
@@ -8220,7 +7755,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
  #endif
  
  class VirtualDevice;
-@@ -144,6 +151,7 @@ namespace sun {
+@@ -144,6 +152,7 @@ namespace sun {
  namespace star {
  namespace awt {
      class XWindowPeer;
@@ -8228,7 +7763,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
  }
  namespace uno {
      class Any;
-@@ -335,26 +351,55 @@ typedef USHORT StateChangedType;
+@@ -335,26 +344,55 @@ typedef USHORT StateChangedType;
  #define EXTTEXTINPUT_END_COMPLETE       ((USHORT)0x0001)
  #define EXTTEXTINPUT_END_CANCEL         ((USHORT)0x0002)
  
@@ -8291,7 +7826,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      Window*             mpFrameWindow;
      Window*             mpOverlapWindow;
      Window*             mpBorderWindow;
-@@ -385,14 +433,13 @@ private:
+@@ -385,14 +423,13 @@ private:
      Font*               mpControlFont;
      Color               maControlForeground;
      Color               maControlBackground;
@@ -8310,7 +7845,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      Point               maPos;
      ULONG               mnHelpId;
      ULONG               mnUniqId;
-@@ -413,8 +460,6 @@ private:
+@@ -413,8 +450,6 @@ private:
      WinBits             mnExtendedStyle;
      WinBits             mnPrevExtendedStyle;
      WindowType          mnType;
@@ -8319,7 +7854,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      USHORT              mnWaitCount;
      USHORT              mnPaintFlags;
      USHORT              mnGetFocusFlags;
-@@ -422,8 +467,6 @@ private:
+@@ -422,8 +457,6 @@ private:
      USHORT              mnActivateMode;
      USHORT              mnDlgCtrlFlags;
      USHORT              mnLockCount;
@@ -8328,7 +7863,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      BOOL                mbFrame:1,
                          mbBorderWin:1,
                          mbOverlapWin:1,
-@@ -490,9 +533,176 @@ private:
+@@ -490,9 +523,176 @@ private:
                          mbDrawSelectionBackground:1;
  
      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
@@ -8506,7 +8041,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
  #endif
  
  protected:
-@@ -573,8 +783,8 @@ public:
+@@ -573,8 +773,8 @@ public:
  
      void                SetBorderStyle( USHORT nBorderStyle );
      USHORT              GetBorderStyle() const;
@@ -8517,7 +8052,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      Size                CalcWindowSize( const Size& rOutSz ) const;
      Size                CalcOutputSize( const Size& rWinSz ) const;
      long                CalcTitleWidth() const;
-@@ -594,6 +804,8 @@ public:
+@@ -594,6 +794,8 @@ public:
      void                SetDialogControlFlags( USHORT nFlags ) { mnDlgCtrlFlags = nFlags; }
      USHORT              GetDialogControlFlags() const { return mnDlgCtrlFlags; }
  
@@ -8526,7 +8061,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      ULONG               GetCurrentModButtons();
  
      void                SetInputContext( const InputContext& rInputContext );
-@@ -616,7 +828,7 @@ public:
+@@ -616,7 +818,7 @@ public:
      void                SetZoomedPointFont( const Font& rFont );
      long                GetDrawPixel( OutputDevice* pDev, long nPixels ) const;
      Font                GetDrawPixelFont( OutputDevice* pDev ) const;
@@ -8535,7 +8070,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
  
      void                SetControlFont();
      void                SetControlFont( const Font& rFont );
-@@ -641,6 +853,10 @@ public:
+@@ -641,6 +843,10 @@ public:
      Region              GetWindowClipRegionPixel( USHORT nFlags = 0 ) const;
      Region              GetPaintRegion() const;
      BOOL                IsInPaint() const { return mbInPaint; }
@@ -8546,7 +8081,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
  
      void                SetParent( Window* pNewParent );
      Window*             GetParent() const { return mpRealParent; }
-@@ -687,8 +903,12 @@ public:
+@@ -687,8 +893,12 @@ public:
      BOOL                IsDefaultPos() const { return mbDefPos; }
      BOOL                IsDefaultSize() const { return mbDefSize; }
  
@@ -8559,7 +8094,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      Point               OutputToAbsoluteScreenPixel( const Point& rPos ) const;
      Point               AbsoluteScreenToOutputPixel( const Point& rPos ) const;
      Rectangle           GetDesktopRectPixel() const;
-@@ -753,6 +964,7 @@ public:
+@@ -753,6 +963,7 @@ public:
      BOOL                IsChildPointerOverwrite() const { return mbChildPtrOverwrite; }
      void                SetPointerPosPixel( const Point& rPos );
      Point               GetPointerPosPixel();
@@ -8567,7 +8102,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      void                ShowPointer( BOOL bVisible );
      BOOL                IsPointerVisible() const { return !mbNoPtrVisible; }
      void                EnterWait();
-@@ -852,11 +1060,11 @@ public:
+@@ -852,11 +1063,11 @@ public:
      ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( BOOL bCreate = TRUE );
      virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
  	void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > );
@@ -8581,7 +8116,7 @@ diff -u -p -u -r1.47.112.1 -r1.55
      void    SetAccessibleRole( USHORT nRole );
      USHORT  GetAccessibleRole() const;
  
-@@ -900,6 +1114,52 @@ public:
+@@ -900,6 +1111,52 @@ public:
      // Clipboard/Selection interfaces
      virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard();
      virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetSelection();
@@ -8636,12 +8171,8 @@ diff -u -p -u -r1.47.112.1 -r1.55
  inline void Window::SetPosPixel( const Point& rNewPos )
 Index: vcl/inc/wintypes.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/wintypes.hxx,v
-retrieving revision 1.14
-retrieving revision 1.17
-diff -u -p -u -r1.14 -r1.17
---- vcl/inc/wintypes.hxx	11 Apr 2003 17:27:04 -0000	1.14
-+++ vcl/inc/wintypes.hxx	10 May 2004 15:44:37 -0000	1.17
+--- vcl/inc/wintypes.hxx.orig	2004-09-12 14:26:21.787960192 +0200
++++ vcl/inc/wintypes.hxx	2004-09-12 14:54:44.882050536 +0200
 @@ -154,14 +154,15 @@ typedef USHORT WindowType;
  #define WINDOW_TREELISTBOX	        (WINDOW_FIRST + 0x4d)
  #define WINDOW_HELPTEXTWINDOW		(WINDOW_FIRST + 0x4e)
@@ -8662,13 +8193,9 @@ diff -u -p -u -r1.14 -r1.17
  // Window-Bits fuer Window
 Index: vcl/inc/wrkwin.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/wrkwin.hxx,v
-retrieving revision 1.7
-retrieving revision 1.9
-diff -u -p -u -r1.7 -r1.9
---- vcl/inc/wrkwin.hxx	11 Apr 2003 17:27:14 -0000	1.7
-+++ vcl/inc/wrkwin.hxx	17 Jun 2004 11:43:45 -0000	1.9
-@@ -96,20 +92,10 @@ private:
+--- vcl/inc/wrkwin.hxx.orig	2004-09-12 14:26:21.788960040 +0200
++++ vcl/inc/wrkwin.hxx	2004-09-12 14:54:44.882050536 +0200
+@@ -96,20 +96,10 @@ private:
      BOOL            mbPresentationMode:1,
                      mbPresentationVisible:1,
                      mbPresentationFull:1,
@@ -8690,7 +8217,7 @@ diff -u -p -u -r1.7 -r1.9
  
  protected:
                      WorkWindow( WindowType nType );
-@@ -124,6 +110,8 @@ public:
+@@ -124,6 +114,8 @@ public:
                      WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version
                      ~WorkWindow();
  
@@ -8699,7 +8226,7 @@ diff -u -p -u -r1.7 -r1.9
      void            ShowFullScreenMode( BOOL bFullScreenMode = TRUE );
      void            EndFullScreenMode() { ShowFullScreenMode( FALSE ); }
      BOOL            IsFullScreenMode() const { return mbFullScreenMode; }
-@@ -136,16 +124,14 @@ public:
+@@ -136,16 +128,14 @@ public:
  
      BOOL			SetPluginParent( SystemParentData* pParent );
  
@@ -8720,12 +8247,8 @@ diff -u -p -u -r1.7 -r1.9
  #endif // _SV_WRKWIN_HXX
 Index: vcl/inc/xconnection.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/inc/xconnection.hxx,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -u -r1.2 -r1.3
---- vcl/inc/xconnection.hxx	11 Sep 2001 15:52:21 -0000	1.2
-+++ vcl/inc/xconnection.hxx	6 Jan 2004 13:08:25 -0000	1.3
+--- vcl/inc/xconnection.hxx.orig	2004-09-12 14:26:21.789959888 +0200
++++ vcl/inc/xconnection.hxx	2004-09-12 14:54:44.883050384 +0200
 @@ -78,7 +78,7 @@
  #include <com/sun/star/uno/Reference.hxx>
  #endif
diff --git a/patches/vclplug/vcl-source-gdi-utf8-msfonts-fixup.diff b/patches/vclplug/vcl-source-gdi-utf8-msfonts-fixup.diff
new file mode 100644
index 000000000..3ee20c67f
--- /dev/null
+++ b/patches/vclplug/vcl-source-gdi-utf8-msfonts-fixup.diff
@@ -0,0 +1,214 @@
+--- vcl/source/gdi/outdev3.cxx.utf8-msfonts	2004-11-02 13:05:07.952153488 -0500
++++ vcl/source/gdi/outdev3.cxx	2004-11-02 13:18:26.199801400 -0500
+@@ -404,10 +404,10 @@
+ 
+ // =======================================================================
+ 
+-struct ImplLocaliziedFontName
++struct ImplLocalizedFontName
+ {
+     const char*         mpEnglishName;
+-    const sal_Unicode*  mpLocaliziedNames;
++    const sal_Unicode*  mpLocalizedNames;
+ };
+ 
+ static sal_Unicode const aBatang[] = { 0xBC14, 0xD0D5, 0, 0 };
+@@ -441,13 +441,19 @@
+ static sal_Unicode const aHei[] = { 0x6865, 0, 0 };
+ static sal_Unicode const aKai[] = { 0x6B61, 0, 0 };
+ static sal_Unicode const aMing[] = { 0x6D69, 0x6E67, 0, 0 };
+-static sal_Unicode const aMSGothic[] = { 0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
+-static sal_Unicode const aMSPGothic[] = { 0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
+-static sal_Unicode const aMSMincho[] = { 0xFF2D, 0xFF33, ' ', 0x660E, 0x671D, 0, 0 };
+-static sal_Unicode const aMSPMincho[] = { 0xFF2D, 0xFF33, ' ', 0xFF30, 0x660E, 0x671D, 0, 0 };
+-static sal_Unicode const aHGMinchoL[] = { 'h', 'g', 0x660E, 0x671D, 'l', 0, 0 };
+-static sal_Unicode const aHGGothicB[] = { 'h', 'g', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 0, 0 };
+-static sal_Unicode const aHGHeiseiMin[] = { 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 0, 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 'w', '3', 'x', '1', '2', 0, 0 };
++static sal_Unicode const aMSGothic[] = { 'm','s',       0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
++static sal_Unicode const aMSPGothic[] = { 'm','s','p',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
++static sal_Unicode const aMSMincho[] = { 'm', 's',      0x660E, 0x671D, 0 };
++static sal_Unicode const aMSPMincho[] = { 'm','s','p',  0x660E, 0x671D, 0 };
++static sal_Unicode const aHGMinchoL[] = { 'h','g',      0x660E, 0x671D, 'l', 0, 0 };
++static sal_Unicode const aHGGothicB[] = { 'h','g',      0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 0 };
++static sal_Unicode const aHGPMinchoL[] = { 'h','g','p', 0x660E, 0x671D, 'l', 0 };
++static sal_Unicode const aHGPGothicB[] = { 'h','g','p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 0 };
++static sal_Unicode const aHGMinchoLSun[] = { 'h','g',   0x660E, 0x671D, 'l', 's', 'u', 'n', 0 };
++static sal_Unicode const aHGPMinchoLSun[] = { 'h','g','p', 0x660E, 0x671D, 'l', 's', 'u', 'n', 0 };
++static sal_Unicode const aHGGothicBSun[] = { 'h','g',   0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
++static sal_Unicode const aHGPGothicBSun[] = { 'h','g','p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
++static sal_Unicode const aHGHeiseiMin[] = { 'h','g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 0, 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 'w', '3', 'x', '1', '2', 0, 0 };
+ static sal_Unicode const aSunDotum[] = { 0xC36C, 0xB3CB, 0xC6C0, 0, 0 };
+ static sal_Unicode const aSunGulim[] = { 0xC36C, 0xAD74, 0xB9BC, 0, 0 };
+ static sal_Unicode const aSunBatang[] = { 0xC36C, 0xBC14, 0xD0D5, 0, 0 };
+@@ -479,8 +485,6 @@
+ static sal_Unicode const aMagicR[]                  = { 0xD734, 0xBA3C, 0xB9E4, 0xC9C1, 0xCCB4, 0, 0 };
+ static sal_Unicode const aSunCrystal[]              = { 0xC36C, 0xD06C, 0xB9AC, 0xC2A4, 0xD0C8, 0, 0 };
+ static sal_Unicode const aSunSaemmul[]              = { 0xC36C, 0xC0D8, 0xBB3C, 0, 0 };
+-static sal_Unicode const aHYShortSamulMedium[]      = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 'm', 0, 0 };
+-static sal_Unicode const aHYShortSamul[]            = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 0, 0 };
+ static sal_Unicode const aHaansoftBatang[]          = { 0xD55C, 0xCEF4, 0xBC14, 0xD0D5, 0, 0 };
+ static sal_Unicode const aHaansoftDotum[]           = { 0xD55C, 0xCEF4, 0xB3CB, 0xC6C0, 0, 0 };
+ static sal_Unicode const aHyhaeseo[]                = { 0xD55C, 0xC591, 0xD574, 0xC11C, 0, 0 };
+@@ -489,11 +493,49 @@
+ static sal_Unicode const aMDArt[]                   = { 'm', 'd', 0xC544, 0xD2B8, 0xCCB4, 0, 0 };
+ static sal_Unicode const aMDAlong[]                 = { 'm', 'd', 0xC544, 0xB871, 0xCCB4, 0, 0 };
+ static sal_Unicode const aMDEasop[]                 = { 'm', 'd', 0xC774, 0xC19D, 0xCCB4, 0, 0 };
+-static sal_Unicode const HYShortSamulMedium[]       = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 'm', 0, 0 };
+-static sal_Unicode const HYShortSamul[]             = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 0, 0 };
++static sal_Unicode const aHYShortSamulMedium[]      = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 'm', 0 };
++static sal_Unicode const aHYShortSamul[]            = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 0 };
++static sal_Unicode const aHGGothicE[]               = { 'h','g', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
++static sal_Unicode const aHGPGothicE[]              = { 'h','g','p', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
++static sal_Unicode const aHGSGothicE[]              = { 'h','g','s', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
++static sal_Unicode const aHGGothicM[]               = { 'h','g', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
++static sal_Unicode const aHGPGothicM[]              = { 'h','g','p', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
++static sal_Unicode const aHGSGothicM[]              = { 'h','g','s', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
++static sal_Unicode const aHGGyoshotai[]             = { 'h','g', 0x884C, 0x66F8, 0x4F53, 0 };
++static sal_Unicode const aHGPGyoshotai[]            = { 'h','g','p', 0x884C, 0x66F8, 0x4F53, 0 };
++static sal_Unicode const aHGSGyoshotai[]            = { 'h','g','s', 0x884C, 0x66F8, 0x4F53, 0 };
++static sal_Unicode const aHGKyokashotai[]           = { 'h','g', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
++static sal_Unicode const aHGPKyokashotai[]          = { 'h','g','p', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
++static sal_Unicode const aHGSKyokashotai[]          = { 'h','g','s', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
++static sal_Unicode const aHGMinchoB[]               = { 'h','g', 0x660E, 0x671D, 'b', 0 };
++static sal_Unicode const aHGPMinchoB[]              = { 'h','g','p', 0x660E, 0x671D, 'b', 0 };
++static sal_Unicode const aHGSMinchoB[]              = { 'h','g','s', 0x660E, 0x671D, 'b', 0 };
++static sal_Unicode const aHGMinchoE[]               = { 'h','g', 0x660E, 0x671D, 'e', 0 };
++static sal_Unicode const aHGPMinchoE[]              = { 'h','g','p', 0x660E, 0x671D, 'e', 0 };
++static sal_Unicode const aHGSMinchoE[]              = { 'h','g','s', 0x660E, 0x671D, 'e', 0 };
++static sal_Unicode const aHGSoeiKakupoptai[]        = { 'h','g', 0x5275,0x82F1,0x89D2,0xFF8E, 
++							0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0}; 
++static sal_Unicode const aHGPSoeiKakupoptai[]       = { 'h','g', 'p', 0x5275,0x82F1,0x89D2,0xFF8E, 
++							0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0}; 
++static sal_Unicode const aHGSSoeiKakupoptai[]       = { 'h','g', 's', 0x5275,0x82F1,0x89D2,0xFF8E, 
++							0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0}; 
++static sal_Unicode const aHGSoeiPresenceEB[]        = { 'h','g', 0x5275,0x82F1,0xFF8C,0xFF9F,
++							0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
++static sal_Unicode const aHGPSoeiPresenceEB[]       = { 'h','g','p', 0x5275,0x82F1,0xFF8C,0xFF9F,
++							0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
++static sal_Unicode const aHGSSoeiPresenceEB[]       = { 'h','g','s', 0x5275,0x82F1,0xFF8C,0xFF9F,
++							0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
++static sal_Unicode const aHGSoeiKakugothicUB[]      = { 'h','g', 0x5275,0x82F1,0x89D2,0xFF7A,
++							0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
++static sal_Unicode const aHGPSoeiKakugothicUB[]     = { 'h','g','p', 0x5275,0x82F1,0x89D2,0xFF7A,
++							0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
++static sal_Unicode const aHGSSoeiKakugothicUB[]     = { 'h','g','s', 0x5275,0x82F1,0x89D2,0xFF7A,
++							0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
++static sal_Unicode const aHGSeikaishotaiPRO[]       = { 'h','g', 0x6B63,0x6977,0x66F8,0x4F53, '-','p','r','o',0};
++static sal_Unicode const aHGMaruGothicMPRO[]        = { 'h','g', 0x4E38,0xFF7A,0xFF9E,0xFF7C,0xFF6F,0xFF78, '-','p','r','o',0};
+ 
+ 
+-static ImplLocaliziedFontName const aImplLocaliziedNamesList[] =
++static ImplLocalizedFontName aImplLocalizedNamesList[] =
+ {
+ {   "batang",               aBatang },
+ {   "batangche",            aBatangChe },
+@@ -530,6 +572,12 @@
+ {   "mspmincho",            aMSPMincho },
+ {   "hgminchol",            aHGMinchoL },
+ {   "hggothicb",            aHGGothicB },
++{   "hgpminchol",           aHGPMinchoL },
++{   "hgpgothicb",           aHGPGothicB },
++{   "hgmincholsun",         aHGMinchoLSun },
++{   "hggothicbsun",         aHGGothicBSun },
++{   "hgpmincholsun",        aHGPMinchoLSun },
++{   "hgpgothicbsun",        aHGPGothicBSun },
+ {   "hgheiseimin",          aHGHeiseiMin },
+ {   "sundotum",             aSunDotum },
+ {   "sungulim",             aSunGulim },
+@@ -572,8 +620,35 @@
+ {   "mdart",                aMDArt },             
+ {   "mdalong",              aMDAlong },           
+ {   "mdeasop",              aMDEasop },           
+-{   "hyshortsamulmedium",   HYShortSamulMedium }, 
+-{   "hyshortsamul",         HYShortSamul },       
++{   "hggothice",            aHGGothicE },
++{   "hgpgothice",           aHGPGothicE },
++{   "hgpothice",            aHGSGothicE },
++{   "hggothicm",            aHGGothicM },
++{   "hgpgothicm",           aHGPGothicM },
++{   "hgpgothicm",           aHGSGothicM },
++{   "hggyoshotai",          aHGGyoshotai },
++{   "hgpgyoshotai",         aHGPGyoshotai },
++{   "hgsgyoshotai",         aHGSGyoshotai },
++{   "hgkyokashotai",        aHGKyokashotai },
++{   "hgpkyokashotai",       aHGPKyokashotai },
++{   "hgskyokashotai",       aHGSKyokashotai },
++{   "hgminchob",            aHGMinchoB },
++{   "hgpminchob",           aHGPMinchoB },
++{   "hgsminchob",           aHGSMinchoB },
++{   "hgminchoe",            aHGMinchoE },
++{   "hgpminchoe",           aHGPMinchoE },
++{   "hgsminchoe",           aHGSMinchoE },
++{   "hgsoeikakupoptai",     aHGSoeiKakupoptai },
++{   "hgpsoeikakupopta",     aHGPSoeiKakupoptai },
++{   "hgssoeikakupopta",     aHGSSoeiKakupoptai },
++{   "hgsoeipresenceeb",     aHGSoeiPresenceEB },
++{   "hgpsoeipresenceeb",    aHGPSoeiPresenceEB },
++{   "hgssoeipresenceeb",    aHGSSoeiPresenceEB },
++{   "hgsoeikakugothicub",   aHGSoeiKakugothicUB },
++{   "hgpsoeikakugothicub",  aHGPSoeiKakugothicUB },
++{   "hgssoeikakugothicub",  aHGSSoeiKakugothicUB },
++{   "hgseikaishotaipro",    aHGSeikaishotaiPRO },
++{   "hgmarugothicmpro",     aHGMaruGothicMPRO },
+ {   NULL,                   NULL },
+ };
+ 
+@@ -665,24 +740,16 @@
+         i++;
+     }
+ 
+-    // Translate localizied name to English ASCII name
+-    const ImplLocaliziedFontName* pTranslateNames = aImplLocaliziedNamesList;
++    // Translate localized name to English ASCII name
++    // TODO: replace the O(n) search!
++    const ImplLocalizedFontName* pTranslateNames = aImplLocalizedNamesList;
+     while ( bTranslate && pTranslateNames->mpEnglishName )
+     {
+-        const sal_Unicode* pLocaliziedName = pTranslateNames->mpLocaliziedNames;
+-        while ( *pLocaliziedName )
++        const sal_Unicode* pLocalizedName = pTranslateNames->mpLocalizedNames;
++        if ( rName.Equals( pLocalizedName ) )
+         {
+-            if ( rName.Equals( pLocaliziedName ) )
+-            {
+-                rName.AssignAscii( pTranslateNames->mpEnglishName );
+-                bTranslate = FALSE;
+-                break;
+-            }
+-
+-            // Run to the end of the Token (\0\0 is the end mark)
+-            while ( *pLocaliziedName )
+-                pLocaliziedName++;
+-            pLocaliziedName++;
++            rName.AssignAscii( pTranslateNames->mpEnglishName );
++            break;
+         }
+ 
+         pTranslateNames++;
+@@ -1216,7 +1283,7 @@
+     }
+     fprintf( stderr, "   OutputDevice::GetDefaultFont() Type=\"%s\" lang=%d flags=%d FontName=\"%s\"\n",
+ 	     s, eLang, nFlags,
+-	     OUStringToOString( aFont.GetName(), osl_getThreadTextEncoding() ).getStr()
++	     OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr()
+ 	     );
+ #endif
+ 
+@@ -4927,7 +4994,7 @@
+ 
+ #if OSL_DEBUG_LEVEL > 2
+     fprintf( stderr, "   OutputDevice::SetFont() FontName=\"%s\"\n",
+-	     OUStringToOString( aFont.GetName(), osl_getThreadTextEncoding() ).getStr() );
++	     OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
+ #endif
+ 
+     if ( !maFont.IsSameInstance( aFont ) )
+@@ -5327,7 +5394,7 @@
+ 
+ #if OSL_DEBUG_LEVEL > 2
+     fprintf( stderr, "   OutputDevice::DrawText(\"%s\")\n",
+-	     OUStringToOString( rStr, osl_getThreadTextEncoding() ).getStr() );
++	     OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr() );
+ #endif
+ 
+     if ( mpMetaFile )
diff --git a/patches/vclplug/vcl-source-gdi.diff b/patches/vclplug/vcl-source-gdi.diff
index 6d059d99c..39cff42c1 100644
--- a/patches/vclplug/vcl-source-gdi.diff
+++ b/patches/vclplug/vcl-source-gdi.diff
@@ -536,15 +536,7 @@ diff -u -p -u -r1.2.292.1 -r1.5
  
  	switch( eFilter )
  	{
-@@ -620,7 +618,7 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFi
- 							aGrey.SetIndex( 0 );
- 						else
- 						{
--							const double fGrey = nDotL / sqrt( nNx * nNx + nNy * nNy + nZ2 );
-+							const double fGrey = nDotL / sqrt( (double)(nNx * nNx + nNy * nNy + nZ2) );
- 							aGrey.SetIndex( (BYTE) VOS_BOUND( fGrey, 0, 255 ) );
- 						}
- 						
+
 Index: vcl/source/gdi/color.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/gdi/color.cxx,v
@@ -1454,18 +1446,6 @@ diff -u -p -u -r1.13 -r1.14
          }
      }
  }
-@@ -1317,11 +1308,7 @@ String StarSymbolToMSMultiFontImpl::Conv
- String StarSymbolToMSMultiFontImpl::ConvertString(String &rString, 
-     xub_StrLen& rIndex)
- { 
--#if 1
-     typedef ::std::multimap<sal_Unicode, SymbolEntry>::iterator MI;
--#else
--    typedef ::std::multimap<sal_Unicode, SymbolEntry>::const_iterator MI;
--#endif
-     typedef ::std::pair<MI, MI> Result;
-     
-     String sRet;
 Index: vcl/source/gdi/gdimtf.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/gdi/gdimtf.cxx,v
diff --git a/patches/vclplug/vcl-source-glyphs.diff b/patches/vclplug/vcl-source-glyphs.diff
index b401f7d15..5121c80f1 100644
--- a/patches/vclplug/vcl-source-glyphs.diff
+++ b/patches/vclplug/vcl-source-glyphs.diff
@@ -2,10 +2,11 @@ Index: vcl/source/glyphs/gcach_ftyp.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
 retrieving revision 1.98.20.2
-diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
---- vcl/source/glyphs/gcach_ftyp.cxx	28 Jan 2004 15:22:42 -0000	1.98.20.2
-+++ vcl/source/glyphs/gcach_ftyp.cxx	5 Jul 2004 14:01:28 -0000
-@@ -58,13 +59,10 @@
+Index: vcl/source/glyphs/gcach_ftyp.cxx
+===================================================================
+--- vcl/source/glyphs/gcach_ftyp.cxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/source/glyphs/gcach_ftyp.cxx	2004-09-14 13:53:47.306959408 +0200
+@@ -58,13 +58,10 @@
   *
   ************************************************************************/
  
@@ -20,7 +21,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  
  #include <gcach_ftyp.hxx>
  
-@@ -72,17 +70,25 @@
+@@ -72,17 +69,25 @@
  #include <outfont.hxx>
  #include <bitmap.hxx>
  #include <bmpacc.hxx>
@@ -53,19 +54,9 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  
  #ifndef FREETYPE_PATCH
      // VERSION_MINOR in freetype.h is too coarse
-@@ -251,15 +258,22 @@ void FtFontFile::Unmap()
- // =======================================================================
- 
- FtFontInfo::FtFontInfo( const ImplFontData& rFontData,
--    const ::rtl::OString& rNativeFileName, int nFaceNum, int nFontId, int nSynthetic )
--:   mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
-+                        const ::rtl::OString& rNativeFileName,
-+                        int nFaceNum, int nFontId, int nSynthetic,
-+                        const unicodeKernMap* pKern
-+                        )
-+:   
+@@ -258,8 +263,8 @@ FtFontInfo::FtFontInfo( const ImplFontDa
+ :   mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
      maFontData( rFontData ),
-+    mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
      mnFaceNum( nFaceNum ),
 -    mnFontId( nFontId ),
      mnSynthetic( nSynthetic ),
@@ -73,57 +64,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      maFaceFT( NULL ),
      mnRefCount( 0 )
  {
-+    if( pKern )
-+        maUnicodeKernPairs = *pKern;
-+
-     maFontData.mpSysData = (void*)nFontId;
-     maFontData.mpNext    = NULL;
- 
-@@ -336,6 +350,43 @@ void FtFontInfo::ReleaseFaceFT( FT_FaceR
-     }
- }
- 
-+void FtFontInfo::CacheGlyphIndex( sal_Unicode cChar, int nGI ) const
-+{
-+    maGlyphMap[ cChar ] = nGI;
-+
-+    if( maUnicodeKernPairs.size() != maGlyphKernPairs.size() )
-+    {
-+        // move kerning to glyph kerning map
-+        unicodeKernMap::const_iterator left_it =
-+            maUnicodeKernPairs.find( cChar );
-+        std::map< sal_Unicode, int >::const_iterator right_it;
-+        for( left_it = maUnicodeKernPairs.begin(); left_it != maUnicodeKernPairs.end(); ++left_it )
-+        {
-+            if( left_it->first == cChar )
-+            {
-+                for( right_it = left_it->second.begin(); right_it != left_it->second.end(); ++right_it )
-+                {
-+                    int nRightGlyph = GetGlyphIndex( right_it->first );
-+                    if( nRightGlyph != -1 )
-+                        maGlyphKernPairs[ nGI ][ nRightGlyph ] = right_it->second;
-+                }
-+            }
-+            else
-+            {
-+                int nLeftGlyph = GetGlyphIndex( left_it->first );
-+                if( nLeftGlyph != -1 )
-+                {
-+                    for( right_it = left_it->second.begin(); right_it != left_it->second.end(); ++right_it )
-+                    {
-+                        if( right_it->first == cChar )
-+                            maGlyphKernPairs[ nLeftGlyph ][ nGI ] = right_it->second;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+}
-+
- // -----------------------------------------------------------------------
- 
- static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
-@@ -382,11 +433,10 @@ const unsigned char* FtFontInfo::GetTabl
+@@ -425,11 +467,10 @@ const unsigned char* FtFontInfo::GetTabl
  // =======================================================================
  
  FreetypeManager::FreetypeManager()
@@ -137,28 +78,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  #ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included
      // Get version of freetype library to enable workarounds.
      // Freetype <= 2.0.9 does not have FT_Library_Version().
-@@ -449,7 +499,10 @@ void* FreetypeManager::GetFontHandle( in
- // -----------------------------------------------------------------------
- 
- void FreetypeManager::AddFontFile( const rtl::OString& rNormalizedName,
--    int nFaceNum, int nFontId, const ImplFontData* pData )
-+                                   int nFaceNum, int nFontId,
-+                                   const ImplFontData* pData,
-+                                   const unicodeKernMap* pKern
-+                                   )
- {
-     if( !rNormalizedName.getLength() )
-         return;
-@@ -457,7 +510,7 @@ void FreetypeManager::AddFontFile( const
-     if( maFontList.find( nFontId ) != maFontList.end() )
-         return;
- 
--    FtFontInfo* pFI = new FtFontInfo( *pData, rNormalizedName, nFaceNum, nFontId, 0 );
-+    FtFontInfo* pFI = new FtFontInfo( *pData, rNormalizedName, nFaceNum, nFontId, 0, pKern );
-     maFontList[ nFontId ] = pFI;
-     if( mnMaxFontId < nFontId )
-         mnMaxFontId = nFontId;
-@@ -482,8 +535,8 @@ long FreetypeManager::AddFontDir( const 
+@@ -527,8 +568,8 @@ long FreetypeManager::AddFontDir( const 
          rcOSL = aDirItem.getFileStatus( aFileStatus );
  
          ::rtl::OUString aUSytemPath;
@@ -169,7 +89,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
          ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, theEncoding );
          const char* pszFontFileName = aCFileName.getStr();
  
-@@ -556,8 +609,21 @@ long FreetypeManager::FetchFontList( Imp
+@@ -601,8 +642,21 @@ long FreetypeManager::FetchFontList( Imp
      for( FontList::const_iterator it(maFontList.begin()); it != maFontList.end(); ++it, ++nCount )
      {
          const FtFontInfo& rFFI = *it->second;
@@ -193,27 +113,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      }
  
      return nCount;
-@@ -581,7 +647,7 @@ FreetypeServerFont* FreetypeManager::Cre
-     if( it != maFontList.end() )
-     {
-         FtFontInfo* pFI = it->second;
--        FreetypeServerFont* pFont = new FreetypeServerFont( rFSD, pFI );
-+        FreetypeServerFont* pFont = new FreetypeServerFont( rFSD, pFI, pFI->GetGlyphKernMap(), pFI->GetUnicodeKernMap() );
-         return pFont;
-     }
- 
-@@ -592,8 +658,8 @@ FreetypeServerFont* FreetypeManager::Cre
- // FreetypeServerFont
- // =======================================================================
- 
--FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
--:   ServerFont( rFSD ),
-+FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI, const glyphKernMap* pKern, const unicodeKernMap* pUniKern )
-+:   ServerFont( rFSD, pKern, pUniKern ),
-     mpFontInfo( pFI ),
-     maFaceFT( NULL ),
-     maSizeFT( NULL ),
-@@ -856,23 +944,23 @@ int FreetypeServerFont::ApplyGlyphTransf
+@@ -903,23 +957,23 @@ int FreetypeServerFont::ApplyGlyphTransf
      case GF_ROTL:    // left
          nAngle += 900;
          bStretched = (mfStretch != 1.0);
@@ -248,7 +148,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
          break;
      }
  
-@@ -1049,9 +1137,9 @@ void FreetypeServerFont::InitGlyphData( 
+@@ -1096,9 +1150,9 @@ void FreetypeServerFont::InitGlyphData( 
      if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
          const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
  #if (FTVERSION < 2000)
@@ -260,7 +160,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  #endif
      }
      rGD.SetCharWidth( (nCharWidth + 32) >> 6 );
-@@ -1314,34 +1402,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
+@@ -1361,34 +1415,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
  {
      int nRangeCount = 0;
  
@@ -295,7 +195,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      const unsigned char* pCmap = NULL;
      ULONG nLength = 0;
      if( FT_IS_SFNT( maFaceFT ) )
-@@ -1409,8 +1469,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
+@@ -1456,8 +1482,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
                  *(pCodes++) = cCode;
          }
      }
@@ -304,34 +204,10 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      return nRangeCount;
  }
  // -----------------------------------------------------------------------
-@@ -1420,7 +1478,10 @@ ULONG FreetypeServerFont::GetFontCodeRan
- int FreetypeServerFont::GetGlyphKernValue( int nGlyphLeft, int nGlyphRight ) const
- {
-     if( maSizeFT )
-+
-         pFTActivateSize( maSizeFT );
-+    if( !FT_HAS_KERNING( maFaceFT ) || !FT_IS_SFNT( maFaceFT ) )
-+        return ServerFont::GetGlyphKernValue( nGlyphLeft, nGlyphRight );
- 
-     FT_Vector aKernVal;
-     FT_Error rcFT = FT_Get_Kerning( maFaceFT, nGlyphLeft, nGlyphRight,
-@@ -1438,7 +1499,7 @@ ULONG FreetypeServerFont::GetKernPairs( 
- 
-     *ppKernPairs = NULL;
-     if( !FT_HAS_KERNING( maFaceFT ) || !FT_IS_SFNT( maFaceFT ) )
--        return 0;
-+        return ServerFont::GetKernPairs( ppKernPairs );
- 
-     // first figure out which glyph pairs are involved in kerning
-     ULONG nKernLength = 0;
 Index: vcl/source/glyphs/gcach_ftyp.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v
-retrieving revision 1.24
-retrieving revision 1.27
-diff -u -p -u -r1.24 -r1.27
---- vcl/source/glyphs/gcach_ftyp.hxx	4 Jul 2003 12:51:33 -0000	1.24
-+++ vcl/source/glyphs/gcach_ftyp.hxx	18 May 2004 10:55:11 -0000	1.27
+--- vcl/source/glyphs/gcach_ftyp.hxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/source/glyphs/gcach_ftyp.hxx	2004-09-14 13:53:47.307959256 +0200
 @@ -65,11 +65,15 @@
  #include <glyphcache.hxx>
  #include <rtl/textcvt.h>
@@ -352,7 +228,7 @@ diff -u -p -u -r1.24 -r1.27
  
  // -----------------------------------------------------------------------
  
-@@ -87,7 +85,6 @@ public:
+@@ -87,7 +91,6 @@ public:
      const unsigned char*    GetBuffer() const { return mpFileMap; }
      int                     GetFileSize() const { return mnFileSize; }
      const ::rtl::OString*   GetFileName() const { return &maNativeFileName; }
@@ -360,72 +236,7 @@ diff -u -p -u -r1.24 -r1.27
  private:
                              FtFontFile( const ::rtl::OString& rNativeFileName );
  
-@@ -104,7 +101,9 @@ class FtFontInfo
- {
- public:
-     FtFontInfo( const ImplFontData&, const ::rtl::OString&,
--        int nFaceNum, int nFontId, int nSynthetic );
-+                int nFaceNum, int nFontId, int nSynthetic,
-+                const unicodeKernMap* pUnicodeKern = NULL
-+                );
- 
-     const unsigned char*  GetTable( const char*, ULONG* pLength=0 ) const;
- 
-@@ -121,6 +120,11 @@ public:
- 
-     int                   GetGlyphIndex( sal_Unicode cChar ) const;
-     void                  CacheGlyphIndex( sal_Unicode cChar, int nGI ) const;
-+    const glyphKernMap*	  GetGlyphKernMap() const
-+    { return (maUnicodeKernPairs.size() || maGlyphKernPairs.size()) ? &maGlyphKernPairs : NULL; }
-+    const unicodeKernMap* GetUnicodeKernMap() const
-+    { return maUnicodeKernPairs.size() ? &maUnicodeKernPairs : NULL; }
-+
- 
- private:
-     ImplFontData    maFontData;
-@@ -135,6 +139,9 @@ private:
-     // cache unicode->glyphid mapping because looking it up is expensive
-     typedef ::std::hash_map<sal_Unicode,int> FIGlyphMap;
-     mutable FIGlyphMap maGlyphMap;
-+
-+    mutable glyphKernMap maGlyphKernPairs;
-+    unicodeKernMap maUnicodeKernPairs;
- };
- 
- // these two inlines are very important for performance
-@@ -147,11 +154,6 @@ inline int FtFontInfo::GetGlyphIndex( sa
-     return -1;
- }
- 
--inline void FtFontInfo::CacheGlyphIndex( sal_Unicode cChar, int nGI ) const
--{
--    maGlyphMap[ cChar ] = nGI;
--}
--
- // -----------------------------------------------------------------------
- 
- class FreetypeManager
-@@ -162,7 +164,9 @@ public:
- 
-     long                AddFontDir( const String& rUrlName );
-     void                AddFontFile( const rtl::OString& rNormalizedName,
--                            int nFaceNum, int nFontId, const ImplFontData* );
-+                                     int nFaceNum, int nFontId, const ImplFontData*,
-+                                     const unicodeKernMap* pKern = NULL
-+                                     );
-     long                FetchFontList( ImplDevFontList* ) const;
-     void                ClearFontList();
- 
-@@ -182,7 +186,7 @@ private:
- class FreetypeServerFont : public ServerFont
- {
- public:
--                                FreetypeServerFont( const ImplFontSelectData&, FtFontInfo* );
-+                                FreetypeServerFont( const ImplFontSelectData&, FtFontInfo*, const glyphKernMap*, const unicodeKernMap* );
-     virtual                     ~FreetypeServerFont();
- 
-     virtual const ::rtl::OString* GetFontFileName() const { return mpFontInfo->GetFontFileName(); }
-@@ -206,9 +210,10 @@ public:
+@@ -211,9 +222,10 @@ public:
      const unsigned char*        GetTable( const char* pName, ULONG* pLength )
                                  { return mpFontInfo->GetTable( pName, pLength ); }
      int                         GetEmUnits() const;
@@ -439,13 +250,9 @@ diff -u -p -u -r1.24 -r1.27
      virtual void                InitGlyphData( int nGlyphIndex, GlyphData& ) const;
 Index: vcl/source/glyphs/gcach_layout.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_layout.cxx,v
-retrieving revision 1.23.20.1
-retrieving revision 1.29
-diff -u -p -u -r1.23.20.1 -r1.29
---- vcl/source/glyphs/gcach_layout.cxx	9 Jan 2004 18:13:49 -0000	1.23.20.1
-+++ vcl/source/glyphs/gcach_layout.cxx	25 Jun 2004 17:09:25 -0000	1.29
-@@ -59,30 +59,29 @@
+--- vcl/source/glyphs/gcach_layout.cxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_layout.cxx	2004-09-14 13:53:47.310958800 +0200
+@@ -59,28 +59,27 @@
   ************************************************************************/
  
  #define ENABLE_ICU_LAYOUT
@@ -483,9 +290,7 @@ diff -u -p -u -r1.23.20.1 -r1.29
  #endif
  
  #if OSL_DEBUG_LEVEL > 1
- #include <cstdio>
- #endif
-@@ -446,6 +446,13 @@
+@@ -450,6 +449,13 @@ IcuLayoutEngine::IcuLayoutEngine( Freety
      meScriptCode( USCRIPT_INVALID_CODE )
  {}
  
@@ -501,12 +306,8 @@ diff -u -p -u -r1.23.20.1 -r1.29
  IcuLayoutEngine::~IcuLayoutEngine()
 Index: vcl/source/glyphs/gcach_rbmp.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_rbmp.cxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/source/glyphs/gcach_rbmp.cxx	13 Dec 2001 14:54:19 -0000	1.3
-+++ vcl/source/glyphs/gcach_rbmp.cxx	6 Jan 2004 13:58:48 -0000	1.4
+--- vcl/source/glyphs/gcach_rbmp.cxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_rbmp.cxx	2004-09-14 13:53:47.311958648 +0200
 @@ -64,7 +64,7 @@
  //------------------------------------------------------------------------
  
@@ -518,12 +319,8 @@ diff -u -p -u -r1.3 -r1.4
  //------------------------------------------------------------------------
 Index: vcl/source/glyphs/gcach_vdev.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_vdev.cxx,v
-retrieving revision 1.11
-retrieving revision 1.15
-diff -u -p -u -r1.11 -r1.15
---- vcl/source/glyphs/gcach_vdev.cxx	5 Aug 2002 07:19:22 -0000	1.11
-+++ vcl/source/glyphs/gcach_vdev.cxx	17 Jun 2004 12:21:43 -0000	1.15
+--- vcl/source/glyphs/gcach_vdev.cxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_vdev.cxx	2004-09-14 13:53:47.312958496 +0200
 @@ -75,10 +75,6 @@
  
  long VirtDevServerFont::FetchFontList( ImplDevFontList* pToAdd )
@@ -544,7 +341,7 @@ diff -u -p -u -r1.11 -r1.15
  	return nCount;
  }
  
-@@ -202,13 +197,16 @@ void VirtDevServerFont::InitGlyphData( i
+@@ -202,13 +196,16 @@ void VirtDevServerFont::InitGlyphData( i
  	vdev.SetFont( aFont );
  
  	// get glyph metrics
@@ -564,7 +361,7 @@ diff -u -p -u -r1.11 -r1.15
  	rGD.SetSize( aRect.GetSize() );
  }
  
-@@ -223,7 +221,7 @@ bool VirtDevServerFont::GetAntialiasAdvi
+@@ -223,7 +220,7 @@ bool VirtDevServerFont::GetAntialiasAdvi
  
  bool VirtDevServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const
  {
@@ -573,7 +370,7 @@ diff -u -p -u -r1.11 -r1.15
  	// draw bitmap
  	vdev.SetOutputSizePixel( aSize, TRUE );
  	vdev.DrawText( Point(0,0)-rGD.GetMetric().GetOffset(), nGlyphIndex );
-@@ -233,9 +231,8 @@ bool VirtDevServerFont::GetGlyphBitmap1(
+@@ -233,9 +230,8 @@ bool VirtDevServerFont::GetGlyphBitmap1(
  	const Bitmap& rBitmap = vdev.GetBitmap( Point(0,0), aSize );
  	rGD.SetBitmap( new Bitmap( rBitmap ) );
  	return true;
@@ -584,7 +381,7 @@ diff -u -p -u -r1.11 -r1.15
  }
  
  // -----------------------------------------------------------------------
-@@ -295,9 +292,8 @@ ULONG VirtDevServerFont::GetKernPairs( I
+@@ -295,9 +291,8 @@ ULONG VirtDevServerFont::GetKernPairs( I
  
  bool VirtDevServerFont::GetGlyphOutline( int nGlyphIndex, PolyPolygon& rPolyPoly ) const
  {
@@ -595,7 +392,7 @@ diff -u -p -u -r1.11 -r1.15
      Font aFont;
  	aFont.SetName		( GetFontSelData().maName );
  	aFont.SetStyleName	( GetFontSelData().maStyleName );
-@@ -311,7 +307,7 @@ bool VirtDevServerFont::GetGlyphOutline(
+@@ -311,7 +306,7 @@ bool VirtDevServerFont::GetGlyphOutline(
  
  	const bool bOptimize = true;
  	return vdev.GetGlyphOutline( nGlyphIndex, rPolyPoly, bOptimize );
@@ -606,12 +403,8 @@ diff -u -p -u -r1.11 -r1.15
  // =======================================================================
 Index: vcl/source/glyphs/gcach_vdev.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_vdev.hxx,v
-retrieving revision 1.5
-retrieving revision 1.7
-diff -u -p -u -r1.5 -r1.7
---- vcl/source/glyphs/gcach_vdev.hxx	15 Feb 2002 15:58:57 -0000	1.5
-+++ vcl/source/glyphs/gcach_vdev.hxx	4 Feb 2004 15:59:34 -0000	1.7
+--- vcl/source/glyphs/gcach_vdev.hxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_vdev.hxx	2004-09-14 13:53:47.312958496 +0200
 @@ -72,7 +72,7 @@ public:
  	virtual bool				GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const;
  
@@ -623,12 +416,8 @@ diff -u -p -u -r1.5 -r1.7
  
 Index: vcl/source/glyphs/glyphcache.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/glyphcache.cxx,v
-retrieving revision 1.22.40.2
-retrieving revision 1.26
-diff -u -p -u -r1.22.40.2 -r1.26
---- vcl/source/glyphs/glyphcache.cxx	26 Jan 2004 17:23:59 -0000	1.22.40.2
-+++ vcl/source/glyphs/glyphcache.cxx	18 May 2004 10:55:25 -0000	1.26
+--- vcl/source/glyphs/glyphcache.cxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/source/glyphs/glyphcache.cxx	2004-09-14 13:53:47.313958344 +0200
 @@ -88,8 +88,8 @@ GlyphCache::GlyphCache( ULONG nMaxSize )
      mnBytesUsed(sizeof(GlyphCache)),
      mnLruIndex(0),
@@ -649,22 +438,7 @@ diff -u -p -u -r1.22.40.2 -r1.26
          if( pFontData != it->first.mpFontData )
              continue;
  
-@@ -219,10 +219,12 @@ void GlyphCache::AddFontPath( const Stri
- // -----------------------------------------------------------------------
- 
- void GlyphCache::AddFontFile( const rtl::OString& rNormalizedName, int nFaceNum,
--    int nFontId, const ImplFontData* pFontData )
-+                              int nFontId, const ImplFontData* pFontData,
-+                              const unicodeKernMap* pKern
-+                              )
- {
-     if( mpFtManager )
--        mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, pFontData );
-+        mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, pFontData, pKern );
- }
- 
- // -----------------------------------------------------------------------
-@@ -337,7 +339,7 @@ void GlyphCache::GarbageCollect()
+@@ -338,7 +338,7 @@ void GlyphCache::GarbageCollect()
              FontList::iterator it_next = maFontList.begin(), it;
              while( it_next != maFontList.end() )
              {
@@ -673,13 +447,7 @@ diff -u -p -u -r1.22.40.2 -r1.26
                  ServerFont* pSF = it->second;
                  if( (pSF != NULL)
                  &&  (pSF->GetRefCount() <= 0)
-@@ -401,15 +403,17 @@ inline void GlyphCache::RemovingGlyph( S
- // ServerFont
- // =======================================================================
- 
--ServerFont::ServerFont( const ImplFontSelectData& rFSD )
-+ServerFont::ServerFont( const ImplFontSelectData& rFSD, const glyphKernMap* pKern, const unicodeKernMap* pUniKern )
- :   maFontSelData(rFSD),
+@@ -407,8 +407,8 @@ ServerFont::ServerFont( const ImplFontSe
      mnExtInfo(0),
      mnRefCount(1),
      mnBytesUsed( sizeof(ServerFont) ),
@@ -687,80 +455,9 @@ diff -u -p -u -r1.22.40.2 -r1.26
      mpPrevGCFont( NULL ),
 +    mpNextGCFont( NULL ),
      nCos( 0x10000),
--    nSin( 0)
-+    nSin( 0),
-+    mpKernPairs( pKern ),
-+    mpUnicodeKernPairs( pUniKern )
- {
-     if( rFSD.mnOrientation != 0 )
-     {
-@@ -440,6 +444,65 @@ long ServerFont::Release() const
- 
- // -----------------------------------------------------------------------
- 
-+int ServerFont::GetGlyphKernValue( int left, int right ) const
-+{
-+    int kern = 0;
-+    if( mpKernPairs )
-+    {
-+        std::map< int, std::map< int, int > >::const_iterator left_it =
-+            mpKernPairs->find( left );
-+        if( left_it != mpKernPairs->end() )
-+        {
-+            std::map< int, int >::const_iterator right_it = left_it->second.find( right );
-+            if( right_it != left_it->second.end() )
-+                kern = right_it->second;
-+        }
-+    }
-+    return kern*(maFontSelData.mnWidth ? maFontSelData.mnWidth : maFontSelData.mnHeight)/1000;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG ServerFont::GetKernPairs( struct ImplKernPairData** ppKernPairs ) const
-+{
-+    int nKernEntry = 0;
-+    unicodeKernMap::const_iterator left_it;
-+    std::map< sal_Unicode, int >::const_iterator right_it;
-+    if( mpUnicodeKernPairs )
-+    {
-+        // count the kern entries
-+        for( left_it = mpUnicodeKernPairs->begin(); left_it != mpUnicodeKernPairs->end(); ++left_it )
-+        {
-+            nKernEntry += left_it->second.size();
-+        }
-+    }
-+
-+    // allocate kern pair table
-+    if( nKernEntry )
-+    {
-+        *ppKernPairs = new ImplKernPairData[ nKernEntry ];
-+
-+        // fill in kern pairs
-+        nKernEntry = 0;
-+        for( left_it = mpUnicodeKernPairs->begin(); left_it != mpUnicodeKernPairs->end(); ++left_it )
-+        {
-+            for( right_it = left_it->second.begin(); right_it != left_it->second.end(); ++right_it )
-+            {
-+                (*ppKernPairs)[ nKernEntry ].mnChar1 = (USHORT)left_it->first;
-+                (*ppKernPairs)[ nKernEntry ].mnChar2 = (USHORT)right_it->first;
-+                (*ppKernPairs)[ nKernEntry ].mnKern = right_it->second*(maFontSelData.mnWidth ? maFontSelData.mnWidth : maFontSelData.mnHeight)/1000;
-+                nKernEntry++;
-+            }
-+        }
-+    }
-+    else
-+        *ppKernPairs = NULL;
-+
-+    return (ULONG)nKernEntry;
-+}
-+
-+// -----------------------------------------------------------------------
-+
- GlyphData& ServerFont::GetGlyphData( int nGlyphIndex )
- {
-     // usually the GlyphData is cached
-@@ -465,7 +528,7 @@ void ServerFont::GarbageCollect( long nM
+     nSin( 0),
+     mpKernPairs( pKern ),
+@@ -527,7 +586,7 @@ void ServerFont::GarbageCollect( long nM
      GlyphList::iterator it_next = maGlyphList.begin(), it;
      while( it_next != maGlyphList.end() )
      {
@@ -771,13 +468,9 @@ diff -u -p -u -r1.22.40.2 -r1.26
          {
 Index: vcl/source/glyphs/makefile.mk
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -p -u -r1.5 -r1.6
---- vcl/source/glyphs/makefile.mk	15 Feb 2002 15:52:27 -0000	1.5
-+++ vcl/source/glyphs/makefile.mk	6 Jan 2004 14:00:38 -0000	1.6
-@@ -76,11 +76,9 @@ TARGET=glyphs
+--- vcl/source/glyphs/makefile.mk.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/makefile.mk	2004-09-14 13:53:47.314958192 +0200
+@@ -77,11 +77,9 @@ CFLAGS += $(FREETYPE_CFLAGS)
  SLOFILES=\
  		$(SLO)$/glyphcache.obj		\
  		$(SLO)$/gcach_rbmp.obj		\
diff --git a/patches/vclplug/vcl-source-window.diff b/patches/vclplug/vcl-source-window.diff
index 5557cccba..67920befb 100644
--- a/patches/vclplug/vcl-source-window.diff
+++ b/patches/vclplug/vcl-source-window.diff
@@ -3152,7 +3152,7 @@ diff -u -p -u -r1.96.60.1 -r1.106
  
  #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
  #include <com/sun/star/uno/Reference.h>
-@@ -196,11 +202,6 @@ DBG_NAME( Menu );
+@@ -196,12 +202,6 @@ DBG_NAME( Menu );
  // document closer
  #define IID_DOCUMENTCLOSE 1
  
@@ -3161,6 +3161,7 @@ diff -u -p -u -r1.96.60.1 -r1.106
 -    return ( Application::GetSettings().GetMouseSettings().GetFollow() & MOUSE_FOLLOW_MENU ) ? TRUE : FALSE;
 -}
 -
+-
  struct MenuItemData
  {
      USHORT          nId;					// SV Id
diff --git a/patches/vclplug/vcl-unx-gtk-menu-bar-style.diff b/patches/vclplug/vcl-unx-gtk-menu-bar-style.diff
new file mode 100644
index 000000000..25220fa72
--- /dev/null
+++ b/patches/vclplug/vcl-unx-gtk-menu-bar-style.diff
@@ -0,0 +1,31 @@
+--- vcl/unx/gtk/window/gtkframe.cxx.menubar	2004-10-19 15:35:49.000000000 -0400
++++ vcl/unx/gtk/window/gtkframe.cxx	2004-10-24 01:19:50.439496320 -0400
+@@ -1294,19 +1294,27 @@
+     aStyleSet.SetHighlightTextColor( aHighlightTextColor );
+
+     // menu colors
++    GtkWidget* pMenuBar = gtk_menu_bar_new();
++    GtkWidget* pMenuBarMenuItem = gtk_menu_item_new_with_label( "blah" );
+     GtkWidget* pMenu = gtk_menu_new();
+     GtkWidget* pMenuItem = gtk_menu_item_new_with_label( "blah" );
++    gtk_menu_shell_append( GTK_MENU_SHELL( pMenuBar ), pMenuBarMenuItem );
++    gtk_menu_item_set_submenu( GTK_MENU_ITEM( pMenuBarMenuItem ), pMenu );
+     gtk_menu_shell_append( GTK_MENU_SHELL( pMenu ), pMenuItem );
+
++    gtk_widget_ensure_style( pMenuBar );
++    gtk_widget_ensure_style( pMenuBarMenuItem );
+     gtk_widget_ensure_style( pMenu );
+     gtk_widget_ensure_style( pMenuItem );
++    GtkStyle* pMenuBarStyle = gtk_rc_get_style( pMenuBar );
+     GtkStyle* pMenuStyle = gtk_rc_get_style( pMenu );
+     GtkStyle* pMenuItemStyle = gtk_rc_get_style( pMenuItem );
+     GtkStyle* pMenuTextStyle = gtk_rc_get_style( gtk_bin_get_child( GTK_BIN( pMenuItem )));
+
++    aBackColor = getColor ( pMenuBarStyle->bg[GTK_STATE_NORMAL] );
++    aStyleSet.SetMenuBarColor( aBackColor );
+     aBackColor = getColor( pMenuStyle->bg[GTK_STATE_NORMAL] );
+     aStyleSet.SetMenuColor( aBackColor );
+-    aStyleSet.SetMenuBarColor( aBackColor );
+     aTextColor = getColor( pMenuTextStyle->text[GTK_STATE_NORMAL] );
+     aStyleSet.SetMenuTextColor( aTextColor );
+     aHighlightColor = getColor( pMenuItemStyle->bg[ GTK_STATE_SELECTED ] );
diff --git a/patches/vclplug/vcl-unx-source-gdi.diff b/patches/vclplug/vcl-unx-source-gdi.diff
index 29d649121..7989f4d08 100644
--- a/patches/vclplug/vcl-unx-source-gdi.diff
+++ b/patches/vclplug/vcl-unx-source-gdi.diff
@@ -3,9 +3,10 @@ Index: vcl/unx/source/gdi/cdeint.cxx
 RCS file: /cvs/gsl/vcl/unx/source/gdi/cdeint.cxx,v
 retrieving revision 1.8
 retrieving revision 1.9
-diff -u -p -u -r1.8 -r1.9
---- vcl/unx/source/gdi/cdeint.cxx	24 Jun 2002 15:53:02 -0000	1.8
-+++ vcl/unx/source/gdi/cdeint.cxx	18 Nov 2003 14:44:27 -0000	1.9
+Index: vcl/unx/source/gdi/cdeint.cxx
+===================================================================
+--- vcl/unx/source/gdi/cdeint.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/cdeint.cxx	2004-09-14 14:09:32.367288400 +0200
 @@ -64,14 +64,12 @@
  #include <salunx.h>
  #include <saldisp.hxx>
@@ -24,12 +25,8 @@ diff -u -p -u -r1.8 -r1.9
  	mnRefCount++;
 Index: vcl/unx/source/gdi/dtint.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/dtint.cxx,v
-retrieving revision 1.16.82.1
-retrieving revision 1.22
-diff -u -p -u -r1.16.82.1 -r1.22
---- vcl/unx/source/gdi/dtint.cxx	15 Jan 2004 12:52:24 -0000	1.16.82.1
-+++ vcl/unx/source/gdi/dtint.cxx	10 May 2004 15:58:19 -0000	1.22
+--- vcl/unx/source/gdi/dtint.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/dtint.cxx	2004-09-14 14:09:32.371287792 +0200
 @@ -72,10 +72,8 @@
  #include <cdeint.hxx>
  #endif
@@ -143,7 +140,7 @@ diff -u -p -u -r1.16.82.1 -r1.22
  
  void DtIntegrator::GetSystemLook( AllSettings& rSettings )
  {
--}
+ }
 -
 -Color DtIntegrator::parseColor( const ByteString& rLine )
 -{
@@ -563,15 +560,11 @@ diff -u -p -u -r1.16.82.1 -r1.22
 -        rSettings.SetMouseSettings( aMouseSettings );
 -        rSettings.SetStyleSettings( aStyleSettings );
 -    }
- }
+-}
 Index: vcl/unx/source/gdi/gcach_xpeer.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/gcach_xpeer.cxx,v
-retrieving revision 1.32.18.1
-retrieving revision 1.37
-diff -u -p -u -r1.32.18.1 -r1.37
---- vcl/unx/source/gdi/gcach_xpeer.cxx	9 Jan 2004 18:14:01 -0000	1.32.18.1
-+++ vcl/unx/source/gdi/gcach_xpeer.cxx	4 Feb 2004 11:05:23 -0000	1.37
+--- vcl/unx/source/gdi/gcach_xpeer.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/gcach_xpeer.cxx	2004-09-14 14:09:32.372287640 +0200
 @@ -61,6 +61,7 @@
  
  #include <rtl/ustring.hxx>
@@ -643,12 +636,8 @@ diff -u -p -u -r1.32.18.1 -r1.37
              rGlyphData.SetOffset( +maRawBitmap.mnXOffset, +maRawBitmap.mnYOffset );
 Index: vcl/unx/source/gdi/kdeint.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/kdeint.cxx,v
-retrieving revision 1.10
-retrieving revision 1.12
-diff -u -p -u -r1.10 -r1.12
---- vcl/unx/source/gdi/kdeint.cxx	16 Jul 2003 17:46:57 -0000	1.10
-+++ vcl/unx/source/gdi/kdeint.cxx	6 Jan 2004 14:37:00 -0000	1.12
+--- vcl/unx/source/gdi/kdeint.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/kdeint.cxx	2004-09-14 14:09:32.373287488 +0200
 @@ -60,18 +60,18 @@
   ************************************************************************/
  
@@ -691,12 +680,8 @@ diff -u -p -u -r1.10 -r1.12
  		if( pTryFiles[i][0] == '~' )
 Index: vcl/unx/source/gdi/makefile.mk
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/makefile.mk,v
-retrieving revision 1.9
-retrieving revision 1.13
-diff -u -p -u -r1.9 -r1.13
---- vcl/unx/source/gdi/makefile.mk	27 Aug 2002 14:52:35 -0000	1.9
-+++ vcl/unx/source/gdi/makefile.mk	10 May 2004 15:58:32 -0000	1.13
+--- vcl/unx/source/gdi/makefile.mk.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/makefile.mk	2004-09-14 14:09:32.374287336 +0200
 @@ -80,24 +80,29 @@ dummy:
  
  .ELSE		# "$(GUIBASE)"!="unx"
@@ -733,21 +718,19 @@ diff -u -p -u -r1.9 -r1.13
  
  .IF "$(USE_XPRINT)" == "TRUE"
  CFLAGS+=-D_USE_PRINT_EXTENSION_=1
-@@ -113,8 +118,6 @@ ENVCFLAGS+=-DUSE_CDE
- 
- .IF "$(USE_BUILTIN_RASTERIZER)" != ""
+@@ -115,8 +120,6 @@ ENVCFLAGS+=-DUSE_CDE
  SLOFILES+=	$(SLO)$/gcach_xpeer.obj
--.ENDIF
--
  .ENDIF
  
+-.ENDIF
+-
  .ENDIF	# "$(GUIBASE)"!="unx"
+ 
+ # --- Targets ------------------------------------------------------
 Index: vcl/unx/source/gdi/pspgraphics.cxx
 ===================================================================
-RCS file: vcl/unx/source/gdi/pspgraphics.cxx
-diff -N vcl/unx/source/gdi/pspgraphics.cxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/unx/source/gdi/pspgraphics.cxx	17 Jun 2004 12:28:07 -0000	1.4
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/unx/source/gdi/pspgraphics.cxx	2004-09-14 14:09:32.377286880 +0200
 @@ -0,0 +1,1355 @@
 +/*************************************************************************
 + *
@@ -2106,12 +2089,8 @@ diff -N vcl/unx/source/gdi/pspgraphics.cxx
 +}
 Index: vcl/unx/source/gdi/salbmp.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salbmp.cxx,v
-retrieving revision 1.8.274.1
-retrieving revision 1.14
-diff -u -p -u -r1.8.274.1 -r1.14
---- vcl/unx/source/gdi/salbmp.cxx	15 Jan 2004 12:52:46 -0000	1.8.274.1
-+++ vcl/unx/source/gdi/salbmp.cxx	22 Jun 2004 17:42:38 -0000	1.14
+--- vcl/unx/source/gdi/salbmp.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salbmp.cxx	2004-09-14 14:09:32.382286120 +0200
 @@ -59,20 +59,18 @@
   *
   ************************************************************************/
@@ -2638,12 +2617,8 @@ diff -u -p -u -r1.8.274.1 -r1.14
  	{
 Index: vcl/unx/source/gdi/salgdi.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi.cxx,v
-retrieving revision 1.24.120.2
-retrieving revision 1.33
-diff -u -p -u -r1.24.120.2 -r1.33
---- vcl/unx/source/gdi/salgdi.cxx	15 Jan 2004 12:53:28 -0000	1.24.120.2
-+++ vcl/unx/source/gdi/salgdi.cxx	22 Jun 2004 17:42:18 -0000	1.33
+--- vcl/unx/source/gdi/salgdi.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salgdi.cxx	2004-09-14 14:09:32.386285512 +0200
 @@ -59,14 +59,22 @@
   *
   ************************************************************************/
@@ -3951,12 +3926,8 @@ diff -u -p -u -r1.24.120.2 -r1.33
 -
 Index: vcl/unx/source/gdi/salgdi2.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi2.cxx,v
-retrieving revision 1.18.68.1
-retrieving revision 1.25
-diff -u -p -u -r1.18.68.1 -r1.25
---- vcl/unx/source/gdi/salgdi2.cxx	15 Jan 2004 12:53:52 -0000	1.18.68.1
-+++ vcl/unx/source/gdi/salgdi2.cxx	22 Jun 2004 17:42:46 -0000	1.25
+--- vcl/unx/source/gdi/salgdi2.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salgdi2.cxx	2004-09-14 14:09:32.406282472 +0200
 @@ -59,9 +59,6 @@
   *
   ************************************************************************/
@@ -5315,12 +5286,8 @@ diff -u -p -u -r1.18.68.1 -r1.25
  
 Index: vcl/unx/source/gdi/salgdi3.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v
-retrieving revision 1.105.46.5
-retrieving revision 1.119
-diff -u -p -u -r1.105.46.5 -r1.119
---- vcl/unx/source/gdi/salgdi3.cxx	13 Feb 2004 14:03:54 -0000	1.105.46.5
-+++ vcl/unx/source/gdi/salgdi3.cxx	17 Jun 2004 12:29:09 -0000	1.119
+--- vcl/unx/source/gdi/salgdi3.cxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/unx/source/gdi/salgdi3.cxx	2004-09-14 14:11:55.218571704 +0200
 @@ -59,10 +59,6 @@
   *
   ************************************************************************/
@@ -5664,7 +5631,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      for( int nStart = 0; rSalLayout.GetNextGlyphs( 1, &nGlyph, aPos, nStart ); )
      {
          Pixmap aStipple = aX11GlyphPeer.GetPixmap( rFont, nGlyph );
-@@ -1124,186 +1015,27 @@ void SalGraphicsData::DrawServerSimpleFo
+@@ -1124,200 +1015,27 @@ void SalGraphicsData::DrawServerSimpleFo
  
  //--------------------------------------------------------------------------
  
@@ -5733,10 +5700,24 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -        // apply pair kerning to prev glyph if requested
 -        if( SAL_LAYOUT_KERNING_PAIRS & rArgs.mnFlags )
 -        {
--            // TODO: get kerning value from printer
--            int nKern = 0; //GetGlyphKernValue( nOldGlyphId, nGlyphIndex );
--            nGlyphWidth += nKern;
--            aPrevItem.mnNewWidth = nGlyphWidth;
+-            if( nOldGlyphId > 0 )
+-            {
+-                const std::list< psp::KernPair >& rKernPairs = mrPrinterGfx.getKernPairs(mbVertical);
+-                for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
+-                     it != rKernPairs.end(); ++it )
+-                {
+-                    if( it->first == nOldGlyphId && it->second == nGlyphIndex )
+-                    {
+-                        int nTextScale = mrPrinterGfx.GetFontWidth();
+-                        if( ! nTextScale )
+-                            nTextScale = mrPrinterGfx.GetFontHeight();
+-                        int nKern = (mbVertical ? it->kern_y : it->kern_x) * nTextScale;
+-                        nGlyphWidth += nKern;
+-                        aPrevItem.mnNewWidth = nGlyphWidth;
+-                        break;
+-                    }
+-                }
+-            }
 -        }
 -        
 -        // finish previous glyph
@@ -5866,7 +5847,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      else
      {
          // draw complex text
-@@ -1326,35 +1058,7 @@ void SalGraphicsData::DispatchServerFont
+@@ -1340,35 +1058,7 @@ void SalGraphicsData::DispatchServerFont
  
  //--------------------------------------------------------------------------
  
@@ -5903,7 +5884,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      const Point& rPoint, const sal_Unicode* pStr, int nLength )
  {
      Display* pDisplay   = GetXDisplay();
-@@ -1383,8 +1087,9 @@ void SalGraphicsData::DrawStringUCS2MB( 
+@@ -1397,8 +1087,9 @@ void SalGraphicsData::DrawStringUCS2MB( 
      {
          XTextItem16 *pTextItem = (XTextItem16*)alloca( nLength * sizeof(XTextItem16) );
          XChar2b     *pMBChar   = (XChar2b*)pStr;
@@ -5914,7 +5895,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
          {
              rtl_TextEncoding  nEnc;
              XFontStruct* pFontStruct = rFont.GetFontStruct( pStr[nChar], &nEnc );
-@@ -1406,15 +1111,13 @@ void SalGraphicsData::DrawStringUCS2MB( 
+@@ -1420,15 +1111,13 @@ void SalGraphicsData::DrawStringUCS2MB( 
  
  //--------------------------------------------------------------------------
  
@@ -5931,7 +5912,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      if( mXFont[0] )
          nPairs = mXFont[0]->GetFontCodeRanges( pCodePairs );
      return nPairs;
-@@ -1449,204 +1152,32 @@ CheckNoNegativeCoordinateWorkaround()
+@@ -1463,204 +1152,32 @@ CheckNoNegativeCoordinateWorkaround()
  //
  // ----------------------------------------------------------------------------
  
@@ -5990,29 +5971,29 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
 -#ifndef _USE_PRINT_EXTENSION_
 -    if (maGraphicsData.m_pPrinterGfx != NULL)
--    {
++    if( nTextColor_	!= nSalColor )
+     {
 -        psp::PrinterColor aColor (SALCOLOR_RED   (nSalColor),
 -                                  SALCOLOR_GREEN (nSalColor),
 -                                  SALCOLOR_BLUE  (nSalColor));
 -        maGraphicsData.m_pPrinterGfx->SetTextColor (aColor);
--    }
++        nTextColor_     = nSalColor;
++        nTextPixel_     = GetPixel( nSalColor );
++        bFontGC_         = FALSE;
+     }
 -    else
 -    {
 -#endif
 -
 -    if( _GetTextColor()	!= nSalColor )
-+    if( nTextColor_	!= nSalColor )
-     {
+-    {
 -        _GetTextColor()     = nSalColor;
 -        _GetTextPixel()     = _GetPixel( nSalColor );
 -        _IsFontGC()         = FALSE;
 -    }
 -
 -#ifndef _USE_PRINT_EXTENSION_
-+        nTextColor_     = nSalColor;
-+        nTextPixel_     = GetPixel( nSalColor );
-+        bFontGC_         = FALSE;
-     }
+-    }
 -#endif
  }
  
@@ -6149,7 +6130,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
      // inform font manager
      rtl::OUString aUSystemPath;
-@@ -1662,7 +1193,7 @@ ImplFontData* SalGraphics::AddTempDevFon
+@@ -1676,7 +1193,7 @@ ImplFontData* SalGraphics::AddTempDevFon
      psp::FastPrintFontInfo aInfo;
      rMgr.getFontFastInfo( nFontId, aInfo );
      ImplFontData* pFontData = new ImplFontData;
@@ -6158,7 +6139,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      pFontData->maName = rFontName;
      pFontData->mnQuality += 5800;
  
-@@ -1676,148 +1207,83 @@ ImplFontData* SalGraphics::AddTempDevFon
+@@ -1690,164 +1207,82 @@ ImplFontData* SalGraphics::AddTempDevFon
  
  // ----------------------------------------------------------------------------
  
@@ -6167,35 +6148,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
 -#ifndef _USE_PRINT_EXTENSION_
 -    if (maGraphicsData.m_pJobData != NULL)
-+    XlfdStorage* pFonts = GetDisplay()->GetXlfdList();
-+    
-+    for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
-+    {
-+        ImplFontData *pFontData = new ImplFontData;
-+        pFonts->Get(nIdx)->ToImplFontData( pFontData );
-+        if( pFontData->maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
-+            pFontData->maName = pFontData->maName.Copy( 4 );
-+        pFontData->mbSubsettable    = FALSE;
-+        pFontData->mbEmbeddable     = FALSE;
-+        pList->Add( pFontData );
-+    }
-+    
-+    aX11GlyphPeer.SetDisplay( GetXDisplay(),
-+                              GetDisplay()->GetVisual()->GetVisual() );
-+#ifdef MACOSX
-+    GlyphCache::EnsureInstance( aX11GlyphPeer, true );
-+#else
-+    GlyphCache::EnsureInstance( aX11GlyphPeer, false );
-+#endif
-+    GlyphCache& rGC = GlyphCache::GetInstance();
-+    
-+    const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
-+    ::std::list< psp::fontID > aList;
-+    ::std::list< psp::fontID >::iterator it;
-+    rMgr.getFontList( aList );
-+    unicodeKernMap aKernTab;
-+    for( it = aList.begin(); it != aList.end(); ++it )
-     {
+-    {
 -        const char* pLangBoost = NULL;
 -        const LanguageType aLang = Application::GetSettings().GetUILanguage();
 -        switch( aLang )
@@ -6225,39 +6178,17 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -
 -        ::std::list< psp::fontID >::iterator it;
 -        for (it = aList.begin(); it != aList.end(); ++it)
-+        psp::FastPrintFontInfo aInfo;
-+        if( rMgr.getFontFastInfo( *it, aInfo ) )
-         {
+-        {
 -            psp::FastPrintFontInfo aInfo;
 -            if (rMgr.getFontFastInfo (*it, aInfo))
-+            if( aInfo.m_eType == psp::fonttype::Builtin )
-+                continue;
-+            ImplFontData aFontData;
-+            PspGraphics::SetImplFontData( aInfo, aFontData );
-+            // prefer builtin_rasterizer fonts
-+            aFontData.mnQuality += 4096;
-+            // prefer truetype fonts
-+            if( aInfo.m_eType == psp::fonttype::TrueType )
-+                aFontData.mnQuality += 1000;
-+            int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
-+            if( aFontData.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
-+                aFontData.maName = aFontData.maName.Copy( 4 );
-+            if( nFaceNum < 0 )
-+                nFaceNum = 0;
-+
-+            
-+            const unicodeKernMap* pKernTab = NULL;
-+            if( aInfo.m_eType == psp::fonttype::Type1 )
-             {
+-            {
 -                ImplFontData *pFontData = new ImplFontData;
 -                SetImplFontData( aInfo, *pFontData );
 -                pFontData->mpSysData = (void*)*it;
 -                if( pFontData->maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
 -                    pFontData->maName = pFontData->maName.Copy( 4 );
 -                if( aInfo.m_eType == psp::fonttype::TrueType )
-+                const std::list< psp::KernPair >& rKernPairs = rMgr.getKernPairs( *it );
-+                if( rKernPairs.size() )
-                 {
+-                {
 -                    // prefer truetype fonts
 -                    pFontData->mnQuality += 10;
 -                    // asian type 1 fonts are not known
@@ -6270,29 +6201,35 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -                        if( pLangBoost && aFileName.Copy( nPos+1, 3 ).EqualsIgnoreCaseAscii( pLangBoost ) )
 -                            pFontData->mnQuality += 10;
 -                    }
-+                    aKernTab.clear();
-+                    for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
-+                         it != rKernPairs.end(); ++it )
-+                        aKernTab[ it->first ][ it->second ] = it->kern_x;
-+                    pKernTab = & aKernTab;
-                 }
+-                }
 -                pList->Add( pFontData );
-             }
-+            
-+            // handling of alias names is done by GlyphCache::FetchFontList
-+            rGC.AddFontFile( rMgr.getFontFileSysPath( aInfo.m_nID ), nFaceNum,
-+                             aInfo.m_nID, &aFontData, pKernTab );
-         }
-     }
+-            }
+-        }
+-    }
 -    else
 -#endif
 -    {
 -        XlfdStorage* pFonts = _GetDisplay()->GetXlfdList();
- 
+-
 -        for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
 -        {
 -            ImplFontData *pFontData = new ImplFontData;
--#ifdef MACOSX
++    XlfdStorage* pFonts = GetDisplay()->GetXlfdList();
++    
++    for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
++    {
++        ImplFontData *pFontData = new ImplFontData;
++        pFonts->Get(nIdx)->ToImplFontData( pFontData );
++        if( pFontData->maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
++            pFontData->maName = pFontData->maName.Copy( 4 );
++        pFontData->mbSubsettable    = FALSE;
++        pFontData->mbEmbeddable     = FALSE;
++        pList->Add( pFontData );
++    }
++    
++    aX11GlyphPeer.SetDisplay( GetXDisplay(),
++                              GetDisplay()->GetVisual()->GetVisual() );
+ #ifdef MACOSX
 -            // don't use bitmap X fonts on OS X
 -            if ( pFonts->Get(nIdx)->GetFontType() != TYPE_RASTER )
 -#endif
@@ -6311,17 +6248,31 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -            maGraphicsData.GetDisplay()->GetVisual()->GetVisual() );
 -#ifdef MACOSX
 -        GlyphCache::EnsureInstance( aX11GlyphPeer, true );
--#else
++    GlyphCache::EnsureInstance( aX11GlyphPeer, true );
+ #else
 -        GlyphCache::EnsureInstance( aX11GlyphPeer, false );
--#endif
++    GlyphCache::EnsureInstance( aX11GlyphPeer, false );
+ #endif
 -        GlyphCache& rGC = GlyphCache::GetInstance();
 -
 -        const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
 -        ::std::list< psp::fontID > aList;
 -        ::std::list< psp::fontID >::iterator it;
 -        rMgr.getFontList( aList );
+-        unicodeKernMap aKernTab;
 -        for( it = aList.begin(); it != aList.end(); ++it )
--        {
++    GlyphCache& rGC = GlyphCache::GetInstance();
++    
++    const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
++    ::std::list< psp::fontID > aList;
++    ::std::list< psp::fontID >::iterator it;
++    rMgr.getFontList( aList );
++    unicodeKernMap aKernTab;
++    for( it = aList.begin(); it != aList.end(); ++it )
++    {
++        psp::FastPrintFontInfo aInfo;
++        if( rMgr.getFontFastInfo( *it, aInfo ) )
+         {
 -            psp::FastPrintFontInfo aInfo;
 -            if( rMgr.getFontFastInfo( *it, aInfo ) )
 -            {
@@ -6339,14 +6290,58 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -                    aFontData.maName = aFontData.maName.Copy( 4 );
 -                if( nFaceNum < 0 )
 -                    nFaceNum = 0;
++            if( aInfo.m_eType == psp::fonttype::Builtin )
++                continue;
++            ImplFontData aFontData;
++            PspGraphics::SetImplFontData( aInfo, aFontData );
++            // prefer builtin_rasterizer fonts
++            aFontData.mnQuality += 4096;
++            // prefer truetype fonts
++            if( aInfo.m_eType == psp::fonttype::TrueType )
++                aFontData.mnQuality += 1000;
++            int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
++            if( aFontData.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
++                aFontData.maName = aFontData.maName.Copy( 4 );
++            if( nFaceNum < 0 )
++                nFaceNum = 0;
++
+             
+-                const unicodeKernMap* pKernTab = NULL;
+-                if( aInfo.m_eType == psp::fonttype::Type1 )
++            const unicodeKernMap* pKernTab = NULL;
++            if( aInfo.m_eType == psp::fonttype::Type1 )
++            {
++                const std::list< psp::KernPair >& rKernPairs = rMgr.getKernPairs( *it );
++                if( rKernPairs.size() )
+                 {
+-                    const std::list< psp::KernPair >& rKernPairs = rMgr.getKernPairs( *it );
+-                    if( rKernPairs.size() )
+-                    {
+-                        aKernTab.clear();
+-                        for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
+-                             it != rKernPairs.end(); ++it )
+-                            aKernTab[ it->first ][ it->second ] = it->kern_x;
+-                        pKernTab = & aKernTab;
+-                    }
++                    aKernTab.clear();
++                    for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
++                         it != rKernPairs.end(); ++it )
++                        aKernTab[ it->first ][ it->second ] = it->kern_x;
++                    pKernTab = & aKernTab;
+                 }
+-
 -                rGC.AddFontFile( rMgr.getFontFileSysPath( aInfo.m_nID ), nFaceNum,
--                    aInfo.m_nID, &aFontData );
--            }
--        }
+-                                 aInfo.m_nID, &aFontData, pKernTab );
+             }
++            
++            // handling of alias names is done by GlyphCache::FetchFontList
++            rGC.AddFontFile( rMgr.getFontFileSysPath( aInfo.m_nID ), nFaceNum,
++                             aInfo.m_nID, &aFontData, pKernTab );
+         }
 -
 -        rGC.FetchFontList( pList );
 -#endif // USE_BUILTIN_RASTERIZER
--    }
+     }
 +    rGC.FetchFontList( pList );
  }
  
@@ -6369,7 +6364,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  }
  
  // ----------------------------------------------------------------------------
-@@ -1831,136 +1297,53 @@ sal_DivideNeg( long n1, long n2 )
+@@ -1861,136 +1296,53 @@ sal_DivideNeg( long n1, long n2 )
  // ----------------------------------------------------------------------------
  
  void
@@ -6517,7 +6512,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      if( !pSF )
          return FALSE;
  
-@@ -1972,13 +1355,13 @@ BOOL SalGraphics::GetGlyphBoundRect( lon
+@@ -2002,13 +1354,13 @@ BOOL SalGraphics::GetGlyphBoundRect( lon
  
  // ---------------------------------------------------------------------------
  
@@ -6533,7 +6528,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      if( !pSF )
          return FALSE;
  
-@@ -1991,29 +1374,13 @@ BOOL SalGraphics::GetGlyphOutline( long 
+@@ -2021,29 +1373,13 @@ BOOL SalGraphics::GetGlyphOutline( long 
  
  //--------------------------------------------------------------------------
  
@@ -6565,7 +6560,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      else if( mXFont[ nFallbackLevel ] )
          pLayout = new X11FontLayout( *mXFont[ nFallbackLevel ] );
      else
-@@ -2024,18 +1391,10 @@ SalLayout* SalGraphicsData::GetTextLayou
+@@ -2054,18 +1390,10 @@ SalLayout* SalGraphicsData::GetTextLayou
  
  //--------------------------------------------------------------------------
  
@@ -6586,7 +6581,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
                                     sal_uInt8* pEncoding,
                                     sal_Int32* pWidths,
                                     int nGlyphs,
-@@ -2049,41 +1408,7 @@ BOOL SalGraphics::CreateFontSubset(
+@@ -2079,41 +1407,7 @@ BOOL SalGraphics::CreateFontSubset(
      // which this method was created). The correct way would
      // be to have the GlyphCache search for the ImplFontData pFont
      psp::fontID aFont = (psp::fontID)pFont->mpSysData;
@@ -6629,7 +6624,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  #else
      return FALSE;
  #endif
-@@ -2091,7 +1416,7 @@ BOOL SalGraphics::CreateFontSubset(
+@@ -2121,7 +1415,7 @@ BOOL SalGraphics::CreateFontSubset(
  
  //--------------------------------------------------------------------------
  
@@ -6638,7 +6633,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
  #ifndef _USE_PRINT_EXTENSION_
      // in this context the sysdata member of pFont should
-@@ -2100,61 +1425,7 @@ const void* SalGraphics::GetEmbedFontDat
+@@ -2130,61 +1424,7 @@ const void* SalGraphics::GetEmbedFontDat
      // which this method was created). The correct way would
      // be to have the GlyphCache search for the ImplFontData pFont
      psp::fontID aFont = (psp::fontID)pFont->mpSysData;
@@ -6701,7 +6696,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  #else
      return NULL;
  #endif
-@@ -2162,14 +1433,16 @@ const void* SalGraphics::GetEmbedFontDat
+@@ -2192,14 +1432,16 @@ const void* SalGraphics::GetEmbedFontDat
  
  //--------------------------------------------------------------------------
  
@@ -6721,7 +6716,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
  #ifndef _USE_PRINT_EXTENSION_
      // in this context the sysdata member of pFont should
-@@ -2178,17 +1451,7 @@ const std::map< sal_Unicode, sal_Int32 >
+@@ -2208,17 +1450,7 @@ const std::map< sal_Unicode, sal_Int32 >
      // which this method was created). The correct way would
      // be to have the GlyphCache search for the ImplFontData pFont
      psp::fontID aFont = (psp::fontID)pFont->mpSysData;
@@ -6742,10 +6737,8 @@ diff -u -p -u -r1.105.46.5 -r1.119
  #endif
 Index: vcl/unx/source/gdi/salnativewidgets-kde.cxx
 ===================================================================
-RCS file: vcl/unx/source/gdi/salnativewidgets-kde.cxx
-diff -N vcl/unx/source/gdi/salnativewidgets-kde.cxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/unx/source/gdi/salnativewidgets-kde.cxx	10 May 2004 15:59:25 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/unx/source/gdi/salnativewidgets-kde.cxx	2004-09-14 14:09:32.421280192 +0200
 @@ -0,0 +1,1633 @@
 +/*************************************************************************
 + *
@@ -8382,12 +8375,8 @@ diff -N vcl/unx/source/gdi/salnativewidgets-kde.cxx
 +/* vim: set tabstop=8 shiftwidth=4: */
 Index: vcl/unx/source/gdi/salogl.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salogl.cxx,v
-retrieving revision 1.7
-retrieving revision 1.11
-diff -u -p -u -r1.7 -r1.11
---- vcl/unx/source/gdi/salogl.cxx	15 Apr 2003 16:10:05 -0000	1.7
-+++ vcl/unx/source/gdi/salogl.cxx	10 May 2004 15:59:38 -0000	1.11
+--- vcl/unx/source/gdi/salogl.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salogl.cxx	2004-09-14 14:09:32.422280040 +0200
 @@ -59,8 +59,6 @@
   *
   ************************************************************************/
@@ -8679,12 +8668,8 @@ diff -u -p -u -r1.7 -r1.11
  								   int nVisuals )
 Index: vcl/unx/source/gdi/salprnpsp.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
-retrieving revision 1.27.40.2
-retrieving revision 1.33
-diff -u -p -u -r1.27.40.2 -r1.33
---- vcl/unx/source/gdi/salprnpsp.cxx	28 Jan 2004 15:25:52 -0000	1.27.40.2
-+++ vcl/unx/source/gdi/salprnpsp.cxx	10 May 2004 15:59:51 -0000	1.33
+--- vcl/unx/source/gdi/salprnpsp.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salprnpsp.cxx	2004-09-14 14:09:32.426279432 +0200
 @@ -79,14 +79,14 @@
  #ifndef _SV_JOBSET_H
  #include <jobset.h>
@@ -9256,12 +9241,8 @@ diff -u -p -u -r1.27.40.2 -r1.33
  
 Index: vcl/unx/source/gdi/salvd.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salvd.cxx,v
-retrieving revision 1.4
-retrieving revision 1.8
-diff -u -p -u -r1.4 -r1.8
---- vcl/unx/source/gdi/salvd.cxx	27 Mar 2003 17:58:52 -0000	1.4
-+++ vcl/unx/source/gdi/salvd.cxx	10 May 2004 16:00:04 -0000	1.8
+--- vcl/unx/source/gdi/salvd.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salvd.cxx	2004-09-14 14:09:32.427279280 +0200
 @@ -59,9 +59,6 @@
   *
   ************************************************************************/
@@ -9484,12 +9465,8 @@ diff -u -p -u -r1.4 -r1.8
  }
 Index: vcl/unx/source/gdi/xfont.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xfont.cxx,v
-retrieving revision 1.29.82.2
-retrieving revision 1.36
-diff -u -p -u -r1.29.82.2 -r1.36
---- vcl/unx/source/gdi/xfont.cxx	26 Jan 2004 17:26:20 -0000	1.29.82.2
-+++ vcl/unx/source/gdi/xfont.cxx	17 Jun 2004 12:29:36 -0000	1.36
+--- vcl/unx/source/gdi/xfont.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xfont.cxx	2004-09-14 14:09:32.428279128 +0200
 @@ -76,8 +76,11 @@
  #ifndef _SV_OUTFONT_HXX
  #include <outfont.hxx>
@@ -9514,7 +9491,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
          mpRangeCodes(NULL),
          mnRangeCount(-1)
  {
-@@ -434,7 +438,7 @@ ExtendedFontStruct::GetDefaultWidth()
+@@ -437,7 +440,7 @@ ExtendedFontStruct::GetDefaultWidth()
  // is compatible with iso8859-X at least in the range to 0x7f
  sal_Size
  ExtendedFontStruct::GetCharWidth8( sal_Unicode nFrom, sal_Unicode nTo,
@@ -9523,7 +9500,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
  	if ( !(nFrom <= nTo) )
  		return 0;
-@@ -477,7 +481,7 @@ ExtendedFontStruct::GetCharWidth8( sal_U
+@@ -480,7 +483,7 @@ ExtendedFontStruct::GetCharWidth8( sal_U
  // Handle utf16 encoded fonts, which do not require conversion
  sal_Size
  ExtendedFontStruct::GetCharWidthUTF16( sal_Unicode nFrom, sal_Unicode nTo,
@@ -9532,7 +9509,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
  	if ( !(nFrom <= nTo) )
  		return 0;
-@@ -523,7 +527,7 @@ ExtendedFontStruct::GetCharWidthUTF16( s
+@@ -526,7 +529,7 @@ ExtendedFontStruct::GetCharWidthUTF16( s
  // font in fontstruct, 8 and 16 bit fonts are handled the same way
  sal_Size
  ExtendedFontStruct::GetCharWidth16( sal_Unicode nFrom, sal_Unicode nTo,
@@ -9541,7 +9518,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
      if ( nFrom > nTo )
          return 0;
-@@ -608,8 +612,8 @@ ExtendedFontStruct::GetCharWidth16( sal_
+@@ -611,8 +614,8 @@ ExtendedFontStruct::GetCharWidth16( sal_
  }
  
  sal_Size
@@ -9552,7 +9529,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
      sal_Size nConverted = 0;
  
-@@ -707,7 +711,9 @@ bool X11FontLayout::LayoutText( ImplLayo
+@@ -710,7 +713,9 @@ bool X11FontLayout::LayoutText( ImplLayo
  {
      Point aNewPos( 0, 0 );
      bool bRightToLeft;
@@ -9563,7 +9540,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
      {
          sal_Unicode cChar = rArgs.mpStr[ nCharPos ];
          if( bRightToLeft )
-@@ -722,7 +728,7 @@ bool X11FontLayout::LayoutText( ImplLayo
+@@ -725,7 +730,7 @@ bool X11FontLayout::LayoutText( ImplLayo
                  nGlyphIndex = 0; // drop NotDef fallback glyphs
          }
  
@@ -9572,7 +9549,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
          mrFont.GetCharWidth( cChar, &nPhysGlyphWidth, &nLogGlyphWidth );
          int nGlyphFlags = (nPhysGlyphWidth > 0) ? 0 : GlyphItem::IS_IN_CLUSTER;
          if( bRightToLeft )
-@@ -753,7 +759,7 @@ void X11FontLayout::DrawText( SalGraphic
+@@ -756,7 +761,7 @@ void X11FontLayout::DrawText( SalGraphic
      int nMaxGlyphs = GetOrientation() ? 1 : MAXGLYPHS;
  
      Point aPos;
@@ -9581,7 +9558,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
      sal_Unicode pStr[ MAXGLYPHS ];
      for( int nStart=0;;)
      {
-@@ -764,7 +770,7 @@ void X11FontLayout::DrawText( SalGraphic
+@@ -767,7 +772,7 @@ void X11FontLayout::DrawText( SalGraphic
          for( int i = 0; i < nGlyphCount; ++i )
              pStr[ i ] = aGlyphAry[ i ] & GF_IDXMASK;
  
@@ -9592,12 +9569,8 @@ diff -u -p -u -r1.29.82.2 -r1.36
  
 Index: vcl/unx/source/gdi/xlfd_attr.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_attr.cxx,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -p -u -r1.14 -r1.15
---- vcl/unx/source/gdi/xlfd_attr.cxx	12 Jun 2003 08:19:39 -0000	1.14
-+++ vcl/unx/source/gdi/xlfd_attr.cxx	6 Jan 2004 14:41:47 -0000	1.15
+--- vcl/unx/source/gdi/xlfd_attr.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_attr.cxx	2004-09-14 14:09:32.433278368 +0200
 @@ -120,10 +120,12 @@ Attribute::Compare( const char *p, int n
  const rtl::OString&
  Attribute::GetKey ()
@@ -9614,12 +9587,8 @@ diff -u -p -u -r1.14 -r1.15
  
 Index: vcl/unx/source/gdi/xlfd_extd.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_extd.cxx,v
-retrieving revision 1.16.46.2
-retrieving revision 1.21
-diff -u -p -u -r1.16.46.2 -r1.21
---- vcl/unx/source/gdi/xlfd_extd.cxx	26 Jan 2004 17:26:45 -0000	1.16.46.2
-+++ vcl/unx/source/gdi/xlfd_extd.cxx	30 Mar 2004 13:43:43 -0000	1.21
+--- vcl/unx/source/gdi/xlfd_extd.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_extd.cxx	2004-09-14 14:09:32.435278064 +0200
 @@ -652,7 +652,7 @@ ScalableBitmapXlfd::ToString( ByteString
  	rString += '-';
  	rString += ByteString::CreateFromInt32( rInfo.mnResolutionY );
@@ -9733,12 +9702,8 @@ diff -u -p -u -r1.16.46.2 -r1.21
  	AppendAttribute( mpFactory->RetrieveCharset(rInfo.mnCharset), rString );
 Index: vcl/unx/source/gdi/xlfd_extd.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_extd.hxx,v
-retrieving revision 1.9.120.2
-retrieving revision 1.12
-diff -u -p -u -r1.9.120.2 -r1.12
---- vcl/unx/source/gdi/xlfd_extd.hxx	26 Jan 2004 17:27:37 -0000	1.9.120.2
-+++ vcl/unx/source/gdi/xlfd_extd.hxx	17 Mar 2004 10:07:56 -0000	1.12
+--- vcl/unx/source/gdi/xlfd_extd.hxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_extd.hxx	2004-09-14 14:09:32.435278064 +0200
 @@ -93,8 +93,8 @@ class XlfdStorage;
  
  class ExtendedXlfd {
@@ -9752,12 +9717,8 @@ diff -u -p -u -r1.9.120.2 -r1.12
  			 				ExtendedXlfd();
 Index: vcl/unx/source/gdi/xlfd_smpl.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_smpl.cxx,v
-retrieving revision 1.5
-retrieving revision 1.7
-diff -u -p -u -r1.5 -r1.7
---- vcl/unx/source/gdi/xlfd_smpl.cxx	15 Apr 2003 16:11:23 -0000	1.5
-+++ vcl/unx/source/gdi/xlfd_smpl.cxx	18 May 2004 13:49:24 -0000	1.7
+--- vcl/unx/source/gdi/xlfd_smpl.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_smpl.cxx	2004-09-14 14:09:32.436277912 +0200
 @@ -282,12 +282,12 @@ Xlfd::ToString( ByteString &rString ) co
  	AppendAttribute( mpFactory->RetrieveSetwidth(mnSetwidth), rString );
  	AppendAttribute( mpFactory->RetrieveAddstyle(mnAddstyle), rString );
@@ -9779,12 +9740,8 @@ diff -u -p -u -r1.5 -r1.7
  
 Index: vcl/unx/source/gdi/xprintext.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xprintext.cxx,v
-retrieving revision 1.6
-retrieving revision 1.8
-diff -u -p -u -r1.6 -r1.8
---- vcl/unx/source/gdi/xprintext.cxx	15 Apr 2003 16:11:42 -0000	1.6
-+++ vcl/unx/source/gdi/xprintext.cxx	30 Mar 2004 13:43:56 -0000	1.8
+--- vcl/unx/source/gdi/xprintext.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xprintext.cxx	2004-09-14 14:09:32.437277760 +0200
 @@ -59,8 +59,6 @@
   *
   ************************************************************************/
diff --git a/patches/vclplug/vcl-unx-source-window.diff b/patches/vclplug/vcl-unx-source-window.diff
index f31393e7d..fe0f7a5fa 100644
--- a/patches/vclplug/vcl-unx-source-window.diff
+++ b/patches/vclplug/vcl-unx-source-window.diff
@@ -298,7 +298,7 @@ diff -u -p -u -r1.163.46.5.22.1 -r1.179
              {
                  // set a document position and size
                  // the first frame gets positioned by the window manager
-@@ -526,7 +472,7 @@ void SalFrameData::Init( ULONG nSalFrame
+@@ -472,7 +472,7 @@
          if( IsOverrideRedirect() )
              Attributes.override_redirect = True;
          // default icon
@@ -307,40 +307,44 @@ diff -u -p -u -r1.163.46.5.22.1 -r1.179
                                   Hints.icon_pixmap, Hints.icon_mask ))
          {
              Hints.flags		|= IconPixmapHint;
-@@ -535,28 +481,28 @@ void SalFrameData::Init( ULONG nSalFrame
+@@ -481,19 +481,19 @@
          }
  
- 		Hints.flags			|= WindowGroupHint;
+ 		// find the top level frame of the transience hierarchy
 -        SalFrame* pFrame = pFrame_;
 -        while( pFrame->maFrameData.mpParent )
 -            pFrame = pFrame->maFrameData.mpParent;
--		Hints.window_group	= pFrame->maFrameData.GetShellWindow();
+-		if( (pFrame->maFrameData.nStyle_ & SAL_FRAME_STYLE_CHILD ) )
 +        X11SalFrame* pFrame = this;
 +        while( pFrame->mpParent )
 +            pFrame = pFrame->mpParent;
-+		Hints.window_group	= pFrame->GetShellWindow();
-     }
- 
-     mhWindow = XCreateWindow( GetXDisplay(),
--                               aFrameParent,
--                               x, y,
--                               w, h,
--                               0,
--                               pVis->GetDepth(),
--                               InputOutput,
--                               pVis->GetVisual(),
--                               nAttrMask,
--                               &Attributes );
-+                              aFrameParent,
-+                              x, y,
-+                              w, h,
-+                              0,
-+                              pVis->GetDepth(),
-+                              InputOutput,
-+                              pVis->GetVisual(),
-+                              nAttrMask,
-+                              &Attributes );
-     mhShellWindow = pParentData ? mhShellWindow : mhWindow;
++		if( (pFrame->nStyle_ & SAL_FRAME_STYLE_CHILD ) )
+ 		{
+ 			// if the top level window is a plugin window,
+ 			// then we should place us in the same window group as
+ 			// the parent application (or none if there is no window group
+ 			// hint in the parent).
+-			if( pFrame->maFrameData.GetShellWindow() )
++			if( pFrame->GetShellWindow() )
+ 			{
+ 				XWMHints* pWMHints = XGetWMHints( pDisplay_->GetDisplay(),
+-					pFrame->maFrameData.GetShellWindow() );
++					pFrame->GetShellWindow() );
+ 				if( pWMHints )
+ 				{
+ 					if( (pWMHints->flags & WindowGroupHint) )
+@@ -508,7 +508,7 @@
+ 		else
+ 		{
+ 			Hints.flags			|= WindowGroupHint;
+-			Hints.window_group	= pFrame->maFrameData.GetShellWindow();
++			Hints.window_group	= pFrame->GetShellWindow();
+ 			// note: for a normal document window this will produce None
+ 			// as the window is not yet created and the shell window is
+ 			// initialized to None. This must be corrected after window creation.
+@@ -535,10 +535,10 @@
+ 			Hints.window_group = GetShellWindow();
+ 	}
  
 -    pFrame_->maGeometry.nX		= x;
 -    pFrame_->maGeometry.nY		= y;
diff --git a/patches/vclplug/vcl-util.diff b/patches/vclplug/vcl-util.diff
index 3b7413cd8..e75085f7d 100644
--- a/patches/vclplug/vcl-util.diff
+++ b/patches/vclplug/vcl-util.diff
@@ -129,7 +129,7 @@ Index: vcl/util/makefile.mk
  # --- UNX ----------------------------------------------------------------
  
  .IF "$(GUI)"=="UNX"
-@@ -278,53 +256,126 @@ SHL1STDLIBS += -ldl
+@@ -278,53 +256,128 @@ SHL1STDLIBS += -ldl
  SHL1STDLIBS += -framework Cocoa
  .ENDIF
  
@@ -171,7 +171,9 @@ Index: vcl/util/makefile.mk
 +
 +.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
 +# some nas versions need -lXt, too
-+SHL2STDLIBS += -lXt
++# we do not need it and do not use it because it breaks Essbase Addin to be used with Sun JRE 1.4
++# there is a bug in such JRE, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4638291
++#SHL2STDLIBS += -lXt
 +SHL2STDLIBS += -laudio
 +.IF "$(OS)"=="SOLARIS"
 +# needed by libaudio.a
@@ -243,7 +245,7 @@ Index: vcl/util/makefile.mk
  
 -.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
 -# some nas versions need -lXt, too
--SHL1STDLIBS += -lXt
+-#we must not link with Xt !!! it requires Xm which is not available on all platforms
 -SHL1STDLIBS += -laudio
 -.IF "$(OS)"=="SOLARIS"
 -# needed by libaudio.a
diff --git a/patches/vclplug/xim-fixes.diff b/patches/vclplug/xim-fixes.diff
index 3f29a0502..1e052590e 100644
--- a/patches/vclplug/xim-fixes.diff
+++ b/patches/vclplug/xim-fixes.diff
@@ -31,18 +31,6 @@
  }
  
  LanguageType GtkSalFrame::GetInputLanguage()
-@@ -1641,8 +1661,11 @@
-     {
-         aLastPressEvent.window = NULL;
-         return TRUE;
-     }
- 
-+	if (pThis->m_bWasPreedit)
-+	    pThis->EndExtTextInput(0);
-+
-     GTK_YIELD_GRAB();
- 
- 	vcl::DeletionListener aDel( pThis );
 @@ -1751,6 +1803,9 @@
  		}
      }
diff --git a/patches/vclplug/xim-fixes3.diff b/patches/vclplug/xim-fixes3.diff
new file mode 100644
index 000000000..567bda2e0
--- /dev/null
+++ b/patches/vclplug/xim-fixes3.diff
@@ -0,0 +1,147 @@
+--- vcl/unx/inc/plugins/gtk/gtkframe.hxx
++++ vcl/unx/inc/plugins/gtk/gtkframe.hxx
+@@ -206,6 +206,7 @@
+     void			SetDefaultSize();
+ 	void			setAutoLock( bool bLock );
+ 	void			setScreenSaverTimeout( int nTimeout );
++	void            hardIMReset();
+ 
+     GdkNativeWindow findTopLevelSystemWindow( GdkNativeWindow aWindow );
+ 
+
+--- vcl/unx/gtk/window/gtkframe.cxx
++++ vcl/unx/gtk/window/gtkframe.cxx
+@@ -190,12 +192,44 @@
+     Init( pSysData );
+ }
+ 
++void GtkSalFrame::hardIMReset()
++{
++	if( !m_pIMContext )
++		return;
++
++#if OSL_DEBUG_LEVEL > 1
++	fprintf( stderr, "IMReset - this should flush the IM's pre-edit buffer\n" );
++#endif
++
++	vcl::DeletionListener aDel( this );
++
++	gtk_im_context_reset( m_pIMContext );
++
++	// a correctly implemented _reset method will
++	// emit a 'commit' signal if pending pre-edit
++	// and also, a predit_changed to '' which will
++	// end input.
++
++	// Since few IM's are correctly implemented,
++	// this will end the ext text input at least
++	// from OO.o's perspective if it is still active.
++	if( !aDel.isDeleted() )
++	{
++#if OSL_DEBUG_LEVEL > 1
++		if( m_bWasPreedit )
++			fprintf( stderr, "Error: ** Your IM ('%s') is broken wrt. reset **\n",
++					 g_getenv ("GTK_IM_MODULE") );
++#endif
++		signalIMPreeditEnd( m_pIMContext, this );
++	}
++}
++
+ GtkSalFrame::~GtkSalFrame()
+ {
+ 	getDisplay()->deregisterFrame( this );
+     if( m_pIMContext )
+     {
+-        gtk_im_context_reset( m_pIMContext );
++		hardIMReset();
+         gtk_im_context_set_client_window( m_pIMContext, NULL );
+         g_object_unref( m_pIMContext );
+     }
+@@ -586,7 +620,7 @@
+             if( m_pIMContext )
+             {
+                 gtk_im_context_focus_out( m_pIMContext );
+-                gtk_im_context_reset( m_pIMContext );
++				hardIMReset();
+             }
+         }
+     }
+@@ -998,13 +1034,7 @@
+ }
+ void GtkSalFrame::EndExtTextInput( USHORT nFlags )
+ {
+-#if OSL_DEBUG_LEVEL > 1
+-	fprintf( stderr, "EndExtTextInput: ContextReset\n" );
+-#endif
+-    if( m_pIMContext )
+-        gtk_im_context_reset( m_pIMContext );
+-    m_bWasPreedit = false;
+-	CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
++	hardIMReset();
+ }
+ 
+ void GtkSalFrame::UpdateIMSpotLocation()
+@@ -1515,25 +1561,27 @@
+ 		pThis->m_nKeyModifiers = 0;
+ 		pThis->m_bSingleAltPress = false;
+ 		pThis->m_bSendModChangeOnRelease = false;
+-        pThis->m_bWasPreedit = false;
+ 	}
+ 
+ 	::vcl::DeletionListener aDel( pThis );
+ 
+     if( pThis->m_pIMContext )
+     {
++#if OSL_DEBUG_LEVEL > 1
++		fprintf( stderr, "signalFocus [reset]: %s\n", pEvent->in ? "in" : "out" );
++#endif
+         if( pEvent->in )
+-        {
++		{
++			pThis->hardIMReset();
+             gtk_im_context_focus_in( pThis->m_pIMContext );
+-            gtk_im_context_reset( pThis->m_pIMContext );
+-        }
++		}
+         else
+         {
+-            gtk_im_context_focus_out( pThis->m_pIMContext );
+-            pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
++			pThis->hardIMReset();
+ 			if (! aDel.isDeleted() )
+-	            gtk_im_context_reset( pThis->m_pIMContext );
++				gtk_im_context_focus_out( pThis->m_pIMContext );
+         }
++        pThis->m_bWasPreedit = false;
+     }
+ 
+     // FIXME: find out who the hell steals the focus from our frame
+@@ -1903,7 +1951,6 @@
+        aEvent.mnCharCode		= aTextEvent.maText.GetChar(0);
+        aEvent.mnRepeat			= 0;
+ 
+-       pThis->m_bWasPreedit = false;
+        pThis->CallCallback( SALEVENT_KEYINPUT, &aEvent );
+ 	   if (!aDel.isDeleted())
+        pThis->CallCallback( SALEVENT_KEYUP, &aEvent );
+@@ -2024,10 +2069,17 @@
+ {
+     GtkSalFrame* pThis = (GtkSalFrame*)frame;
+ #if OSL_DEBUG_LEVEL > 1
+-	fprintf( stderr, "*** :signalImPreeditEnd ***\n" );
++	fprintf( stderr, "*** :signalImPreeditEnd *** '%s'\n", pThis->m_bWasPreedit ? "commit" : "nop" );
++#endif
++	if( pThis->m_bWasPreedit )
++	{
++		pThis->m_bWasPreedit = false;
++		pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
++	}
++#if OSL_DEBUG_LEVEL > 1
++	else
++		fprintf (stderr, "Avoid double commit\n");
+ #endif
+-	pThis->m_bWasPreedit = false;
+-	pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
+ }
+ 
+ gboolean GtkSalFrame::signalIMRetrieveSurrounding( GtkIMContext* pContext, gpointer frame )
diff --git a/src/openabout_mandrakelinux.bmp b/src/openabout_mandrakelinux.bmp
new file mode 100644
index 000000000..a936b8982
--- /dev/null
+++ b/src/openabout_mandrakelinux.bmp
author	nobody <nobody@gnome.org>	2005-01-27 10:23:36 +0000
committer	nobody <nobody@gnome.org>	2005-01-27 10:23:36 +0000
commit	f4e8f357409a669db8b9151b4f333409d0f62260 (patch)
tree	32ac0c14c98a8f3994a10d8067a799829cd438c3
parent	4bfa94e9488518b5b5da6e54fef6522c91dce1f1 (diff)