This commit was manufactured by cvs2svn to create tagALPHA_REWORK2

'ALPHA_REWORK2'.
author: nobody <nobody@gnome.org> 2003-09-15 09:23:11 +0000
committer: nobody <nobody@gnome.org> 2003-09-15 09:23:11 +0000
commit: 4ec6abc7b28a432ad985db718f66269bba43e215 (patch)
tree: eb5f4806d0ac4d9ba2c88d5a67d1c0770fb21787
parent: 5962b9ace11fbb6e3800e99c18bb762d5aa8eaf4 (diff)
75 files changed, 0 insertions, 10114 deletions
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 9896d608d..000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-Federico Mena <federico@ximian.com>
-Michael Meeks <michael@ximian.com>
-
-=== Artists ===
-
-Tigert <tigert@ximian.com>
-Jimmac <jimmac@ximian.com>
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index c08b208ee..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS = po desktop bin etc patches man doc www
-
-EXTRA_DIST = config.rpath	\
-	emacs.el		\
-	mkinstalldirs		\
-	MAINTAINERS		\
-	HACKING			\
-	download		\
-	intltool-merge.in	\
-	intltool-update.in	\
-	intltool-extract.in
-
-ACLOCAL_AMFLAGS = -I m4
diff --git a/NEWS b/NEWS
deleted file mode 100644
index b160eb84d..000000000
--- a/NEWS
+++ /dev/null
@@ -1,130 +0,0 @@
-ooo-build-1.1.40
-
-	+ features
-		+ switch to the RC4 tree (Michael)
-		+ more icons / better coverage (Jimmac)
-	+ bug fixes
-		+ LD_LIBRARY_PATH installer issue (Anders)
-		+ correct palette pop-down (Michael, Philipp L)
-		+ sensible coluor palette sizing (Michael)
-		+ system font sync fix (Michael)
-		+ updated magicpoint users help (Michael)
-		+ web fixes (Julian Seward)
-	+ translations (last few releases)
-		+ da (Kenneth Christiansen)
-		+ sr (Danilo Segan)
-		+ fr (Christophe Merlet)
-		+ ca (Jordi Mallach)
-		+ vi,wa (Pablo Saratxaga)
-		+ pl (Artur Flinta)
-		+ nl (Vincent van Adrighem)
-		+ cs (Miloslav Trmac)
-		+ pt (Duarte Loreto)
-
-ooo-build-1.1.39
-
-	+ features
-		+ switch to the RC3 tree (Michael)
-	+ bug fixes
-		+ font munging fixes (Michael)
-		+ wrapper cleans (Michael)
-		+ improved patching fuzziness (Michael)
-		+ more word count translations (Martin)
-		+ crashdump build fixes (Michael)
-		+ bin MS format default duplication (Michael)
-
-ooo-build-1.1.38
-	+ bug fixes
-		+ vicious bindings crasher (Michael)
-		+ export 'no color' bg to .doc (Chris)
-		+ source EOF massage (Chris)
-		+ build fixes (Michael, Martin)
-	+ features
-		+ elisp for OO.o source (Martin)
-	+ pending
-		+ improved gtk+ integration
-		+ layout prototype
-
-ooo-build-1.1.37
-	+ bug fixes
-		+ metric font mappings for XD2 fonts (Michael)
-		+ ccache fixes (Anders Carlsson)
-		+ word count fixes (Martin Kretzschmar)
-		+ crashdump strangeness (Michael)
-		+ misc. build fixes (Michael, Chris, Martin)
-	+ features
-		+ save 1.5Gb in lang-pack (Chris, Michael)
-		+ toolbox (Martin)
-			+ pretty zoom combo
-			+ death of URL combo
-		+ translated .desktop files (Carlos Perelló Marín)
-			+ de (Christian neumair)
-			+ da (Ole Laursen)
-			+ zh (Abel Cheung)
-			+ de (Martin)
-			+ no (Kjartan Maraas)
-			+ sv (Christian Rose)
-			+ sq (Laurent Dhima)
-			+ es (Carlos)
-		+ Man pages (Rene Engelhard)
-		+ beep far less (Michael)
-		+ build bits
-			+ conditionals/paths (Michael)
-			+ much improved patching (Chris)
-			+ --with-system-gcc (Michael)
-			+ disable broken moz bits (Michael)
-			+ linkoo improvements (Martin)
-			+ Gnome/gtk+ build fixage (Rene)
-			+ build less of gcc (Nick Hudson)
-		+ Debian patches merged (Chris, Rene, Martin)
-			+ config switch expansion, bin lzwc
-			+ drop rpaths, sal_debug, stlport dynlink
-			+ html fix, system python/aclocal
-		+ shrink perl wrapper (Michael)
-			+ obey LANG env.
-			+ obey 'COMPATIBLE' for MS export.
-		+ html export (Michael)
-			+ nicer icons (Jimmac)
-			+ export .png not .gif
-	+ pending (Michael)
-		+ glib/gtk+ loop integration
-		+ some layout bits.
-
-ooo-build-1.1.35
-	+ bug fixes
-		+ fix wrapper symlinkage / Makefile cruft.
-		+ default prefix to /usr
-	+ featurelets
-		+ oolink support for connectivity libraries
-
-ooo-build-1.1.34
-	+ bug fixes
-		+ fix configuration patches (system fonts etc.)
-		+ icon composite fixes
-		+ register Gnome VFS UCP properly
-		+ linkoo checks for abs. path (Martin Kretzschmar)
-		+ bin bogus .desktop user install
-		+ fix ~/Documents as default save loc.
-		+ print/error dialog fix
-		+ delete/backspace switch in calc.
-
-	+ features
-		+ Tools->Word Count in menus
-		+ cleanup unzip code (Martin, Michael)
-		+ add web/math/template icons (Martin / Jimmac)
-		+ build / user guide updates
-		+ more build cleans
-		+ menu / check rendering forward-port
-
-ooo-build-1.1.33
-	+ scale czech,portbr,slovak icons (Martin Kretzschmar)
-	+ switch to RC3_030729 snapshot.
-	+ add configure --enable-devel to specify target
-	+ misc. build fixes / cleans
-
-ooo-build-1.1.31
-	+ add --with-src for package builds
-
-ooo-build-1.1.30
-	+ import into gnome CVS.
-	+ re-hash build / re-arrange
diff --git a/README b/README
deleted file mode 100644
index 7451da325..000000000
--- a/README
+++ /dev/null
@@ -1,27 +0,0 @@
-OpenOffice.org build:
-
-	This package contains the Gnome integration work for
-OpenOffice.org, and a much simplified build wrapper, making an OO.o
-build / install is possible for the common man.[1]
-
-	The latest version of this module can be obtained from
-anonymous CVS with these commands:
-
-	export CVSROOT=':pserver:anonymous@anoncvs.gnome.org:/cvs/gnome'
-	cvs login # no password
-	cvs checkout openoffice
-
-	Packaged releases can be found from:
-
-		http://ooo.ximian.com/packages
-
-	More documentation is in the www/ directory the latest version
-of which is available at http://ooo.ximian.com/
-
-	Finally, you can subscribe to the development mailing list at
-http://lists.ximian.com/mailman/listinfo/openoffice.
-
-	Happy hacking.
-
-[1] - assuming the common man has 4Gb+ of spare space, and lots of
-      idle CPU time.
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 7f298fed2..000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-aclocal
-automake --gnu --add-missing
-# intltoolize --copy --force --automake
-autoconf
-./configure $@
diff --git a/intltool-merge.in b/intltool-merge.in
deleted file mode 100755
index f1d53b114..000000000
--- a/intltool-merge.in
+++ /dev/null
@@ -1,908 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-
-#
-#  The Intltool Message Merger
-#
-#  Copyright (C) 2000, 2002 Free Software Foundation.
-#  Copyright (C) 2000, 2001 Eazel, Inc
-#
-#  Intltool is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License 
-#  version 2 published by the Free Software Foundation.
-#
-#  Intltool is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  As a special exception to the GNU General Public License, if you
-#  distribute this file as part of a program that contains a
-#  configuration script generated by Autoconf, you may include it under
-#  the same distribution terms that you use for the rest of that program.
-#
-#  Authors:  Maciej Stachowiak <mjs@noisehavoc.org>
-#            Kenneth Christiansen <kenneth@gnu.org>
-#            Darin Adler <darin@bentspoon.com>
-#
-#  Proper XML UTF-8'ification written by Cyrille Chepelov <chepelov@calixo.net>
-#
-
-## Release information
-my $PROGRAM = "intltool-merge";
-my $PACKAGE = "intltool";
-my $VERSION = "0.25";
-
-## Loaded modules
-use strict; 
-use Getopt::Long;
-use Text::Wrap;
-
-## Scalars used by the option stuff
-my $HELP_ARG = 0;
-my $VERSION_ARG = 0;
-my $BA_STYLE_ARG = 0;
-my $XML_STYLE_ARG = 0;
-my $KEYS_STYLE_ARG = 0;
-my $DESKTOP_STYLE_ARG = 0;
-my $SCHEMAS_STYLE_ARG = 0;
-my $RFC822DEB_STYLE_ARG = 0;
-my $QUIET_ARG = 0;
-my $PASS_THROUGH_ARG = 0;
-my $UTF8_ARG = 0;
-my $cache_file;
-
-## Handle options
-GetOptions 
-(
- "help" => \$HELP_ARG,
- "version" => \$VERSION_ARG,
- "quiet|q" => \$QUIET_ARG,
- "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility
- "ba-style|b" => \$BA_STYLE_ARG,
- "xml-style|x" => \$XML_STYLE_ARG,
- "keys-style|k" => \$KEYS_STYLE_ARG,
- "desktop-style|d" => \$DESKTOP_STYLE_ARG,
- "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
- "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
- "pass-through|p" => \$PASS_THROUGH_ARG,
- "utf8|u" => \$UTF8_ARG,
- "cache|c=s" => \$cache_file
- ) or &error;
-
-my $PO_DIR;
-my $FILE;
-my $OUTFILE;
-
-my %po_files_by_lang = ();
-my %translations = ();
-
-# Use this instead of \w for XML files to handle more possible characters.
-my $w = "[-A-Za-z0-9._:]";
-
-# XML quoted string contents
-my $q = "[^\\\"]*";
-
-## Check for options. 
-
-if ($VERSION_ARG) 
-{
-	&print_version;
-} 
-elsif ($HELP_ARG) 
-{
-	&print_help;
-} 
-elsif ($BA_STYLE_ARG && @ARGV > 2) 
-{
-	&preparation;
-	&print_message;
-	&ba_merge_translations;
-	&finalize;
-} 
-elsif ($XML_STYLE_ARG && @ARGV > 2) 
-{
-        &utf8_sanity_check;
-	&preparation;
-	&print_message;
-	&xml_merge_translations;
-	&finalize;
-} 
-elsif ($KEYS_STYLE_ARG && @ARGV > 2) 
-{
-        &utf8_sanity_check;
-        &preparation;
-        &print_message;
-        &keys_merge_translations;
-	&finalize;
-} 
-elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) 
-{
-        &preparation;
-        &print_message;
-        &desktop_merge_translations;
-	&finalize;
-} 
-elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) 
-{
-        &preparation;
-        &print_message;
-        &schemas_merge_translations;
-	&finalize;
-} 
-elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) 
-{
-        &preparation;
-        &print_message;
-        &rfc822deb_merge_translations;
-	&finalize;
-} 
-else 
-{
-	&print_help;
-}
-
-exit;
-
-## Sub for printing release information
-sub print_version
-{
-    print "${PROGRAM} (${PACKAGE}) ${VERSION}\n";
-    print "Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.\n\n";
-    print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n";
-    print "Copyright (C) 2000-2001 Eazel, Inc.\n";
-    print "This is free software; see the source for copying conditions.  There is NO\n";
-    print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-    exit;
-}
-
-## Sub for printing usage information
-sub print_help
-{
-    print "Usage: ${PROGRAM} [OPTIONS] PO_DIRECTORY FILENAME OUTPUT_FILE\n";
-    print "Generates an output file that includes translated versions of some attributes,\n";
-    print "from an untranslated source and a po directory that includes translations.\n\n";
-    print "  -b, --ba-style         includes translations in the bonobo-activation style\n";
-    print "  -d, --desktop-style    includes translations in the desktop style\n";
-    print "  -k, --keys-style       includes translations in the keys style\n";
-    print "  -s, --schemas-style    includes translations in the schemas style\n";
-    print "  -r, --rfc822deb-style  includes translations in the RFC822 style\n";
-    print "  -x, --xml-style        includes translations in the standard xml style\n";
-    print "  -u, --utf8             convert all strings to UTF-8 before merging\n";
-    print "  -p, --pass-through     use strings as found in .po files, without\n";
-    print "                         conversion (STRONGLY unrecommended with -x)\n";
-    print "  -q, --quiet            suppress most messages\n";
-    print "      --help             display this help and exit\n";
-    print "      --version          output version information and exit\n";
-    print "\nReport bugs to bugzilla.gnome.org, module intltool, or contact us through \n";
-    print "<xml-i18n-tools-list\@gnome.org>.\n";
-    exit;
-}
-
-
-## Sub for printing error messages
-sub print_error
-{
-    print "Try `${PROGRAM} --help' for more information.\n";
-    exit;
-}
-
-
-sub print_message 
-{
-    print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG;
-}
-
-
-sub preparation 
-{
-    $PO_DIR = $ARGV[0];
-    $FILE = $ARGV[1];
-    $OUTFILE = $ARGV[2];
-
-    &gather_po_files;
-    &get_translation_database;
-}
-
-# General-purpose code for looking up translations in .po files
-
-sub po_file2lang
-{
-    my ($tmp) = @_; 
-    $tmp =~ s/^.*\/(.*)\.po$/$1/; 
-    return $tmp; 
-}
-
-sub gather_po_files
-{
-    for my $po_file (glob "$PO_DIR/*.po") {
-	$po_files_by_lang{po_file2lang($po_file)} = $po_file;
-    }
-}
-
-sub get_local_charset
-{
-    my ($encoding) = @_;
-    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
-
-    # seek character encoding aliases in charset.alias (glib)
-
-    if (open CHARSET_ALIAS, $alias_file) 
-    {
-	while (<CHARSET_ALIAS>) 
-        {
-            next if /^\#/;
-            return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i)
-        }
-
-        close CHARSET_ALIAS;
-    }
-
-    # if not found, return input string
-
-    return $encoding;
-}
-
-sub get_po_encoding
-{
-    my ($in_po_file) = @_;
-    my $encoding = "";
-
-    open IN_PO_FILE, $in_po_file or die;
-    while (<IN_PO_FILE>) 
-    {
-        ## example: "Content-Type: text/plain; charset=ISO-8859-1\n"
-        if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) 
-        {
-            $encoding = $1; 
-            last;
-        }
-    }
-    close IN_PO_FILE;
-
-    if (!$encoding) 
-    {
-        print "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n";
-        $encoding = "ISO-8859-1";
-    }
-
-    $encoding = get_local_charset($encoding);
-
-    return $encoding
-}
-
-sub utf8_sanity_check 
-{
-    if (!$UTF8_ARG) 
-    {
-        if (!$PASS_THROUGH_ARG) 
-        {
-            $PASS_THROUGH_ARG="1";
-        }
-    }
-}
-
-sub get_translation_database
-{
-    if ($cache_file) {
-	&get_cached_translation_database;
-    } else {
-        &create_translation_database;
-    }
-}
-
-sub get_newest_po_age
-{
-    my $newest_age;
-
-    foreach my $file (values %po_files_by_lang) 
-    {
-	my $file_age = -M $file;
-	$newest_age = $file_age if !$newest_age || $file_age < $newest_age;
-    }
-
-    return $newest_age;
-}
-
-sub create_cache
-{
-    print "Generating and caching the translation database\n" unless $QUIET_ARG;
-
-    &create_translation_database;
-
-    open CACHE, ">$cache_file" || die;
-    print CACHE join "\x01", %translations;
-    close CACHE;
-}
-
-sub load_cache 
-{
-    print "Found cached translation database\n" unless $QUIET_ARG;
-
-    my $contents;
-    open CACHE, "<$cache_file" || die;
-    {
-        local $/;
-        $contents = <CACHE>;
-    }
-    close CACHE;
-    %translations = split "\x01", $contents;
-}
-
-sub get_cached_translation_database
-{
-    my $cache_file_age = -M $cache_file;
-    if (defined $cache_file_age) 
-    {
-        if ($cache_file_age <= &get_newest_po_age) 
-        {
-            &load_cache;
-            return;
-        }
-        print "Found too-old cached translation database\n" unless $QUIET_ARG;
-    }
-
-    &create_cache;
-}
-
-sub create_translation_database
-{
-    for my $lang (keys %po_files_by_lang) 
-    {
-    	my $po_file = $po_files_by_lang{$lang};
-
-        if ($UTF8_ARG) 
-        {
-            my $encoding = get_po_encoding ($po_file);
-
-            if (lc $encoding eq "utf-8") 
-            {
-                open PO_FILE, "<$po_file";	
-            } 
-            else 
-            {
-                my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv";
-                open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";	
-            }
-        } 
-        else 
-        {
-            open PO_FILE, "<$po_file";	
-        }
-
-	my $nextfuzzy = 0;
-	my $inmsgid = 0;
-	my $inmsgstr = 0;
-	my $msgid = "";
-	my $msgstr = "";
-
-        while (<PO_FILE>) 
-        {
-	    $nextfuzzy = 1 if /^#, fuzzy/;
-       
-	    if (/^msgid "((\\.|[^\\])*)"/ ) 
-            {
-		$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
-		$msgid = "";
-		$msgstr = "";
-
-		if ($nextfuzzy) {
-		    $inmsgid = 0;
-		} else {
-		    $msgid = unescape_po_string($1);
-		    $inmsgid = 1;
-		}
-		$inmsgstr = 0;
-		$nextfuzzy = 0;
-	    }
-
-	    if (/^msgstr "((\\.|[^\\])*)"/) 
-            {
-	        $msgstr = unescape_po_string($1);
-		$inmsgstr = 1;
-		$inmsgid = 0;
-	    }
-
-	    if (/^"((\\.|[^\\])*)"/) 
-            {
-	        $msgid .= unescape_po_string($1) if $inmsgid;
-	        $msgstr .= unescape_po_string($1) if $inmsgstr;
-	    }
-	}
-	$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
-    }
-}
-
-sub finalize
-{
-}
-
-sub unescape_one_sequence
-{
-    my ($sequence) = @_;
-
-    return "\\" if $sequence eq "\\\\";
-    return "\"" if $sequence eq "\\\"";
-    return "\n" if $sequence eq "\\n";
-
-    # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal),
-    # \xXX (hex) and has a comment saying they want to handle \u and \U.
-
-    return $sequence;
-}
-
-sub unescape_po_string
-{
-    my ($string) = @_;
-
-    $string =~ s/(\\.)/unescape_one_sequence($1)/eg;
-
-    return $string;
-}
-
-## NOTE: deal with < - &lt; but not > - &gt;  because it seems its ok to have 
-## > in the entity. For further info please look at #84738.
-sub entity_decode
-{
-    local ($_) = @_;
-
-    s/&apos;/'/g; # '
-    s/&quot;/"/g; # "
-    s/&amp;/&/g;
-    s/&lt;/</g;
-
-    return $_;
-}
-
-sub entity_encode
-{
-    my ($pre_encoded) = @_;
-
-    my @list_of_chars = unpack ('C*', $pre_encoded);
-
-    if ($PASS_THROUGH_ARG) 
-    {
-        return join ('', map (&entity_encode_int_even_high_bit, @list_of_chars));
-    } 
-    else 
-    {
-        return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
-    }
-}
-
-sub entity_encode_int_minimalist
-{
-    return "&quot;" if $_ == 34;
-    return "&amp;" if $_ == 38;
-    return "&apos;" if $_ == 39;
-    return "&lt;" if $_ == 60;
-    return chr $_;
-}
-
-sub entity_encode_int_even_high_bit
-{
-    if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60) 
-    {
-        # the ($_ > 127) should probably be removed
-	return "&#" . $_ . ";"; 
-    } 
-    else 
-    {
-	return chr $_;
-    }
-}
-
-sub entity_encoded_translation
-{
-    my ($lang, $string) = @_;
-
-    my $translation = $translations{$lang, $string};
-    return $string if !$translation;
-    return entity_encode ($translation);
-}
-
-## XML (bonobo-activation specific) merge code
-
-sub ba_merge_translations
-{
-    my $source;
-
-    {
-       local $/; # slurp mode
-       open INPUT, "<$FILE" or die "can't open $FILE: $!";
-       $source = <INPUT>;
-       close INPUT;
-    }
-
-    open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!";
-
-    while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) 
-    {
-        print OUTPUT $1;
-
-        my $node = $2 . "\n";
-
-        my @strings = ();
-        $_ = $node;
-	while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) {
-             push @strings, entity_decode($3);
-        }
-	print OUTPUT;
-
-	my %langs;
-	for my $string (@strings) 
-        {
-	    for my $lang (keys %po_files_by_lang) 
-            {
-                $langs{$lang} = 1 if $translations{$lang, $string};
-	    }
-	}
-	
-	for my $lang (sort keys %langs) 
-        {
-	    $_ = $node;
-	    s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s;
-	    s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg;
-	    print OUTPUT;
-        }
-    }
-
-    print OUTPUT $source;
-
-    close OUTPUT;
-}
-
-
-## XML (non-bonobo-activation) merge code
-
-sub xml_merge_translations
-{
-    my $source;
-
-    {
-       local $/; # slurp mode
-       open INPUT, "<$FILE" or die "can't open $FILE: $!";
-       $source = <INPUT>;
-       close INPUT;
-    }
-
-    open OUTPUT, ">$OUTFILE" or die;
-
-    # FIXME: support attribute translations
-
-    # Empty nodes never need translation, so unmark all of them.
-    # For example, <_foo/> is just replaced by <foo/>.
-    $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-
-    # Support for <_foo>blah</_foo> style translations.
-    while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s) 
-    {
-        print OUTPUT $1;
-
-        my $spaces = $2;
-        my $tag = $3;
-        my $string = $4;
-
-	print OUTPUT "$spaces<$tag>$string</$tag>\n";
-
-	$string =~ s/\s+/ /g;
-	$string =~ s/^ //;
-	$string =~ s/ $//;
-	$string = entity_decode($string);
-
-	for my $lang (sort keys %po_files_by_lang) 
-        {
-	    my $translation = $translations{$lang, $string};
-	    next if !$translation;
-	    $translation = entity_encode($translation);
-	    print OUTPUT "$spaces<$tag xml:lang=\"$lang\">$translation</$tag>\n";
-        }
-    }
-
-    print OUTPUT $source;
-
-    close OUTPUT;
-}
-
-sub keys_merge_translations
-{
-    open INPUT, "<${FILE}" or die;
-    open OUTPUT, ">${OUTFILE}" or die;
-
-    while (<INPUT>) 
-    {
-        if (s/^(\s*)_(\w+=(.*))/$1$2/)  
-        {
-	    my $string = $3;
-
-            print OUTPUT;
-
-	    my $non_translated_line = $_;
-
-            for my $lang (sort keys %po_files_by_lang) 
-            {
-		my $translation = $translations{$lang, $string};
-                next if !$translation;
-
-                $_ = $non_translated_line;
-		s/(\w+)=.*/[$lang]$1=$translation/;
-                print OUTPUT;
-            }
-	} 
-        else 
-        {
-            print OUTPUT;
-        }
-    }
-
-    close OUTPUT;
-    close INPUT;
-}
-
-sub desktop_merge_translations
-{
-    open INPUT, "<${FILE}" or die;
-    open OUTPUT, ">${OUTFILE}" or die;
-
-    while (<INPUT>) 
-    {
-        if (s/^(\s*)_(\w+=(.*))/$1$2/)  
-        {
-	    my $string = $3;
-
-            print OUTPUT;
-
-	    my $non_translated_line = $_;
-
-            for my $lang (sort keys %po_files_by_lang) 
-            {
-                my $translation = $translations{$lang, $string};
-                next if !$translation;
-
-                $_ = $non_translated_line;
-                s/(\w+)=.*/${1}[$lang]=$translation/;
-                print OUTPUT;
-            }
-	} 
-        else 
-        {
-            print OUTPUT;
-        }
-    }
-
-    close OUTPUT;
-    close INPUT;
-}
-
-sub schemas_merge_translations
-{
-    my $source;
-
-    {
-       local $/; # slurp mode
-       open INPUT, "<$FILE" or die "can't open $FILE: $!";
-       $source = <INPUT>;
-       close INPUT;
-    }
-
-    open OUTPUT, ">$OUTFILE" or die;
-
-    # FIXME: support attribute translations
-
-    # Empty nodes never need translation, so unmark all of them.
-    # For example, <_foo/> is just replaced by <foo/>.
-    $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-
-    while ($source =~ s/
-                        (.*?)
-                        (\s+)(<locale\ name="C">(\s*)
-                            (<default>\s*(.*?)\s*<\/default>)?(\s*)
-                            (<short>\s*(.*?)\s*<\/short>)?(\s*)
-                            (<long>\s*(.*?)\s*<\/long>)?(\s*)
-                        <\/locale>)
-                       //sx) 
-    {
-        print OUTPUT $1;
-
-	my $locale_start_spaces = $2 ? $2 : '';
-	my $default_spaces = $4 ? $4 : '';
-	my $short_spaces = $7 ? $7 : '';
-	my $long_spaces = $10 ? $10 : '';
-	my $locale_end_spaces = $13 ? $13 : '';
-	my $c_default_block = $3 ? $3 : '';
-	my $default_string = $6 ? $6 : '';
-	my $short_string = $9 ? $9 : '';
-	my $long_string = $12 ? $12 : '';
-
-	$c_default_block =~ s/default>\[.*?\]/default>/s;
-        
-	print OUTPUT "$locale_start_spaces$c_default_block";
-
-        $default_string =~ s/\s+/ /g;
-        $default_string = entity_decode($default_string);
-	$short_string =~ s/\s+/ /g;
-	$short_string = entity_decode($short_string);
-	$long_string =~ s/\s+/ /g;
-	$long_string = entity_decode($long_string);
-
-	for my $lang (sort keys %po_files_by_lang) 
-        {
-	    my $default_translation = $translations{$lang, $default_string};
-	    my $short_translation = $translations{$lang, $short_string};
-	    my $long_translation  = $translations{$lang, $long_string};
-
-	    next if (!$default_translation && !$short_translation && 
-                     !$long_translation);
-
-	    print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
-
-        print OUTPUT "$default_spaces";    
-
-        if ($default_translation)
-        {
-            $default_translation = entity_encode($default_translation);
-            print OUTPUT "<default>$default_translation</default>";
-        }
-
-	    print OUTPUT "$short_spaces";
-
-	    if ($short_translation)
-	    {
-			$short_translation = entity_encode($short_translation);
-			print OUTPUT "<short>$short_translation</short>";
-	    }
-
-	    print OUTPUT "$long_spaces";
-
-	    if ($long_translation)
-	    {
-			$long_translation = entity_encode($long_translation);
-			print OUTPUT "<long>$long_translation</long>";
-	    }	    
-
-	    print OUTPUT "$locale_end_spaces</locale>";
-        }
-    }
-
-    print OUTPUT $source;
-
-    close OUTPUT;
-}
-
-sub rfc822deb_merge_translations
-{
-    my $source;
-
-    $Text::Wrap::huge = 'overflow';
-
-    {
-       local $/; # slurp mode
-       open INPUT, "<$FILE" or die "can't open $FILE: $!";
-       $source = <INPUT>;
-       close INPUT;
-    }
-
-    open OUTPUT, ">${OUTFILE}" or die;
-
-    while ($source =~ /(^|\n+)(_)?([^:_\n]+)(:\s*)(.*?)(?=\n[\S\n]|$)/sg) 
-    {
-	    my $sep = $1;
-	    my $non_translated_line = $3.$4;
-	    my $string = $5;
-	    my $is_translatable = defined($2);
-	    #  Remove [] dummy strings
-	    $string =~ s/\[\s[^\[\]]*\]$//;
-            $non_translated_line .= $string;
-
-            print OUTPUT $sep.$non_translated_line;
-    
-            if ($is_translatable) 
-            {
-                my @str_list = rfc822deb_split($string);
-           
-	        for my $lang (sort keys %po_files_by_lang) 
-                {
-                    my $is_translated = 1;
-                    my $str_translated = '';
-                    my $first = 1;
-                
-                    for my $str (@str_list) 
-                    {
-                        my $translation = $translations{$lang, $str};
-                    
-                        if (!$translation) 
-                        {
-                            $is_translated = 0;
-                            last;
-                        }
-
-	                #  $translation may also contain [] dummy
-                        #  strings, mostly to indicate an empty string
-	                $translation =~ s/\[\s[^\[\]]*\]$//;
-                        
-                        if ($first) 
-                        {
-                            $str_translated .=
-                                Text::Tabs::expand($translation) .
-                                "\n";
-                        } 
-                        else 
-                        {
-                            $str_translated .= Text::Tabs::expand(
-                                Text::Wrap::wrap(' ', ' ', $translation)) .
-                                "\n .\n";
-                        }
-                        $first = 0;
-
-                        #  To fix some problems with Text::Wrap::wrap
-                        $str_translated =~ s/(\n )+\n/\n .\n/g;
-                    }
-                    next unless $is_translated;
-
-                    $str_translated =~ s/\n \.\n$//;
-                    $str_translated =~ s/\s+$//;
-
-                    $_ = $non_translated_line;
-                    s/^(\w+):\s*.*/$sep${1}-$lang: $str_translated/s;
-                    print OUTPUT;
-                }
-            }
-    }
-    print OUTPUT "\n";
-
-    close OUTPUT;
-    close INPUT;
-}
-
-sub rfc822deb_split 
-{
-    # Debian defines a special way to deal with rfc822-style files:
-    # when a value contain newlines, it consists of
-    #   1.  a short form (first line)
-    #   2.  a long description, all lines begin with a space,
-    #       and paragraphs are separated by a single dot on a line
-    # This routine returns an array of all paragraphs, and reformat
-    # them.
-    my $text = shift;
-    $text =~ s/^ //mg;
-    return ($text) if $text !~ /\n/;
-
-    $text =~ s/([^\n]*)\n//;
-    my @list = ($1);
-    my $str = '';
-
-    for my $line (split (/\n/, $text)) 
-    {
-        chomp $line;
-        $line =~ /\s+$/;
-    
-        if ($line =~ /^\.$/) 
-        {
-            #  New paragraph
-            $str =~ s/\s*$//;
-            push(@list, $str);
-            $str = '';
-        } 
-        elsif ($line =~ /^\s/) 
-        {
-            #  Line which must not be reformatted
-            $str .= "\n" if length ($str) && $str !~ /\n$/;
-            $str .= $line."\n";
-        } 
-        else 
-        {
-            #  Continuation line, remove newline
-            $str .= " " if length ($str) && $str !~ /[\n ]$/;
-            $str .= $line;
-        }
-    }
-
-    $str =~ s/\s*$//;
-    push(@list, $str) if length ($str);
-
-    return @list;
-}
-
diff --git a/intltool-update.in b/intltool-update.in
deleted file mode 100755
index 2004a5985..000000000
--- a/intltool-update.in
+++ /dev/null
@@ -1,642 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-
-#
-#  The Intltool Message Updater
-#
-#  Copyright (C) 2000-2002 Free Software Foundation.
-#
-#  Intltool is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License 
-#  version 2 published by the Free Software Foundation.
-#
-#  Intltool is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  As a special exception to the GNU General Public License, if you
-#  distribute this file as part of a program that contains a
-#  configuration script generated by Autoconf, you may include it under
-#  the same distribution terms that you use for the rest of that program.
-#
-#  Authors: Kenneth Christiansen <kenneth@gnu.org>
-#           Maciej Stachowiak
-#           Darin Adler <darin@bentspoon.com>
-
-## Release information
-my $PROGRAM = "intltool-update";
-my $VERSION = "0.25";
-my $PACKAGE = "intltool";
-
-## Loaded modules
-use strict;
-use Getopt::Long;
-use Cwd;
-use File::Copy;
-use File::Find;
-
-## Scalars used by the option stuff
-my $HELP_ARG 	   = 0;
-my $VERSION_ARG    = 0;
-my $DIST_ARG	   = 0;
-my $POT_ARG	   = 0;
-my $HEADERS_ARG    = 0;
-my $MAINTAIN_ARG   = 0;
-my $REPORT_ARG     = 0;
-my $VERBOSE	   = 0;
-my $GETTEXT_PACKAGE = "";
-
-my @languages;
-my %po_files_by_lang = ();
-
-# Regular expressions to categorize file types.
-# FIXME: Please check if the following is correct
-
-my $xml_extension =
-"xml(\.in)*|".		# .in is not required
-"ui|".
-"glade2?(\.in)*|".	# .in is not required
-"scm(\.in)*|".		# .in is not required
-"oaf(\.in)+|".
-"etspec|".
-"sheet(\.in)+|".
-"schemas(\.in)+|".
-"pong(\.in)+";
-
-my $ini_extension =
-"desktop(\.in)+|".
-"caves(\.in)+|". 
-"directory(\.in)+|".
-"soundlist(\.in)+|".
-"keys(\.in)+|".
-"theme(\.in)+|".
-"server(\.in)+";
-
-## Always print as the first thing
-$| = 1;
-
-## Handle options
-GetOptions 
-(
- "help" 	       => \$HELP_ARG,
- "version" 	       => \$VERSION_ARG,
- "dist|d"	       => \$DIST_ARG,
- "pot|p"	       => \$POT_ARG,
- "headers|s"	       => \$HEADERS_ARG,
- "maintain|m"	       => \$MAINTAIN_ARG,
- "report|r"	       => \$REPORT_ARG,
- "verbose|x"	       => \$VERBOSE,
- "gettext-package|g=s" => \$GETTEXT_PACKAGE,
- ) or &print_error_invalid_option;
-
-&print_help if $HELP_ARG;
-&print_version if $VERSION_ARG;
-
-my $arg_count = ($DIST_ARG > 0)
-    + ($POT_ARG > 0)
-    + ($HEADERS_ARG > 0)
-    + ($MAINTAIN_ARG > 0)
-    + ($REPORT_ARG > 0);
-&print_help if $arg_count > 1;
-
-# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &find_package_name;
-
-if ($DIST_ARG) {
-    if ($ARGV[0] =~ /^[a-z]/){
-        &update_po_file ($ARGV[0]);
-        &print_status ($ARGV[0]);
-    } else {
-        &print_help;
-    }
-} elsif ($POT_ARG) {
-    &generate_headers;
-    &generate_po_template;
-} elsif ($HEADERS_ARG) {
-    &generate_headers;
-} elsif ($MAINTAIN_ARG) {
-    &find_leftout_files;
-} elsif ($REPORT_ARG) {
-    &print_report;
-} else {
-    if ($ARGV[0] =~ /^[a-z]/) {
-        &main ($ARGV[0]);
-    } else {
-        &print_help;
-    }
-}
-
-exit;
-
-#########
-
-sub print_version
-{
-    ## Print version information
-    print "${PROGRAM} (${PACKAGE}) $VERSION\n";
-    print "Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.\n\n";
-    print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n";
-    print "This is free software; see the source for copying conditions.  There is NO\n";
-    print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-    exit;
-}
-
-sub print_help
-{
-    ## Print usage information
-    print "Usage: ${PROGRAM} [OPTIONS] ...LANGCODE\n";
-    print "Updates PO template files and merge them with the translations.\n\n";
-    print "  -p, --pot              generate the PO template only\n";
-    print "  -s, --headers          generate the header files in POTFILES.in\n";
-    print "  -m, --maintain         search for left out files from POTFILES.in\n";
-    print "  -r, --report           display a status report for the module.\n";
-    print "  -x, --verbose          display lots of feedback\n";
-    print "      --help             display this help and exit\n";
-    print "      --version          output version information and exit\n";
-    print "\nExamples of use:\n";
-    print "${PROGRAM} --pot    just creates a new PO template from the source\n";
-    print "${PROGRAM} da       created new PO template and updated the da.po file\n\n";
-    print "Report bugs to bugzilla.gnome.org, module 'intltool'.\n";
-    exit;
-}
-
-sub main
-{
-    my ($lang) = @_;
-
-    ## Report error if the language file supplied
-    ## to the command line is non-existent
-    &print_error_not_existing("$lang.po") if ! -s "$lang.po";
-
-    print "Working, please wait..." unless $VERBOSE;
-    &generate_headers;
-    &generate_po_template;
-    &update_po_file ($lang);
-    &print_status ($lang);
-}
-
-sub determine_type ($) 
-{
-   my $type = $_;
-   my $gettext_type;
-
-   # FIXME: Use $xml_extentions, and maybe do all this even nicer
-   my $xml_regex = 
-       "(?:xml(\.in)*|ui|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|".
-       "pong(?:\.in)+|etspec|schemas(?:\.in)+)";
-   my $ini_regex =
-       "(?:desktop(?:\.in)+|theme(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|".
-       "soundlist(?:\.in)+)";
-
-   if ($type =~ /\[type: gettext\/([^\]].*)]/) {
-        $gettext_type=$1;
-   }
-   elsif ($type =~ /schemas(\.in)+$/) {
-        $gettext_type="schemas";
-   }
-   elsif ($type =~ /$xml_regex$/) {
-        $gettext_type="xml";
-   }
-   elsif ($type =~ /glade2?(\.in)*$/) {
-        $gettext_type="glade";
-   }
-   elsif ($type =~ /$ini_regex$/) { 
-        $gettext_type="ini";
-   }
-   elsif ($type =~ /scm(\.in)*$/) {
-        $gettext_type="scheme";
-   }
-   elsif ($type =~ /keys(\.in)+$/) {
-        $gettext_type="keys";
-   }
-   else { $gettext_type=""; }
-
-   return "gettext\/$gettext_type";
-}
-
-sub find_leftout_files
-{
-    my (@buf_i18n_plain,
-	@buf_i18n_xml,
-	@buf_i18n_xml_unmarked,
-	@buf_i18n_ini,
-	@buf_potfiles,
-	@buf_potfiles_ignore,
-	@buf_allfiles,
-	@buf_allfiles_sorted,
-	@buf_potfiles_sorted
-    );
-
-    ## Search and find all translatable files
-    find sub { 
-	push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/ 
-	}, "..";
-    find sub { 
-	push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/ 
-	}, "..";
-    find sub {
-	push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/ 
-	}, "..";
-    find sub {
-        push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/
-        }, "..";
-
-
-    open POTFILES, "POTFILES.in" or die "$PROGRAM:  there's no POTFILES.in!\n";
-
-    @buf_potfiles = grep /^[^#]/, <POTFILES>;
-    foreach (@buf_potfiles) {
-        s/^\[.*]\s*//;
-    }
-			    
-    print "Searching for missing translatable files...\n" if $VERBOSE;
-
-    ## Check if we should ignore some found files, when
-    ## comparing with POTFILES.in
-    foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") {
-        if (-s $ignore) {
-            open FILE, $ignore;
-            while (<FILE>) {
-                if (/^[^#]/){
-                    push @buf_potfiles_ignore, $_;
-                }
-            }
-	    print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-            @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
-        }
-    }
-
-    foreach my $file (@buf_i18n_plain)
-      {
-        my $in_comment = 0;
-	my $in_macro = 0;
-
-        open FILE, "<$file";
-        while (<FILE>)
-	  {
-	    # Handle continued multi-line comment.
-	    if ($in_comment)
-	      {
-		next unless s-.*\*/--;
-		$in_comment = 0;
-	      }
-
-	    # Handle continued macro.
-	    if ($in_macro)
-	      {
-		$in_macro = 0 unless /\\$/;
-		next;
-	      }
-
-	    # Handle start of macro (or any preprocessor directive).
-	    if (/^\s*\#/)
-	      {
-		$in_macro = 1 if /^([^\\]|\\.)*\\$/;
-		next;
-	      }
-
-	    # Handle comments and quoted text.
-	    while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
-	      {
-		my $match = $1;
-		if ($match eq "/*")
-		  {
-		    if (!s-/\*.*?\*/--)
-		      {
-			s-/\*.*--;
-			$in_comment = 1;
-		      }
-		  }
-		elsif ($match eq "//")
-		  {
-		    s-//.*--;
-		  }
-		else # ' or "
-		  {
-		    if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
-		      {
-			warn "mismatched quotes at line $. in $file\n";
-			s-$match.*--;
-		      }
-		  }
-	      }
-	
-
-	    if (/_\(QUOTEDTEXT/)
-	      {
-		## Remove the first 3 chars and add newline
-		push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-		last;
-	      }
-	  }
-	close FILE;
-      }
-
-    foreach my $file (@buf_i18n_xml) {
-        open FILE, "<$file";
-        while (<FILE>) {
-            if (/\s_(.*)=\"/ || /translatable=\"yes\"/){
-                push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                last;
-            }
-        }
-    }
-
-    foreach my $file (@buf_i18n_ini){
-        open FILE, "<$file";
-        while (<FILE>) {
-            if (/_(.*)=/){
-                push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                last;
-            }
-        }
-    }
-
-    foreach my $file (@buf_i18n_xml_unmarked){
-        push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-    }
-
-
-    @buf_allfiles_sorted = sort (@buf_allfiles);
-    @buf_potfiles_sorted = sort (@buf_potfiles);
-
-    my %in2;
-    foreach (@buf_potfiles_sorted) {
-        $in2{$_} = 1;
-    }
-
-    my @result;
-
-    foreach (@buf_allfiles_sorted){
-        if (!exists($in2{$_})){
-            push @result, $_
-        }
-    }
-
-    ## Save file with information about the files missing
-    ## if any, and give information about this procedure.
-    if (@result) {
-	print "\n" if $VERBOSE;
-        open OUT, ">missing";
-        print OUT @result;
-        print "The following files contain translations and are currently not in use. Please\n";
-	print "consider adding these to the POTFILES.in file, located in the po/ directory.\n\n";
-	print @result, "\n";
-	print "If some of these files are left out on purpose then please add them to\n";
-	print "POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list\n";
-        print "of left out files has been written in the current directory.\n";
-    }
-
-    ## If there is nothing to complain about, notify the user
-    else {
-        print "\nAll files containing translations are present in POTFILES.in.\n";
-    }
-}
-
-sub print_error_invalid_option
-{
-    ## Handle invalid arguments
-    print "Try `${PROGRAM} --help' for more information.\n";
-    exit 1;
-}
-
-sub generate_headers
-{
-    my $EXTRACT = `which intltool-extract 2>/dev/null`;
-    chomp $EXTRACT;
-
-    $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
-
-    ## Generate the .h header files, so we can allow glade and
-    ## xml translation support
-    if (! -s $EXTRACT)
-    {
-	print "\n *** The intltool-extract script wasn't found!"
-	     ."\n *** Without it, intltool-update can not generate files.\n";
-	exit;
-    }
-    else
-    {
-        open FILE, "<POTFILES.in";
-        while (<FILE>) {
-           chomp;
-
-           ## Find xml files in POTFILES.in and generate the
-           ## files with help from the extract script
-
-	   my $gettext_type= &determine_type ($1);
-
-           if (/\.($xml_extension|$ini_extension)$/ || /^\[/){
-	       $_ =~ s/^\[[^\[].*]\s*//;
-               my $filename = "../$_";
-
-               if ($VERBOSE){
-                   system($EXTRACT, "--update", "--type=$gettext_type", $filename);
-               } else {
-	 	   system($EXTRACT, "--update", "--type=$gettext_type", "--quiet", $filename);
-               }
-           }
-       }
-       close FILE;
-   }
-}
-
-sub generate_po_template
-{
-    ## Generate the potfiles from the POTFILES.in file
-
-    print "Building the $MODULE.pot...\n" if $VERBOSE;
-
-    move ("POTFILES.in", "POTFILES.in.old");
-
-    open INFILE, "<POTFILES.in.old";
-    open OUTFILE, ">POTFILES.in";
-    while (<INFILE>) {
-        chomp;
-        if (/\.($xml_extension|$ini_extension)$/ || /^\[/) {
-            s/^\[.*]\s*//;
-            print OUTFILE "$_.h\n";
-        } else {
-            print OUTFILE "$_\n";
-        }
-    }
-    close OUTFILE;
-    close INFILE;
-
-    system ("xgettext", "--default-domain\=$MODULE", 
-			"--directory\=\.\.",
-	   		"--add-comments", 
-			"--keyword\=\_", 
-			"--keyword\=N\_", 
-			"--keyword\=U\_",
-	   		"--files-from\=\.\/POTFILES\.in");
-
-    move ("POTFILES.in.old", "POTFILES.in");
-
-    print "Removing generated header (.h) files..." if $VERBOSE;
-
-    open FILE, "<POTFILES.in";
-
-    while (<FILE>)
-    {
-        chomp;
-        unlink "../$_.h" if /\.($xml_extension|$ini_extension)$/;
-    }
-
-    close FILE;
-    print "done\n" if $VERBOSE;
-
-    if (!-e "$MODULE.po") {
-        print "WARNING: It seems that none of the files in POTFILES.in ".
-              "contain marked strings\n";
-        exit (1);
-    }
-
-    system ("rm", "-f", "$MODULE.pot");
-    move ("$MODULE.po", "$MODULE.pot") or die "$PROGRAM: couldn't move $MODULE.po to $MODULE.pot.\n";
-
-    print "Wrote $MODULE.pot\n" if $VERBOSE;
-}
-
-sub update_po_file
-{
-    my ($lang) = @_;
-
-    print "Merging $lang.po with $MODULE.pot..." if $VERBOSE;
-
-    copy ("$lang.po", "$lang.po.old") || die "copy failed: $!";
-
-    # Perform merge, remove backup file and the "messages" trash file 
-    # generated by gettext
-    system ("msgmerge", "$lang.po.old", "$MODULE.pot", "-o", "$lang.po");
-    unlink "$lang.po.old";
-    unlink "messages";
-}
-
-sub print_error_not_existing
-{
-    my ($file) = @_;
-
-    ## Report error if supplied language file is non-existing
-    print "$PROGRAM: $file does not exist!\n";
-    print "Try '$PROGRAM --help' for more information.\n";
-    exit;
-}
-
-sub gather_po_files
-{
-    my @po_files = glob ("./*.po");
-
-    @languages = map (&po_file2lang, @po_files);
-
-    foreach my $lang (@languages) {
-	$po_files_by_lang{$lang} = shift (@po_files);
-    }
-}
-
-sub po_file2lang ($)
-{
-    my $tmp = $_;
-    $tmp =~ s/^.*\/(.*)\.po$/$1/;
-    return $tmp;
-}
-
-sub print_status
-{
-    my ($lang) = @_;
-
-    system ("msgfmt", "--statistics", "$lang.po");
-    print "\n";
-}
-
-sub print_report
-{
-    &generate_headers;
-    &generate_po_template;
-    &gather_po_files;
-
-    foreach my $lang (@languages) {
-	print "$lang: ";
-	&update_po_file ($lang);
-    }
-
-    print "\n\n * Current translation support in $MODULE \n\n";
-
-    foreach my $lang (@languages){
-        print "$lang: ";
-	system ("msgfmt", "--statistics", "$lang.po");
-    }
-}
-
-sub find_package_name
-{
-    my $base_dirname = getcwd();
-    $base_dirname =~ s@.*/@@;
-
-    my ($conf_in, $src_dir);
-
-    if ($base_dirname =~ /^po(-.+)?$/) {
-        if (-f "../configure.in") {
-            $conf_in = "../configure.in";
-	} elsif (-f "../configure.ac") {
-	    $conf_in = "../configure.ac";
-        } else {
-	    my $makefile_source;
-	    local (*IN);
-	    open IN, "<Makefile" || die "can't open Makefile: $!";
-
-	    while (<IN>) {
-		if (/^top_srcdir[ \t]*=/) {
-		    $src_dir = $_;
-		    # print "${src_dir}\n";
-
-		    $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
-		    # print "${src_dir}\n";
-		    chomp $src_dir;
-		    $conf_in = "$src_dir" . "/configure.in" . "\n";
-		    last;
-		}
-	    }
-	    $conf_in || die "Cannot find top_srcdir in Makefile."
-        }
-
-	my %varhash = ();
-        my $conf_source; {
-           local (*IN);
-           open (IN, "<$conf_in") || die "can't open $conf_in: $!";
-           while (<IN>) {
-              if (/^(\w+)=(\S+)/) { $varhash{$1} = $2 };
-           }
-           seek (IN, 0, 0);
-           local $/; # slurp mode
-           $conf_source = <IN>;
-        }
-
-	my $name = "";
-	$name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m;
-	if ($conf_source =~ /^AC_INIT\([\s\[]*([^,\)\s\]]+)\]?\s*,/m) {
-	    $name = $1;
-	    $varhash{"AC_PACKAGE_NAME"} = $1;
-	}
-	$name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\s\]]+)/m;
-
-	$name = "\$AC_PACKAGE_NAME" if "$name" eq "AC_PACKAGE_NAME";
-
-	my $oldname = "";
-	while (($name =~ /[\$](\S+)/) && ("$oldname" ne "$name")) {
-	    $oldname = $name;
-	    if (exists $varhash{$1}) {
-		$name =~ s/[\$](\S+)/$varhash{$1}/;
-	    }
-	}
-	return $name if $name;
-    }
-
-    print "$PROGRAM: Unable to determine package name.\n" .
-	  "Make sure to run this script inside the po directory.\n";
-    exit;
-}
diff --git a/patches/.cvsignore b/patches/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/patches/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/patches/Makefile.am b/patches/Makefile.am
deleted file mode 100644
index 284f95a0d..000000000
--- a/patches/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS=RC3 OOO_1_1_RC3 OOO_1_1_RC4
-EXTRA_DIST=README apply.pl order
diff --git a/patches/OOO_1_1/app-compatible.diff b/patches/OOO_1_1/app-compatible.diff
deleted file mode 100644
index 4c6caf055..000000000
--- a/patches/OOO_1_1/app-compatible.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: framework/source/classes/filtercachedata.cxx
-===================================================================
-RCS file: /cvs/framework/framework/source/classes/filtercachedata.cxx,v
-retrieving revision 1.22
-diff -u -p -u -r1.22 filtercachedata.cxx
---- framework/source/classes/filtercachedata.cxx	17 Jun 2003 15:23:15 -0000	1.22
-+++ framework/source/classes/filtercachedata.cxx	12 Aug 2003 14:48:08 -0000
-@@ -1032,6 +1033,13 @@ void FilterCFGAccess::impl_loadFilters( 
-     sal_uInt32                              nProperty       = 0                              ;
-     ::rtl::OUString                         sPath                                            ;
- 
-+    sal_Bool compatible = FALSE;
-+    const char *pEnv = getenv ("COMPATIBLE");
-+    if (pEnv && *pEnv) {
-+//	    fprintf (stderr, "Compatible!\n");
-+	    compatible = TRUE;
-+    }
-+
-     // c)
- 	for( nNodeName=0; nNodeName<nNodeCount; ++nNodeName )
- 	{
-@@ -1075,6 +1083,7 @@ void FilterCFGAccess::impl_loadFilters( 
-             lPropertyNames[nProperty] = sPath + SUBKEY_DATA                 ;
-             ++nProperty;
-         }
-+
- 	}
- 
- 	// d)
-@@ -1153,6 +1162,23 @@ void FilterCFGAccess::impl_loadFilters( 
-                 FilterCFGAccess::decodeFilterData( sTempString, aFilter );
-                 ++nProperty;
-             }
-+
-+	    if (compatible) {
-+		    // A truly ugly & hard-coded hack ...
-+		    if ( aFilter.sType.equalsAscii( "writer_MS_Word_97" ) ||
-+			 aFilter.sType.equalsAscii( "calc_MS_Excel_97" ) ||
-+			 aFilter.sType.equalsAscii( "impress_MS_PowerPoint_97" ) )
-+			    aFilter.nFlags |= FILTERFLAG_DEFAULT;
-+
-+		    else if ( aFilter.sType.equalsAscii( "writer_StarOffice_XML_Writer") ||
-+				aFilter.sType.equalsAscii( "calc_StarOffice_XML_Calc" ) ||
-+				aFilter.sType.equalsAscii( "impress_StarOffice_XML_Impress" ) )
-+			    aFilter.nFlags &= ~FILTERFLAG_DEFAULT;
-+
-+/*		    fprintf (stderr, "Incompatible %d (%s) a default [%ld]\n", nProperty,
-+			     (const sal_Char *)OUStringToOString (aFilter.sType, RTL_TEXTENCODING_UTF8),
-+			     (long)aFilter.nFlags); */
-+	    }
- 
-             LOG_ASSERT2( (sal_uInt32)(nProperty-nCheckPropCount)!=(sal_uInt32)(m_nKeyCountFilters-1), "FilterCFGAccess::impl_loadFilters()", "Mismatch between key count of filters and count of ignored filter properties detected. Follow readed filters would be wrong!" )
- 
diff --git a/patches/OOO_1_1/build-instsetoo-langext.diff b/patches/OOO_1_1/build-instsetoo-langext.diff
deleted file mode 100644
index c23054fc2..000000000
--- a/patches/OOO_1_1/build-instsetoo-langext.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: instsetoo/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo/util/makefile.mk,v
-retrieving revision 1.18.2.1
-diff -u -3 -p -r1.18.2.1 makefile.mk
---- instsetoo/util/makefile.mk	12 Aug 2003 09:48:01 -0000	1.18.2.1
-+++ instsetoo/util/makefile.mk	16 Aug 2003 22:42:56 -0000
-@@ -97,16 +97,21 @@ SEARCH_DIR=r:\solenv\inst\ooo\$(OUTPATH)
- 
- ALLTAR : pack
- 
--.IF "$(alllangext)"!=""
-+# Create installation sets for languages in instsetext, or in alllangext if
-+# insetsetext is not defined in the format instsetext=<num>,[<num>,]...
-+# e.g.: instsetext=01,49,99
-+instsetext*=$(alllangext)
-+  
-+.IF "$(instsetext)"!=""
- 
- .IF "$(BUILD_SPECIAL)"!=""  
- .IF "$(OOO_RELEASE_BUILD)"==""
- pack: pack_01
- .ELSE
--pack: $(foreach,i,$(alllangext) pack_$i)
-+pack: $(foreach,i,$(instsetext) pack_$i)
- .ENDIF
- .ELSE
--pack: $(foreach,i,$(alllangext) pack_$i)
-+pack: $(foreach,i,$(instsetext) pack_$i)
- .ENDIF
- 
- pack_%:
-@@ -117,10 +122,12 @@ pack_%:
- test:
- 	+-$(LZIP) $(LZIPFLAGS) -p ${SEARCH_DIR} -l 01 -f openoffice.lst -o -n OfficeOSL 
- 
--.ELSE			# "$(alllangext)"!=""
-+.ELSE			# "$(instsetext)"!=""
- pack:
--	@+echo cannot pack nothing...
-+	@+echo no installation sets selected to be packed.
-+	@+echo instsetext: $(instsetext)
-+	@+echo alllangext: $(alllangext)
- 
--.ENDIF			# "$(alllangext)"!=""
-+.ENDIF			# "$(instsetext)"!=""
- 
- 	
diff --git a/patches/OOO_1_1/build-lang-no-pack.diff b/patches/OOO_1_1/build-lang-no-pack.diff
deleted file mode 100644
index 5e4ba83cd..000000000
--- a/patches/OOO_1_1/build-lang-no-pack.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-Index: scptools/source/linker/lzip.cxx
-===================================================================
-RCS file: /cvs/installation/scptools/source/linker/lzip.cxx,v
-retrieving revision 1.19
-diff -u -p -u -r1.19 lzip.cxx
---- scptools/source/linker/lzip.cxx	4 Apr 2003 15:04:25 -0000	1.19
-+++ scptools/source/linker/lzip.cxx	8 Aug 2003 11:43:47 -0000
-@@ -113,6 +113,7 @@ ByteString					m_aZipLst;
- 
- BOOL 						m_bPrintCommandline = FALSE;
- BOOL 						m_bTestOnly = FALSE;
-+BOOL 						m_bDontPack  = FALSE;
- BOOL 						m_bBuildWeb = FALSE;
- BOOL 						m_bStripBinaries = FALSE;
- 
-@@ -142,6 +143,7 @@ void PrintUsage()
- 	fprintf( stderr, "\t-z <size>\n" );
- 	fprintf( stderr, "\t-e <filename> (write a non HTML log)\n" );
- 	fprintf( stderr, "\t-o test only mode\n" );
-+	fprintf( stderr, "\t-O don't pack files\n" );
- 	fprintf( stderr, "\t-c print scpzip commandline\n" );
- 	fprintf( stderr, "\t-w generate a webinstall script\n" );
- //	fprintf( stderr, "\t-v <version> (write script version default is 100)\n" );
-@@ -301,6 +303,10 @@ BOOL StartJob()
- 	if( m_bTestOnly )
- 		AddCmd( "-o" );
- 
-+	// === Don't pack ===================
-+	if( m_bDontPack )
-+		AddCmd( "-O" );
-+
- 	// === compression =================
- 	if (pPrj->m_aCompression >= 0 && pPrj->m_aCompression <= 9)
- 	{
-@@ -604,6 +610,9 @@ int __LOADONCALLAPI main( int argc, char
- 				break;
- 
- 			case 'o':	m_bTestOnly = TRUE;
-+				break;
-+
-+			case 'O':	m_bDontPack = TRUE;
- 				break;
- 
- 			case 'w':	m_bBuildWeb = TRUE;
-Index: scptools/source/linker/scpzip.cxx
-===================================================================
-RCS file: /cvs/installation/scptools/source/linker/scpzip.cxx,v
-retrieving revision 1.42
-diff -u -p -u -r1.42 scpzip.cxx
---- scptools/source/linker/scpzip.cxx	4 Jun 2003 14:25:41 -0000	1.42
-+++ scptools/source/linker/scpzip.cxx	8 Aug 2003 16:16:16 -0000
-@@ -151,6 +151,7 @@ ByteString		aMergeFilename;
- ByteString		aHTMLFilename;
- 
- BOOL			bTestOnly			= FALSE;
-+BOOL			bDontPack			= FALSE;
- BOOL			bOldSetupZIPStyle	= FALSE;
- BOOL			bWebScript 			= FALSE;
- BOOL			bStripBinaries		= FALSE;
-@@ -183,6 +184,7 @@ void PrintZipUsage()
- 	fprintf( stderr, "usage:\n" );
- 	fprintf( stderr, "\t-<1..9> compression (default is 5)\n" );
- 	fprintf( stderr, "\t-o test only\n" );
-+	fprintf( stderr, "\t-O don't pack files\n" );
- 	fprintf( stderr, "\t-l <langcode,...> (first langcode is default language)\n" );
- 	fprintf( stderr, "\t-h <INTEL | SPARC> (INTEL)\n" );
- 	fprintf( stderr, "\t-t <WNT | OS2 | UNX> (default WNT)\n" );
-@@ -211,6 +213,8 @@ void __EnumFilesCallBack( char *pFile, U
- 
- void _rawZip( ByteString& aSource, SiDirEntry& aDestination )
- {
-+	if(bDontPack) return;
-+
- 	ByteString aCompressionParam( '-' );
- 	aCompressionParam += ByteString::CreateFromInt32( nCompression );
- 
-@@ -546,7 +550,9 @@ void ZipFile( SiFile* pFile, USHORT nLan
- 		if( !pFile->IsSetupZip() && aDestination.Exists() )
- 			aDestination.Kill();
- 
--		if( pFile->IsArchive() )
-+		if(bDontPack)
-+			;
-+		else if( pFile->IsArchive() )
- 		{
- 			SiDirEntry aEntry(aSource);
- 			FileCopy(aEntry, aDestination);
-@@ -1578,6 +1584,9 @@ int __LOADONCALLAPI main( int argv, char
- 						  break;
- 
- 				case 'o': bTestOnly = TRUE;
-+						  break;
-+
-+				case 'O': bDontPack = TRUE;
- 						  break;
- 
- 				case 'h': {
diff --git a/patches/OOO_1_1/config-disable-mozilla.diff b/patches/OOO_1_1/config-disable-mozilla.diff
deleted file mode 100644
index 0be587fea..000000000
--- a/patches/OOO_1_1/config-disable-mozilla.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: connectivity/source/drivers/mozab/makefile.mk
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/mozab/makefile.mk,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 makefile.mk
---- connectivity/source/drivers/mozab/makefile.mk	28 Apr 2003 16:58:58 -0000	1.10
-+++ connectivity/source/drivers/mozab/makefile.mk	14 Aug 2003 12:00:01 -0000
-@@ -66,7 +66,7 @@ PRJNAME=connectivity
- TARGET=$(MOZAB_TARGET)
- TARGET2=$(MOZAB_TARGET)drv
- 
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO"
- all: 
- 	@echo "		Not building the mozabsrc stuff in OpenOffice.org build"
- 	@echo "		dependency to Mozilla developer snapshots not feasable at the moment"
-Index: connectivity/source/drivers/mozab/mozillasrc/makefile.mk
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk,v
-retrieving revision 1.11
-diff -u -p -u -r1.11 makefile.mk
---- connectivity/source/drivers/mozab/mozillasrc/makefile.mk	15 Apr 2003 17:39:14 -0000	1.11
-+++ connectivity/source/drivers/mozab/mozillasrc/makefile.mk	14 Aug 2003 12:00:19 -0000
-@@ -85,7 +85,7 @@ ENVCFLAGS+=/FR$(SLO)$/
- 
- .INCLUDE : settings.mk
- 
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO"
- 
- dummy:
- 	@echo "		Not building the mozillasrc stuff in OpenOffice.org build"
-Index: scp/source/office/makefile.mk
-===================================================================
-RCS file: /cvs/installation/scp/source/office/makefile.mk,v
-retrieving revision 1.12
-diff -u -p -u -r1.12 makefile.mk
---- scp/source/office/makefile.mk	16 Jul 2003 18:17:16 -0000	1.12
-+++ scp/source/office/makefile.mk	14 Aug 2003 12:08:41 -0000
-@@ -72,6 +72,10 @@ TARGETTYPE=CUI
- SCPDEFS+=-DENABLE_CRASHDUMP
- .ENDIF
- 
-+.IF "$(WITH_MOZILLA)"=="NO"
-+SCPDEFS+=-DWITHOUT_MOZILLA
-+.ENDIF
-+
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :  svpre.mk
-Index: scp/source/office/files.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/files.scp,v
-retrieving revision 1.367
-diff -u -p -u -r1.367 files.scp
---- scp/source/office/files.scp	17 Jul 2003 08:54:46 -0000	1.367
-+++ scp/source/office/files.scp	14 Aug 2003 12:09:00 -0000
-@@ -3242,6 +3248,9 @@ End
- 
- #endif
-                                   // of #ifdef SOLAR_JAVA
-+
-+#ifndef WITHOUT_MOZILLA 
-+
- #ifndef MACOSX
- File GID_FILE_MOZILLA_RUNTIME
-         TXT_FILE_BODY;
-@@ -3249,6 +3258,8 @@ File GID_FILE_MOZILLA_RUNTIME
-         Dir    = GID_DIR_PROGRAM;
-         Name	= "mozruntime.zip";
- End
-+#endif
-+
- #endif
- 
- File GID_FILE_HTML_THIRDPARTYLICENSEREADME
-Index: moz/zipped/makefile.mk
-===================================================================
-RCS file: /cvs/external/moz/zipped/makefile.mk,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 makefile.mk
---- moz/zipped/makefile.mk	14 Aug 2002 16:22:52 -0000	1.7
-+++ moz/zipped/makefile.mk	14 Aug 2003 19:52:29 -0000
-@@ -71,7 +71,7 @@ TARGET=moz_unzip
- 
- # --- Files --------------------------------------------------------
- 
--.IF "$(OS)" == "MACOSX"
-+.IF "$(OS)" == "MACOSX" || "$(WITH_MOZILLA)" == "NO"
- 
- dummy:
- 	@echo "Nothing to build for OS $(OS)"
diff --git a/patches/OOO_1_1/config-get-correct-path.diff b/patches/OOO_1_1/config-get-correct-path.diff
deleted file mode 100644
index 60372a0b7..000000000
--- a/patches/OOO_1_1/config-get-correct-path.diff
+++ /dev/null
@@ -1,204 +0,0 @@
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.10.2.8
-diff -u -p -u -r1.10.2.8 set_soenv.in
---- config_office/set_soenv.in	29 Jul 2003 14:30:13 -0000	1.10.2.8
-+++ config_office/set_soenv.in	11 Aug 2003 13:44:04 -0000
-@@ -1009,37 +1009,31 @@ if ($platform eq "$Winnt")
- }
-      
- # The general environment path.
--if ($platform eq "$Solaris") 
--{  $PATH              = $cur_dir.
--                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
--                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
--                        $ps.'$SOLARENV'.$BIN.
--                        $ps.$USR_CCS.$BIN;
--   if ( $JAVA_HOME ne "" )
--   {
--      $PATH .=          $ps.'$JAVA_HOME'.$BIN;
--   }
--
--   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
--
--   $PATH             .= $ps.$oldPATH;
--}
--elsif (($platform eq "$Linux")  || ($platform eq "$NetBSD") ||
--	($platform eq "$Tru64")  || ($platform eq "$Irix") ||
--	($platform eq "$Irix64") || ($platform eq "$FreeBSD") ||
--	($platform eq "AIX"))
-+if (($platform eq "$Linux")  || ($platform eq "$NetBSD") ||
-+    ($platform eq "$Tru64")  || ($platform eq "$Irix") ||
-+    ($platform eq "$Irix64") || ($platform eq "$FreeBSD") ||
-+    ($platform eq "AIX")     || ($platform eq "$Solaris"))
- {  $PATH              = $cur_dir.
-                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
-                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-                         $ps.'$SOLARENV'.$BIN;
--   if ( $JAVA_HOME ne "" )
--   {
--      $PATH .=          $ps.'$JAVA_HOME'.$BIN;
-+
-+   if ($platform eq "$Solaris") {
-+	$PATH .= $ps.$USR_CCS.$BIN;
-    }
--   $PATH             .= $ps.$oldPATH;
- 
--   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
-+   $PATH             .= $ps.$oldPATH;
- 
-+   my @javaBits;
-+   if ( $JAVA_HOME ne "" ) {
-+      @javaBits = ( $ps.'$JAVA_HOME'.$BIN, 'javac' );
-+   } else {
-+      @javaBits = (); 
-+   }
-+   $PATH             .= GetCorrectPath ($PATH, $COMPATH, $CC,
-+                                        $PERL_PATH, 'perl',
-+					$TCSH_PATH, 'tcsh',
-+                                        @javaBits);
- }
- 
- elsif ($platform eq "$Winnt")
-@@ -2277,53 +2275,99 @@ sub CreateBuildEnv 
-    mkdir( $src_root, 0777 ) || 
-       print ( "Cannot create directory $src_root \n");
- }
-+
- #--------------------------------------------------------
- # Function name: GetCorrectPath
- # Description:   Creates the build environment. 
--# Arguments:     1. $COMPATH:     Compiler Path.
--#                2. $PERL_PATH:   Perl executable Path.
--#                2. $TCSH_PATH:   Tcsh executable Path.
-+# Arguments:     1.   existing / original path
-+#                2... pairs of <path, executable>
- # Return value:  String - Correct Path
- #--------------------------------------------------------
--sub GetCorrectPath 
--{  my ( $compath, $perl_path, $tcsh_path, $compiler, $perl_compath, $compath_perl, $correct_path );
--   $compath  = $_[ 0 ];
--   $perl_path = $_[ 1 ];
--   $tcsh_path = $_[ 2 ];
--   $compiler = $_[ 3 ];
--   if ($compath ne $perl_path) 
--   {  $perl_compath .= $compath.$ds."perl";
--      if ( !( -f $perl_compath ) ) 
--      {  $correct_path = $ps.$compath.
--                         $ps.$perl_path;
--      }
--      else 
--      {  $compath_perl .= $perl_path.$ds.$compiler;
--         if ( !( -f $compath_perl ) ) 
--         {  $correct_path = $ps.$perl_path.
--                         $ps.$compath;
--         }
--         else
--         {  AddWarning( "set_soenv", "Compiler path and Perl Path conflict, fix and run ./configure again" );
--            $correct_path = "";
--         }
--      }
--   }
--   else 
--   {  $correct_path = $ps.$compath;
--   }
--   if (($tcsh_path ne $compath) && ($tcsh_path ne $perl_path) && 
--       ($tcsh_path ne $USR.$BIN) && ($tcsh_path ne $BIN)) 
--   {  $correct_path .= $ps.$tcsh_path;
--   }
--   if (($compath ne $USR.$BIN) && ($perl_path ne $USR.$BIN) && ($tcsh_path ne $USR.$BIN)) 
--   {  $correct_path .= $ps.$USR.$BIN;
--   }
--   if (($compath ne $BIN) && ($perl_path ne $BIN)) 
--   {  $correct_path .= $ps.$BIN;
--   } 
--   return $correct_path;
-+sub GetCorrectPath
-+{
-+	sub PathLookup
-+	{
-+	    my $cmd = shift;
-+	    while (@_) {
-+		my $elem = shift;
-+		
-+		-x "$elem/$cmd" && return $elem;
-+	    }
-+	    return '';
-+	}
-+
-+	sub CleanupPath
-+	{
-+	    my $elem = shift;
-+	    my @rest = @_;
-+	    my @result = ($elem);
-+	    
-+	    if (@rest) {
-+		my @chew = CleanupPath(@rest);
-+		
-+		for $a (@chew) {
-+		    if (!($a eq $elem)) {
-+			push @result, $a;
-+		    }
-+		}
-+		return @result;
-+	    } else {
-+		return $elem;
-+	    }
-+	}
-+
-+	my $oldPath = shift;
-+	my @originalPairs = @_;
-+	my @pairs = @originalPairs;
-+	my @Path = split /$ps/, $oldPath;
-+
-+	while (@pairs) {
-+	    my $path = shift @pairs;
-+	    my $cmd = shift @pairs;
-+	    my $to_append = 1;
-+	    my $elem;
-+
-+	    if (! -x "$path/$cmd") {
-+		AddWarning ("Missing executable $path/$cmd\n");
-+		next;
-+	    }
-+
-+	    for $elem (@Path) {
-+		if ($elem eq $path) {
-+#		    print "Hit duplicate path in path; break\n";
-+		    $to_append = 0;
-+		    last;
-+		}
-+		if (-f "$elem/$cmd") {
-+#		    print "Element already in path ...\n";
-+		    unshift @Path, $path;
-+		    $to_append = 0;
-+		    last;
-+		} else {
-+#		    print "No file $elem/$cmd\n";
-+		}
-+	    }
-+	    if ($to_append) {
-+		push @Path, $path;
-+	    }
-+	}
-+
-+	@pairs = @originalPairs;
-+	while (@pairs) {
-+	    my $path = shift @pairs;
-+	    my $cmd = shift @pairs;
-+	    my $realpath;
-+
-+	    $realpath = PathLookup ($cmd, @Path);
-+	    if (!($realpath eq $path)) {
-+		AddWarning ("Path conflict for executables " .
-+                            "$path/$cmd against $realpath");
-+	    }
-+	}
-+
-+	return join $ps, CleanupPath (@Path);
- }
-+
- #------------------------------------------------------------
- # Function name: AddWarning 
- # Description:   Adds any kind of warning for the user.
diff --git a/patches/OOO_1_1/config-path-unbreak.diff b/patches/OOO_1_1/config-path-unbreak.diff
deleted file mode 100644
index 491b95928..000000000
--- a/patches/OOO_1_1/config-path-unbreak.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.10.2.1
-diff -u -p -u -r1.10.2.1 set_soenv.in
---- config_office/set_soenv.in	21 Jul 2003 14:41:34 -0000	1.10.2.1
-+++ config_office/set_soenv.in	21 Jul 2003 16:55:33 -0000
-@@ -2235,6 +2235,9 @@ sub CreateBuildEnv 
- #--------------------------------------------------------
- sub GetCorrectPath 
- {  my ( $compath, $perl_path, $tcsh_path, $compiler, $perl_compath, $compath_perl, $correct_path );
-+
-+   return '';
-+
-    $compath  = $_[ 0 ];
-    $perl_path = $_[ 1 ];
-    $tcsh_path = $_[ 2 ];
diff --git a/patches/OOO_1_1/debug-appinit.diff b/patches/OOO_1_1/debug-appinit.diff
deleted file mode 100644
index bfd7b4bd8..000000000
--- a/patches/OOO_1_1/debug-appinit.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- tools/source/rc/rc.cxx
-+++ tools/source/rc/rc.cxx
-@@ -146,7 +146,7 @@
-     if ( !pResMgr )
-         pResMgr = Resource::GetResManager();
- 
--    if ( pResMgr->GetResource( rResId ) )
-+    if ( pResMgr && pResMgr->GetResource( rResId ) )
-     {
-         // String laden
-         RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass();
-@@ -159,6 +159,8 @@
-         nSize += nSize % 2;
-         pResMgr->Increment( nSize );
-     }
-+    else
-+	InitStringRes ("", 0);
- 
-     ResHookProc pImplResHookProc = ResMgr::GetReadStringHook();
-     if ( pImplResHookProc )
---- tools/source/rc/resmgr.cxx	2002/05/30 08:42:25	1.15.2.1
-+++ tools/source/rc/resmgr.cxx	2002/10/22 11:39:46
-@@ -940,6 +940,8 @@
-         *ppResMgr = rResId.GetResMgr();
-     else
-         *ppResMgr = Resource::GetResManager();
-+    if (!*ppResMgr)
-+      return NULL;
-     (*ppResMgr)->GetResource( rResId );
-     (*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
-     return (*ppResMgr)->GetClass();
---- vcl/source/gdi/bitmap.cxx	2000/09/18 17:05:37	1.1.1.1
-+++ vcl/source/gdi/bitmap.cxx	2002/10/22 11:58:23
-@@ -113,6 +113,10 @@
- 
- 	USHORT nBitmapType;
- 	USHORT nBitmapId;
-+
-+	if (!pResMgr)
-+	  return;
-+
- 	nBitmapType	= pResMgr->ReadShort();
- 	nBitmapId	= pResMgr->ReadShort();
- 
-Index: desktop/source/app/appinit.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/app/appinit.cxx,v
-retrieving revision 1.16
-diff -u -p -u -r1.16 appinit.cxx
---- desktop/source/app/appinit.cxx	25 Mar 2003 13:51:11 -0000	1.16
-+++ desktop/source/app/appinit.cxx	13 May 2003 11:11:37 -0000
-@@ -59,6 +59,7 @@
-  *
-  ************************************************************************/
- 
-+#include <stdio.h>
- #include <algorithm>
- 
- #include "app.hxx"
-@@ -280,8 +281,10 @@ Reference< XMultiServiceFactory > Deskto
- 
- 		return xMS;
- 	}
--	catch( ::com::sun::star::uno::Exception& )
-+	catch( ::com::sun::star::uno::Exception& e)
- 	{
-+	  OString s = OUStringToOString (e.Message, RTL_TEXTENCODING_UTF8);
-+	  fprintf (stderr, "Bootstrap failing: '%s'\n", s.getStr());
- 	}
- 
- 	return Reference< XMultiServiceFactory >();
diff --git a/patches/OOO_1_1/disable-lzwc.diff b/patches/OOO_1_1/disable-lzwc.diff
deleted file mode 100644
index 6cbb331c9..000000000
--- a/patches/OOO_1_1/disable-lzwc.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: oo_cvs/goodies/source/filter.vcl/egif/makefile.mk
-===================================================================
-RCS file: /cvs/oo/graphics/goodies/source/filter.vcl/egif/makefile.mk,v
-retrieving revision 1.4
-diff -u -3 -p -u -r1.4 makefile.mk
---- goodies/source/filter.vcl/egif/makefile.mk	2001/12/06 14:18:02	1.4
-+++ goodies/source/filter.vcl/egif/makefile.mk	2002/08/15 12:12:32
-@@ -89,7 +89,7 @@ SRCFILES =	dlgegif.src		\
- 
- SLOFILES= 	$(SLO)$/egif.obj		\
- 		$(SLO)$/dlgegif.obj	\
--		$(SLO)$/giflzwc.obj
-+		$(SLO)$/giflzwc_disabled.obj
- 
- 
- # ==========================================================================
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ goodies/source/filter.vcl/egif/giflzwc_disabled.cxx	2002-08-15 15:09:47.000000000 +0200
-@@ -0,0 +1,42 @@
-+/**********************************
-+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
-+ **********************************/ 
-+
-+//#include <tools/stream.hxx>
-+#include "giflzwc.hxx"
-+
-+// --------------------
-+// - GIFLZWCompressor -
-+// --------------------
-+
-+GIFLZWCompressor::GIFLZWCompressor()
-+{
-+	pIDOS=NULL;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+GIFLZWCompressor::~GIFLZWCompressor()
-+{
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
-+{
-+	/********************** DISABLED *************************/
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
-+{
-+	/********************** DISABLED *************************/
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::EndCompression()
-+{
-+	/********************** DISABLED *************************/
-+}
diff --git a/patches/OOO_1_1/dmake-tempnam.diff b/patches/OOO_1_1/dmake-tempnam.diff
deleted file mode 100644
index c6e2e3862..000000000
--- a/patches/OOO_1_1/dmake-tempnam.diff
+++ /dev/null
@@ -1,810 +0,0 @@
-Fix for tempnam vulnerability, IZ#7800
-
-Index: dmake/config.h.in
-===================================================================
-RCS file: /cvs/tools/dmake/config.h.in,v
-retrieving revision 1.8
-diff -u -3 -p -r1.8 config.h.in
---- dmake/config.h.in	25 Mar 2003 14:02:09 -0000	1.8
-+++ dmake/config.h.in	14 Jul 2003 13:51:57 -0000
-@@ -67,6 +67,12 @@
- /* Define to 1 if you have the `strstr' function. */
- #undef HAVE_STRSTR
- 
-+/* Define if you have the mkstemp function.  */
-+#undef HAVE_MKSTEMP
-+
-+/* Define if you have the tempnam function.  */
-+#undef HAVE_TEMPNAM
-+
- /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-    */
- #undef HAVE_SYS_DIR_H
-Index: dmake/configure.in
-===================================================================
-RCS file: /cvs/tools/dmake/configure.in,v
-retrieving revision 1.19
-diff -u -3 -p -r1.19 configure.in
---- dmake/configure.in	25 Mar 2003 14:02:10 -0000	1.19
-+++ dmake/configure.in	14 Jul 2003 13:51:57 -0000
-@@ -47,7 +47,7 @@ AC_FUNC_MEMCMP
- AC_TYPE_SIGNAL
- AC_FUNC_UTIME_NULL
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS(getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz)
-+AC_CHECK_FUNCS(getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam)
- 
- dnl Checks for OS
- AC_MSG_CHECKING([the operating system])
-Index: dmake/function.c
-===================================================================
-RCS file: /cvs/tools/dmake/function.c,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 function.c
---- dmake/function.c	25 Mar 2003 14:02:11 -0000	1.4
-+++ dmake/function.c	14 Jul 2003 13:51:57 -0000
-@@ -346,8 +346,11 @@ char *data;
-       char *newtmp;
- 
-       /* This call to Get_temp sets TMPFILE for subsequent expansion of file.
--       * DO NOT DELETE IT! */
--      Get_temp( &newtmp, "", FALSE ); FREE(newtmp);
-+	   * The contents file variable passed may include TMPFILE to be expanded. */
-+      /* Using TMPFILE as an argument to mktmp is no longer supported because it is not
-+       * safe to create a random filename and assume the file does not exist.  Howver,
-+       * we still allow Expand() to do its job for fixed filenames */
-+      /* Get_temp( &newtmp, "", FALSE ); FREE(newtmp); */
-       tmpname = Expand(file);
- 
-       if( *tmpname ) {
-@@ -562,10 +565,9 @@ char *mod1;
-    cell.ce_attr   = A_PHONY|A_SILENT;
- 
-    if( nestlevel == 0 ) {
--      tmpnm   = tempnam(NIL(char),"mk");
-       org_out = dup(1);
- 
--      if( (tmp = fopen(tmpnm, "w+")) == NIL(FILE) )
-+      if( (tmp = Get_temp(&tmpnm, "", "w+")) == NIL(FILE) )
- 	 Open_temp_error( tmpnm, cname.ht_name );
- 
-       close(1);
-Index: dmake/sysintf.c
-===================================================================
-RCS file: /cvs/tools/dmake/sysintf.c,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 sysintf.c
---- dmake/sysintf.c	11 Oct 2002 13:42:44 -0000	1.4
-+++ dmake/sysintf.c	14 Jul 2003 13:51:57 -0000
-@@ -441,7 +441,40 @@ Get_switch_char()
-    return( getswitchar() );
- }
- 
-+/*
-+** Create a temporary file and open with exclusive access
-+** Path is updated with the filename and the file descriptor
-+** is returned.  Note that the new name should be freed when
-+** the file is removed.
-+**/
-+int Create_temp(tmpdir, path, suff)
-+char *tmpdir;
-+char **path;
-+char *suff;
-+{
-+   int fd;
-+
-+#if defined(HAVE_MKSTEMP)
-+   mode_t       mask;
-+
-+   *path = DmStrJoin( tmpdir, "/", -1, FALSE);
-+   *path = DmStrJoin( *path, "mkXXXXXX", -1, TRUE );
-+   *path = DmStrJoin( *path, suff, -1, TRUE );
-+   mask = umask(0044);
-+   fd = mkstemp( *path );
-+   umask(mask);
- 
-+#elif defined(HAVE_TEMPNAM)
-+   *path = DmStrJoin( tempnam(tmpdir, "mk"), suff, -1, TRUE );
-+   fd = open(*path, O_CREAT | O_EXCL | O_TRUNC | O_RDWR, 0600);
-+#else
-+
-+#error mkstemp() or tempnam() is needed
-+
-+#endif
-+
-+   return fd;
-+}
- 
- /*
- ** Generate a temporary file name and open the file for writing.
-@@ -449,19 +482,40 @@ Get_switch_char()
- ** return -1, else return the fileno of the open file.
- ** and update the source file pointer to point at the new file name.
- ** Note that the new name should be freed when the file is removed.
-+** The file stream is opened with the given mode
- */
- PUBLIC FILE*
--Get_temp(path, suff, op)
-+Get_temp(path, suff, mode)
- char **path;
- char *suff;
--int  op;
-+char *mode;
- {
--   extern char *tempnam();
--
--   *path = DmStrJoin( tempnam(NIL(char), "mk"), suff, -1, TRUE );
--   Def_macro( "TMPFILE", *path, M_MULTI|M_EXPANDED );
-+   int          fd;
-+   FILE         *fp;
-+   char         *tmpdir;
-+   int          tries = 20;
-+
-+   tmpdir = Read_env_string( "TMPDIR" );
-+   if( tmpdir == NIL(char) )
-+      tmpdir = "/tmp";
-+
-+   while( --tries )
-+   {
-+      if( (fd = Create_temp(tmpdir, path, suff)) != -1)
-+         break;
-+
-+      free(*path);
-+   }
-+
-+   if( fd != -1)
-+   {
-+      Def_macro( "TMPFILE", *path, M_MULTI|M_EXPANDED );
-+      fp = fdopen(fd, mode);
-+   }
-+   else
-+      fp = NIL(FILE);
- 
--   return( op?fopen(*path, "w"):NIL(FILE) );
-+   return fp;
- }
- 
- 
-@@ -480,7 +534,7 @@ char    **fname;
- 
-    name = (cp != NIL(CELL))?cp->CE_NAME:"makefile text";
- 
--   if( (fp = Get_temp(&tmpname, suffix, TRUE)) == NIL(FILE) )
-+   if( (fp = Get_temp(&tmpname, suffix, "w")) == NIL(FILE) )
-       Open_temp_error( tmpname, name );
- 
-    Link_temp( cp, fp, tmpname );
-Index: dmake/mac/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/mac/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/mac/public.h	12 Jun 2003 10:50:45 -0000	1.4
-+++ dmake/mac/public.h	14 Jul 2003 13:51:57 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/man/dmake.tf
-===================================================================
-RCS file: /cvs/tools/dmake/man/dmake.tf,v
-retrieving revision 1.2
-diff -u -3 -p -r1.2 dmake.tf
---- dmake/man/dmake.tf	3 Oct 2002 12:29:46 -0000	1.2
-+++ dmake/man/dmake.tf	14 Jul 2003 13:52:00 -0000
-@@ -1332,16 +1332,8 @@ The last line of the file is terminated 
- due to the \en found at the end of the \fIdata\fP string.
- .PP
- If the optional \fIfile\fP specifier is present then its expanded value
--is the name of the temporary file to create.  Whenever a $(mktmp ...) macro
--is expanded the macro $(TMPFILE) is set to a new temporary file name.  Thus
--the construct:
--.RS
--.sp
--$(mktmp,$(TMPFILE) data)
--.sp
--.RE
--is completely equivalent to not specifying the $(TMPFILE) optional argument.
--Another example that would be useful for MSDOS users with a Turbo-C compiler
-+is the name of the temporary file to create.  An example that would be useful
-+for MSDOS users with a Turbo-C compiler
- .RS
- .sp
- $(mktmp,turboc.cfg $(CFLAGS))
-Index: dmake/msdos/borland/bcc30/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/borland/bcc30/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/borland/bcc30/public.h	12 Jun 2003 10:50:57 -0000	1.4
-+++ dmake/msdos/borland/bcc30/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/msdos/borland/bcc40/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/borland/bcc40/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/borland/bcc40/public.h	12 Jun 2003 10:51:09 -0000	1.4
-+++ dmake/msdos/borland/bcc40/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/msdos/borland/bcc45/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/borland/bcc45/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/borland/bcc45/public.h	12 Jun 2003 10:51:19 -0000	1.4
-+++ dmake/msdos/borland/bcc45/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/msdos/borland/bcc50/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/borland/bcc50/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/borland/bcc50/public.h	12 Jun 2003 10:51:31 -0000	1.4
-+++ dmake/msdos/borland/bcc50/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/msdos/borland/tcc20/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/borland/tcc20/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/borland/tcc20/public.h	12 Jun 2003 10:51:41 -0000	1.4
-+++ dmake/msdos/borland/tcc20/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/msdos/microsft/msc51/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/microsft/msc51/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/microsft/msc51/public.h	12 Jun 2003 10:51:53 -0000	1.4
-+++ dmake/msdos/microsft/msc51/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/msdos/microsft/msc60/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/microsft/msc60/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/microsft/msc60/public.h	12 Jun 2003 10:52:05 -0000	1.4
-+++ dmake/msdos/microsft/msc60/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/msdos/zortech/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/msdos/zortech/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/msdos/zortech/public.h	12 Jun 2003 10:52:15 -0000	1.4
-+++ dmake/msdos/zortech/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/os2/ibm/icc/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/os2/ibm/icc/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/os2/ibm/icc/public.h	12 Jun 2003 10:52:26 -0000	1.4
-+++ dmake/os2/ibm/icc/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/os2/ibm/icc3/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/os2/ibm/icc3/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/os2/ibm/icc3/public.h	12 Jun 2003 10:52:38 -0000	1.4
-+++ dmake/os2/ibm/icc3/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/qssl/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/qssl/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/qssl/public.h	12 Jun 2003 10:52:50 -0000	1.4
-+++ dmake/qssl/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/tos/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/tos/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/tos/public.h	12 Jun 2003 10:53:07 -0000	1.4
-+++ dmake/tos/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/386ix/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/386ix/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/386ix/public.h	12 Jun 2003 10:53:18 -0000	1.4
-+++ dmake/unix/386ix/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/bsd43/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/bsd43/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/bsd43/public.h	12 Jun 2003 10:53:29 -0000	1.4
-+++ dmake/unix/bsd43/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/bsd43/uw/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/bsd43/uw/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/bsd43/uw/public.h	12 Jun 2003 10:53:40 -0000	1.4
-+++ dmake/unix/bsd43/uw/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/bsd43/vf/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/bsd43/vf/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/bsd43/vf/public.h	12 Jun 2003 10:53:52 -0000	1.4
-+++ dmake/unix/bsd43/vf/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/bsdarm32/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/bsdarm32/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/bsdarm32/public.h	12 Jun 2003 10:54:02 -0000	1.4
-+++ dmake/unix/bsdarm32/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/coherent/ver40/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/coherent/ver40/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/coherent/ver40/public.h	12 Jun 2003 10:54:12 -0000	1.4
-+++ dmake/unix/coherent/ver40/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/coherent/ver42/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/coherent/ver42/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/coherent/ver42/public.h	12 Jun 2003 10:54:24 -0000	1.4
-+++ dmake/unix/coherent/ver42/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/cygwin/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/cygwin/public.h,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 public.h
---- dmake/unix/cygwin/public.h	25 Mar 2003 14:02:46 -0000	1.3
-+++ dmake/unix/cygwin/public.h	14 Jul 2003 13:52:00 -0000
-@@ -144,7 +144,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/linux/gnu/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/linux/gnu/public.h,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 public.h
---- dmake/unix/linux/gnu/public.h	25 Mar 2003 14:02:46 -0000	1.3
-+++ dmake/unix/linux/gnu/public.h	14 Jul 2003 13:52:00 -0000
-@@ -183,7 +183,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/macosx/gnu/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/macosx/gnu/public.h,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 public.h
---- dmake/unix/macosx/gnu/public.h	25 Mar 2003 14:02:47 -0000	1.3
-+++ dmake/unix/macosx/gnu/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/solaris/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/solaris/public.h,v
-retrieving revision 1.2
-diff -u -3 -p -r1.2 public.h
---- dmake/unix/solaris/public.h	13 Jan 2003 14:28:05 -0000	1.2
-+++ dmake/unix/solaris/public.h	14 Jul 2003 13:52:00 -0000
-@@ -122,7 +122,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/solaris/gnu/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/solaris/gnu/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/solaris/gnu/public.h	12 Jun 2003 10:54:36 -0000	1.4
-+++ dmake/unix/solaris/gnu/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/sysvr1/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/sysvr1/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/sysvr1/public.h	12 Jun 2003 10:54:47 -0000	1.4
-+++ dmake/unix/sysvr1/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/sysvr3/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/sysvr3/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/sysvr3/public.h	12 Jun 2003 10:54:59 -0000	1.4
-+++ dmake/unix/sysvr3/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/sysvr3/gnu/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/sysvr3/gnu/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/sysvr3/gnu/public.h	12 Jun 2003 10:55:10 -0000	1.4
-+++ dmake/unix/sysvr3/gnu/public.h	14 Jul 2003 13:52:00 -0000
-@@ -121,7 +121,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/sysvr3/pwd/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/sysvr3/pwd/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/sysvr3/pwd/public.h	12 Jun 2003 10:55:21 -0000	1.4
-+++ dmake/unix/sysvr3/pwd/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/sysvr4/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/sysvr4/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/sysvr4/public.h	12 Jun 2003 10:55:33 -0000	1.4
-+++ dmake/unix/sysvr4/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/xenix/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/xenix/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/xenix/public.h	12 Jun 2003 10:55:47 -0000	1.4
-+++ dmake/unix/xenix/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/unix/xenix/pwd/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/unix/xenix/pwd/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/unix/xenix/pwd/public.h	12 Jun 2003 10:56:00 -0000	1.4
-+++ dmake/unix/xenix/pwd/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/win95/borland/bcc50/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/win95/borland/bcc50/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/win95/borland/bcc50/public.h	12 Jun 2003 10:56:12 -0000	1.4
-+++ dmake/win95/borland/bcc50/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/win95/microsft/vpp40/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/win95/microsft/vpp40/public.h,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 public.h
---- dmake/win95/microsft/vpp40/public.h	25 Mar 2003 14:02:54 -0000	1.3
-+++ dmake/win95/microsft/vpp40/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/winnt/borland/bcc50/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/winnt/borland/bcc50/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/winnt/borland/bcc50/public.h	12 Jun 2003 10:56:24 -0000	1.4
-+++ dmake/winnt/borland/bcc50/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/winnt/microsft/vpp40/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/winnt/microsft/vpp40/public.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 public.h
---- dmake/winnt/microsft/vpp40/public.h	12 Jun 2003 10:56:35 -0000	1.4
-+++ dmake/winnt/microsft/vpp40/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/winnt/mingw/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/winnt/mingw/public.h,v
-retrieving revision 1.2
-diff -u -3 -p -r1.2 public.h
---- dmake/winnt/mingw/public.h	25 Mar 2003 14:02:56 -0000	1.2
-+++ dmake/winnt/mingw/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
-Index: dmake/winnt/msvc6/public.h
-===================================================================
-RCS file: /cvs/tools/dmake/winnt/msvc6/public.h,v
-retrieving revision 1.2
-diff -u -3 -p -r1.2 public.h
---- dmake/winnt/msvc6/public.h	25 Mar 2003 14:02:57 -0000	1.2
-+++ dmake/winnt/msvc6/public.h	14 Jul 2003 13:52:00 -0000
-@@ -123,7 +123,7 @@ void Epilog ANSI((int));
- char *Get_current_dir ANSI(());
- int Set_dir ANSI((char*));
- char Get_switch_char ANSI(());
--FILE* Get_temp ANSI((char **, char *, int));
-+FILE* Get_temp ANSI((char **, char *, char *));
- FILE *Start_temp ANSI((char *, CELLPTR, char **));
- void Open_temp_error ANSI((char *, char *));
- void Link_temp ANSI((CELLPTR, FILE *, char *));
diff --git a/patches/OOO_1_1/gui-font-antialias-size.diff b/patches/OOO_1_1/gui-font-antialias-size.diff
deleted file mode 100644
index 5687d4b0c..000000000
--- a/patches/OOO_1_1/gui-font-antialias-size.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
-retrieving revision 1.84
-diff -u -p -u -r1.84 Common.xcs
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs	24 Jul 2003 13:12:08 -0000	1.84
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	29 Aug 2003 13:32:53 -0000
-@@ -13180,11 +13180,11 @@
- 						<label xml:lang="th">Font Antialiasing Minimum Pixel Height</label>
- 						<label xml:lang="x-comment">Font Antialiasing Minimum Pixel Height</label>
- 					</info>
--					<value>8</value>
-+					<value>1</value>
- 				</prop>
--			</group>
-+			</group>  <!-- dummy -->
- 		</group>
--		<group oor:name="Undo">
-+		<group oor:name="Undo"> <!-- dummy -->
- 			<info>
- 				<author>MBA</author>
- 				<desc xml:lang="en-US">Contains the settings regarding the undo operation in the Office.</desc>
diff --git a/patches/OOO_1_1/gui-ft-21-compat.patch b/patches/OOO_1_1/gui-ft-21-compat.patch
deleted file mode 100644
index 5a739fd69..000000000
--- a/patches/OOO_1_1/gui-ft-21-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: vcl/source/glyphs/gcach_ftyp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
-retrieving revision 1.90
-diff -u -p -u -r1.90 gcach_ftyp.cxx
---- vcl/source/glyphs/gcach_ftyp.cxx	24 Apr 2003 10:29:11 -0000	1.90
-+++ vcl/source/glyphs/gcach_ftyp.cxx	13 May 2003 12:55:20 -0000
-@@ -113,6 +113,13 @@
- #include <settings.hxx>
- #include <tools/lang.hxx>
- 
-+#if defined(FT_NEXT_SHORT) && !defined(NEXT_Short)
-+// Freetype 2.1 isn't fully compatible with the *internal(!)* API used by OOo
-+#  define NEXT_Short(x)  FT_NEXT_SHORT(x)
-+#  define NEXT_UShort(x) FT_NEXT_USHORT(x)
-+#  define NEXT_Long(x)	 FT_NEXT_LONG(x)
-+#endif
-+
- // -----------------------------------------------------------------------
- 
- static FT_Library aLibFT = 0;
diff --git a/patches/OOO_1_1/gui-icon-composite.diff b/patches/OOO_1_1/gui-icon-composite.diff
deleted file mode 100644
index fed5e0af7..000000000
--- a/patches/OOO_1_1/gui-icon-composite.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: vcl/source/control/fixed.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/control/fixed.cxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 fixed.cxx
---- vcl/source/control/fixed.cxx	17 Oct 2002 14:47:00 -0000	1.10
-+++ vcl/source/control/fixed.cxx	12 Sep 2003 14:38:28 -0000
-@@ -73,6 +73,9 @@
- #ifndef _VCL_CONTROLLAYOUT_HXX
- #include <controllayout.hxx>
- #endif
-+#ifndef _SV_BITMAPEX_HXX
-+#include <bitmapex.hxx>
-+#endif
- 
- #include <rc.h>
- 
-@@ -810,14 +820,16 @@ void FixedBitmap::ImplDraw( OutputDevice
- 	else
- 	{
- 		// Haben wir ueberhaupt eine Bitmap
--		if ( !(!(*pBitmap)) )
-+        if ( !!(*pBitmap) )
- 		{
-+			BitmapEx aEx( *pBitmap );
-+
- 			if ( GetStyle() & WB_SCALE )
--				pDev->DrawBitmap( rPos, rSize, *pBitmap );
-+				pDev->DrawBitmapEx( rPos, rSize, aEx );
- 			else
- 			{
- 				Point aPos = ImplCalcPos( GetStyle(), rPos, pBitmap->GetSizePixel(), rSize );
--				pDev->DrawBitmap( aPos, *pBitmap );
-+				pDev->DrawBitmapEx( aPos, aEx );
- 			}
- 		}
- 	}
diff --git a/patches/OOO_1_1/gui-keybindings.diff b/patches/OOO_1_1/gui-keybindings.diff
deleted file mode 100644
index 0bc516e05..000000000
--- a/patches/OOO_1_1/gui-keybindings.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: sc/source/ui/src/menue.src
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/src/menue.src,v
-retrieving revision 1.101
-diff -u -p -u -r1.101 menue.src
---- sc/source/ui/src/menue.src	29 Apr 2003 17:10:19 -0000	1.101
-+++ sc/source/ui/src/menue.src	14 May 2003 14:47:03 -0000
-@@ -157,7 +157,7 @@ Accelerator SCCFG_ACCELERATOR
- 		 // Ansicht
- 		AI_NAVIGATOR
-          // Absatz
--		AI_ATTR_PARA_LINESPACE_10
-+//		AI_ATTR_PARA_LINESPACE_10
- 		AI_ATTR_PARA_LINESPACE_20
- 		AI_ATTR_PARA_LINESPACE_15
- 		AI_ALIGNLEFT
-@@ -256,6 +256,7 @@ Accelerator SCCFG_ACCELERATOR
- 		USR_ACCEL ( SID_OUTLINE_REMOVE , KEY_F12 , FALSE , TRUE , FALSE )
- 		USR_ACCEL ( FID_FOCUS_POSWND , KEY_T , TRUE , TRUE , FALSE )
- 		USR_ACCEL ( FID_FOCUS_POSWND , KEY_F5 , TRUE , TRUE , FALSE )
-+		USR_ACCEL ( FID_CELL_FORMAT , KEY_1 , FALSE , TRUE , FALSE )
- 	};
- };
- 
-Index: sch/source/ui/app/menu.src
-===================================================================
-RCS file: /cvs/graphics/sch/source/ui/app/menu.src,v
-retrieving revision 1.47
-diff -u -p -u -r1.47 menu.src
---- sch/source/ui/app/menu.src	17 Jul 2003 11:37:32 -0000	1.47
-+++ sch/source/ui/app/menu.src	21 Jul 2003 17:04:48 -0000
-@@ -125,6 +125,17 @@ Accelerator RID_ACCEL
- 		};
- 		AcceleratorItem
- 		{
-+			Identifier = SID_OPENDOC ;
-+			Key = KeyCode
-+			{
-+                                Code = KEY_F3 ;
-+                                Shift = FALSE ;
-+                                Modifier1 = FALSE ;
-+                                Modifier2 = FALSE ;
-+			};
-+		};
-+		AcceleratorItem
-+		{
- 			Identifier = SID_SAVEDOC ;
- 			Key = KeyCode
- 			{
diff --git a/patches/OOO_1_1/gui-menu-check-images.diff b/patches/OOO_1_1/gui-menu-check-images.diff
deleted file mode 100644
index 558f0de2b..000000000
--- a/patches/OOO_1_1/gui-menu-check-images.diff
+++ /dev/null
@@ -1,78 +0,0 @@
---- vcl/source/window/menu-checkbox-off.xpm	Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-checkbox-off.xpm	Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,12 @@
-+/* XPM */
-+static char * menu_checkbox_off_xpm[] = {
-+"8 8 1 1",
-+" 	c None",
-+"        ",
-+"        ",
-+"        ",
-+"        ",
-+"        ",
-+"        ",
-+"        ",
-+"        "};
---- vcl/source/window/menu-checkbox-on.xpm	Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-checkbox-on.xpm	Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,16 @@
-+/* XPM */
-+static char * menu_checkbox_on_xpm[] = {
-+"8 8 5 1",
-+" 	c None",
-+"+	c #DEDEDE",
-+"@	c #000000",
-+"#	c #989898",
-+"$	c #C9C9C9",
-+"        ",
-+"        ",
-+"     +@#",
-+"+@+ +@@+",
-+"@@@$@@+ ",
-+"+@@@@+  ",
-+" +@@+   ",
-+"        "};
---- vcl/source/window/menu-radio-off.xpm	Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-radio-off.xpm	Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,18 @@
-+/* XPM */
-+static char * menu_radio_off_xpm[] = {
-+"8 8 7 1",
-+" 	c None",
-+".	c #FDFDFD",
-+"+	c #CDCDCD",
-+"@	c #4F4F4F",
-+"#	c #0A0A0A",
-+"$	c #D3D3D3",
-+"%	c #FEFEFE",
-+" +@##@+ ",
-+"+#$%%$#+",
-+"@$....$@",
-+"#%....%#",
-+"#%....%#",
-+"@$....$@",
-+"+#$%%$#+",
-+" +@##@+ "};
---- vcl/source/window/menu-radio-on.xpm	Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-radio-on.xpm	Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,20 @@
-+/* XPM */
-+static char * menu_radio_on_xpm[] = {
-+"8 8 9 1",
-+" 	c None",
-+"+	c #CDCDCD",
-+"@	c #4F4F4F",
-+"#	c #0A0A0A",
-+"$	c #D3D3D3",
-+"%	c #FEFEFE",
-+"&	c #9F9F9F",
-+"*	c #151515",
-+"=	c #000000",
-+" +@##@+ ",
-+"+#$%%$#+",
-+"@$&**&$@",
-+"#%*==*%#",
-+"#%*==*%#",
-+"@$&**&$@",
-+"+#$%%$#+",
-+" +@##@+ "};
diff --git a/patches/OOO_1_1/gui-menu-check-render.diff b/patches/OOO_1_1/gui-menu-check-render.diff
deleted file mode 100644
index 2315fa45d..000000000
--- a/patches/OOO_1_1/gui-menu-check-render.diff
+++ /dev/null
@@ -1,393 +0,0 @@
-Index: vcl/source/window/menu.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/menu.cxx,v
-retrieving revision 1.96
-diff -u -p -u -r1.96 menu.cxx
---- vcl/source/window/menu.cxx	12 Jun 2003 07:51:30 -0000	1.96
-+++ vcl/source/window/menu.cxx	6 Aug 2003 16:44:44 -0000
-@@ -171,6 +171,339 @@
- 
- #include <map>
- 
-+
-+#include <ctype.h>
-+#include <stdio.h>
-+
-+#include <salbtype.hxx>
-+#include <bmpacc.hxx>
-+
-+#include "menu-checkbox-off.xpm"
-+#include "menu-checkbox-on.xpm"
-+#include "menu-radio-off.xpm"
-+#include "menu-radio-on.xpm"
-+
-+static void
-+rgb_to_hls (double *r,
-+            double *g,
-+            double *b)
-+{
-+	double min;
-+	double max;
-+	double red;
-+	double green;
-+	double blue;
-+	double h, l, s;
-+	double delta;
-+  
-+	red = *r;
-+	green = *g;
-+	blue = *b;
-+  
-+	if (red > green) {
-+		if (red > blue)
-+			max = red;
-+		else
-+			max = blue;
-+      
-+		if (green < blue)
-+			min = green;
-+		else
-+			min = blue;
-+    } else {
-+		if (green > blue)
-+			max = green;
-+		else
-+			max = blue;
-+      
-+		if (red < blue)
-+			min = red;
-+		else
-+			min = blue;
-+    }
-+  
-+	l = (max + min) / 2;
-+	s = 0;
-+	h = 0;
-+  
-+	if (max != min) {
-+		if (l <= 0.5)
-+			s = (max - min) / (max + min);
-+		else
-+			s = (max - min) / (2 - max - min);
-+      
-+		delta = max -min;
-+		if (red == max)
-+			h = (green - blue) / delta;
-+		else if (green == max)
-+			h = 2 + (blue - red) / delta;
-+		else if (blue == max)
-+			h = 4 + (red - green) / delta;
-+      
-+		h *= 60;
-+		if (h < 0.0)
-+			h += 360;
-+    }
-+  
-+	*r = h;
-+	*g = l;
-+	*b = s;
-+}
-+
-+static void
-+hls_to_rgb (double *h,
-+            double *l,
-+            double *s)
-+{
-+	double hue;
-+	double lightness;
-+	double saturation;
-+	double m1, m2;
-+	double r, g, b;
-+  
-+	lightness = *l;
-+	saturation = *s;
-+  
-+	if (lightness <= 0.5)
-+		m2 = lightness * (1 + saturation);
-+	else
-+		m2 = lightness + saturation - lightness * saturation;
-+	m1 = 2 * lightness - m2;
-+  
-+	if (saturation == 0) {
-+		*h = lightness;
-+		*l = lightness;
-+		*s = lightness;
-+    } else {
-+		hue = *h + 120;
-+		while (hue > 360)
-+			hue -= 360;
-+		while (hue < 0)
-+			hue += 360;
-+      
-+		if (hue < 60)
-+			r = m1 + (m2 - m1) * hue / 60;
-+		else if (hue < 180)
-+			r = m2;
-+		else if (hue < 240)
-+			r = m1 + (m2 - m1) * (240 - hue) / 60;
-+		else
-+			r = m1;
-+      
-+		hue = *h;
-+		while (hue > 360)
-+			hue -= 360;
-+		while (hue < 0)
-+			hue += 360;
-+      
-+		if (hue < 60)
-+			g = m1 + (m2 - m1) * hue / 60;
-+		else if (hue < 180)
-+			g = m2;
-+		else if (hue < 240)
-+			g = m1 + (m2 - m1) * (240 - hue) / 60;
-+		else
-+			g = m1;
-+      
-+		hue = *h - 120;
-+		while (hue > 360)
-+			hue -= 360;
-+		while (hue < 0)
-+			hue += 360;
-+      
-+		if (hue < 60)
-+			b = m1 + (m2 - m1) * hue / 60;
-+		else if (hue < 180)
-+			b = m2;
-+		else if (hue < 240)
-+			b = m1 + (m2 - m1) * (240 - hue) / 60;
-+		else
-+			b = m1;
-+      
-+		*h = r;
-+		*l = g;
-+		*s = b;
-+    }
-+}
-+
-+/* Does some weird shading from the bg and fg colors and puts the result in (ir, ig, ib) */
-+static void
-+shade_rgb (int *ir, int *ig, int *ib, const Color &fg_color, const Color &bg_color, double value)
-+{
-+	double r, g, b;
-+	double f_r, f_g, f_b;
-+
-+	r = bg_color.GetRed () / 255.0;
-+	g = bg_color.GetGreen () / 255.0;
-+	b = bg_color.GetBlue () / 255.0;
-+
-+	f_r = fg_color.GetRed () / 255.0;
-+	f_g = fg_color.GetGreen () / 255.0;
-+	f_b = fg_color.GetBlue () / 255.0;
-+
-+	rgb_to_hls (&r, &g, &b);
-+	rgb_to_hls (&f_r, &f_g, &f_b);
-+
-+	/* now green is the lightness */
-+
-+	g = (g - f_g) * value + f_g;
-+	if (g > 1.0)
-+		g = 1.0;
-+	else if (g < 0.0)
-+		g = 0.0;
-+
-+	hls_to_rgb (&r, &g, &b);
-+
-+	*ir = (r * 255.0) + 0.5;
-+	*ig = (g * 255.0) + 0.5;
-+	*ib = (b * 255.0) + 0.5;
-+}
-+
-+/* Takes a grayscale XPM and shades it into a Bitmap */
-+static Bitmap *
-+create_shaded_bitmap (char **xpm, const Color &fg_color, const Color &bg_color)
-+{
-+	char *line;
-+	int width, height, n_colors, color_len;
-+	int palette[256]; /* 0xRRGGBBAA */
-+	Bitmap *bitmap;
-+	BitmapWriteAccess *wa;
-+	int i;
-+	int y;
-+	int br, bg, bb;
-+
-+	line = xpm[0];
-+
-+	if (sscanf (line, "%d%d%d%d", &width, &height, &n_colors, &color_len) != 4)
-+		return NULL;
-+
-+	if (color_len != 1)
-+		return NULL;
-+
-+	/* Read the palette */
-+
-+	for (i = 0; i < 256; i++)
-+		palette[i] = 0;
-+
-+	for (i = 0; i < n_colors; i++) {
-+		char *p;
-+		int color_id;
-+		int color;
-+		BOOL is_transparent;
-+
-+		line = xpm[i + 1];
-+		p = line;
-+
-+		color_id = *p++;
-+
-+		while (*p && isspace (*p))
-+			p++;
-+
-+		if (*p != 'c')
-+			return NULL;
-+
-+		p++;
-+
-+		while (*p && isspace (*p))
-+			p++;
-+
-+		color = 0;
-+		is_transparent = TRUE;
-+
-+		if (*p == '#') {
-+			p++;
-+			is_transparent = FALSE;
-+
-+			while (*p) {
-+				color = (color << 4);
-+
-+				if (*p >= '0' && *p <= '9')
-+					color += *p - '0';
-+				else if (*p >= 'A' && *p <= 'Z')
-+					color += *p - 'A' + 10;
-+				else
-+					break;
-+
-+				p++;
-+			}
-+		}
-+
-+		color = color << 8;
-+		if (!is_transparent)
-+			color = color | 0xFF;
-+
-+		palette[color_id] = color;
-+	}
-+
-+	/* Create the bitmap */
-+
-+	bitmap = new Bitmap (Size (width, height), 24);
-+	if (!bitmap)
-+		return NULL;
-+
-+	wa = bitmap->AcquireWriteAccess ();
-+	if (!wa) {
-+		delete bitmap;
-+		return NULL;
-+	}
-+
-+	br = bg_color.GetRed ();
-+	bg = bg_color.GetGreen ();
-+	bb = bg_color.GetBlue ();
-+
-+	for (y = 0; y < height; y++) {
-+		int x;
-+
-+		line = xpm[y + n_colors + 1];
-+
-+		for (x = 0; x < width; x++) {
-+			int color;
-+			double gray;
-+			int r, g, b, a;
-+			int tmp;
-+
-+			color = palette[line[x]];
-+			gray = ((color & 0xFF00) >> 8) / 254.0; /* who knows why that is the maximum value in the files */
-+			a = color & 0xFF;
-+
-+			shade_rgb (&r, &g, &b, fg_color, bg_color, gray);
-+
-+			tmp = (r - br) * a;
-+			r = br + ((tmp + (tmp >> 8) + 0x80) >> 8);
-+
-+			tmp = (g - bg) * a;
-+			g = bg + ((tmp + (tmp >> 8) + 0x80) >> 8);
-+
-+			tmp = (b - bb) * a;
-+			b = bb + ((tmp + (tmp >> 8) + 0x80) >> 8);
-+
-+			wa->SetPixel (y, x, BitmapColor (r, g, b));
-+		}
-+	}
-+
-+	bitmap->ReleaseAccess (wa);
-+
-+	return bitmap;
-+}
-+
-+/* Generates the appropriate image for a check or radio menu item */
-+static Bitmap *
-+create_option_bitmap (BOOL is_radio, BOOL is_active, const Color &fg_color, const Color &bg_color)
-+{
-+	static char **xpms[] = {
-+		menu_checkbox_off_xpm,
-+		menu_checkbox_on_xpm,
-+		menu_radio_off_xpm,
-+		menu_radio_on_xpm
-+	};
-+
-+	char **xpm;
-+
-+	xpm = xpms[(is_radio ? 2 : 0) | (is_active ? 1 : 0)];
-+
-+	return create_shaded_bitmap (xpm, fg_color, bg_color);
-+}
-+
- namespace vcl
- {
- 
-@@ -2093,6 +2435,7 @@ void Menu::ImplPaint( Window* pWin, USHO
-                 }
- 
-                 // CheckMark
-+#if 0
-                 if ( !bLayout && !bIsMenuBar && pData->bChecked )
-                 {
-                     Rectangle aRect;
-@@ -2116,6 +2459,37 @@ void Menu::ImplPaint( Window* pWin, USHO
-                     }
-                     aDecoView.DrawSymbol( aRect, eSymbol, pWin->GetTextColor(), nSymbolStyle );
-                 }
-+#endif
-+                if ( !bIsMenuBar
-+		     && !pData->pSubMenu
-+		     && ( pData->bChecked || (pData->nBits & (MIB_RADIOCHECK | MIB_CHECKABLE | MIB_AUTOCHECK)) ) )
-+                {
-+			Bitmap *bitmap;
-+			BOOL is_radio;
-+			BOOL is_active;
-+			const StyleSettings &settings = pWin->GetSettings().GetStyleSettings();
-+			
-+			is_radio = (pData->nBits & MIB_RADIOCHECK) != 0;
-+			is_active = pData->bChecked;
-+			
-+			bitmap = create_option_bitmap (is_radio,
-+						       is_active,
-+						       settings.GetMenuTextColor (),
-+						       pWin->GetFillColor ());
-+			
-+			if (bitmap) {
-+				Point p;
-+				int text_yofs;
-+				
-+				text_yofs = (pData->aSz.Height() - nFontHeight) / 2;
-+				
-+				p.X () = aPos.X () + nCheckPos;
-+				p.Y () = aPos.Y () + text_yofs + nFontHeight / 2 - bitmap->GetSizePixel ().Height () / 2;
-+				
-+				pWin->DrawBitmap (p, *bitmap);
-+				delete bitmap;
-+			}
-+                }
- 
-                 // SubMenu?
-                 if ( !bLayout && !bIsMenuBar && pData->pSubMenu )
diff --git a/patches/OOO_1_1/gui-metric-fonts.diff b/patches/OOO_1_1/gui-metric-fonts.diff
deleted file mode 100644
index 781fd4fcf..000000000
--- a/patches/OOO_1_1/gui-metric-fonts.diff
+++ /dev/null
@@ -1,215 +0,0 @@
-Index: officecfg/registry/data/org/openoffice/VCL.xcu
-===================================================================
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
-retrieving revision 1.20
-diff -u -p -u -r1.20 VCL.xcu
---- officecfg/registry/data/org/openoffice/VCL.xcu	16 Jul 2003 17:35:55 -0000	1.20
-+++ officecfg/registry/data/org/openoffice/VCL.xcu	8 Aug 2003 21:09:57 -0000
-@@ -694,7 +694,7 @@
-           <value>albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
--          <value/>
-+          <value>Trebuchet</value>
-         </prop>
-         <prop oor:name="SubstFontsPS">
-           <value/>
-@@ -763,8 +763,31 @@
-           <value>comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-+          <value>comic</value>
-+        </prop>
-+        <prop oor:name="SubstFontsPS">
-           <value/>
-         </prop>
-+        <prop oor:name="SubstFontsHTML">
-+          <value>cursive</value>
-+        </prop>
-+        <prop oor:name="FontWeight">
-+          <value>Normal</value>
-+        </prop>
-+        <prop oor:name="FontWidth">
-+          <value>Normal</value>
-+        </prop>
-+        <prop oor:name="FontType">
-+          <value>Italic,Script,Comic</value>
-+        </prop>
-+      </node>
-+      <node oor:name="andymt" oor:op="replace">
-+        <prop oor:name="SubstFonts">
-+          <value>comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting</value>
-+        </prop>
-+        <prop oor:name="SubstFontsMS">
-+          <value>comic</value>
-+        </prop>
-         <prop oor:name="SubstFontsPS">
-           <value/>
-         </prop>
-@@ -1013,7 +1036,30 @@
-       </node>
-       <node oor:name="bell" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino</value>
-+          <value>bellmt;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino</value>
-+        </prop>
-+        <prop oor:name="SubstFontsMS">
-+          <value/>
-+        </prop>
-+        <prop oor:name="SubstFontsPS">
-+          <value/>
-+        </prop>
-+        <prop oor:name="SubstFontsHTML">
-+          <value>serif</value>
-+        </prop>
-+        <prop oor:name="FontWeight">
-+          <value>Normal</value>
-+        </prop>
-+        <prop oor:name="FontWidth">
-+          <value>Normal</value>
-+        </prop>
-+        <prop oor:name="FontType">
-+          <value>Normal,Serif</value>
-+        </prop>
-+      </node>
-+      <node oor:name="georgia" oor:op="replace">
-+        <prop oor:name="SubstFonts">
-+          <value>bellmt;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -1542,7 +1588,7 @@
-       </node>
-       <node oor:name="comicsans" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting</value>
-+          <value>andymt;comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -1565,7 +1611,7 @@
-       </node>
-       <node oor:name="comicsansms" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting</value>
-+          <value>andymt;comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -5498,7 +5544,7 @@
-       </node>
-       <node oor:name="sans" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>helvetica;arial;albanyamt;bitstreamvera;verdana;nimbussansl;luxisans;albany;arial;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -5662,7 +5708,7 @@
-           <value>albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
--          <value/>
-+          <value>Verdana</value>
-         </prop>
-         <prop oor:name="SubstFontsPS">
-           <value/>
-@@ -5912,7 +5958,7 @@
-       </node>
-       <node oor:name="sorts" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;opensymbol;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>monotypesorts;starsymbol;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;opensymbol;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -5935,7 +5981,7 @@
-       </node>
-       <node oor:name="sorts2" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>monotypesorts;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -5958,7 +6004,7 @@
-       </node>
-       <node oor:name="sorts3" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>monotypesorts;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6349,7 +6395,7 @@
-       </node>
-       <node oor:name="trebuchet" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>andalesans;verdana;trebuchetms;albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6487,7 +6533,7 @@
-       </node>
-       <node oor:name="verdana" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans</value>
-+          <value>segoe;albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6579,7 +6625,7 @@
-       </node>
-       <node oor:name="webdings" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>netdings;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6602,7 +6648,7 @@
-       </node>
-       <node oor:name="webdings2" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>netdings;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6625,7 +6671,7 @@
-       </node>
-       <node oor:name="webdings3" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>netdings;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6671,7 +6717,7 @@
-       </node>
-       <node oor:name="wingdings" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;wingdings;morewingbats;opensymbol;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>lingdings;starsymbol;wingdings;morewingbats;opensymbol;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6694,7 +6740,7 @@
-       </node>
-       <node oor:name="wingdings2" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>lingdings;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
-@@ -6717,7 +6763,7 @@
-       </node>
-       <node oor:name="wingdings3" oor:op="replace">
-         <prop oor:name="SubstFonts">
--          <value>starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-+          <value>lingdings;starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl;andalesansui;arialunicodems;lucidaunicode</value>
-         </prop>
-         <prop oor:name="SubstFontsMS">
-           <value/>
diff --git a/patches/OOO_1_1/gui-sc-delete.diff b/patches/OOO_1_1/gui-sc-delete.diff
deleted file mode 100644
index 52d6cf657..000000000
--- a/patches/OOO_1_1/gui-sc-delete.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: sc/source/ui/src/menue.src
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/src/menue.src,v
-retrieving revision 1.104
-diff -u -p -u -r1.104 menue.src
---- sc/source/ui/src/menue.src	17 Jul 2003 12:56:00 -0000	1.104
-+++ sc/source/ui/src/menue.src	7 Aug 2003 12:52:06 -0000
-@@ -1132,8 +1133,8 @@ Menu SCCFG_PLUGINMENU
- 					};
- 					MenuItem
- 					{
--						Identifier = SID_DELETE ;
--						HelpId = SID_DELETE ;
-+						Identifier = SID_DELETE_CONTENTS ;
-+						HelpId = SID_DELETE_CONTENTS ;
- 						Text = "Inhalte l~�schen..." ;
- 						Text [ ENGLISH ] = "Dele~te Data..." ;
- 						Text [ norwegian ] = "Dele~te Data..." ;
-@@ -5596,8 +5597,8 @@ Menu SCCFG_MENUBAR
- 					};
- 					MenuItem
- 					{
--						Identifier = SID_DELETE ;
--						HelpId = SID_DELETE ;
-+						Identifier = SID_DELETE_CONTENTS ;
-+						HelpId = SID_DELETE_CONTENTS ;
- 						Text = "Inhalte l~�schen..." ;
- 						Text [ ENGLISH ] = "Dele~te Data..." ;
- 						Text [ norwegian ] = "Dele~te Data..." ;
-Index: sc/source/ui/view/cellsh1.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/cellsh1.cxx,v
-retrieving revision 1.25
-diff -u -p -u -r1.25 cellsh1.cxx
---- sc/source/ui/view/cellsh1.cxx	20 Nov 2002 14:34:34 -0000	1.25
-+++ sc/source/ui/view/cellsh1.cxx	7 Aug 2003 12:52:40 -0000
-@@ -338,12 +338,12 @@ void ScCellShell::ExecuteEdit( SfxReques
- 		//	Inhalte von Zellen loeschen
- 		//
- 
--		case SID_DELETE_CONTENTS:
-+		case SID_DELETE:
- 			pTabViewShell->DeleteContents( IDF_CONTENTS );
- 			rReq.Done();
- 			break;
- 
--		case SID_DELETE:
-+		case SID_DELETE_CONTENTS:
- 			{
- 				USHORT	nFlags = IDF_NONE;
- 
diff --git a/patches/OOO_1_1/gui-tbx-ctrl-bg.diff b/patches/OOO_1_1/gui-tbx-ctrl-bg.diff
deleted file mode 100644
index 0dbc6742b..000000000
--- a/patches/OOO_1_1/gui-tbx-ctrl-bg.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: svx/source/tbxctrls/tbcontrl.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/tbxctrls/tbcontrl.cxx,v
-retrieving revision 1.42
-diff -u -p -u -r1.42 tbcontrl.cxx
---- svx/source/tbxctrls/tbcontrl.cxx	6 Jun 2003 10:44:32 -0000	1.42
-+++ svx/source/tbxctrls/tbcontrl.cxx	11 Jul 2003 14:44:19 -0000
-@@ -1814,11 +1814,16 @@ void SvxTbxButtonColorUpdater_Impl::Upda
- 	BOOL	bSizeChanged = ( theBmpSize != aImage.GetSizePixel() );
- 	BOOL	bDisplayModeChanged = ( bWasHiContrastMode != pTbx->GetBackground().GetColor().IsDark() );
- 
-+	Color	aTransparentColor; // A hack - much like the others for alpha:
-+	const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-+	aTransparentColor = rStyleSettings.GetFaceColor ();
-+
-     Color aColor( rColor );
-+
-     
-     // #109290# Workaround for SetFillColor with COL_AUTO
-     if ( aColor.GetColor() == COL_AUTO )
--        aColor = Color( IMAGE_COL_TRANSPARENT );
-+        aColor = aTransparentColor;
- 
- 	if ( aCurColor == aColor && !bSizeChanged && !bDisplayModeChanged )
- 		return;
-@@ -1838,7 +1843,7 @@ void SvxTbxButtonColorUpdater_Impl::Upda
- 
- 		aVirDev.SetPen( Pen( PEN_NULL ) );
- 		aVirDev.SetOutputSizePixel( theBmpSize );
--		aVirDev.SetFillColor( Color( IMAGE_COL_TRANSPARENT ) );
-+		aVirDev.SetFillColor( aTransparentColor );
- 		aVirDev.DrawRect( Rectangle( aNullPnt, theBmpSize ) );
- 		aVirDev.DrawImage( aNullPnt, aImage );
- 		delete pBtnBmp;
-@@ -1860,7 +1865,7 @@ void SvxTbxButtonColorUpdater_Impl::Upda
- 
- 	if ( nDrawMode == TBX_UPDATER_MODE_CHAR_COLOR_NEW &&
- 		 ( aColor.GetColor() != COL_AUTO &&
--		   aColor.GetColor() != IMAGE_COL_TRANSPARENT ))
-+		   aColor != aTransparentColor ) )
- 	{
- 		// Draw border only if COLOR_AUTO is the new color!
- 		aVirDev.SetLineColor( aColor );
-@@ -1878,6 +1883,7 @@ void SvxTbxButtonColorUpdater_Impl::Upda
- 	}
- 	else if ( nDrawMode != TBX_UPDATER_MODE_NONE )
- 	{
-+		aVirDev.SetFillColor( aTransparentColor );
- 		DrawChar( aVirDev, aColor );
- 	}
- 	else
-@@ -1885,21 +1891,9 @@ void SvxTbxButtonColorUpdater_Impl::Upda
- 
- 	aCurColor = aColor;
- 
--    // The following code asumes that we cannot change the display color depth
--    // during Office runtime. Which is at least NOT true for newer Windows versions!
--	const Bitmap	aBmp( aVirDev.GetBitmap( aNullPnt, theBmpSize ) );
--	static Color	aTransparentColor;
--	static sal_Bool	bTransparentColorInitialized = sal_False;
--
--	if( !bTransparentColorInitialized )
--	{
--		aVirDev.DrawPixel( aNullPnt, IMAGE_COL_TRANSPARENT );
--		aTransparentColor = aVirDev.GetPixel( aNullPnt );
--		bTransparentColorInitialized = sal_True;
--	}
-+	const Bitmap aBmp( aVirDev.GetBitmap( aNullPnt, theBmpSize ) );
-+	Image aNewImage( aBmp );
- 
--	Bitmap	aMaskBitmap = aBmp.CreateMask( aTransparentColor );
--	Image aNewImage( aBmp, aMaskBitmap );
- 	pTbx->SetItemImage( nBtnId, aNewImage );
- }
- 
-@@ -1917,7 +1911,6 @@ void SvxTbxButtonColorUpdater_Impl::Draw
- 	if ( nDrawMode == TBX_UPDATER_MODE_CHAR_COLOR )
- 	{
- 		aFont.SetColor( rCol );
--		aFont.SetFillColor( Color( IMAGE_COL_TRANSPARENT ) );
- 	}
- 	else
- 	{
diff --git a/patches/OOO_1_1/gui-tbx-palette.diff b/patches/OOO_1_1/gui-tbx-palette.diff
deleted file mode 100644
index 038568403..000000000
--- a/patches/OOO_1_1/gui-tbx-palette.diff
+++ /dev/null
@@ -1,73 +0,0 @@
---- svx/source/tbxctrls/tbcontrl.cxx
-+++ svx/source/tbxctrls/tbcontrl.cxx
-@@ -1008,6 +1008,10 @@
- #define WB_NO_DIRECTSELECT      ((WinBits)0x04000000)
- #endif
- 
-+#define PALETTE_X 10
-+#define PALETTE_Y 10
-+#define PALETTE_SIZE (PALETTE_X * PALETTE_Y)
-+
- SvxColorWindow_Impl::SvxColorWindow_Impl( USHORT nId, USHORT nSlotId,
- 								const String& rWndTitle,
- 								SfxBindings& rBindings ) :
-@@ -1021,7 +1025,7 @@
- 	SfxObjectShell* pDocSh = SfxObjectShell::Current();
- 	const SfxPoolItem* pItem = NULL;
- 	XColorTable* pColorTable = NULL;
--	const Size aSize12( 12, 12 );
-+	const Size aSize12( 13, 13 );
- 
- 	if ( pDocSh )
- 		if ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) )
-@@ -1051,8 +1055,8 @@
- 		Color aColWhite( COL_WHITE );
- 		String aStrWhite( SVX_RES(RID_SVXITEMS_COLOR_WHITE) );
- 
--		if ( nCount > 80 )
--			// bei mehr als 80 Farben ScrollBar anzeigen
-+		if ( nCount > PALETTE_SIZE )
-+			// bei mehr als Max Farben ScrollBar anzeigen
- 			aColorSet.SetStyle( aColorSet.GetStyle() | WB_VSCROLL );
- 
- 		for ( i = 0; i < nCount; i++ )
-@@ -1061,17 +1065,17 @@
- 			aColorSet.InsertItem( i+1, pEntry->GetColor(), pEntry->GetName() );
- 		}
- 
--		while ( i < 80 )
-+		while ( i < PALETTE_SIZE )
- 		{
--			// bei weniger als 80 Farben, mit Weiss auff"ullen
-+			// bei weniger als Max Farben, mit Weiss auff"ullen
- 			aColorSet.InsertItem( i+1, aColWhite, aStrWhite );
- 			i++;
- 		}
- 	}
- 
-     aColorSet.SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
--	aColorSet.SetColCount( 8 );
--	aColorSet.SetLineCount( 10 );
-+	aColorSet.SetColCount( PALETTE_X );
-+	aColorSet.SetLineCount( PALETTE_Y );
- 
- 	lcl_CalcSizeValueSet( *this, aColorSet, aSize12 );
- 
-@@ -1163,7 +1167,7 @@
- 
- 		// ScrollBar an oder aus
- 		WinBits nBits = aColorSet.GetStyle();
--		if ( nCount > 80 )
-+		if ( nCount > PALETTE_SIZE )
- 			nBits &= ~WB_VSCROLL;
- 		else
- 			nBits |= WB_VSCROLL;
-@@ -1176,7 +1180,7 @@
- 			aColorSet.SetItemText ( i + 1, pEntry->GetName() );
- 		}
- 
--		while ( i < 80 )
-+		while ( i < PALETTE_SIZE )
- 		{
- 			aColorSet.SetItemColor( i + 1, aColWhite );
- 			aColorSet.SetItemText ( i + 1, aStrWhite );
diff --git a/patches/OOO_1_1/gui-tbxcust.diff b/patches/OOO_1_1/gui-tbxcust.diff
deleted file mode 100644
index 2192f8e10..000000000
--- a/patches/OOO_1_1/gui-tbxcust.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sfx2/source/toolbox/tbxcust.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/toolbox/tbxcust.cxx,v
-retrieving revision 1.26
-diff -u -p -u -r1.26 tbxcust.cxx
---- sfx2/source/toolbox/tbxcust.cxx	4 Apr 2003 17:39:20 -0000	1.26
-+++ sfx2/source/toolbox/tbxcust.cxx	14 May 2003 14:32:23 -0000
-@@ -1080,7 +1080,7 @@ SfxUserBitmapDialog_Impl::SfxUserBitmapD
- 				if ( !!aBitmap )
- 				{
- 					if ( aBitmap.GetSizePixel() != aSize )
--						aBitmap.Scale( aSize, BMP_SCALE_FAST );
-+						aBitmap.Scale( aSize, BMP_SCALE_INTERPOLATE );
- 
- 					// Add image to the image list which will be used to initialize toolbox
- 					aBitmapUrls.push_back( rUrl );
diff --git a/patches/OOO_1_1/gui-toolbox-cleanup.diff b/patches/OOO_1_1/gui-toolbox-cleanup.diff
deleted file mode 100644
index b584ce78a..000000000
--- a/patches/OOO_1_1/gui-toolbox-cleanup.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: sfx2/source/appl/app.src
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/app.src,v
-retrieving revision 1.88
-diff -u -r1.88 app.src
---- sfx2/source/appl/app.src	17 Jul 2003 13:14:26 -0000	1.88
-+++ sfx2/source/appl/app.src	15 Aug 2003 10:25:27 -0000
-@@ -3521,6 +3521,7 @@
- 		ToolBoxItem
- 		{
- 			Identifier = SID_OPENURL ;
-+			Hide = TRUE ;
- 		};
- 		ToolBoxItem
- 		{
-Index: sfx2/source/view/view.src
-===================================================================
-RCS file: /cvs/framework/sfx2/source/view/view.src,v
-retrieving revision 1.40
-diff -u -r1.40 view.src
---- sfx2/source/view/view.src	17 Jul 2003 13:22:42 -0000	1.40
-+++ sfx2/source/view/view.src	15 Aug 2003 10:25:52 -0000
-@@ -1073,6 +1079,7 @@
- 		ToolBoxItem
- 		{
- 			Identifier = SID_OPENURL ;
-+			Hide = TRUE ;
- 		};
- 		ToolBoxItem
- 		{
-@@ -1089,6 +1096,7 @@
- 		ToolBoxItem
- 		{
- 			Identifier = SID_BROWSE_STOP ;
-+			Hide = TRUE;
- 		};
- 		ToolBoxItem
- 		{
diff --git a/patches/OOO_1_1/gui-toolbox-tristate.diff b/patches/OOO_1_1/gui-toolbox-tristate.diff
deleted file mode 100644
index 8a926d760..000000000
--- a/patches/OOO_1_1/gui-toolbox-tristate.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: vcl/source/window/toolbox.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/toolbox.cxx,v
-retrieving revision 1.60
-diff -u -p -u -r1.60 toolbox.cxx
---- vcl/source/window/toolbox.cxx	17 Apr 2003 15:19:46 -0000	1.60
-+++ vcl/source/window/toolbox.cxx	14 May 2003 08:11:12 -0000
-@@ -3024,9 +3024,6 @@ void ToolBox::ImplDrawItem( USHORT nPos,
-         if ( !pItem->mbEnabled || !IsEnabled() )
-             nImageStyle |= IMAGE_DRAW_DISABLE;
- 
--        if ( pItem->meState == STATE_DONTKNOW )
--            nImageStyle |= IMAGE_DRAW_DISABLE;
--
- 
-         // Image ausgeben
-         nTempOffX = nOffX;
diff --git a/patches/OOO_1_1/gui-toolbox.diff b/patches/OOO_1_1/gui-toolbox.diff
deleted file mode 100644
index df07f78c5..000000000
--- a/patches/OOO_1_1/gui-toolbox.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: vcl/source/window/toolbox.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/toolbox.cxx,v
-retrieving revision 1.60
-diff -u -p -u -r1.60 toolbox.cxx
---- vcl/source/window/toolbox.cxx	17 Apr 2003 15:19:46 -0000	1.60
-+++ vcl/source/window/toolbox.cxx	13 May 2003 12:16:02 -0000
-@@ -2795,27 +2795,29 @@ void ToolBox::ImplDrawItem( USHORT nPos,
-             pTempItem = &mpData->m_aItems[nPos+1];
-             if ( !pTempItem->mbShowWindow && !pTempItem->mbBreak )
-             {
--                long nCenterPos;
-+                long nCenterPos, nSlim;
-                 SetLineColor( rStyleSettings.GetShadowColor() );
-                 if ( IsHorizontal() )
-                 {
-+		    nSlim = (pItem->maRect.Bottom() - pItem->maRect.Top ()) / 4;
-                     nCenterPos = pItem->maRect.Center().X()-1;
--                    DrawLine( Point( nCenterPos, pItem->maRect.Top() ),
--                              Point( nCenterPos, pItem->maRect.Bottom() ) );
-+                    DrawLine( Point( nCenterPos, pItem->maRect.Top() + nSlim - 1),
-+                              Point( nCenterPos, pItem->maRect.Bottom() - nSlim - 1) );
-                     nCenterPos++;
-                     SetLineColor( rStyleSettings.GetLightColor() );
--                    DrawLine( Point( nCenterPos, pItem->maRect.Top() ),
--                              Point( nCenterPos, pItem->maRect.Bottom() ) );
-+                    DrawLine( Point( nCenterPos, pItem->maRect.Top() + nSlim),
-+                              Point( nCenterPos, pItem->maRect.Bottom() - nSlim) );
-                 }
-                 else
-                 {
-+		    nSlim = (pItem->maRect.Right() - pItem->maRect.Left ()) / 4;
-                     nCenterPos = pItem->maRect.Center().Y()-1;
--                    DrawLine( Point( pItem->maRect.Left(), nCenterPos ),
--                              Point( pItem->maRect.Right(), nCenterPos ) );
-+                    DrawLine( Point( pItem->maRect.Left() + nSlim, nCenterPos),
-+                              Point( pItem->maRect.Right() - nSlim, nCenterPos) );
-                     nCenterPos++;
-                     SetLineColor( rStyleSettings.GetLightColor() );
--                    DrawLine( Point( pItem->maRect.Left(), nCenterPos ),
--                              Point( pItem->maRect.Right(), nCenterPos ) );
-+                    DrawLine( Point( pItem->maRect.Left() + nSlim, nCenterPos ),
-+                              Point( pItem->maRect.Right() - nSlim, nCenterPos ) );
-                 }
-             }
-         }
-@@ -3152,14 +3154,11 @@ void ToolBox::ImplDrawItem( USHORT nPos,
-     {
- 
-         Point aArrowPos( nOffX, nOffY );
--        // shadows
--        if( bHighlight == 2 )
--        {
--            aArrowPos.X() -= 2;
--            aArrowPos.Y() -= 2;
--        }
-+#define ARROW_SIZE_HIGHLIGHT 8
-+#define ARROW_SIZE_NO_HIGHLIGHT 6
- 
--        aArrowPos.X() += nBtnWidth-6;
-+	int arrow_size = bHighlight ? ARROW_SIZE_HIGHLIGHT : ARROW_SIZE_NO_HIGHLIGHT;
-+        aArrowPos.X() += nBtnWidth - arrow_size;
- 
-         Color       aOldLineColor = GetLineColor();
-         Color       aOldFillColor = GetFillColor();
-@@ -3200,10 +3199,7 @@ void ToolBox::ImplDrawItem( USHORT nPos,
-         if ( !pItem->mbEnabled || !IsEnabled() )
-             SetFillColor( rStyleSettings.GetShadowColor() );
-         else
--        {
--            SetFillColor( COL_LIGHTGREEN );
--            bBlack = TRUE;
--        }
-+            SetFillColor( rStyleSettings.GetMenuHighlightColor() );
- 
-         SetClipRegion( aOldRegion );
- 
diff --git a/patches/OOO_1_1/gui-vcl-fix-borders.diff b/patches/OOO_1_1/gui-vcl-fix-borders.diff
deleted file mode 100644
index cf6ce0600..000000000
--- a/patches/OOO_1_1/gui-vcl-fix-borders.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: vcl/unx/source/window/salframe.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
-retrieving revision 1.163
-diff -u -p -u -r1.163 salframe.cxx
---- vcl/unx/source/window/salframe.cxx	1 Jul 2003 14:49:01 -0000	1.163
-+++ vcl/unx/source/window/salframe.cxx	9 Sep 2003 14:24:38 -0000
-@@ -3304,8 +3304,8 @@ long SalFrameData::HandleReparentEvent( 
-      *  note: this works because hWM_Parent is direct child of root,
-      *  not necessarily parent of GetShellWindow()
-      */
--    pFrame_->maGeometry.nX		= xp + pFrame_->maGeometry.nLeftDecoration;
--    pFrame_->maGeometry.nY		= yp + pFrame_->maGeometry.nTopDecoration;
-+    pFrame_->maGeometry.nX		= xp + nLeft;
-+    pFrame_->maGeometry.nY		= yp + nTop;
-     bool bResized = w != pFrame_->maGeometry.nWidth || h != pFrame_->maGeometry.nHeight;
-     pFrame_->maGeometry.nWidth	= w;
-     pFrame_->maGeometry.nHeight = h;
diff --git a/patches/OOO_1_1/gui-window-layout.diff b/patches/OOO_1_1/gui-window-layout.diff
deleted file mode 100644
index fd0bafc23..000000000
--- a/patches/OOO_1_1/gui-window-layout.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: vcl/inc/window.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/window.hxx,v
-retrieving revision 1.47
-diff -u -p -u -r1.47 window.hxx
---- vcl/inc/window.hxx	24 Apr 2003 16:30:42 -0000	1.47
-+++ vcl/inc/window.hxx	27 Jun 2003 08:11:20 -0000
-@@ -530,6 +530,8 @@ public:
-     virtual long        PreNotify( NotifyEvent& rNEvt );
-     virtual long        Notify( NotifyEvent& rNEvt );
-     virtual Window*     GetPreferredKeyInputWindow();
-+    virtual void        VtkAllocateSize( const Size &aSize );
-+    virtual void        VtkRequestSize( Size &rSize );
- 
-     /*virtual*/ void    AddEventListener( const Link& rEventListener );
-     /*virtual*/ void    RemoveEventListener( const Link& rEventListener );
-Index: vcl/source/window/window.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
-retrieving revision 1.174
-diff -u -p -u -r1.174 window.cxx
---- vcl/source/window/window.cxx	12 Jun 2003 07:51:56 -0000	1.174
-+++ vcl/source/window/window.cxx	27 Jun 2003 08:11:23 -0000
-@@ -8776,3 +8781,11 @@ LanguageType Window::GetInputLanguage() 
-     return mpFrame->GetInputLanguage();
- }
- 
-+
-+void Window::VtkAllocateSize( const Size &aSize )
-+{
-+}
-+
-+void Window::VtkRequestSize( Size &rSize )
-+{
-+}
diff --git a/patches/OOO_1_1/help-fallback-en.diff b/patches/OOO_1_1/help-fallback-en.diff
deleted file mode 100644
index df1463a8d..000000000
--- a/patches/OOO_1_1/help-fallback-en.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-	It seems there is no particularly nice way to do this - which
-sucks, presumably that's a result of a lack of code re-use in other
-places. [ taken from the Debian patch ]
-
-
-Index: xmlhelp/source/cxxhelp/provider/urlparameter.cxx
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx,v
-retrieving revision 1.25
-diff -u -p -u -r1.25 urlparameter.cxx
---- xmlhelp/source/cxxhelp/provider/urlparameter.cxx	31 Oct 2001 13:08:14 -0000	1.25
-+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx	17 Jan 2003 16:25:16 -0000
-@@ -266,12 +266,32 @@ rtl::OUString URLParameter::get_title()
- 	
- 	return m_aTitle;
- }
--		
-+
- 
- rtl::OUString URLParameter::get_language()
- {
- 	if( m_aLanguage.getLength() == 0 )
- 		return m_aDefaultLanguage;
-+	
-+	// Check that we have the necessary files. The rationale is if
-+	// help/<lang>/err.html exists then, we have localized help
-+	// data, possibly not installed. Otherwise, we won't have
-+	// localized help and we try to fallback to English.
-+	rtl::OUString fileURL = 
-+		m_pDatabases->getInstallPathAsURL()
-+		+ m_pDatabases->lang( m_aLanguage )
-+		+ rtl::OUString::createFromAscii( "/err.html" );
-+	
-+	osl::DirectoryItem aDirItem;
-+	osl::File aFile( fileURL );
-+	osl::FileStatus aStatus( FileStatusMask_FileSize );
-+	
-+	if( osl::FileBase::E_None != osl::DirectoryItem::get( fileURL,aDirItem ) ||
-+		osl::FileBase::E_None != aFile.open( OpenFlag_Read )       ||
-+		osl::FileBase::E_None != aDirItem.getFileStatus( aStatus ) )
-+	{
-+		m_aLanguage = rtl::OUString::createFromAscii( "en-US" );
-+	}
- 	
- 	return m_aLanguage;
- }
-Index: xmlhelp/source/treeview/tvread.cxx
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/treeview/tvread.cxx,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 tvread.cxx
---- xmlhelp/source/treeview/tvread.cxx	8 Nov 2001 16:42:46 -0000	1.13
-+++ xmlhelp/source/treeview/tvread.cxx	17 Jan 2003 16:25:16 -0000
-@@ -704,7 +704,27 @@ ConfigData TVChildTarget::init( const Re
- 															   aDirItem ) )
- 		ret = locale.copy( 0,idx );
- 	
--	url = url + ret;
-+	rtl::OUString test_url = url + ret;
-+	{
-+		// Check that we have the necessary files. The rationale is if
-+		// help/<lang>/err.html exists then, we have localized help
-+		// data, possibly not installed. Otherwise, we won't have
-+		// localized help and we try to fallback to English.
-+		rtl::OUString errfileURL = test_url + rtl::OUString::createFromAscii( "/err.html" );
-+		
-+		osl::DirectoryItem aDirItem;
-+		osl::File aFile( errfileURL );
-+		osl::FileStatus aStatus( FileStatusMask_FileSize );
-+	
-+		if( osl::FileBase::E_None != osl::DirectoryItem::get( errfileURL,aDirItem ) ||
-+			osl::FileBase::E_None != aFile.open( OpenFlag_Read )       ||
-+			osl::FileBase::E_None != aDirItem.getFileStatus( aStatus ) )
-+		{
-+			locale = rtl::OUString::createFromAscii( "en-US" );
-+			test_url = url + locale.copy( 0, 2 );
-+		}
-+	}
-+	url = test_url;
- 	
- 	// first of all, try do determine whether there are any *.tree files present
- 	
diff --git a/patches/OOO_1_1/layout-vcl-layout.diff b/patches/OOO_1_1/layout-vcl-layout.diff
deleted file mode 100644
index 7a063bbb9..000000000
--- a/patches/OOO_1_1/layout-vcl-layout.diff
+++ /dev/null
@@ -1,521 +0,0 @@
-Index: vcl/source/window/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/makefile.mk,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 makefile.mk
---- vcl/source/window/makefile.mk	27 Mar 2003 17:58:22 -0000	1.10
-+++ vcl/source/window/makefile.mk	27 Aug 2003 12:18:43 -0000
-@@ -76,6 +76,7 @@ TARGET=win
- # --- Files --------------------------------------------------------
- 
- SLOFILES=	$(SLO)$/accel.obj		\
-+		$(SLO)$/layout.obj		\
- 			$(SLO)$/accmgr.obj		\
- 			$(SLO)$/brdwin.obj		\
- 			$(SLO)$/btndlg.obj		\
-Index: vcl/source/window/layout.cxx
-===================================================================
-RCS file: vcl/source/window/layout.cxx
-diff -N vcl/source/window/layout.cxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/source/window/layout.cxx	27 Aug 2003 12:18:43 -0000
-@@ -0,0 +1,390 @@
-+#include <sal/macros.h>
-+#include <tools/rcid.h>
-+#include <tools/rc.h>
-+#include "layout.hxx"
-+
-+// --- LayoutConnector ---
-+
-+Layout *LayoutConnector::loadLayout()
-+{
-+	RSHEADER_TYPE *pHdr = (RSHEADER_TYPE *)m_pResMgr->GetClass();
-+	m_pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
-+
-+	fprintf( stderr, "Header: Id 0x%x type: %d, Glob: 0x%x, Local: 0x%x\n",
-+		 pHdr->GetId(), pHdr->GetRT(), pHdr->GetGlobOff(), pHdr->GetLocalOff() );
-+
-+	Layout *pLayout = NULL;
-+
-+	switch( pHdr->GetRT() ) {
-+	case RSC_LAYOUT_BIN:
-+	case RSC_LAYOUT_BOX:
-+		fprintf( stderr, "Layout 0x%x is not instantiable\n", pHdr->GetRT() );
-+		break;
-+	case RSC_LAYOUT_HBOX:
-+		fprintf( stderr, "HBox Layout\n", pHdr->GetRT() );
-+		pLayout = new LayoutHBox();
-+		break;
-+	case RSC_LAYOUT_WINDOW:
-+	case RSC_LAYOUT_ALIGNMENT:
-+	case RSC_LAYOUT_VBOX:
-+	case RSC_LAYOUT_TABLE:
-+		fprintf( stderr, "Layout 0x%x not yet implemented\n", pHdr->GetRT() );
-+		break;
-+	case RSC_LAYOUT:
-+		fprintf( stderr, "Base Layout\n", pHdr->GetRT() );
-+		pLayout = new Layout();
-+		break;
-+	default:
-+		fprintf( stderr, "Layout 0x%x is unknown\n", pHdr->GetRT() );
-+		break;
-+	}
-+
-+	if( pLayout )
-+		pLayout->readRes( *this, m_pResMgr );
-+
-+	return pLayout;
-+}
-+LayoutConnector::LayoutConnector( Window *pWindow, ResMgr *pMgr, 
-+				  USHORT nId) :
-+	m_pTopWindow( pWindow )
-+{
-+	fprintf( stderr, "Window with a layout ! (0x%x)\n", nId );
-+
-+	ResId aLayout( nId, pMgr );
-+	aLayout.SetRT( RSC_LAYOUT_HBOX );
-+
-+	m_pResMgr = pMgr;
-+
-+	// Do the setup ...
-+	if( pMgr->GetResource( aLayout ) ) {
-+		m_pTopLayout = loadLayout();
-+		pMgr->PopContext();
-+	} else
-+		fprintf( stderr, "No such resource 0x%x\n", nId );
-+
-+	m_pResMgr = NULL;
-+}
-+void LayoutConnector::reconcile( Connection &pCnx)
-+{
-+	fprintf( stderr, "Reconcile mapping 0x%x\n", pCnx );
-+	pCnx.pLayout->setPeer( pCnx.pWindow );
-+	if( pCnx.pWindow->IsVisible() )
-+		fprintf( stderr, "FIXME: trigger re-layout\n" );
-+}
-+void LayoutConnector::addMap( USHORT nId, Layout *pLayout )
-+{
-+	std::list<Connection>::iterator aIter;
-+	for (aIter = m_aMap.begin(); aIter != m_aMap.end(); aIter++) {
-+		if( aIter->nId == nId ) {
-+			aIter->pLayout = pLayout;
-+			reconcile( *aIter );
-+			return;
-+		}
-+	}
-+	Connection aCnx = { nId, pLayout, NULL };
-+	m_aMap.push_back( aCnx );
-+}
-+void LayoutConnector::reconcileMap( USHORT nId, Window *pWindow )
-+{
-+	std::list<Connection>::iterator aIter;
-+	for (aIter = m_aMap.begin(); aIter != m_aMap.end(); aIter++) {
-+		if( aIter->nId == nId ) {
-+			aIter->pWindow = pWindow;
-+			reconcile( *aIter );
-+			return;
-+		}
-+	}
-+}
-+bool LayoutConnector::checkReconciled()
-+{
-+	bool bResult = true;
-+
-+	std::list<Connection>::iterator aIter;
-+	for (aIter = m_aMap.begin(); aIter != m_aMap.end(); aIter++) {
-+		if( !aIter->pWindow ) {
-+			fprintf( stderr, "Unreconciled id 0x%x -> %p\n",
-+				 aIter->nId, aIter->pLayout );
-+			bResult = false;
-+		}
-+	}
-+
-+	return bResult;
-+}
-+
-+// --- Layout ---
-+
-+Layout::Layout() :
-+	m_pPeer( NULL ),
-+	m_aRequisition( 0, 0),
-+	m_nBorderWidth( 0 ),
-+	m_bHomogeneous( FALSE ),
-+	m_nPadding( 0 ),
-+	m_bExpand( 0 ),
-+	m_bFill( 0 ),
-+	m_bPackStart( TRUE )
-+{
-+}
-+Layout::~Layout()
-+{
-+}
-+void Layout::addChild( Layout *pLayout )
-+{
-+	fprintf( stderr, "Meaningless to add a child to base Layout\n");
-+}
-+void Layout::readRes( LayoutConnector &rCnx, ResMgr *pResMgr )
-+{
-+	USHORT nFlags;
-+	nFlags = pResMgr->ReadShort();
-+
-+	fprintf( stderr, "Flags: 0x%x\n", nFlags );
-+
-+	if( nFlags & RSC_LAYOUT_PEER ) {
-+		USHORT nPeer = pResMgr->ReadShort();
-+		fprintf( stderr, "Peer: 0x%x\n", nPeer );
-+		rCnx.addMap( nPeer, this );
-+	}
-+	if( nFlags & RSC_LAYOUT_BORDER)
-+		m_nBorderWidth = pResMgr->ReadShort();
-+	if( nFlags & RSC_LAYOUT_HOMOGENEOUS )
-+		m_bHomogeneous = TRUE;
-+	else
-+		m_bHomogeneous = FALSE;
-+
-+	if( nFlags & RSC_LAYOUT_CHILD_EXPAND )
-+		m_bExpand = TRUE;
-+	if( nFlags & RSC_LAYOUT_CHILD_FILL )
-+		m_bFill = TRUE;
-+	if( nFlags & RSC_LAYOUT_CHILD_PADDING )
-+		m_nPadding = pResMgr->ReadShort();
-+	if( nFlags & RSC_LAYOUT_CHILD_PACK_END )
-+		m_bPackStart = FALSE;
-+	
-+	USHORT nMarker;
-+	while (( nMarker = pResMgr->ReadShort() ) != 0x3c3e )
-+		fprintf( stderr, " Skip strangeness 0x%x\n", nMarker); // FIXME: strange.
-+
-+	int nChildren = pResMgr->ReadShort();
-+	fprintf( stderr, "Layout has %d children\n", nChildren );
-+
-+	for( int i = 0; i < nChildren; i++ ){
-+		fprintf( stderr, "Load child %d\n", i);
-+		Layout *pChild;
-+
-+		if( ( pChild = rCnx.loadLayout() ) )
-+			addChild( pChild );
-+	}
-+}
-+void Layout::requestSize( Size &rSize )
-+{
-+	if( m_pPeer ) {
-+		m_pPeer->VtkRequestSize( rSize );
-+		// Size requesting doesn't seem too accurate
-+		rSize.Width() += 8;
-+	} else
-+		rSize = Size();
-+	fprintf( stderr, "Layout::RequestSize -> %d, %d [%p]\n",
-+		 rSize.Width(), rSize.Height(), m_pPeer );
-+	m_aRequisition = rSize;
-+}
-+void Layout::allocateSize( const Point &rPoint,
-+			   const Size  &rSize )
-+{
-+	if( m_pPeer )
-+		m_pPeer->SetPosSizePixel( rPoint, rSize );
-+	fprintf( stderr, "Layout::allocateSize -> %d,%d (%d, %d) [%p]\n",
-+		 rPoint.X(), rPoint.Y(), rSize.Width(), rSize.Height(),
-+		 m_pPeer );
-+}
-+
-+// --- LayoutBin ---
-+
-+LayoutBin::LayoutBin() : Layout()
-+{
-+}
-+LayoutBin::~LayoutBin()
-+{
-+	if (m_pChild)
-+		delete m_pChild;
-+}
-+void LayoutBin::requestSize( Size &rSize )
-+{
-+	if( m_pChild )
-+		m_pChild->requestSize( rSize );
-+	else
-+		rSize = Size();
-+}
-+void LayoutBin::allocateSize( const Point &rPoint, const Size &rSize )
-+{
-+	if( m_pChild )
-+		m_pChild->allocateSize( rPoint, rSize );
-+}
-+
-+// --- LayoutBox ---
-+
-+LayoutBox::LayoutBox() :
-+	Layout(), m_nSpacing(0)
-+{
-+}
-+LayoutBox::~LayoutBox()
-+{
-+	std::list<BoxChild>::const_iterator aIter;
-+	for (aIter = m_aChildren.begin(); aIter != m_aChildren.end(); aIter++)
-+		delete aIter->pLayout;
-+}
-+void LayoutBox::addChild( Layout *pLayout ) 
-+{
-+	BoxChild aChild;
-+
-+	// this sucks ...
-+	aChild.pLayout = pLayout;
-+	aChild.nPadding = aChild.pLayout->m_nPadding;
-+	aChild.bExpand = aChild.pLayout->m_bExpand;
-+	aChild.bFill = aChild.pLayout->m_bFill;
-+	aChild.bPackStart = aChild.pLayout->m_bPackStart;
-+
-+	m_aChildren.push_back( aChild );
-+}
-+
-+// --- LayoutHBox ---
-+
-+LayoutHBox::LayoutHBox() : LayoutBox( )
-+{
-+}
-+void LayoutHBox::requestSize( Size &rSize )
-+{
-+	int nVisibleChildren = 0;
-+
-+	rSize.Width() = 0;
-+	rSize.Height() = 0;
-+	
-+	std::list<BoxChild>::const_iterator aIter;
-+	for (aIter = m_aChildren.begin(); aIter != m_aChildren.end(); aIter++) {
-+		if( !aIter->pLayout->visible() )
-+			continue;
-+
-+		Size aChildSize;
-+		
-+		aIter->pLayout->requestSize( aChildSize );
-+
-+		int nThisWidth = aChildSize.Width() + aIter->nPadding * 2;
-+
-+		if( m_bHomogeneous )
-+			rSize.Width() = SAL_MAX( rSize.Width(), nThisWidth );
-+		else
-+			rSize.Width() += nThisWidth;
-+
-+		rSize.Height() = SAL_MAX( rSize.Height(), aChildSize.Height() );
-+
-+		nVisibleChildren++;
-+	}
-+
-+	if (nVisibleChildren) {
-+		if( m_bHomogeneous )
-+			rSize.Width() *= nVisibleChildren;
-+		rSize.Width() += (nVisibleChildren - 1) * m_nSpacing;
-+	}
-+
-+	rSize.Width() += m_nBorderWidth * 2;
-+	rSize.Height() += m_nBorderWidth * 2;
-+
-+	fprintf( stderr, "LayoutHBox::RequestSize -> %d, %d [%p]\n",
-+		 rSize.Width(), rSize.Height(), this );
-+
-+	m_aRequisition = rSize;
-+}
-+#define FIXED_PT 16
-+void LayoutHBox::allocateSize( const Point &rPoint, const Size &rSize )
-+{
-+	int nVisibleChildren = 0;
-+	int nExpandChildren = 0;
-+	int fExtraSpace;
-+	Point fEndPos;
-+	Point fStartPos;
-+	Size  aChildSize;
-+
-+	LayoutBox::allocateSize( rPoint, rSize );
-+	
-+	std::list<BoxChild>::const_iterator aIter;
-+	for (aIter = m_aChildren.begin(); aIter != m_aChildren.end(); aIter++) {
-+		if( aIter->pLayout->visible() )
-+			nVisibleChildren++;
-+		if( aIter->bExpand )
-+			nExpandChildren++;
-+	}
-+
-+	if( !nVisibleChildren )
-+		return;
-+
-+	if( m_bHomogeneous )
-+		fExtraSpace = ( ( rSize.Width() - m_nBorderWidth * 2 -
-+				  ( nVisibleChildren - 1 ) * m_nSpacing ) * FIXED_PT ) / nVisibleChildren;
-+
-+	else if( nExpandChildren )
-+		fExtraSpace = ( ( rSize.Width() - m_aRequisition.Width() ) * FIXED_PT ) / nExpandChildren;
-+
-+	else
-+		fExtraSpace = 0;
-+
-+
-+	fprintf( stderr, "Layout::allocateSize extra space %g [%p]\n",
-+		 (double)fExtraSpace/FIXED_PT, this );
-+
-+	fStartPos = rPoint;
-+	fStartPos.Move( m_nBorderWidth, m_nBorderWidth );
-+	fStartPos.X() *= FIXED_PT;
-+	fEndPos = rPoint;
-+	fEndPos.Move(rSize.Width(), 0);
-+	fEndPos.Move( -m_nBorderWidth, m_nBorderWidth );
-+	fEndPos.X() *= FIXED_PT;
-+	aChildSize.Height() = SAL_MAX( 1, rSize.Height() - m_nBorderWidth * 2 );
-+
-+	for (aIter = m_aChildren.begin(); aIter != m_aChildren.end(); aIter++) {
-+		if( !aIter->pLayout->visible() )
-+			continue;
-+
-+		Point aChildPos;
-+		int   fBoxWidth; // of the available box space
-+
-+		if( m_bHomogeneous )
-+			fBoxWidth = fExtraSpace;
-+		else {
-+			fBoxWidth = ( aIter->pLayout->getRequisition().Width() + aIter->nPadding * 2 ) * FIXED_PT;
-+
-+			if( aIter->bExpand )
-+				fBoxWidth += fExtraSpace;
-+		}
-+
-+		int nSlackSpace;
-+		if( aIter->bFill ) {
-+			aChildSize.Width() = SAL_MAX( 1, fBoxWidth / FIXED_PT - aIter->nPadding * 2 );
-+			nSlackSpace = aIter->nPadding;
-+		} else {
-+			aChildSize.Width() = aIter->pLayout->getRequisition().Width();
-+			nSlackSpace = (fBoxWidth / FIXED_PT - aChildSize.Width()) / 2;
-+		}
-+		
-+		fprintf( stderr, "LayoutHBox::alloc_child [%p] slack %d, childSize: %d,%d\n",
-+			 aIter->pLayout, nSlackSpace, aChildSize.Width(), aChildSize.Height() );
-+
-+		Point aPlace;
-+		if( aIter->bPackStart ) {
-+
-+			aPlace = fStartPos;
-+			aPlace.X() /= FIXED_PT;
-+			aPlace.Move( nSlackSpace, 0 );
-+			
-+			fStartPos.Move( fBoxWidth + m_nSpacing * FIXED_PT, 0 );
-+		} else {
-+
-+			fEndPos.Move( -fBoxWidth - m_nSpacing * FIXED_PT, 0 );
-+
-+			aPlace = fEndPos;
-+			aPlace.X() /= FIXED_PT;
-+			aPlace.Move( nSlackSpace, 0 );
-+		}
-+
-+		aIter->pLayout->allocateSize( aPlace, aChildSize );
-+	}
-+}
-+
-+
-Index: vcl/inc/layout.hxx
-===================================================================
-RCS file: vcl/inc/layout.hxx
-diff -N vcl/inc/layout.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/inc/layout.hxx	27 Aug 2003 12:18:43 -0000
-@@ -0,0 +1,102 @@
-+#ifndef _SV_LAYOUT_HXX
-+#define _SV_LAYOUT_HXX
-+
-+#include <list>
-+
-+#include <gen.hxx>
-+#include <resmgr.hxx>
-+#include <window.hxx>
-+
-+class Layout;
-+//
-+//      The connector exists to connect widgets as they are
-+// instantiated later, to the pre-existing layout peers.
-+//
-+class LayoutConnector {
-+	struct Connection {
-+		USHORT  nId;
-+		Layout *pLayout;
-+		Window *pWindow;
-+	};
-+	std::list<Connection> m_aMap;
-+	ResMgr *m_pResMgr;
-+	Window *m_pTopWindow;
-+	Layout *m_pTopLayout;
-+    private:
-+	void    reconcile( Connection &pCnx );
-+    public:
-+	LayoutConnector( Window *pWindow, ResMgr *pMgr, USHORT nId );
-+
-+	// Construction time bits
-+	ResMgr *getSetupMgr();
-+	void    addMap( USHORT nId, Layout *pLayout );
-+	Layout *loadLayout();
-+
-+	// later association bits
-+	void    reconcileMap( USHORT nId, Window *pWindow );
-+	bool    checkReconciled();
-+	Layout *getLayout() { return m_pTopLayout; }
-+};
-+
-+class Layout {
-+public: // sucking child properties ...
-+	Window *m_pPeer;
-+	Size    m_aRequisition;
-+	int     m_nBorderWidth;
-+	bool    m_bHomogeneous;
-+// Unsatisfactory child properties ...
-+	int     m_nPadding;
-+	bool    m_bExpand;
-+	bool    m_bFill;
-+	bool    m_bPackStart;
-+    public:
-+	Layout();
-+	~Layout();
-+	virtual void readRes( LayoutConnector &rCnx, ResMgr *pResMgr );
-+	virtual void requestSize( Size &rSize );
-+	virtual void allocateSize( const Point &rPoint,
-+				   const Size  &rSize );
-+	virtual void addChild( Layout *pLayout );
-+	const Size  &getRequisition()        { return m_aRequisition; }
-+	void         setPeer( Window *pPeer) { m_pPeer = pPeer; }
-+	Window      *getPeer()               { return  m_pPeer; }
-+	bool         visible() { return m_pPeer ? m_pPeer->IsVisible() : TRUE; }
-+};
-+
-+class LayoutBin : public Layout {
-+    protected:
-+	Layout *m_pChild;
-+    public:
-+	LayoutBin();
-+	~LayoutBin();
-+	virtual void requestSize( Size &rSize );
-+	virtual void allocateSize( const Point &rPoint, const Size &rSize );
-+};
-+
-+class LayoutBox : public Layout {
-+    protected:
-+//	bool    m_bHomogeneous;
-+	struct BoxChild {
-+		Layout *pLayout;
-+		int     nPadding;
-+		bool    bExpand;
-+		bool    bFill;
-+		bool    bPackStart;
-+	};
-+	int m_nSpacing;
-+	std::list<BoxChild> m_aChildren;
-+    public:
-+	LayoutBox();
-+	~LayoutBox();
-+	virtual void addChild( Layout *pLayout );
-+};
-+
-+class LayoutHBox : public LayoutBox {
-+    public:
-+	LayoutHBox();
-+	virtual void  requestSize( Size &rSize );
-+	virtual void  allocateSize( const Point &rPoint,
-+				    const Size  &rSize );
-+};
-+
-+#endif // _SV_LAYOUT_HXX
diff --git a/patches/OOO_1_1/path-home-documents.diff b/patches/OOO_1_1/path-home-documents.diff
deleted file mode 100644
index f88a6d896..000000000
--- a/patches/OOO_1_1/path-home-documents.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: framework/source/services/substitutepathvars.cxx
-===================================================================
-RCS file: /cvs/framework/framework/source/services/substitutepathvars.cxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 substitutepathvars.cxx
---- framework/source/services/substitutepathvars.cxx	4 Apr 2003 17:18:28 -0000	1.3
-+++ framework/source/services/substitutepathvars.cxx	6 Aug 2003 15:54:12 -0000
-@@ -830,6 +830,11 @@ rtl::OUString SubstitutePathVariables::G
- 	rtl::OUString	aHomePath;
- 
- 	aSecurity.getHomeDir( aHomePath );
-+
-+	aHomePath += rtl::OUString ("/Documents",
-+				    strlen ("/Documents"),
-+				    RTL_TEXTENCODING_UTF8);
-+
- 	return ConvertOSLtoUCBURL( aHomePath );
- }
- 
diff --git a/patches/OOO_1_1/print-cups.diff b/patches/OOO_1_1/print-cups.diff
deleted file mode 100644
index 8918a26af..000000000
--- a/patches/OOO_1_1/print-cups.diff
+++ /dev/null
@@ -1,1460 +0,0 @@
-Index: vcl/unx/source/gdi/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/makefile.mk,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 makefile.mk
---- vcl/unx/source/gdi/makefile.mk	27 Aug 2002 14:52:35 -0000	1.9
-+++ vcl/unx/source/gdi/makefile.mk	29 May 2003 15:44:36 -0000
-@@ -103,7 +103,8 @@ SLOFILES=	\
- CFLAGS+=-D_USE_PRINT_EXTENSION_=1
- SLOFILES+=$(SLO)$/xprintext.obj
- .ELSE
--SLOFILES+=$(SLO)$/salprnpsp.obj
-+CFLAGS+= `pkg-config --cflags libgnomecups-1.0`
-+SLOFILES+=$(SLO)$/salprncups.obj
- .ENDIF
- 
- .IF "$(OS)"=="SOLARIS"
-Index: vcl/unx/inc/salprn.h
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/salprn.h,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 salprn.h
---- vcl/unx/inc/salprn.h	13 Nov 2002 20:24:03 -0000	1.9
-+++ vcl/unx/inc/salprn.h	2 Jun 2003 11:56:15 -0000
-@@ -85,8 +85,10 @@ struct SalInfoPrinterData
- 
- struct SalPrinterData
- {
-+	ULONG                            m_nError;
- 	String					m_aFileName;
- 	String					m_aTmpFile;
-+	String                                  m_aJobName;
- 	String					m_aFaxNr;
- 	bool					m_bFax:1;
- 	bool					m_bPdf:1;
-@@ -95,7 +97,8 @@ struct SalPrinterData
- 	::psp::PrinterJob		m_aPrintJob;
- 	::psp::JobData			m_aJobData;
- 	::psp::PrinterGfx		m_aPrinterGfx;
--    ULONG					m_nCopies;
-+  ULONG					m_nCopies;
-+	bool isPrintToFile() { return m_aFileName.Len() > 0; }
- };
- 
- class Timer;
---- /dev/null	2003-01-30 10:24:37.000000000 +0000
-+++ vcl/unx/source/gdi/salprncups.cxx	2003-05-29 16:48:01.000000000 +0100
-@@ -0,0 +1,1396 @@
-+/*************************************************************************
-+ *
-+ *  $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): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+/**
-+  this file implements the sal printer interface ( SalPrinter, SalInfoPrinter
-+  and some printer relevant methods of SalInstance and SalGraphicsData )
-+
-+  as aunderlying library the printer features of psprint are used.
-+
-+  The query methods of a SalInfoPrinter are implemented by querying psprint
-+
-+  The job methods of a SalPrinter are implemented by calling psprint
-+  printer job functions.
-+ */
-+
-+#include <salunx.h>
-+#include <unistd.h>
-+#include <sys/wait.h>
-+
-+#ifndef _SV_JOBSET_H
-+#include <jobset.h>
-+#endif
-+#ifndef _SV_SALINST_HXX
-+#include <salinst.hxx>
-+#endif
-+#ifndef _SV_SALPRN_HXX
-+#include <salprn.hxx>
-+#endif
-+#ifndef _SV_SALGDI_HXX
-+#include <salgdi.hxx>
-+#endif
-+#ifndef _SV_PRINT_H
-+#include <print.h>
-+#endif
-+#ifndef _SV_SALPTYPE_HXX
-+#include <salptype.hxx>
-+#endif
-+#ifndef _SV_SALFRAME_HXX
-+#include <salframe.hxx>
-+#endif
-+#ifndef _SV_SALDATA_HXX
-+#include <saldata.hxx>
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+
-+#include <glib.h>
-+
-+#include <psprint/printerinfomanager.hxx>
-+
-+#ifndef _PSPRINT_JOBDATA_HXX_
-+#include <psprint/jobdata.hxx>
-+#endif
-+
-+#include <libgnomecups/gnome-cups-init.h>
-+#include <libgnomecups/gnome-cups-printer.h>
-+
-+static bool cups_debug = false;
-+
-+namespace cups { };
-+
-+using namespace cups;
-+using namespace psp;
-+using namespace rtl;
-+using namespace osl;
-+
-+namespace cups {
-+
-+  class PrinterInfoManagerCups : ::psp::PrinterInfoManager
-+  {
-+    PrinterInfoManagerCups();
-+    void initialize ();
-+
-+    ::psp::JobData  m_aGlobalDefaults;
-+    ::rtl::OUString m_aDefaultPrinter;
-+    GList          *m_aPrinterList;
-+    ::std::hash_map< ::rtl::OUString, ::psp::JobData, ::rtl::OUStringHash > m_aJobDataCache;
-+
-+  private:
-+    void mergeToJobData    ( ::psp::JobData &rJobInfo, const PPDParser *pParser );
-+    void mergeCupsSettings ( ::psp::JobData &rJobInfo );
-+  public:
-+    String          m_aGlobalDriverName;
-+    static PrinterInfoManagerCups& getCups();
-+
-+    bool isBuiltinGeneric() { return m_aPrinterList == NULL; };
-+
-+    void                   listPrinters           ( ::std::list< ::rtl::OUString >& rList ) const;
-+    ::psp::JobData         getJobInfo             ( const ::rtl::OUString& rPrinter );
-+    SalPrinterQueueInfo   *getSalPrinterQueueInfo ( const ::rtl::OUString& rPrinter );
-+    bool                   checkPrintersChanged   ();
-+    GnomeCupsPrinter      *getGnomePrinter        ( const ::rtl::OUString& rPrinter );
-+    GnomeCupsPrinter      *getGnomePrinter        ( SalPrinterQueueInfo *aQueueInfo )
-+    { return getGnomePrinter ( aQueueInfo->maPrinterName ); }
-+    const ::rtl::OUString& getDefaultPrinter      () const
-+    { return m_aDefaultPrinter; }
-+    virtual const PPDParser *getParserForPrinter( ::rtl::OUString rPrinter );
-+    virtual ::std::hash_map< fontID, fontID > *getFontSubstitutesForPrinter( ::rtl::OUString rPrinter );
-+    virtual FILE *getPipeToPrinter( ::rtl::OUString rPrinter );
-+  };
-+
-+  PrinterInfoManagerCups& PrinterInfoManagerCups::getCups()
-+  {
-+    static PrinterInfoManagerCups aManager;
-+    set( &aManager );
-+    return aManager;
-+  }
-+
-+  extern "C" {
-+    static gboolean
-+    gcups_password_cb (const char           *prompt,
-+		       char                **username,
-+		       char                **password,
-+		       GnomeCupsAuthContext *ctxt)
-+    {
-+      fprintf( stderr, "No authentication yet\n" );
-+      return FALSE;
-+    }
-+  }
-+
-+  PrinterInfoManagerCups::PrinterInfoManagerCups()
-+  {
-+    static bool cups_initialized = false;
-+    if (!cups_initialized) {
-+      cups_initialized = true;
-+      gnome_cups_init( gcups_password_cb );
-+      if (g_getenv ("CUPS_DEBUG") &&
-+	  atoi (g_getenv ("CUPS_DEBUG")))
-+	      cups_debug = true;
-+    }
-+    initialize ();
-+  }
-+
-+  const ::psp::PPDParser *
-+  PrinterInfoManagerCups::getParserForPrinter( ::rtl::OUString rPrinter )
-+  {
-+    return getJobInfo( rPrinter ).m_pParser;
-+  }
-+
-+  ::std::hash_map< fontID, fontID > *
-+  PrinterInfoManagerCups::getFontSubstitutesForPrinter( ::rtl::OUString rPrinter )
-+  { // font mapping tables are a terrible idea.
-+    return NULL;
-+  }
-+
-+  FILE *
-+  PrinterInfoManagerCups::getPipeToPrinter( ::rtl::OUString rPrinter )
-+  { // we always print to a file
-+    return NULL;
-+  }
-+
-+  bool PrinterInfoManagerCups::checkPrintersChanged()
-+  {
-+    bool different = false;
-+    GList *printers;
-+
-+    /* gnome-cups does timeout polling */
-+    printers = gnome_cups_get_printers ();
-+    if (g_list_length (printers) != g_list_length (m_aPrinterList))
-+      different = true;
-+    else {
-+      GList *l1, *l2;
-+      for (l2 = m_aPrinterList, l1 = printers;
-+	   l1 && l2; l1 = l1->next, l2 = l2->next) {
-+	if (strcmp ((char *) l1->data, (char *) l2->data)) {
-+	  different = true;
-+	  break;
-+	}
-+      }
-+    }
-+
-+    if (different)
-+      initialize ();
-+  
-+    return different;
-+  }
-+
-+  void PrinterInfoManagerCups::initialize()
-+  {
-+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-+    OUString aPrinterPath( getPrinterPath() );
-+    m_aJobDataCache.clear();
-+
-+    // first initialize the global defaults
-+    m_aGlobalDefaults = JobData();
-+    m_aGlobalDriverName = String( RTL_CONSTASCII_USTRINGPARAM( "CUPS" ) );
-+    
-+    // g_warning ("We need to parse SGEN43.PS ... - how can we ship that ?");
-+    // need a parser for the PPDContext. generic printer should do.
-+    m_aGlobalDefaults.m_pParser = PPDParser::getParser
-+      ( String( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) );
-+    m_aGlobalDefaults.m_aContext.setParser( m_aGlobalDefaults.m_pParser );
-+
-+    if( ! m_aGlobalDefaults.m_pParser )
-+      {
-+        fprintf( stderr, "Error: no SGENPRT available, shutting down psprint...\n" );
-+ //       return;
-+      }
-+
-+    char *prnt;
-+    if (!(prnt = gnome_cups_get_default()))
-+      prnt = g_strdup("GenericPostscript");
-+    m_aDefaultPrinter = OUString( prnt, strlen( prnt ), RTL_TEXTENCODING_UTF8 );
-+    g_free( prnt );
-+
-+    gnome_cups_printer_list_free( m_aPrinterList );
-+    m_aPrinterList = gnome_cups_get_printers();
-+  }
-+
-+  void
-+  PrinterInfoManagerCups::listPrinters( ::std::list< OUString >& rList ) const
-+  {
-+    GList *l;
-+
-+    rList.clear();
-+    if (m_aPrinterList)
-+      {
-+	for (l = m_aPrinterList; l; l = l->next)
-+	  rList.push_back( OUString( (char *)l->data,
-+				     strlen( (char *) l->data ),
-+				     RTL_TEXTENCODING_UTF8 ) );
-+      }
-+    else
-+      {
-+	rList.push_back( ::rtl::OUString::createFromAscii( "GenericPostscript" ) );
-+      }
-+  }
-+
-+  GnomeCupsPrinter *
-+  PrinterInfoManagerCups::getGnomePrinter ( const ::rtl::OUString& rPrinter )
-+  {
-+    if (isBuiltinGeneric())
-+      return NULL;
-+    else
-+      {
-+	OString name = OUStringToOString( rPrinter, RTL_TEXTENCODING_UTF8 );
-+	return gnome_cups_printer_get (name.getStr());
-+      }
-+  }
-+
-+  SalPrinterQueueInfo*
-+  PrinterInfoManagerCups::getSalPrinterQueueInfo ( const ::rtl::OUString& rPrinter )
-+  {
-+    GnomeCupsPrinter *printer = getGnomePrinter( rPrinter );
-+
-+    OString name = OUStringToOString( rPrinter, RTL_TEXTENCODING_UTF8 );
-+    //    fprintf (stderr, "Add printer '%s'\n", name.getStr());
-+
-+    SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
-+    pInfo->maPrinterName  = OUString (rPrinter);
-+    pInfo->maDriver       = m_aGlobalDriverName;
-+    pInfo->maLocation     = String
-+      ( printer ? gnome_cups_printer_get_location( printer ) : "", RTL_TEXTENCODING_UTF8);
-+    pInfo->maComment      = String
-+      ( printer ? gnome_cups_printer_get_description (printer) : "", RTL_TEXTENCODING_UTF8);
-+    pInfo->mpSysData      = NULL;
-+    pInfo->mnJobs         = printer ? gnome_cups_printer_get_job_count (printer) : 0;
-+
-+    gnome_cups_printer_unref( printer );
-+
-+    return pInfo;
-+  }
-+
-+  
-+  void
-+  PrinterInfoManagerCups::mergeToJobData ( ::psp::JobData  &rJobInfo,
-+					   const PPDParser *pParser )
-+  {
-+    rJobInfo.m_pParser = pParser;
-+    rJobInfo.m_aContext.setParser( pParser );
-+
-+    // merge the ppd context keys if the printer has the same keys and values
-+    // this is a bit tricky, since it involves mixing two PPDs
-+    // without constraints which might end up badly
-+    // this feature should be use with caution
-+    // it is mainly to select default paper sizes for new printers
-+    for( int nPPDValueModified = 0; nPPDValueModified < m_aGlobalDefaults.m_aContext.countValuesModified(); nPPDValueModified++ )
-+      {
-+	const PPDKey* pDefKey = m_aGlobalDefaults.m_aContext.getModifiedKey( nPPDValueModified );
-+	const PPDValue* pDefValue = m_aGlobalDefaults.m_aContext.getValue( pDefKey );
-+	const PPDKey* pPrinterKey = pDefKey ? rJobInfo.m_pParser->getKey( pDefKey->getKey() ) : NULL;
-+	if( pDefKey && pPrinterKey )
-+	  // at least the options exist in both PPDs
-+	  {
-+	    if( pDefValue )
-+	      {
-+		const PPDValue* pPrinterValue = pPrinterKey->getValue( pDefValue->m_aOption );
-+		if( pPrinterValue )
-+                                // the printer has a corresponding option for the key
-+		  rJobInfo.m_aContext.setValue( pPrinterKey, pPrinterValue );
-+	      }
-+	    else
-+	      rJobInfo.m_aContext.setValue( pPrinterKey, NULL );
-+	  }
-+      }
-+  }
-+
-+  void
-+  PrinterInfoManagerCups::mergeCupsSettings( ::psp::JobData &rJobInfo )
-+  {
-+    GnomeCupsPrinter *printer;
-+
-+    printer = getGnomePrinter( rJobInfo.m_aPrinterName );
-+
-+    if( cups_debug ) {
-+      gnome_cups_printer_force_refresh( printer, GNOME_CUPS_PRINTER_REFRESH_OPTIONS );
-+      g_warning ("Forced printer option refresh");
-+    }
-+
-+    // Set the local cups options
-+    if (printer)
-+      {
-+	if (cups_debug)
-+	  g_warning ("Refreshing user options ...");
-+
-+        GList *user_options = gnome_cups_printer_get_options (printer);
-+	
-+	for (GList *l = user_options; l; l = l->next)
-+          {
-+            GnomeCupsPrinterOptionChoice *opt = (GnomeCupsPrinterOptionChoice *) l->data;
-+
-+	    char *value = gnome_cups_printer_get_option_value (printer, opt->value);
-+
-+	    if (cups_debug)
-+	      g_warning (" '%s' -> '%s'", opt->value, value);
-+
-+	    if (!opt->text || !value)
-+              continue;
-+
-+	    const PPDKey* pKey;
-+
-+	    pKey = rJobInfo.m_pParser->getKey( String::CreateFromAscii( opt->value ) );
-+	    if (pKey) {
-+		    const PPDValue* pValue;
-+
-+		    pValue = pKey->getValue( String( value, RTL_TEXTENCODING_UTF8 ) );
-+
-+		    if (pValue)
-+		      rJobInfo.m_aContext.setValue( pKey, pValue );
-+
-+		    else if (cups_debug)
-+		      g_warning ("No value '%s'", value);
-+
-+	    } else if (cups_debug)
-+              g_warning ("No key '%s'", opt->value);
-+	  }
-+	gnome_cups_printer_option_list_free (user_options);
-+
-+	gnome_cups_printer_unref( printer );
-+    }
-+    else if (cups_debug)
-+      g_warning ("No printer");
-+  }
-+
-+  ::psp::JobData
-+  PrinterInfoManagerCups::getJobInfo( const ::rtl::OUString& rPrinter )
-+  {
-+    ::std::hash_map< OUString, ::psp::JobData, OUStringHash >::const_iterator it = m_aJobDataCache.find( rPrinter );
-+
-+    if (it != m_aJobDataCache.end()) {
-+      ::psp::JobData aJobInfo = it->second;
-+      mergeCupsSettings( aJobInfo );
-+
-+      return aJobInfo;
-+    }
-+
-+    ::psp::JobData aJobInfo = m_aGlobalDefaults;
-+
-+    OString name = OUStringToOString( rPrinter, RTL_TEXTENCODING_UTF8 );
-+
-+    aJobInfo.m_aPrinterName = OUString (rPrinter);
-+
-+    const char *v;
-+    if( cups_debug && (v = g_getenv( "PPD_DO" )) && atoi( v ) )
-+      g_warning ("--- ppd parsing disabled ---");
-+    else
-+      {
-+        GnomeCupsPrinter *printer = NULL;
-+	GnomeCupsPPDFile *ppd_file = NULL;
-+	char             *ppd_fname = NULL;
-+	const PPDParser  *pParser = NULL;
-+
-+ 	if ( ( printer   = getGnomePrinter( rPrinter ) ) &&
-+	     ( ppd_file  = gnome_cups_printer_get_ppd_file( printer ) ) &&
-+	     ( ppd_fname = gnome_cups_ppd_file_get_name( ppd_file ) ) &&
-+	     ( pParser   = PPDParser::getParser ( String( ppd_fname, RTL_TEXTENCODING_UTF8 ) ) ) &&
-+	     pParser )
-+	  {
-+	    if (cups_debug)
-+	      g_warning ("---- parse ppd ...----");
-+	    mergeToJobData (aJobInfo, pParser);
-+	  }
-+	else if (cups_debug)
-+	  g_warning ("---- failed to parse ppd '%s' ----", ppd_fname);
-+
-+	g_free( ppd_fname );
-+	gnome_cups_ppd_file_release( ppd_file );
-+	gnome_cups_printer_unref( printer );
-+      }
-+
-+    mergeCupsSettings( aJobInfo );
-+
-+
-+    m_aJobDataCache[ rPrinter ] = aJobInfo;
-+
-+    return aJobInfo;
-+  }
-+
-+} /* namespace cups */
-+
-+inline int PtTo10Mu( int nPoints ) { return (int)(((double)nPoints)*35.27777778)+0.5; }
-+
-+inline int TenMuToPt( int nUnits ) { return (int)(((double)nUnits)/35.27777778)+0.5; }
-+
-+static struct
-+{
-+	int			width;
-+	int			height;
-+	const char*	name;
-+	int			namelength;
-+	Paper		paper;
-+} aPaperTab[] =
-+{
-+	{ 29700, 42000,	"A3",			2,	PAPER_A3		},
-+	{ 21000, 29700,	"A4",			2,	PAPER_A4		},
-+	{ 14800, 21000,	"A5",			2,	PAPER_A5		},
-+	{ 25000, 35300,	"B4",			2,	PAPER_B4		},
-+	{ 17600, 25000,	"B5",			2,	PAPER_B5		},
-+	{ 21600, 27900,	"Letter",		6,	PAPER_LETTER	},
-+	{ 21600, 35600,	"Legal",		5,	PAPER_LEGAL		},
-+	{ 27900, 43100,	"Tabloid",		7,	PAPER_TABLOID	},
-+	{ 0, 0,	  		"USER",			4,	PAPER_USER		}
-+};
-+
-+static Paper getPaperType( const String& rPaperName )
-+{
-+	ByteString aPaper( rPaperName, RTL_TEXTENCODING_ISO_8859_1 );
-+	for( int i = 0; i < sizeof( aPaperTab )/sizeof( aPaperTab[0] ); i++ )
-+	{
-+		if( ! strcmp( aPaper.GetBuffer(), aPaperTab[i].name ) )
-+			return aPaperTab[i].paper;
-+	}
-+	return PAPER_USER;
-+}
-+
-+static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
-+{
-+
-+  pJobSetup->meOrientation = (Orientation)(rData.m_eOrientation == orientation::Landscape ?
-+					   ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
-+
-+  // copy page size
-+  String aPaper;
-+  int width, height;
-+	
-+  rData.m_aContext.getPageSize( aPaper, width, height );
-+  pJobSetup->mePaperFormat = getPaperType( aPaper );
-+  pJobSetup->mnPaperWidth  = 0;
-+  pJobSetup->mnPaperHeight = 0;
-+  if( pJobSetup->mePaperFormat == PAPER_USER )
-+    {
-+      // transform to 100dth mm
-+      width  = PtTo10Mu( width );
-+      height = PtTo10Mu( height );
-+
-+      if( rData.m_eOrientation == psp::orientation::Portrait )
-+        {
-+	  pJobSetup->mnPaperWidth  = width;
-+	  pJobSetup->mnPaperHeight = height;
-+        }
-+      else
-+        {
-+	  pJobSetup->mnPaperWidth  = height;
-+	  pJobSetup->mnPaperHeight = width;
-+        }
-+    }
-+
-+  // copy input slot
-+  const PPDKey* pKey;
-+  const PPDValue* pValue;
-+  ::std::list< const PPDValue* > aValues;
-+  ::std::list< const PPDValue* >::iterator it;
-+
-+  pKey   = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
-+  pValue = rData.m_aContext.getValue( pKey );
-+  rData.m_aContext.getUnconstrainedValues( pKey, aValues );
-+  pJobSetup->mnPaperBin = 0xffff;
-+  if ( pKey && pValue )
-+  {
-+        for( pJobSetup->mnPaperBin = 0;
-+             pValue != pKey->getValue( pJobSetup->mnPaperBin ) &&
-+                 pJobSetup->mnPaperBin < pKey->countValues();
-+             pJobSetup->mnPaperBin++ )
-+            ;
-+        if( pJobSetup->mnPaperBin >= pKey->countValues() || pValue == pKey->getDefaultValue() )
-+ 		pJobSetup->mnPaperBin = 0xffff;
-+  }
-+  for( it = aValues.begin(); it != aValues.end(); ++it, pJobSetup->mnPaperBin++ )
-+    if( *it == pValue )
-+      break;
-+  if( it == aValues.end() )
-+    pJobSetup->mnPaperBin = 0xffff;
-+	
-+  // copy the whole context
-+  if( pJobSetup->mpDriverData )
-+    rtl_freeMemory( pJobSetup->mpDriverData );
-+
-+  int nBytes;
-+  void* pBuffer = NULL;
-+  if( rData.getStreamBuffer( pBuffer, nBytes ) )
-+    {
-+      pJobSetup->mnDriverDataLen = nBytes;
-+      pJobSetup->mpDriverData = (BYTE*)pBuffer;
-+    }
-+  else
-+    {
-+      pJobSetup->mnDriverDataLen = 0;
-+      pJobSetup->mpDriverData = NULL;
-+    }
-+}
-+
-+/*
-+ *	SalInstance
-+ */
-+
-+// -----------------------------------------------------------------------
-+
-+SalInfoPrinter* SalInstance::CreateInfoPrinter(
-+	SalPrinterQueueInfo *pQueueInfo,
-+	ImplJobSetup        *pJobSetup )
-+{
-+  maInstData.mbPrinterInit = true;
-+
-+  SalInfoPrinter* pPrinter = new SalInfoPrinter;
-+  PrinterInfoManagerCups& rManager( PrinterInfoManagerCups::getCups() );
-+  ::psp::JobData aJobInfo = rManager.getJobInfo( pQueueInfo->maPrinterName );
-+
-+  pPrinter->maPrinterData.m_aJobData = aJobInfo;
-+  pPrinter->maPrinterData.m_aPrinterGfx.Init( pPrinter->maPrinterData.m_aJobData );
-+
-+  if( pJobSetup )
-+    {
-+      if( pJobSetup->mpDriverData )
-+	JobData::constructFromStreamBuffer( pJobSetup->mpDriverData,
-+					    pJobSetup->mnDriverDataLen,
-+					    aJobInfo );
-+
-+      pJobSetup->mnSystem      = JOBSETUP_SYSTEM_UNIX;
-+      pJobSetup->maPrinterName = pQueueInfo->maPrinterName;
-+      pJobSetup->maDriver      = rManager.m_aGlobalDriverName;
-+      copyJobDataToJobSetup( pJobSetup, aJobInfo );
-+    }
-+	
-+  return pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
-+{
-+  delete pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalPrinter* SalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
-+{
-+  maInstData.mbPrinterInit = true;
-+  // create and initialize SalPrinter
-+  SalPrinter* pPrinter = new SalPrinter;
-+  pPrinter->maPrinterData.m_aJobData = pInfoPrinter->maPrinterData.m_aJobData;
-+	
-+  return pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::DestroyPrinter( SalPrinter* pPrinter )
-+{
-+  delete pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
-+{
-+  maInstData.mbPrinterInit = true;
-+  PrinterInfoManagerCups& rManager( PrinterInfoManagerCups::getCups() );
-+  ::std::list< OUString > aPrinters;
-+  rManager.listPrinters( aPrinters );
-+
-+  for( ::std::list< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it ) {
-+    SalPrinterQueueInfo *pInfo = rManager.getSalPrinterQueueInfo( *it );
-+    GetPrinterQueueState( pInfo );
-+    pList->Add( pInfo );
-+  }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
-+{
-+  delete pInfo;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
-+{
-+  if (!pInfo)
-+    return;
-+
-+  GnomeCupsPrinter *printer;
-+  printer = PrinterInfoManagerCups::getCups().getGnomePrinter( pInfo );
-+  if (!printer)
-+    {
-+      pInfo->mnStatus = QUEUE_STATUS_READY;
-+      return;
-+    }
-+
-+  switch (gnome_cups_printer_get_state (printer)) {
-+  case IPP_PRINTER_IDLE:
-+    pInfo->mnStatus = QUEUE_STATUS_READY;
-+    break;
-+  case IPP_PRINTER_PROCESSING:
-+    pInfo->mnStatus = QUEUE_STATUS_PROCESSING;
-+    break;
-+  case IPP_PRINTER_STOPPED:
-+  default:
-+    pInfo->mnStatus = QUEUE_STATUS_ERROR;
-+
-+    GList *l, *reasons = gnome_cups_printer_get_state_reasons (printer);
-+    if (!reasons || !reasons->data)
-+      break;
-+
-+    pInfo->mnStatus = 0;
-+    for (l = reasons; l; l = l->next) {
-+      GnomeCupsPrinterReason *reason = (GnomeCupsPrinterReason *) reasons->data;
-+    
-+#define MAP_STATUS(str,en) \
-+      if (!strcmp (reason->keyword, (str))) \
-+        pInfo->mnStatus |= QUEUE_STATUS_##en;
-+
-+      /* cf. RFC 2911.txt 4.4.12 */
-+      MAP_STATUS ("stopping", PENDING_DELETION);
-+      MAP_STATUS ("timed-out", ERROR);
-+      MAP_STATUS ("media-empty", PAPER_PROBLEM);
-+      MAP_STATUS ("connecting-to-device", IO_ACTIVE);
-+      MAP_STATUS ("output-tray-area-full", OUTPUT_BIN_FULL);
-+      MAP_STATUS ("marker-supply-low", TONER_LOW);
-+      MAP_STATUS ("marker-supply-empty", NO_TONER);
-+      MAP_STATUS ("developer-low", TONER_LOW);
-+      MAP_STATUS ("developer-empty", NO_TONER);
-+      MAP_STATUS ("marker-waste-full", USER_INTERVENTION);
-+      MAP_STATUS ("door-open", DOOR_OPEN);
-+      MAP_STATUS ("cover-open", DOOR_OPEN);
-+      MAP_STATUS ("interlock-open", DOOR_OPEN);
-+      MAP_STATUS ("input-tray-missing", DOOR_OPEN);
-+      MAP_STATUS ("output-tray-missing", DOOR_OPEN);
-+      MAP_STATUS ("none", ERROR); // ?
-+      MAP_STATUS ("other", ERROR);
-+      MAP_STATUS ("paused", PAUSED);
-+      MAP_STATUS ("moving-to-paused", PAUSED);
-+      MAP_STATUS ("shutdown", OFFLINE);
-+      MAP_STATUS ("media-jam", PAPER_JAM);
-+      MAP_STATUS ("media-needed", PAPER_OUT);
-+      MAP_STATUS ("media-low", READY); // PAPER_PROBLEM
-+      MAP_STATUS ("output-tray-area-almost-full", READY); // OUTPUT_BIN_FULL
-+      MAP_STATUS ("marker-waste-almost-full", READY); // USER_INTERVENTION
-+#undef MAP_STATUS
-+    }
-+
-+    if ( !pInfo->mnStatus )
-+      pInfo->mnStatus = QUEUE_STATUS_ERROR;
-+
-+    gnome_cups_printer_free_reasons( reasons );
-+    break;
-+  }
-+  gnome_cups_printer_unref( printer );
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+String SalInstance::GetDefaultPrinter()
-+{
-+    maInstData.mbPrinterInit = true;
-+	PrinterInfoManagerCups& rManager( PrinterInfoManagerCups::getCups() );
-+	return rManager.getDefaultPrinter();
-+}
-+
-+// =======================================================================
-+
-+SalInfoPrinter::SalInfoPrinter()
-+{
-+	maPrinterData.m_pGraphics = NULL;
-+	m_bPapersInit = false;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalInfoPrinter::~SalInfoPrinter()
-+{
-+  if( maPrinterData.m_pGraphics )
-+    {
-+      delete maPrinterData.m_pGraphics;
-+      maPrinterData.m_pGraphics = NULL;
-+    }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+
-+void SalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData )
-+{
-+    m_aPaperFormats.clear();
-+    m_bPapersInit = true;
-+
-+    if( maPrinterData.m_aJobData.m_pParser )
-+    {
-+        const PPDKey* pKey = maPrinterData.m_aJobData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
-+        if( pKey )
-+        {
-+            int nValues = pKey->countValues();
-+            for( int i = 0; i < nValues; i++ )
-+            {
-+                const PPDValue* pValue = pKey->getValue( i );
-+                vcl::PaperInfo aInfo;
-+                aInfo.m_aPaperName = pValue->m_aOptionTranslation;
-+                if( ! aInfo.m_aPaperName.Len() )
-+                    aInfo.m_aPaperName = pValue->m_aOption;
-+                int nWidth = 0, nHeight = 0;
-+                maPrinterData.m_aJobData.m_pParser->getPaperDimension( pValue->m_aOption, nWidth, nHeight );
-+                aInfo.m_nPaperWidth = (unsigned long)((PtTo10Mu( nWidth )+50)/100);
-+                aInfo.m_nPaperHeight = (unsigned long)((PtTo10Mu( nHeight )+50)/100);
-+                m_aPaperFormats.push_back( aInfo );
-+            }
-+        }
-+    }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+int SalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* pSetupData )
-+{
-+    return 900;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalGraphics* SalInfoPrinter::GetGraphics()
-+{
-+  // return a valid pointer only once
-+  // the reasoning behind this is that we could have different
-+  // SalGraphics that can run in multiple threads
-+  // (future plans)
-+  SalGraphics* pRet = NULL;
-+  if( ! maPrinterData.m_pGraphics )
-+    {
-+      maPrinterData.m_pGraphics = new SalGraphics;
-+      maPrinterData.m_pGraphics->maGraphicsData.m_pJobData	= &maPrinterData.m_aJobData;
-+      maPrinterData.m_pGraphics->maGraphicsData.m_pPrinterGfx	= &maPrinterData.m_aPrinterGfx;
-+      maPrinterData.m_pGraphics->maGraphicsData.bPrinter_       = TRUE;
-+      pRet = maPrinterData.m_pGraphics;
-+    }
-+  return pRet;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics )
-+{
-+  if( pGraphics == maPrinterData.m_pGraphics )
-+    {
-+      delete pGraphics;
-+      maPrinterData.m_pGraphics = NULL;
-+    }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+#include <stdio.h>
-+
-+BOOL SalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
-+{
-+  if( ! pFrame || ! pJobSetup )
-+    return FALSE;
-+
-+  OString str = OUStringToOString (maPrinterData.m_aJobData.m_aPrinterName, RTL_TEXTENCODING_UTF8);
-+  const char *argv[] = { "gnome-cups-manager", "--properties", NULL, NULL };
-+  argv [2] = str.getStr ();
-+  BOOL success;
-+
-+  if (cups_debug)
-+    fprintf (stderr, "Setup ... [ properties on '%s' ]\n", str.getStr ());
-+
-+  success = g_spawn_async (NULL, (gchar **)argv,
-+			   NULL, G_SPAWN_SEARCH_PATH,
-+			   NULL, NULL, NULL, NULL);
-+
-+  return success;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+// This function gets the driver data and puts it into pJobSetup
-+// If pJobSetup->mpDriverData is NOT NULL, then the independend
-+// data should be merged into the driver data
-+// If pJobSetup->mpDriverData IS NULL, then the driver defaults
-+// should be merged into the independent data
-+BOOL SalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
-+{
-+  if (cups_debug)
-+    fprintf (stderr, "--- re-fetch data from cupsd ---\n");
-+  if( pJobSetup->mpDriverData )
-+    return SetData( ~0, pJobSetup );
-+
-+  copyJobDataToJobSetup( pJobSetup, maPrinterData.m_aJobData );
-+  return TRUE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+// This function merges the independ driver data
-+// and sets the new independ data in pJobSetup
-+// Only the data must be changed, where the bit
-+// in nGetDataFlags is set
-+BOOL SalInfoPrinter::SetData(
-+	ULONG nSetDataFlags,
-+	ImplJobSetup* pJobSetup )
-+{
-+  JobData aData;
-+  JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+  if( aData.m_pParser )
-+    {
-+      const PPDKey* pKey;
-+      const PPDValue* pValue;
-+
-+      // merge papersize if necessary
-+      if( nSetDataFlags & SAL_JOBSET_PAPERSIZE )
-+	{
-+	  int nWidth, nHeight;
-+	  if( pJobSetup->meOrientation == ORIENTATION_PORTRAIT )
-+            {
-+	      nWidth	= pJobSetup->mnPaperWidth;
-+	      nHeight	= pJobSetup->mnPaperHeight;
-+            }
-+	  else
-+            {
-+	      nWidth	= pJobSetup->mnPaperHeight;
-+	      nHeight	= pJobSetup->mnPaperWidth;
-+            }
-+	  String aPaper;
-+	  if( pJobSetup->mePaperFormat == PAPER_USER )
-+	    aPaper = aData.m_pParser->matchPaper(
-+						 TenMuToPt( pJobSetup->mnPaperWidth ),
-+						 TenMuToPt( pJobSetup->mnPaperHeight ) );
-+	  else
-+	    aPaper = String( ByteString( aPaperTab[ pJobSetup->mePaperFormat ].name ), RTL_TEXTENCODING_ISO_8859_1 );
-+	  pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
-+	  pValue = pKey ? pKey->getValue( aPaper ) : NULL;
-+	  if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) )
-+	    return FALSE;
-+	}
-+
-+      // merge paperbin if necessary
-+      if( nSetDataFlags & SAL_JOBSET_PAPERBIN )
-+	{
-+	  pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
-+	  if( pKey )
-+	    {
-+	      int nPaperBin = pJobSetup->mnPaperBin;
-+	      if( nPaperBin == 0xffff )
-+		pValue = pKey->getDefaultValue();
-+	      else
-+	        pValue = pKey->getValue( pJobSetup->mnPaperBin );
-+
-+                // may fail due to constraints;
-+                // real paper bin is copied back to jobsetup in that case
-+		aData.m_aContext.setValue( pKey, pValue );
-+	    }
-+	  // if printer has no InputSlot key simply ignore this setting
-+	  // (e.g. SGENPRT has no InputSlot)
-+	}
-+
-+      // merge orientation if necessary
-+      if( nSetDataFlags & SAL_JOBSET_ORIENTATION )
-+	aData.m_eOrientation = pJobSetup->meOrientation == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait;
-+
-+      maPrinterData.m_aJobData = aData;
-+      copyJobDataToJobSetup( pJobSetup, aData );
-+      return TRUE;
-+    }
-+
-+  return FALSE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInfoPrinter::GetPageInfo(
-+	const ImplJobSetup* pJobSetup,
-+	long& rOutWidth, long& rOutHeight,
-+	long& rPageOffX, long& rPageOffY,
-+	long& rPageWidth, long& rPageHeight )
-+{
-+  if( ! pJobSetup )
-+    return;
-+
-+  JobData aData;
-+  JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+  // get the selected page size
-+  if( aData.m_pParser )
-+    {
-+      String aPaper;
-+      int width, height;
-+      int left = 0, top = 0, right = 0, bottom = 0;
-+      int nDPI = aData.m_aContext.getRenderResolution();
-+
-+
-+      if( aData.m_eOrientation == psp::orientation::Portrait )
-+        {
-+	  aData.m_aContext.getPageSize( aPaper, width, height );
-+	  aData.m_pParser->getMargins( aPaper, left, right, top, bottom );
-+        }
-+      else
-+        {
-+	  aData.m_aContext.getPageSize( aPaper, height, width );
-+	  aData.m_pParser->getMargins( aPaper, bottom, top, left, right );
-+        }
-+      rPageWidth	= width * nDPI / 72;
-+      rPageHeight	= height * nDPI / 72;
-+      rPageOffX	= left * nDPI / 72;
-+      rPageOffY	= top * nDPI / 72;
-+      rOutWidth	= ( width  - left - right ) * nDPI / 72;
-+      rOutHeight	= ( height - top  - bottom ) * nDPI / 72;
-+
-+      if( cups_debug )
-+        g_warning ("SalInfoPrinter:: GetPageInfo ... margins: %ld %ld %ld %ld",
-+		   rPageOffX, rPageOffY, rPageWidth - rOutWidth, rPageHeight - rOutHeight);
-+    }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG SalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
-+{
-+  if( ! pJobSetup )
-+    return 0;
-+
-+  JobData aData;
-+  JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+  const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL;
-+
-+  return pKey ? pKey->countValues() : 0;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+String SalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG nPaperBin )
-+{
-+  JobData aData;
-+  JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+  String aRet;
-+  if( aData.m_pParser )
-+    {
-+      const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL;
-+      if( nPaperBin == 0xffff || !pKey )
-+	aRet = aData.m_pParser->getDefaultInputSlot();
-+      else
-+	{
-+            const PPDValue* pValue = pKey->getValue( nPaperBin );
-+            if( pValue )
-+                aRet = pValue->m_aOptionTranslation.Len() ? pValue->m_aOptionTranslation : pValue->m_aOption;
-+	}
-+    }
-+
-+  return aRet;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG SalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT nType )
-+{
-+  /* FIXME: surely we can do better here */
-+  switch( nType )
-+    {
-+    case PRINTER_CAPABILITIES_SUPPORTDIALOG:
-+      return 1;
-+    case PRINTER_CAPABILITIES_COPIES:
-+      return 0xffff;
-+    case PRINTER_CAPABILITIES_COLLATECOPIES:
-+      return 0;
-+    case PRINTER_CAPABILITIES_SETORIENTATION:
-+      return 1;
-+    case PRINTER_CAPABILITIES_SETPAPERBIN:
-+      return 1;
-+    case PRINTER_CAPABILITIES_SETPAPERSIZE:
-+      return 1;
-+    case PRINTER_CAPABILITIES_SETPAPER:
-+      return 0;
-+    case PRINTER_CAPABILITIES_FAX:
-+      return 0;
-+    default: break;
-+    };
-+  return 0;
-+}
-+
-+// =======================================================================
-+
-+/*
-+ *	SalPrinter
-+ */
-+
-+SalPrinter::SalPrinter()
-+{
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalPrinter::~SalPrinter()
-+{
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+static inline String getTmpName()
-+{
-+  int fd;
-+  String ret;
-+  char  *tmp_name;
-+
-+  tmp_name = g_strdup_printf( "%s/ooo-ps-XXXXXX",
-+			      g_get_tmp_dir() );
-+
-+  if ((fd = g_mkstemp (tmp_name)))
-+    close (fd);
-+  else
-+  {
-+    g_warning ("Failed to create tmpfile '%s'", tmp_name);
-+    return ret;
-+  }
-+
-+  ret = String( ByteString( tmp_name ), RTL_TEXTENCODING_UTF8 );
-+
-+  g_free (tmp_name);
-+
-+  return ret;
-+}
-+
-+BOOL SalPrinter::StartJob(
-+	const XubString* pFileName,
-+	const XubString& rJobName,
-+	const XubString& rAppName,
-+	ULONG nCopies, BOOL bCollate,
-+	ImplJobSetup* pJobSetup )
-+{
-+  int nMode = 0;
-+  vcl_sal::PrinterUpdate::jobStarted();
-+
-+  maPrinterData.m_bFax	    = false;
-+  maPrinterData.m_bPdf      = false;
-+  maPrinterData.m_aFileName = pFileName ? *pFileName : String();
-+  maPrinterData.m_aJobName  = rJobName;
-+  maPrinterData.m_aTmpFile  = String();
-+  maPrinterData.m_nCopies   = nCopies;
-+
-+  JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen,
-+				      maPrinterData.m_aJobData );
-+  if( maPrinterData.m_nCopies > 1 )
-+    // in case user did not do anything (m_nCopies=1)
-+    // take the default from jobsetup
-+    maPrinterData.m_aJobData.m_nCopies = maPrinterData.m_nCopies;
-+
-+  maPrinterData.m_aTmpFile = getTmpName();
-+  if (!maPrinterData.m_aTmpFile.Len())
-+    return FALSE;
-+
-+  String printTo;
-+  if (maPrinterData.isPrintToFile ())
-+    {
-+      ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
-+      it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "Filter#" ) );
-+      nMode = S_IRUSR | S_IWUSR;
-+      if( it != pJobSetup->maValueMap.end() )
-+	{
-+	  OUString aFilter = it->second;
-+	  maPrinterData.m_bPdf = !aFilter.compareToAscii( "PDF" );
-+	}
-+
-+      if (maPrinterData.m_bPdf)
-+	printTo = maPrinterData.m_aTmpFile;
-+      else
-+	printTo = maPrinterData.m_aFileName;
-+    }
-+  else
-+    printTo = maPrinterData.m_aTmpFile;
-+
-+  maPrinterData.m_aPrinterGfx.Init( maPrinterData.m_aJobData );
-+
-+  // FIXME: race
-+  if (PrinterInfoManagerCups::getCups().isBuiltinGeneric() &&
-+      !maPrinterData.m_aFileName.Len())
-+    {
-+#ifdef SAL_PRINTER_ERROR_NO_PRINTER
-+      maPrinterData.m_nError = SAL_PRINTER_ERROR_NO_PRINTER; 
-+      return FALSE;
-+#else
-+      g_warning ("Can't print with generic printer");
-+#endif
-+    }
-+
-+  return maPrinterData.m_aPrintJob.StartJob
-+	( printTo, nMode, rJobName, rAppName, maPrinterData.m_aJobData,
-+	  &maPrinterData.m_aPrinterGfx ) ? TRUE : FALSE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+BOOL SalPrinter::EndJob()
-+{
-+  BOOL bSuccess = maPrinterData.m_aPrintJob.EndJob();
-+  BOOL bUnlink = FALSE;
-+  OString aTmpName = OUStringToOString
-+	  ( maPrinterData.m_aTmpFile, RTL_TEXTENCODING_UTF8 );
-+
-+  if( bSuccess )
-+    {
-+      if (maPrinterData.isPrintToFile ())
-+	{
-+	  if (maPrinterData.m_bPdf) 
-+	    {
-+	      if (cups_debug)
-+                g_warning ("Print to PDF...");
-+	      String aCommandLine = String( RTL_CONSTASCII_USTRINGPARAM(
-+		"/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=\"(OUTFILE)\" (INFILE)" ) );
-+
-+	      if (g_getenv ("SAL_PDF_CONVERT_CMD"))
-+		aCommandLine.AssignAscii (g_getenv ("SAL_PDF_CONVERT_CMD"));
-+
-+#define REPLACE(a,b) \
-+	      while( aCommandLine.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( a ) ), b ) != STRING_NOTFOUND );
-+
-+	      REPLACE ("(OUTFILE)", maPrinterData.m_aFileName);
-+	      REPLACE ("(INFILE)",  maPrinterData.m_aTmpFile);
-+	  
-+	      OString aSystemCmd = OUStringToOString ( aCommandLine, RTL_TEXTENCODING_UTF8 );
-+	      gint exit_status = 0;
-+	      if (!g_spawn_command_line_sync (aSystemCmd.getStr (), NULL, NULL, &exit_status, NULL))
-+		bSuccess = FALSE;
-+	      else
-+		bSuccess = !exit_status;
-+	    }
-+	  else if (cups_debug)
-+            g_warning ("Print to PS file...");
-+	}
-+      else
-+	{
-+	  OString aJobTitle = OUStringToOString
-+	    ( maPrinterData.m_aJobName, RTL_TEXTENCODING_UTF8 );
-+
-+	  if (cups_debug)
-+	    g_warning( "Printing file '%s' name '%s' to '%s'",
-+		       (const sal_Char *)aTmpName,
-+		       (const sal_Char *)OUStringToOString
-+			       ( maPrinterData.m_aJobName, RTL_TEXTENCODING_UTF8 ),
-+		       (const sal_Char *)OUStringToOString
-+				( maPrinterData.m_aJobData.m_aPrinterName, RTL_TEXTENCODING_UTF8 ) );
-+	  
-+	  GError *error = NULL;
-+	  GList  *print_options = NULL;
-+	  GnomeCupsPrinter *printer;
-+
-+	  printer = PrinterInfoManagerCups::getCups().getGnomePrinter
-+		( maPrinterData.m_aJobData.m_aPrinterName );
-+
-+#ifdef USE_CUPS_OPTIONS
-+	  gnome_cups_printer_force_refresh
-+		( printer, GNOME_CUPS_PRINTER_REFRESH_OPTIONS );
-+	  print_options = gnome_cups_printer_get_options( printer );
-+#endif	  
-+	  bSuccess = gnome_cups_printer_print_file
-+		( printer, (const sal_Char *) aTmpName,
-+		  (const sal_Char *) aJobTitle, print_options, &error) != 0;
-+
-+	  if (!bSuccess) {
-+	    if (cups_debug)
-+	      g_warning ("Error printing '%s' ... (0x%x)",
-+			 aTmpName.getStr(), error ? error->code : -1);
-+	    // We can map the IPP status type in error->code but
-+	    // since we can only map it to 2 errors, why bother
-+	    maPrinterData.m_nError = PRINTER_GENERALERROR;
-+	  }
-+
-+#ifdef USE_CUPS_OPTIONS
-+	  gnome_cups_printer_option_list_free( print_options );
-+#endif
-+
-+	  gnome_cups_printer_unref( printer );
-+	}
-+    }
-+  else if (cups_debug)
-+    g_warning ("Internal printing was not a success");
-+
-+  if (maPrinterData.m_aTmpFile.Len())
-+  {
-+    if (cups_debug)
-+      g_warning ("Unlinking tmpfile");
-+    unlink( (const sal_Char *) aTmpName );
-+  }
-+
-+  vcl_sal::PrinterUpdate::jobEnded();
-+
-+  if (cups_debug)
-+    g_warning ("::EndJob returns %d", bSuccess);
-+  return bSuccess;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+BOOL SalPrinter::AbortJob()
-+{
-+    BOOL bAbort = maPrinterData.m_aPrintJob.AbortJob() ? TRUE : FALSE;
-+    vcl_sal::PrinterUpdate::jobEnded();
-+	return bAbort;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalGraphics* SalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL bNewJobData )
-+{
-+  JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, maPrinterData.m_aJobData );
-+  maPrinterData.m_pGraphics = new SalGraphics();
-+  maPrinterData.m_pGraphics->maGraphicsData.m_pJobData      = &maPrinterData.m_aJobData;
-+  maPrinterData.m_pGraphics->maGraphicsData.m_pPrinterGfx   = &maPrinterData.m_aPrinterGfx;
-+  maPrinterData.m_pGraphics->maGraphicsData.bPrinter_       = true;
-+  maPrinterData.m_pGraphics->maGraphicsData.m_pPhoneNr      = maPrinterData.m_bFax ? &maPrinterData.m_aFaxNr : NULL;
-+  maPrinterData.m_pGraphics->maGraphicsData.m_bSwallowFaxNo = maPrinterData.m_bSwallowFaxNo;
-+  if( maPrinterData.m_nCopies > 1 )
-+    // in case user did not do anything (m_nCopies=1)
-+    // take the default from jobsetup
-+    maPrinterData.m_aJobData.m_nCopies = maPrinterData.m_nCopies;
-+
-+  maPrinterData.m_aPrintJob.StartPage( maPrinterData.m_aJobData, bNewJobData ? sal_True : sal_False );
-+  maPrinterData.m_aPrinterGfx.Init( maPrinterData.m_aPrintJob );
-+
-+  return maPrinterData.m_pGraphics;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+BOOL SalPrinter::EndPage()
-+{
-+  sal_Bool bResult = maPrinterData.m_aPrintJob.EndPage();
-+  maPrinterData.m_aPrinterGfx.Clear();
-+  return bResult ? TRUE : FALSE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG SalPrinter::GetErrorCode()
-+{
-+  return maPrinterData.m_nError;
-+}
-+
-+/*
-+ *  vcl::PrinterUpdate
-+ */
-+
-+Timer* vcl_sal::PrinterUpdate::pPrinterUpdateTimer = NULL;
-+int vcl_sal::PrinterUpdate::nActiveJobs = 0;
-+
-+void vcl_sal::PrinterUpdate::doUpdate()
-+{
-+  ::cups::PrinterInfoManagerCups& rManager( ::cups::PrinterInfoManagerCups::getCups() );
-+  if( rManager.checkPrintersChanged() )
-+    {
-+      SalFrame* pFrame = GetSalData()->pFirstFrame_;
-+      while( pFrame )
-+        {
-+	  pFrame->maFrameData.Call( SALEVENT_PRINTERCHANGED, NULL );
-+	  pFrame = pFrame->maFrameData.GetNextFrame();
-+        }
-+    }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+IMPL_STATIC_LINK( vcl_sal::PrinterUpdate, UpdateTimerHdl, void*, pDummy )
-+{
-+  if( nActiveJobs < 1 )
-+    {
-+      doUpdate();
-+      delete pPrinterUpdateTimer;
-+      pPrinterUpdateTimer = NULL;
-+    }
-+  else
-+    pPrinterUpdateTimer->Start();
-+    
-+  return 0;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void vcl_sal::PrinterUpdate::update()
-+{
-+  if( nActiveJobs < 1 )
-+    doUpdate();
-+  else if( ! pPrinterUpdateTimer )
-+    {
-+      pPrinterUpdateTimer = new Timer();
-+      pPrinterUpdateTimer->SetTimeout( 500 );
-+      pPrinterUpdateTimer->SetTimeoutHdl( STATIC_LINK( NULL, vcl_sal::PrinterUpdate, UpdateTimerHdl ) );
-+      pPrinterUpdateTimer->Start();
-+    }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void vcl_sal::PrinterUpdate::jobEnded()
-+{
-+  nActiveJobs--;
-+  if( nActiveJobs < 1 )
-+    {
-+      if( pPrinterUpdateTimer )
-+        {
-+	  pPrinterUpdateTimer->Stop();
-+	  delete pPrinterUpdateTimer;
-+	  pPrinterUpdateTimer = NULL;
-+	  doUpdate();
-+        }
-+    }
-+}
-Index: vcl/util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.46.2.3
-diff -u -p -u -r1.46.2.3 makefile.mk
---- vcl/util/makefile.mk	31 Jul 2003 15:28:43 -0000	1.46.2.3
-+++ vcl/util/makefile.mk	29 Aug 2003 14:34:04 -0000
-@@ -275,6 +275,8 @@ SHL1STDLIBS += -framework Cocoa
- 
- .IF "$(GUIBASE)"=="unx"
- 
-+SHL1STDLIBS += `pkg-config --libs libgnomecups-1.0`
-+
- .IF "$(WITH_LIBSN)"=="YES"
- SHL1STDLIBS+=$(LIBSN_LIBS)
- .ENDIF
diff --git a/patches/OOO_1_1/print-psprint-rehash.diff b/patches/OOO_1_1/print-psprint-rehash.diff
deleted file mode 100644
index 67fc16a4e..000000000
--- a/patches/OOO_1_1/print-psprint-rehash.diff
+++ /dev/null
@@ -1,422 +0,0 @@
-Index: psprint/inc/psprint/printergfx.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/printergfx.hxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 printergfx.hxx
---- psprint/inc/psprint/printergfx.hxx	26 Mar 2003 14:24:02 -0000	1.10
-+++ psprint/inc/psprint/printergfx.hxx	29 May 2003 14:27:22 -0000
-@@ -237,6 +237,8 @@ private:            
-     osl::File*      mpPageHeader;
-     osl::File*      mpPageBody;
- 
-+    void            InitForPrinter( const rtl::OUString &rPrinter );
-+
-     void            TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut, 
-                                           sal_Int32 nXIn, sal_Int32 nYIn )
-     { rXOut = nXIn; rYOut = nYIn; }
-Index: psprint/source/printer/jobdata.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/jobdata.cxx,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 jobdata.cxx
---- psprint/source/printer/jobdata.cxx	19 Jun 2002 10:53:34 -0000	1.2
-+++ psprint/source/printer/jobdata.cxx	29 May 2003 14:27:54 -0000
-@@ -205,9 +205,7 @@ bool JobData::constructFromStreamBuffer(
-         {
-             if( bPrinter )
-             {
--                PrinterInfoManager& rManager = PrinterInfoManager::get();
--                const PrinterInfo& rInfo = rManager.getPrinterInfo( rJobData.m_aPrinterName );
--                rJobData.m_pParser = PPDParser::getParser( rInfo.m_aDriverName );
-+	        rJobData.m_pParser = PrinterInfoManager::get()->getParserForPrinter( rJobData.m_aPrinterName );
-                 if( rJobData.m_pParser )
-                 {
-                     rJobData.m_aContext.setParser( rJobData.m_pParser );
-Index: psprint/source/printergfx/common_gfx.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printergfx/common_gfx.cxx,v
-retrieving revision 1.11
-diff -u -p -u -r1.11 common_gfx.cxx
---- psprint/source/printergfx/common_gfx.cxx	26 Mar 2003 14:24:07 -0000	1.11
-+++ psprint/source/printergfx/common_gfx.cxx	29 May 2003 14:28:17 -0000
-@@ -102,6 +102,17 @@ GraphicsStatus::GraphicsStatus() :
-  * non graphics graphics routines
-  */
- 
-+void
-+PrinterGfx::InitForPrinter( const ::rtl::OUString &rPrinter )
-+{
-+  const PPDParser *pParser = PrinterInfoManager::get()->getParserForPrinter( rPrinter );
-+    
-+  mpFontSubstitutes = PrinterInfoManager::get()->getFontSubstitutesForPrinter( rPrinter );
-+  
-+  mbUploadPS42Fonts = pParser ? ( pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
-+}
-+
-+
- sal_Bool
- PrinterGfx::Init (PrinterJob &rPrinterJob)
- {
-@@ -113,14 +124,8 @@ PrinterGfx::Init (PrinterJob &rPrinterJo
-     
-     mnDpi = rPrinterJob.GetResolution();
-     rPrinterJob.GetScale (mfScaleX, mfScaleY);
--    const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) );
--    if( mpFontSubstitutes )
--        delete const_cast< ::std::hash_map<fontID,fontID>* >(mpFontSubstitutes);
--    if( rInfo.m_bPerformFontSubstitution )
--        mpFontSubstitutes = new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions );
--    else
--        mpFontSubstitutes = NULL;
--    mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
-+
-+    InitForPrinter( rPrinterJob.GetPrinterName() );
- 
-     return sal_True;
- }
-@@ -137,6 +142,7 @@ PrinterGfx::Init (const JobData& rData)
-     mnDpi           = nRes;
-     mfScaleX        = (double)72.0 / (double)mnDpi;
-     mfScaleY        = (double)72.0 / (double)mnDpi;
-+#if 0
-     const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) );
-     if( mpFontSubstitutes )
-         delete const_cast< ::std::hash_map<fontID,fontID>* >(mpFontSubstitutes);
-@@ -145,6 +151,8 @@ PrinterGfx::Init (const JobData& rData)
-     else
-         mpFontSubstitutes = NULL;
-     mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
-+#endif
-+    InitForPrinter( rData.m_aPrinterName );
-     
-     return sal_True;
- }
-Index: psprint/source/printergfx/printerjob.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
-retrieving revision 1.21
-diff -u -p -u -r1.21 printerjob.cxx
---- psprint/source/printergfx/printerjob.cxx	26 Mar 2003 14:24:08 -0000	1.21
-+++ psprint/source/printergfx/printerjob.cxx	29 May 2003 14:28:29 -0000
-@@ -550,17 +550,10 @@ PrinterJob::EndJob ()
-     }
-     else
-     {
--        const PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get ();
--        const rtl::OUString& rPrinter     = m_aLastJobData.m_aPrinterName;
--        const PrinterInfo&   rPrinterInfo = rPrinterInfoManager.getPrinterInfo (rPrinter);
--        const rtl::OUString& rCommand     = rPrinterInfo.m_aCommand;
-+      pDestFILE = PrinterInfoManager::get ()->getPipeToPrinter( m_aLastJobData.m_aPrinterName );
- 
--        const rtl::OString aShellCommand = rtl::OUStringToOString (rCommand, 
--                                                                   RTL_TEXTENCODING_ISO_8859_1);
--													  
--        pDestFILE = popen (aShellCommand.getStr(), "w");
--        if (pDestFILE == NULL)
--            return sal_False;
-+      if (pDestFILE == NULL)
-+	return sal_False;
-     }
- 
-     /* spool the document parts to the destination */
-Index: psprint/inc/psprint/printerinfomanager.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 printerinfomanager.hxx
---- psprint/inc/psprint/printerinfomanager.hxx	10 Jun 2003 14:34:28 -0000	1.4
-+++ psprint/inc/psprint/printerinfomanager.hxx	20 Jun 2003 14:47:18 -0000
-@@ -83,6 +83,20 @@
- 
- namespace psp
- {
-+class PrinterInfoManager
-+{
-+  static PrinterInfoManager *pGlobalManager;
-+protected:
-+  static void set (PrinterInfoManager *pManager) { pGlobalManager = pManager; }
-+public:
-+  static PrinterInfoManager *get ();
-+  virtual const PPDParser *getParserForPrinter( ::rtl::OUString rPrinter );
-+  virtual ::std::hash_map< fontID, fontID > *getFontSubstitutesForPrinter( ::rtl::OUString rPrinter );
-+  virtual FILE *getPipeToPrinter( ::rtl::OUString rPrinter );
-+};
-+
-+namespace lpr
-+{
- 
- class SystemQueueInfo;
- 
-@@ -115,7 +129,7 @@ struct PrinterInfo : JobData
-     m_aFontSubstitutions;
- };
- 
--class PrinterInfoManager
-+class PrinterInfoManagerLpr : ::psp::PrinterInfoManager
- {
-     // needed for checkPrintersChanged: files (not necessarily existant)
-     // and their last known modification time
-@@ -155,8 +169,8 @@ class PrinterInfoManager
- 
-     SystemQueueInfo*					m_pQueueInfo;
- 
--    PrinterInfoManager();
--    ~PrinterInfoManager();
-+    PrinterInfoManagerLpr();
-+    ~PrinterInfoManagerLpr();
- 
-     void initialize();
- 
-@@ -214,8 +228,14 @@ public:
-         
-     // similar but returnse whole commandlines
-     void getSystemPrintCommands( ::std::list< ::rtl::OUString >& rCommands );
-+
-+    virtual const PPDParser *getParserForPrinter( ::rtl::OUString rPrinter );
-+    virtual ::std::hash_map< fontID, fontID > *getFontSubstitutesForPrinter( ::rtl::OUString rPrinter );
-+    virtual FILE *getPipeToPrinter( ::rtl::OUString rPrinter );
- };
-+
-+} // namespace lpr
-     
--} // namespace
-+} // namespace psp
- 
- #endif // _PSPRINT_PRINTERINFOMANAGER_HXX_
-Index: psprint/source/printer/printerinfomanager.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/printerinfomanager.cxx,v
-retrieving revision 1.19
-diff -u -p -u -r1.19 printerinfomanager.cxx
---- psprint/source/printer/printerinfomanager.cxx	12 Jun 2003 11:08:59 -0000	1.19
-+++ psprint/source/printer/printerinfomanager.cxx	23 Jun 2003 13:28:10 -0000
-@@ -62,6 +62,7 @@
- #include <unistd.h>
- #include <sys/wait.h>
- #include <signal.h>
-+#include <stdio.h>
- 
- #include <tools/urlobj.hxx>
- #include <tools/stream.hxx>
-@@ -81,10 +82,41 @@
- using namespace psp;
- using namespace rtl;
- using namespace osl;
-+using namespace lpr;
- 
- namespace psp
- {
--class SystemQueueInfo : public Thread
-+
-+PrinterInfoManager *::psp::PrinterInfoManager::pGlobalManager = NULL;
-+
-+const ::psp::PPDParser *
-+PrinterInfoManager::getParserForPrinter( ::rtl::OUString rPrinter )
-+{
-+  fprintf( stderr, "error, base PrinterInfoManager::getParserForPrinter\n" );
-+  return NULL;
-+}
-+
-+::std::hash_map< fontID, fontID > *
-+PrinterInfoManager::getFontSubstitutesForPrinter( ::rtl::OUString rPrinter )
-+{ // font mapping tables are a terrible idea.
-+  fprintf( stderr, "error, base PrinterInfoManager::getFontSubstitutesForPrinter\n" );
-+  return NULL;
-+}
-+
-+::psp::PrinterInfoManager *
-+PrinterInfoManager::get ()
-+{
-+  return pGlobalManager;
-+}
-+
-+FILE *
-+PrinterInfoManager::getPipeToPrinter( ::rtl::OUString rPrinter )
-+{
-+  fprintf( stderr, "error, base PrinterInfoManager::getPipeToPrinter\n" );
-+  return NULL;
-+}
-+
-+class psp::lpr::SystemQueueInfo : public Thread
- {
-     mutable Mutex				m_aMutex;
-     bool						m_bChanged;
-@@ -106,21 +138,21 @@ class SystemQueueInfo : public Thread
- } // namespace
- 
- /*
-- *  class PrinterInfoManager
-+ *  class PrinterInfoManagerLpr
-  */
- 
- // -----------------------------------------------------------------
- 
--PrinterInfoManager& PrinterInfoManager::get()
-+PrinterInfoManager& PrinterInfoManagerLpr::get()
- {
--    static PrinterInfoManager aManager;
-+    static PrinterInfoManagerLpr aManager;
- 
-     return aManager;
- }
- 
- // -----------------------------------------------------------------
- 
--PrinterInfoManager::PrinterInfoManager()
-+PrinterInfoManagerLpr::PrinterInfoManagerLpr()
- {
-     m_pQueueInfo = new SystemQueueInfo();
-     initialize();
-@@ -128,14 +160,14 @@ PrinterInfoManager::PrinterInfoManager()
- 
- // -----------------------------------------------------------------
- 
--PrinterInfoManager::~PrinterInfoManager()
-+PrinterInfoManagerLpr::~PrinterInfoManagerLpr()
- {
-     delete m_pQueueInfo;
- }
- 
- // -----------------------------------------------------------------
- 
--bool PrinterInfoManager::checkPrintersChanged()
-+bool PrinterInfoManagerLpr::checkPrintersChanged()
- {
-     // check if files were created, deleted or modified since initialize()
- 
-@@ -172,7 +204,7 @@ bool PrinterInfoManager::checkPrintersCh
- 
- // -----------------------------------------------------------------
- 
--void PrinterInfoManager::initialize()
-+void PrinterInfoManagerLpr::initialize()
- {
-     rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
-     m_aPrinters.clear();
-@@ -542,7 +574,7 @@ void PrinterInfoManager::initialize()
- 
- // -----------------------------------------------------------------
- 
--void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
-+void PrinterInfoManagerLpr::listPrinters( ::std::list< OUString >& rList ) const
- {
-     ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it;
-     rList.clear();
-@@ -552,7 +584,7 @@ void PrinterInfoManager::listPrinters( :
- 
- // -----------------------------------------------------------------
- 
--const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
-+const PrinterInfo& PrinterInfoManagerLpr::getPrinterInfo( const OUString& rPrinter ) const
- {
-     static PrinterInfo aEmptyInfo;
-     ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
-@@ -564,7 +596,7 @@ const PrinterInfo& PrinterInfoManager::g
- 
- // -----------------------------------------------------------------
- 
--void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
-+void PrinterInfoManagerLpr::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
- {
-     ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
- 
-@@ -593,7 +625,7 @@ static bool checkWriteability( const OUS
-     return bRet;
- }
- 
--bool PrinterInfoManager::writePrinterConfig()
-+bool PrinterInfoManagerLpr::writePrinterConfig()
- {
-     // find at least one writeable config
-     ::std::hash_map< OUString, Config*, OUStringHash > files;
-@@ -724,7 +756,7 @@ bool PrinterInfoManager::writePrinterCon
- 
- // -----------------------------------------------------------------
- 
--bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUString& rDriverName )
-+bool PrinterInfoManagerLpr::addPrinter( const OUString& rPrinterName, const OUString& rDriverName )
- {
-     bool bSuccess = false;
- 
-@@ -769,7 +801,7 @@ bool PrinterInfoManager::addPrinter( con
- 
- // -----------------------------------------------------------------
- 
--bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bCheckOnly )
-+bool PrinterInfoManagerLpr::removePrinter( const OUString& rPrinterName, bool bCheckOnly )
- {
-     bool bSuccess = true;
- 
-@@ -823,7 +855,7 @@ bool PrinterInfoManager::removePrinter( 
- 
- // -----------------------------------------------------------------
- 
--bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
-+bool PrinterInfoManagerLpr::setDefaultPrinter( const OUString& rPrinterName )
- {
-     bool bSuccess = false;
- 
-@@ -841,7 +873,7 @@ bool PrinterInfoManager::setDefaultPrint
- 
- // -----------------------------------------------------------------
- 
--void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
-+void PrinterInfoManagerLpr::fillFontSubstitutions( PrinterInfo& rInfo ) const
- {
-     PrintFontManager& rFontManager( PrintFontManager::get() );
-     rInfo.m_aFontSubstitutions.clear();
-@@ -938,7 +970,7 @@ void PrinterInfoManager::fillFontSubstit
- 
- // -----------------------------------------------------------------
- 
--void PrinterInfoManager::getSystemPrintCommands( std::list< OUString >& rCommands )
-+void PrinterInfoManagerLpr::getSystemPrintCommands( std::list< OUString >& rCommands )
- {
-     if( m_pQueueInfo->hasChanged() )
-     {
-@@ -957,7 +989,7 @@ void PrinterInfoManager::getSystemPrintC
-     }
- }
- 
--const std::list< OUString >& PrinterInfoManager::getSystemPrintQueues()
-+const std::list< OUString >& PrinterInfoManagerLpr::getSystemPrintQueues()
- {
-     if( m_pQueueInfo->hasChanged() )
-     {
-@@ -1097,4 +1129,36 @@ void SystemQueueInfo::run()
-         m_aQueues	= aSysPrintQueues;
-         m_aCommand	= aPrintCommand;
-     }
-+}
-+
-+// --- untested, just to show willing ---
-+
-+const PPDParser *
-+PrinterInfoManagerLpr::getParserForPrinter( ::rtl::OUString rPrinter )
-+{
-+  PrinterInfo rInfo( getPrinterInfo( rPrinter ) );
-+  return rInfo.m_pParser;
-+}
-+
-+::std::hash_map< fontID, fontID > *
-+PrinterInfoManagerLpr::getFontSubstitutesForPrinter( ::rtl::OUString rPrinter )
-+{
-+  PrinterInfo rInfo( getPrinterInfo( rPrinter ) );
-+
-+  if( !rInfo.m_bPerformFontSubstitution )
-+    return NULL;
-+
-+  return new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions );
-+}
-+
-+FILE *
-+PrinterInfoManagerLpr::getPipeToPrinter( ::rtl::OUString rPrinter )
-+{
-+  const PrinterInfo&   rPrinterInfo = getPrinterInfo (rPrinter);
-+  const rtl::OUString& rCommand     = rPrinterInfo.m_aCommand;
-+  
-+  const rtl::OString aShellCommand = rtl::OUStringToOString
-+    ( rCommand, RTL_TEXTENCODING_ISO_8859_1);
-+  
-+  return popen (aShellCommand.getStr(), "w");
- }
diff --git a/patches/OOO_1_1/rsc-no-crash.diff b/patches/OOO_1_1/rsc-no-crash.diff
deleted file mode 100644
index 51db056cc..000000000
--- a/patches/OOO_1_1/rsc-no-crash.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: rsc/source/rscpp/cpp1.c
-===================================================================
-RCS file: /cvs/gsl/rsc/source/rscpp/cpp1.c,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 cpp1.c
---- rsc/source/rscpp/cpp1.c	2 Jul 2003 14:52:27 -0000	1.4
-+++ rsc/source/rscpp/cpp1.c	10 Sep 2003 16:12:10 -0000
-@@ -419,10 +419,11 @@ nRunde++;
- /* alt:        fclose(stdout); */
- 
- #if OSL_DEBUG_LEVEL > 1
--        fclose( pDefOut );
-+		if( pDefOut != stdout )
-+            fclose( pDefOut );
- #endif
--        fclose( pCppOut );
--        fclose( pCppIn  );
-+		if( pCppOut != stdout )
-+            fclose( pCppOut );
- 
- 
-         if (errors > 0) {
diff --git a/patches/OOO_1_1/sd-export-html-descr.diff b/patches/OOO_1_1/sd-export-html-descr.diff
deleted file mode 100644
index bbf92a1fc..000000000
--- a/patches/OOO_1_1/sd-export-html-descr.diff
+++ /dev/null
@@ -1,140 +0,0 @@
---- /dev/null	2002-08-31 00:31:37.000000000 +0100
-+++ extras/source/gallery/htmltheme	2003-08-18 14:35:38.000000000 +0100
-@@ -0,0 +1,137 @@
-+# first off, first on, prev off, prev on
-+# next off, next on, last off, last on
-+# index, text, more, less
-+
-+[ simple ]
-+htmlexpo/simple-first-inactive.png
-+htmlexpo/simple-first.png
-+htmlexpo/simple-left-inactive.png
-+htmlexpo/simple-left.png
-+htmlexpo/simple-right-inactive.png
-+htmlexpo/simple-right.png
-+htmlexpo/simple-last-inactive.png
-+htmlexpo/simple-last.png
-+htmlexpo/simple-nav.png
-+htmlexpo/simple-text.png
-+htmlexpo/simple-plus.png
-+htmlexpo/simple-minus.png
-+
-+[ gorilla ]
-+htmlexpo/gorilla-first-inactive.png
-+htmlexpo/gorilla-first.png
-+htmlexpo/gorilla-left-inactive.png
-+htmlexpo/gorilla-left.png
-+htmlexpo/gorilla-right-inactive.png
-+htmlexpo/gorilla-right.png
-+htmlexpo/gorilla-last-inactive.png
-+htmlexpo/gorilla-last.png
-+htmlexpo/gorilla-nav.png
-+htmlexpo/gorilla-text.png
-+htmlexpo/gorilla-plus.png
-+htmlexpo/gorilla-minus.png
-+
-+[ blue ]
-+htmlexpo/blue-first-inactive.png
-+htmlexpo/blue-first.png
-+htmlexpo/blue-left-inactive.png
-+htmlexpo/blue-left.png
-+htmlexpo/blue-right-inactive.png
-+htmlexpo/blue-right.png
-+htmlexpo/blue-last-inactive.png
-+htmlexpo/blue-last.png
-+htmlexpo/blue-nav.png
-+htmlexpo/blue-text.png
-+htmlexpo/blue-plus.png
-+htmlexpo/blue-minus.png
-+
-+[ green ]
-+htmlexpo/green-first-inactive.png
-+htmlexpo/green-first.png
-+htmlexpo/green-left-inactive.png
-+htmlexpo/green-left.png
-+htmlexpo/green-right-inactive.png
-+htmlexpo/green-right.png
-+htmlexpo/green-last-inactive.png
-+htmlexpo/green-last.png
-+htmlexpo/green-nav.png
-+htmlexpo/green-text.png
-+htmlexpo/green-plus.png
-+htmlexpo/green-minus.png
-+
-+[ grey ]
-+htmlexpo/grey-first-inactive.png
-+htmlexpo/grey-first.png
-+htmlexpo/grey-left-inactive.png
-+htmlexpo/grey-left.png
-+htmlexpo/grey-right-inactive.png
-+htmlexpo/grey-right.png
-+htmlexpo/grey-last-inactive.png
-+htmlexpo/grey-last.png
-+htmlexpo/grey-nav.png
-+htmlexpo/grey-text.png
-+htmlexpo/grey-plus.png
-+htmlexpo/grey-minus.png
-+
-+[ yellow ]
-+htmlexpo/yellow-first-inactive.png
-+htmlexpo/yellow-first.png
-+htmlexpo/yellow-left-inactive.png
-+htmlexpo/yellow-left.png
-+htmlexpo/yellow-right-inactive.png
-+htmlexpo/yellow-right.png
-+htmlexpo/yellow-last-inactive.png
-+htmlexpo/yellow-last.png
-+htmlexpo/yellow-nav.png
-+htmlexpo/yellow-text.png
-+htmlexpo/yellow-plus.png
-+htmlexpo/yellow-minus.png
-+
-+[ blu ]
-+htmlexpo/blufirs_.gif
-+htmlexpo/blufirs.gif
-+htmlexpo/bluprev_.gif
-+htmlexpo/bluprev.gif
-+htmlexpo/blunext_.gif
-+htmlexpo/blunext.gif
-+htmlexpo/blulast_.gif
-+htmlexpo/blulast.gif
-+htmlexpo/blunav.gif
-+htmlexpo/blutext.gif
-+
-+[ cub ]
-+htmlexpo/cubfirs_.gif
-+htmlexpo/cubfirs.gif
-+htmlexpo/cubprev_.gif
-+htmlexpo/cubprev.gif
-+htmlexpo/cubnext_.gif
-+htmlexpo/cubnext.gif
-+htmlexpo/cublast_.gif
-+htmlexpo/cublast.gif
-+htmlexpo/cubnav.gif
-+htmlexpo/cubtext.gif
-+
-+[ gre ]
-+htmlexpo/grefirs_.gif
-+htmlexpo/grefirs.gif
-+htmlexpo/greprev_.gif
-+htmlexpo/greprev.gif
-+htmlexpo/grenext_.gif
-+htmlexpo/grenext.gif
-+htmlexpo/grelast_.gif
-+htmlexpo/grelast.gif
-+htmlexpo/grenav.gif
-+htmlexpo/gretext.gif
-+
-+
-+[ sim ]
-+htmlexpo/simfirs_.gif
-+htmlexpo/simfirs.gif
-+htmlexpo/simprev_.gif
-+htmlexpo/simprev.gif
-+htmlexpo/simnext_.gif
-+htmlexpo/simnext.gif
-+htmlexpo/simlast_.gif
-+htmlexpo/simlast.gif
-+htmlexpo/simnav.gif
-+htmlexpo/simtext.gif
-+
diff --git a/patches/OOO_1_1/sd-export-html.diff b/patches/OOO_1_1/sd-export-html.diff
deleted file mode 100644
index a5e6dde17..000000000
--- a/patches/OOO_1_1/sd-export-html.diff
+++ /dev/null
@@ -1,429 +0,0 @@
-Index: sd/inc/resltn.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/inc/resltn.hxx,v
-retrieving revision 1.1.1.1
-diff -u -p -u -r1.1.1.1 resltn.hxx
---- sd/inc/resltn.hxx   18 Sep 2000 16:48:28 -0000      1.1.1.1
-+++ sd/inc/resltn.hxx   14 Aug 2003 13:27:09 -0000
-@@ -71,8 +71,9 @@ enum PublishingResolution
-
- enum PublishingFormat
- {
--       FORMAT_GIF,
--       FORMAT_JPG
-+//     FORMAT_GIF,
-+       FORMAT_JPG = 1,
-+       FORMAT_PNG = 2
- };
-
- enum PublishingScript
-
-Index: sd/source/filter/html/htmlex.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/filter/html/htmlex.cxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 htmlex.cxx
---- sd/source/filter/html/htmlex.cxx	4 Jun 2003 11:02:23 -0000	1.10
-+++ sd/source/filter/html/htmlex.cxx	18 Aug 2003 12:57:03 -0000
-@@ -222,6 +222,7 @@
- #include "imapinfo.hxx"
- #include "sdresid.hxx"
- #include "htmlex.hxx"
-+#include "htmltheme.hxx"
- 
- using namespace ::rtl;
- using namespace ::com::sun::star;
-@@ -1077,7 +1078,7 @@ bool HtmlExport::CreateImagesForPresPage
- 		Sequence< PropertyValue > aDescriptor( 3 );
- 		aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("URL") );
- 		aDescriptor[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") );
--		aDescriptor[1].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM(m_eFormat==FORMAT_GIF ? "GIF" : "JPG") );
-+		aDescriptor[1].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM(m_eFormat==FORMAT_JPG ? "JPG" : "PNG") );
- 		aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") );
- 		aDescriptor[2].Value <<= aFilterData;
- 
-@@ -2116,10 +2117,10 @@ void HtmlExport::CreateFileNames()
- 
- 		pName = new String( RTL_CONSTASCII_USTRINGPARAM("img") );
- 		*pName += String::CreateFromInt32(nSdPage);
--		if( m_eFormat==FORMAT_GIF )
--            pName->AppendAscii( ".gif" );
-+		if( m_eFormat!=FORMAT_JPG )
-+			pName->AppendAscii( ".png" );
- 		else
--            pName->AppendAscii( ".jpg" );
-+			pName->AppendAscii( ".jpg" );
- 
- 		m_pImageFiles[nSdPage] = pName;
- 
-@@ -2679,10 +2680,7 @@ bool HtmlExport::CreateBitmaps()
- 
-     if(m_nButtonThema != -1)
-     {
--        if( GalleryExplorer::BeginLocking( GALLERY_THEME_HTMLBUTTONS ) )
--        {
-             Graphic aButton;
--            INT16 nButtons = m_nButtonThema * NUM_BUTTONS + 1;
-             for( INT16 nButton = 0; nButton < NUM_BUTTONS && nErr == 0; nButton++ )
-             {
-                 if(!m_bFrames && (nButton == BTN_MORE || nButton == BTN_LESS))
-@@ -2691,11 +2689,8 @@ bool HtmlExport::CreateBitmaps()
-                 if(!m_bImpress && (nButton == BTN_TEXT || nButton == BTN_MORE || nButton == BTN_LESS ))
-                     continue;
- 
--                nErr = CreateBitmap(GALLERY_THEME_HTMLBUTTONS, nButtons + nButton, GetButtonName(nButton));
-+                nErr = CreateBitmap(m_nButtonThema, nButton, GetButtonName(nButton));
-             }
--
--            GalleryExplorer::EndLocking( GALLERY_THEME_HTMLBUTTONS );
--        }
-     }
- 
- 	if( nErr != 0 )
-@@ -2709,28 +2704,31 @@ bool HtmlExport::CreateBitmaps()
- // ====================================================================
- ULONG HtmlExport::CreateBitmap( ULONG nThemeId, INT16 nImage, const String& aName ) const
- {
-+	SdHtmlTheme aTheme = SdHtmlTheme::getTheme();
-+
- 	String aFull(m_aExportPath);
- 	aFull += aName;
- 
--	Graphic aGraphic;
- 	EasyFile aFile;
- 	String aJPG;
- 	SvStream* pStrm;
- 	ULONG nErr = aFile.createStream(aFull, pStrm);
- 	if(nErr == 0)
- 	{
--		nErr = GalleryExplorer::GetGraphicObj( nThemeId, nImage, &aGraphic )?0:1;
--		if( nErr == 0 )
-+		BitmapEx aBitmap;
-+
-+		nErr = aTheme.getBitmap( nThemeId, nImage, aBitmap );
-+
-+		if (nErr == 0)
- 		{
- 			if( m_bUserAttr || m_bDocColors )
- 			{
--				BitmapEx aBitmap( aGraphic.GetBitmapEx() );
--
--				if( aBitmap.GetTransparentType() != TRANSPARENT_NONE )
-+				if( aBitmap.GetTransparentType() != TRANSPARENT_NONE &&
-+				   m_eFormat != FORMAT_PNG )
- 					SmoothBitmap( aBitmap, m_bUserAttr?m_aBackColor:m_aFirstPageColor );
--				aGraphic = Graphic( aBitmap );
- 			}
--			nErr = GraphicConverter::Export( *pStrm, aGraphic, CVT_GIF );
-+			Graphic aGraphic = aBitmap;
-+			nErr = GraphicConverter::Export( *pStrm, aGraphic, m_eFormat==FORMAT_JPG?CVT_JPG:CVT_PNG );
- 		}
- 
- 		if( nErr == 0 )
-@@ -3455,6 +3453,16 @@ String HtmlExport::GetButtonName( USHORT
- {
- 	String aName;
- 	aName.AssignAscii( pButtonNames[nButton] );
-+	
-+	xub_StrLen nExtnOffset;
-+	if ( ( nExtnOffset = aName.SearchBackward( '.' ) ) > 0 ) {
-+		aName.Erase( nExtnOffset );
-+		if (m_eFormat != FORMAT_PNG)
-+			aName += String::CreateFromAscii( ".jpg" );
-+		else
-+			aName += String::CreateFromAscii( ".png" );
-+	}
-+
- 	return aName;
- }
- 
-Index: sd/source/filter/html/makefile.mk
-===================================================================
-RCS file: /cvs/graphics/sd/source/filter/html/makefile.mk,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 makefile.mk
---- sd/source/filter/html/makefile.mk	2 Aug 2002 12:13:59 -0000	1.4
-+++ sd/source/filter/html/makefile.mk	18 Aug 2003 12:57:03 -0000
-@@ -77,10 +77,11 @@ SLOFILES =	$(SLO)$/HtmlOptionsDialog.obj
- 			$(SLO)$/sdhtmlfilter.obj	\
- 			$(SLO)$/htmlex.obj			\
- 			$(SLO)$/htmlattr.obj		\
-+			$(SLO)$/htmltheme.obj		\
- 			$(SLO)$/pubdlg.obj			
- 
- EXCEPTIONSFILES = $(SLO)$/HtmlOptionsDialog.obj \
--				  $(SLO)$/htmlex.obj
-+				  $(SLO)$/htmlex.obj $(SLO)/htmltheme.obj
- 
- SRCFILES =	pubdlg.src					
- 	
-Index: sd/source/filter/html/pubdlg.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/filter/html/pubdlg.cxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 pubdlg.cxx
---- sd/source/filter/html/pubdlg.cxx	16 Jul 2002 08:13:01 -0000	1.3
-+++ sd/source/filter/html/pubdlg.cxx	18 Aug 2003 12:57:04 -0000
-@@ -149,6 +149,7 @@
- #include "htmlattr.hxx"
- #include "htmlex.hxx"
- #include "helpids.h"
-+#include "htmltheme.hxx"
- 
- using namespace std;
- using namespace rtl;
-@@ -509,7 +510,7 @@ SdPublishingDlg::SdPublishingDlg(Window*
- 	pPage2_Index->SetText(aText);
- 	pPage2_CGI->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "/cgi-bin/" ) ) );
- 
--	pPage3_Gif->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
-+	pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
- 	pPage3_Jpg->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
- 
- 	pPage3_Resolution_1->SetClickHdl(LINK(this,SdPublishingDlg, ResolutionHdl ));
-@@ -663,7 +664,7 @@ void SdPublishingDlg::CreatePages()
- 	aAssistentFunc.InsertControl(3,
- 		pPage3_Titel1 = new FixedLine(this,SdResId(PAGE3_TITEL_1)));
- 	aAssistentFunc.InsertControl(3,
--		pPage3_Gif = new RadioButton(this,SdResId(PAGE3_GIF)));
-+		pPage3_Png = new RadioButton(this,SdResId(PAGE3_PNG)));
- 	aAssistentFunc.InsertControl(3,
- 		pPage3_Jpg = new RadioButton(this,SdResId(PAGE3_JPG)));
- 	aAssistentFunc.InsertControl(3,
-@@ -721,6 +722,7 @@ void SdPublishingDlg::CreatePages()
- 		pPage5_TextOnly = new CheckBox(this, SdResId(PAGE5_TEXTONLY)));
- 	aAssistentFunc.InsertControl(5,
- 		pPage5_Buttons = new ValueSet(this,SdResId(PAGE5_BUTTONS)));
-+	pPage5_Buttons->SetStyle(pPage5_Buttons->GetStyle() | WB_VSCROLL);
- 
- 	// Seite 6
- 	aAssistentFunc.InsertControl(6,
-@@ -814,7 +816,7 @@ void SdPublishingDlg::RemovePages()
- 
- 	delete pPage3_Bmp;
- 	delete pPage3_Titel1;
--	delete pPage3_Gif;
-+	delete pPage3_Png;
- 	delete pPage3_Jpg;
- 	delete pPage3_Quality_txt;
- 	delete pPage3_Quality;
-@@ -944,7 +946,7 @@ void SdPublishingDlg::GetParameterSequen
- 	aProps.push_back( aValue );
- 
- 	aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Format" ) );
--	aValue.Value <<= (sal_Int32)(pPage3_Gif->IsChecked()?FORMAT_GIF:FORMAT_JPG);
-+	aValue.Value <<= (sal_Int32)(pPage3_Png->IsChecked()?FORMAT_PNG:FORMAT_JPG);
- 	aProps.push_back( aValue );
- 
- 	// Page 4
-@@ -980,7 +982,7 @@ void SdPublishingDlg::GetParameterSequen
- 	if( !pPage5_TextOnly->IsChecked() )
- 	{
- 		aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UseButtonSet" ) );
--		aValue.Value <<= (sal_Int32)(pPage5_Buttons->GetSelectItemId() - 1);
-+		aValue.Value <<= (sal_Int32)(pPage5_Buttons->GetSelectItemId());
- 		aProps.push_back( aValue );
- 	}
- 
-@@ -1128,10 +1130,10 @@ IMPL_LINK( SdPublishingDlg, WebServerHdl
- // =====================================================================
- IMPL_LINK( SdPublishingDlg, GfxFormatHdl, RadioButton *, pButton )
- {
--	if(pButton == pPage3_Gif)
-+	if(pButton == pPage3_Png)
- 		pPage3_Jpg->Check(FALSE);
- 	else
--		pPage3_Gif->Check(FALSE);
-+		pPage3_Png->Check(FALSE);
- 
- 	pPage3_Quality->Enable(pButton == pPage3_Jpg);
- 	return 0;
-@@ -1334,8 +1336,6 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, O
- 	return 0;
- }
- 
--static UINT16 nPreviewBitmapOffests[] = { 1,3,5,7,8,9,10,11 };
--
- // =====================================================================
- // Refresh des Dialogs beim wechsel der Seite
- // =====================================================================
-@@ -1466,42 +1466,13 @@ void SdPublishingDlg::UpdatePage()
-  */
- void SdPublishingDlg::LoadPreviewButtons()
- {
--	if( GalleryExplorer::BeginLocking( GALLERY_THEME_HTMLBUTTONS ) )
--	{
--		UINT16 nFavCount = (UINT16) GalleryExplorer::GetObjCount( GALLERY_THEME_HTMLBUTTONS );
--
--		USHORT nItem = 1;
--		Graphic	aThumb;
--		Size aSize( (8*40) - 8, 32 );
--		Point aOrigin( 0,0 );
--		Size aDestSize( 32, 32 );
--
--		for( UINT16 nModelPos = 1; nModelPos < nFavCount; nModelPos+= NUM_BUTTONS )
--		{
--			VirtualDevice aVDev;
--			aVDev.SetMapMode(MapMode(MAP_PIXEL));
--			aVDev.SetOutputSizePixel( aSize );
--
--			for( UINT16 nImage = 0; nImage < 8; nImage++ )
--			{
--				if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_HTMLBUTTONS, nModelPos + nPreviewBitmapOffests[nImage], &aThumb ) )
--					continue;
-+	SdHtmlTheme aTheme = SdHtmlTheme::getTheme();
- 
--				// ValueSet fuellen
--				Bitmap aBitmap( aThumb.GetBitmap() );
--
--				Point aDestPt( nImage * 40, 0 );
--				aVDev.DrawBitmap( aDestPt, aDestSize, aBitmap );
--			}
--
--			String aStr = UniString::CreateFromInt32( nItem );
--			Bitmap aBitmap( aVDev.GetBitmap( aOrigin, aSize ) );
--
--			pPage5_Buttons->InsertItem( (USHORT)nItem++, aBitmap, aStr );
--		}
-+	for (int nThemeId = 0; nThemeId < aTheme.getThemeCount (); nThemeId++)
-+	{
-+		String aStr = UniString::CreateFromInt32( nThemeId );
-+		pPage5_Buttons->InsertItem( (USHORT)nThemeId, aTheme.getThumbnail( nThemeId ), aStr );
- 		m_bButtonsDirty = FALSE;
--
--		GalleryExplorer::EndLocking( GALLERY_THEME_HTMLBUTTONS );
- 	}
- }
- 
-@@ -1551,7 +1522,7 @@ void SdPublishingDlg::SetDesign( SdPubli
- 
- 	pPage2_Endless->Check( pDesign->m_bEndless );
- 
--	pPage3_Gif->Check(pDesign->m_eFormat == FORMAT_GIF);
-+	pPage3_Png->Check(pDesign->m_eFormat != FORMAT_JPG);
- 	pPage3_Jpg->Check(pDesign->m_eFormat == FORMAT_JPG);
- 
- 	pPage3_Quality->SetText(pDesign->m_aCompression);
-@@ -1611,7 +1582,7 @@ void SdPublishingDlg::GetDesign( SdPubli
- 	pDesign->m_bContentPage = pPage2_Content->IsChecked();
- 	if(m_bImpress)
- 		pDesign->m_bNotes = pPage2_Notes->IsChecked();
--	pDesign->m_eFormat = pPage3_Gif->IsChecked()?FORMAT_GIF:FORMAT_JPG;
-+	pDesign->m_eFormat = pPage3_Png->IsChecked()?FORMAT_PNG:FORMAT_JPG;
- 	pDesign->m_aCompression = pPage3_Quality->GetText();
- 
- 	pDesign->m_nResolution = pPage3_Resolution_1->IsChecked()?PUB_LOWRES_WIDTH:
-@@ -1629,7 +1600,7 @@ void SdPublishingDlg::GetDesign( SdPubli
- 	if(pPage5_TextOnly->IsChecked())
- 		pDesign->m_nButtonThema = -1;
- 	else
--		pDesign->m_nButtonThema = pPage5_Buttons->GetSelectItemId() - 1;
-+		pDesign->m_nButtonThema = pPage5_Buttons->GetSelectItemId();
- 
- 	pDesign->m_bUserAttr = pPage6_User->IsChecked();
- 	pDesign->m_aBackColor = m_aBackColor;
-Index: sd/source/filter/html/pubdlg.hrc
-===================================================================
-RCS file: /cvs/graphics/sd/source/filter/html/pubdlg.hrc,v
-retrieving revision 1.1
-diff -u -p -u -r1.1 pubdlg.hrc
---- sd/source/filter/html/pubdlg.hrc	18 Apr 2002 15:04:35 -0000	1.1
-+++ sd/source/filter/html/pubdlg.hrc	18 Aug 2003 12:57:04 -0000
-@@ -108,7 +108,7 @@
- 
- #define PAGE3_BMP			50
- #define PAGE3_TITEL_1		51
--#define PAGE3_GIF			52
-+#define PAGE3_PNG			52
- #define PAGE3_JPG			53
- #define PAGE3_QUALITY_TXT	54
- #define PAGE3_QUALITY		55
-Index: sd/source/filter/html/pubdlg.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/filter/html/pubdlg.hxx,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 pubdlg.hxx
---- sd/source/filter/html/pubdlg.hxx	16 Jul 2002 08:13:01 -0000	1.2
-+++ sd/source/filter/html/pubdlg.hxx	18 Aug 2003 12:57:04 -0000
-@@ -163,7 +163,7 @@ private:
- 	// page 3 controls
- 	FixedBitmap*	pPage3_Bmp;
- 	FixedLine*		pPage3_Titel1;
--	RadioButton*	pPage3_Gif;
-+	RadioButton*	pPage3_Png;
- 	RadioButton*	pPage3_Jpg;
- 	FixedText*		pPage3_Quality_txt;
- 	ComboBox*		pPage3_Quality;
-Index: sd/source/filter/html/pubdlg.src
-===================================================================
-RCS file: /cvs/graphics/sd/source/filter/html/pubdlg.src,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 pubdlg.src
---- sd/source/filter/html/pubdlg.src	17 Jul 2003 12:39:25 -0000	1.13
-+++ sd/source/filter/html/pubdlg.src	18 Aug 2003 12:57:04 -0000
-@@ -1112,37 +1112,37 @@ ModalDialog DLG_PUBLISHING
- 		Text[ slovak ] = "Uložiť obrázok ako";
- 	};
- 
--	RadioButton PAGE3_GIF
-+	RadioButton PAGE3_PNG
- 	{
- 		Pos = MAP_APPFONT( 12, 49 );
- 		Size = MAP_APPFONT( 116, 10 );
--		Text = "~GIF";
--		Text [ ENGLISH ] = "~GIF";
--		Text[ italian ] = "~GIF";
--		Text[ portuguese_brazilian ] = "~GIF";
--		Text[ portuguese ] = "~GIF - Graphics Interchange Format";
--		Text[ danish ] = "GIF - Graphics Interchange Format";
--		Text[ french ] = "GIF";
--		Text[ swedish ] = "~GIF";
--		Text[ dutch ] = "~GIF - Graphics Interchange-Format";
--		Text[ spanish ] = "~GIF ";
--		Text[ english_us ] = "~GIF";
--		Text[ chinese_simplified ] = "~GIF";
--		Text[ russian ] = "~GIF - Graphics Interchange Format";
--		Text[ polish ] = "GIF - Graphics Interchange Format";
--		Text[ japanese ] = "~GIF";
--		Text[ greek ] = "~GIF - Graphics Interchange Format";
--		Text[ korean ] = "~GIF";
--		Text[ chinese_traditional ] = "~GIF";
--		Text[ arabic ] = "GIF - Graphics Interchange-Format";
--		Text[ turkish ] = "~GIF";
--		Text[ catalan ] = "~GIF";
--		Text[ finnish ] = "~GIF";
--		Text[ thai ] = "~GIF - Graphics Interchange Format";
--		Text[ czech ] = "GIF";
--		Text[ hebrew ] = "~GIF";
--		Text[ hindi ] = "~GIF";
--		Text[ slovak ] = "~GIF";
-+		Text = "~PNG";
-+		Text [ ENGLISH ] = "~PNG";
-+		Text[ italian ] = "~PNG";
-+		Text[ portuguese_brazilian ] = "~PNG";
-+		Text[ portuguese ] = "~PNG";
-+		Text[ danish ] = "PNG";
-+		Text[ french ] = "PNG";
-+		Text[ swedish ] = "~PNG";
-+		Text[ dutch ] = "~PNG";
-+		Text[ spanish ] = "~PNG ";
-+		Text[ english_us ] = "~PNG";
-+		Text[ chinese_simplified ] = "~PNG";
-+		Text[ russian ] = "~PNG";
-+		Text[ polish ] = "PNG";
-+		Text[ japanese ] = "~PNG";
-+		Text[ greek ] = "~PNG";
-+		Text[ korean ] = "~PNG";
-+		Text[ chinese_traditional ] = "~PNG";
-+		Text[ arabic ] = "PNG";
-+		Text[ turkish ] = "~PNG";
-+		Text[ catalan ] = "~PNG";
-+		Text[ finnish ] = "~PNG";
-+		Text[ thai ] = "~PNG";
-+		Text[ czech ] = "PNG";
-+		Text[ hebrew ] = "~PNG";
-+		Text[ hindi ] = "~PNG";
-+		Text[ slovak ] = "~PNG";
- 	};
- 
- 	RadioButton PAGE3_JPG
diff --git a/patches/OOO_1_1/setup-no-langcheck.diff b/patches/OOO_1_1/setup-no-langcheck.diff
deleted file mode 100644
index 97e897e9f..000000000
--- a/patches/OOO_1_1/setup-no-langcheck.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Definately still at hack status, this one.  We change the language using langpacks
-so we don't want setup refusing to upgrade a user install because he doesn't have the
-same language (en_US).  Maybe this could be controlled by a switch to setup.
-
---- setup2/source/ui/mainevt.cxx.orig	2003-07-22 21:03:01.000000000 +0200
-+++ setup2/source/ui/mainevt.cxx	2003-07-22 21:08:19.000000000 +0200
-@@ -748,11 +748,13 @@
- 
-                 eDestInstMode = pCurrentInstall->GetInstallMode();
- 
-+#if 0
-                 //  check if the languages are the same
- 				if (nLanguagePos == STRING_NOTFOUND)
- 				{
- 					m_pEnv->SetUpdateOldVersionWrongLanguage(true);
- 				}
-+#endif
- 
- 				// Name and Version are equal
- 				m_pEnv->SetUpdateOldVersion();
diff --git a/patches/OOO_1_1/stlport-defeat-include.diff b/patches/OOO_1_1/stlport-defeat-include.diff
deleted file mode 100644
index e8cf35426..000000000
--- a/patches/OOO_1_1/stlport-defeat-include.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-This is to work around stlport horrors: cf.
-http://ooo.ximian.com/hackers-guide.html#section-10.10
-
-Index: solenv/inc/settings.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/settings.mk,v
-retrieving revision 1.135.14.1
-diff -u -p -u -r1.135.14.1 settings.mk
---- solenv/inc/settings.mk	31 Jul 2003 08:32:40 -0000	1.135.14.1
-+++ solenv/inc/settings.mk	29 Aug 2003 13:14:09 -0000
-@@ -1171,9 +1171,9 @@ RSC=guw.pl rsc
- RSCUPDVER=$(UPD)$(UPDMINOR)
- RSCFLAGS=-s
- .IF "$(remote)" != ""
--RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -DSUPD=$(UPD) -DBUILD=$(BUILD) -D$(REMOTEDEF) $(JAVADEF)
-+RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -DSUPD=$(UPD) -D$(REMOTEDEF) $(JAVADEF)
- .ELSE
--RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -DSUPD=$(UPD) -DBUILD=$(BUILD) $(JAVADEF)
-+RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -DSUPD=$(UPD) $(JAVADEF)
- .ENDIF
- 
- .IF "$(rscres)"!=""
-@@ -1268,7 +1268,7 @@ COMID=$(COM)
- .ENDIF			# "$(SOLAR_JAVA)"=="TRUE"
- 
- # --- extend new environment ----------------------------------
--CDEFS+= -DSUPD=$(UPD) -DBUILD=$(BUILD)
-+CDEFS+= -DSUPD=$(UPD)
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_CRASHDUMP)"!="" || "$(ENABLE_SYMBOLS)"!=""
diff --git a/patches/OOO_1_1/stlport-dynamic-link.diff b/patches/OOO_1_1/stlport-dynamic-link.diff
deleted file mode 100644
index 4046c2dbb..000000000
--- a/patches/OOO_1_1/stlport-dynamic-link.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: oo_cvs_641/solenv/inc/unxlngi4.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxlngi4.mk,v
-retrieving revision 1.13
-diff -u -3 -p -r1.13 unxlngi4.mk
---- solenv/inc/unxlngi4.mk	4 Mar 2002 15:53:59 -0000	1.13
-+++ solenv/inc/unxlngi4.mk	5 Feb 2003 15:54:46 -0000
-@@ -196,7 +196,11 @@ STDSHLGUIST=-lX11 -lXext -ldl -lm
- STDSHLCUIST=-ldl -lm
- 
- LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
-+.IF "$(STLPORT4)"=="NO_STLPORT4"
- LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ELSE
-+LIBSTLPORTST=$(LIBSTLPORT)
-+.ENDIF
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
-Index: oo_cvs_641/solenv/inc/unxlngppc4.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxlngppc4.mk,v
-retrieving revision 1.1.2.3
-diff -u -3 -p -r1.1.2.3 unxlngppc4.mk
---- solenv/inc/unxlngppc4.mk	7 Jun 2002 14:11:58 -0000	1.1.2.3
-+++ solenv/inc/unxlngppc4.mk	5 Feb 2003 15:54:46 -0000
-@@ -199,7 +199,11 @@ STDSHLGUIMT=-lX11 -lXext -ldl -lpthread 
- STDSHLCUIMT=-ldl -lpthread -lm
- 
- LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
-+.IF "$(STLPORT4)"=="NO_STLPORT4"
- LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ELSE
-+LIBSTLPORTST=$(LIBSTLPORT)
-+.ENDIF
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/patches/OOO_1_1/system-libart.diff b/patches/OOO_1_1/system-libart.diff
deleted file mode 100644
index 5506aa7f2..000000000
--- a/patches/OOO_1_1/system-libart.diff
+++ /dev/null
@@ -1,458 +0,0 @@
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.54.2.1
-diff -u -p -u -r1.54.2.1 configure.in
---- config_office/configure.in	7 Jul 2003 10:36:49 -0000	1.54.2.1
-+++ config_office/configure.in	9 Jul 2003 09:20:25 -0000
-@@ -23,6 +23,10 @@ AC_ARG_WITH(gpc,
-                           This is required to allow some strict packagers to
-                           comply with their distrubution policy.
- ],,)
-+AC_ARG_ENABLE(libart,
-+[  --enable-libart          Enables the use of libart, instead of GPC for
-+			  polygon clipping.
-+],,)
- AC_ARG_ENABLE(gcc3,
- [  --enable-gcc3          Deprecated: Now has no effect, checks compiler version.
- ],,)
-@@ -1214,10 +1218,19 @@ else
- fi
- 
- dnl ===================================================================
--dnl Test for the presence of the required gpc.{c,h} files
-+dnl Test for the presence of the right polgyon clipping code
- dnl ===================================================================
- 
--if test "$with_gpc" != "no" ; then
-+WITH_GPC=NO
-+WITH_LIBART=NO
-+
-+if test -n "$enable_libart"; then
-+  PKG_CHECK_MODULES( LIBART, libart-2.0 >= 2.3.13 )
-+  AC_SUBST(LIBART_CFLAGS)
-+  AC_SUBST(LIBART_LIBS)
-+  WITH_LIBART=YES
-+	
-+elif test "$with_gpc" != "no" ; then
-   WITH_GPC=YES
- 
-   AC_MSG_CHECKING([GPC files])
-@@ -1238,8 +1251,6 @@ if test "$with_gpc" != "no" ; then
- 	AC_MSG_ERROR([GPC files not found
- ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc])
-   fi
--else
--  WITH_GPC=NO
- fi
- 
- dnl ===================================================================
-@@ -1416,6 +1427,9 @@ AC_SUBST(ENABLE_STATIC_GTK)
- AC_SUBST(ENVCFLAGSCXX)
- AC_SUBST(ENABLE_CRASHDUMP)
- AC_SUBST(WITH_GPC)
-+AC_SUBST(WITH_LIBART)
-+AC_SUBST(LIBART_CFLAGS)
-+AC_SUBST(LIBART_LIBS)
- 
- AC_OUTPUT([set_soenv])
- 
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.9.2.1
-diff -u -p -u -r1.9.2.1 set_soenv.in
---- config_office/set_soenv.in	7 Jul 2003 10:36:50 -0000	1.9.2.1
-+++ config_office/set_soenv.in	9 Jul 2003 09:20:26 -0000
-@@ -1653,11 +1653,14 @@ ToFile( "CXX",               $CXX,      
- if ( $COM ne "MSC" ) {
-   ToFile( "LINK",			 $CC,				 "e" );
- }
--ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
--ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@","e" );
--ToFile( "WITH_GPC",          "@WITH_GPC@",      "e" );
--ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
--ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
-+ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",     "e" );
-+ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@", "e" );
-+ToFile( "WITH_GPC",          "@WITH_GPC@",         "e" );
-+ToFile( "WITH_LIBART",       "@WITH_LIBART@",      "e" );
-+ToFile( "LIBART_CFLAGS",     "@LIBART_CFLAGS@",    "e" );
-+ToFile( "LIBART_LIBS",       "@LIBART_LIBS@",      "e" );
-+ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@", "e" );
-+ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );
- if ($platform ne "$Winnt")
- {  ToFile( "TEMP",              $TEMP,              "e" );
-    ToFile( "TMP",               $TEMP,              "e" );
-Index: tools/util/makefile.mk
-===================================================================
-RCS file: /cvs/util/tools/util/makefile.mk,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 makefile.mk
---- tools/util/makefile.mk	30 Apr 2003 08:25:57 -0000	1.10
-+++ tools/util/makefile.mk	9 Jul 2003 09:24:29 -0000
-@@ -191,7 +191,14 @@ SHL1TARGET=     tl$(VERSION)$(DLLPOSTFIX
- SHL1LIBS=       $(LIB1TARGET)
- SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
- SHL1IMPLIB=     itools
--SHL1STDLIBS+=   $(SALLIB) $(VOSLIB) $(GPC3RDLIB)
-+SHL1STDLIBS+=   $(SALLIB) $(VOSLIB)
-+
-+.IF "$(WITH_LIBART)"="YES"
-+SHL1STDLIBS+=   $(LIBART_LIBS)
-+.ELSE
-+SHL1STDLIBS+=   $(GPC3RDLIB)
-+.ENDIF
-+
- 
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+=   shell32.lib     \
-Index: tools/source/generic/makefile.mk
-===================================================================
-RCS file: /cvs/util/tools/source/generic/makefile.mk,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 makefile.mk
---- tools/source/generic/makefile.mk	2 Jul 2003 14:21:12 -0000	1.6
-+++ tools/source/generic/makefile.mk	9 Jul 2003 09:25:49 -0000
-@@ -74,6 +74,10 @@ TARGET=gen
- .IF "$(WITH_GPC)"!="NO"
- CDEFS+=-DHAVE_GPC_H
- .ENDIF
-+.IF "$(WITH_LIBART)"!="NO"
-+CDEFS+=-DHAVE_LIBART_H
-+CFLAGS+=$(LIBART_CFLAGS)
-+.ENDIF
- 
- # --- Files --------------------------------------------------------
- 
-Index: tools/inc/poly.hxx
-===================================================================
-RCS file: /cvs/util/tools/inc/poly.hxx,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 poly.hxx
---- tools/inc/poly.hxx	27 Mar 2003 17:03:26 -0000	1.2
-+++ tools/inc/poly.hxx	9 Jul 2003 10:46:54 -0000
-@@ -280,10 +280,10 @@ private:
-     ImplPolyPolygon*    mpImplPolyPolygon;
- 
- #if _SOLAR__PRIVATE
--
--	void*				ImplCreateGPCPolygon() const;
--	void				ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const;
--
-+    void *ImplCreateGPCPolygon() const;
-+    void  ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const;
-+    void *ImplCreateArtVpath() const;
-+    void  ImplSetFromArtVpath( void *pVpath );
- #endif // __PRIVATE
- 
- public:
-Index: tools/source/generic/poly2.cxx
-===================================================================
-RCS file: /cvs/util/tools/source/generic/poly2.cxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 poly2.cxx
---- tools/source/generic/poly2.cxx	2 Jul 2003 14:21:27 -0000	1.3
-+++ tools/source/generic/poly2.cxx	11 Jul 2003 11:50:02 -0000
-@@ -61,24 +61,26 @@
- 
- #define _SV_POLY2_CXX
- 
--#ifdef HAVE_GPC_H
--
--#ifndef __gpc_h
--extern "C" 
-+extern "C"
- {
--	#include <external/gpc/gpc.h> 
--}
--#endif
--
-+#if defined (HAVE_GPC_H) && !defined (__gpc_h)
-+#  include <external/gpc/gpc.h> 
- #else
--
--// No GPC
--#define GPC_INT 0
--#define GPC_UNION 0
--#define GPC_DIFF 0
--#define GPC_XOR 0
--
-+#  ifdef HAVE_LIBART_H
-+#    include <libart_lgpl/art_misc.h>
-+#    include <libart_lgpl/art_vpath.h>
-+#    include <libart_lgpl/art_svp.h>
-+#    include <libart_lgpl/art_svp_vpath.h>
-+#    include <libart_lgpl/art_vpath_svp.h>
-+#    include <libart_lgpl/art_svp_ops.h>
-+#    include <libart_lgpl/art_svp_intersect.h>
-+#  endif
-+#    define GPC_INT   0
-+#    define GPC_UNION 1
-+#    define GPC_DIFF  2
-+#    define GPC_XOR   3
- #endif // HAVE_GPC_H
-+}
- 
- #include <cstring>
- #include <cmath>
-@@ -366,7 +368,7 @@ void PolyPolygon::Optimize( ULONG nOptim
- 		if( bEdges )
- 		{
- 			const Rectangle aBound( GetBoundRect() );
--		
-+
- 			fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5;
- 			nPercent = pData ? pData->GetPercentValue() : 50;
- 			nOptimizeFlags &= ~POLY_OPTIMIZE_EDGES;
-@@ -538,18 +540,246 @@ void PolyPolygon::ImplDoOperation( const
- }
- 
- #else
--// No GPC implementation
-+#ifdef HAVE_LIBART_H
- 
--void* PolyPolygon::ImplCreateGPCPolygon() const
-+/* Finds the index of the upper rightmost vertex of a polygon */
-+static int
-+upper_rightmost_vertex (const Polygon &poly)
-+{
-+	int n;
-+	int i;
-+	double x, y;
-+	int k;
-+
-+	n = poly.GetSize ();
-+
-+	k = 0;
-+	x = poly[0].X ();
-+	y = poly[0].Y ();
-+
-+	for (i = 1; i < n; i++)
-+		if (poly[i].Y () < y || (poly[0].Y () == y && poly[i].X () > x)) {
-+			k = i;
-+			x = poly[i].X ();
-+			y = poly[i].Y ();
-+		}
-+
-+	return k;
-+}
-+
-+/* Returns whether a polygon is specified in counterclockwise order */
-+static BOOL
-+poly_is_ccw (const Polygon &poly)
-+{
-+	int n;
-+	int k;
-+	double cross;
-+
-+	n = poly.GetSize ();
-+
-+	if (n == 0)
-+		return TRUE;
-+
-+	k = upper_rightmost_vertex (poly);
-+
-+	const Point &a = poly[(k + n - 1) % n];
-+	const Point &b = poly[k];
-+	const Point &c = poly[(k + 1) % n];
-+
-+	cross = -(a.X () * b.Y () - a.Y () * b.X () +
-+		  a.Y () * c.X () - a.X () * c.Y () +
-+		  b.X () * c.Y () - c.X () * b.Y ());
-+
-+  	return (cross > 0);
-+}
-+
-+void *
-+PolyPolygon::ImplCreateArtVpath () const
-+{
-+	ArtVpath *vpath;
-+	int n_contours;
-+	int n_vertices;
-+	int i, v;
-+
-+	n_contours = Count ();
-+	n_vertices = 0;
-+	for (i = 0; i < n_contours; i++) {
-+		const Polygon &poly = GetObject (i);
-+		n_vertices += poly.GetSize () + 1; /* plus 1 for if we have to close the path */
-+	}
-+
-+	n_vertices++; /* for the ART_END terminator */
-+
-+	vpath = art_new (ArtVpath, n_vertices);
-+	v = 0;
-+
-+	for (i = 0; i < n_contours; i++) {
-+		int j, k;
-+		int n;
-+		const Polygon &poly = GetObject (i);
-+		BOOL ccw;
-+
-+		n = poly.GetSize ();
-+
-+		ccw = poly_is_ccw (poly);
-+
-+		/* Holes or inside contours need to be listed out in reverse
-+		 * clockwise direction to the main outwards contour, but OO.o
-+		 * does not seem to handle holes at all.  So we'll just list all
-+		 * the contours as non-holes, e.g. in normal counterclockwise
-+		 * order.
-+		 */
-+
-+		if (ccw)
-+			k = 0;
-+		else
-+			k = n - 1;
-+
-+		for (j = 0; j < n; j++) {
-+			const Point &point = poly[k];
-+			vpath[v].code = (j == 0) ? ART_MOVETO : ART_LINETO;
-+			vpath[v].x = point.X ();
-+			vpath[v].y = point.Y ();
-+
-+			if (ccw)
-+				k++;
-+			else
-+				k--;
-+
-+			v++;
-+		}
-+
-+		/* Close the path if needed */
-+		if (n > 0 &&
-+		    (vpath[v - 1].x != vpath[v - n].x ||
-+		     vpath[v - 1].y != vpath[v - n].y)) {
-+			vpath[v].code = ART_LINETO;
-+			vpath[v].x = vpath[v - n].x;
-+			vpath[v].y = vpath[v - n].y;
-+			v++;
-+		}
-+	}
-+
-+	vpath[v].code = ART_END;
-+
-+	return vpath;
-+}
-+
-+void
-+PolyPolygon::ImplSetFromArtVpath (void *_vpath)
-+{
-+	ArtVpath *vpath;
-+
-+	vpath = (ArtVpath *) _vpath;
-+
-+	Clear ();
-+
-+	while (vpath->code != ART_END) {
-+		ArtVpath *p;
-+		int n, n_vertices;
-+
-+		n = 0;
-+		for (p = vpath; n == 0 || p->code == ART_LINETO; p++)
-+			n++;
-+
-+		/* Remove the last duplicated point from closed subpaths */
-+		if (n > 0 &&
-+		    vpath[n - 1].x == vpath[0].x &&
-+		    vpath[n - 1].y == vpath[0].y)
-+			n_vertices = n - 1;
-+		else
-+			n_vertices = n;
-+
-+		if (n_vertices != 0) {
-+			int i;
-+
-+			Polygon poly (n_vertices);
-+
-+			p = vpath;
-+			for (i = 0; i < n_vertices; i++) {
-+				Point &point = poly[i];
-+
-+				point.X () = FRound (p->x);
-+				point.Y () = FRound (p->y);
-+
-+				p++;
-+			}
-+
-+			Insert (poly);
-+		}
-+
-+		vpath += n;
-+	}
-+}
-+
-+/* Converts an arbitrary SVP to an even-odd SVP */
-+static ArtSVP *
-+svp_to_even_odd (ArtSVP *pSvp)
- {
--	return NULL;
-+	ArtSVP *pResult;
-+	ArtSvpWriter *pSvw;
-+
-+	pSvw = art_svp_writer_rewind_new( ART_WIND_RULE_ODDEVEN );
-+	art_svp_intersector( pSvp, pSvw);
-+
-+ 	pResult = art_svp_writer_rewind_reap( pSvw );
-+	/* Shallow free because the result contains shared segments */
-+	art_free( pSvp );
-+
-+	return pResult;
- }
- 
- void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const
-+{
-+	ArtVpath *a, *b;
-+	ArtSVP *sa, *sb, *s;
-+
-+	a = (ArtVpath *) ImplCreateArtVpath ();
-+	b = (ArtVpath *) rPolyPoly.ImplCreateArtVpath ();
-+
-+	sa = svp_to_even_odd (art_svp_from_vpath (a));
-+	sb = svp_to_even_odd (art_svp_from_vpath (b));
-+
-+	art_free (a);
-+	art_free (b);
-+
-+	switch (nOperation) {
-+	case GPC_UNION:
-+		s = art_svp_union (sa, sb);
-+		a = art_vpath_from_svp (s);
-+		art_svp_free (s);
-+		break;
-+	case GPC_DIFF:
-+		s = art_svp_minus (sa, sb);
-+		a = art_vpath_from_svp (s);
-+		art_svp_free (s);
-+		break;
-+	case GPC_XOR:
-+		s = art_svp_diff (sa, sb); /* symmetric difference, *not* set difference */
-+		a = art_vpath_from_svp (s);
-+		art_svp_free (s);
-+		break;
-+	default:
-+		/* Odd ... */
-+	case GPC_INT:
-+		s = art_svp_intersect (sa, sb);
-+		a = art_vpath_from_svp (s);
-+		art_svp_free (s);
-+		break;
-+	}
-+
-+
-+	rResult.ImplSetFromArtVpath (a);
-+	art_free (a);	
-+}
-+
-+#else // No GPC or libart implementations
-+
-+void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const
- { 
--	return;
- }
- 
-+#endif // HAVE_LIBART_H
- #endif // HAVE_GPC_H
- 
- // -----------------------------------------------------------------------
diff --git a/patches/OOO_1_1/thread-yield.diff b/patches/OOO_1_1/thread-yield.diff
deleted file mode 100644
index 39c194ce9..000000000
--- a/patches/OOO_1_1/thread-yield.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: sal/osl/unx/thread.c
-===================================================================
-RCS file: /cvs/oo/porting/sal/osl/unx/thread.c,v
-retrieving revision 1.21.8.1
-diff -u -p -u -r1.21.8.1 thread.c
---- sal/osl/unx/thread.c	25 Nov 2002 12:11:18 -0000	1.21.8.1
-+++ sal/osl/unx/thread.c	29 Apr 2003 12:16:53 -0000
-@@ -598,7 +598,9 @@ void SAL_CALL osl_waitThread(const TimeV
- /*****************************************************************************/
- void SAL_CALL osl_yieldThread()
- {
--    sched_yield();
-+#ifndef LINUX
-+	sched_yield();
-+#endif
- }
- 
- /*****************************************************************************/
diff --git a/patches/OOO_1_1/unzip-cleanup.diff b/patches/OOO_1_1/unzip-cleanup.diff
deleted file mode 100644
index 73a078a1c..000000000
--- a/patches/OOO_1_1/unzip-cleanup.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- unzip/util/svunzip.map
-+++ unzip/util/svunzip.map
-@@ -0,0 +1,9 @@
-+SVUNZIP_1_0 {
-+	global:
-+		getCRC32;
-+		SVUnzip;
-+		SVUnzipEnumFiles;
-+		GetVersionInfo;
-+	local:
-+		*;
-+};
-Index: unzip/util/makefile.mk
-===================================================================
-RCS file: /cvs/util/unzip/util/makefile.mk,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 makefile.mk
---- unzip/util/makefile.mk	13 Aug 2002 12:58:26 -0000	1.3
-+++ unzip/util/makefile.mk	4 Aug 2003 09:01:35 -0000
-@@ -88,6 +88,7 @@ LIB1FILES=  \
- SHL1TARGET=zip$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB= i$(TARGET)
- SHL1LIBS=$(LIB2TARGET)
-+SHL1VERSIONMAP= $(TARGET).map
- SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
- .ENDIF
- 
diff --git a/patches/OOO_1_1/unzip-rewrite.diff b/patches/OOO_1_1/unzip-rewrite.diff
deleted file mode 100644
index 883fab6c6..000000000
--- a/patches/OOO_1_1/unzip-rewrite.diff
+++ /dev/null
@@ -1,227 +0,0 @@
---- unzip/source/makefile.mk
-+++ unzip/source/makefile.mk
-@@ -77,52 +77,10 @@
- 
-  # --- Files --------------------------------------------------------
- 
--SLOFILES= $(SLO)$/envargs.obj	\
--		$(SLO)$/explode.obj 	\
--		$(SLO)$/extract.obj		\
--		$(SLO)$/file_io.obj		\
--		$(SLO)$/inflate.obj		\
--		$(SLO)$/mapname.obj		\
--		$(SLO)$/match.obj		\
--		$(SLO)$/misc.obj		\
--		$(SLO)$/unzip.obj		\
--		$(SLO)$/svunzip.obj
-+CFLAGS+=-g `pkg-config --cflags glib-2.0`
- 
--#		$(SLO)$/unreduce.obj	\
--#		$(SLO)$/unshrink.obj	\
--
--
--.IF "$(GUI)"=="MAC"
--SLOFILES += $(SLO)$/macfile.obj		\
--			$(SLO)$/macstat.obj
--.ENDIF
--
--.IF "$(GUI)"=="OS2"
--SLOFILES += $(SLO)$/os2unzip.obj
--.ENDIF
--
--OBJFILES= $(OBJ)$/envargs.obj	\
--		$(OBJ)$/explode.obj 	\
--		$(OBJ)$/extract.obj		\
--		$(OBJ)$/file_io.obj		\
--		$(OBJ)$/inflate.obj		\
--		$(OBJ)$/mapname.obj		\
--		$(OBJ)$/match.obj		\
--		$(OBJ)$/misc.obj		\
--		$(OBJ)$/unzip.obj		\
--		$(OBJ)$/svunzip.obj
--
--#		$(OBJ)$/unreduce.obj	\
--#		$(OBJ)$/unshrink.obj	\
--
--
--.IF "$(GUI)"=="MAC"
--OBJFILES += $(OBJ)$/macfile.obj		\
--			$(OBJ)$/macstat.obj
--.ENDIF
--.IF "$(GUI)"=="OS2"
--OBJFILES += $(OBJ)$/os2unzip.obj
--.ENDIF
-+SLOFILES= $(SLO)$/svunzip.obj
-+OBJFILES= $(OBJ)$/svunzip.obj
- 
- # --- Targets ------------------------------------------------------
- 
---- unzip/util/makefile.mk
-+++ unzip/util/makefile.mk
-@@ -88,6 +88,7 @@
- SHL1TARGET=zip$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB= i$(TARGET)
- SHL1LIBS=$(LIB2TARGET)
-+SHL1STDLIBS+=`pkg-config --libs glib-2.0`
- SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
- .ENDIF
- 
---- unzip/source/svunzip.c
-+++ unzip/source/svunzip.c
-@@ -1,3 +1,135 @@
-+/*
-+ * This module sucks rocks, but not as much
-+ * as defining global symbols such as 'statbuf'
-+ * 'inflate' etc.
-+ */
-+#include <glib.h>
-+#include <stdio.h>
-+#include <svunzip.h>
-+
-+static char *
-+fiddle_with_path (const char *orig_path)
-+{
-+  char *path;
-+
-+  if (!g_file_test (orig_path, G_FILE_TEST_EXISTS) ||
-+      g_file_test (orig_path, G_FILE_TEST_IS_DIR)) {
-+    path = g_strconcat (orig_path, ".zip", NULL);
-+    if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
-+      g_free (path);
-+      path = NULL;
-+    }
-+  } else
-+    path = g_strdup (orig_path);
-+  
-+  return path;
-+}
-+
-+unsigned long
-+getCRC32 (const char* pZipFilePath)
-+{
-+	g_warning ("Hit unused getCRC32 '%s'", pZipFilePath);
-+	return 0;
-+}
-+
-+static int
-+exec_command (const char *pZipFilePath,
-+	      const char *pDestPath,
-+	      const char *pFlags,
-+	      char      **stdout_str)
-+{
-+  int   ret = 0;
-+  char *zip_path;
-+  char *stderr_str = NULL;
-+  int   exit_status;
-+  char *command;
-+  GError *err = NULL;
-+
-+  if (!(zip_path = fiddle_with_path (pZipFilePath)))
-+    return 1001; /* not found */
-+
-+  if (!pDestPath || !*pDestPath)
-+    pDestPath = "*.*";
-+
-+  command = g_strdup_printf ("unzip -qq%s '%s' '%s'",
-+			     pFlags, zip_path, pDestPath);
-+
-+  if (!g_spawn_command_line_sync (command, stdout_str,
-+				  &stderr_str, &exit_status, &err)) {
-+    g_warning ("Failed to exec '%s' '%s'",
-+	       command, err ? err->message : "No msg");
-+    ret = 1111;
-+  }
-+
-+  if (stderr_str && stderr_str [0] != '\0') {
-+    g_warning ("Error execing '%s': %s", command, stderr_str);
-+    ret = 1111;
-+  }
-+
-+  g_free (zip_path);
-+  g_free (command);
-+  g_free (stderr_str);
-+
-+  return ret;
-+}
-+
-+int
-+SVUnzip (const char* pZipFilePath, const char* pDestPath,
-+	 const char* pFlags, UnzipCallBack *pCallBackFunc)
-+{
-+  /* pDestPath has nothing to do with the destination path */
-+//  fprintf (stderr, "Unpack '%s' '%s' '%s'\n", pZipFilePath, pDestPath, pFlags);
-+  return exec_command (pZipFilePath, pDestPath, pFlags, NULL);
-+}
-+
-+int
-+SVUnzipEnumFiles (const char              *pZipFilePath,
-+		  const char              *pPattern,
-+		  UnzipEnumFilesCallBack  *pCallBack,
-+		  void                    *pExtraData)
-+{
-+  int ret, i;
-+  char **lines;
-+  char *stdout_str = NULL;
-+
-+  if ((ret = exec_command (pZipFilePath, pPattern,
-+			   "v", &stdout_str)))
-+    return ret;
-+
-+  if (!stdout_str || stdout_str [0] == '\0') {
-+    fprintf (stderr, "Odd: empty stdout on exec for file '%s' ('%s')\n",
-+	     pZipFilePath, pPattern);
-+    return 1111;
-+  }
-+  
-+  lines = g_strsplit (stdout_str, "\n", -1);
-+  for (i = 0; lines && lines [i]; i++) {
-+    int j;
-+    long len;
-+    char *p;
-+
-+    p = lines [i];
-+    if (!p || p[0] == '\0')
-+      continue;
-+
-+    for (; *p && (*p == ' ' || *p == '\t'); p++); /* skip white */
-+    len = strtol (p, NULL, 10);
-+
-+    p+= strlen (p); /* end */
-+    for (; p >= lines [i] && *p != ' ' && *p != '\t'; p--); /* seek name */
-+    p++;
-+
-+//    g_warning ("File '%s' len %ld", p, len);
-+
-+    if (pCallBack)
-+      pCallBack (p, len, pExtraData);
-+  }
-+  g_strfreev (lines);
-+}
-+
-+/* Nastiness to make patching work nicely for some odd reason */
-+
-+#ifdef THIS_IS_TOTALLY_BROKEN
- /*************************************************************************
-  *
-  *  $RCSfile$
-@@ -180,3 +312,4 @@
-     pEnumFilesExtraData = pExtraData;
-     return SVUnzip(pZipFilePath, pPattern , "v", NULL);
- }
-+#endif
-Index: setup2/mow/source/loader/makefile.mk
-===================================================================
-RCS file: /cvs/installation/setup2/mow/source/loader/makefile.mk,v
-retrieving revision 1.12.22.2
-diff -u -p -u -r1.12.22.2 makefile.mk
---- setup2/mow/source/loader/makefile.mk	15 Jul 2003 16:48:21 -0000	1.12.22.2
-+++ setup2/mow/source/loader/makefile.mk	18 Jul 2003 13:46:25 -0000
-@@ -101,7 +101,7 @@ APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -
- .IF "$(OS)"=="MACOSX"
- APP1STDLIBS=$(LOADERLIB) -ldl $(SVUNZIPLIB) -lX11
- .ELSE
--APP1STDLIBS=$(LOADERLIB) -ldl $(SVUNZIPLIB)
-+APP1STDLIBS=$(LOADERLIB) -ldl $(SVUNZIPLIB) `pkg-config --libs glib-2.0`
- .ENDIF
- .ENDIF
- 
diff --git a/patches/OOO_1_1/vfs-ucp-setup.diff b/patches/OOO_1_1/vfs-ucp-setup.diff
deleted file mode 100644
index ed5094fd8..000000000
--- a/patches/OOO_1_1/vfs-ucp-setup.diff
+++ /dev/null
@@ -1,195 +0,0 @@
---- ucb/source/ucp/gvfs/ucpgvfs.xml
-+++ ucb/source/ucp/gvfs/ucpgvfs.xml
-@@ -0,0 +1,116 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+    <module-name>
-+	ucpgvfs
-+    </module-name>
-+
-+    <component-description>
-+        <author>
-+	    Michael Meeks
-+        </author>
-+        <name>
-+            com.sun.star.comp.ucb.GnomeVFSProvider
-+        </name>
-+        <description>
-+	    This component implements a Content Provider for the Universal
-+            Content Broker. It provides access to the Gnome VFS Virtual
-+	    file system
-+        </description>
-+        <loader-name>
-+            com.sun.star.loader.SharedLibrary
-+        </loader-name>
-+        <language>
-+            c++
-+        </language>
-+        <status value="final"/>
-+        <supported-service>
-+            com.sun.star.ucb.GnomeVFSContentProvider
-+        </supported-service>
-+
-+        <service-dependency>
-+            com.sun.star.config.SpecialConfigManager
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.configuration.ConfigurationAccess
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.configuration.ConfigurationProvider
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.script.Converter
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.ucb.CachedDynamicResultSetStubFactory
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.ucb.Store
-+        </service-dependency>
-+    </component-description>
-+
-+    <project-build-dependency> sal                </project-build-dependency>
-+    <project-build-dependency> cppu               </project-build-dependency>
-+    <project-build-dependency> cppuhelper         </project-build-dependency>
-+    <project-build-dependency> vos                </project-build-dependency>
-+    <project-build-dependency> ucbhelper          </project-build-dependency>
-+
-+    <runtime-module-dependency>	sal3			  </runtime-module-dependency>
-+    <runtime-module-dependency>	cppu3			  </runtime-module-dependency>
-+    <runtime-module-dependency>	cppuhelper3$(COM) </runtime-module-dependency>
-+    <runtime-module-dependency>	vos2$(COM)        </runtime-module-dependency>
-+    <runtime-module-dependency>	ucbhelper1$(COM)  </runtime-module-dependency>
-+
-+    <type> com.sun.star.beans.Property                         </type>
-+    <type> com.sun.star.beans.PropertyAttribute                </type>
-+    <type> com.sun.star.beans.PropertySetInfoChange            </type>
-+    <type> com.sun.star.beans.PropertyState                    </type>
-+    <type> com.sun.star.beans.PropertyValue                    </type>
-+    <type> com.sun.star.beans.XPropertiesChangeNotifier        </type>
-+    <type> com.sun.star.beans.XPropertyAccess                  </type>
-+    <type> com.sun.star.beans.XPropertyContainer               </type>
-+    <type> com.sun.star.beans.XPropertySetInfo                 </type>
-+    <type> com.sun.star.beans.XPropertySetInfoChangeNotifier   </type>
-+    <type> com.sun.star.container.XChild                       </type>
-+    <type> com.sun.star.container.XHierarchicalNameAccess      </type>
-+    <type> com.sun.star.frame.ConfigManager                    </type>
-+    <type> com.sun.star.io.XActiveDataSink                     </type>
-+    <type> com.sun.star.io.XActiveDataStreamer                 </type>
-+    <type> com.sun.star.io.XSeekable                           </type>
-+    <type> com.sun.star.io.XStream                             </type>
-+    <type> com.sun.star.lang.XMultiServiceFactory              </type>
-+    <type> com.sun.star.lang.XServiceInfo                      </type>
-+    <type> com.sun.star.lang.XSingleServiceFactory             </type>
-+    <type> com.sun.star.lang.XTypeProvider                     </type>
-+    <type> com.sun.star.registry.XRegistryKey                  </type>
-+    <type> com.sun.star.script.XTypeConverter                  </type>
-+    <type> com/sun/star/sdbc/ColumnValue                       </type>
-+    <type> com.sun.star.sdbc.XCloseable                        </type>
-+    <type> com.sun.star.sdbc.XResultSetMetaDataSupplier        </type>
-+    <type> com.sun.star.sdbc.XRow                              </type>
-+    <type> com.sun.star.ucb.ContentAction                      </type>
-+    <type> com.sun.star.ucb.ContentInfoAttribute               </type>
-+    <type> com.sun.star.ucb.FileSystemNotation                 </type>
-+    <type> com.sun.star.ucb.InsertCommandArgument              </type>
-+    <type> com.sun.star.ucb.InteractiveBadTransferURLException </type>
-+    <type> com.sun.star.ucb.ListAction                         </type>
-+    <type> com.sun.star.ucb.NameClash                          </type>
-+    <type> com.sun.star.ucb.NumberedSortingInfo                </type>
-+    <type> com.sun.star.ucb.OpenCommandArgument2               </type>
-+    <type> com.sun.star.ucb.OpenMode                           </type>
-+    <type> com.sun.star.ucb.TransferInfo                       </type>
-+    <type> com.sun.star.ucb.WelcomeDynamicResultSetStruct      </type>
-+    <type> com.sun.star.ucb.XCachedDynamicResultSetStubFactory </type>
-+    <type> com.sun.star.ucb.XCommandInfo                       </type>
-+    <type> com.sun.star.ucb.XCommandProcessor                  </type>
-+    <type> com.sun.star.ucb.XContentAccess                     </type>
-+    <type> com.sun.star.ucb.XContentCreator                    </type>
-+    <type> com.sun.star.ucb.XContentIdentifier                 </type>
-+    <type> com.sun.star.ucb.XContentIdentifierFactory          </type>
-+    <type> com.sun.star.ucb.XContentProvider                   </type>
-+    <type> com.sun.star.ucb.XDynamicResultSet                  </type>
-+    <type> com.sun.star.ucb.XFileIdentifierConverter           </type>
-+    <type> com.sun.star.ucb.XPropertySetRegistryFactory        </type>
-+    <type> com.sun.star.ucb.XSourceInitialization              </type>
-+    <type> com.sun.star.uno.XWeak                              </type>
-+</module-description>
---- ucb/source/ucp/gvfs/makefile.mk
-+++ ucb/source/ucp/gvfs/makefile.mk
-@@ -0,0 +1,58 @@
-+PRJ=..$/..$/..
-+PRJNAME=ucb
-+TARGET=ucpgvfs
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# Version
-+UCPGVFS_MAJOR=1
-+
-+.INCLUDE: svpre.mk
-+.INCLUDE: settings.mk
-+.INCLUDE: sv.mk
-+
-+SLOFILES=\
-+	$(SLO)$/content.obj	\
-+	$(SLO)$/directory.obj	\
-+	$(SLO)$/stream.obj	\
-+	$(SLO)$/provider.obj
-+
-+CFLAGS+=`pkg-config --cflags gnome-vfs-2.0`
-+CFLAGS+=-Wall
-+
-+LIB1TARGET=$(SLB)$/_$(TARGET).lib
-+LIB1OBJFILES=$(SLOFILES)
-+
-+SHL1TARGET=$(TARGET)$(UCPGVFS_MAJOR)
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1LIBS=$(LIB1TARGET)
-+SHL1IMPLIB=i$(TARGET)
-+SHL1STDLIBS=\
-+	$(CPPUHELPERLIB) \
-+	$(CPPULIB) \
-+	$(SALLIB)  \
-+	$(VOSLIB) \
-+	$(UCBHELPERLIB)	\
-+	$(UNOTOOLSLIB) \
-+	`pkg-config --libs gnome-vfs-2.0`
-+
-+
-+DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
-+DEF1NAME=$(SHL1TARGET)
-+DEF1EXPORT1 =component_getImplementationEnvironment
-+DEF1EXPORT2 =component_writeInfo
-+DEF1EXPORT3 =component_getFactory
-+DEF1DES=UCB : Gnome VFS System Content Provider
-+
-+.INCLUDE: target.mk
-+
-+$(MISC)$/$(SHL1TARGET).flt:
-+	@echo ------------------------------
-+	@echo Making: $@
-+	@echo cpp >> $@
-+	@echo m_ >> $@
-+	@echo rtl >> $@
-+	@echo vos >> $@
-+	@echo component_getImplementationEnvironment >> $@
-+	@echo component_writeInfo >> $@
-+	@echo component_getFactory >> $@
-Index: ucb/prj/build.lst
-===================================================================
-RCS file: /cvs/ucb/ucb/prj/build.lst,v
-retrieving revision 1.11
-diff -u -p -u -r1.11 build.lst
---- ucb/prj/build.lst	27 Mar 2003 17:26:37 -0000	1.11
-+++ ucb/prj/build.lst	13 May 2003 20:58:30 -0000
-@@ -8,6 +8,7 @@ uc	ucb\source\cacher		    nmake	-	all	uc
- uc	ucb\source\sorter		    nmake	-	all	uc_sorter uc_unotypes NULL
- uc	ucb\source\ucp\ftp		    nmake	-	all	uc_ftp uc_unotypes NULL
- uc	ucb\source\ucp\file		    nmake	-	all	uc_file uc_unotypes NULL
-+uc	ucb\source\ucp\gvfs		nmake	-	all	uc_gvfs uc_unotypes NULL
- uc	ucb\source\ucp\hierarchy	nmake	-	all	uc_hierarchy uc_unotypes NULL
- uc	ucb\source\ucp\remote		nmake	-	all	uc_remote uc_regexp NULL
- uc	ucb\source\ucp\webdav		nmake	-	all	uc_webdav uc_unotypes NULL
diff --git a/patches/OOO_1_1/vfs-uno-register.diff b/patches/OOO_1_1/vfs-uno-register.diff
deleted file mode 100644
index 66788d2c3..000000000
--- a/patches/OOO_1_1/vfs-uno-register.diff
+++ /dev/null
@@ -1,176 +0,0 @@
-Index: ucb/prj/d.lst
-===================================================================
-RCS file: /cvs/oo/ucb/ucb/prj/d.lst,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 d.lst
---- ucb/prj/d.lst	2 Aug 2001 16:18:32 -0000	1.10
-+++ ucb/prj/d.lst	1 Apr 2003 15:21:28 -0000
-@@ -27,6 +27,7 @@
- ..\source\ucp\package\ucppkg.xml %_DEST%\xml%_EXT%\ucppkg.xml
- ..\source\ucp\remote\ucprmt.xml %_DEST%\xml%_EXT%\ucprmt.xml
- ..\source\ucp\webdav\ucpdav.xml %_DEST%\xml%_EXT%\ucpdav.xml
-+..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml%_EXT%\ucpgvfs.xml
- 
- ..\%__SRC%\bin\ucb.exe %_DEST%\bin%_EXT%\ucb.exe
- ..\%__SRC%\bin\ucb %_DEST%\bin%_EXT%\ucb.bin
---- ucb/source/ucp/gvfs/ucpgvfs.xml	2003-04-01 16:22:25.000000000 +0100
-+++ ucb/source/ucp/gvfs/ucpgvfs.xml	2003-04-01 16:22:25.000000000 +0100
-@@ -0,0 +1,116 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+    <module-name>
-+	ucpgvfs
-+    </module-name>
-+
-+    <component-description>
-+        <author>
-+	    Michael Meeks
-+        </author>
-+        <name>
-+            com.sun.star.comp.ucb.GnomeVFSProvider
-+        </name>
-+        <description>
-+	    This component implements a Content Provider for the Universal
-+            Content Broker. It provides access to the Gnome VFS Virtual
-+	    file system
-+        </description>
-+        <loader-name>
-+            com.sun.star.loader.SharedLibrary
-+        </loader-name>
-+        <language>
-+            c++
-+        </language>
-+        <status value="final"/>
-+        <supported-service>
-+            com.sun.star.ucb.GnomeVFSContentProvider
-+        </supported-service>
-+
-+        <service-dependency>
-+            com.sun.star.config.SpecialConfigManager
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.configuration.ConfigurationAccess
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.configuration.ConfigurationProvider
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.script.Converter
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.ucb.CachedDynamicResultSetStubFactory
-+        </service-dependency>
-+        <service-dependency>
-+            com.sun.star.ucb.Store
-+        </service-dependency>
-+    </component-description>
-+
-+    <project-build-dependency> sal                </project-build-dependency>
-+    <project-build-dependency> cppu               </project-build-dependency>
-+    <project-build-dependency> cppuhelper         </project-build-dependency>
-+    <project-build-dependency> vos                </project-build-dependency>
-+    <project-build-dependency> ucbhelper          </project-build-dependency>
-+
-+    <runtime-module-dependency>	sal3			  </runtime-module-dependency>
-+    <runtime-module-dependency>	cppu3			  </runtime-module-dependency>
-+    <runtime-module-dependency>	cppuhelper3$(COM) </runtime-module-dependency>
-+    <runtime-module-dependency>	vos2$(COM)        </runtime-module-dependency>
-+    <runtime-module-dependency>	ucbhelper1$(COM)  </runtime-module-dependency>
-+
-+    <type> com.sun.star.beans.Property                         </type>
-+    <type> com.sun.star.beans.PropertyAttribute                </type>
-+    <type> com.sun.star.beans.PropertySetInfoChange            </type>
-+    <type> com.sun.star.beans.PropertyState                    </type>
-+    <type> com.sun.star.beans.PropertyValue                    </type>
-+    <type> com.sun.star.beans.XPropertiesChangeNotifier        </type>
-+    <type> com.sun.star.beans.XPropertyAccess                  </type>
-+    <type> com.sun.star.beans.XPropertyContainer               </type>
-+    <type> com.sun.star.beans.XPropertySetInfo                 </type>
-+    <type> com.sun.star.beans.XPropertySetInfoChangeNotifier   </type>
-+    <type> com.sun.star.container.XChild                       </type>
-+    <type> com.sun.star.container.XHierarchicalNameAccess      </type>
-+    <type> com.sun.star.frame.ConfigManager                    </type>
-+    <type> com.sun.star.io.XActiveDataSink                     </type>
-+    <type> com.sun.star.io.XActiveDataStreamer                 </type>
-+    <type> com.sun.star.io.XSeekable                           </type>
-+    <type> com.sun.star.io.XStream                             </type>
-+    <type> com.sun.star.lang.XMultiServiceFactory              </type>
-+    <type> com.sun.star.lang.XServiceInfo                      </type>
-+    <type> com.sun.star.lang.XSingleServiceFactory             </type>
-+    <type> com.sun.star.lang.XTypeProvider                     </type>
-+    <type> com.sun.star.registry.XRegistryKey                  </type>
-+    <type> com.sun.star.script.XTypeConverter                  </type>
-+    <type> com/sun/star/sdbc/ColumnValue                       </type>
-+    <type> com.sun.star.sdbc.XCloseable                        </type>
-+    <type> com.sun.star.sdbc.XResultSetMetaDataSupplier        </type>
-+    <type> com.sun.star.sdbc.XRow                              </type>
-+    <type> com.sun.star.ucb.ContentAction                      </type>
-+    <type> com.sun.star.ucb.ContentInfoAttribute               </type>
-+    <type> com.sun.star.ucb.FileSystemNotation                 </type>
-+    <type> com.sun.star.ucb.InsertCommandArgument              </type>
-+    <type> com.sun.star.ucb.InteractiveBadTransferURLException </type>
-+    <type> com.sun.star.ucb.ListAction                         </type>
-+    <type> com.sun.star.ucb.NameClash                          </type>
-+    <type> com.sun.star.ucb.NumberedSortingInfo                </type>
-+    <type> com.sun.star.ucb.OpenCommandArgument2               </type>
-+    <type> com.sun.star.ucb.OpenMode                           </type>
-+    <type> com.sun.star.ucb.TransferInfo                       </type>
-+    <type> com.sun.star.ucb.WelcomeDynamicResultSetStruct      </type>
-+    <type> com.sun.star.ucb.XCachedDynamicResultSetStubFactory </type>
-+    <type> com.sun.star.ucb.XCommandInfo                       </type>
-+    <type> com.sun.star.ucb.XCommandProcessor                  </type>
-+    <type> com.sun.star.ucb.XContentAccess                     </type>
-+    <type> com.sun.star.ucb.XContentCreator                    </type>
-+    <type> com.sun.star.ucb.XContentIdentifier                 </type>
-+    <type> com.sun.star.ucb.XContentIdentifierFactory          </type>
-+    <type> com.sun.star.ucb.XContentProvider                   </type>
-+    <type> com.sun.star.ucb.XDynamicResultSet                  </type>
-+    <type> com.sun.star.ucb.XFileIdentifierConverter           </type>
-+    <type> com.sun.star.ucb.XPropertySetRegistryFactory        </type>
-+    <type> com.sun.star.ucb.XSourceInitialization              </type>
-+    <type> com.sun.star.uno.XWeak                              </type>
-+</module-description>
-Index: officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
-===================================================================
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 Configuration.xcu
---- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu	8 Nov 2002 16:50:28 -0000	1.4
-+++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu	13 May 2003 20:52:35 -0000
-@@ -154,6 +154,17 @@
-                 <value/>
-               </prop>
-             </node>
-+            <node oor:name="Provider9" oor:op="replace">
-+              <prop oor:name="ServiceName">
-+                <value>com.sun.star.ucb.GnomeVFSContentProvider</value>
-+              </prop>
-+              <prop oor:name="URLTemplate">
-+                <value>.*</value>
-+              </prop>
-+              <prop oor:name="Arguments">
-+                <value/>
-+              </prop>
-+            </node>
-           </node>
-         </node>
-       </node>
-Index: scp/source/office/files.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/files.scp,v
-retrieving revision 1.367
-diff -u -p -u -r1.367 files.scp
---- scp/source/office/files.scp	17 Jul 2003 08:54:46 -0000	1.367
-+++ scp/source/office/files.scp	5 Aug 2003 14:48:48 -0000
-@@ -879,6 +883,9 @@ SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_PACKAG
- 
- SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_UCPHIER1,ucphier1)
- SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_UCPDAV1,ucpdav1)
-+#ifdef UNX
-+SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_UCPGVFS1,ucpgvfs1)
-+#endif
- SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_FILEACC,fileacc)
- SPECIAL_UNO_COMPONENT_LIB_FILE(GID_FILE_LIB_TINSTRM,textinstream.uno)
- SPECIAL_UNO_COMPONENT_LIB_FILE(GID_FILE_LIB_TOUTSTRM,textoutstream.uno)
diff --git a/patches/apply.pl b/patches/apply.pl
deleted file mode 100755
index e41a00e3d..000000000
--- a/patches/apply.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Copy;
-use File::Basename;
-
-sub find_file($$)
-{
-    my $dir = shift;
-    my $file = shift;
-
-    if (!-f "$dir/$file") {
-	my @search = split /:/, $options{'PATCHPATH'};
-
-	for $stem (@search) {
-	    my $testdir = "$dir/$stem";
-	    if (-f "$testdir/$file") {
-		$dir = $testdir;
-		last;
-	    }
-	}
-    }
-
-    -f "$dir/$file" || die "\n\n** Error ** - Can't find file $dir/$file\n\n\n";
-
-    return "$dir/$file";
-}
-
-sub do_patch {
-    my $patch = shift;
-    my $base_cmd = shift;
-    my $patch_file = basename($patch);
-    my $cmd_output = "";
-    my $cmd_suffix = "";
-
-    print "$patch_file: testing..."; 
-
-    if ($quiet) 
-        { $cmd_output = " > /dev/null " }
-
-    $cmd_suffix .= " < $patch";
-    my $cmd = "$base_cmd --dry-run ".$cmd_output.$cmd_suffix;
-
-    print "$cmd\n" unless $quiet;
-    system ($cmd) && die "Testing patch $patch_file failed.";
-
-    $cmd = "$base_cmd > /dev/null".$cmd_suffix;
-    if($quiet)
-        { print "applying..." }
-    else
-        { print "$cmd\n" }
-
-    system ($cmd) && die "Failed to patch $patch_file.";
-    print "done.\n";
-}
-
-sub slurp {
-    my $from = shift;
-    my $save = $/;
-    my $FROM;
-
-    undef $/;
-    open ($FROM, "<$from");
-    # slurp whole file in one big string
-    my $content = <$FROM>;
-    close ($FROM);
-    $/ = $save;
-
-    return $content;
-}
-
-sub apply_patches {
-
-    my @Patches = ();
-
-    open (PatchList, "$apply_list") || die "Can't find $apply_list";
-
-    my @targets=($distro);
-    while (<PatchList>) {
-            s/\s*#.*//;
-            chomp;
-            $_ eq '' && next;
-
-            if (/\[\s*(.*)\]/) {
-                my $tmp = $1;
-                $tmp =~ s/\s+$//;
-                #print "Distro: '$tmp'\n"; 
-
-                @targets = split /\s*,\s*/, $tmp;
-                next;
-            }
-
-            if (/\s*(\S+)\s*\s*=(\S+)/) {
-                $options{$1} = $2;
-                print "$1 => $2\n" unless $quiet;
-                next;
-            }
-
-            if (!grep /$distro/i, @targets) {
-                #print "$distro: skipping '$_'\n";
-                next;
-            }
-
-            push @Patches, find_file ($patch_dir, $_);
-    }
-    close (PatchList);
-    print "\n" unless $quiet;
-
-    for $opt (@required_opts) { 
-        defined $options{$opt} || die "Required option $opt not defined"; 
-    }
-
-    if( ! -d $applied_patches ) {
-        mkdir $applied_patches || die "Can't make directory $patch_dir: $!";
-    }
-
-    my $patch_num = 0;
-    my %existing_patches;
-
-    foreach (glob($applied_patches."/???-*")) { 
-        my $file = basename $_;
-
-        $file =~ s/^([0-9]{3})-//;
-        $existing_patches{$file} = $_;
-        $patch_num = $1;
-    }
-    $patch_num++;
-
-    foreach $patch (@Patches) {
-        my $patch_file = basename($patch);
-        
-        my $is_applied = 0;
-        
-        if( exists $existing_patches{$patch_file} ) {
-            my $applied_patch = $existing_patches{$patch_file};
-            my $patch_content = slurp($patch);
-            my $applied_content = slurp($applied_patch);
-            if (length ($patch_content) == length ($applied_content) &&
-                $patch_content eq $applied_content) {
-                print "$patch_file already applied, skipped\n";
-                $is_applied = 1;
-            }
-            else {
-                print "$patch_file changed, unapplying\n";
-                do_patch $applied_patch, $base_cmd." -R";
-                unlink $applied_patch || die "Can't remove $applied_patch: $!";
-            }
-            delete $existing_patches{$patch_file};
-        }
-
-        if (!$is_applied) {
-            print "\n" unless $quiet;
-            do_patch $patch, $base_cmd;
-
-            my $patch_copy = sprintf("%s/%03d-%s", $applied_patches, ++$patch_num, $patch_file);
-
-            print "copy $patch_file -> $patch_copy\n" unless $quiet;
-
-            copy($patch, $patch_copy) 
-                || die "Can't copy $patch to $patch_copy $!";
-        }
-    }
-
-    foreach (values %existing_patches) {
-        print "Unapplying obsolete patch $_\n";
-        do_patch $_, $base_cmd." -R";
-        unlink $_ || die "Can't remove $_ $!";
-    }
-}
-
-sub remove_patches {
-    my @Patches = ();
-
-    -d $applied_patches || return;
-
-    foreach $patch_file (reverse glob($applied_patches."/???-*")) {
-        print "\nRemoving ".basename($patch_file)."...\n" unless $quiet;
-        do_patch $patch_file, $base_cmd;
-        unlink $patch_file;
-    }
-    rmdir $applied_patches
-}
-
-(@ARGV > 1) || die "Syntax:\napply <path-to-patchdir> <src root> [--distro=Debian] [patch flags '--dry-run' eg.]\n";
-
-$patch_dir = shift (@ARGV);
-$apply_list = $patch_dir.'/apply';
-$dest_dir = shift (@ARGV);
-$applied_patches = $dest_dir.'/applied_patches';
-%options = ();
-
-$quiet = 0;
-$remove = 0;
-$opts = "";
-$distro = 'Ximian';
-@required_opts = ( 'PATCHPATH' );
-
-foreach $a (@ARGV) {
-	if ($a eq '-R') {
-	    	$remove = 1;
-	}
-
-	if ($a eq '--quiet') {
-	    $quiet = 1;
-	} elsif ($a =~ m/--distro=(.*)/) {
-	    $distro = $1;
-	} else {
-		$opts = $opts . " " . $a;
-	}
-}
-
-$base_cmd = "patch -l -b -p0 $opts -d $dest_dir";
-
-# Compatibility for a little ...
-if (!($patch_dir =~ /RC3_030729/)) {
-    $base_cmd .= ' --fuzz=1';
-}
-
-print "Execute: $base_cmd for distro '$distro'\n" unless $quiet;
-
-if (!$remove) {
-    apply_patches();
-}
-else {
-    remove_patches();
-}
-
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644
index 31faa6de2..000000000
--- a/po/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.pot
-POTFILES
-Makefile
-Makefile.in
-Makefile.in.in
-Makevars.template
-Rules-quot
-boldquot.sed
-en@boldquot.header
-en@quot.header
-insert-header.sin
-quot.sed
-remove-potcdate.sin
diff --git a/po/Makefile.am b/po/Makefile.am
deleted file mode 100644
index 84ea92faa..000000000
--- a/po/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST=${wildcard *.po} ChangeLog POTFILES.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index 0a012d4d2..000000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,8 +0,0 @@
-desktop/drawing1.1.desktop.in
-desktop/drawing.desktop.in
-desktop/presentation1.1.desktop.in
-desktop/presentation.desktop.in
-desktop/spreadsheet1.1.desktop.in
-desktop/spreadsheet.desktop.in
-desktop/textdoc1.1.desktop.in
-desktop/textdoc.desktop.in
diff --git a/po/ca.po b/po/ca.po
deleted file mode 100644
index a36c15c7b..000000000
--- a/po/ca.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Catalan translation of ooo-build.
-# Copyright © 2003 Free Software Foundation, Inc.
-# This file is distributed under the same license as the ooo-build package.
-# Jordi Mallach <jordi@sindominio.net>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ooo-build\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-31 21:16+0200\n"
-"PO-Revision-Date: 2003-08-31 21:20+0200\n"
-"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
-"Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Dibuix (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Paquet de dibuix d'OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Dibuix"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Aplicació de presentacions d'OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Presentació (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Presentació"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Full de càlcul d'OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Full de càlcul (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Full de càlcul"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Processador de textos d'OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Processador de textos (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Processador de textos"
diff --git a/po/cs.po b/po/cs.po
deleted file mode 100644
index b03bf8951..000000000
--- a/po/cs.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Czech translation of openoffice.
-# Copyright (C) 2003 openoffice'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the openoffice package.
-# Miloslav Trmac <mitr@volny.cz>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 12:40+0200\n"
-"PO-Revision-Date: 2003-09-05 22:59+0200\n"
-"Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Kreslení (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Kreslicí balík OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Kreslení"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Aplikace OpenOffice.org pro prezentace"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Prezentace (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Prezentace"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Tabulkový kalkulátor OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Tabulkový kalkulátor (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Tabulkový kalkulátor"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Textový procesor OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Textový procesor (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Textový procesor"
diff --git a/po/da.po b/po/da.po
deleted file mode 100644
index 6274e54f1..000000000
--- a/po/da.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# Danish translation of openoffice strings.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Ole Laursen <olau@hardworking.dk>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice\n"
-"POT-Creation-Date: 2003-08-20 18:24+0200\n"
-"PO-Revision-Date: 2003-08-21 21:23+0200\n"
-"Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Tegneprogram (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "OpenOffice.org-tegnepakke"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Tegneprogram"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "OpenOffice.org-præsentationsprogram"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Præsentation (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Præsentation"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "OpenOffice.org-regneark"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Regneark (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Regneark"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "OpenOffice.org-tekstbehandler"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Tekstbehandler (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Tekstbehandler"
diff --git a/po/de.po b/po/de.po
deleted file mode 100644
index 9b5b3886c..000000000
--- a/po/de.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Ximian OpenOffice.
-# Copyright (C) 2003 Ximian, Inc
-# This file is distributed under the same license as the ooo-build package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ooo-build 1.1.35 \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-25 12:27+0200\n"
-"PO-Revision-Date: 2003-08-25 12:27+0200\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Zeichnung (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "OpenOffice.org Zeichnungspaket"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Zeichnung"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "OpenOffice.org Präsentationsanwendung"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Präsentation (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Präsentation"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "OpenOffice.org Tabellenkalkulation"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Tabellenkalkulation (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Tabellenkalkulation"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "OpenOffice.org Textverarbeitung"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Textverarbeitung (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Textverarbeitung"
diff --git a/po/es.po b/po/es.po
deleted file mode 100644
index 750ca3c7a..000000000
--- a/po/es.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Ximian OpenOffice.
-# Copyright (C) 2003 Ximian, Inc
-# This file is distributed under the same license as the openoffice package.
-# Carlos Perelló Marín <carlos@gnome.org>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-20 14:18+0200\n"
-"PO-Revision-Date: 2003-08-20 14:30+0200\n"
-"Last-Translator: Carlos Perelló Marín <carlos@gnome.org>\n"
-"Language-Team: Spanish <traductores@es.gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Dibujo (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Paquete de dibujo de OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Dibujo"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Aplicación de presentaciones de OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Presentación (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Presentación"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Hoja de cálculo de OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Hoja de cálculo (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Hoja de cálculo"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Procesador de textos de OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Procesador de textos (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Procesador de textos"
diff --git a/po/fr.po b/po/fr.po
deleted file mode 100644
index ec0f09013..000000000
--- a/po/fr.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# French translation of ooo-build.
-# Copyright (C) 2003 The Free Software Foundation, Inc.
-# This file is distributed under the same license as the ooo-build package.
-# Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ooo-build 1.1.38\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-30 22:38+0200\n"
-"PO-Revision-Date: 2003-08-30 22:38+0200\n"
-"Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Dessin (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Dessin OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Dessin"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Application de présentation OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Présentation (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Présentation"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Tableur OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Tableur (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Tableur"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Traitement de texte OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Traitement de texte (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Traitement de texte"
diff --git a/po/ms.po b/po/ms.po
deleted file mode 100644
index f4372f24e..000000000
--- a/po/ms.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# Duit PPRT siapa yang kebas????      
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Hasbullah Bin Pit (sebol) <sebol@ikhlas.com>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ooo-build\n"
-"POT-Creation-Date: 2003-08-29 06:54+0800\n"
-"PO-Revision-Date: 2003-08-29 06:54+0800\n"
-"Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
-"Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Lukisan (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Pakej lukisan OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Lukisan"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Aplikasi persembahan OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Persembahan (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Persembahan"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "hamparan OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Hamparan (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Hamparan"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Pemproses perkataan OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Pemproses Perkataan (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Pemproses Perkataan"
diff --git a/po/nl.po b/po/nl.po
deleted file mode 100644
index 333a476f0..000000000
--- a/po/nl.po
+++ /dev/null
@@ -1,65 +0,0 @@
-# Dutch translation of GNOME-ooo module
-# Copyright (C) 2003 The Free Software Foundation
-# This file is distributed under the same license as the openoffice package.
-# Tino Meinen <a.t.meinen@chello.nl>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNOME 2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-04 12:43+0200\n"
-"PO-Revision-Date: 2003-09-04 20:30+0200\n"
-"Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
-"Language-Team: Dutch <vertaling@nl.linux.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Tekenen (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "OpenOffice.org tekenpakket"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Tekenen"
-
-# presentatie-programma klinkt beter dan presentatie-toepassing
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "OpenOffice.org presentatie-programma"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Presentatie (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Presentatie"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "OpenOffice.org spreadsheet"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Spreadsheet (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Spreadsheet"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "OpenOffice.org tekstverwerker"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Tekstverwerker (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Tekstverwerker"
diff --git a/po/no.po b/po/no.po
deleted file mode 100644
index 767c515ce..000000000
--- a/po/no.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Norwegian translations for PACKAGE package.
-# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 1.1RC3\n"
-"POT-Creation-Date: 2003-08-20 21:15+0200\n"
-"PO-Revision-Date: 2003-08-20 21:17+0200\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Tegning (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "OpenOffice.org tegneprogram"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Tegning"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Openoffice.org presentasjonsprogram"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Presentasjon (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Presentasjon"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "OpenOffice.org regneark"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Regneark (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Regneark"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "OpenOffice.org tekstbehandling"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Tekstbehandling (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Tekstbehandling"
diff --git a/po/pl.po b/po/pl.po
deleted file mode 100644
index a50eb4de9..000000000
--- a/po/pl.po
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 2001-2002 Free Software Foundation, Inc.
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aktualną wersję tego pliku możesz odnaleźć w repozytorium cvs.gnome.pl
-# (:pserver:anonymous@cvs.gnome.pl:/home/cvs, puste hasło)
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas na adres:
-# translators@gnome.pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-03 14:35+0200\n"
-"PO-Revision-Date: 2003-09-02 08:51+0100\n"
-"Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Rysunek (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Rysunek OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Rysunek"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Prezentacje OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Prezentacja (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Prezentacja"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Arkusz Kalkulacyjny OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Arkusz kalkulacyjny (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Arkusz Kalkulacyjny"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Procesor tekstu OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Procesor tekstu (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Procesor tekstu"
diff --git a/po/pt.po b/po/pt.po
deleted file mode 100644
index 9d1455f84..000000000
--- a/po/pt.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# openoffice's Portuguese translation.
-# Copyright (C) 2003 openoffice
-# This file is distributed under the same license as the openoffice package.
-# Duarte Loreto <happyguy_pt@hotmail.com>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 2.4\n"
-"Report-Msgid-Bugs-To: Duarte Loreto <happyguy_pt@hotmail.com>\n"
-"POT-Creation-Date: 2003-09-09 13:00+0200\n"
-"PO-Revision-Date: 2003-09-09 13:10+0000\n"
-"Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
-"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Drawing (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Pacote de desenho OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Drawing"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Aplicação de apresentações OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Presentation (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Presentation"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Folha de cálculo OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Spreadsheet (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Spreadsheet"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Processador de texto OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Word Processor (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Word Processor"
diff --git a/po/sq.po b/po/sq.po
deleted file mode 100644
index 8e3af9d53..000000000
--- a/po/sq.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# Ximian OpenOffice.
-# This file is distributed under the same license as the openoffice package.
-# Copyright (C) 2003 Ximian, Inc
-# Laurent Dhima <laurenti@alblinux.net>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice1.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-20 15:21+0200\n"
-"PO-Revision-Date: 2003-08-20 15:30+0200\n"
-"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
-"Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Vizatuesi (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Paketa për vizatimet në OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Vizatim"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Aplikativi për prezantimet i OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Prezantim (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Prezantime"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Fleta elektronike e OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Fleta elektronike (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Fleta elektronike"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Procesuesi i tekstit i OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Procesues teksti (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Procesues teksti"
-
diff --git a/po/sr.po b/po/sr.po
deleted file mode 100644
index 6345f9da7..000000000
--- a/po/sr.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Serbian translation of openoffice
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003.
-#
-# This file is distributed under the same license as the openoffice package.
-#
-# Maintainer: Данило Шеган <dsegan@gmx.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice\n"
-"PO-Revision-Date: 2003-08-30 14:05+0200\n"
-"Last-Translator: Данило Шеган <danilo@prevod.org>\n"
-"Language-Team: Serbian (sr) <serbiangnome-listaL@nongnu.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Цртање (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Пакет за цртање из Отворене канцеларије"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Цртање"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Програм за презентације из Отворене канцеларије"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Презентација (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Презентација"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Табеле из Отворене канцеларије"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Табеле (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Табеле"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Обрада текста из Отворене канцеларије"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Обрада текста (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Обрада текста"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
deleted file mode 100644
index 5937652ca..000000000
--- a/po/sr@Latn.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Serbian translation of openoffice
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003.
-#
-# This file is distributed under the same license as the openoffice package.
-#
-# Maintainer: Danilo Šegan <dsegan@gmx.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice\n"
-"PO-Revision-Date: 2003-08-30 14:05+0200\n"
-"Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
-"Language-Team: Serbian (sr) <serbiangnome-listaL@nongnu.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Crtanje (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Paket za crtanje iz Otvorene kancelarije"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Crtanje"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Program za prezentacije iz Otvorene kancelarije"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Prezentacija (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Prezentacija"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Tabele iz Otvorene kancelarije"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Tabele (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Tabele"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Obrada teksta iz Otvorene kancelarije"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Obrada teksta (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Obrada teksta"
diff --git a/po/sv.po b/po/sv.po
deleted file mode 100644
index 740e6e0c2..000000000
--- a/po/sv.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# Swedish messages for openoffice.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Christian Rose <menthos@menthos.com>, 2003.
-#
-# $Id: sv.po,v 1.1 2003/08/20 16:30:00 menthos Exp $
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice\n"
-"POT-Creation-Date: 2003-08-20 18:24+0200\n"
-"PO-Revision-Date: 2003-08-20 18:25+0200\n"
-"Last-Translator: Christian Rose <menthos@menthos.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Teckning (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "OpenOffice.org-teckningspaket"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Teckning"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "OpenOffice.org-presentationsprogram"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Presentation (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Presentation"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "OpenOffice.org-kalkylblad"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Kalkylblad (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Kalkylblad"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "OpenOffice.org-ordbehandlare"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Ordbehandlare (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Ordbehandlare"
-
-#~ msgid "Drawing package"
-#~ msgstr "Teckningspaket"
-
-#~ msgid "Presentation application"
-#~ msgstr "Presentationsprogram"
diff --git a/po/vi.po b/po/vi.po
deleted file mode 100644
index fc58deb31..000000000
--- a/po/vi.po
+++ /dev/null
@@ -1,68 +0,0 @@
-# Vietnamese Translation For OpenOffice.
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# Trinh Minh Thanh <tmthanh@yahoo.com>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice.HEAD.vi\n"
-"POT-Creation-Date: 2003-09-02 12:47+0200\n"
-"PO-Revision-Date: 2003-09-02 23:26+0700\n"
-"Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Drawing (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2
-#: desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Gói OpenOffice.org Drawing"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Drawing"
-
-#: desktop/presentation1.1.desktop.in.h:1
-#: desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Ứng dụng OpenOffice.org Presentation"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Presentation (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Presentation"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1
-#: desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "OpenOffice.org spreadsheet"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Spreadsheet (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Spreadsheet"
-
-#: desktop/textdoc1.1.desktop.in.h:1
-#: desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "OpenOffice.org word processor"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Word Processor (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Word Processor"
-
diff --git a/po/wa.po b/po/wa.po
deleted file mode 100644
index a4aa2c9ea..000000000
--- a/po/wa.po
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Pablo Saratxaga <pablo@mandrakesoft.com>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice\n"
-"POT-Creation-Date: 2003-09-02 21:49+0200\n"
-"PO-Revision-Date: 2003-07-25 15:27+0200\n"
-"Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
-"Language-Team: Walloon <linux-wa@walon.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "Dessinaedje (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "Programe di dessinaedje d' OpenOffice.org"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "Dessinaedje"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "Programe di prezintåcion d' OpenOffice.org"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "Prezintåcion (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "Prezintåcion"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "Tåvleu d' OpenOffice.org"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "Tåvleu (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "Tåvleu"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "Aspougneu d' tecse d' OpenOffice.org"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "Aspougneu d' tecse (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "Aspougneu d' tecse"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
deleted file mode 100644
index 522096f37..000000000
--- a/po/zh_TW.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# traditional Chinese translation of Ximian OpenOffice.org
-# This file is distributed under the same license as the openoffice package.
-# Copyright (C) 2003 Ximian, Inc
-# Abel Cheung <maddog@linux.org.hk>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ooo-build\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=l10n\n"
-"POT-Creation-Date: 2003-08-21 05:25+0800\n"
-"PO-Revision-Date: 2003-08-21 05:27+0800\n"
-"Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: desktop/drawing1.1.desktop.in.h:1
-msgid "Drawing (1.1)"
-msgstr "繪圖 (1.1)"
-
-#: desktop/drawing1.1.desktop.in.h:2 desktop/drawing.desktop.in.h:2
-msgid "OpenOffice.org drawing package"
-msgstr "OpenOffice.org 繪圖軟體"
-
-#: desktop/drawing.desktop.in.h:1
-msgid "Drawing"
-msgstr "繪圖"
-
-#: desktop/presentation1.1.desktop.in.h:1 desktop/presentation.desktop.in.h:1
-msgid "OpenOffice.org presentation application"
-msgstr "OpenOffice.org 簡報應用程式"
-
-#: desktop/presentation1.1.desktop.in.h:2
-msgid "Presentation (1.1)"
-msgstr "簡報 (1.1)"
-
-#: desktop/presentation.desktop.in.h:2
-msgid "Presentation"
-msgstr "簡報"
-
-#: desktop/spreadsheet1.1.desktop.in.h:1 desktop/spreadsheet.desktop.in.h:1
-msgid "OpenOffice.org spreadsheet"
-msgstr "OpenOffice.org 試算表"
-
-#: desktop/spreadsheet1.1.desktop.in.h:2
-msgid "Spreadsheet (1.1)"
-msgstr "試算表 (1.1)"
-
-#: desktop/spreadsheet.desktop.in.h:2
-msgid "Spreadsheet"
-msgstr "試算表"
-
-#: desktop/textdoc1.1.desktop.in.h:1 desktop/textdoc.desktop.in.h:1
-msgid "OpenOffice.org word processor"
-msgstr "OpenOffice.org 文書處理器"
-
-#: desktop/textdoc1.1.desktop.in.h:2
-msgid "Word Processor (1.1)"
-msgstr "文書處理器 (1.1)"
-
-#: desktop/textdoc.desktop.in.h:2
-msgid "Word Processor"
-msgstr "文書處理器"
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index bbae20d2d..000000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.tar.gz
-*.tar.bz2
diff --git a/src/README b/src/README
deleted file mode 100644
index a6df1947f..000000000
--- a/src/README
+++ /dev/null
@@ -1 +0,0 @@
-This is where all the source is downloaded to when you run 'download'
author	nobody <nobody@gnome.org>	2003-09-15 09:23:11 +0000
committer	nobody <nobody@gnome.org>	2003-09-15 09:23:11 +0000
commit	4ec6abc7b28a432ad985db718f66269bba43e215 (patch)
tree	eb5f4806d0ac4d9ba2c88d5a67d1c0770fb21787
parent	5962b9ace11fbb6e3800e99c18bb762d5aa8eaf4 (diff)