This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_3_11

'OOO_BUILD_1_3_11'.

65 files changed, 4544 insertions, 4728 deletions

diff --git a/patches/OOO_1_1/build-versioning.diff b/patches/OOO_1_1/build-versioning.diff
new file mode 100644
index 000000000..70ae6f19d
--- /dev/null
+++ b/patches/OOO_1_1/build-versioning.diff
@@ -0,0 +1,212 @@
+Index: sfx2/inc/about.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/about.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 about.hxx
+--- sfx2/inc/about.hxx	6 Jan 2004 16:16:50 -0000	1.2
++++ sfx2/inc/about.hxx	26 Jan 2005 16:10:39 -0000
+@@ -92,10 +92,12 @@
+ 
+ 	FixedInfo   	aVersionText;
+ 	FixedInfo   	aCopyrightText;
++	FixedInfo   	aBuildData;
+ 
+ 	ResStringArray	aDeveloperAry;
+ 	String			aDevVersionStr;
+ 	String 			aAccelStr;
++	String			aVersionData;
+ 
+ 	AccelList 		aAccelList;
+ 
+Index: sfx2/source/dialog/about.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/dialog/about.cxx,v
+retrieving revision 1.22
+diff -u -r1.22 about.cxx
+--- sfx2/source/dialog/about.cxx	7 Jan 2005 08:56:37 -0000	1.22
++++ sfx2/source/dialog/about.cxx	26 Jan 2005 16:10:39 -0000
+@@ -103,6 +103,21 @@
+ typedef const char* (*fncChar)();
+ 
+ // class AboutDialog -----------------------------------------------------
++static void layoutText( FixedInfo &rText, long &nY, long nTextWidth, Size a6Size )
++{
++	Point aTextPos = rText.GetPosPixel();
++	aTextPos.X() = a6Size.Width() * 2;
++	aTextPos.Y() = nY;
++	rText.SetPosPixel( aTextPos );
++
++	Size aTxtSiz = rText.GetSizePixel();
++	aTxtSiz.Width() = nTextWidth;
++    Size aCalcSize = rText.CalcMinimumSize( nTextWidth );
++    aTxtSiz.Height() = aCalcSize.Height();
++	rText.SetSizePixel( aTxtSiz );
++
++	nY += aTxtSiz.Height();
++}
+ 
+ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr ) :
+ 
+@@ -111,6 +126,7 @@
+ 	aOKButton      	( this,		ResId( ABOUT_BTN_OK ) ),
+ 	aVersionText 	( this, 	ResId( ABOUT_FTXT_VERSION ) ),
+ 	aCopyrightText	( this, 	ResId( ABOUT_FTXT_COPYRIGHT ) ),
++	aBuildData      ( this ),
+ 	aDeveloperAry	( 			ResId( ABOUT_STR_DEVELOPER_ARY ) ),
+ 	aDevVersionStr	( rVerStr ),
+ 	aAccelStr		( 			ResId( ABOUT_STR_ACCEL ) ),
+@@ -211,6 +227,22 @@
+ 	Color aTextColor( rSettings.GetWindowTextColor() );
+ 	aVersionText.SetControlForeground( aTextColor );
+ 	aCopyrightText.SetControlForeground( aTextColor );
++	aBuildData.SetBackground( aWall );
++
++	Font aSmallFont = rSettings.GetInfoFont();
++	Size aSmaller = aNewFont.GetSize();
++	aSmaller.Width() = (long) (aSmaller.Width() * 0.75);
++	aSmaller.Height() = (long) (aSmaller.Height() * 0.75);
++	aNewFont.SetSize( aSmaller );
++	aBuildData.SetFont( aNewFont );
++	aBuildData.SetBackground( aWall );
++#ifdef BUILD_VER_STRING	
++	String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) );
++#else
++	String aBuildString;
++#endif
++	aBuildData.SetText( aBuildString );
++	aBuildData.Show();
+ 
+ 	// Gr"ossen und Positionen berechnen
+ 	Size aAppLogoSiz = aAppLogo.GetSizePixel();
+@@ -222,31 +254,18 @@
+ 
+ 	// Texte (Gr"osse und Position )
+ 	Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
+-	long nY = 0;
+-	Point aTextPos = aVersionText.GetPosPixel();
+-	aTextPos.X() = a6Size.Width() * 2;
+-	aTextPos.Y() = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
+-	nY = aTextPos.Y();
+-	aVersionText.SetPosPixel( aTextPos );
+-	Size aTxtSiz = aVersionText.GetSizePixel();
+-	aTxtSiz.Width() = aAppLogoSiz.Width() - ( a6Size.Width() * 4 );
+-	long nTextWidth = aTxtSiz.Width();
+-    Size aCalcSize = aVersionText.CalcMinimumSize( nTextWidth );
+-
+-    aTxtSiz.Height() = aCalcSize.Height();
+-	aVersionText.SetSizePixel( aTxtSiz );
+-	nY += aTxtSiz.Height() + ( a6Size.Height() / 3 );
++	long nTextWidth = aAppLogoSiz.Width() - ( a6Size.Width() * 4 );
++	long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
+ 
+-	aTextPos = aCopyrightText.GetPosPixel();
+-	aTextPos.X() = a6Size.Width() * 2;
+-	aTextPos.Y() = nY;
+-	aCopyrightText.SetPosPixel( aTextPos );
+-	aTxtSiz = aCopyrightText.GetSizePixel();
+-	aTxtSiz.Width() = nTextWidth;
+-    aCalcSize = aCopyrightText.CalcMinimumSize( nTextWidth );
+-    aTxtSiz.Height() = aCalcSize.Height();
+-	aCopyrightText.SetSizePixel( aTxtSiz );
+-	nY += aTxtSiz.Height() + ( a6Size.Height() / 2 );
++	layoutText( aVersionText, nY, nTextWidth, a6Size );
++	nY += ( a6Size.Height() / 3 );
++	layoutText( aCopyrightText, nY, nTextWidth, a6Size );
++	nY += ( a6Size.Height() / 3 );
++	if( aBuildString.Len() > 0 )
++	{
++		layoutText( aBuildData, nY, nTextWidth, a6Size );
++		nY += ( a6Size.Height() / 2 );
++	}
+ 
+ 	// OK-Button-Position (at the bottom and centered)
+ 	Size aOKSiz = aOKButton.GetSizePixel();
+@@ -271,6 +290,8 @@
+         sCopyright.SearchAndReplaceAll(sSO, sProduct);
+         aCopyrightText.SetText(sCopyright);
+     }
++
++	
+ }
+ 
+ // -----------------------------------------------------------------------
+Index: sfx2/source/dialog/makefile.mk
+===================================================================
+RCS file: /cvs/framework/sfx2/source/dialog/makefile.mk,v
+retrieving revision 1.27
+diff -u -r1.27 makefile.mk
+--- sfx2/source/dialog/makefile.mk	11 Jan 2005 14:57:53 -0000	1.27
++++ sfx2/source/dialog/makefile.mk	26 Jan 2005 16:10:40 -0000
+@@ -136,6 +136,10 @@
+ 		printopt.src        \
+ 		srchdlg.src
+ 
++.IF "$(BUILD_VER_STRING)"!=""
++CFLAGS+=-DBUILD_VER_STRING='"$(BUILD_VER_STRING)"'
++.ENDIF
++
+ # --- Targets -------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
+
+
+
+
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.82
+diff -u -r1.82 configure.in
+--- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
++++ config_office/configure.in	26 Jan 2005 16:19:58 -0000
+@@ -354,5 +379,12 @@
+ 
+                           Usage: --with-use-shell=<desired shell>
+ ],with_use_shell=$withval,with_use_shell=0)
++AC_ARG_WITH(build-version,
++[  --with-build-version   Allows the builder to add a custom version tag
++                          that will appear in the Help/About box for QA
++                          purposes.
++
++                          Usage: --with-build-version="Built by Jim"
++],with_build_version=$withval)
+ AC_ARG_ENABLE(sgistl,
+ [  --enable-sgistl         for IRIX users, use this option option to build
+@@ -1436,6 +1495,17 @@
+ fi
+ 
+ dnl ===================================================================
++dnl Custom build version
++dnl ===================================================================
++
++if test "z$with_build_version" != "z"; then
++   BUILD_VER_STRING=$with_build_version
++else
++   BUILD_VER_STRING=
++fi
++AC_SUBST(BUILD_VER_STRING)
++
++dnl ===================================================================
+ dnl Java support enable
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to build with Java support])
+
+
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.33
+diff -u -r1.33 set_soenv.in
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -1444,7 +1413,8 @@
+ ToFile( "MULTITHREAD_OBJ",   $MULTITHREAD_OBJ,   "e" );
+ ToFile( "NO_REC_RES",        $NO_REC_RES,        "e" );
+ ToFile( "PROEXT",            $PROEXT,            "e" );
+ ToFile( "SO3",               $SO3,               "e" );
++ToFile( "BUILD_VER_STRING",  "@BUILD_VER_STRING@", "e" );
+ ToFile( "SOLAR_PLUGIN",      $SOLAR_PLUGIN,      "e" );
+ ToFile( "TF_PACKAGES",       $TF_PACKAGES,       "e" );
+ ToFile( "TF_FILEURL",        $TF_FILEURL,        "e" );
+
+
diff --git a/patches/OOO_1_1/default-graphics-cache.diff b/patches/OOO_1_1/default-graphics-cache.diff
new file mode 100644
index 000000000..ca45f3fa2
--- /dev/null
+++ b/patches/OOO_1_1/default-graphics-cache.diff
@@ -0,0 +1,20 @@
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old	2005-03-22 20:05:58.000000000 +0100
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2005-03-23 12:20:22.000000000 +0100
+@@ -9098,7 +9098,7 @@
+ 						<label xml:lang="kn-IN">Total Graphic Cache Size</label>
+ 						<label xml:lang="gl">Total Graphic Cache Size</label>
+ 					</info>
+-					<value>10240000</value>
++					<value>20480000</value>
+ 				</prop>
+ 				<prop oor:name="ObjectCacheSize" oor:type="xs:int">
+ 					<info>
+@@ -9184,7 +9184,7 @@
+ 						<label xml:lang="kn-IN">Graphic Object Cache Size</label>
+ 						<label xml:lang="gl">Graphic Object Cache Size</label>
+ 					</info>
+-					<value>2560000</value>
++					<value>5120000</value>
+ 				</prop>
+ 				<prop oor:name="ObjectReleaseTime" oor:type="xs:int">
+ 					<info>
diff --git a/patches/OOO_1_1/email-attachment.diff b/patches/OOO_1_1/email-attachment.diff
new file mode 100644
index 000000000..6b51cb9ba
--- /dev/null
+++ b/patches/OOO_1_1/email-attachment.diff
@@ -0,0 +1,38 @@
+--- unotools/source/ucbhelper/tempfile.cxx	2004-10-12 10:47:47.000000000 +0530
++++ unotools/source/ucbhelper/tempfile.cxx	2004-10-19 16:20:49.663737320 +0530
+@@ -324,7 +324,8 @@
+     for ( sal_Int32 i=0;; i++ )
+     {
+         String aTmp( aName );
+-       	aTmp += String::CreateFromInt32( i );
++	if (i)
++        	aTmp += String::CreateFromInt32( i );
+         if ( pExtension )
+             aTmp += *pExtension;
+         else
+--- sfx2/source/dialog/mailmodel.cxx	2004-10-19 16:52:56.703782704 +0530
++++ sfx2/source/dialog/mailmodel.cxx	2004-10-11 20:48:22.000000000 +0530
+@@ -341,12 +341,12 @@
+ 				pExt = new String( String::CreateFromAscii( "." ) + aFileObj.getExtension() );
+ 				aFileObj.removeExtension();
+ 				aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+-				 aLeadingStr += String::CreateFromAscii( "_" );
++				// aLeadingStr += String::CreateFromAscii( "_" );
+ 			}
+ 			else
+ 			{
+ 				aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+-				 aLeadingStr += String::CreateFromAscii( "_" );
++				// aLeadingStr += String::CreateFromAscii( "_" );
+ 			}
+ 		}
+ 
+@@ -441,7 +441,7 @@
+ 					pExt = new String( aPDFExtension );
+ 					aFileObj.removeExtension();
+ 					aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+-					aLeadingStr += String::CreateFromAscii( "_" );
++				//	aLeadingStr += String::CreateFromAscii( "_" );
+ 				}
+ 				else
+ 				{
diff --git a/patches/OOO_1_1/fpicker-kde-partial-kio.diff b/patches/OOO_1_1/fpicker-kde-partial-kio.diff
new file mode 100644
index 000000000..160264fa3
--- /dev/null
+++ b/patches/OOO_1_1/fpicker-kde-partial-kio.diff
@@ -0,0 +1,189 @@
+--- fpicker/source/unx/kde/kdefilepicker.hxx	2005-03-03 15:38:55.741091637 +0100
++++ fpicker/source/unx/kde/kdefilepicker.hxx	2005-03-04 16:23:10.215148048 +0100
+@@ -96,6 +96,7 @@ protected:
+      *  (custom list boxes are under this check box, which looks ugly).
+      */
+     bool                        m_bIsSave;
++    bool                        m_bIsExecuting;
+ 
+     bool                        m_bCanNotifySelection;
+ 
+@@ -125,6 +126,12 @@ protected:
+     void                        setIsSave( bool bIsSave ) { m_bIsSave = bIsSave; }
+     bool                        isSave( void ) const { return m_bIsSave; }
+ 
++    void                        setIsExecuting( bool bIsExecuting ) { m_bIsExecuting = bIsExecuting; }
++    bool                        isExecuting( void ) const { return m_bIsExecuting; }
++
++    bool                        isSupportedProtocol( const QString &rProtocol ) const;
++    QString                     localCopy( const QString &rFileName ) const;
++
+     void                        setCanNotifySelection( bool bCanNotifySelection ) { m_bCanNotifySelection = bCanNotifySelection; }
+     bool                        canNotifySelection( void ) const { return m_bCanNotifySelection; }
+ 
+--- fpicker/source/unx/kde/kdefilepicker.cxx	2005-03-03 15:38:50.737956764 +0100
++++ fpicker/source/unx/kde/kdefilepicker.cxx	2005-03-04 16:39:33.815625995 +0100
+@@ -79,8 +79,10 @@
+ #include <kdiroperator.h>
+ #include <kfiledialog.h>
+ #include <kfilefiltercombo.h>
++#include <kio/netaccess.h>
+ #include <klocale.h>
+ #include <kmessagebox.h>
++#include <ktempfile.h>
+ 
+ #include <algorithm>
+ #include <iostream>
+@@ -98,6 +100,7 @@ FileDialog::FileDialog( const QString &s
+       m_pPushButtons( new QVBox( m_pCombosAndButtons ) ),
+       m_pCheckBoxes( new QGrid( 2, m_pCustomWidget ) ),
+       m_bIsSave( false ),
++      m_bIsExecuting( false ),
+       m_bCanNotifySelection( true )
+ {
+     connect( this, SIGNAL( fileHighlighted( const QString & ) ),
+@@ -257,10 +260,16 @@ void FileDialog::customEvent( QCustomEve
+                         for ( KURL::List::const_iterator it = qList.begin(); it != qList.end(); ++it )
+                         {
+                             qString.append( " " );
+-                            QString qUrlStr = (*it).url();
++                            QString qUrlStr = addExtension( (*it).url() );
++
++                            if ( !isExecuting() && !isSupportedProtocol( KURL( qUrlStr ).protocol() ) )
++                                qUrlStr = localCopy( qUrlStr );
++
+                             if ( qUrlStr.startsWith( "file:/" ) && qUrlStr.mid( 6, 1 ) != "/" )
+                                 qUrlStr.replace( "file:/", "file:///" );
+-                            appendEscaped( qString, addExtension( qUrlStr ) );
++
++                            if ( !qUrlStr.isEmpty() )
++                                appendEscaped( qString, qUrlStr );
+                         }
+                     }
+                     else
+@@ -270,10 +279,16 @@ void FileDialog::customEvent( QCustomEve
+                         for ( KFileItemListIterator it( *pItems ); it.current(); ++it )
+                         {
+                             qString.append( " " );
+-                            QString qUrlStr = (*it)->url().url();
++                            QString qUrlStr = addExtension( (*it)->url().url() );
++
++                            if ( !isExecuting() && !isSupportedProtocol( KURL( qUrlStr ).protocol() ) )
++                                qUrlStr = localCopy( qUrlStr );
++
+                             if ( qUrlStr.startsWith( "file:/" ) && qUrlStr.mid( 6, 1 ) != "/" )
+                                 qUrlStr.replace( "file:/", "file:///" );
+-                            appendEscaped( qString, addExtension( qUrlStr ) );
++
++                            if ( !qUrlStr.isEmpty() )
++                                appendEscaped( qString, qUrlStr );
+                         }
+                     }
+ 
+@@ -322,18 +337,47 @@ void FileDialog::customEvent( QCustomEve
+                 {
+                     filterWidget->setEditable( false );
+                     QString qSelectedURL;
++                    setIsExecuting( true );
++                    bool bCanExit = false;
+                     do {
+                         setCanNotifySelection( true );
+                         exec();
++
+                         qSelectedURL = addExtension( selectedURL().url() );
+-                    } while ( isSave() &&
+-                              result() == QDialog::Accepted &&
+-                              ( qSelectedURL.startsWith( "file:" ) && QFile::exists( qSelectedURL.mid( 5 ) ) ) &&
+-                              KMessageBox::warningYesNo( 0,
+-                                  i18n( "A file named \"%1\" already exists. "
+-                                      "Are you sure you want to overwrite it?" ).arg( qSelectedURL ),
+-                                  i18n( "Overwrite File?" ),
+-                                  i18n( "Overwrite" ), KStdGuiItem::cancel() ) != KMessageBox::Yes );
++                        QString qProtocol( selectedURL().protocol() );
++
++                        if ( isSave() && result() == QDialog::Accepted )
++                        {
++                            if ( qSelectedURL.startsWith( "file:" ) )
++                            {
++                                bCanExit =
++                                    !QFile::exists( qSelectedURL.mid( 5 ) ) ||
++                                    ( KMessageBox::warningYesNo( 0,
++                                                                 i18n( "A file named \"%1\" already exists. "
++                                                                     "Are you sure you want to overwrite it?" ).arg( qSelectedURL ),
++                                                                 i18n( "Overwrite File?" ),
++                                                                 i18n( "Overwrite" ), KStdGuiItem::cancel() ) == KMessageBox::Yes );
++                            }
++                            else if ( !isSupportedProtocol( qProtocol ) )
++                            {
++                                KMessageBox::sorry( 0,
++                                        i18n( "Saving using protocol \"%1\" is not supported." ).arg( qProtocol ) );
++                                bCanExit = false;
++                            }
++                            else
++                                bCanExit = true;
++                        }
++                        else if ( !isSave() && result() == QDialog::Accepted && !isSupportedProtocol( qProtocol ) )
++                        {
++                            KMessageBox::information( 0,
++                                    i18n( "Protocol \"%1\" is supported only partially. "
++                                        "Local copy of the file will be created." ).arg( qProtocol ) );
++                            bCanExit = true;
++                        }
++                        else
++                            bCanExit = true;
++                    } while ( !bCanExit );
++                    setIsExecuting( false );
+ 
+                     if ( result() == QDialog::Accepted )
+                         sendCommand( "accept" );
+@@ -563,6 +607,50 @@ QString FileDialog::addExtension( const 
+         return rFileName + qExtension;
+ }
+ 
++bool FileDialog::isSupportedProtocol( const QString &rProtocol ) const
++{
++    // TODO Get this information directly from OOo
++    const char * pOOoProtocols[] = { "", "ftp", "http", "file", "mailto",
++        "vnd.sun.star.webdav", "news", "private", "vnd.sun.star.help",
++        "https", "slot", "macro", "javascript", "imap", "pop3", "data",
++        "cid", "out", "vnd.sun.star.wfs", "vnd.sun.star.hier", "vim",
++        ".uno", ".component", "vnd.sun.star.pkg", "ldap", "db",
++        "vnd.sun.star.cmd", "vnd.sun.star.script", "vnd.sun.star.odma",
++        "telnet",
++        NULL };
++
++    for ( const char **pIndex = pOOoProtocols; *pIndex != NULL; ++pIndex )
++    {
++        if ( rProtocol == *pIndex )
++            return true;
++    }
++
++    // TODO gnome-vfs bits here
++
++    return false;
++}
++
++QString FileDialog::localCopy( const QString &rFileName ) const
++{
++    int nExtensionPos = rFileName.findRev( '/' );
++    if ( nExtensionPos >= 0 )
++        nExtensionPos = rFileName.find( '.', nExtensionPos );
++    else
++        nExtensionPos = rFileName.find( '.' );
++
++    KTempFile qTempFile( QString::null, ( nExtensionPos < 0 )? QString(): rFileName.mid( nExtensionPos ) );
++    KURL qDestURL;
++    qDestURL.setPath( qTempFile.name() );
++
++    if ( !KIO::NetAccess::file_copy( rFileName, qDestURL, 0600, true, false, NULL ) )
++    {
++        KMessageBox::error( 0, KIO::NetAccess::lastErrorString() );
++        return QString::null;
++    }
++
++    return qDestURL.url();
++}
++
+ void FileDialog::fileHighlightedCommand( const QString & )
+ {
+     if ( canNotifySelection() )
diff --git a/patches/OOO_1_1/fpicker-kde.diff b/patches/OOO_1_1/fpicker-kde.diff
index dfc6b4f8d..f8532c798 100644
--- a/patches/OOO_1_1/fpicker-kde.diff
+++ b/patches/OOO_1_1/fpicker-kde.diff
@@ -342,7 +342,7 @@
 +#endif // _KDECOMMANDTHREAD_HXX_
 --- /dev/null	2004-04-06 15:27:52.000000000 +0200
 +++ fpicker/source/unx/kde/kdefilepicker.cxx	2004-09-08 17:01:55.270345192 +0200
-@@ -0,0 +1,611 @@
+@@ -0,0 +1,617 @@
 +/*************************************************************************
 + *
 + *
@@ -568,10 +568,9 @@
 +            case CommandEvent::SetCurrentFilter:
 +                if ( nListSize >= 1 )
 +                {
-+                    filterWidget->setCurrentItem( pStringList->front() );
-+                    // FIXME notify that the filter changed (otherwise the old
-+                    // is still used)
++                    static_cast< FileFilterComboHack* >( filterWidget )->setCurrentFilter( pStringList->front() );
 +                }
++                break;
 +            case CommandEvent::GetDirectory:
 +                {
 +                    QString qDirectory = baseURL().url();
@@ -954,9 +953,16 @@
 +
 +    return qString;
 +}
++
++
++void FileFilterComboHack::setCurrentFilter( const QString& filter )
++{
++    setCurrentText( filter );
++    filterChanged();
++}
 --- /dev/null	2004-04-06 15:27:52.000000000 +0200
 +++ fpicker/source/unx/kde/kdefilepicker.hxx	2004-06-11 14:03:03.937359576 +0200
-@@ -0,0 +1,140 @@
+@@ -0,0 +1,147 @@
 +/*************************************************************************
 + *
 + *
@@ -1022,6 +1028,7 @@
 +#define _KDEFILEPICKER_HXX_
 +
 +#include <kfiledialog.h>
++#include <kfilefiltercombo.h>
 +
 +class QGrid;
 +class QHBox;
@@ -1096,6 +1103,12 @@
 +    QString                     escapeString( const QString &rString );
 +};
 +
++class FileFilterComboHack : public KFileFilterCombo
++{
++public:
++    void setCurrentFilter( const QString& filter );
++};
++
 +#endif // _KDEFILEPICKER_HXX_
 --- /dev/null	2004-04-06 15:27:52.000000000 +0200
 +++ fpicker/source/unx/kde/kdefpmain.cxx	2004-06-21 17:40:44.786843760 +0200
diff --git a/patches/OOO_1_1/hebrew-culmus.diff b/patches/OOO_1_1/hebrew-culmus.diff
new file mode 100644
index 000000000..fdb44e670
--- /dev/null
+++ b/patches/OOO_1_1/hebrew-culmus.diff
@@ -0,0 +1,16 @@
+Index: registry/data/org/openoffice/VCL.xcu
+===================================================================
+RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
+retrieving revision 1.20.14.7
+diff -u -u -r1.20.14.7 VCL.xcu
+--- officecfg/registry/data/org/openoffice/VCL.xcu	27 May 2004 13:21:14 -0000	1.20.14.7
++++ officecfg/registry/data/org/openoffice/VCL.xcu	7 Nov 2004 14:21:56 -0000
+@@ -409,7 +409,7 @@
+     </node>
+     <node oor:name="he" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+-        <value>Tahoma;Raanana;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
++        <value>Ellinia CLM;Tahoma;Raanana;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
+      </prop>
+       <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace">
+         <value>Tahoma;Raanana;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
diff --git a/patches/OOO_1_1/i18n-calc-encoding.diff b/patches/OOO_1_1/i18n-calc-encoding.diff
index 15c23ed17..11c0cf3b2 100644
--- a/patches/OOO_1_1/i18n-calc-encoding.diff
+++ b/patches/OOO_1_1/i18n-calc-encoding.diff
@@ -2,10 +2,11 @@ Index: calc/profile_calc.lng
 ===================================================================
 RCS file: /cvs/installation/scp/source/calc/Attic/profile_calc.lng,v
 retrieving revision 1.49.24.5
-diff -u -r1.49.24.5 profile_calc.lng
---- scp/source/calc/profile_calc.lng	27 Apr 2004 18:15:09 -0000	1.49.24.5
-+++ scp/source/calc/profile_calc.lng	10 Jun 2004 15:28:49 -0000
-@@ -598,7 +598,7 @@
+Index: scp/source/calc/profile_calc.lng
+===================================================================
+--- scp/source/calc/profile_calc.lng.orig	2004-09-13 22:31:50.000000000 +0200
++++ scp/source/calc/profile_calc.lng	2004-09-14 15:49:37.746332016 +0200
+@@ -678,7 +678,7 @@
  82 = "%PRODUCTNAME %PRODUCTVERSION 스프레드시트"
  86 = "%PRODUCTNAME %PRODUCTVERSION 工作表"
  88 = "%PRODUCTNAME %PRODUCTVERSION 工作表"
@@ -14,23 +15,11 @@ diff -u -r1.49.24.5 profile_calc.lng
  07 = "Ýëåêòðîííàÿ òàáëèöà %PRODUCTNAME %PRODUCTVERSION"
  30 = "Õðïëïãéóôéêü öýëëï %PRODUCTNAME %PRODUCTVERSION"
  31 = "%PRODUCTNAME %PRODUCTVERSION Werkblad"
-@@ -636,7 +636,7 @@
- 34 = "Hoja de ~cálculo"
- 55 = "~Planilha"
- 48 = "~Arkusz kalkulacyjny"
--03 = "Folha de ~cálculo"
-+03 = "Folha de ~cálculo"
- 82 = "스프레드시트(~S)"
- 33 = "~Classeur"
- 96 = "~Spreadsheet"
-Index: impress/profile_impress.lng
+Index: scp/source/impress/profile_impress.lng
 ===================================================================
-RCS file: /cvs/installation/scp/source/impress/Attic/profile_impress.lng,v
-retrieving revision 1.57.24.5
-diff -u -r1.57.24.5 profile_impress.lng
---- scp/source/impress/profile_impress.lng	27 Apr 2004 18:18:43 -0000	1.57.24.5
-+++ scp/source/impress/profile_impress.lng	10 Jun 2004 15:28:51 -0000
-@@ -639,7 +639,7 @@
+--- scp/source/impress/profile_impress.lng.orig	2004-09-13 22:32:00.000000000 +0200
++++ scp/source/impress/profile_impress.lng	2004-09-14 15:49:37.749331560 +0200
+@@ -724,7 +724,7 @@
  82 = "%PRODUCTNAME %PRODUCTVERSION 프레젠테�션"
  86 = "%PRODUCTNAME %PRODUCTVERSION 演示文稿"
  88 = "%PRODUCTNAME %PRODUCTVERSION ç°¡å ±"
@@ -39,7 +28,7 @@ diff -u -r1.57.24.5 profile_impress.lng
  07 = "Ïðåçåíòàöèÿ %PRODUCTNAME %PRODUCTVERSION"
  30 = "Ðáñïõóßáóç %PRODUCTNAME %PRODUCTVERSION"
  31 = "%PRODUCTNAME %PRODUCTVERSION Presentatie"
-@@ -677,7 +677,7 @@
+@@ -767,7 +767,7 @@
  34 = "~Presentación"
  55 = "A~presentação"
  48 = "~Prezentacja"
@@ -48,7 +37,7 @@ diff -u -r1.57.24.5 profile_impress.lng
  82 = "프레젠테�션(~P)"
  33 = "~Présentation"
  96 = "ÚÑÖ Ê~ÞÏíãí"
-@@ -714,7 +714,7 @@
+@@ -809,7 +809,7 @@
  34 = "~Presentación..."
  55 = "A~presentação..."
  48 = "~Prezentacja..."
@@ -56,15 +45,12 @@ diff -u -r1.57.24.5 profile_impress.lng
 +03 = "A~presentação..."
  82 = "프레젠테�션(~P)..."
  33 = "~Présentation..."
- 96 = "~Presentation..."
-Index: math/profile_math.lng
+ 96 = "~ÚÑÖ ÊÞÏíãì..."
+Index: scp/source/math/profile_math.lng
 ===================================================================
-RCS file: /cvs/installation/scp/source/math/Attic/profile_math.lng,v
-retrieving revision 1.40.24.4
-diff -u -r1.40.24.4 profile_math.lng
---- scp/source/math/profile_math.lng	27 Apr 2004 18:20:23 -0000	1.40.24.4
-+++ scp/source/math/profile_math.lng	10 Jun 2004 15:28:51 -0000
-@@ -80,7 +80,7 @@
+--- scp/source/math/profile_math.lng.orig	2004-09-13 22:32:04.000000000 +0200
++++ scp/source/math/profile_math.lng	2004-09-14 15:49:37.750331408 +0200
+@@ -90,7 +90,7 @@
  34 = "~Fórmula"
  55 = "~Fórmula"
  48 = "F~ormu³a"
@@ -73,14 +59,11 @@ diff -u -r1.40.24.4 profile_math.lng
  82 = "수�(~O)"
  33 = "F~ormule"
  96 = "ÕíÛÉ"
-Index: office/profile.lng
+Index: scp/source/office/profile.lng
 ===================================================================
-RCS file: /cvs/installation/scp/source/office/Attic/profile.lng,v
-retrieving revision 1.58.24.8
-diff -u -r1.58.24.8 profile.lng
---- scp/source/office/profile.lng	4 May 2004 06:48:05 -0000	1.58.24.8
-+++ scp/source/office/profile.lng	10 Jun 2004 15:28:53 -0000
-@@ -1080,7 +1080,7 @@
+--- scp/source/office/profile.lng.orig	2004-09-13 22:32:06.000000000 +0200
++++ scp/source/office/profile.lng	2004-09-14 15:49:37.756330496 +0200
+@@ -1225,7 +1225,7 @@
  34 = "~Tarjetas de visita"
  55 = "Cartões de ~Visita"
  48 = "~Wizytówki"
@@ -88,8 +71,8 @@ diff -u -r1.58.24.8 profile.lng
 +03 = "Cartões de ~visita"
  82 = "명함(~U)"
  33 = "Cartes de ~visite"
- 96 = "B~usiness Cards"
-@@ -1302,7 +1302,7 @@
+ 96 = "ß~ÑÊ ÇáÚãá"
+@@ -1477,7 +1477,7 @@
  34 = "Página ~Web..."
  55 = "Página da ~Web..."
  48 = "Strona ~WWW..."
@@ -97,8 +80,8 @@ diff -u -r1.58.24.8 profile.lng
 +03 = "Página ~Web..."
  82 = "웹 페�지(~W)..."
  33 = "Page ~Web..."
- 96 = "~Web Page..."
-@@ -1339,7 +1339,7 @@
+ 96 = "~ÕÝÍÉ æíÈ..."
+@@ -1519,7 +1519,7 @@
  34 = "Formulario..."
  55 = "~Formulário..."
  48 = "Fo~rmularz..."
@@ -106,8 +89,8 @@ diff -u -r1.58.24.8 profile.lng
 +03 = "F~ormulário..."
  82 = "양�(~R)..."
  33 = "Form~ulaire..."
- 96 = "Form..."
-@@ -1520,7 +1520,7 @@
+ 96 = "äã~æÐÌ..."
+@@ -1725,7 +1725,7 @@
  01 = "Address Data Source..."
  44 = "Address Data Source..."
  49 = "Adress-Datenquelle..."
diff --git a/patches/OOO_1_1/i18n-lang-typo-italian.diff b/patches/OOO_1_1/i18n-lang-typo-italian.diff
new file mode 100644
index 000000000..da51f5932
--- /dev/null
+++ b/patches/OOO_1_1/i18n-lang-typo-italian.diff
@@ -0,0 +1,1542 @@
+--- basctl/source/basicide/basidesh.src.lang39	2004-09-09 19:50:02.000000000 +0200
++++ basctl/source/basicide/basidesh.src	2004-09-13 09:20:14.586837872 +0200
+@@ -557,7 +557,7 @@
+ 	Text[ dutch ] = "De naam van een bibliotheek mag maximaal 30 tekens lang zijn.";
+ 	Text[ french ] = "Le nom d'une bibliothèque peut contenir au maximum 30 caractères.";
+ 	Text[ spanish ] = "El nombre de la biblioteca no debe contener más de 30 caracteres.";
+-	Text[ italian ] = "Il nome della librery può avere una lunghezza massima di 30 caratteri.";
++	Text[ italian ] = "Il nome di una libreria può avere una lunghezza massima di 30 caratteri.";
+ 	Text[ danish ] = "Navnet på et bibliotek må højst være på 30 tegn.";
+ 	Text[ swedish ] = "Namnet på ett bibliotek får maximalt innehålla 30 tecken.";
+ 	Text[ polish ] = "Nazwa biblioteki mo¿e siê sk³adaæ maksymalnie z 30 znaków.";
+--- basic/source/classes/sb.src.lang39	2004-09-09 19:03:50.000000000 +0200
++++ basic/source/classes/sb.src	2004-09-13 09:20:14.580837752 +0200
+@@ -2345,7 +2345,7 @@
+ 		Text = "Zeitüberschreitung während des Wartens auf DDE-Antwort" ;
+ 		Text [ ENGLISH ] = "Timeout while waiting for DDE response" ;
+ 		Text [ norwegian ] = "Tidsgrense nådd ved venting på DDE-svar" ;
+-		Text [ italian ] = "Tempo d'attesa per la rispota DDE oltrepassato" ;
++		Text [ italian ] = "Tempo d'attesa per la risposta DDE oltrepassato" ;
+ 		Text [ portuguese_brazilian ] = "Tempo de espera esgotado durante a espera por uma resposta DDE" ;
+ 		Text [ portuguese ] = "Ultrapassado tempo de espera pela resposta DDE" ;
+ 		Text [ french ] = "Timeout pendant l'attente de la réponse DDE" ;
+@@ -4624,7 +4624,7 @@
+ 		Text = "Wert kann nicht zugewiesen werden" ;
+ 		Text [ ENGLISH ] = "Cannot set value" ;
+ 		Text [ norwegian ] = "Kan ikke bruke verdi" ;
+-		Text [ italian ] = "Impossibile attribuitre il valore" ;
++		Text [ italian ] = "Impossibile attribuire il valore" ;
+ 		Text [ portuguese_brazilian ] = "Não é possível aplicar o valor" ;
+ 		Text [ portuguese ] = "Impossível atribuir o valor" ;
+ 		Text [ french ] = "Impossible d'attribuer la valeur" ;
+--- dbaccess/source/ui/control/tabletree.src.lang39	2004-09-09 18:23:10.000000000 +0200
++++ dbaccess/source/ui/control/tabletree.src	2004-09-13 09:20:14.294832048 +0200
+@@ -163,7 +163,7 @@
+ 			Text[ dutch ] = "Aflopend sorteren";
+ 			Text[ french ] = "Tri décroissant";
+ 			Text[ spanish ] = "Orden descendente";
+-			Text[ italian ] = "Disponi in ordine descrescente";
++			Text[ italian ] = "Disponi in ordine decrescente";
+ 			Text[ danish ] = "Sorter faldende";
+ 			Text[ swedish ] = "Sortera fallande";
+ 			Text[ polish ] = "Sortuj malej¹co";
+--- dbaccess/source/ui/dlg/RelationDlg.src.lang39	2004-09-09 18:24:09.000000000 +0200
++++ dbaccess/source/ui/dlg/RelationDlg.src	2004-09-13 09:20:14.295832068 +0200
+@@ -459,7 +459,7 @@
+ 		Text [ portuguese_brazilian ] = "~Sem ação" ;
+ 		Text [ swedish ] = "Ing~en åtgärd" ;
+ 		Text [ danish ] = "~Ingen handling" ;
+-		Text [ italian ] = "~Nessua operazione" ;
++		Text [ italian ] = "~Nessuna operazione" ;
+ 		Text [ spanish ] = "Ninguna a~cción" ;
+ 		Text [ french ] = "A~ucune action" ;
+ 		Text [ dutch ] = "G~een handeling" ;
+--- dbaccess/source/ui/dlg/dbadmin.src.lang39	2004-09-09 18:24:58.000000000 +0200
++++ dbaccess/source/ui/dlg/dbadmin.src	2004-09-13 09:20:14.302832207 +0200
+@@ -1622,7 +1622,7 @@
+ 		Text [ dutch ] = "Er bestaat reeds een andere gegevensbron met deze naam. Kies een andere naam.";
+ 		Text [ french ] = "Ce nom a déjà été attribué à une autre source de données. Étant donné que les sources de données doivent avoir des noms globalement uniques, vous devez en choisir un autre.";
+ 		Text [ spanish ] = "Ya existe otra fuente de datos con este nombre. Debe elegir otro ya que el nombre de la fuente de datos debe ser globalmente único.";
+-		Text [ italian ] = "Esiste già una sorgente dati con questo nome. Poiché il nome delle sorgenti di dati dev'essere univoco, è necesario scegliere un altro nome.";
++		Text [ italian ] = "Esiste già una sorgente dati con questo nome. Poiché il nome delle sorgenti di dati dev'essere univoco, è necessario scegliere un altro nome.";
+ 		Text [ danish ] = "Der findes allerede en anden datakilde med dette navn. Da datakildenavne skal være unikke, skal du vælge et andet navn.";
+ 		Text [ swedish ] = "Det finns redan en datakälla med det här namnet. Eftersom namn på datakällor måste vara globalt unika bör du välja ett annat namn.";
+ 		Text [ polish ] = "Istnieje inne Ÿród³o danych o tej samej nazwie. Poniewa¿ nazwy Ÿróde³ danych musz¹ byæ globalnie jednoznaczne, nale¿y wybraæ inn¹ nazwê.";
+@@ -1843,7 +1843,7 @@
+ 		Text[ portuguese ] = "To adjust the settings, go to the MySQL tab page.";
+ 		Text[ russian ] = "Äëÿ óòî÷íåíèÿ íàñòðîåê ïåðåéäèòå ê çàêëàäêå MySQL.";
+ 		Text[ spanish ] = "Vaya a la ficha MySQL para realizar la configuración.";
+-		Text[ italian ] = "Per corregere le impostazioni andate alla scheda MySQL.";
++		Text[ italian ] = "Per correggere le impostazioni andate alla scheda MySQL.";
+ 		Text[ swedish ] = "Gå till MySQL-fliken för att göra inställningarna.";
+ 		Text[ polish ] = "To adjust the settings, go to the MySQL tab page.";
+ 		Text[ portuguese_brazilian ] = "Para ajustar as configurações, vá para a página da guia MySQL.";
+@@ -5255,7 +5255,7 @@
+ 	Message[ dutch ] = "De naam van de gewiste gegevensbron heeft u reeds gebruikt voor een andere bron! Wilt u de gewiste gegevensbron weer herstellen, dan moet u eerst de naam van de andere bron wijzigen.";
+ 	Message[ french ] = "Le nom de la source de données supprimée a déjà été attribué à une autre source que vous devez commencer par renommer afin de pouvoir restaurer l'ancienne.";
+ 	Message[ spanish ] = "El nombre de la fuente de datos borrada se ha asignado ya a otra fuente. Deberá cambiarle el nombre para poder restaurar la antigua fuente de datos.";
+-	Message[ italian ] = "Il nome della sorgente dati eliiminata è già stato attribuito a un'altra. Prima di procedere, è necessario cambiare nome alla seconda sorgente dati prima di poter ripristinare quella eliminata.";
++	Message[ italian ] = "Il nome della sorgente dati eliminata è già stato attribuito a un'altra. Prima di procedere, è necessario cambiare nome alla seconda sorgente dati prima di poter ripristinare quella eliminata.";
+ 	Message[ danish ] = "Du har allerede givet en anden datakilde den slettede datakildes navn! Du skal omdøbe den første datakilde for at kunne gendanne den aktuelle.";
+ 	Message[ swedish ] = "Du har redan gett namnet på den raderade datakällan till en annan datakälla! Du måste byta namn på den andra datakällan för att kunna återställa den aktuella datakällan.";
+ 	Message[ polish ] = "Nazwa usuniêtego Ÿród³a danych zosta³a przypisana innemu Ÿród³u danych. Aby mo¿na by³o przywróciæ usuniête Ÿród³o danych, nale¿y zmieniæ nazwê tego drugiego.";
+--- dbaccess/source/ui/dlg/AdabasPage.src.lang39	2004-09-09 18:23:40.000000000 +0200
++++ dbaccess/source/ui/dlg/AdabasPage.src	2004-09-13 09:20:14.304832247 +0200
+@@ -87,7 +87,7 @@
+ 		Text[ dutch ] = "~Grootte gegevensbuffer (MB)";
+ 		Text[ french ] = "~Taille du tampon de données (Mo)";
+ 		Text[ spanish ] = "Tamaño de la ~memoria intermedia (MB):";
+-		Text[ italian ] = "Dimensione tamponamento dei dati (MB):";
++		Text[ italian ] = "Dimensione buffer dati (MB):";
+ 		Text[ danish ] = "Data~bufferstørrelse (MB)";
+ 		Text[ swedish ] = "Datab~uffertstorlek (MB):";
+ 		Text[ polish ] = "WielkoϾ ~bufora danych (MB)";
+--- desktop/source/app/desktop.src.lang39	2004-09-09 18:58:53.000000000 +0200
++++ desktop/source/app/desktop.src	2004-09-13 09:20:14.325832666 +0200
+@@ -265,7 +265,7 @@
+ 	Message[ french ] = "%PRODUCTNAME %PRODUCTVERSION n'a pas pu lancer le Setup de Java. Quittez %PRODUCTNAME et démarrez le Setup de %PRODUCTNAME %PRODUCTVERSION. Choisissez 'Réparation'.";
+ 	Message[ spanish ] = "%PRODUCTNAME %PRODUCTVERSION no pudo iniciar el programa de instalación de Java. Cierre %PRODUCTNAME e inicie el programa de instalación de %PRODUCTNAME %PRODUCTVERSION. Seleccione 'Reparar'.";
+ 	Message[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION could not start the Java Setup. Exit %PRODUCTNAME and start the %PRODUCTNAME %PRODUCTVERSION Setup. Choose 'Repair'.";
+-	Message[ italian ] = "%PRODUCTNAME %PRODUCTVERSION non è riuscito ad avviare l'installazione di Java. Chiudete %PRODUCTNAME e avviate il programma di installazione di %PRODUCTNAME %PRODUCTVERSION. Sceliete l'opzione 'Riparazione'.";
++	Message[ italian ] = "%PRODUCTNAME %PRODUCTVERSION non è riuscito ad avviare l'installazione di Java. Chiudete %PRODUCTNAME e avviate il programma di installazione di %PRODUCTNAME %PRODUCTVERSION. Scegliete l'opzione 'Riparazione'.";
+ 	Message[ danish ] = "%PRODUCTNAME %PRODUCTVERSION kunne ikke starte Java-installationen. Afslut %PRODUCTNAME og start installationsprogrammet for %PRODUCTNAME %PRODUCTVERSION. Vælg 'Reparer'.";
+ 	Message[ swedish ] = "%PRODUCTNAME %PRODUCTVERSION kunde inte starta Java Setup. Avsluta %PRODUCTNAME och starta %PRODUCTNAME %PRODUCTVERSION Setup. Välj 'Reparera'.";
+ 	Message[ polish ] = "%PRODUCTNAME %PRODUCTVERSION could not start the Java Setup. Exit %PRODUCTNAME and start the %PRODUCTNAME %PRODUCTVERSION Setup. Choose 'Repair'.";
+@@ -1379,7 +1379,7 @@
+ 	Text[ french ] = "Impossible d'établir une connexion à la configuration centrale ! ";
+ 	Text[ spanish ] = "No se ha podido establecer ninguna conexión con la configuración central. ";
+ 	Text[ finnish ] = "A connection to the central configuration could not be established. ";
+-	Text[ italian ] = "impossibile realizzare un colleamento con la configurazione centrale. ";
++	Text[ italian ] = "impossibile realizzare un collegamento con la configurazione centrale. ";
+ 	Text[ danish ] = "Der kunne ikke oprettes forbindelse til den centrale konfiguration. ";
+ 	Text[ swedish ] = "Det gick inte att koppla till den centrala konfigurationen. ";
+ 	Text[ polish ] = "A connection to the central configuration could not be established. ";
+@@ -1751,7 +1751,7 @@
+ 	Text[ french ] = "Configuration défectueuse de java.ini";
+ 	Text[ spanish ] = "Configuración defectuosa de java.ini ";
+ 	Text[ finnish ] = "Defective java.ini Configuration";
+-	Text[ italian ] = "Configurazione difettossa di java.ini";
++	Text[ italian ] = "Configurazione difettosa di java.ini";
+ 	Text[ danish ] = "Defekt konfiguration af java.ini";
+ 	Text[ swedish ] = "Felaktig java.ini-konfiguration";
+ 	Text[ polish ] = "Defective java.ini Configuration";
+@@ -2069,7 +2069,7 @@
+ 	Text[ portuguese ] = "The following internal error has occured: ";
+ 	Text[ russian ] = "The following internal error has occured: ";
+ 	Text[ spanish ] = "Se ha producido el error interno siguiente: ";
+-	Text[ italian ] = "Si è verficato il seguente errore interno: ";
++	Text[ italian ] = "Si è verificato il seguente errore interno: ";
+ 	Text[ swedish ] = "Följande interna fel har uppstått: ";
+ 	Text[ polish ] = "The following internal error has occured: ";
+ 	Text[ portuguese_brazilian ] = "O seguinte erro interno ocorreu: ";
+--- extensions/source/dbimport/importdialog.src.lang39	2004-09-09 18:32:25.000000000 +0200
++++ extensions/source/dbimport/importdialog.src	2004-09-13 09:20:14.644839029 +0200
+@@ -2905,7 +2905,7 @@
+ 	Text[ dutch ] = "Fout bij toegang tot $path$.";
+ 	Text[ french ] = "Erreur d'accès à $path$.";
+ 	Text[ spanish ] = "Error al acceder a $path$.";
+-	Text[ italian ] = "Impossibile acedere a $path$.";
++	Text[ italian ] = "Impossibile accedere a $path$.";
+ 	Text[ danish ] = "Der opstod en fejl, da du forsøgte at få adgang til $path$.";
+ 	Text[ swedish ] = "Åtkomst till $path$ är inte möjlig.";
+ 	Text[ polish ] = "B³¹d dostêpu do $path$.";
+@@ -3136,7 +3136,7 @@
+ 	Text[ dutch ] = "Document $name$ kan niet worden geladen.\nDe naam van de gegevensbron die gebruikt wordt voor het formulier kan niet worden aangepast. U kunt deze handmatig aanpassen.";
+ 	Text[ french ] = "Impossible de charger le document $name$ !\nIl n'a pas été possible d'ajuster le nom de la source de données avec lequel le formulaire travaille, si bien que vous devrez éventuellement le faire manuellement.";
+ 	Text[ spanish ] = "No se pudo cargar el documento $name$.\nEl nombre de la fuente de datos con el que trabaja el formulario no se pudo ajustar, por lo que quizás deberá hacerlo a mano.";
+-	Text[ italian ] = "Impossibile caricare il documento $name$.\nImpossibile adattare il nome della sorgente dati utilizzata dal formulario per questo è necesario effettuare l'operazione manualmente.";
++	Text[ italian ] = "Impossibile caricare il documento $name$.\nImpossibile adattare il nome della sorgente dati utilizzata dal formulario per questo è necessario effettuare l'operazione manualmente.";
+ 	Text[ danish ] = "Dokumentet $name$ kunne ikke indlæses.\nNavnet på den datakilde, som formularen arbejder med, kunne ikke tilpasses. Det skal du eventuelt gøre manuelt på et senere tidspunkt.";
+ 	Text[ swedish ] = "Det gick inte att ladda dokumentet $name$.\nDet gick inte att anpassa namnet på datakällan som formuläret arbetar med, så eventuellt måste du göra detta manuellt i efterhand.";
+ 	Text[ polish ] = "Za³adowanie dokumentu $name$ nie by³o mo¿liwe.\nNie uda³o siê dopasowaæ nazwy Ÿród³a danych, z którym wspó³pracuje formularz. Byæ mo¿e trzeba to bêdzie zrobiæ samodzielnie.";
+--- extensions/source/dbpilots/listcombopages.src.lang39	2004-09-09 18:33:33.000000000 +0200
++++ extensions/source/dbpilots/listcombopages.src	2004-09-13 09:20:14.646839069 +0200
+@@ -391,7 +391,7 @@
+ 		Text [ dutch ] = "De inhoud van het geselecteerde veld wordt in de lijst onder het combinatieveld weergegeven.";
+ 		Text [ french ] = "Le contenu du champ sélectionné sera affiché dans la liste de la zone combinée.";
+ 		Text [ spanish ] = "El contenido del campo seleccionado se mostrará en la lista del cuadro combinado.";
+-		Text [ italian ] = "Il contenuto del campo selezionto viene mostrato nell'elenco della casella combinata.";
++		Text [ italian ] = "Il contenuto del campo selezionato viene mostrato nell'elenco della casella combinata.";
+ 		Text [ danish ] = "Indholdet af det valgte felt vises på kombinationsfeltets liste.";
+ 		Text [ swedish ] = "Innehållet i det utvalda fältet visas i kombinationsfältets lista.";
+ 		Text [ polish ] = "Zawartoœæ wybranego pola zostanie wyœwietlona na liœcie pola kombi.";
+--- offmgr/source/offapp/dialog/internationaloptions.src.lang39	2004-09-09 17:54:10.000000000 +0200
++++ offmgr/source/offapp/dialog/internationaloptions.src	2004-09-13 09:20:14.292832008 +0200
+@@ -329,7 +329,7 @@
+ 		Text[ french ] = "Uniquement pour le document actif";
+ 		Text[ spanish ] = "~Sólo para el documento actual";
+ 		Text[ finnish ] = "~Current document only";
+-		Text[ italian ] = "Solo per il docuemnto attivo";
++		Text[ italian ] = "Solo per il documento attivo";
+ 		Text[ danish ] = "~Kun for nuværende dokument";
+ 		Text[ swedish ] = "Bara för ~aktuellt dokument";
+ 		Text[ polish ] = "~Current document only";
+--- padmin/source/padialog.src.lang39	2004-09-09 18:58:00.000000000 +0200
++++ padmin/source/padialog.src	2004-09-13 09:20:14.653839209 +0200
+@@ -572,7 +572,7 @@
+ 		Text[ dutch ] = "Het lettertype wordt niet geïnstalleerd omdat het lettertypenbestand \n %s\n niet kan worden gekopieerd."; \
+ 		Text[ french ] = "Copie du fichier de police\n   %s\n impossible, donc impossibilité d'installer la police !"; \
+ 		Text[ spanish ] = "No se pudo copiar el archivo de fuente\n   %s\n, por lo que no se instalará la fuente."; \
+-		Text[ italian ] = "Impossibile compiare il file del tipo di carattere\n   %s\n. Il tipo di carattere non è stato installato."; \
++		Text[ italian ] = "Impossibile copiare il file del tipo di carattere\n   %s\n. Il tipo di carattere non è stato installato."; \
+ 		Text[ danish ] = "Skrifttypefilen\n   %s\nkunne ikke kopieres. Skrifttypen bliver ikke installeret."; \
+ 		Text[ swedish ] = "Det gick inte att kopiera teckensnittsfilen\n   %s\n. Teckensnittet installeras inte."; \
+ 		Text[ polish ] = "Skopiowanie pliku czcionki\n   %s\nnie by³o mo¿liwe. Czcionka nie zostanie zainstalowana."; \
+@@ -3938,7 +3938,7 @@
+ 	Text[ dutch ] = "Printer \"%s\" kan niet worden geïmporteerd omdat deze geen geldige configuratie heeft."; \
+ 	Text[ french ] = "L'imprimante \"%s\" n'a pas été correctement configurée et ne peut donc pas être importée."; \
+ 	Text[ spanish ] = "La impresora \"%s\" no está correctamente configurada, por lo que no se puede importar."; \
+-	Text[ italian ] = "La stampante \"%s\" ha una configuraziopne non valida e per questo non puó essere importata."; \
++	Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non puó essere importata."; \
+ 	Text[ danish ] = "Printeren \"%s\" har ingen gyldig konfiguration og kan derfor ikke importeres."; \
+ 	Text[ swedish ] = "Det går inte att importera skrivaren \"%s\" eftersom den inte är fullständigt konfigurerad."; \
+ 	Text[ polish ] = "Drukarki \"%s\" nie mo¿na importowaæ, poniewa¿ nie zosta³a prawid³owo skonfigurowana."; \
+@@ -4636,7 +4636,7 @@
+ 		Text[ french ] = "Connecter un périphérique fax";
+ 		Text[ spanish ] = "Conectar a un fa~x";
+ 		Text[ finnish ] = "Kytke ~faksilaite";
+-		Text[ italian ] = "Aggingi un fa~x";
++		Text[ italian ] = "Aggiungi un fa~x";
+ 		Text[ danish ] = "Forbind en fa~xenhed";
+ 		Text[ swedish ] = "Anslut en fa~xlösning";
+ 		Text[ polish ] = "Pod³¹cz ~faks";
+@@ -5773,7 +5773,7 @@
+ 		Text[ dutch ] = "een speciale ~driver voor het aanpassen van de opmaakattributen aan die van een andere printer";
+ 		Text[ french ] = "Pilote spécifique pour adaptation du formatage à une autre imprimante";
+ 		Text[ spanish ] = "~Controlador específico para adaptar el formato a otra impresora";
+-		Text[ italian ] = "un driver specifico per adattare la formattazione a un'altra stamapante";
++		Text[ italian ] = "un driver specifico per adattare la formattazione a un'altra stampante";
+ 		Text[ danish ] = "en bestemt ~driver for at tilpasse formateringen til en anden printer";
+ 		Text[ swedish ] = "en specifik drivru~tin för att anpassa formateringen till en annan skrivare";
+ 		Text[ polish ] = "~Specjalny sterownik dostosowuj¹cy format do wymagañ innej drukarki";
+--- padmin/source/rtsetup.src.lang39	2004-09-09 18:58:14.000000000 +0200
++++ padmin/source/rtsetup.src	2004-09-13 09:20:14.656839268 +0200
+@@ -1353,7 +1353,7 @@
+ 		Text[ dutch ] = "door ~printerlettertype";
+ 		Text[ french ] = "Par la police d'~imprimante";
+ 		Text[ spanish ] = "por la ~fuente de la impresora";
+-		Text[ italian ] = "da caratteri della stamapante";
++		Text[ italian ] = "da caratteri della stampante";
+ 		Text[ danish ] = "med ~printerskrifttype";
+ 		Text[ swedish ] = "med s~krivarteckensnitt";
+ 		Text[ polish ] = "na czcionkê ~drukarki";
+--- sc/addin/datefunc/dfa.src.lang39	2004-09-09 20:00:40.000000000 +0200
++++ sc/addin/datefunc/dfa.src	2004-09-13 09:20:14.518836516 +0200
+@@ -1267,7 +1267,7 @@
+ 		Text[ dutch ] = "Geeft als resultaat het aantal dagen in een jaar bij een bepaalde datum";
+ 		Text[ french ] = "Renvoie le nombre de jours dans l'année en relation avec la date indiquée.";
+ 		Text[ spanish ] = "Devuelve el número de días del año en relación a la fecha introducida. ";
+-		Text[ italian ] = "Restituisce il numero dei giorni dell'anno per una deteminata data";
++		Text[ italian ] = "Restituisce il numero dei giorni dell'anno per una determinata data";
+ 		Text[ danish ] = "Returnerer antal dage i det angivne år";
+ 		Text[ swedish ] = "Bestämmer antalet dagar i året till ett datum";
+ 		Text[ polish ] = "Zwraca liczbê dni w roku w odniesieniu do podanej daty";
+--- sc/source/ui/src/globstr.src.lang39	2004-09-09 20:08:16.000000000 +0200
++++ sc/source/ui/src/globstr.src	2004-09-13 09:20:14.536836875 +0200
+@@ -4064,7 +4064,7 @@
+ 		Text = "Der Bereich enthält keine Spaltenköpfe.\nSoll die erste Zeile als Spaltenköpfe verwendet werden?" ;
+ 		Text [ ENGLISH ] = "This area does not contain column headers.\nUse the first line as column headers?" ; \
+ 		Text [ norwegian ] = "Dette området inneholder ingen kolonneoverskrifter.\nVil du bruke den første linja som overskrift?" ; \
+-		Text [ italian ] = "L' area non contiene intestazioni per le colonne.\nUsare la prima riga come intestazione colonna?" ; \
++		Text [ italian ] = "L'area non contiene intestazioni per le colonne.\nUsare la prima riga come intestazione colonna?" ; \
+ 		Text [ portuguese_brazilian ] = "O intervalo não contém cabeçalhos de colunas.\nDeseja utilizar a primeira linha como cabeçalho de coluna?" ; \
+ 		Text [ portuguese ] = "Esta área não contém cabeçalhos de colunas.\nUtilizar a primeira linha como cabeçalho de coluna?" ; \
+ 		Text [ finnish ] = "Alue ei sisällä sarakeotsikoita.\nHaluatko ensimmäistä riviä käytettävän sarakeotsikkona?" ; \
+@@ -5698,7 +5698,7 @@
+ 		Text [ ENGLISH ] = "Error creating the Data Pilot Table." ;
+ 		Text [ dutch ] = "Fout bij het maken van DataPiloot-tabel" ;
+ 		Text [ english_us ] = "Error creating the Data Pilot Table." ;
+-		Text [ italian ] = "Erore nella creazione della tabella DataPilot" ;
++		Text [ italian ] = "Errore nella creazione della tabella DataPilot" ;
+ 		Text [ spanish ] = "Error al crear la tabla del Piloto de Datos." ;
+ 		Text [ french ] = "Erreur lors de la création de la table du pilote de données" ;
+ 		Text [ swedish ] = "Fel när Datapilot-tabell skapades." ;
+@@ -6825,7 +6825,7 @@
+ 		Text = "Dieser Bereich wurde bereits eingefügt." ;
+ 		Text [ ENGLISH ] = "This area already has been inserted." ;
+ 		Text [ norwegian ] = "Dette området er alt satt inn." ;
+-		Text [ italian ] = "Ques'area è già stata inserita." ;
++		Text [ italian ] = "Quest'area è già stata inserita." ;
+ 		Text [ portuguese_brazilian ] = "Este intervalo já foi inserido." ;
+ 		Text [ portuguese ] = "Esta área já foi inserida." ;
+ 		Text [ finnish ] = "Tämä alue on jo lisätty." ;
+@@ -12581,7 +12581,7 @@
+ 		Text [ ENGLISH ] = "Hide table" ;
+ 		Text [ dutch ] = "Werkblad verbergen" ;
+ 		Text [ english_us ] = "Hide sheet" ;
+-		Text [ italian ] = "Nacondi la tabella" ;
++		Text [ italian ] = "Nascondi la tabella" ;
+ 		Text [ spanish ] = "Ocultar hoja" ;
+ 		Text [ french ] = "Masquer feuille" ;
+ 		Text [ swedish ] = "Dölj tabell" ;
+--- sc/source/ui/src/scstring.src.lang39	2004-09-09 20:12:14.000000000 +0200
++++ sc/source/ui/src/scstring.src	2004-09-13 09:20:14.542836994 +0200
+@@ -5158,7 +5158,7 @@
+ 	Text[ french ] = "Les cellules dans lesquelles vous voulez insérer des données contiennent déjà des données.\nÉcraser les données existantes ?"; \
+ 	Text[ spanish ] = "Las celdas en las que quiere insertar datos ya contienen datos.\n¿Desea sobrescribir los datos existentes?"; \
+ 	Text[ finnish ] = "Do you want to replace the contents of the destination cells?"; \
+-	Text[ italian ] = "Le celle in cui volete inserire i dati contengono già dei dati.\nVolete soprascriverli?"; \
++	Text[ italian ] = "Le celle in cui volete inserire i dati contengono già dei dati.\nVolete sovrascriverli?"; \
+ 	Text[ danish ] = "Du er ved at indsætte data i celler, der allerede indeholder data.\nEr du sikker på, at du vil overskrive eksisterende data?"; \
+ 	Text[ swedish ] = "Cellerna som du vill klistra in data i innehåller redan data.\nVill du verkligen skriva över dessa data?"; \
+ 	Text[ polish ] = "Do you want to replace the contents of the destination cells?"; \
+--- scaddins/source/analysis/analysis.src.lang39	2004-09-09 18:35:41.000000000 +0200
++++ scaddins/source/analysis/analysis.src	2004-09-13 09:20:14.571837573 +0200
+@@ -3011,7 +3011,7 @@
+ 			Text[ french ] = "Multiple auquel arrondir le nombre.";
+ 			Text[ spanish ] = "El valor al cual se desea redondear.";
+ 			Text[ finnish ] = "Luvun pyöristystarkkuus";
+-			Text[ italian ] = "Il multilpo a cui arrotondare il valore.";
++			Text[ italian ] = "Il multiplo a cui arrotondare il valore.";
+ 			Text[ danish ] = "Værdien, hvis multiplum der skal afrundes til.";
+ 			Text[ swedish ] = "Värdet vars multipel talet ska avrundas till.";
+ 			Text[ polish ] = "Wielokrotnoœæ, do której nale¿y zaokr¹gliæ liczbê.";
+@@ -6187,7 +6187,7 @@
+ 			Text[ french ] = "Nombre décimal";
+ 			Text[ spanish ] = "Número decimal";
+ 			Text[ finnish ] = "Muunnettava desimaaliluku";
+-			Text[ italian ] = "Numero deciamle";
++			Text[ italian ] = "Numero decimale";
+ 			Text[ danish ] = "Det decimaltal der skal konverteres";
+ 			Text[ swedish ] = "Decimaltal";
+ 			Text[ polish ] = "Liczba dziesiêtna do konwersji.";
+--- sch/source/core/glob.src.lang39	2004-09-09 19:16:31.000000000 +0200
++++ sch/source/core/glob.src	2004-09-13 09:20:14.374833643 +0200
+@@ -669,7 +669,7 @@
+ 	Text [ ENGLISH ] = "Negative and Zero-Values cannot be shown logarithmic." ;
+ 	Text [ dutch ] = "Negatieve waarden en nul-waarden kunnen niet logaritmisch worden weergegeven." ;
+ 	Text [ english_us ] = "Negative and zero values cannot be logarithmicaly portrayed." ;
+-	Text [ italian ] = "Valori nulli e negativi non possono essere rappresentati logaritmamente." ;
++	Text [ italian ] = "Valori nulli e negativi non possono essere rappresentati logaritmicamente." ;
+ 	Text [ spanish ] = "No es posible representar logarítmicamente valores cero o valores negativos." ;
+ 	Text [ french ] = "Valeurs négatives et valeurs zéro ne peuvent être affichées sous forme de logarithme" ;
+ 	Text [ swedish ] = "Negativa värden och nollvärden kan inte visas logaritmiskt." ;
+--- sch/source/ui/app/strings.src.lang39	2004-09-09 19:17:35.000000000 +0200
++++ sch/source/ui/app/strings.src	2004-09-13 09:20:14.381833783 +0200
+@@ -891,7 +891,7 @@
+ 	Text [ ENGLISH ] = "Normal with lines" ;
+ 	Text [ dutch ] = "Normaal met lijnen" ;
+ 	Text [ english_us ] = "Normal with lines" ;
+-	Text [ italian ] = "Normale con liee" ;
++	Text [ italian ] = "Normale con linee" ;
+ 	Text [ spanish ] = "Normal con líneas" ;
+ 	Text [ french ] = "Normal avec lignes" ;
+ 	Text [ swedish ] = "Normal med linjer" ;
+--- sd/sdi/sdslots.src.lang39	2004-09-09 19:05:04.000000000 +0200
++++ sd/sdi/sdslots.src	2004-09-13 09:20:14.338832925 +0200
+@@ -4949,7 +4949,7 @@
+ 	SlotName[ dutch ] = "Plakpunt verticaal gecentreerd";
+ 	SlotName[ french ] = "Point de collage verticalement centré";
+ 	SlotName[ spanish ] = "Punto de adhesión vertical centro";
+-	SlotName[ italian ] = "Punto di incollaggio cetrato in verticale";
++	SlotName[ italian ] = "Punto di incollaggio centrato in verticale";
+ 	SlotName[ danish ] = "Klæbepunkt lodret centreret";
+ 	SlotName[ swedish ] = "Fästpunkt vertikalt centrerat";
+ 	SlotName[ polish ] = "Punkt sklejenia poœrodku w pionie";
+@@ -6080,7 +6080,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijl-/cirkeluiteinde";
+ 	SlotName[ french ] = "Ligne avec flèche/cercle";
+ 	SlotName[ spanish ] = "Línea con flecha/círculo al final";
+-	SlotName[ italian ] = "Linea con cerchio/freccia teminale";
++	SlotName[ italian ] = "Linea con cerchio/freccia terminale";
+ 	SlotName[ danish ] = "Streg med pilespids/cirkel";
+ 	SlotName[ swedish ] = "Linje med pil-/cirkelslut";
+ 	SlotName[ polish ] = "Linia ze strza³k¹-kó³kiem";
+@@ -6127,7 +6127,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijluiteinde";
+ 	SlotName[ french ] = "Ligne avec flèche à la fin";
+ 	SlotName[ spanish ] = "Línea con flecha al final";
+-	SlotName[ italian ] = "Linea con freccia teminale";
++	SlotName[ italian ] = "Linea con freccia terminale";
+ 	SlotName[ danish ] = "Streg med pilespids";
+ 	SlotName[ swedish ] = "Linje med pilslut";
+ 	SlotName[ polish ] = "Linia ze strza³k¹ na koñcu";
+@@ -6174,7 +6174,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijl-/vierkantuiteinde";
+ 	SlotName[ french ] = "Ligne avec flèche/carré";
+ 	SlotName[ spanish ] = "Línea con flecha/cuadrado al final";
+-	SlotName[ italian ] = "Linea con freccia/quadrato teminale";
++	SlotName[ italian ] = "Linea con freccia/quadrato terminale";
+ 	SlotName[ danish ] = "Streg med pilespids/kvadrat";
+ 	SlotName[ swedish ] = "Linje med pil-/kvadratslut";
+ 	SlotName[ polish ] = "Linia ze strza³k¹-kwadratem";
+@@ -6268,7 +6268,7 @@
+ 	SlotName[ dutch ] = "Lijn met pijluiteinden";
+ 	SlotName[ french ] = "Ligne avec flèches";
+ 	SlotName[ spanish ] = "Línea con puntas de flechas";
+-	SlotName[ italian ] = "Linea con frecce teminale";
++	SlotName[ italian ] = "Linea con frecce terminali";
+ 	SlotName[ danish ] = "Streg med pilespidser";
+ 	SlotName[ swedish ] = "Linje med pilslut";
+ 	SlotName[ polish ] = "Linia ze strza³kami";
+@@ -6694,7 +6694,7 @@
+ 	SlotName[ dutch ] = "Paginalay-out wijzigen...";
+ 	SlotName[ french ] = "Modifier la mise en page...";
+ 	SlotName[ spanish ] = "Modificar diseño de diapositiva...";
+-	SlotName[ italian ] = "Modifica layout di dispositiva...";
++	SlotName[ italian ] = "Modifica layout di diapositiva...";
+ 	SlotName[ danish ] = "Modificer diaslayout...";
+ 	SlotName[ swedish ] = "Ändra sidlayout...";
+ 	SlotName[ polish ] = "Modyfikuj uk³ad slajdu...";
+--- sd/source/ui/app/menuids.src.lang39	2004-09-09 19:06:17.000000000 +0200
++++ sd/source/ui/app/menuids.src	2004-09-13 09:20:14.346833085 +0200
+@@ -5067,7 +5067,7 @@
+         Text [ english_us ] = "Fixed Ver~tical Bottom" ; \
+         Text [ swedish ] = "Fixerad vertikalt ~nederkant" ; \
+         Text [ danish ] = "Fikseret lodret bund" ; \
+-        Text [ italian ] = "Fissato vertcalmente in ~basso" ; \
++        Text [ italian ] = "Fissato verticalmente in ~basso" ; \
+         Text [ spanish ] = "Fijado abajo ~verticalmente" ; \
+         Text [ french ] = "Fixé verticalement en bas" ; \
+         Text [ portuguese_brazilian ] = "Inferior Ver~tical Fixo" ; \
+--- sd/source/ui/app/sdstring.src.lang39	2004-09-09 19:07:57.000000000 +0200
++++ sd/source/ui/app/sdstring.src	2004-09-13 09:20:14.348833125 +0200
+@@ -569,7 +569,7 @@
+ 	Text = "Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen." ;
+ 	Text [ ENGLISH ] = "The bitmap was modified without save. You can modify the selected bitmap or add a new bitmap" ;
+ 	Text [ norwegian ] = "Bildet ble endret uten at det ble lagret. \nDu kan endre det valgte bildet\neller legge til et nytt." ; \
+-	Text [ italian ] = "La bitmap è stata modificata senza esseere salvata.\nPotete modificare la bitmap selezionata o aggiungerne una nuova." ; \
++	Text [ italian ] = "La bitmap è stata modificata senza essere salvata.\nPotete modificare la bitmap selezionata o aggiungerne una nuova." ; \
+ 	Text [ portuguese_brazilian ] = "O bitmap foi modificado sem ser salvo. \nVocê pode modificar o bitmap selecionado \\ou adicionar um novo." ; \
+ 	Text [ portuguese ] = "As modificações feitas no bitmap não foram guardadas. Poderá alterar o \nbitmap seleccionado ou adicionar um novo bitmap." ; \
+ 	Text [ finnish ] = "Bittikarttaa ei tallennettu muokkauksen jälkeen. \nVoit vaihtaa valitun bittikartan tai lisätä uuden." ; \
+--- sd/source/ui/app/strings.src.lang39	2004-09-09 19:08:22.000000000 +0200
++++ sd/source/ui/app/strings.src	2004-09-13 09:20:14.370833564 +0200
+@@ -7357,7 +7357,7 @@
+ 	Text [ ENGLISH ] = "The object name allready exists. Please choose another one" ;
+ 	Text [ dutch ] = "De objectnaam bestaat reeds. Typ een andere naam." ;
+ 	Text [ english_us ] = "The object name already exists. Please enter another name." ;
+-	Text [ italian ] = "Il nume dell'oggetto esiste già. Digitarne un altro." ;
++	Text [ italian ] = "Il nome dell'oggetto esiste già. Digitarne un altro." ;
+ 	Text [ spanish ] = "El nombre del objeto ya existe. Por favor escriba otro nombre." ;
+ 	Text [ french ] = "Le nom de cet objet existe déjà. Veuillez entrer un autre nom." ;
+ 	Text [ swedish ] = "Objektnamnet finns redan. Mata in ett annat namn" ;
+@@ -9803,7 +9803,7 @@
+ 	Text = "Diese Aktion löscht die Seite '$'. \nDie Seite enthält Zeichenobjekte!" ;
+ 	Text [ ENGLISH ] = "This action deletes the page '$'. \nThe page contains drawing objects!" ;
+ 	Text [ english_us ] = "This action deletes the page '$'. \nNote: the page contains drawing objects!" ;
+-	Text [ italian ] = "Tale operazione elimina la pagina $. \nLa paginacontiene oggetti di disegno!" ;
++	Text [ italian ] = "Tale operazione elimina la pagina $. \nLa pagina contiene oggetti di disegno!" ;
+ 	Text [ spanish ] = "Esta acción borrará la página $. \n¡La página contiene objetos de dibujo!" ;
+ 	Text [ french ] = "Cette opération supprime la page '$'. \nCette page contient des objets de dessin !" ;
+ 	Text [ dutch ] = "Door deze handeling wordt pagina '$' verwijderd.\nDeze pagina bevat tekenobjecten!" ;
+@@ -9966,7 +9966,7 @@
+ 		Text[ french ] = "Cette action supprime la liste des opérations pouvant\nêtre annulées. Ceci n'affecte pas les modifications\napportées au document, mais empêche de les annuler.\nVoulez-vous poursuivre et assigner\nle nouveau style de page ?";
+ 		Text[ spanish ] = "Esta orden borra la lista de los pasos que se\npuedan deshacer. En el documento se conservarán las modificaciones\nrealizadas hasta ahora, pero no se podrán\ndeshacer más. ¿Desea continuar y asignar el nuevo\ndiseño de diapositiva?";
+ 		Text[ finnish ] = "Tämä toiminto poistaa toimintojen luettelon,\neikä sitä voi kumota. Edelliset asiakirjaan tehdyt muutokset ovat yhä voimassa,\nmutta niitä ei voi kumota. Haluatko jatkaa ja\nmäärittää uuden diarakenteen?";
+-		Text[ italian ] = "Quest'azione elimina l'elenco delle fasi di lavoro da annullare./nLa modifiche effettuate fino a questo momento rimangono inalterate/nma non si possono più annullare. Volete proseguire/ne assegnare il nuovo modello di diapositiva?";
++		Text[ italian ] = "Quest'azione elimina l'elenco delle fasi di lavoro da annullare./nLe modifiche effettuate fino a questo momento rimangono inalterate/nma non si possono più annullare. Volete proseguire/ne assegnare il nuovo modello di diapositiva?";
+ 		Text[ danish ] = "Denne handling sletter listen over arbejdstrin, som kan fortrydes.\nTidligere ændringer i dokumentet bibeholdes, men kan ikke længere fortrydes.\nVil du fortsætte og tilføje det nye diasdesign?";
+ 		Text[ swedish ] = "Den här åtgärden raderar listan med arbetssteg som\ngår att ångra. Ändringar som har\ngjorts hittills i dokumentet finns kvar men går\ninte att ångra längre. Vill du fortsätta\noch tilldela den nya sidformatmallen?";
+ 		Text[ polish ] = "W wyniku tej akcji zostanie usuniêta lista operacji, które\nmo¿na cofn¹æ. Zmiany dokonane\nw dokumencie zostan¹ zachowane, nie mo¿na\nich jednak cofn¹æ. Czy chcesz kontynuowaæ\ni tym samym przypisaæ nowy uk³ad slajdu?";
+@@ -10380,7 +10380,7 @@
+ 	Text = "Diese Grafik ist mit dem Dokument verknüpft. \nMöchten Sie die Verknüpfung aufheben, um die Grafik zu bearbeiten?" ;
+ 	Text [ English ] = "This is a linked graphic. \nDo you want to unlink the graphic in order to edit the graphic?" ;
+ 	Text [ norwegian ] = "Denne grafikken er koblet til et dokument. \nVil du fjerne tilkoblingen til dokumentet slik at du kan redigere bildet?" ;
+-	Text [ italian ] = "Questra immagine è collegata con il documento. \nDesiderate scollegare l'immagine per poterla modificare?" ;
++	Text [ italian ] = "Questa immagine è collegata con il documento. \nDesiderate scollegare l'immagine per poterla modificare?" ;
+ 	Text [ portuguese_brazilian ] = "Esta figura esta vinculada a um documento. \nDeseja desvincular a figura para que seja possível editá-la?" ;
+ 	Text [ portuguese ] = "Esta imagem está ligada ao documento. \nRemover a ligação para editar a imagem?" ;
+ 	Text [ english_us ] = "This graphic is linked to a document. \nDo you want to unlink the graphic in order to edit it?" ;
+@@ -10562,7 +10562,7 @@
+ 	Text = "Die Version der Grafikdatei wird nicht unterstützt" ;
+ 	Text [ ENGLISH ] = "Version of graphic file not supported" ;
+ 	Text [ english_us ] = "This graphics file version is not supported" ;
+-	Text [ italian ] = "La verione del file grafico non è supportata" ;
++	Text [ italian ] = "La versione del file grafico non è supportata" ;
+ 	Text [ spanish ] = "La versión del archivo gráfico no se admite" ;
+ 	Text [ french ] = "La version du fichier graphique n'est pas supportée" ;
+ 	Text [ dutch ] = "Deze versie van het grafische bestand wordt niet ondersteund" ;
+@@ -11700,7 +11700,7 @@
+ 	Text = "Originalgröße" ;
+ 	Text [ ENGLISH ] = "Real Size" ;
+ 	Text [ norwegian ] = "Opprinnelig størrelse" ;
+-	Text [ italian ] = "Dimensione orginale" ;
++	Text [ italian ] = "Dimensione originale" ;
+ 	Text [ portuguese_brazilian ] = "Tamanho Original" ;
+ 	Text [ portuguese ] = "Tamanho real" ;
+ 	Text [ finnish ] = "Alkuperäinen koko" ;
+@@ -14549,7 +14549,7 @@
+ 	Text = "Schlangenlinie von links" ;
+ 	Text [ ENGLISH ] = "Wavyline from left" ;
+ 	Text [ english_us ] = "Wavy Line From Left" ;
+-	Text [ italian ] = "Serpentina da sinsitra" ;
++	Text [ italian ] = "Serpentina da sinistra" ;
+ 	Text [ spanish ] = "Serpentina desde la izquierda" ;
+ 	Text [ french ] = "Ligne ondulée à partir de la gauche" ;
+ 	Text [ dutch ] = "Slangenlijn van links" ;
+@@ -20399,7 +20399,7 @@
+ 	Text [ portuguese_brazilian ] = "Deseja adicionar o som à Galeria?" ;
+ 	Text [ swedish ] = "Vill du lägga till ljudet till Gallery-temat?" ;
+ 	Text [ danish ] = "Skal lyden tilføjes til Galleriet?" ;
+-	Text [ italian ] = "Aggiungere lil suono all'argomento Gallery?" ;
++	Text [ italian ] = "Aggiungere il suono all'argomento Gallery?" ;
+ 	Text [ spanish ] = "¿Desea añadir el sonido al tema Gallery?" ;
+ 	Text [ french ] = "Voulez-vous ajouter le son au thème de la Gallery ?" ;
+ 	Text [ dutch ] = "Wilt u het geluid opnemen in de gallery?" ;
+@@ -20941,7 +20941,7 @@
+ 	Text = "Diese Grafik ist mit dem Dokument verknüpft. Möchten Sie die Verknüpfung aufheben, um die Grafik zu bearbeiten?" ;
+ 	Text [ English ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ;
+ 	Text [ norwegian ] = "Denne grafikken er koblet til et dokument. Vil du koble den fra dokumentet for å redigere den?" ;
+-	Text [ italian ] = "Questra immagine è collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
++	Text [ italian ] = "Questa immagine è collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
+ 	Text [ portuguese_brazilian ] = "Esta figura está vinculada a um documento. Deseja desvinculá-la para que se possa editá-la?" ;
+ 	Text [ portuguese ] = "Esta imagem está ligada ao documento. Deseja remover a ligação para poder editar a imagem?" ;
+ 	Text [ english_us ] = "This graphic is linked to a document. Do you want to unlink the graphic in order to edit it?" ;
+@@ -21711,7 +21711,7 @@
+ {
+ 	Text = "Es existiert bereits ein Design mit diesem Namen\nSoll es überschrieben werden?";
+ 	Text [ ENGLISH ] = "A design with the same name already exists\nShould it be replaced?";
+-	Text[ italian ] = "Un design con questo nome esiste già.\nVolete sovrasciverlo?";
++	Text[ italian ] = "Un progetto con questo nome esiste già.\nVolete sovrasciverlo?";
+ 	Text[ portuguese_brazilian ] = "Já existe um design com este nome.\nDeseja substituí-lo?";
+ 	Text[ portuguese ] = "Já existe um Design com este mesmo nome\nSubstituir?";
+ 	Text[ danish ] = "Der findes allerede et design med dette navn.\nSkal det overskrives?";
+--- sd/source/ui/app/pseudo.src.lang39	2000-09-18 18:48:30.000000000 +0200
++++ sd/source/ui/app/pseudo.src	2004-09-13 09:20:14.372833603 +0200
+@@ -111,7 +111,7 @@
+ 	HelpText [ ENGLISH ] = "Insert a Checkbox" ;
+ 	Slotname [ english_us ] = "Insert Checkbox" ;
+ 	HelpText [ english_us ] = "Insert a checkbox" ;
+-	Slotname [ italian ] = "InserisciChekcBox" ;
++	Slotname [ italian ] = "InserisciCheckBox" ;
+ 	HelpText [ italian ] = "Inserisci una Checkbox" ;
+ 	Slotname [ spanish ] = "InsertarCasillaControl" ;
+ 	HelpText [ spanish ] = "Inserta un cuadro de verificación" ;
+--- setup2/source/custom/jvmsetup/jvmdlg.src.lang39	2004-09-09 18:44:15.000000000 +0200
++++ setup2/source/custom/jvmsetup/jvmdlg.src	2004-09-13 09:20:14.462835399 +0200
+@@ -1359,7 +1359,7 @@
+ 	TEXT = "Mit diesem Dialog wählen Sie die Java Umgebung aus, die von %PRODUCTNAME verwendet werden soll. Wurde bei der automatischen Suche keine verwendbare Java Version gefunden, so können Sie über die Funktion \"Manuell Suchen...\" eine schon auf dem System vorhandene Java Umgebung angeben.\n\n\"Manuell suchen...\" öffnet einen Dialog, mit dem Sie ein Verzeichnis selektieren können. Geben Sie hier das Stammverzeichnis der Java Installation (JavaHome) an. Nach der Bestätigung wird die getroffene Wahl verifiziert. Kann die angegeben VM benutzt werden, so wird ein entsprechender Eintrag an die Liste der vorhandenen Umgebungen gehängt. Tritt ein Fehler auf, so wird dies durch eine Meldung mitgeteilt.\n\nDie verwendete Laufzeitumgebung können Sie jederzeit nachträglich verändern.\nRufen Sie dafür, im Ordner ..\%PRODUCTNAME%PRODUCTVERSION\program, das Programm "jvmsetup.exe" auf. Wenn Sie keine Java Umgebung auswählen, werden Java Applets, JavaScripte oder Datenbankzugriffe über JDBC ausgeführt werden." ;
+ 	TEXT[ ENGLISH ] = "In this dialog select the Java Environment which %PRODUCTNAME should run.\nIf Office cannot use any version, install a corresponding Environment.\nIn the README file in the Office folder you can find more information about the Java support in %PRODUCTNAME and about the installation of a Java Environment.\nThe Runtime Environment used can be modified any time later on.\n You can modify the Runtime Environment by selecting  the \"JVM Setup\" entry in the Bookmarks/Java folder of the Explorer.\nIf no Java Environment has been selected, neither Java (Applets) nor JavaScript will be executed." ; 
+ 	TEXT[ english_us ] = "Use this dialog to select the Java environment to be used by %PRODUCTNAME. If the automatic search found no usable Java version, use \"Browse...\" to select a Java environment already existing on the system.\n\n\"Browse...\" opens a dialog in which a directory can be selected. Enter the root directory of the Java installation (JavaHome). After confirmation the selection will be verified. If the VM entered can be used, a corresponding entry is added to the list of the existing environments. If an error occurs, a message appears. \n\nThe Runtime Environment used can be modified at any future point.\nGo to the Explorer and select the entry \"Java Setup\" in the Bookmarks/Java folder. If you do not select a Java environment neither Java (Applets) nor JavaScript can be run." ; 
+-	TEXT[ italian ] = "In questo dialogo potete selezionare il Java Environment che dovrà essere usato da %PRODUCTNAME. Se con la ricerca automatica non viene individuata nessuna versione Java utilizzabile, ricercate il Java Environment installato nel vostro sistema servendovi della funzione \"Sfoglia...\".\n\nCon \"Sfoglia...\" aprite un dialogo con il quale potete scegliere una cartella. Specificate qui il nome della cartella di origine (root) dell'installazione Java (JavaHome). Dopo la conferma, verrà verificata la scelta. Se la VM indicata può essere utilizzata verrà aggiunta la voce corrispondente all'elenco degli environment disponibili. In caso di errore apparirà un messaggio.\n\nÈ possibile modificare il Runtime Environment in qualsiasi momento.\nPer questa operazione nella cartella Bookmark/Java che si trova nell'Explorer, selezionate la voce \"Java setup\". Se non viene selezionato nessun Java Environment non verranno eseguiti né Java (Applets) né JavaScript.\n\nIl dialogo esegue tutte le modifiche necessarie nel file INI (soffice.ini). Con le relative modifiche manuali delle voci è possibile personalizzare il Java Environment in uso. Qui di seguito vengono illustrate le voci più importanti. Fate attenzione alle lettere maiuscole o miniscole delle voci:\n\nJava:\nattiva (1) o disattiva (0) il supporto Java. Se il valore è impostato sullo 0 tutte le altre impostazioni Java verranno ignorate.\n\nHome:\n indica la cartella in cui è stato installato il Runtime Environment (JavaHome).\n\nVersione:\nindica la versione Java installata.\n\nSystemClasspath:\ndefinisce il percorso di ricerca di tutte le classi Java (CLASSPATH) necessarie all'avvio del Java Environment (ad esempio classes.zip o rt.jar e r18i.jar). Le classi che non fanno parte del Runtime Environment generalmente vengono riportate nello UserClasspath.\n\nUserClasspath:\nqui appaiono tutte le classi che non appartengono direttamente al Runtime Environment. L'intero Classpath, che si trasmetterà al Java VM, è composto dal SystemClasspath e dall'UserCl sspath.\n\nRuntimeLib: indica il DLL Java (con il relativo percorso) che di solito è javai.dll (Java 1.1.x) oppure jvm.dll (Java 1.2.x). Il DLL deve contenere tutte le funzioni JNI necessarie all'inizializzazione e all'avvio di Java VM.\n\nPer ulteriori voci o informazioni più dettagliate sull'uso di Runtime Environment di Java in Office, leggete il file README."; 
++	TEXT[ italian ] = "In questo dialogo potete selezionare il Java Environment che dovrà essere usato da %PRODUCTNAME. Se con la ricerca automatica non viene individuata nessuna versione Java utilizzabile, ricercate il Java Environment installato nel vostro sistema servendovi della funzione \"Sfoglia...\".\n\nCon \"Sfoglia...\" aprite un dialogo con il quale potete scegliere una cartella. Specificate qui il nome della cartella di origine (root) dell'installazione Java (JavaHome). Dopo la conferma, verrà verificata la scelta. Se la VM indicata può essere utilizzata verrà aggiunta la voce corrispondente all'elenco degli environment disponibili. In caso di errore apparirà un messaggio.\n\nÈ possibile modificare il Runtime Environment in qualsiasi momento.\nPer questa operazione nella cartella Bookmark/Java che si trova nell'Explorer, selezionate la voce \"Java setup\". Se non viene selezionato nessun Java Environment non verranno eseguiti né Java (Applets) né JavaScript.\n\nIl dialogo esegue tutte le modifiche necessarie nel file INI (soffice.ini). Con le relative modifiche manuali delle voci è possibile personalizzare il Java Environment in uso. Qui di seguito vengono illustrate le voci più importanti. Fate attenzione alle lettere maiuscole o minuscole delle voci:\n\nJava:\nattiva (1) o disattiva (0) il supporto Java. Se il valore è impostato sullo 0 tutte le altre impostazioni Java verranno ignorate.\n\nHome:\n indica la cartella in cui è stato installato il Runtime Environment (JavaHome).\n\nVersione:\nindica la versione Java installata.\n\nSystemClasspath:\ndefinisce il percorso di ricerca di tutte le classi Java (CLASSPATH) necessarie all'avvio del Java Environment (ad esempio classes.zip o rt.jar e r18i.jar). Le classi che non fanno parte del Runtime Environment generalmente vengono riportate nello UserClasspath.\n\nUserClasspath:\nqui appaiono tutte le classi che non appartengono direttamente al Runtime Environment. L'intero Classpath, che si trasmetterà al Java VM, è composto dal SystemClasspath e dall'UserCl sspath.\n\nRuntimeLib: indica il DLL Java (con il relativo percorso) che di solito è javai.dll (Java 1.1.x) oppure jvm.dll (Java 1.2.x). Il DLL deve contenere tutte le funzioni JNI necessarie all'inizializzazione e all'avvio di Java VM.\n\nPer ulteriori voci o informazioni più dettagliate sull'uso di Runtime Environment di Java in Office, leggete il file README."; 
+ 	TEXT[ portuguese ] = "Seleccione nesta caixa de diálogo o ambiente Java a ser utilizado pelo %PRODUCTNAME.\nSe a procura automática não encontrar nenhuma versão Java que possa ser utilizada, poderá indicar por meio da função \"Pesquisar...\" um ambiente Java já existente no sistema.\n\nEsta função abrirá uma caixa de diálogo que lhe permite seleccionar um directório. Indique aqui o directório-raíz (JavaHome) da instalação Java. Depois de confirmar, a sua escolha será verificada. Se a máquina virtual (VM) Java puder ser utilizada, a entrada correspondente será adicionada à lista dos ambientes existentes. Se surgir algum erro, verá uma mensagem de erro.\n\nPoderá modificar o ambiente de execução Java a qualquer altura.\nPara isso bastará seleccionar no Explorer a pasta \"Bookmarks/Java\" e aqui a entrada \"Java Setup\". Se não seleccionar nenhum ambiente Java, não será possível executar nem Java (Apllets) nem JavaScript.\n\\Poderá fazer todas as modificações necessárias no ficheiro INI (soffice.ini). Por meio de modificações manuais adequadas poderá personalizar o ambiente Java utilizado. A seguinte lista apresenta-lhe as entradas mais importantes. Tome em atenção as maiúsculas e minúsculas:\n\nJava:\nActiva (1) ou Desactiva(0) o suporte Java. Se o valor for 0, serão ignoradas todas as outras predefinições Java.\n\nHome:\nIndica o directório da instalação Java (JavaHome).\n\nVersão:\nIndica a versão de Java instalada.\n\nSystemClasspath:\nDefine o atalho de procura para todas as classes de Java (CLASSPATH) absolutamente necessárias ao ambiente Java (ex.: classes.zip ou rt.jar e r18i.jar). As classes não pertencentes ao ambiente de execução Java deveriam ser listadas em UserClasspath.\n\nUserClasspath:\nDeverá incluir todas as classes que não pertençam ao ambiente de execução. O Classpath completo transmitido à máquina virtual Java é composto pelos atalhos SystemClasspath e UserClasspath.\n\nRuntimeLib:\nIndica o ficheiro DLL de Java a ser utilizado (com indicação dos atalhos). Geralmente estes são: javai.dll (Jav 1.1.x), jvm.dll (Java 1.2.x) O ficheiro DLL terá que conter todas as funções JNI necessárias à inicialização e arranque da máquina virtual (VM) Java.\n\nEncontrará outras entradas e informações mais detalhadas sobre a utilização do ambiente de execução Java Runtime no Office no ficheiro README."; 
+ 	TEXT[ russian ] = "Ïðè ïîìîùè ýòîãî äèàëîãà âûáèðàåòñÿ ñðåäà Java, êîòîðàÿ äîëæíà èñïîëüçîâàòüñÿ äëÿ %PRODUCTNAME. Åñëè ïðè àâòîïîèñêå íåîáõîäèìàÿ âåðñèÿ Java, íå íàéäåíà, òî ïðè ïîìîùè ôóíêöèè \"Ïîèñê âðó÷íóþ...\" Âû ìîæåòå çàäàòü èìåþùóþñÿ óæå â ñèñòåìå ñðåäó Java.\n\n\"Ïîèñê âðó÷íóþ...\" îòêðûâàåò äèàëîã, â êîòîðîì Âû ñìîæåòå âûáðàòü êàòàëîã. Çàäàéòå çäåñü êîðíåâîé êàòàëîã äëÿ èíñòàëëÿöèè Java (JavaHome). Ïîñëå ïîäòâåðæäåíèÿ âûáîð áóäåò ïðîâåðåí. Åñëè çàäàííàÿ VM ìîæåò áûòü èñïîëüçîâàíà, òî ñïèñîê èìåþùèõñÿ ñðåä áóäåò äîïîëíåí ñîîòâåòñòâóþùèì ýëåìåíòîì. Åñëè ïðîèçîéäåò îøèáêà, òî Âû ïîëó÷èòå ñîîáùåíèå îá ýòîì.\n\nÈñïîëüçóåìàÿ ñðåäà âûïîëíåíèÿ ìîæåò áûòü â ëþáîå âðåìÿ èçìåíåíà.\nÄëÿ ýòîãî íåîáõîäèìî âûáðàòü â Ïðîâîäíèêå Çàêëàäêè/Ïàïêà Java çàïèñü \"Óñòàíîâêà Java\". Åñëè Âû íå âûáåðèòå ñðåäó Java, òî íè Java (àïïëåòû), íè JavaScript âûïîëíÿòüñÿ íå áóäóò.\n\nÄèàëîã âûïîëíèò âñå íåîáõîäèìûå èçìåíåíèÿ â ôàéëå INI (soffice.ini). Áëàãîäàðÿ âîçìîæíîñòè âðó÷íóþ èçìåíÿòü ñîîòâåòñòâóþùèå ýëåìåíòû, Âû ìîæåòå ïî æåëàíèþ ñêîíôèãóðèðîâàòü èñïîëüçóåìóþ ñðåäó Java. Äàëåå áóäóò ïðèâåäåíû âàæíåéøèå ýëåìåíòû. Îáðàòèòå âíèìàíèå íà íàïèñàíèå ñòðî÷íûõ è çàãëàâíûõ áóêâ:\n\nJava:\n Âêëþ÷àåò (1) èëè âûêëþ÷àåò (0) ïîääåðæêó Java. Åñëè çíà÷åíèå óñòíîâëåíî íà 0, òî âñå îñòàëüíûå íàñòðîéêè Java áóäóò èãíîðèðîâàòüñÿ.n\nHome:\nÇàäàåò êàòàëîã, â êîòîðîì èíñòàëëèðîâàíà ñðåäà âûïîëíåíèÿ Java (JavaHome).\n\nÂåðñèÿ:\nÓêàçûâàåò íà èíñòàëëèðîâàííóþ âåðñèþ Java.\n\nSystemClasspath:\n Óñòàíàâëèâàåò ïóòü ïîèñêà äëÿ âñåõ êëàññîâ Java (CLASSPATH), êîòîðûå îáÿçàòåëüíî íåîáõîäèìû äëÿ çàïóñêà ñðåäû Java (íàïðèì.,classes.zip èëè rt.jar è r18i.jar). Êëàññû, êîòîðûå íå îòíîñÿòñÿ ê ñðåäå âûïîëíåíèÿ, äîëæíû áûòü ïðåäñòàâëåíû, êàê ïðàâèëî, â UserClasspath.\n\nUserClasspath:\nÇäåñü äîëæíû íàõîäèòüñÿ âñå êëàññû, êîòîðûå ïðÿìî íå îòíîñÿòñÿ ê ñðåäå âûïîëíåíèÿ. Âåñü Classpath, êîòîðûé ïåðåäàåòñÿ Java VM, ñîñòîèò èç SystemClasspath è èç UserClasspath.\n\nRuntimeLib:\nÇàäàåò Java DLL (ñ óêàçàíèåì ïóòè). Ýòî, êàê ïðàâèëî, javai.dll (Java 1.1.x) èëè jvm.dll (Java 1.2.).  DLL äîëæíû ñîäåðæàòüñÿ âñå íåîáõîäèìûå ôóíêöèè JNI, êîòîðûå íåîáõîäèìû äëÿ èíèöèàëèçàöèè è çàïóñêà Java VM.\n\nÎñòàëüíûå ýëåìåíòû, à òàêæå ïîäðîáíóþ èíôîðìàöèþ îá óïðàâëåíèè ñðåäîé âûïîëíåíèÿ Java â Office Âû ìîæåòå ïîëó÷èòü èç ôàéëîâ README."; 
+ 	TEXT[ dutch ] = "In deze dialoog kiest u de Java-omgeving voor %PRODUCTNAME. Mocht er geen passende Java-versie te vinden zijn dan kunt u een reeds in uw systeem voorhanden Java-omgeving aangeven via de functie \"Handmatig zoeken...\".\n\nMet deze functie wordt er een dialoog geopend waarin u een directory kunt selecteren. Geef hier de homedirectory van de Java-installatie (JavaHome) aan en bevestig dit. Uw keuze wordt dan geverifieerd. Kan deze worden gebruikt dan wordt er een item toegevoegd aan de lijst van voorhanden omgevingen. Mocht er een fout optreden dan verschijnt er een melding.\n\nHet gebruikte runtime-environment kan te allen tijde worden gewijzigd.\nSelecteer hiervoor de optie \"Java Setup\" in de Bookmarks/Java-map in de explorer.\nSelecteert u geen Java omgeving dan wordt er geen Java (Applets) of JavaScript uitgevoerd.\n\nIn de dialoog komen alle noodzakelijke veranderingen van het INI-bestand (soffice.ini) voor. U kunt hierin handmatig veranderingen aanbrengen om de Java-omgeving aan te passen aan uw wensen, Hieronder vindt u een overzicht van de belangrijkste opties. Let op hoofdletters en kleine letters.\n\nJava:\ninschakelen (1) en uitschakelen (0) van de Java-ondersteuning. Staat de waarde op 0 dan worden alle andere Java-instellingen genegeerd.\n\nHome:\nde directory waarin Java Runtime Envireonment is geïnstalleerd (JavaHome).\n\nVersion:\nde geïnstalleerde versie.\n\nSystemClaspath:\\het zoekpad voor alle Java-klassen (CLASSPATH) die noodzakelijk zijn om de Java-omgeving te kunnen starten (bijv. classes.zip of rt.jar en r18i.jar). Klassen die niet tot het runtime-environment behoren moeten in de regel in het UserClasspath voorkomen.\n\nUserClasspath:\\hierin moeten alle klassen voorkomen die niet direct behoren tot het runtime environment. SystemClasspath en UserClasspath vormen samen het complete classpath dat wordt overgedragen aan Java VM.\n\\RuntimeLib:\nbevat de JavaDLL (met padaanduiding), meestal javai.dll (Java 1.1.x) of jvm.dll (Java 1.2.x). DLL moet alle JNI-functies bevatten ie noodzakelijk zijn voor het initialiseren en het starten van Java VM.\n\nAndere opties zoals gedetailleerde gegevens m.b.t. de besturing van het Java Runtime Environment onder Office vindt u in het README-bestand."; 
+--- setup2/source/ui/pages/maindlg.src.lang39	2004-09-09 18:46:33.000000000 +0200
++++ setup2/source/ui/pages/maindlg.src	2004-09-13 09:20:14.465835459 +0200
+@@ -556,7 +556,7 @@
+ 	Text = " KB benötigt. Bevor Sie die Installation erneut starten,\nstellen Sie bitte sicher, dass soviel Speicherplatz frei ist." ;
+ 	Text [ English ] = " KB. Before you start the installation again,\nplease make sure that there is enough memory.\n" ;
+ 	Text [ norwegian ] = " KB. Kontroller at det er nok ledig plass\nfør du starter installasjonen på nytt." ;
+-	Text [ italian ] = "KB. Prima di avviare di nuovo l'nstallazione,\nassicuratevi che vi sia memoria sufficiente." ;
++	Text [ italian ] = "KB. Prima di avviare di nuovo l'installazione,\nassicuratevi che vi sia memoria sufficiente." ;
+ 	Text [ portuguese_brazilian ] = "KB são necessários. Antes de reiniciar a instalação,\ncertifique-se de que há espaço suficiente disponível.\n." ;
+ 	Text [ portuguese ] = "KB. Antes de reiniciar a instalação,\ncertifique-se de que existe memória suficiente disponível." ;
+ 	Text [ finnish ] = "kilotavua Ennen kuin käynnistät asennuksen uudelleen,\nvarmista, että tallennustilaa on riittävästi." ;
+@@ -1059,7 +1059,7 @@
+ 	Text [ portuguese_brazilian ] = "O %PRODUCTNAME %PRODUCTVERSION não pode ser instalado no diretório escolhido, por que o sistema de arquivos não tem suporte para vínculos simbólicos. Escolha outro diretório. " ;
+ 	Text [ swedish ] = "Det går inte att installera %PRODUCTNAME %PRODUCTVERSION i katalogen som du har valt eftersom filsystemet inte har något stöd för symboliska länkar. Välj en annan katalog." ;
+ 	Text [ danish ] = "%PRODUCTNAME %PRODUCTVERSION kan ikke installeres i det valgte katalog, da filsystemet ikke understøtter symbolske henvisninger. Vælg et andet katalog." ;
+-	Text [ italian ] = "Impossibile installare %PRODUCTNAME %PRODUCTVERSION nella cartella indicata perchè il file system non supporta i collegamenti simbolici. Selezionate un'altra cartella." ;
++	Text [ italian ] = "Impossibile installare %PRODUCTNAME %PRODUCTVERSION nella cartella indicata perché il file system non supporta i collegamenti simbolici. Selezionate un'altra cartella." ;
+ 	Text [ spanish ] = "%PRODUCTNAME %PRODUCTVERSION no se puede instalar en el directorio seleccionado porque el sistema de archivos no admite enlaces simbólicos. Seleccione otro directorio." ;
+ 	Text [ french ] = "Impossible d'installer %PRODUCTNAME %PRODUCTVERSION dans le répertoire sélectionné : ce système de fichiers ne supporte pas les liens symboliques. Choisissez un autre répertoire." ;
+ 	Text [ dutch ] = "%PRODUCTNAME %PRODUCTVERSION kan niet in de opgegeven directory worden geïnstalleerd, omdat dat bestandssysteem geen symbolische links ondersteunt. Kies a.u.b. een andere directory." ;
+--- setup2/source/ui/pages/passrv.src.lang39	2004-09-09 18:47:41.000000000 +0200
++++ setup2/source/ui/pages/passrv.src	2004-09-13 09:20:14.466835478 +0200
+@@ -168,7 +168,7 @@
+ 		Text [ portuguese_brazilian ] = "O nome do computador no qual o servidor %1 será executado." ;
+ 		Text [ swedish ] = "Namnet på datorn där %1 servern skall köras." ;
+ 		Text [ danish ] = "Navnet på computeren som %1 serveren udføres på." ;
+-		Text [ italian ] = "Il mome del computer nel quale in server %1 è in esecuzione." ;
++		Text [ italian ] = "Il nome del computer nel quale in server %1 è in esecuzione." ;
+ 		Text [ spanish ] = "El nombre del ordenador en el que se ejecutará el servidor %1." ;
+ 		Text [ french ] = "Le nom de l'ordinateur sur lequel le serveur %1 va être lancé." ;
+ 		Text [ dutch ] = "De naam van de computer waarop de %1 Server wordt uitgevoerd." ;
+--- setup2/source/ui/pages/pcrc.src.lang39	2004-09-09 18:49:01.000000000 +0200
++++ setup2/source/ui/pages/pcrc.src	2004-09-13 09:20:14.468835518 +0200
+@@ -173,7 +173,7 @@
+ 		Text [ portuguese_brazilian ] = "contém arquivos compactados %2. As somas CRC para estes arquivos serão agora verificadas." ;
+ 		Text [ swedish ] = "innehåller %2 komprimerade filer. För de här filerna kontolleras just nu CRC-checksummorna." ;
+ 		Text [ danish ] = "indeholder %2 komprimerede filer. For disse filer bliver CRC-summen kontrolleret nu." ;
+-		Text [ italian ] = "contiene %2 file compressi. Per questi file verranno adesso controllate le checksum CRC." ;
++		Text [ italian ] = "contiene %2 file compressi. Per questi file verranno adesso controllati i checksum CRC." ;
+ 		Text [ spanish ] = "contiene %2 archivos comprimidos. Para estos archivos se comprobarán ahora las sumas CRC." ;
+ 		Text [ french ] = "contient %2 fichiers comprssés. Les sommes de contrôle CRC vont maintenant être vérifiées pour ces fichiers." ;
+ 		Text [ dutch ] = "bevat %2 gecomprimeerde bestanden. Voor deze bestanden worden nu de CRC-checksommen gecontroleerd.." ;
+--- setup2/source/ui/pages/ppatch.src.lang39	2004-09-09 18:50:54.000000000 +0200
++++ setup2/source/ui/pages/ppatch.src	2004-09-13 09:20:14.469835538 +0200
+@@ -172,7 +172,7 @@
+ 		Text[ french ] = "Cliquez sur '%1' pour actualiser %PRODUCTNAME %PRODUCTVERSION.\n\nCliquez sur '%2' pour quitter le programme d'installation."; 
+ 		Text[ spanish ] = "Pulse '%1' para actualizar %PRODUCTNAME %PRODUCTVERSION.\n\nPulse '%2' para finalizar el programa de instalación."; 
+ 		Text[ finnish ] = "Asenna %PRODUCTNAME %PRODUCTVERSION -korjaus napsauttamalla kohdetta %1.\n\nPoistu asennusohjelmasta napsauttamalla kohdetta %2."; 
+-		Text[ italian ] = "Fate clic su '%1' per aggiornare %PRODUCTNAME %PRODUCTVERSION.\n\nFate clic su '%2' per terminare il programma d'istallazione."; 
++		Text[ italian ] = "Fate clic su '%1' per aggiornare %PRODUCTNAME %PRODUCTVERSION.\n\nFate clic su '%2' per terminare il programma d'installazione."; 
+ 		Text[ danish ] = "Hvis du klikker på '%1' for at opdatere %PRODUCTNAME %PRODUCTVERSION.\n\nKlik på '%2' for at afslutte installationsprogrammet."; 
+ 		Text[ swedish ] = "Klicka på '%1' om du vill uppdatera %PRODUCTNAME %PRODUCTVERSION.\n\nKlicka på '%2' om du vill avsluta installationsprogrammet."; 
+ 		Text[ polish ] = "Kliknij przycisk „%1”, aby zainstalowaæ poprawkê do programu %PRODUCTNAME %PRODUCTVERSION.\n\nKliknij przycisk „%2”, aby zakoñczyæ program instalacyjny."; 
+--- setup2/source/ui/pages/pprofile.src.lang39	2004-09-09 18:51:07.000000000 +0200
++++ setup2/source/ui/pages/pprofile.src	2004-09-13 09:20:14.471835578 +0200
+@@ -124,7 +124,7 @@
+ 		Text[ dutch ] = "Kies hier de installatieprofielen die u later met het responsbestand wilt installeren.";
+ 		Text[ french ] = "Compilez les différents profils d'installation à installer avec le Response File.";
+ 		Text[ spanish ] = "Determine aquí los diferentes perfiles de instalación que desee instalar posteriormente con el Responsefile.";
+-		Text[ italian ] = "Raccogliete i diversi proifili di configurazione da installare in seguito con il response file.";
++		Text[ italian ] = "Raccogliete i diversi profili di configurazione da installare in seguito con il response file.";
+ 		Text[ danish ] = "Oversæt forskellige installationsprofiler, som du senere ønsker at installere med svarfile.";
+ 		Text[ swedish ] = "Här sammanställer du dina olika installationsprofiler som du vill installera senare med svarsfilen.";
+ 		Text[ polish ] = "Po³¹cz ró¿ne profile instalacji, które póŸniej zostan¹ zainstalowane przy u¿yciu pliku odpowiedzi.";
+--- setup2/source/ui/pages/preadygo.src.lang39	2004-09-09 18:51:35.000000000 +0200
++++ setup2/source/ui/pages/preadygo.src	2004-09-13 09:20:14.472835598 +0200
+@@ -169,7 +169,7 @@
+ 		Text[ french ] = "Une installation de %PRODUCTNAME %PRODUCTVERSION a été détectée sous :";
+ 		Text[ spanish ] = "Se encontró una instalación de %PRODUCTNAME %PRODUCTVERSION en: ";
+ 		Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION -asennus on löydetty kohteesta:";
+-		Text[ italian ] = "È stata trovata un'istallazione di %PRODUCTNAME %PRODUCTVERSION nel seguente percorso:";
++		Text[ italian ] = "È stata trovata un'installazione di %PRODUCTNAME %PRODUCTVERSION nel seguente percorso:";
+ 		Text[ danish ] = "Installationen %PRODUCTNAME %PRODUCTVERSION blev fundet i følgende sti:";
+ 		Text[ swedish ] = "En %PRODUCTNAME %PRODUCTVERSION-installation har hittats under:";
+ 		Text[ polish ] = "Program %PRODUCTNAME %PRODUCTVERSION jest zainstalowany w:";
+@@ -319,7 +319,7 @@
+ 		Text[ french ] = "L'espace disponible sur l'unité cible ne suffit pas pour l'installation de %PRODUCTPATCHNAME. L'installation requiert environ %SPACE_NEEDED Ko de plus.";
+ 		Text[ spanish ] = "La unidad de destino no dispone de espacio suficiente para instalar %PRODUCTPATCHNAME. Se requieren unos %SPACE_NEEDED KB más.";
+ 		Text[ finnish ] = "Kohdeasemalla ei ole tarpeeksi tilaa kohteen %PRODUCTPATCHNAME asentamiseen. Lisätilaa tarvitaan noin %SPACE_NEEDED kt.";
+-		Text[ italian ] = "Il drive di destinazione non lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora  %SPACE_NEEDED KB.";
++		Text[ italian ] = "Il drive di destinazione non ha lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB.";
+ 		Text[ danish ] = "Der er ikke tilstrækkelig ledig plads på destinationsdrevet til at installere %PRODUCTPATCHNAME. Der kræves ca. %SPACE_NEEDED KB yderligere.";
+ 		Text[ swedish ] = "Det finns inte tillräckligt med utrymme på målenheten för att %PRODUCTPATCHNAME ska kunna installeras. Det behövs ungefär %SPACE_NEEDED KB ytterligare.";
+ 		Text[ polish ] = "Za ma³o miejsca na dysku docelowym, aby zainstalowaæ aktualizacjê %PRODUCTPATCHNAME. Potrzeba jeszcze oko³o %SPACE_NEEDED KB.";
+--- setup2/source/ui/pages/preins.src.lang39	2004-09-09 18:52:16.000000000 +0200
++++ setup2/source/ui/pages/preins.src	2004-09-13 09:20:14.474835638 +0200
+@@ -414,7 +414,7 @@
+ 		Text[ french ] = "Restauration de l'état d'origine de votre installation de %1.";
+ 		Text[ spanish ] = "Restablece el estado original de la instalación de %1.";
+ 		Text[ finnish ] = "Asentaa uudelleen kaikki ohjelmamoduulit, jotka asennettiin edellisen %1-asennuksen yhteydessä.";
+-		Text[ italian ] = "Reinstalla tutti i moduli di programma già presenti duranti l'installazione di %1.";
++		Text[ italian ] = "Reinstalla tutti i moduli di programma già presenti durante l'installazione di %1.";
+ 		Text[ danish ] = "Gendanner %1-installationens oprindelige tilstand.";
+ 		Text[ swedish ] = "Återställer din %1-installation till ursprungligt tillstånd.";
+ 		Text[ polish ] = "Przywraca pierwotny stan instalacji %1.";
+--- setup2/source/ui/pages/prepair.src.lang39	2004-09-09 18:52:29.000000000 +0200
++++ setup2/source/ui/pages/prepair.src	2004-09-13 09:20:14.476835678 +0200
+@@ -237,7 +237,7 @@
+ 		Text[ dutch ] = "%1 vereist dit bestand om correct te kunnen worden uitgevoerd. Met het installatieprogramma kan dit bestand eventueel weer worden hersteld.";
+ 		Text[ french ] = "%1 ne peut pas être exécuté correctement sans ce fichier. Le programme d'installation peut essayer de le restaurer.";
+ 		Text[ spanish ] = "%1 necesita este archivo para poder ser ejecutado con éxito. El programa de instalación puede intentar restaurar este archivo.";
+-		Text[ italian ] = "%1 richiede questo file per poter essere eseguito corretamente. Il programma d'installazione cercherà di ripristinare questo file.";
++		Text[ italian ] = "%1 richiede questo file per poter essere eseguito correttamente. Il programma d'installazione cercherà di ripristinare questo file.";
+ 		Text[ danish ] = "%1 har brug for denne fil for at kunne udføres fejlfrit. Installationsprogrammet kan prøve på at genoprette denne fil." ;
+ 		Text[ swedish ] = "Den här filen kräver %1 för att den skall kunna utföras utan några fel. Installationsprogrammet kan försöka att återskapa filen.";
+ 		Text[ polish ] = "%1 wymaga tego pliku do prawid³owego wykonania. Plik ten mo¿na przywróciæ przy u¿yciu program instalacyjnego." ;
+--- setup2/source/ui/pages/pupdate.src.lang39	2004-09-09 18:53:34.000000000 +0200
++++ setup2/source/ui/pages/pupdate.src	2004-09-13 09:20:14.479835738 +0200
+@@ -641,7 +641,7 @@
+ 		Text[ french ] = "L'installation en réseau existante de %PRODUCTNAME %PREVIOUSPRODUCTVERSION ne peut pas être actualisée depuis une installation monoutilisateur.\nPour actualiser l'installation en réseau, lancez le programme d'installation avec le paramètre '-net'. Cliquez sur '%CANCEL' pour quitter le programme d'installation ou sur '%OK' pour installer une version monoutilisateur dans un nouveau répertoire.";
+ 		Text[ spanish ] = "La instalación de red existente de %PRODUCTNAME %PREVIOUSPRODUCTVERSION no se puede actualizar después de la instalación monousuario.\nPara actualizar la instalación de red inicie el programa de instalación con el parámetro '-net'. Para interrumpir la instalación pulse en 'CANCELAR' y para instalar una versión monousuario en un directorio nuevo pulse en 'ACEPTAR'.";
+ 		Text[ finnish ] = "If you want to update a network installation start the setup with the parameter: -net.\nClick '%1', if you want to install a single user version into a new folder.\nTo abort the setup click '%2'.";
+-		Text[ italian ] = "Impossibile aggiornare l'installazione di rete %PRODUCTNAME %PREVIOUSPRODUCTVERSION da un'instalalzione monoutente.\nPer aggiornare un'installazione di rete avviate il programma di installazione con il parametro '-net'. Per interrompere l'installazione fate click su '%CANCEL'. Per installare una versione monoutente in un'altra cartella cliccate '%OK'.";
++		Text[ italian ] = "Impossibile aggiornare l'installazione di rete %PRODUCTNAME %PREVIOUSPRODUCTVERSION da un'installazione monoutente.\nPer aggiornare un'installazione di rete avviate il programma di installazione con il parametro '-net'. Per interrompere l'installazione fate click su '%CANCEL'. Per installare una versione monoutente in un'altra cartella cliccate '%OK'.";
+ 		Text[ danish ] = "Din netværksinstallation af %PRODUCTNAME %PREVIOUSPRODUCTVERSION kan ikke opdateres fra en enkeltbruger installation.\nFor at opdatere en netværksinstallation skal du starte installationsprogrammet med parameteren '-net'. Klik på '%CANCEL' for at afbryde installationen eller '%OK' for at foretage en enkeltbruger installation i et andet katalog.";
+ 		Text[ swedish ] = "Det går inte att uppdatera din existerande nätverksinstallation av %PRODUCTNAME %PREVIOUSPRODUCTVERSION från en fristående installation.\nOm du vill uppdatera en nätverksinstallation startar du installationsprogrammet med parametern '-net'. Om du vill avsluta installationsprogrammet klickar du på '%CANCEL'. Annars klickar du på '%OK' för att installera en fristående version i en ny katalog.";
+ 		Text[ polish ] = "If you want to update a network installation start the setup with the parameter: -net.\nClick '%1', if you want to install a single user version into a new folder.\nTo abort the setup click '%2'.";
+--- setup2/source/ui/app.src.lang39	2004-09-09 18:45:11.000000000 +0200
++++ setup2/source/ui/app.src	2004-09-13 09:20:14.484835837 +0200
+@@ -534,7 +534,7 @@
+ 	Text [ portuguese_brazilian ] = "Verificando configurações locais" ;
+ 	Text [ swedish ] = "Kontrollerar de lokala inställningarna" ;
+ 	Text [ danish ] = "Kontrollerer lokale indstillinger" ;
+-	Text [ italian ] = "Verifica delle impostzioni locali" ;
++	Text [ italian ] = "Verifica delle impostazioni locali" ;
+ 	Text [ spanish ] = "Verifica la configuración local" ;
+ 	Text [ french ] = "Vérification des paramètres locaux" ;
+ 	Text [ dutch ] = "Lokale instellingen worden gecontroleerd" ;
+@@ -816,7 +816,7 @@
+ 	Text = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ English ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ norwegian ] = "Setup \nOpphavsrett (c) 1993 - 1996 av Star Division GmbH" ;
+-	Text [ italian ] = "Setup \nCopyrigth (c) 1993 - 1996 by Star Division GmbH" ;
++	Text [ italian ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ portuguese_brazilian ] = "Instalação \nCopyright (c) 1993 - 1996 - Star Division GmbH" ;
+ 	Text [ portuguese ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ;
+ 	Text [ finnish ] = "Asennus \nCopyright (c) 1993 - 1996 Star Division GmbH" ;
+--- setup2/source/ui/error.src.lang39	2004-09-09 18:45:27.000000000 +0200
++++ setup2/source/ui/error.src	2004-09-13 09:20:14.489835937 +0200
+@@ -973,7 +973,7 @@
+ Text = "Die Dateiliste für die Upgrade-Installation ist leer.\nEs wurde eine falsche oder fehlerhafte Skriptdatei benutzt.\nDas Programm wird abgebrochen." ;
+ Text [ English ] = "The upgrade filelist is emptyYou use a wrong or defect scriptfile.\nProgram aborted." ;
+ Text [ english_us ] = "The upgrade file list is empty. \nYou may have utilized a wrong or defect script file.\nProgram aborted." ;
+-Text [ italian ] = "L'elenco dei file per l'installazione di aggiormento è vuoto.\nIl file di script utiizzato è errato stato usato un file di script errato.\nIl programma viene interrotto." ;
++Text [ italian ] = "L'elenco dei file per l'installazione di aggiornamento è vuoto.\nPotreste avere usato un file di script errato o difettoso.\nIl programma viene interrotto." ;
+ Text [ spanish ] = "La lista de archivos para la instalación de actualización está vacía.\nSe ha utilizado un archivo script erróneo o defectuoso.\nEl programa se cancelará." ;
+ Text [ french ] = "La liste des fichiers pour l'installation de la mise à niveau est vide.\nVous vous êtes trompé de fichier script ou avez utilisé un fichier script défectueux.\nInterruption du programme." ;
+ Text [ dutch ] = "De bestandslijst voor de Upgrade-installatie is leeg.\nEr is een verkeerd of foutief scriptbestand gebruikt.\nHet programma wordt geannuleerd." ;
+@@ -1202,7 +1202,7 @@
+ Text = "Das Installationsprogramm kann keine gemeinsam genutzten Dateien aktualisieren, wenn diese gerade verwendet werden.\nSchließen Sie bitte alle geöffneten Anwendungen, bevor Sie die Installation erneut starten." ;
+ Text [ English ] = "Setup cannot update shared files, when they are open.\nPlease close all applications before you start setup again." ;
+ Text [ english_us ] = "The setup program cannot update shared files when they are in use.\nPlease close all applications before restarting the setup." ;
+-Text [ italian ] = "Il programma di installazione non può aggionare i file comuni quando sono in uso.\nPrima di riavviare l'installazione chiudete tutte le applicazioni." ;
++Text [ italian ] = "Il programma di installazione non può aggiornare i file comuni quando sono in uso.\nPrima di riavviare l'installazione chiudete tutte le applicazioni." ;
+ Text [ spanish ] = "El programa de instalación no puede actualizar archivos utilizados en común cuando estos están siendo utilizados.\n Cierre, por favor, todas las aplicaciones activas antes de volver a iniciar la instalación." ;
+ Text [ french ] = "Le programme d'installation ne peut actualiser des fichiers communs alors qu'ils sont ouverts.\nFermez toutes les applications ouvertes avant de redémarrer l'installation." ;
+ Text [ dutch ] = "Het installatieprogramma kan geen gemeenschappelijk gebruikte bestanden bijwerken als deze reeds zijn geopend.\nSluit alle geopende toepassingen voordat u de installatie opnieuw start." ;
+@@ -1480,7 +1480,7 @@
+ Text [ English ] = "Wrong comman line parameter: %1" ;
+ Text [ english_us ] = "Wrong command line parameter: %1" ;
+ Text [ dutch ] = "Foutieve commandoregelparameter: %1" ;
+-Text [ italian ] = "Parametro della riga di comando errrato: %1" ;
++Text [ italian ] = "Parametro della riga di comando errato: %1" ;
+ Text [ spanish ] = "Parámetro de orden no válido: %1" ;
+ Text [ french ] = "Paramètre de ligne de commande incorrecte : %1" ;
+ Text [ swedish ] = "Fel kommandoradparameter: %1" ;
+@@ -1711,7 +1711,7 @@
+ Text[ french ] = "Paramètre incomplet dans la ligne de commande : %1";
+ Text[ spanish ] = "Parámetro en la línea de comando incompleto: %1";
+ Text[ finnish ] = "Incomplete command line parameter: %1";
+-Text[ italian ] = "Paramentro della riga di comando incompleto: %1";
++Text[ italian ] = "Parametro della riga di comando incompleto: %1";
+ Text[ danish ] = "Ufuldstændig kommandolinjeparameter: %1";
+ Text[ swedish ] = "Ofullständig kommandoradsparameter: %1";
+ Text[ polish ] = "Incomplete command line parameter: %1";
+--- sfx2/sdi/sfxslots.src.lang39	2004-09-09 20:29:01.000000000 +0200
++++ sfx2/sdi/sfxslots.src	2004-09-13 09:20:14.311832387 +0200
+@@ -5751,7 +5751,7 @@
+ 	SlotName[ dutch ] = "Opniew";
+ 	SlotName[ french ] = "Restaurer";
+ 	SlotName[ spanish ] = "Restaurar";
+-	SlotName[ italian ] = "Riprtistina";
++	SlotName[ italian ] = "Ripristina";
+ 	SlotName[ danish ] = "Gendan";
+ 	SlotName[ swedish ] = "Återställ";
+ 	SlotName[ polish ] = "Ponów";
+--- sfx2/source/appl/app.src.lang39	2004-09-09 20:29:32.000000000 +0200
++++ sfx2/source/appl/app.src	2004-09-13 09:20:14.318832526 +0200
+@@ -2335,7 +2335,7 @@
+ 	Message = "Die Anwendung kann zur Zeit nicht beendet werden.\nBitte warten Sie das Ende aller Druckaufträge und/oder\nOLE-Aktivierungen ab und schließen Sie alle Dialoge." ;
+ 	Message [ English ] = "Can't quit the application at this moment.\nPlease wait until all print jobs and/or\nOLE-activations are terminated and close\nall dialogs." ;
+ 	Message [ norwegian ] = "Kan ikke avslutte programmet for øyeblikket.\nVent til alle skriverjobber og/eller \nOLE-handlinger er avsluttet og lukk alle dialogbokser." ;
+-	Message [ italian ] = "Impossibile uscire dall'applicazione in questo momento.\nAttendendete la concluisione della stampa e/o\n tutte le attivazioni OLE, quindi chiudete\ntutti i dialoghi." ;
++	Message [ italian ] = "Impossibile uscire dall'applicazione in questo momento.\nAttendete la conclusione della stampa e/o\n tutte le attivazioni OLE, quindi chiudete\ntutti i dialoghi." ;
+ 	Message [ portuguese_brazilian ] = "Não foi possível finalizar o aplicativo no momento.\nAguarde até que todas as \nações OLE e/ou as tarefas de impressão sejam concluídas e feche todas as caixas de diálogo." ;
+ 	Message [ portuguese ] = "De momento é impossível sair desta aplicação.\nAguarde a impressão de todos os documentos\n e/ou o fim das activações OLE e feche todos os diálogos." ;
+ 	Message [ french ] = "Impossible de quitter l'application maintenant.\nVeuillez attendre la fin des activités d'impression et/ou des activations OLE\net fermez tous les dialogues." ;
+--- sfx2/source/bastyp/fltfnc.src.lang39	2004-09-09 20:30:46.000000000 +0200
++++ sfx2/source/bastyp/fltfnc.src	2004-09-13 09:20:14.319832546 +0200
+@@ -209,7 +209,7 @@
+ 	Text[ dutch ] = "De gekozen filter $(FILTER) is niet geïnstalleerd.\nWilt u dat nu doen?"; \
+ 	Text[ french ] = "Le filtre $(FILTER) que vous avez sélectionné n'est pas installé\nSouhaitez-vous l'installer ?"; \
+ 	Text[ spanish ] = "El filtro seleccionado $(FILTER) no ha sido instalado.\n¿Desea instalarlo?"; \
+-	Text[ italian ] = "Il filtro selezionato $(FILTER) non è stato instalalto.\nVolete installarlo adesso?"; \
++	Text[ italian ] = "Il filtro selezionato $(FILTER) non è stato installato.\nVolete installarlo adesso?"; \
+ 	Text[ danish ] = "Det valgte filter $(FILTER) er ikke installeret.\nVil du installere det nu?"; \
+ 	Text[ swedish ] = "Det utvalda filtret $(FILTER) är inte installerat.\nVill du göra det nu?"; \
+ 	Text[ polish ] = "Wybrany filtr $(FILTER) nie jest zainstalowany.\nCzy to teraz zrobiæ ?"; \
+--- sfx2/source/bastyp/newhdl.src.lang39	2004-09-09 20:30:59.000000000 +0200
++++ sfx2/source/bastyp/newhdl.src	2004-09-13 09:20:14.320832566 +0200
+@@ -117,7 +117,7 @@
+ 	Text [ portuguese_brazilian ] = "Memória principal insuficiente. Feche outros aplicativos ou janelas antes de continuar." ;
+ 	Text [ swedish ] = "Inte tillräckligt med arbetsminne. Avsluta andra program eller stäng några fönster innan du fortsätter att arbeta." ;
+ 	Text [ danish ] = "Ikke tilstrækkelig hukommelse. Afslut venligst andre programmer eller luk nogle vinduer, før du fortsætter." ;
+-	Text [ italian ] = "La memoria principale è scarsa. Prma di continuare a lavorare chiudere alcune applicazioni o alcune finestre." ;
++	Text [ italian ] = "La memoria principale è scarsa. Prima di continuare a lavorare chiudere alcune applicazioni o alcune finestre." ;
+ 	Text [ spanish ] = "No hay suficiente memoria. Cierre por favor otras aplicaciones o algunas ventanas antes de continuar." ;
+ 	Text [ french ] = "La mémoire centrale se fait rare. Veuillez quitter quelques applications ou fermer quelques fenêtres avant de poursuivre." ;
+ 	Text [ dutch ] = "Onvoldoende schijfruimte. Beëindig andere toepassingen of sluit een aantal vensters voordat u uw werk voortzet." ;
+--- so3/src/svuidlg.src.lang39	2004-09-09 19:00:01.000000000 +0200
++++ so3/src/svuidlg.src	2004-09-13 09:20:14.515836456 +0200
+@@ -2584,7 +2584,7 @@
+ 	Text [ english_us ] = "Insert Plug-in" ;
+ 	Text [ swedish ] = "Infoga plug-in" ;
+ 	Text [ danish ] = "Indsæt PlugIn" ;
+-	Text [ italian ] = "Inserischi PlugIn" ;
++	Text [ italian ] = "Inserisci PlugIn" ;
+ 	Text [ spanish ] = "Insertar Plug-in" ;
+ 	Text [ french ] = "Insérer un Plug-in" ;
+ 	Text [ dutch ] = "PlugIn invoegen" ;
+--- starmath/source/commands.src.lang39	2004-09-09 18:39:45.000000000 +0200
++++ starmath/source/commands.src	2004-09-13 09:20:14.613838411 +0200
+@@ -1750,7 +1750,7 @@
+ 						HelpId = HID_SMA_SBLANK;
+ 						Text = "kleiner Zwischenraum";
+ 						Text [ ENGLISH ] = "small space" ;
+-						Text[ italian ] = "Spazio intemedio piccolo";
++						Text[ italian ] = "Spazio intermedio piccolo";
+ 						Text[ portuguese_brazilian ] = "Pequeno Intervalo";
+ 						Text[ portuguese ] = "espaçamento pequeno";
+ 						Text[ danish ] = "Lille frirum";
+--- starmath/source/smres.src.lang39	2004-09-09 18:40:19.000000000 +0200
++++ starmath/source/smres.src	2004-09-13 09:20:14.629838730 +0200
+@@ -17545,7 +17545,7 @@
+ 	Text = "Linke Begrenzung erwartet" ;
+ 	Text [ ENGLISH ] = "Left delimiter expected" ;
+ 	Text [ english_us ] = "Left limit expected" ;
+-	Text [ italian ] = "Atteso limite sinisto" ;
++	Text [ italian ] = "Atteso limite sinistro" ;
+ 	Text [ spanish ] = "Se requiere el límite izquierdo" ;
+ 	Text [ french ] = "Limite gauche requise" ;
+ 	Text [ dutch ] = "Linkerbegrenzing verwacht" ;
+--- svtools/source/misc/errtxt.src.lang39	2004-09-09 19:57:20.000000000 +0200
++++ svtools/source/misc/errtxt.src	2004-09-13 09:20:14.638838909 +0200
+@@ -4075,7 +4075,7 @@
+ 		Text [ english_us ] = "The configuration of the icon display could not be deleted." ;
+ 		Text [ swedish ] = "Konfigurationen för symbolvisningen kunde inte raderas." ;
+ 		Text [ danish ] = "Det var ikke muligt at slette ikonvisningens konfiguration" ;
+-		Text [ italian ] = "Impossibile cancellare la configurazione della rappresentazione dei simbol" ;
++		Text [ italian ] = "Impossibile cancellare la configurazione della rappresentazione dei simboli." ;
+ 		Text [ spanish ] = "No se pudo borrar la configuración del panel de símbolos." ;
+ 		Text [ french ] = "Impossible de supprimer les paramètres d'affichage de l'icône" ;
+ 		Text [ portuguese ] = "Foi impossível eliminar a configuração do painel de ícones." ;
+--- svx/sdi/enumslot.src.lang39	2001-05-17 17:13:50.000000000 +0200
++++ svx/sdi/enumslot.src	2004-09-13 09:20:14.383833823 +0200
+@@ -208,7 +208,7 @@
+ 	Slotname [ danish ] = "Beziermodus" ;
+ 	HelpText [ danish ] = "Vælg tegnfunktion Bezier" ;
+ 	Slotname [ italian ] = "Modo Bezier" ;
+-	HelpText [ italian ] = "Scegli la funzione di disegno Bezier" ;
++	HelpText [ italian ] = "Scegli la funzione di disegno Bézier" ;
+ 	Slotname [ spanish ] = "ModoBézier" ;
+ 	HelpText [ spanish ] = "Selecciona la función de Bezier de dibujo" ;
+ 	Slotname [ french ] = "Mode Bézier" ;
+@@ -236,7 +236,7 @@
+ 	Slotname [ danish ] = "Freihandmodus" ;
+ 	HelpText [ danish ] = "Zeichenfunktion Freihandzeichnen auswählen" ;
+ 	Slotname [ italian ] = "A mano libera" ;
+-	HelpText [ italian ] = "Zeichenfunktion Freihandzeichnen auswählen" ;
++	HelpText [ italian ] = "Seleziona il modo di disegno a mano libera" ;
+ 	Slotname [ spanish ] = "Dibujo a mano alzada" ;
+ 	HelpText [ spanish ] = "Selecciona el modo de dibujo a mano alzada" ;
+ 	Slotname [ french ] = "Mode A main levée" ;
+@@ -262,7 +262,7 @@
+ 	Slotname [ danish ] = "Lauftext" ;
+ 	HelpText [ danish ] = "Zeichenfunktion Lauftext auswählen" ;
+ 	Slotname [ italian ] = "Testo scorrevole" ;
+-	HelpText [ italian ] = "Zeichenfunktion Lauftext auswählen" ;
++	HelpText [ italian ] = "Seleziona il modo di animazione del testo" ;
+ 	Slotname [ spanish ] = "Texto animado" ;
+ 	HelpText [ spanish ] = "Selecciona la función de texto animado" ;
+ 	Slotname [ french ] = "Défilement de texte" ;
+--- svx/sdi/svxslots.src.lang39	2004-09-09 17:58:42.000000000 +0200
++++ svx/sdi/svxslots.src	2004-09-13 09:20:14.396834082 +0200
+@@ -481,7 +481,7 @@
+ 	SlotName[ dutch ] = "Uitgevuld";
+ 	SlotName[ french ] = "Justifié";
+ 	SlotName[ spanish ] = "Justificado";
+-	SlotName[ italian ] = "Giustifcato";
++	SlotName[ italian ] = "Giustificato";
+ 	SlotName[ danish ] = "Lige margener";
+ 	SlotName[ swedish ] = "Marginaljustering";
+ 	SlotName[ polish ] = "Do lewej i prawej";
+@@ -13676,7 +13676,7 @@
+ 	SlotName[ french ] = "Champ numérique";
+ 	SlotName[ spanish ] = "Campo numérico";
+ 	SlotName[ finnish ] = "Numeerinen kenttä";
+-	SlotName[ italian ] = "Campo  numerico";
++	SlotName[ italian ] = "Campo numerico";
+ 	SlotName[ danish ] = "Numerisk felt";
+ 	SlotName[ swedish ] = "Numeriskt fält";
+ 	SlotName[ polish ] = "Pole liczbowe";
+--- svx/source/dialog/contdlg.src.lang39	2004-09-09 18:01:15.000000000 +0200
++++ svx/source/dialog/contdlg.src	2004-09-13 09:20:14.399834142 +0200
+@@ -1141,7 +1141,7 @@
+ 	Text = "Diese Grafik ist mit dem Dokument verknüpft. Möchten Sie die Verknüpfung aufheben, um die Grafik zu bearbeiten?" ;
+ 	Text [ English ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ;
+ 	Text [ norwegian ] = "Dette grafikkobjektet er lenket til dokumentet. Vil du oppheve lenken for å redigere grafikkobjektet?" ;
+-	Text [ italian ] = "Questra immagine è collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
++	Text [ italian ] = "Questa immagine è collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
+ 	Text [ portuguese_brazilian ] = "Este objeto gráfico está vinculado ao documento. Deseja desvincular este objeto para poder editá-lo?" ;
+ 	Text [ portuguese ] = "Esta imagem está ligada ao documento. Deseja remover a ligação para poder editar a imagem?" ;
+ 	Text [ english_us ] = "This graphic object is linked to the document. Do you want to unlink the graphics in order to edit it?" ;
+--- svx/source/dialog/hyperdlg.src.lang39	2004-09-09 18:03:51.000000000 +0200
++++ svx/source/dialog/hyperdlg.src	2004-09-13 09:20:14.403834222 +0200
+@@ -4890,7 +4890,7 @@
+ 	Text[ french ] = "Créez un lien vers un document existant ou une cible dans le document.";
+ 	Text[ spanish ] = "Crea un hiperenlace a un documento existente o a un destino dentro de un documento. ";
+ 	Text[ finnish ] = "This is where you create a hyperlink to an exisitng document or a target within a document.";
+-	Text[ italian ] = "Crea un hyperllink a un documento oppure a un punto interno di un file.";
++	Text[ italian ] = "Crea un hyperlink a un documento oppure a un punto interno di un file.";
+ 	Text[ danish ] = "Her opretter du et hyperlink til et eksisterende dokument eller et mål inde i et dokument.";
+ 	Text[ swedish ] = "Här kan du skapa en hyperlänk till ett existerande dokument eller ett mål inom ett dokument.";
+ 	Text[ polish ] = "This is where you create a hyperlink to an exisitng document or a target within a document.";
+--- svx/source/form/fmstring.src.lang39	2004-09-09 18:13:38.000000000 +0200
++++ svx/source/form/fmstring.src	2004-09-13 09:20:14.411834381 +0200
+@@ -160,7 +160,7 @@
+ 	Text [ portuguese_brazilian ] = "A entrada já existe.\nEscolha outro nome." ; \
+ 	Text [ swedish ] = "Inmatningen finns redan.\nVar vänlig och välj ett annat namn." ; \
+ 	Text [ danish ] = "Elementet findes allerede.\nVælg venligst et andet navn." ; \
+-	Text [ italian ] = "La voce esiste giài.\nScegliete un altro nome." ; \
++	Text [ italian ] = "La voce esiste già.\nScegliete un altro nome." ; \
+ 	Text [ spanish ] = "El registro ya existe.\nPor favor elija otro nombre." ; \
+ 	Text [ french ] = "Cette entrée existe déjà.\nVeuillez choisir un autre nom." ; \
+ 	Text [ dutch ] = "Item bestaat reeds.\nKies een andere naam." ; \
+@@ -3892,7 +3892,7 @@
+ 	Text = "Ersetzen eines Containerelements" ;
+ 	Text [ English ] = "Movement of #" ;
+ 	Text [ english_us ] = "Replace a container element" ;
+-	TEXT[ italian ] = "Sostituzione di un elemnto di container";
++	TEXT[ italian ] = "Sostituzione di un elemento di container";
+ 	TEXT[ portuguese_brazilian ] = "Substituir um elemento do recipiente";
+ 	TEXT[ portuguese ] = "Substituir um elemento do contentor";
+ 	TEXT[ danish ] = "Erstat et containerelement";
+--- svx/source/items/svxerr.src.lang39	2004-09-09 18:14:48.000000000 +0200
++++ svx/source/items/svxerr.src	2004-09-13 09:20:14.413834421 +0200
+@@ -422,7 +422,7 @@
+ 		TEXT[ french ] = "$(ARG1) n'est pas supporté par la vérification ou n'est actuellement pas actif.\nVérifiez l'installation et installez le cas échéant le module de langue requis, ou activez-le sous 'Outils - Options - Paramètres linguistiques - Linguistique'."; \
+ 		TEXT[ spanish ] = "$(ARG1) no está disponible para la revisión ortográfica o no está activo en este momento.\n Examine la instalación e instale en caso dado el idioma deseado\no active el módulo correspondiente en 'Herramientas - Opciones - Configuración de idiomas - Lingüística'."; \
+ 		TEXT[ finnish ] = "$(ARG1) ei ole käytettävissä oikeinkirjoituksen tarkistusta varten.\nTarkista asennetut osat ja asenna haluttu kieli.\n"; \
+-		TEXT[ italian ] = "$(ARG1) non è supportato per il controllo oppure non è attivato al momento.\nControllate l'installazione ed installate, se necessario, la lingua desiderata\noppure impostate il modulo linquistico corrispondente in 'Strumenti - Opzioni - Impostazioni lingua - Linguistica'."; \
++		TEXT[ italian ] = "$(ARG1) non è supportato per il controllo oppure non è attivato al momento.\nControllate l'installazione ed installate, se necessario, la lingua desiderata\noppure impostate il modulo linguistico corrispondente in 'Strumenti - Opzioni - Impostazioni lingua - Linguistica'."; \
+ 		TEXT[ danish ] = "$(ARG1) understøttes ikke af stavekontrollen eller er ikke aktiveret i øjeblikket.\nKontroller venligst installationen, og installer eventuelt det nødvendige sprogmodul,\neller aktiver det pågældende sprogmodul under 'Funktioner - Indstillinger - Sprogindstillinger - Skrivehjælp'."; \
+ 		TEXT[ swedish ] = "$(ARG1) stöds inte av kontrollen resp., är inte aktiverat för närvarande.\nKontrollera installationen och installera eventuellt den nödvändiga språkmodulen\nresp. aktivera motsvarande språkmodul under \"Verktyg - Alternativ - Språkinställningar - Lingvistik\"."; \
+ 		TEXT[ polish ] = "$(ARG1) nie jest obs³ugiwany przez funkcjê sprawdzania pisowni albo nie jest teraz aktywny.\nSprawdŸ instalacjê i ewentualnie zainstaluj wymagany modu³ jêzyka\nlub uaktywnij go, wydaj¹c sekwencjê poleceñ 'Narzêdzia - Opcje - Konfiguracja jêzyków - Pisownia'."; \
+@@ -1073,7 +1073,7 @@
+ 		TEXT[ dutch ] = "De originele VBA Basic-code in dit document wordt niet opgeslagen.";
+ 		TEXT[ french ] = "Le code VBA basic d'origine contenu dans le document ne sera pas enregistré.";
+ 		TEXT[ spanish ] = "No se guardará el Basic Code VBA incluido en el documento.";
+-		TEXT[ italian ] = "Non è possibile salvare il codice VBA Basic contenuto nel documeto.";
++		TEXT[ italian ] = "Non è possibile salvare il codice VBA Basic contenuto nel documento.";
+ 		TEXT[ danish ] = "Den originale VBA Basic kode, som er indeholdt i dokumentet, gemmes ikke.";
+ 		TEXT[ swedish ] = "Original-VBA-Basic-koden som finns i dokumentet sparas inte.";
+ 		TEXT[ polish ] = "Zawarty w dokumencie oryginalny kod VBA nie zostanie zapisany.";
+--- svx/source/items/svxitems.src.lang39	2004-09-09 18:15:07.000000000 +0200
++++ svx/source/items/svxitems.src	2004-09-13 09:20:14.425834661 +0200
+@@ -3553,7 +3553,7 @@
+ 	Text[ dutch ] = "Onderstreept (golf)";
+ 	Text[ french ] = "Soulignage (ondulation)";
+ 	Text[ spanish ] = "Subrayado (ondulado)";
+-	Text[ italian ] = "Sottolienato (linea ondulata)";
++	Text[ italian ] = "Sottolineato (linea ondulata)";
+ 	Text[ danish ] = "Understreget (bølger)";
+ 	Text[ swedish ] = "Understruken (våg)";
+ 	Text[ polish ] = "Podkreœlenie (Fala)";
+@@ -13909,7 +13909,7 @@
+ 	Text[ dutch ] = "teken $(ARG1)° gedraaid";
+ 	Text[ french ] = "Rotation des caractères : $(ARG1)°";
+ 	Text[ spanish ] = "Carácter rodado en $(ARG1)°";
+-	Text[ italian ] = "Carattere rotato di $(ARG1)°";
++	Text[ italian ] = "Carattere ruotato di $(ARG1)°";
+ 	Text[ danish ] = "Tegn roteret med $(ARG1)°";
+ 	Text[ swedish ] = "Tecken roterat med $(ARG1)°";
+ 	Text[ polish ] = "Znaki obrócone o $(ARG1)°";
+--- svx/source/options/optinet2.src.lang39	2004-09-09 18:17:29.000000000 +0200
++++ svx/source/options/optinet2.src	2004-09-13 09:20:14.430834760 +0200
+@@ -2035,7 +2035,7 @@
+ 		Text = "~Ändern" ;
+ 		Text [ English ] = "Chan~ge" ;
+ 		Text [ english_us ] = "~Modify" ;
+-		Text [ italian ] = "Modfica" ;
++		Text [ italian ] = "Modifica" ;
+ 		Text [ spanish ] = "Modificar" ;
+ 		Text [ french ] = "Modifier" ;
+ 		Text [ dutch ] = "Wij~zigen" ;
+--- svx/source/svdraw/svdstr.src.lang39	2004-09-09 18:19:40.000000000 +0200
++++ svx/source/svdraw/svdstr.src	2004-09-13 09:20:14.454835239 +0200
+@@ -2468,7 +2468,7 @@
+ 	Text = "Bézierkurve" ;
+ 	Text [ ENGLISH ] = "bézier" ;
+ 	Text [ norwegian ] = "Bézierkurve" ;
+-	Text [ italian ] = "Curva di Bezier" ;
++	Text [ italian ] = "Curva di Bézier" ;
+ 	Text [ portuguese_brazilian ] = "Curva de Bézier" ;
+ 	Text [ portuguese ] = "Curvas Bézier" ;
+ 	Text [ finnish ] = "Bézier-käyrä" ;
+@@ -2515,7 +2515,7 @@
+ 	Text = "Bézierkurven" ;
+ 	Text [ ENGLISH ] = "béziers" ;
+ 	Text [ norwegian ] = "Bézierkurver" ;
+-	Text [ italian ] = "Curve di Bezier" ;
++	Text [ italian ] = "Curve di Bézier" ;
+ 	Text [ portuguese_brazilian ] = "Curvas de Bézier" ;
+ 	Text [ portuguese ] = "Curvas Bézier" ;
+ 	Text [ finnish ] = "Bézier-käyrät" ;
+@@ -2562,7 +2562,7 @@
+ 	Text = "Bézierkurve" ;
+ 	Text [ ENGLISH ] = "bézier" ;
+ 	Text [ norwegian ] = "Bézierkurve" ;
+-	Text [ italian ] = "Curva di Bezier" ;
++	Text [ italian ] = "Curva di Bézier" ;
+ 	Text [ portuguese_brazilian ] = "Curva de Bézier" ;
+ 	Text [ portuguese ] = "Curvas Bézier" ;
+ 	Text [ finnish ] = "Bézier-käyrä" ;
+@@ -2609,7 +2609,7 @@
+ 	Text = "Bézierkurven" ;
+ 	Text [ ENGLISH ] = "béziers" ;
+ 	Text [ norwegian ] = "Bézierkurver" ;
+-	Text [ italian ] = "Curve di Bezier" ;
++	Text [ italian ] = "Curve di Bézier" ;
+ 	Text [ portuguese_brazilian ] = "Curvas de Bézier" ;
+ 	Text [ portuguese ] = "Curvas Bézier" ;
+ 	Text [ finnish ] = "Bézier-käyrät" ;
+@@ -10874,7 +10874,7 @@
+ 	Text [ portuguese_brazilian ] = "%N pontos de %O" ;
+ 	Text [ swedish ] = "%N punkter för %O" ;
+ 	Text [ danish ] = "%N punkt fra %O" ;
+-	Text [ italian ] = "%N punkti di %O" ;
++	Text [ italian ] = "%N punti di %O" ;
+ 	Text [ spanish ] = "%N Puntos de %O" ;
+ 	Text [ french ] = "%N points de %O" ;
+ 	Text [ dutch ] = "%N punten van %O" ;
+@@ -15720,7 +15720,7 @@
+ 	Text [ portuguese_brazilian ] = "Espaçamento da borda direita" ;
+ 	Text [ swedish ] = "Höger ramavstånd" ;
+ 	Text [ danish ] = "Højre kantafstand" ;
+-	Text [ italian ] = "Distanta destra cornice" ;
++	Text [ italian ] = "Distanza destra cornice" ;
+ 	Text [ spanish ] = "Borde derecho del marco" ;
+ 	Text [ french ] = "Bord droit du cadre" ;
+ 	Text [ dutch ] = "Rechterkaderafstand" ;
+@@ -23894,7 +23894,7 @@
+ 	Text[ dutch ] = "Aantal verplaatsbare lijnen";
+ 	Text[ french ] = "Nombre de lignes déplaçables";
+ 	Text[ spanish ] = "Núm. líneas desplazables";
+-	Text[ italian ] = "Numro linee mobili";
++	Text[ italian ] = "Numero linee mobili";
+ 	Text[ danish ] = "Antal flytbare linjer";
+ 	Text[ swedish ] = "Antal förflyttningsbara linjer";
+ 	Text[ polish ] = "Liczba linii przesuwalnych";
+@@ -25094,7 +25094,7 @@
+ 	Text[ dutch ] = "Maateenheid";
+ 	Text[ french ] = "Unité de mesure";
+ 	Text[ spanish ] = "Unidad de medida";
+-	Text[ italian ] = "Unità di musura";
++	Text[ italian ] = "Unità di misura";
+ 	Text[ danish ] = "Måleenhed";
+ 	Text[ swedish ] = "Måttenhet";
+ 	Text[ polish ] = "Jednostka miary";
+@@ -26532,7 +26532,7 @@
+ 	Text[ dutch ] = "Hoogte, totaal";
+ 	Text[ french ] = "Hauteur totale";
+ 	Text[ spanish ] = "Alto, todo";
+-	Text[ italian ] = "Alttezza completa";
++	Text[ italian ] = "Altezza completa";
+ 	Text[ danish ] = "Højde, samlet";
+ 	Text[ swedish ] = "Höjd totalt";
+ 	Text[ polish ] = "Wysokoœæ ³¹cznie";
+@@ -27300,7 +27300,7 @@
+ 	Text[ dutch ] = "Herschalen X, compleet";
+ 	Text[ french ] = "Redimensionner X pour tout";
+ 	Text[ spanish ] = "Redimensión X, todo";
+-	Text[ italian ] = "Risimensiona X completamente";
++	Text[ italian ] = "Ridimensiona X completamente";
+ 	Text[ danish ] = "Redimensioner X, samlet";
+ 	Text[ swedish ] = "Återställ X totalt";
+ 	Text[ polish ] = "Zmieñ rozmiar X ³¹cznie";
+--- sw/sdi/swslots.src.lang39	2004-09-13 09:19:18.385716702 +0200
++++ sw/sdi/swslots.src	2004-09-13 09:20:14.602838191 +0200
+@@ -308,7 +308,7 @@
+ 	SlotName[ french ] = "AutoFormat pour la saisie";
+ 	SlotName[ spanish ] = "Formateado automático mientras se escribe";
+ 	SlotName[ finnish ] = "Automaattinen muotoilu kirjoitettaessa";
+-	SlotName[ italian ] = "Foramttazione automatica durante la digitazione";
++	SlotName[ italian ] = "Formattazione automatica durante la digitazione";
+ 	SlotName[ danish ] = "Anvend AutoFormat mens der indtastes";
+ 	SlotName[ swedish ] = "AutoFormat vid inmatning";
+ 	SlotName[ polish ] = "Autoformatowanie podczas pisania";
+@@ -962,7 +962,7 @@
+ 	SlotName[ dutch ] = "Tot aan begin regel wissen";
+ 	SlotName[ french ] = "Supprimer jusqu'au début de la ligne";
+ 	SlotName[ spanish ] = "Borrar hasta el comienzo de la línea";
+-	SlotName[ italian ] = "Cancella fino all'inzio della riga";
++	SlotName[ italian ] = "Cancella fino all'inizio della riga";
+ 	SlotName[ danish ] = "Slet til begyndelsen af linjen";
+ 	SlotName[ swedish ] = "Radera till början av rad";
+ 	SlotName[ polish ] = "Usuñ do pocz¹tku wiersza";
+@@ -5282,7 +5282,7 @@
+ 	SlotName[ dutch ] = "Indexwijzer naar index";
+ 	SlotName[ french ] = "Marque d'index à l'index";
+ 	SlotName[ spanish ] = "Marca de índice al índice";
+-	SlotName[ italian ] = "Contrassegnno per l'indice";
++	SlotName[ italian ] = "Contrassegno per l'indice";
+ 	SlotName[ danish ] = "Indeksmarkering til indeks";
+ 	SlotName[ swedish ] = "Indexmärke till index";
+ 	SlotName[ polish ] = "Znacznik indeksu do indeksu";
+--- sw/source/ui/app/mn.src.lang39	2004-09-09 19:25:14.000000000 +0200
++++ sw/source/ui/app/mn.src	2004-09-13 09:20:14.604838231 +0200
+@@ -192,7 +192,7 @@
+ 			Text = "Tabellenbegrenz~ung" ;
+ 			Text [ English ] = "Grid lines" ;
+ 			Text [ norwegian ] = "Tabellgrenser" ;
+-			Text [ italian ] = "Limte tabella" ;
++			Text [ italian ] = "Limiti tabella" ;
+ 			Text [ portuguese_brazilian ] = "Limites da Tabela" ;
+ 			Text [ portuguese ] = "~Limites da tabela" ;
+ 			Text [ finnish ] = "Taulukon rajat" ;
+@@ -669,7 +669,7 @@
+ 	Text = "Zeichenobjekt Text" ;
+ 	Text [ English ] = "Draw object text" ;
+ 	Text [ english_us ] = "Draw Object text" ;
+-	Text [ italian ] = "Oggetto di diesegno testo" ;
++	Text [ italian ] = "Oggetto di disegno testo" ;
+ 	Text [ spanish ] = "Texto del objeto de dibujo" ;
+ 	Text [ french ] = "Texte objet de dessin" ;
+ 	Text [ dutch ] = "Tekenobject tekst" ;
+--- sw/source/ui/uiview/view.src.lang39	2004-09-09 19:43:46.000000000 +0200
++++ sw/source/ui/uiview/view.src	2004-09-13 09:20:14.607838291 +0200
+@@ -278,7 +278,7 @@
+ 	MESSAGE = "Dieses Wort sollten Sie vermeiden! Thesaurus starten?" ;
+ 	MESSAGE [ English ] = "Please avoid this word! Start thesaurus?" ;
+ 	MESSAGE [ norwegian ] = "Dette ordet står på lista over ord du vil unngå. Vil du starte synonymordlista?" ;
+-	MESSAGE [ italian ] = "Tale temine andrebbe evitato. Avviare il dizionario dei sinonimi?" ;
++	MESSAGE [ italian ] = "Tale termine andrebbe evitato. Avviare il dizionario dei sinonimi?" ;
+ 	MESSAGE [ portuguese_brazilian ] = "Esta palavra aparece na lista de palavras que você deseja evitar! Iniciar Dicionário de Correlatos?" ;
+ 	MESSAGE [ portuguese ] = "Evite esta palavra! Iniciar o dicionário de sinónimos?" ;
+ 	MESSAGE [ finnish ] = "Tämä sana esiintyy vältettävien sanojen luettelossa. Avataanko synonyymisanasto?" ;
+--- sw/source/ui/utlui/attrdesc.src.lang39	2004-09-09 19:43:59.000000000 +0200
++++ sw/source/ui/utlui/attrdesc.src	2004-09-13 09:20:14.610838351 +0200
+@@ -2332,7 +2332,7 @@
+ 	TEXT = "Trennlinienbreite:" ;
+ 	TEXT [ English ] = "limiter width:" ;
+ 	Text [ english_us ] = "Separator Width:" ;
+-	Text [ italian ] = "Spessore linea di sepazione" ;
++	Text [ italian ] = "Spessore linea di separazione" ;
+ 	Text [ spanish ] = "Ancho de la línea de separación:" ;
+ 	Text [ french ] = "Largeur du trait de séparation :" ;
+ 	Text [ dutch ] = "breedte scheidingslijn:" ;
+--- uui/source/cookiedg.src.lang39	2004-09-09 18:55:34.000000000 +0200
++++ uui/source/cookiedg.src	2004-09-13 09:20:14.632838790 +0200
+@@ -528,7 +528,7 @@
+ 	Text [ portuguese_brazilian ] = "O %PRODUCTNAME salvou no servidor '${HOST}' cookies que serão enviados quando você solicitar o documento ${PATH}.\nOs cookies contêm informações referentes a certas classes de URLs. Eles são enviados por alguns servidores para o %PRODUCTNAME, onde serão salvos quando determinados documentos forem acessados. Se o %PRODUCTNAME carregar um documento que, de acordo com o URL, corresponda à classe de um dos Cookies anteriormente recebidos, o %PRODUCTNAME enviará essas informações ao servidor. Isso permitirá que o servidor controle o status de um aplicativo WWW, por exemplo, quando fizer compras on-line.\n\nOs seguintes Cookies devem ser utilizados:\n\n" ; \
+ 	Text [ swedish ] = "%PRODUCTNAME har sparat cookies för servern '${HOST}, som skall skickas då dokumentet ${PATH} laddas.\nCookies är information som refererar till vissa URL-klasser. De skickas av vissa servrar till %PRODUCTNAME och sparas där när vissa dokument öppnas. Denna information skickas av %PRODUCTNAME till servern om %PRODUCTNAME vid ett senare tillfälle laddar ett dokument, som enligt URL:en motsvarar en klass från en cookie som har mottagits tidigare. På så sätt kan servern känna igen tillståndet för en WWW-tillämpning (t.ex. varor i en varukorg när Du handlar online).\n\nFöljande cookies skall tilldelas:\n\n" ; \
+ 	Text [ danish ] = "%PRODUCTNAME har gemt cookies for serveren '${HOST}', som skal sendes, når dokmentet ${PATH} læses.\nCookies er informationer, som relaterer til bestemte URL-klasser. De bliver sendt til %PRODUCTNAME af nogle servere og gemt der, når bestemte dokumenter læses. Læser %PRODUCTNAME senere et dokument, hvis URLs klasse svarer til en før modtaget cookie, sender %PRODUCTNAME denne information til serveren. Således kan serveren kontrollere et WWW-programs tilstand (f.eks. varer i din indkøbskurv, når du handler online).\n\nFølgende cookies skal sættes:\n\n" ; \
+-	Text [ italian ] = "%PRODUCTNAME ha salvato per il server '${HOST}' dei cookies da inviare al momento della richiesta del documento ${PATH}.\nI cookies sono informazioni che si riferiscono a determinate classi di URL. Vengono inviati da alcuni server quando si richiamano determinati documenti a %PRODUCTNAME e qui salvati. Se %PRODUCTNAME in seguito richiede un documento che corrisponde all'URL di una classe di un cookie precedentemente ricevuto, tale informazione viene inviata da %PRODUCTNAME al server. In tal modo i server possono memorizzare lo stato di un'applicazione WWW (ad esempio gli articoli introdotti nel \"carrello\" di un supermercato elettronico).\n\nÈ necessarion impostare i seguenti cookies:\n\n" ; \
++	Text [ italian ] = "%PRODUCTNAME ha salvato per il server '${HOST}' dei cookies da inviare al momento della richiesta del documento ${PATH}.\nI cookies sono informazioni che si riferiscono a determinate classi di URL. Vengono inviati da alcuni server quando si richiamano determinati documenti a %PRODUCTNAME e qui salvati. Se %PRODUCTNAME in seguito richiede un documento che corrisponde all'URL di una classe di un cookie precedentemente ricevuto, tale informazione viene inviata da %PRODUCTNAME al server. In tal modo i server possono memorizzare lo stato di un'applicazione WWW (ad esempio gli articoli introdotti nel \"carrello\" di un supermercato elettronico).\n\nÈ necessario impostare i seguenti cookies:\n\n" ; \
+ 	Text [ spanish ] = "%PRODUCTNAME ha guardado cookies para el servidor '${HOST}' que serán enviadas cuando se solicite el documento ${PATH}.\nLas cookies son informaciones referentes a determinadas clases de URLs. Cuando se solicita un documento, algunos servidores las envían a %PRODUCTNAME y las guardan allí. Si %PRODUCTNAME solicita más tarde un documento que de acuerdo con su URL corresponda a una clase de una cookie recibida anteriormente, %PRODUCTNAME enviará esta información al servidor. Así, los servidores pueden recordar el estado de una aplicación www, como por ejemplo los artículos en la cesta de un sistema de compras.\n\nEstas son las cookies a instalar:\n\n" ; \
+ 	Text [ french ] = "%PRODUCTNAME a enregistré des Cookies pour le serveur '${HOST}', qui seront envoyés au moment de la requête du document ${PATH}.\nLes Cookies sont des informations se rapportant à certaines classes d'URL. Plus tard, si %PRODUCTNAME requiert un document dont l'URL correspond à la classe d'un Cookie déjà reçu, cette information est envoyée au serveur. Ceci permet aux serveurs de reconnaître l'état d'une application WWW (par ex. les articles placés dans le panier d'un système d'achat).\n\nLes Cookies suivants vont être placés : \n\n" ; \
+ 	Text [ dutch ] = "%PRODUCTNAME heeft voor server '${HOST}' cookies opgeslagen die bij het opvragen van het document ${PATH} moeten worden verzonden.\nCookies zijn gegevens die betrekking hebben op bepaalde klassen URL's. Ze worden door veel servers bij het oproepen van bepaalde documenten naar %PRODUCTNAME verzonden en daar opgeslagen. Vraagt %PRODUCTNAME later een document op met een URL-klasse die overeenkomt met een klasse van een eerder ontvangen cookie, dan wordt deze informatie door %PRODUCTNAME naar de server verzonden. Zo kunnen servers de status van een WWW-toepassing onthouden (zoals de artikelen die in een winkel in een boodschappenmand zijn geplaatst).\n\nDe volgende cookies moeten worden toegepast:\n\n" ; \
+--- wizards/source/euro/euro.src.lang39	2004-09-09 20:17:23.000000000 +0200
++++ wizards/source/euro/euro.src	2004-09-13 09:20:14.493836017 +0200
+@@ -1326,7 +1326,7 @@
+ 	Text[ french ] = "Conversion également pour les champs et les tableaux des textes.";
+ 	Text[ spanish ] = "Convertir también campos y tablas en documentos de texto.";
+ 	Text[ finnish ] = "Muunna myös tekstiasiakirjojen kentät ja taulukot";
+-	Text[ italian ] = "Converti anche comadi di campo e tabelle nel documento di testo";
++	Text[ italian ] = "Converti anche comandi di campo e tabelle nel documento di testo";
+ 	Text[ danish ] = "Omregn også felter og tabeller i tekstdokumenter";
+ 	Text[ swedish ] = "Konvertera även fältkommandon och tabeller i textdokument";
+ 	Text[ polish ] = "Konwertuj równie¿ pola i tabele w dokumentach tekstowych";
+@@ -1558,7 +1558,7 @@
+ 	Text[ dutch ] = "Beveiliging van werkbladen wordt hersteld...";
+ 	Text[ french ] = "Restauration des protections des feuilles...";
+ 	Text[ spanish ] = "Se volverá a crear cada protección de tabla...";
+-	Text[ italian ] = "Protezione tabella in corso di ripristinamento...";
++	Text[ italian ] = "Protezione tabella in corso di ripristino...";
+ 	Text[ danish ] = "Hver enkelt tabelbeskyttelse oprettes igen...";
+ 	Text[ swedish ] = "Varje enskilt tabellskydd återställs igen...";
+ 	Text[ polish ] = "Zostanie przywrócona ochrona poszczególnych arkuszy...";
+--- wizards/source/formwizard/dbwizres.src.lang39	2004-09-09 20:17:43.000000000 +0200
++++ wizards/source/formwizard/dbwizres.src	2004-09-13 09:20:14.505836256 +0200
+@@ -401,7 +401,7 @@
+ 	Text[ dutch ] = "Er is geen database geïnstalleerd. U heeft minstens één database nodig om de AutoPiloot voor formulieren te kunnen starten.";
+ 	Text[ french ] = "Aucune base de données n'est installée. Vous avez besoin d'au moins une base de données afin de pouvoir lancer l'AutoPilote de formulaire.";
+ 	Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el Piloto automático para formularios.";
+-	Text[ italian ] = "Non è stato installato nessun datase. Occorre almeno un database per poter avviare il Pilota automatico per i formulari.";
++	Text[ italian ] = "Non è stato installato nessun database. Occorre almeno un database per poter avviare il Pilota automatico per i formulari.";
+ 	Text[ danish ] = "Der er ikke installeret nogen database. Mindst én database er nødvendig for at kunne starte AutoPilot til formularer.";
+ 	Text[ swedish ] = "Ingen databas är installerad. Du behöver minst en databas för att kunna starta AutoPiloten för formulär.";
+ 	Text[ polish ] = "Nie zainstalowano ¿adnej bazy danych. Do uruchomienia AutoPilota formularzy jest wymagana co najmniej jedna baza danych.";
+--- wizards/source/importwizard/importwi.src.lang39	2004-09-09 20:18:01.000000000 +0200
++++ wizards/source/importwizard/importwi.src	2004-09-13 09:20:14.512836396 +0200
+@@ -3164,7 +3164,7 @@
+ 	Text[English] = "These will be exported in the following directory:";
+ 	Text[ English_us ] = "These will be exported to the following directory:";
+ 	Text[ french ] = "Ils seront exportés vers le répertoire suivant :";
+-	Text[ italian ] = "L'esportazione avverà nella seguente cartella:";
++	Text[ italian ] = "L'esportazione avverrà nella seguente cartella:";
+ 	Text[ spanish ] = "Se exportarán al siguiente directorio:";
+ 	Text[ portuguese ] = "Estes serão exportados para o seguinte directório:";
+ 	Text[ dutch ] = "Ze worden geëxporteerd naar de volgende directory:";
+--- dbaccess/source/ui/dlg/indexdialog.src.orig	2004-09-24 11:54:26.719067593 +0200
++++ dbaccess/source/ui/dlg/indexdialog.src	2004-09-24 11:54:39.276313464 +0200
+@@ -326,7 +326,7 @@
+ 				Text[ dutch ] = "Huidig register opslaan";
+ 				Text[ french ] = "Enregistrer l'index actif";
+ 				Text[ spanish ] = "Guardar el índice actual";
+-				Text[ italian ] = "Salva l'indica attuale";
++				Text[ italian ] = "Salva l'indice attuale";
+ 				Text[ danish ] = "Gem aktuelt indeks";
+ 				Text[ swedish ] = "Spara aktuellt index";
+ 				Text[ polish ] = "Zapisz bie¿¹cy indeks";
+--- extensions/source/installation/office/protchk/protdlg.src.orig	2004-09-24 12:06:44.595514043 +0200
++++ extensions/source/installation/office/protchk/protdlg.src	2004-09-24 12:07:23.832283586 +0200
+@@ -578,7 +578,7 @@
+ 		Text[ dutch ] = "Protocol voor gegevensoverdracht (FTP)";
+ 		Text[ french ] = "Protocole de transfert de fichier (FTP)";
+ 		Text[ spanish ] = "Protocolo para transferencia de archivo (FTP)";
+-		Text[ italian ] = "Protocollo per tranfer di file (FTP)";
++		Text[ italian ] = "Protocollo per la trasmissione di file (FTP)";
+ 		Text[ danish ] = "Protokol for filoverførsel (FTP)";
+ 		Text[ swedish ] = "Protokoll för filöverföring (FTP)";
+ 		Text[ polish ] = "Protokó³ przesy³ania plików (FTP)";
+--- extensions/source/propctrlr/formres.src.orig	2004-09-24 12:09:26.592696374 +0200
++++ extensions/source/propctrlr/formres.src	2004-09-24 12:09:59.115335532 +0200
+@@ -2059,7 +2059,7 @@
+ 	Text [ portuguese ] = "Espaço vazio é NULL" ;
+ 	Text [ english_us ] = "Empty string is NULL" ;
+ 	Text [ swedish ] = "Tom teckensträng är NULL" ;
+-	Text [ italian ] = "Lo string vuoto è ZERO" ;
++	Text [ italian ] = "Lo stringa vuota è NULL" ;
+ 	Text [ spanish ] = "Serie de caracteres vacía es NULL" ;
+ 	Text [ french ] = "Espace vide égale NULL" ;
+ 	Text [ dutch ] = "Opvullen met NUL" ;
+--- offmgr/source/offapp/dialog/treeopt.src.orig	2004-09-24 12:17:10.746815992 +0200
++++ offmgr/source/offapp/dialog/treeopt.src	2004-09-24 12:17:23.009056856 +0200
+@@ -418,7 +418,7 @@
+ 			< "Qui è possibile effettuare le impostazioni per i documenti di presentazione che vengono salvati la prima volta. Tra l'altro è possibile determinare i contenuti da visualizzare sulle pagine, l'unità di misura standard da adottare, l'allineamento alla griglia e i contenuti da stampare." ; SID_SD_EDITOPTIONS; > ;
+ 			< "Qui è possibile effettuare diverse impostazioni per i disegni. Tra l'altro potete stabilire i contenuti da visualizzare sulle pagine, la scala standard da adottare, se e come allineare alla griglia e i contenuti da stampare." ; SID_SD_GRAPHIC_OPTIONS; > ;
+ 			< "Qui è possibile selezionare il formato e le opzioni di stampa per tutte le formule salvate di recente. Queste opzioni risulteranno utili nel momento in cui volete stampare una formula direttamente da %PRODUCTNAME Math." ; SID_SM_EDITOPTIONS; > ;
+-			< "Qui è possibile eseguire le installazioni fondamentali per %PRODUCTNAME Chart. Stabilite ie colori base per i nuovi diagrammi." ; SID_SCH_EDITOPTIONS; > ;
++			< "Qui è possibile eseguire le installazioni fondamentali per %PRODUCTNAME Chart. Stabilite i colori base per i nuovi diagrammi." ; SID_SCH_EDITOPTIONS; > ;
+ 			< "Qui è possibile eseguire le impostazioni per l'accesso a sorgenti dati esterne"; SID_SB_STARBASEOPTIONS; > ;
+ 			< "Qui è possibile eseguire le installazioni fondamentali per caricare e salvare i documenti da formati esterni. Potete modificare le macro e  gli oggetti OLE dei documenti MS Office oppure fare delle impostazioni per i documenti HTML." ; SID_FILTER_DLG; > ;
+ 		};
+--- padmin/source/padialog.src.typoita2	2004-09-24 12:42:29.686676409 +0200
++++ padmin/source/padialog.src	2004-09-24 12:43:41.694095186 +0200
+@@ -3938,7 +3938,7 @@
+ 	Text[ dutch ] = "Printer \"%s\" kan niet worden geïmporteerd omdat deze geen geldige configuratie heeft."; \
+ 	Text[ french ] = "L'imprimante \"%s\" n'a pas été correctement configurée et ne peut donc pas être importée."; \
+ 	Text[ spanish ] = "La impresora \"%s\" no está correctamente configurada, por lo que no se puede importar."; \
+-	Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non puó essere importata."; \
++	Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non può essere importata."; \
+ 	Text[ danish ] = "Printeren \"%s\" har ingen gyldig konfiguration og kan derfor ikke importeres."; \
+ 	Text[ swedish ] = "Det går inte att importera skrivaren \"%s\" eftersom den inte är fullständigt konfigurerad."; \
+ 	Text[ polish ] = "Drukarki \"%s\" nie mo¿na importowaæ, poniewa¿ nie zosta³a prawid³owo skonfigurowana."; \
+--- readlicense_oo/docs/readme/readme.xrm.orig	2004-09-24 12:56:29.976222584 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-24 12:56:41.798455224 +0200
+@@ -2916,7 +2916,7 @@
+ 			<Text id="dew32f" xml:lang="fr">Si l&apos;activation du démarrage rapide d&apos;OpenOffice.org devait causer des problèmes (lien non valide) au moment du démarrage du système, il est probable que l&apos;unité réseau (sur laquelle l&apos;installation en réseau correspondante est installée) n&apos;est pas (ou pas encore) disponible.</Text>
+ 			<Text id="dew32f" xml:lang="es">Si durante el inicio del sistema se produjeran problemas al activar el inicio rápido de OpenOffice.org, p.ej. un vínculo no válido, esto puede ser debido a que la unidad de red en la que se instaló la instalación de red correspondiente aún no esté disponible o simplemente no esté disponible.</Text>
+ 			<Text id="dew32f" xml:lang="fi">Jos järjestelmää käynnistettäessä ilmenee ongelmia OpenOffice.orgn Pikakäynnistyksen avaamisessa (esim. virheellinen linkki), tämä johtuu mahdollisesti siitä, että verkkoasema, jolle verkkoasennus on tehty, ei ole vielä tai ollenkaan käytettävissä.</Text>
+-			<Text id="dew32f" xml:lang="it">Se durante l&apos;avvio del sistema dovessero verificarsi dei problemi nell&apos;aprire il QuickStart di OpenOffice.org (collegamento non valido) è dovuto al fatto che il driver di rete su cui è stata efffettuata l&apos;installazione non è oppure non è ancora a disposizione.</Text>
++			<Text id="dew32f" xml:lang="it">Se durante l&apos;avvio del sistema dovessero verificarsi dei problemi nell&apos;aprire il QuickStart di OpenOffice.org (collegamento non valido) è dovuto al fatto che il driver di rete su cui è stata effettuata l&apos;installazione non è oppure non è ancora a disposizione.</Text>
+ 			<Text id="dew32f" xml:lang="cs">Pokud se při startu systému objeví problémy s OpenOffice.org Quickstarterem (např. neplatný odkaz), může to být způsobeno, že v okamžiku spuštění síťové instalace není k dispozici síťový disk, na kterém se nachází síťová instalace.</Text>
+ 			<Text id="dew32f" xml:lang="sk">Pokiaľ sa pri štarte systému objavia problémy s OpenOffice.org Quickstar (napr. neplatný odkaz), môže to byť spôsobené tým, že v momente spustenia sieťovej inštalácie nie je k dispozícii sieťový disk, na ktorom sa nachádza sieťová inštalácia.</Text>
+ 			<Text id="dew32f" xml:lang="da">Hvis der under opstart af systemet opstår problemer med åbning af OpenOffice.org Hurtig start (f.eks. ugyldig genvej), skyldes dette sandsynligvis, at det netværksdrev, hvor den tilhørende netværksinstallation er installeret, ikke er tilgængelig.</Text>
+--- readlicense_oo/docs/readme/readme.xrm.orig1	2004-09-24 13:04:31.374692638 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-24 12:56:41.000000000 +0200
+@@ -2958,7 +2958,7 @@
+ 			<Text id="df3df" xml:lang="fr">La plupart du temps, ce type de cas se présente lorsque la connexion des unités réseau a lieu via un script de Login et que cette connexion a lieu en même temps que l&apos;exécution des programmes du groupe Autostart, depuis lequel le démarrage rapide est également activé.</Text>
+ 			<Text id="df3df" xml:lang="es">En la mayoría de los casos esto se produce cuando el registro de la unidad de red se realiza mediante un Script de Login y la conexión de la unidad de red tiene lugar de manera paralela a la ejecución de los programas del grupo Inicio, desde el que también se inicia el inicio rápido.</Text>
+ 			<Text id="df3df" xml:lang="fi">Monesti näin tapahtuu, kun verkkoasemiin kirjaudutaan sisään kirjautumisskriptillä, ja yhteys verkkoasemiin otetaan samaan aikaan sellaisten ohjelmien suorittamisen kanssa, jotka ovat automaattikäynnistysryhmässä, josta myös Pikakäynnistys aloitetaan.</Text>
+-			<Text id="df3df" xml:lang="it">Nella maggior parte dei casi questo accade quando si effettua la registrazione del driver di rete tramite uno script di login e quindi il collegamento del driver di rete si realizza contemporanemente all&apos;esecuzione del programma del gruppo di esecuzione automatica, da cui viene attivato QuickStart.</Text>
++			<Text id="df3df" xml:lang="it">Nella maggior parte dei casi questo accade quando si effettua la registrazione del driver di rete tramite uno script di login e quindi il collegamento del driver di rete si realizza contemporaneamente all&apos;esecuzione del programma del gruppo di esecuzione automatica, da cui viene attivato QuickStart.</Text>
+ 			<Text id="df3df" xml:lang="cs">Ve většině případů toto nastane v okamžiku, když se síťový disk připojuje pomocí login skriptu, a tudíž se připojuje ve stejný okamžik jako skupina autostart, z níž se spouští Quickstarter.</Text>
+ 			<Text id="df3df" xml:lang="sk">Vo vä�šine prípadov toto nastane v okamihu, ke� sa sieťový disk pripája pomocou login skriptu, a zároveň sa pripája v tom istom momente ako skupina autostart, z ktorej sa spúšťa Quickstarter.</Text>
+ 			<Text id="df3df" xml:lang="da">I de fleste tilfælde sker dette, når der logges på netværksdrev ved hjælp af et logind-script, og forbindelsen til netværksdrevene etableres parallelt med eksekveringen af programmerne i autostartgruppen, hvorfra også Hurtig start åbnes.</Text>
+@@ -3214,7 +3214,7 @@
+ 			<Text id="naso2" xml:lang="fr">Si vous deviez rencontrer des problèmes au démarrage d&apos;OpenOffice.org (la plupart du temps en relation avec Gnome), vous devez redéfinir la variable d&apos;environnement SESSION_MANAGER dans le shell utilisé pour le démarrage d&apos;OpenOffice.org : insérez &quot;unset SESSION_MANAGER&quot; au début du script shell de soffice placé dans le répertoire &quot;[office folder]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="es">Si surgen problemas durante la inicialización de OpenOffice.org (normalmente en conexión con Gnome) vuelva a definir la variable de entorno SESSION_MANAGER dentro de la cáscara (shell) que utiliza para iniciar OpenOffice.org. Esto se puede hacer añadiendo la línea &quot;unset SESSION_MANAGER&quot; al inicio del shell script de soffice que se encuentra en el directorio &quot;[carperta office]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="fi">If you experience OpenOffice.org startup problems (most notably while using Gnome) please &apos;unset&apos; the SESSION_MANAGER environment variable inside the shell you use to start OpenOffice.org. This can be done by adding the line &quot;unset SESSION_MANAGER&quot; to the beginning of the soffice shell script found in the &quot;[office folder]/program&quot; directory.</Text>
+-			<Text id="naso2" xml:lang="it">Se si presentassero problemi all&apos;avvio di OpenOffice.org (soprattutto sotto Gnome) è necessario ridefinire la varibile di ambiente SESSION_MANAGER nella shell che utilizzate per l&apos;avvio di OpenOffice.org. A questo proposito digitate &quot;unset SESSION_MANAGER&quot; all&apos;inizio dello script della shell che si trova nella cartella &quot;[office folder]/program&quot;.</Text>
++			<Text id="naso2" xml:lang="it">Se si presentassero problemi all&apos;avvio di OpenOffice.org (soprattutto sotto Gnome) è necessario ridefinire la variabile di ambiente SESSION_MANAGER nella shell che utilizzate per l&apos;avvio di OpenOffice.org. A questo proposito digitate &quot;unset SESSION_MANAGER&quot; all&apos;inizio dello script della shell che si trova nella cartella &quot;[office folder]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="cs">Pokud při startu OpenOffice.org pozorujete problémy (hlavně při používání Gnome), použijte v příkazovém interpretu, z něhož spouštíte OpenOffice.org, příkaz &apos;unset&apos; ke zrušení proměnné prostředí SESSION_MANAGER. Můžete to zařídit přidáním řádku &quot;unset SESSION_MANAGER&quot; na za�átek skriptu soffice, který se nachází v adresáři &quot;[adresář OpenOffice.org]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="sk">Pokiaľ pri štarte OpenOffice.org spozorujete problémy (hlavne pri používaní Gnome), použite v príkazovom interpreteri, z ktorého spúšťate OpenOffice.org, príkaz &apos;unset&apos; pre zrušenie premennej prostredia SESSION_MANAGER. Môžete to zariadiť pridaním riadku &quot;unset SESSION_MANAGER&quot; na za�iatok skriptu soffice, ktorý sa nachádza v adresári &quot;[adresár OpenOffice.org]/program&quot;.</Text>
+ 			<Text id="naso2" xml:lang="da">Hvis du oplever opstartsproblemer (oftest i Gnome) skal du &apos;unset&apos; miljøvariablen SESSION MANAGER i den skal, du bruger til at starte OpenOffice.org. Dette kan gøres ved at tilføje linjen &quot;unset SESSION_MANAGER&quot; i begyndelsen af soffice skalscriptet, som findes i kataloget &quot;[office mappen]/program&quot;</Text>
+--- readlicense/docs/readme/readme.xrm~	2004-09-24 13:25:17.252442851 +0200
++++ readlicense/docs/readme/readme.xrm	2004-09-24 13:25:17.257442951 +0200
+@@ -4222,7 +4222,7 @@
+ 			<Text id="scs2" xml:lang="fr">Le système de fichier ReiserFS (version inférieure à 3.6) cause des problèmes si l&apos;ID d&apos;utilisateur est supérieur à 65535 : les fichiers temporaires créés par OpenOffice.org ne peuvent plus être supprimés par le programme, mais uniquement par l&apos;administrateur système (par ex. /tmp/OSL_PIPE_xxx ). Ceci a pour conséquence que OpenOffice.org ne démarre plus. Il s&apos;agit là d&apos;un problème du système de fichiers ReiserFS qui a toutefois disparu des versions 3.6 et plus.</Text>
+ 			<Text id="scs2" xml:lang="es">En versiones inferiores a la 3.6 el sistema de archivos ReiserFS puede ocasionar problemas si el ID del usuario es superior a 65535: los archivos temporales creados por OpenOffice.org ya no se podrán eliminar por el programa sino por el administrador del sistema (p.ej. /tmp/OSL_PIPE_xxx ). El resultado es que OpenOffice.org no se puede iniciar más. La situación aquí descrita es un problema del sistema de archivos ReiserFS que a partir de la versión 3.6 no se produce más.</Text>
+ 			<Text id="scs2" xml:lang="fi">Versiota 3.6 aikaisemmissa versioissa ReiserFS-tiedostojärjestelmä aiheuttaa ongelmia, jos käyttäjätunnus on pitempi kuin 65535. Ongelma on, että OpenOffice.orgn väliaikaisesti tallentamia tiedostoja ei voi poistaa ohjelmallisesti, vaan ainoastaan järjestelmän pääkäyttäjä voi tehdä sen (esim. /tmp/OSL_PIPE_xxx ). Sen vuoksi OpenOffice.orga ei voi käynnistää. Ongelma on ReiserFS-tiedostojärjestelmässä, ja se on korjattu versiossa 3.6 ja sitä uudemmissa versioissa.</Text>
+-			<Text id="scs2" xml:lang="it">Il sistema di file ReiserFS in una versione precedente alla 3.6 può causare dei problemi nei casi di un utente con un codice d&apos;identificazione superiore a 65535 e cioè che i file temporanei creati da OpenOffice.org (ad esempio /tmp/OSL_PIPE_xxx ) non vengano eliminati dal programma stesso ma solo dall&apos;amministratore del sistema. L&apos;effetto seguente è che non sarà possibile avviare OpenOffice.org. La sistuazione sopra descritta è un problema noto del sistema di file ReiserF3 ed è stato risolto a partire dalla versione 3.6.</Text>
++			<Text id="scs2" xml:lang="it">Il sistema di file ReiserFS in una versione precedente alla 3.6 può causare dei problemi nei casi di un utente con un codice d&apos;identificazione superiore a 65535 e cioè che i file temporanei creati da OpenOffice.org (ad esempio /tmp/OSL_PIPE_xxx ) non vengano eliminati dal programma stesso ma solo dall&apos;amministratore del sistema. L&apos;effetto seguente è che non sarà possibile avviare OpenOffice.org. La sistuazione sopra descritta è un problema noto del sistema di file ReiserFS ed è stato risolto a partire dalla versione 3.6.</Text>
+ 			<Text id="scs2" xml:lang="cs">V nižší verzi než 3.6 způsoboval ReiserFS problémy v okamžiku, kdy ID uživatele bylo vyšší než 65535. Problém byl ten, že do�asné soubory ukládané OpenOffice.org nemohly být již odstraněny, protože to mohl pouze správce systému (např. /tmp/OSL_PIPE_xxx). Výsledkem bylo, že nebylo možné spustit OpenOffice.org. Tento problém byl již ve verzi 3.6 a vyšší odstraněn.</Text>
+ 			<Text id="scs2" xml:lang="sk">V nižšej verzii ako 3.6 spôsoboval ReiserFS problémy v okamihu, ke� ID užívateľa bolo vyššie ako 65535. Problém bol v tom, že do�asné súbory ukladané OpenOffice.org nemohli byť už odstránené, pretože to mohol len správca systému (napr. /tmp/OSL_PIPE_xxx). Výsledkom bolo, že nebolo možné spustiť OpenOffice.org. Tento problém bol už vo verzii 3.6 a vyššej odstránený.</Text>
+ 			<Text id="scs2" xml:lang="da">Filsystemet ReiserFS i versioner ældre end 3.6 giver problemer, når bruger-ID er større end 65535. Dette viser sig ved, at midlertidige filer oprettet af OpenOffice.org (f.eks. /tmp/OSL_PIPE_xxx ) ikke kan fjernes af programmet selv, men kun af systemadministratoren. Dette medfører, at OpenOffice.org ikke længere kan startes. Den beskrevne proces er et problem i filsystemet ReiserFS, og det er fjernet i version 3.6 og nyere.</Text>
+--- readlicense_oo/docs/readme/readme.xrm.orig2	2004-09-24 16:21:23.052730248 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-24 16:21:43.317124601 +0200
+@@ -3708,7 +3708,7 @@
+ 			<Text id="aw4333" xml:lang="fr">Le Java(TM) Access Bridge installé en même temps que cette version Early Access ne fonctionne éventuellement pas correctement avec les applications Java conventionnelles.</Text>
+ 			<Text id="aw4333" xml:lang="es">Puede suceder que el Java(TM) Access Bridge instalado con esta versión de early access no funcione correctamente con las aplicaciones de Java convencionales.</Text>
+ 			<Text id="aw4333" xml:lang="fi">The Java(TM) Access Bridge installed with this early access version does not work properly with conventional Java applications.</Text>
+-			<Text id="aw4333" xml:lang="it">Java (TM) Access Bridge, installato insieme a questa versione, non funziona correttamente con le normani applicazioni Java.</Text>
++			<Text id="aw4333" xml:lang="it">Java (TM) Access Bridge, installato insieme a questa versione, non funziona correttamente con le normali applicazioni Java.</Text>
+ 			<Text id="aw4333" xml:lang="cs">Java(TM) Access Bridge nainstalovaný se staršími verzemi nespolupracuje správně s běžnými Java aplikacemi.</Text>
+ 			<Text id="aw4333" xml:lang="sk">Java(TM) Access Bridge nainštalovaný so staršími verziami nespolupracuje správne s bežnými Java aplikáciami.</Text>
+ 			<Text id="aw4333" xml:lang="da">Udgaven af Java(TM) Access Bridge, som er installeret med denne tidlige version, virker ikke korrekt sammen med konventionelle Java-programmer</Text>
+--- sc/source/ui/src/globstr.src.orig	2004-09-24 17:10:00.456316975 +0200
++++ sc/source/ui/src/globstr.src	2004-09-24 17:10:10.729515783 +0200
+@@ -3477,7 +3477,7 @@
+ 		Text [ portuguese_brazilian ] = "Desproteger documento" ;
+ 		Text [ swedish ] = "Upphäv dokumentskydd" ;
+ 		Text [ danish ] = "Ophæv dokumentbeskyttelse" ;
+-		Text [ italian ] = "Disattiva protezione documentro" ;
++		Text [ italian ] = "Disattiva protezione documento" ;
+ 		Text [ spanish ] = "Desproteger documento" ;
+ 		Text [ french ] = "Annuler la protection de document" ;
+ 		Text [ dutch ] = "Beveiliging opheffen" ;
+--- sc/source/ui/src/scfuncs.src.orig2	2004-09-24 17:18:10.624794633 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-24 17:18:23.431041899 +0200
+@@ -12628,7 +12628,7 @@
+ 			Text = "Fälligkeit. F = 1 heißt Fälligkeit am Anfang einer Periode, F = 0 am Ende." ;
+ 			Text [ english ] = "???" ;
+ 			Text [ norwegian ] = "Type=1 viser fortjenesten ved periodens begynnelse, =0 ved periodens slutt." ;
+-			Text [ italian ] = "Tipo di scadenze dei pagamaenti. 1 = all'inizio del periodo, 0 = alla fine." ;
++			Text [ italian ] = "Tipo di scadenze dei pagamenti. 1 = all'inizio del periodo, 0 = alla fine." ;
+ 			Text [ portuguese_brazilian ] = "Tipo = 1 denota a dívida no início do período, = 0 no fim." ;
+ 			Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ;
+ 			Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ;
+--- sc/source/ui/src/scfuncs.src.orig3	2004-09-24 17:43:29.216140105 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-24 17:44:17.603075732 +0200
+@@ -15233,7 +15233,7 @@
+ 			Text = "Berechnet die jährliche Effektivverzinsung zu einer Nominalverzinsung." ;
+ 			Text [ english ] = "???" ;
+ 			Text [ norwegian ] = "Beregner årlig effektiv rente ut fra den nominelle renten." ;
+-			Text [ italian ] = "Restituisce l'interesse effettivo annuale per un'interesse nominale." ;
++			Text [ italian ] = "Restituisce l'interesse effettivo annuale per un interesse nominale." ;
+ 			Text [ portuguese_brazilian ] = "Calcula a taxa de juros anual líquida para uma taxa de juros nominal." ;
+ 			Text [ portuguese ] = "Calcula a taxa de juros anual efectiva para uma taxa de juros nominal." ;
+ 			Text [ finnish ] = "Laskee nimellisen koron vuosittaisen nettosumman." ;
+--- sc/source/ui/src/scfuncs.src.orig4	2004-09-24 17:49:47.910463038 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-24 17:50:03.836770284 +0200
+@@ -31790,7 +31790,7 @@
+ 			Text = "Erste Matrix, deren Argumente quadriert summiert werden." ;
+ 			Text [ english ] = "is the first array or range of values." ;
+ 			Text [ norwegian ] = "Den første matrisen der kvadratet av argumentene skal legges sammen." ;
+-			Text [ italian ] = "Prima matrice di cui si deve aggiundere l'elemento al quadrato." ;
++			Text [ italian ] = "Prima matrice di cui si deve aggiungere l'elemento al quadrato." ;
+ 			Text [ portuguese_brazilian ] = "Primeiro vetor no qual o quadrado dos argumentos é totalizado." ;
+ 			Text [ portuguese ] = "é a primeira matriz ou intervalo de valores." ;
+ 			Text [ finnish ] = "Ensimmäinen taulukko, jonka argumenttien neliöt lasketaan yhteen." ;
+--- scaddins/source/analysis/analysis.src.orig	2004-09-24 18:06:22.021667020 +0200
++++ scaddins/source/analysis/analysis.src	2004-09-24 18:07:12.741638289 +0200
+@@ -19010,7 +19010,7 @@
+ 			Text[ french ] = "Renvoie la durée de Macaulay modifiée d'un titre pour une valeur nominale de 100 unités monétaires.";
+ 			Text[ spanish ] = "Devuelve la duración modificada de Macaulay de un título de un valor de 100 unidades monetarias.";
+ 			Text[ finnish ] = "Palauttaa arvopaperin Macaulay-keston oletetulla 100 valuuttayksikön nimellisarvolla";
+-			Text[ italian ] = "Restituisce la durata Macauley modificata di un titolo con un valore nominale di 100 unità monetarie.";
++			Text[ italian ] = "Restituisce la durata Macaulay modificata di un titolo con un valore nominale di 100 unità monetarie.";
+ 			Text[ danish ] = "Returnerer den modificerede Macauley-varighed for et værdipapir med 100 valutaenheder pålydende værdi.";
+ 			Text[ swedish ] = "Returnerar den modifierade Macauley-löptiden för ett värdepapper med ett nominellt värde på 100 valutaenheter.";
+ 			Text[ polish ] = "Zwraca wartoœæ zmodyfikowanego okresu Macaulay'a w przypadku papieru wartoœciowego o za³o¿onej wartoœci 100 jednostek.";
+--- scp/source/fonts/module_fonts.lng.orig	2004-09-24 11:37:51.000000000 +0200
++++ scp/source/fonts/module_fonts.lng	2004-09-24 18:16:06.912895565 +0200
+@@ -51,7 +51,7 @@
+ 33 = "Ce module permet d'élargir le choix des polices de caractères. Ces polices supplémentaires sont également disponibles dans les modèles et exemples de document."
+ 34 = "Seleccione este módulo para incluir fuentes adicionales y así ampliar la gama de diseños. Estas fuentes se utilizan también en las plantillas y ejemplos.  "
+ 35 = "Lisäfontit"
+-39 = "Selezionate questo modulo per aggiungere altri tipi di caratere per aumentarne la gamma a disposizione. Questi caratteri sono utilizzati anche da modelli ed esempi."
++39 = "Selezionate questo modulo per aggiungere altri tipi di carattere per aumentarne la gamma a disposizione. Questi caratteri sono utilizzati anche da modelli ed esempi."
+ 45 = "Yderligere skrifttyper."
+ 46 = "Välj den här modulen om du vill ha ytterligare teckensnitt för mer designflexibilitet. De här teckensnitten används även i mallarna och exemplen."
+ 48 = "Dodatkowe czcionki."
+--- scp/source/office/setuphelp.lng.orig	2004-09-24 18:23:35.062535707 +0200
++++ scp/source/office/setuphelp.lng	2004-09-24 18:23:58.511988475 +0200
+@@ -99,7 +99,7 @@
+ 33 = "Une installation de station de travail n'installe que les fichiers utilisateur requis pour le fonctionnement de %PRODUCTNAME depuis une installation serveur.\n\nUne installation locale installe tous les fichiers requis pour l'exécution de %PRODUCTNAME sur l'ordinateur."
+ 34 = "Una instalación de estación de trabajo sólo instala los archivos específicos del usuario necesarios para ejecutar %PRODUCTNAME después de una instalación de servidor.\n\nUna instalación local instala todos los archivos necesarios para ejecutar  %PRODUCTNAME en su ordenador."
+ 35 = "A workstation installation only installs user-specific files that are required to run %PRODUCTNAME from a server installation.\n\nA local installation installs all of the files that are required to run %PRODUCTNAME from your computer."
+-39 = "L'installazione per workstation installa solo quei file speciifci dell'utente necessari per il funzionamento di %PRODUCTNAME su un server.\n\nUn'installazione locale installa tutti i file necessari per il funzionamento di %PRODUCTNAME sul computer."
++39 = "L'installazione per workstation installa solo quei file specifici dell'utente necessari per il funzionamento di %PRODUCTNAME su un server.\n\nUn'installazione locale installa tutti i file necessari per il funzionamento di %PRODUCTNAME sul computer."
+ 45 = "En arbejdsstationsinstallation installerer kun de nødvendige brugerspecifikke filer fra en serverinstallation. En enkeltbrugerinstallation installerer alle nødvendige filer, så %PRODUCTNAME kan køres direkte på din computer."
+ 46 = "En installation på en arbetsstation installerar bara användarspecifika filer som krävs för att %PRODUCTNAME ska kunna köras från en serverinstallation.\n\nEn lokal installation installerar alla filer som krävs för att %PRODUCTNAME ska kunna köras från din dator."
+ 48 = "A workstation installation only installs user-specific files that are required to run %PRODUCTNAME from a server installation.\n\nA local installation installs all of the files that are required to run %PRODUCTNAME from your computer."
+--- setup2/source/custom/reg4msdoc/preg4msdoc.src.orig	2004-09-24 18:33:41.284269065 +0200
++++ setup2/source/custom/reg4msdoc/preg4msdoc.src	2004-09-24 18:33:51.474467256 +0200
+@@ -646,7 +646,7 @@
+ 	Text[ french ] = "Vous pouvez utiliser %PRODUCTNAME %PRODUCTVERSION comme application par défaut pour l'ouverture et l'édition des documents Microsoft Word, Excel et PowerPoint.\nSi vous n'en avez pas l'intention, supprimez le marquage des options.\nVous pouvez de plus définir %PRODUCTNAME %PRODUCTVERSION comme éditeur HTML par défaut.\nEn cas contraire, supprimez le marquage de l'option '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ spanish ] = "Puede utilizar %PRODUCTNAME %PRODUCTVERSION como una aplicación predeterminada para la apertura y edición de los archivos de Microsoft Word, Excel y PowerPoint files.\nSi esta no es su intención anule la selección de las opciones.\nAdemás podrá registrar %PRODUCTNAME %PRODUCTVERSION como editor HTML predeterminado.\nSi ésta tampoco es su intención borre la marca de la opción '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ finnish ] = "Voit käyttää %PRODUCTNAME %PRODUCTVERSION -ohjelmaa oletussovelluksena Microsoft Word-, Excel- ja PowerPoint-asiakirjojen avaamiseen ja muokkaamiseen.\nEllet halua tehdä niin, poista valintamerkki.\nVoit myös rekisteröidä %PRODUCTNAME %PRODUCTVERSION -ohjelman järjestelmäsi HTML-oletuseditoriksi.\nEllet halua rekisteröidä %PRODUCTNAME %PRODUCTVERSION -ohjelmaa, poista valintamerkki kohdasta %PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+-	Text[ italian ] = "Potete utilizzare %PRODUCTNAME %PRODUCTVERSION quale applicazione standard per aprire documenti Microsoft Word, Excel e PowerPoint.\nSe preferite non usare il programma quale applicazione standard eliminate il contrassegno dall'opzione.\nPotete impostare %PRODUCTNAME %PRODUCTVERSION quale editor standard HTML\nIn caso contrario eliminate il contrassego dall'opzione '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
++	Text[ italian ] = "Potete utilizzare %PRODUCTNAME %PRODUCTVERSION quale applicazione standard per aprire documenti Microsoft Word, Excel e PowerPoint.\nSe preferite non usare il programma quale applicazione standard eliminate il contrassegno dall'opzione.\nPotete impostare %PRODUCTNAME %PRODUCTVERSION quale editor standard HTML\nIn caso contrario eliminate il contrassegno dall'opzione '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ danish ] = "Du kan bruge %PRODUCTNAME %PRODUCTVERSION som standardprogram til at åbne og redigere Microsoft Word-, Microsoft Excel- og Microsoft PowerPoint-dokumenter.\nHvis du ikke ønsker dette, skal du fjerne markeringen.\nDu kan også vælge, om %PRODUCTNAME %PRODUCTVERSION skal defineres som standard-HTML-editor på computeren. Hvis du ikke ønsker at anvende %PRODUCTNAME %PRODUCTVERSION som standard-HTML-editor på computeren, skal du fjerne markeringen af '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ swedish ] = "Du kan använda %PRODUCTNAME %PRODUCTVERSION som standardprogram för att öppna och redigera Microsoft Word-, Excel- och PowerPoint-dokument.\nOm du inte vill det tar du bort markeringen.\nDessutom kan du definiera om %PRODUCTNAME %PRODUCTVERSION ska ställas in som standard-HTML-redigerare i ditt system.\nOm du inte vill använda %PRODUCTNAME %PRODUCTVERSION som standard-HTML-redigerare i ditt system avmarkerar du '%PRODUCTNAME %PRODUCTVERSION Writer/Web'.";
+ 	Text[ polish ] = "Mo¿esz u¿ywaæ programów %PRODUCTNAME %PRODUCTVERSION jako domyœlnych aplikacji do otwierania i edytowania plików w formacie Microsoft Word, Excel i PowerPoint files.\nJeœli tego nie chcesz, wyczyœæ pole wyboru.\nMo¿esz tak¿e zarejestrowaæ %PRODUCTNAME %PRODUCTVERSION jako domyœlny edytor HTML.\nJeœli nie chcesz rejestrowaæ %PRODUCTNAME %PRODUCTVERSION jako domyœlnego edytora HTML, wyczyœæ pole wyboru „%PRODUCTNAME %PRODUCTVERSION Writer/Web”.";
+--- sw/source/ui/app/app.src.orig	2004-09-24 18:37:04.577223727 +0200
++++ sw/source/ui/app/app.src	2004-09-24 18:37:13.204391591 +0200
+@@ -4190,7 +4190,7 @@
+     Message = "Zum Fortsetzen des Vorgangs, muss die Rückgängig-Funktion abgeschaltet werden. Wollen Sie die Rückgängig-Funktion abschalten?";
+ 	Message [ English ] = "This action needs for undo many memory.\nWould you disable undo?" ;
+ 	Message [ norwegian ] = "Du må slå av angrefunksjonen for å fortsette med denne handlingen. Vil du slå av angrefunksjonen?" ;
+-	Message [ italian ] = "Per procedre con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilità di annullare?" ;
++	Message [ italian ] = "Per procedere con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilità di annullare?" ;
+ 	Message [ portuguese_brazilian ] = "Para prosseguir com esta ação, você deve primeiro desativar a função \"desfazer\".\nDeseja desativar a função \"desfazer\"?" ;
+ 	Message [ portuguese ] = "Para poder anular esta acção é necessária muita memória.\nDeseja cancelar esta função?" ;
+ 	Message [ finnish ] = "Tämän toiminnon kumoamiseen tarvitaan suuri määrä muistia.\nHaluatko peruuttaa kumoamisen?" ;
+--- sw/source/ui/docvw/docvw.src.orig	2004-09-24 18:38:34.654976561 +0200
++++ sw/source/ui/docvw/docvw.src	2004-09-24 18:38:45.857194567 +0200
+@@ -1742,7 +1742,7 @@
+ 	Text [ portuguese_brazilian ] = "Formatado" ;
+ 	Text [ swedish ] = "Attributerat" ;
+ 	Text [ danish ] = "Formateret" ;
+-	Text [ italian ] = "Fomattato" ;
++	Text [ italian ] = "Formattato" ;
+ 	Text [ spanish ] = "Formateado" ;
+ 	Text [ french ] = "Formaté" ;
+ 	Text [ dutch ] = "Opgemaakt" ;
+--- sw/source/ui/misc/glosbib.src.orig	2004-09-24 18:40:01.197660882 +0200
++++ sw/source/ui/misc/glosbib.src	2004-09-24 18:40:11.363858757 +0200
+@@ -316,7 +316,7 @@
+ 		Text[ french ] = "Chemin";
+ 		Text[ spanish ] = "Ruta";
+ 		Text[ finnish ] = "Polku";
+-		Text[ italian ] = "Percoso";
++		Text[ italian ] = "Percorso";
+ 		Text[ danish ] = "Sti";
+ 		Text[ swedish ] = "Sökväg";
+ 		Text[ polish ] = "Œcie¿ka";
+--- scp/source/office/basic.lng.orig	2004-09-24 11:37:52.000000000 +0200
++++ scp/source/office/basic.lng	2004-09-25 09:35:36.216182919 +0200
+@@ -179,7 +179,7 @@
+ 33 = "%PRODUCTNAME n'a malheureusement pas réussi à détecter les fichiers destinés à l'installation de la base de données Adabas. Si vous souhaitez utiliser l'intégration d'Adabas sous %PRODUCTNAME, lancez manuellement le programme d'installation d'Adabas, une fois l'installation de %PRODUCTNAME terminée. Le jeu d'installation d'Adabas peut être téléchargé à partir de l'Internet."
+ 34 = "%PRODUCTNAME no pudo encontrar los archivos para la instalación de la base de datos Adabas. Si desea usar la integración de Adabas en %PRODUCTNAME, inicie 'manualmente' el programa de instalación de Adabas después de instalar %PRODUCTNAME. El programa de instalación de Adabas lo puede descargar desde Internet."
+ 35 = "%PRODUCTNAME ei löytänyt Adabas-tietokannan asennuksessa tarvittavia tiedostoja. Jos haluat integroida Adabas-tietokannan %PRODUCTNAMEen, suorita Adabas-asennusohjelma %PRODUCTNAMEn asennuksen jälkeen. Adabas-asennusohjelma voidaan ladata Internetistä."
+-39 = "Non è stato possibile trovare i file per l'istallazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
++39 = "Non è stato possibile trovare i file per l'installazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
+ 45 = "%PRODUCTNAME kunne desværre ikke finde filerne til installation af Adabas-databasen. Hvis du ønsker at bruge Adabas-integration i %PRODUCTNAME, skal du starte installationsprogrammet til Adabas manuelt efter installation af %PRODUCTNAME. Adabas-installationsfilerne kan hentes på Internet."
+ 46 = "Tyvärr kunde %PRODUCTNAME inte hitta filerna för installation av Adabas-databasen. Om du vill använda Adabas-integrationen i %PRODUCTNAME, startar du setupprogrammet för Adabas manuellt när installationen av %PRODUCTNAME är avslutad. Adabas-installationsfilerna kan laddas ner från Internet."
+ 48 = "Program %PRODUCTNAME nie znalaz³ plików potrzebnych do zainstalowania bazy danych Adabas. Je¿eli chcesz zintegrowaæ bazê danych Adabas z programem %PRODUCTNAME, to uruchom jej program instalacyjny po zakoñczeniu instalacji %PRODUCTNAME. Pliki instalacyjne bazy danych Adabas mo¿na pobraæ z Internetu."
+--- scp/source/office/unxbasic.lng.orig	2004-09-25 09:36:48.023647109 +0200
++++ scp/source/office/unxbasic.lng	2004-09-25 09:37:03.035953143 +0200
+@@ -93,7 +93,7 @@
+ 33 = "%PRODUCTNAME n'a malheureusement pas réussi à détecter les fichiers destinés à l'installation de la base de données Adabas. Si vous souhaitez utiliser l'intégration d'Adabas sous %PRODUCTNAME, lancez manuellement le programme d'installation d'Adabas, une fois l'installation de %PRODUCTNAME terminée. Le jeu d'installation d'Adabas peut être téléchargé à partir de l'Internet."
+ 34 = "%PRODUCTNAME no pudo encontrar los archivos para la instalación de la base de datos Adabas. Si desea usar la integración de Adabas en %PRODUCTNAME, inicie 'manualmente' el programa de instalación de Adabas después de instalar %PRODUCTNAME. El programa de instalación de Adabas lo puede descargar desde Internet."
+ 35 = "%PRODUCTNAME ei löytänyt Adabas-tietokannan asennuksessa tarvittavia tiedostoja. Jos haluat integroida Adabas-tietokannan %PRODUCTNAMEen, suorita Adabas-asennusohjelma %PRODUCTNAMEn asennuksen jälkeen. Adabas-asennusohjelma voidaan ladata Internetistä."
+-39 = "Non è stato possibile trovare i file per l'istallazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
++39 = "Non è stato possibile trovare i file per l'installazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet."
+ 45 = "%PRODUCTNAME kunne desværre ikke finde filerne til installation af Adabas-databasen. Hvis du ønsker at bruge Adabas-integration i %PRODUCTNAME, skal du starte installationsprogrammet til Adabas manuelt efter installation af %PRODUCTNAME. Adabas-installationsfilerne kan hentes på Internet."
+ 46 = "Tyvärr kunde %PRODUCTNAME inte hitta filerna för installation av Adabas-databasen. Om du vill använda Adabas-integrationen i %PRODUCTNAME, startar du setupprogrammet för Adabas manuellt när installationen av %PRODUCTNAME är avslutad. Adabas-installationfilerna kan laddas ner från Internet."
+ 48 = "Program %PRODUCTNAME nie znalaz³ plików potrzebnych do zainstalowania bazy danych Adabas. Je¿eli chcesz zintegrowaæ bazê danych Adabas z programem %PRODUCTNAME, to uruchom jej program instalacyjny po zakoñczeniu instalacji %PRODUCTNAME. Pliki instalacyjne bazy danych Adabas mo¿na pobraæ z Internetu."
+--- setup2/source/ui/pages/vefun.src.orig	2004-09-25 09:38:07.692270887 +0200
++++ setup2/source/ui/pages/vefun.src	2004-09-25 09:38:21.625554800 +0200
+@@ -642,7 +642,7 @@
+ 		Text [ portuguese_brazilian ] = "Para reiniciar agora, clique em '%1'. Utilize '%2' para concluir o programa de instalação." ;
+ 		Text [ swedish ] = "För att göra en omstart klicka på '%1'. Klickar du däremot på '%2', kommer installationsprogrammet att avslutas." ;
+ 		Text [ danish ] = "Klik på '%1' for at genstarte. Hvis du klikker på '%2' afsluttes installationsprogrammet derimod." ;
+-		Text [ italian ] = "Per effettuare adesso un riavvio, cliccate su '%1'. Cliccando invece su '%2', il programma di installazione verrà conlcuso." ;
++		Text [ italian ] = "Per effettuare adesso un riavvio, cliccate su '%1'. Cliccando invece su '%2', il programma di installazione verrà concluso." ;
+ 		Text [ spanish ] = "Pulse sobre '%1' para reiniciar el sistema. Pulse '%2' para terminar el programa de instalación." ;
+ 		Text [ french ] = "Cliquez sur '%1' pour redémarrer immédiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ;
+ 		Text [ dutch ] = "Klik op '%1' om het systeem opnieuw op te starten. Klikt u echter op '%2', dan wordt het installeren beëindigd zonder opnieuw op te starten." ;
+--- sc/source/ui/src/scfuncs.src.orig5	2004-09-25 09:39:33.508019211 +0200
++++ sc/source/ui/src/scfuncs.src	2004-09-25 09:40:17.395913054 +0200
+@@ -10997,7 +10997,7 @@
+ 			Text = "Periode. Die Periode, für die die Tilgung berechnet wird. P = 1 heißt für die erste Periode, P = ZZR für die letzte." ;
+ 			Text [ english ] = "specifies the period and must be in the range 1 to nper." ;
+ 			Text [ norwegian ] = "Periode. Perioden avdragene beregnes for. Per=1 gir første periode, P=PERIODER gir siste periode." ;
+-			Text [ italian ] = "La durata per la quale si desidera calcolare l'ammortamento .  1 = primo periodo, Numero rate = ultimo periodo." ;
++			Text [ italian ] = "La durata per la quale si desidera calcolare l'ammortamento.  1 = primo periodo, Numero rate = ultimo periodo." ;
+ 			Text [ portuguese_brazilian ] = "Período. O período para o qual os reembolsos são calculados. Per = 1 denota o primeiro período, P = NPER para o último" ;
+ 			Text [ portuguese ] = "é o período para o qual se calcula a amortização. 1 indica o primeiro período, nper o último." ;
+ 			Text [ finnish ] = "Kausi Kausi, jonka maksut lasketaan. P = 1 tarkoittaa ensimmäistä ja P = NPER viimeistä kautta" ;
+--- setup2/source/ui/pages/preadygo.src.orig	2004-09-24 11:38:02.000000000 +0200
++++ setup2/source/ui/pages/preadygo.src	2004-09-25 09:42:06.521134806 +0200
+@@ -319,7 +319,7 @@
+ 		Text[ french ] = "L'espace disponible sur l'unité cible ne suffit pas pour l'installation de %PRODUCTPATCHNAME. L'installation requiert environ %SPACE_NEEDED Ko de plus.";
+ 		Text[ spanish ] = "La unidad de destino no dispone de espacio suficiente para instalar %PRODUCTPATCHNAME. Se requieren unos %SPACE_NEEDED KB más.";
+ 		Text[ finnish ] = "Kohdeasemalla ei ole tarpeeksi tilaa kohteen %PRODUCTPATCHNAME asentamiseen. Lisätilaa tarvitaan noin %SPACE_NEEDED kt.";
+-		Text[ italian ] = "Il drive di destinazione non ha lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB.";
++		Text[ italian ] = "Il drive di destinazione non ha lo spazio sufficiente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB.";
+ 		Text[ danish ] = "Der er ikke tilstrækkelig ledig plads på destinationsdrevet til at installere %PRODUCTPATCHNAME. Der kræves ca. %SPACE_NEEDED KB yderligere.";
+ 		Text[ swedish ] = "Det finns inte tillräckligt med utrymme på målenheten för att %PRODUCTPATCHNAME ska kunna installeras. Det behövs ungefär %SPACE_NEEDED KB ytterligare.";
+ 		Text[ polish ] = "Za ma³o miejsca na dysku docelowym, aby zainstalowaæ aktualizacjê %PRODUCTPATCHNAME. Potrzeba jeszcze oko³o %SPACE_NEEDED KB.";
+--- svx/source/dialog/page.src.orig	2004-09-25 09:45:15.537980791 +0200
++++ svx/source/dialog/page.src	2004-09-25 10:01:44.441194427 +0200
+@@ -4014,7 +4014,7 @@
+ 		< "C6" ; PAPERSIZE_C6 ; > ;
+ 		< "C65" ; PAPERSIZE_C65 ; > ;
+ 		< "DL" ; PAPERSIZE_DL ; > ;
+-		< "Diapoisitiva" ; PAPERSIZE_DIA ; > ;
++		< "Diapositiva" ; PAPERSIZE_DIA ; > ;
+ 		< "Schermo" ; PAPERSIZE_SCREEN ; > ;
+ 		< "16 kai" ; PAPERSIZE_KAI16; > ;
+ 		< "32 kai" ; PAPERSIZE_KAI32; > ;
+--- sc/idl/scalc.idl.orig	2000-09-18 18:44:47.000000000 +0200
++++ sc/idl/scalc.idl	2004-09-25 10:07:29.607258546 +0200
+@@ -5389,7 +5389,7 @@
+ 	//idlpp HelpText [ french ] = "Modifier les prédéfinitions de format d'une ou plusieurs cellules" ;
+ 	//idlpp ConfigName [ spanish ] = "Formatear celda" ;
+ 	//idlpp HelpText [ spanish ] = "Editar formatos predeterminados para una o más celdas" ;
+-	//idlpp ConfigName [ italian ] = "Fromatta cella" ;
++	//idlpp ConfigName [ italian ] = "Formatta cella" ;
+ 	//idlpp HelpText [ italian ] = "Modifica le preimpostazioni per un o più celle" ;
+ 	//idlpp ConfigName [ danish ] = "FormatCell" ;
+ 	//idlpp HelpText [ danish ] = "Redigèr typografi for en eller flere celler" ;
+--- sc/sdi/scslots.src.orig	2004-09-24 11:37:31.000000000 +0200
++++ sc/sdi/scslots.src	2004-09-25 10:08:34.683588109 +0200
+@@ -258,7 +258,7 @@
+ 	SlotName[ dutch ] = "Cel opmaken";
+ 	SlotName[ french ] = "Formater la cellule";
+ 	SlotName[ spanish ] = "Formatear celda";
+-	SlotName[ italian ] = "Fromatta cella";
++	SlotName[ italian ] = "Formatta cella";
+ 	SlotName[ danish ] = "Formater celle";
+ 	SlotName[ swedish ] = "Formatera cell";
+ 	SlotName[ polish ] = "Formatuj komórkê";
+--- svx/source/dialog/sdstring.src.orig	2004-09-25 10:10:16.930675873 +0200
++++ svx/source/dialog/sdstring.src	2004-09-25 10:10:32.883001471 +0200
+@@ -582,7 +582,7 @@
+ 	Text = "Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen." ;
+ 	Text [ ENGLISH ] = "The Bitmap was modified without Save? \nChange the selected Bitmap or add a new Bitmap." ;
+ 	Text [ norwegian ] = "Bildet ble endret, men ikke lagret. \nEndre det valgte bildet, eller legg til et nytt." ;
+-	Text [ italian ] = "La bitmap è stata modificata ma non salvata \nPotete cambiare la bitmap selezionata \no naggiungerne una nuova." ;
++	Text [ italian ] = "La bitmap è stata modificata ma non salvata \nPotete cambiare la bitmap selezionata \no aggiungerne una nuova." ;
+ 	Text [ portuguese_brazilian ] = "O bitmap foi modificado sem salvar. \nModifique o bitmap selecionado ou adicione um novo bitmap." ;
+ 	Text [ portuguese ] = "O bitmap foi alterado e não guardado? \nPoderá modificar o bitmap seleccionado \nou adicionar um novo." ;
+ 	Text [ finnish ] = "Bittikarttaa ei tallennettu muutoksen jälkeen. \nMuuta valittua bittikarttaa tai lisää uusi bittikartta." ;
+--- svx/source/dialog/sdstring.src.orig2	2004-09-25 10:10:32.883001000 +0200
++++ svx/source/dialog/sdstring.src	2004-09-25 10:11:54.267662092 +0200
+@@ -815,7 +815,7 @@
+ 	Text = "Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen." ;
+ 	Text [ ENGLISH ] = "The Linestyle was modified without Save? \nChange the selected Linestyle or add a new Linestyle." ;
+ 	Text [ norwegian ] = "Linjestilen ble endret, men ikke lagret. \nEndre den valgte linjestilen eller legg til en ny." ;
+-	Text [ italian ] = "Lo stile è stato modificato ma non salvato.\nPotetecambiare lo stile selezionato\\o aggiungerne uno nuovo." ;
++	Text [ italian ] = "Lo stile è stato modificato ma non salvato.\nPotete cambiare lo stile selezionato\\o aggiungerne uno nuovo." ;
+ 	Text [ portuguese_brazilian ] = "O estilo de linha foi modificado sem salvar. \nModifique o estilo de linha selecionado ou adicione um novo estilo de linha." ;
+ 	Text [ portuguese ] = "O fim de linha foi modificado e não guardado.\nPoderá modificar o fim de linha seleccionado\nou adicionar um novo." ;
+ 	Text [ finnish ] = "Viivatyyliä ei tallennettu muutoksen jälkeen. \nMuuta valittua viivatyyliä tai lisää uusi viivatyyli." ;
+--- svx/source/items/svxerr.src.orig2	2004-09-25 10:14:17.880590564 +0200
++++ svx/source/items/svxerr.src	2004-09-25 10:16:46.979628616 +0200
+@@ -801,7 +801,7 @@
+ 		Text[ swedish ] = "Formulärskiktet laddades inte eftersom nödvändig IO-service (stardiv.uno.io.*) inte kunde instantieras.";
+ 		Text[ language_user1 ] = "Plast obrazca se ni naložila, ker zahtevanih IO-storitev (stardiv.uno.io*) ni bilo mogo�e uporabiti";
+ 		Text[ russian ] = "Íå çàãðóæåí ñëîé ôîðìû, òàê êàê íå óäàëîñü ñîçäàòü ýêçåìïëÿð ñëóæáû IO (stardiv.uno.io.*).";
+-		Text[ italian ] = "Lo strato del formulario non è stato caricato poichè stato possibile creare i servizi IO (strdiv.uno.io.*) necessari.";
++		Text[ italian ] = "Lo strato del formulario non è stato caricato poiché non è stato possibile creare i servizi IO (strdiv.uno.io.*) necessari.";
+ 		Text[ danish ] = "Formularlaget blev ikke indlæst, fordi det ikke var muligt at instantiere den nødvendige IO-service (stardiv.uno.io.*)";
+ 		Text[ polish ] = "Warstwa formularza nie zosta³a za³adowana, poniewa¿ nie mo¿na utworzyæ instancji wymaganych us³ug we-wy (stardiv.uno.io.*)";
+ 		Text[ portuguese_brazilian ] = "A camada do formulário não foi carregada, pois não foi possível criar uma instância dos serviços de ES necessários (stardiv.uno.io.*)";
+--- readlicense_oo/docs/readme/readme.xrm.orig6	2004-09-25 10:23:19.245633102 +0200
++++ readlicense_oo/docs/readme/readme.xrm	2004-09-25 10:23:51.604295424 +0200
+@@ -3668,7 +3668,7 @@
+ 			<Text id="aw453" xml:lang="fr">En raison d&apos;un problème rencontré dans le Java(TM) Access Bridge, vous devez définir &quot;Anglais (États-Unis)&quot; (ou &quot;EN-us&quot;) comme langue (environnement linguistique) du système d&apos;exploitation, ceci afin d&apos;activer la coopération avec des logiciels tels que ZoomText.(Attention ! Le programme WindowEyes ne fonctionne pas avec OpenOffice.org étant donné qu&apos;il ne supporte pas la Java Accessibility API.)</Text>
+ 			<Text id="aw453" xml:lang="es">Debido a un problema con Java(TM) Access Bridge, deberá establecer el idioma del sistema operativo local en &quot;Inglés (Reino Unido)&quot; o &quot;(EN-US)&quot;. Sólo con esta configuración podrá trabajar con programas como ZoomText.</Text>
+ 			<Text id="aw453" xml:lang="fi">Due to a problem within the Java(TM) Accessibility Bride it is necessary to set the operating system locale to &quot;English (United States)&quot;. Only this setting will enable co-operation with programs like ZoomText.</Text>
+-			<Text id="aw453" xml:lang="it">Dovuto a un problema di Java (TM) Access Bridge è necessario impostare la lingua del sistema operativo locale su &quot;Inglese (USA)&quot; (&quot;EN-US&quot;). In questo modo sarà possibile lavorare con programmi del tipo ZoomText. (Nota: il programma WindowEyes non funziona con OpenOffice.org perchè non supporta l&apos;API Java Accessibility).</Text>
++			<Text id="aw453" xml:lang="it">Dovuto a un problema di Java (TM) Access Bridge è necessario impostare la lingua del sistema operativo locale su &quot;Inglese (USA)&quot; (&quot;EN-US&quot;). In questo modo sarà possibile lavorare con programmi del tipo ZoomText. (Nota: il programma WindowEyes non funziona con OpenOffice.org perché non supporta l&apos;API Java Accessibility).</Text>
+ 			<Text id="aw453" xml:lang="cs">Vzhledem k potížím s Java(TM) Access Bridge musíte nastavit jazyk systému na &quot;Anglicky (Spojené státy)&quot; nebo &quot;(EN-us)&quot;. Jedině při tomto nastavení můžete používat programy, jako např. ZoomText. (Poznámka: Program WindowsEyes nespolupracuje s OpenOffice.org, protože nepodporuje Java Accessibility API.)</Text>
+ 			<Text id="aw453" xml:lang="sk">Vzhľadom k problémom s Java(TM) Access Bridge musíte nastaviť jazyk systému na &quot;Anglický (Spojené štáty)&quot; alebo &quot;(EN-us)&quot;. Iba pri tomto nastavení môžete používať programy, ako napr. ZoomText. (Poznámka: Program WindowsEyes nespolupracuje s OpenOffice.org, pretože nepodporuje Java Accessibility API.)</Text>
+ 			<Text id="aw453" xml:lang="da">På grund af et problem i Java(TM) Access Bridge skal du sætte operativsystemets lokalitetsindstilling til &quot;Engelsk (USA)&quot; eller &quot;(EN-us)&quot;. Kun under denne indstilling vil du kunne bruge programmer som ZoomText. (Bemærk, at programmet WindowEyes ikke virker sammen med OpenOffice.org, fordi det ikke understøtter Java Accessibility API.)</Text>
+--- sw/sdi/swslots.src.orig3	2004-09-25 10:25:27.253251316 +0200
++++ sw/sdi/swslots.src	2004-09-25 10:25:36.021430230 +0200
+@@ -2087,7 +2087,7 @@
+ 	SlotName[ dutch ] = "Naar einde volgende pagina";
+ 	SlotName[ french ] = "À la fin de la page suivante";
+ 	SlotName[ spanish ] = "Ir al final de la página siguiente";
+-	SlotName[ italian ] = "Alla fine dell pagina successiva";
++	SlotName[ italian ] = "Alla fine della pagina successiva";
+ 	SlotName[ danish ] = "Til næste sides slutning";
+ 	SlotName[ swedish ] = "Till slutet av nästa sida";
+ 	SlotName[ polish ] = "Do koñca nastêpnej strony";
+--- starmath/sdi/smslots.src.orig	2004-09-24 11:38:08.000000000 +0200
++++ starmath/sdi/smslots.src	2004-09-25 10:27:54.263250424 +0200
+@@ -866,7 +866,7 @@
+ 	SlotName[ dutch ] = "Symbolen";
+ 	SlotName[ french ] = "Symboles";
+ 	SlotName[ spanish ] = "Símbolos";
+-	SlotName[ italian ] = "Symboli";
++	SlotName[ italian ] = "Simboli";
+ 	SlotName[ danish ] = "Symboler";
+ 	SlotName[ swedish ] = "Symboler";
+ 	SlotName[ polish ] = "Symbole";
+--- wizards/source/template/template.src.orig	2004-09-24 11:38:43.000000000 +0200
++++ wizards/source/template/template.src	2004-09-25 10:29:28.955181542 +0200
+@@ -683,7 +683,7 @@
+ 	Text[ dutch ] = "Fout";
+ 	Text[ french ] = "Une erreur est survenue !";
+ 	Text[ spanish ] = "Ha ocurrido un error.";
+-	Text[ italian ] = "Si è verificato un'errore.";
++	Text[ italian ] = "Si è verificato un errore.";
+ 	Text[ swedish ] = "Det har uppstått ett fel!";
+ 	Text[ russian ] = "Îøèáêà";
+ 	Text[ greek ] = "ÓöÜëìá";
+--- sysui/oounix/office/cde/impress.lng.orig	2004-09-25 10:30:36.604560864 +0200
++++ sysui/oounix/office/cde/impress.lng	2004-09-25 10:30:47.992793038 +0200
+@@ -51,7 +51,7 @@
+ 33 = "Modèle de présentation %PRODUCTNAME"
+ 34 = "Plantilla de presentación %PRODUCTNAME"
+ 35 = "%PRODUCTNAME - Esitysmalli"
+-39 = "Modello di poresentazione %PRODUCTNAME"
++39 = "Modello di presentazione %PRODUCTNAME"
+ 45 = "%PRODUCTNAME-præsentationsskabelon"
+ 46 = "%PRODUCTNAME-presentationsmall"
+ 48 = "%PRODUCTNAME Presentation Template"
diff --git a/patches/OOO_1_1/native-fpicker-not-default.diff b/patches/OOO_1_1/native-fpicker-not-default.diff
new file mode 100644
index 000000000..26de5a2de
--- /dev/null
+++ b/patches/OOO_1_1/native-fpicker-not-default.diff
@@ -0,0 +1,17 @@
+Index: Common.xcu
+===================================================================
+RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
+retrieving revision 1.13.34.2
+diff -u -r1.13.34.2 Common.xcu
+--- officecfg/registry/data/org/openoffice/Office/Common.xcu	6 Jul 2004 10:50:06 -0000	1.13.34.2
++++ officecfg/registry/data/org/openoffice/Office/Common.xcu	21 Dec 2004 15:40:02 -0000
+@@ -437,4 +437,9 @@
+       </node>
+     </node>
+   </node>
++  <node oor:name="Misc">
++    <prop oor:name="UseSystemFileDialog" oor:type="xs:boolean">
++      <value>false</value>
++    </prop>
++  </node> 
+ </oor:component-data>
diff --git a/patches/OOO_1_1/officecfg-dont-deliver-report-wizard.diff b/patches/OOO_1_1/officecfg-dont-deliver-report-wizard.diff
new file mode 100644
index 000000000..441b30ad9
--- /dev/null
+++ b/patches/OOO_1_1/officecfg-dont-deliver-report-wizard.diff
@@ -0,0 +1,89 @@
+--- scp/source/office/profile.scp.report	2004-11-05 00:34:03.817000040 +0000
++++ scp/source/office/profile.scp	2004-11-05 00:41:47.927318603 +0000
+@@ -1171,42 +1171,6 @@
+         Styles           = (CFG_STRING, CREATE);
+ End
+ 
+-ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M9_URL
+-    #ifdef WEB_PRODUCT
+-        ModuleID         = GID_MODULE_PRG_WRT;
+-    #else
+-        ModuleID         = GID_MODULE_PRG_WRT_BIN;
+-    #endif
+-        Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m9']";
+-        Key              = "URL";
+-        Value            = "service:com.sun.star.wizards.report.CallReportWizard?start";
+-        Styles           = (CFG_STRING, CREATE);
+-End
+-
+-ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M9_TARGETNAME
+-    #ifdef WEB_PRODUCT
+-        ModuleID         = GID_MODULE_PRG_WRT;
+-    #else
+-        ModuleID         = GID_MODULE_PRG_WRT_BIN;
+-    #endif
+-        Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m9']";
+-        Key              = "TargetName";
+-        Value            = "_self";
+-        Styles           = (CFG_STRING, CREATE);
+-End
+-
+-ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M9_IMAGEIDENTIFIER
+-    #ifdef WEB_PRODUCT
+-        ModuleID         = GID_MODULE_PRG_WRT;
+-    #else
+-        ModuleID         = GID_MODULE_PRG_WRT_BIN;
+-    #endif
+-        Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m9']";
+-        Key              = "ImageIdentifier";
+-        Value            = "private:image/3216";
+-        Styles           = (CFG_STRING, CREATE);
+-End
+-
+ ConfigurationItem GID_CONFIGURATIONITEM_COMMON_MENUS_WIZARD_M10_URL
+         ModuleID         = GID_MODULE_SO_ROOT;
+         Path             = "org.openoffice.Office.Common/Menus/Wizard/*['m10']";
+@@ -3464,43 +3428,6 @@
+ 	Styles		 = (CFG_STRING);
+ End
+ 
+-#ifdef FAT_PRODUCT
+-
+-StarRegistryItem GID_STARREGISTRYITEM_SERVICES_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/SERVICES/com.sun.star.wizards.report.CallReportWizard";
+-    SeqValue    = "com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation";
+-    Styles      = (NETWORK);
+-End
+-
+-StarRegistryItem GID_STARREGISTRYITEM_IMPLEMENTATIONS_SERVICES_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/IMPLEMENTATIONS/com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation/UNO/SERVICES/com.sun.star.wizards.report.CallReportWizard";
+-    Value       = "";
+-    Styles      = (NETWORK);
+-End
+-
+-StarRegistryItem GID_STARREGISTRYITEM_IMPLEMENTATIONS_ACTIVATOR_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/IMPLEMENTATIONS/com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation/UNO/ACTIVATOR";
+-    Value       = "com.sun.star.loader.Java2";
+-    Styles      = (NETWORK);
+-End
+-
+-StarRegistryItem GID_STARREGISTRYITEM_IMPLEMENTATIONS_LOCATION_REPORTWIZARD
+-    ModuleID    = GID_MODULE_SO_ROOT;
+-    RegistryID  = GID_STARREGISTRY_SERVICES_RDB;
+-    Key         = "/IMPLEMENTATIONS/com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation/UNO/LOCATION";
+-    Value       = "vnd.sun.star.expand:$SYSBINDIR/classes/report.jar";
+-    Styles      = (NETWORK);
+-End
+-
+-#endif
+-
+-
+ // HACK: write accessibility bridge service info
+ 
+ #if ! ( defined (WEB_PRODUCT) || defined (SRV_PRODUCT) )
diff --git a/patches/OOO_1_1/qpro-hxx.diff b/patches/OOO_1_1/qpro-hxx.diff
new file mode 100644
index 000000000..582cbb231
--- /dev/null
+++ b/patches/OOO_1_1/qpro-hxx.diff
@@ -0,0 +1,50 @@
+--- /dev/null	2004-08-25 23:04:59.000000000 +0530
++++ sc/source/filter/inc/qpro.hxx	2004-12-15 12:41:25.000000000 +0530
+@@ -0,0 +1,47 @@
++#ifndef _QPRO_HXX
++#define _QPRO_HXX
++
++#include "flttools.hxx"
++#include "filter.hxx"
++#include "scerrors.hxx"
++#include "document.hxx"
++#include "cell.hxx"
++#include "math.h"
++
++#include <vcl/color.hxx>
++                                                                                                                  
++                                                                                                                  
++// Stream wrapper class
++class BiffReader
++{
++  protected:
++       sal_uInt16  	mnId;
++       sal_uInt16  	mnLength;
++       sal_uInt32  	mnOffset;
++       rtl_TextEncoding meCharSet;
++                                                                                                                  
++  public:
++       sal_uInt8 	Align[ 256 ];
++       sal_uInt8 	Font[ 256 ];
++       sal_uInt16 	FontRecord[ 256 ];
++       sal_uInt16 	FontSize[ 256 ];
++       sal_Int16	FontColor[ 256 ];
++       String 		FontType[ 256 ];
++       bool 		EndOfFile;
++       SvStream   	*mpStream;
++        	        BiffReader( SfxMedium & rMedium );
++                        ~BiffReader();
++       bool     	recordsLeft() { return mpStream && !mpStream->IsEof(); }
++       bool       	nextRecord();
++       void 	  	SetFormat( ScDocument* pDoc, sal_uInt8 nCol, sal_uInt16 nRow, sal_uInt8 nTab, sal_uInt16 nStyle );
++       sal_uInt16 	getId() { return mnId; }
++       sal_uInt16 	getLength() { return mnLength; }
++       void       	readString( String &rString, sal_uInt16 nLength );
++       SvStream&  	operator>>( sal_uInt8 & rByte ); 
++       SvStream&  	operator>>( sal_uInt16 & rWord );
++       SvStream&        operator>>( sal_Int8 & rByte );
++       ColorData	MapIntToColor( sal_uInt16 nColor );
++       
++};
++#endif
++
diff --git a/patches/OOO_1_1/qproform-cxx.diff b/patches/OOO_1_1/qproform-cxx.diff
new file mode 100644
index 000000000..5237b094a
--- /dev/null
+++ b/patches/OOO_1_1/qproform-cxx.diff
@@ -0,0 +1,604 @@
+--- /dev/null	2004-08-25 23:04:59.000000000 +0530
++++ sc/source/filter/qpro/qproform.cxx	2004-12-15 14:04:52.678608080 +0530
+@@ -0,0 +1,601 @@
++#ifdef PCH
++#include "filt_pch.hxx"
++#endif
++                                                                                                                  
++#pragma hdrstop
++                                                                                                                  
++//------------------------------------------------------------------------
++                                                                                                                  
++#include "decl.h"
++
++#ifndef _QPRO_HXX
++#include "qpro.hxx"
++#endif
++
++#include "qproform.hxx"
++#include "compiler.hxx"
++#include "namebuff.hxx"
++#include "root.hxx"
++#include "ftools.hxx"
++#include "tool.h"
++#include <math.h>
++
++static const sal_Char*          GetAddInName( const UINT8 nIndex );
++                                                                                                                  
++static DefTokenId                       lcl_KnownAddIn( const ByteString& sTest );
++                                                                                                                  
++void QProToSc::ReadSRD( SingleRefData& rSRD, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 nRelBit )
++{
++
++	UINT16 nTmp = nRelBit & 0x1fff;
++	rSRD.InitAddress( ScAddress( nCol, (~nTmp + 1), 0 ) );
++	if( nRelBit & 0x4000 )
++	{
++                rSRD.nRelCol = nCol;
++        	rSRD.SetColRel( TRUE );
++	}
++	else
++	{
++		rSRD.nCol = nCol;
++        	rSRD.SetColRel( FALSE );
++	}
++	if( nRelBit & 0x2000 )
++	{
++		rSRD.nRelRow = (~nTmp + 1);
++		rSRD.nRelRow = (UINT16)(nTmp << 3);
++		rSRD.nRelRow /= 8;
++		
++        	rSRD.SetRowRel( TRUE );
++	}
++	else
++	{
++		rSRD.nRow = nTmp;
++        	rSRD.SetRowRel( FALSE );
++	}
++        if( nRelBit & 0x8000 )
++        {
++                rSRD.nRelTab = nPage;
++                rSRD.SetTabRel( TRUE );
++        }
++        else
++        {
++                rSRD.nTab = nPage;
++                rSRD.SetTabRel( FALSE );
++        }
++        
++}
++  
++void QProToSc::Reset( ScAddress aEingPos )
++{
++        QProConverterBase::Reset();
++                                                                                                                  
++        TokenId nEins = aPool.Store( 1.0 );
++                                                                                                                  
++        aPool << ocClose << ocAdd << nEins;
++        nAddToken = aPool.Store();
++                                                                                                                  
++        aPool << ocClose << ocSub << nEins;
++        nSubToken = aPool.Store();
++                                                                                                                  
++        n0Token = aPool.Store( 0.0 );
++}
++
++QProToSc::QProToSc( BiffReader& rStream ) :
++        QProConverterBase( rStream, 128 )
++{
++}
++void QProToSc::DoFunc( DefTokenId eOc, BYTE nArgs, const sal_Char* pExtString )
++{
++        TokenId                                         eParam[ 256 ];
++        INT32                                           nLauf;
++        TokenId                                         nPush, nPush1;
++                                                                                                                  
++        BOOL                                            bAddIn = FALSE;
++        BOOL                                            bNeg = FALSE;
++                                                                                                                  
++                if( eOc == ocNoName )
++                {
++                        bAddIn = TRUE;
++                        nPush = aPool.Store( eOc );
++                        aPool << nPush;
++                }
++        
++                                                                                                                  
++        for( nLauf = 0 ; nLauf < nArgs; nLauf++ )
++                aStack >> eParam[ nLauf ];
++                                                                                                                  
++        switch( eOc )
++        {
++                case ocIndex:
++                        nPush = eParam[ 0 ];
++                        eParam[ 0 ] = eParam[ 1 ];
++                        eParam[ 1 ] = nPush;
++                        IncToken( eParam[ 0 ] );
++                        IncToken( eParam[ 1 ] );
++                        break;
++                case ocIKV:
++                {
++                        nPush = eParam[ 0 ];
++                        eParam[ 0 ] = eParam[ 1 ];
++                        eParam[ 1 ] = nPush;
++                }
++                        break;
++                case ocGetYear:
++                {
++                        nPush = aPool.Store( 1900.0 );
++                        aPool << ocOpen;
++                }
++                        break;
++                case ocChose:
++                {
++                        IncToken( eParam[ nArgs- 1 ] );
++                }
++                        break;
++                case ocFind:
++                case ocHLookup:
++                case ocVLookup:
++                {
++                        IncToken( eParam[ 0 ] );
++                }
++                        break;
++                case ocMid:
++                case ocReplace:
++                {
++                        IncToken( eParam[ nArgs- 2 ] );
++                }
++                        break;
++                case ocZins:
++                {
++                        nArgs= 4;
++                        eParam[ 3 ] = eParam[ 0 ];      // 3. -> 1.
++                        eParam[ 0 ] = eParam[ 2 ];      // 1. -> 4.
++                        NegToken( eParam[ 1 ] );        // 2. -> -2. (+ 2. -> 3.)
++                        eParam[ 2 ] = n0Token;          //    -> 2. als Default
++                }
++                        break;
++        }
++                                                                                                                  
++        if( !bAddIn )
++                aPool << eOc;
++
++        aPool << ocOpen;
++                                                                                                                  
++        if( nArgs> 0 )
++        {
++                INT16 nNull = -1;       
++                                                                                                                  
++                INT16 nLast = nArgs- 1;
++                                                                                                                  
++                if( eOc == ocRMZ )
++                {        aPool << eParam[ 1 ] << ocSep << eParam[ 0 ] << ocSep
++                                << ocNegSub << eParam[ 2 ];
++                }
++                else
++                {        aPool << eParam[ nLast ];
++                                                                                                                  
++                        for( nLauf = nLast - 1 ; nLauf >= 0 ; nLauf-- )
++                        {
++                                if( nLauf != nNull )
++                                        aPool << ocSep << eParam[ nLauf ];
++                        }
++                }
++        }
++                                                                                                                  
++                                                                                                                  
++        if( eOc == ocGetYear )
++        {
++                aPool << ocClose << ocSub << nPush;
++        }
++        else if( eOc == ocFixed )
++        {
++                aPool << ocSep << ocTrue << ocOpen << ocClose;
++        }
++        else if( eOc == ocFind )
++        {
++                nPush1 = aPool.Store();
++                DecToken( nPush1 );
++                aPool << nPush1;
++        }
++                                                                                                                  
++        aPool << ocClose;
++                                                                                                                  
++        aPool >> aStack;
++                                                                                                                  
++        if( bNeg )
++        {
++                aPool << ocOpen << ocSub << aStack << ocClose;
++                aPool >> aStack;
++        }
++}
++
++void QProToSc::IncToken( TokenId &rParam )
++{
++        aPool << ocOpen << rParam << nAddToken;
++        rParam = aPool.Store();
++}
++                                                                                                                  
++                                                                                                                  
++void QProToSc::DecToken( TokenId &rParam )
++{
++        aPool << ocOpen << rParam << nSubToken;
++        rParam = aPool.Store();
++}
++                                                                                                                  
++                                                                                                                  
++void QProToSc::NegToken( TokenId &rParam )
++{
++        aPool << ocNegSub << ocOpen << rParam << ocClose;
++        rParam = aPool.Store();
++}
++                                                                                                                  
++
++ConvErr QProToSc::Convert( const ScTokenArray*& rpErg, sal_uInt16 nLen, const FORMULA_TYPE eFT ) 
++{
++	sal_uInt8 nFmla[ 256 ];
++ 	sal_Int8  nCol, nPage;
++        sal_uInt16 nCRefCount = 0, nBRefCount = 0;
++  	sal_uInt16 nNote, nRef, nRelBits;
++  	TokenId  nPush;
++        BOOL FirstCRef = TRUE, FirstBRef = TRUE;
++ 	ComplRefData    aCRD;
++  	SingleRefData   aSRD;
++  	FUNC_TYPE       eType;
++  	DefTokenId	  eOc;
++  	const sal_Char* pExtName;
++ 
++  	aCRD.InitFlags();
++  	aSRD.InitFlags();
++  	aIn >> nRef;
++   
++  	for(int i=0; i < ( int )nRef; i++)
++    		aIn >> nFmla[i];
++        
++	i = 0;
++        
++	while( nFmla[ i ] != 0x03 )
++        { 
++    		eType = IndexToType( nFmla[ i ] );
++    		eOc = IndexToToken( nFmla[ i ] );
++    		if( eOc == ocNoName )
++       			pExtName = GetAddInName( eOc );
++                           
++    		switch( eType )
++    		{
++       			case FT_NotImpl:
++                        case FT_FuncFix0:       DoFunc( eOc, 0, pExtName ); break;
++                        case FT_FuncFix1:       DoFunc( eOc, 1, pExtName ); break;
++                        case FT_FuncFix2:       DoFunc( eOc, 2, pExtName ); break;
++                        case FT_FuncFix3:       DoFunc( eOc, 3, pExtName ); break;
++                        case FT_FuncFix4:       DoFunc( eOc, 4, pExtName ); break;
++
++			case FT_Cref : { // Single cell reference
++				aIn >> nNote >> nCol >> nPage >> nRelBits;  
++                       		ReadSRD( aSRD, nPage, nCol, nRelBits );
++                       		aStack << aPool.Store( aSRD );
++                       		break;
++                      		}
++    
++       			case FT_Range: { // Block reference
++				aIn >> nNote >> nCol >> nPage >> nRelBits;
++                   		ReadSRD( aCRD.Ref1, nPage, nCol, nRelBits );
++                   		aIn >> nCol >> nPage >> nRelBits;
++                   		ReadSRD( aCRD.Ref2, nPage, nCol, nRelBits );
++                   		aStack << aPool.Store( aCRD );
++                   		break;
++                  		}
++   
++       			case FT_FuncVar: { // Sum of a sequence of numbers
++                   		sal_uInt8 nArg;
++                                i++;
++                                nArg = nFmla[ i ];
++                   		DoFunc( eOc, nArg , pExtName );
++                   		break;
++		  		}
++
++       			case FT_Op: { // operators
++                   		aStack >> nPush;
++                   		aPool << aStack << eOc << nPush;
++                   		aPool >> aStack;
++                   		break; 
++                  		}
++      
++       			case FT_Braces: 
++                    		aPool << ocOpen << aStack << ocClose;
++                    		aPool >> aStack;
++                    		break;
++
++       			case FT_ConstInt:{
++                        	 sal_uInt16 nVal;
++                         	 aIn >> nVal;
++                         	 aStack << aPool.Store( ( double ) nVal );
++                        	}
++      
++       			case FT_Erref:
++                        	aPool << ocBad;
++                        	aPool >> aStack;
++                        	break;
++
++       			case FT_Ecref:
++                        	aPool << ocBad;
++                        	aPool >> aStack;
++                        	break;
++
++       			case FT_Econstant:
++                        	aPool << ocBad;
++                        	aPool >> aStack;
++                      	 	break;
++ 		}
++		i++;
++	}
++  
++
++   rpErg = aPool[ aStack.Get() ];
++   return ConvOK;
++}
++
++
++DefTokenId lcl_KnownAddIn( const ByteString& sTest )
++{
++        DefTokenId      eId = ocNoName;
++                                                                                                                  
++        if( sTest == "FACT" )
++    		eId = ocFact;
++        else if( sTest == "ISEMPTY")
++                 eId = ocIsEmpty;
++        else if( sTest == "DEGTORAD")
++                 eId = ocRad;
++        else if( sTest == "RADTODEG")
++                 eId = ocDeg;
++        else if( sTest == "SIGN")
++                 eId = ocPlusMinus;
++        else if( sTest == "ACOSH")
++                 eId = ocArcCosHyp;
++        else if( sTest == "ACOTH")
++                 eId = ocArcCotHyp;
++        else if( sTest == "ASINH")
++                 eId = ocArcSinHyp;
++        else if( sTest == "ATANH")
++                 eId = ocArcTanHyp;
++        else if( sTest == "COSH")
++                 eId = ocCosHyp;
++        else if( sTest == "COTH")
++                 eId = ocCotHyp;
++        else if( sTest == "SINH")
++                 eId = ocSinHyp;
++        else if( sTest == "TANH")
++                 eId = ocTanHyp;
++        else if( sTest == "EVEN")
++                 eId = ocIsEven;
++        else if( sTest == "ODD")
++                 eId = ocIsOdd;
++        else if( sTest == "ACOT")
++                 eId = ocArcCot;
++        else if( sTest == "COT")
++                 eId = ocCot;
++        else if( sTest == "ACOT")
++		 eId = ocArcCot;
++        else if( sTest == "TRUNC")
++                 eId = ocTrunc;
++        else if( sTest == "GEOMEAN")
++                 eId = ocGeoMean;
++        else if( sTest == "HARMEAN")
++                 eId = ocHarMean;
++        else if( sTest == "CORREL")
++                 eId = ocCorrel;
++        else if( sTest == "MEDIAN")
++                 eId = ocMedian;
++        else if( sTest == "COV")
++                 eId = ocCovar;
++        else if( sTest == "SKEWNESS")
++                 eId = ocSchiefe;
++        else if( sTest == "CHITEST")
++                 eId = ocChiTest;
++        else if( sTest == "FTEST")
++                 eId = ocFTest;
++        else if( sTest == "AVEDEV")
++                 eId = ocAveDev;
++        else if( sTest == "PRODUCT")
++                 eId = ocProduct;
++        else if( sTest == "PERMUT")
++                 eId = ocVariationen;
++        else if( sTest == "GAMMALN")
++                 eId = ocGammaLn;
++        else if( sTest == "POISSON")
++                 eId = ocPoissonDist;
++        else if( sTest == "NORMAL")
++                 eId = ocNormDist;
++        else if( sTest == "CRITBINOMIAL")
++                 eId = ocKritBinom;
++        
++	return  eId;
++}
++
++static const struct {
++	DefTokenId nToken;
++        FUNC_TYPE   nType;
++	const sal_Char *addInName;
++} aFuncMap[ 162 ] = {
++
++                { ocPush, FT_ConstFloat, NULL },                       
++                { ocPush, FT_Cref, NULL },                        
++		{ ocPush, FT_Range, NULL },                        
++	        { ocPush, FT_Return, NULL },                        
++                { ocPush, FT_Braces, NULL },                       
++                { ocPush, FT_ConstInt, NULL },                       
++                { ocPush, FT_ConstString, NULL },
++                { ocPush, FT_NOP, NULL },
++                { ocNegSub, FT_Neg, NULL },                       
++                { ocAdd, FT_Op, NULL },                           
++                { ocSub, FT_Op, NULL },                         
++                { ocMul, FT_Op, NULL },                         
++                { ocDiv, FT_Op, NULL },                         
++                { ocPow, FT_Op, NULL },                         
++                { ocEqual, FT_Op, NULL },                        
++                { ocNotEqual, FT_Op, NULL },                    
++                { ocLessEqual, FT_Op, NULL },           
++                { ocGreaterEqual, FT_Op, NULL },        
++                { ocLess, FT_Op, NULL },                
++                { ocGreater, FT_Op, NULL },             
++                { ocAnd, FT_Op, NULL },                 
++                { ocOr, FT_Op, NULL },                  
++                { ocNot, FT_FuncFix1, NULL },                 
++                { ocPush, FT_NOP, NULL },
++		{ ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },               
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocNoValue, FT_FuncFix0, NULL },              
++                { ocNoName, FT_FuncFix0, NULL },              
++                { ocAbs, FT_FuncFix1, NULL },                  
++                { ocInt, FT_FuncFix1, NULL },                 
++                { ocSqrt, FT_FuncFix1, NULL },                
++                { ocLog10, FT_FuncFix1, NULL },               
++                { ocLn, FT_FuncFix1, NULL },                  
++                { ocPi, FT_FuncFix0, NULL },                   
++		{ ocSin, FT_FuncFix1, NULL },                   
++                { ocCos, FT_FuncFix1, NULL },                 
++                { ocTan, FT_FuncFix1, NULL },                 
++                { ocArcTan2, FT_FuncFix2, NULL },              
++                { ocArcTan, FT_FuncFix1, NULL },              
++                { ocArcSin, FT_FuncFix1, NULL },              
++                { ocArcCos, FT_FuncFix1, NULL },              
++                { ocExp, FT_FuncFix1, NULL },                  
++                { ocMod, FT_FuncFix2, NULL },    
++                { ocChose, FT_FuncVar, NULL },                
++                { ocIsNV, FT_FuncFix1, NULL },                
++                { ocIsError, FT_FuncFix1, NULL },              
++                { ocFalse, FT_FuncFix0, NULL },               
++                { ocTrue, FT_FuncFix0, NULL },                
++                { ocRandom, FT_FuncFix0, NULL },                      
++                { ocGetDate, FT_FuncFix3, NULL },                    
++                { ocGetActDate, FT_FuncFix0, NULL },          
++                { ocRMZ, FT_FuncFix3, NULL },                
++                { ocBW, FT_FuncFix3, NULL },               
++                { ocZW, FT_FuncFix3, NULL },            
++                { ocIf, FT_FuncFix3, NULL },          
++                { ocGetDay, FT_FuncFix1, NULL },                     
++                { ocGetMonth, FT_FuncFix1, NULL },                   
++                { ocGetYear, FT_FuncFix1, NULL },                    
++                { ocRound, FT_FuncFix2, NULL },                      
++                { ocGetTime, FT_FuncFix3, NULL },                    
++                { ocGetHour, FT_FuncFix1, NULL },                    
++                { ocGetMin, FT_FuncFix1, NULL },                      
++                { ocGetSec, FT_FuncFix1, NULL },                     
++                { ocIsValue, FT_FuncFix1, NULL },                     
++                { ocIsString, FT_FuncFix1, NULL },                    
++                { ocLen, FT_FuncFix1, NULL },                        
++                { ocValue, FT_FuncFix1, NULL },    
++		{ ocFixed, FT_FuncFix2, NULL },                      
++                { ocMid, FT_FuncFix3, NULL },                         
++                { ocChar, FT_FuncFix1, NULL },                        
++                { ocCode, FT_FuncFix1, NULL },                       
++                { ocFind, FT_FuncFix3, NULL },                       
++                { ocGetDateValue, FT_FuncFix1, NULL },        
++		{ ocGetTimeValue, FT_FuncFix1, NULL },        
++                { ocNoName, FT_FuncFix1, "CELLPOINTER" },              
++		{ ocSum, FT_FuncVar, NULL },                 
++                { ocAverage, FT_FuncVar, NULL },              
++                { ocCount, FT_FuncVar, NULL },               
++                { ocMin, FT_FuncVar, NULL },                  
++                { ocMax, FT_FuncVar, NULL },                 
++                { ocVLookup, FT_FuncFix3, NULL },             
++                { ocNBW, FT_FuncFix2, NULL },                 
++                { ocVar, FT_FuncVar, NULL },                 
++                { ocNormDist, FT_FuncVar, NULL },           
++                { ocIKV, FT_FuncFix2, NULL },                  
++                { ocHLookup, FT_FuncFix3, NULL },              
++                { ocDBSum, FT_FuncFix3, NULL },                
++                { ocDBAverage, FT_FuncFix3, NULL },           
++                { ocDBCount, FT_FuncFix3, NULL },             
++                { ocDBMin, FT_FuncFix3, NULL },                
++		{ ocDBMax, FT_FuncFix3, NULL }, 
++                { ocDBVar, FT_FuncFix3, NULL },               
++                { ocDBStdDev, FT_FuncFix3, NULL },            
++                { ocIndex, FT_FuncFix3, NULL },               
++                { ocColumns, FT_FuncFix1, NULL },             
++                { ocRows, FT_FuncFix1, NULL },                 
++                { ocRept, FT_FuncFix2, NULL },                 
++                { ocUpper, FT_FuncFix1, NULL },               
++                { ocLower, FT_FuncFix1, NULL },               
++                { ocLeft, FT_FuncFix2, NULL },                
++                { ocRight, FT_FuncFix2, NULL },               
++                { ocReplace, FT_FuncFix4, NULL },              
++                { ocPropper, FT_FuncFix1, NULL },              
++                { ocNoName, FT_FuncFix2, "CELL" },              
++                { ocTrim, FT_FuncFix1, NULL },                
++                { ocClean, FT_FuncFix1, NULL },               
++                { ocFalse, FT_FuncFix1, "F" },               
++                { ocTrue, FT_FuncFix1, "W" },                 
++                { ocExact, FT_FuncFix2, NULL },               
++                { ocNoName, FT_NotImpl, NULL },              
++                { ocIndirect, FT_FuncFix1, NULL },             
++                { ocZins, FT_FuncFix3, "RATE" },                
++		{ ocNoName, FT_FuncFix1, "TERM" },              
++                { ocNoName, FT_FuncFix1, "CTERM" },              
++        	{ ocLIA, FT_FuncFix3, NULL },
++		{ ocDIA, FT_FuncFix4, NULL },                  
++                { ocGDA, FT_FuncFix4, NULL },                 
++                { ocNoName, FT_NotImpl,"STDS" },         
++                { ocNoName, FT_NotImpl, "VARS" },          
++                { ocNoName, FT_NotImpl, "DSTDS" },              
++                { ocNoName, FT_NotImpl, "DVARS" },              
++                { ocNoName, FT_NotImpl, "PVAL" },              
++                { ocNoName, FT_NotImpl, "PAYMT" },              
++                { ocNoName, FT_NotImpl, "FVAL" },              
++                { ocNoName, FT_NotImpl, "NPER" },              
++                { ocNoName, FT_NotImpl, "IRATE" },              
++                { ocNoName, FT_NotImpl, "IPAYMT" },              
++                { ocNoName, FT_NotImpl, "PPAYMT" },              
++                { ocNoName, FT_NotImpl, "SUMPRODUCT" },              
++                { ocNoName, FT_NotImpl, "MEMAVAIL" },              
++                { ocNoName, FT_NotImpl, "MEMEMSAVAIL" },              
++                { ocNoName, FT_NotImpl, "FILEEXISTS" },              
++                { ocNoName, FT_NotImpl, "CURVALUE" },              
++                { ocNoName, FT_NotImpl, "DEGREES" },              
++                { ocNoName, FT_NotImpl, "RADIANS" },              
++                { ocNoName, FT_NotImpl, "HEXTONUM" },              
++                { ocNoName, FT_NotImpl, "NUMTOHEX" },              
++                { ocNoName, FT_NotImpl, "TODAY" },              
++                { ocNoName, FT_NotImpl, "NPV" },   
++		{ ocNoName, FT_NotImpl, "CELLINDEX2D" }, 
++		{ ocNoName, FT_NotImpl, "VERSION" }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++                { ocNoName, FT_NotImpl, NULL },
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, NULL }, 
++		{ ocNoName, FT_NotImpl, "SHEETS" }, 
++		{ ocNoName, FT_NotImpl, NULL },
++		{ ocNoName, FT_FuncVar, NULL },
++		{ ocNoName, FT_NotImpl, "INDEX3D" },
++		{ ocNoName, FT_NotImpl, "CELLINDEX3D" }, 
++		{ ocNoName, FT_NotImpl, "PROPERTY" },
++		{ ocNoName, FT_NotImpl, "DDELINK" },
++		{ ocNoName, FT_NotImpl, "COMMAND" }
++};
++
++DefTokenId QProToSc::IndexToToken( sal_uInt16 nIndex )
++{
++	if( nIndex >= 0 && nIndex <= 161 )
++      		return aFuncMap[ nIndex ].nToken;
++}
++                                                                                                                  
++FUNC_TYPE QProToSc::IndexToType( sal_uInt8 nIndex )
++{
++	if( nIndex >= 0 && nIndex <= 161 )	
++      		return aFuncMap[ nIndex ].nType;
++}
++
++const sal_Char* QProToSc::GetAddInName( const UINT8 nIndex )
++{
++	if( nIndex >= 0 && nIndex <= 161 )
++		return aFuncMap[ nIndex ].addInName;
++}
++                                                                                                                  
++
diff --git a/patches/OOO_1_1/recent-files.diff b/patches/OOO_1_1/recent-files.diff
index 41434beb4..6fb5fc797 100644
--- a/patches/OOO_1_1/recent-files.diff
+++ b/patches/OOO_1_1/recent-files.diff
@@ -270,7 +270,7 @@
 +#endif
 --- /dev/null	2003-09-23 18:59:22.000000000 +0100
 +++ svtools/source/config/recent-files.cxx	2004-03-12 14:54:33.000000000 +0000
-@@ -0,0 +1,817 @@
+@@ -0,0 +1,820 @@
 +#include <stdio.h>
 +#include <string.h>
 +#include <time.h>
@@ -1044,6 +1044,9 @@
 +
 +	uri.convertToString(&uriOString, osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS);
 +	mimeType.convertToString(&mimeTypeOString, osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS);
++ 
++       if (0 == mimeTypeOString.getLength())
++               mimeTypeOString = APPLICATION_OCTET_STREAM;
 +
 +	for (ItemList::iterator l = context.items.begin(); l != context.items.end(); l++) {
 +		Item *item;
diff --git a/patches/OOO_1_1/rpath-origin-desktop.diff b/patches/OOO_1_1/rpath-origin-desktop.diff
new file mode 100644
index 000000000..bdac803eb
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-desktop.diff
@@ -0,0 +1,57 @@
+--- desktop/scripts/soffice.sh
++++ desktop/scripts/soffice.sh
+@@ -137,36 +137,15 @@ case $sd_platform in
+     export LD_LIBRARYN32_PATH
+     ;;
+ 
++  Linux*)
++    #-rpath $ORIGIN is sufficient
++    ;;
+   *)
+     LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH
+     export LD_LIBRARY_PATH
+     ;;
+ esac
+ 
+-# extend the ld_library_path for java: javaldx checks the sofficerc for us
+-if [ -x "$sd_prog/javaldx" ] ; then
+-    java_ld_library_path=`"$sd_prog/javaldx"`
+-    if [ "$java_ld_library_path" != "" ] ; then
+-        case $sd_platform in
+-            AIX)
+-                LIBPATH=${java_ld_library_path}:${LIBPATH}
+-                ;;
+-            Darwin)
+-                DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+-                ;;
+-            HP-UX)
+-                SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
+-                ;;
+-            IRIX*)
+-                LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
+-                ;;
+-            *)
+-                LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+-                ;;
+-        esac
+-    fi
+-fi
+-
+ # set java environment variables
+ THREADS_TYPE=native_threads
+ 
+@@ -232,9 +211,12 @@ sd_pagein_args="${sd_pagein_args:+${sd_p
+ "${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args}
+ 
+ # set path so that other apps can be started from soffice just by name
+-PATH="$sd_prog":$PATH
++if [ $PATH ] ; then
++    PATH="$sd_prog":$PATH
++else
++    PATH="$sd_prog"
++fi
+ export PATH
+ 
+ # execute soffice binary
+ exec "$sd_prog/$sd_binary" "$@"
+-
diff --git a/patches/OOO_1_1/rpath-origin-icu.diff b/patches/OOO_1_1/rpath-origin-icu.diff
new file mode 100644
index 000000000..48fb593e9
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-icu.diff
@@ -0,0 +1,18 @@
+--- icu/icu-2.2.patch	17 May 2004 14:48:45 -0000	1.17.6.1.26.1
++++ icu/icu-2.2.patch	3 Nov 2004 10:41:48 -0000
+@@ -1127,3 +1127,15 @@
+           return tempGlyphCount;
+       };
+   
++*** misc/icu/source/data/icupkg.inc.in	2004-11-03 07:59:49.647342501 +0000
++--- misc/build/icu/source/data/icupkg.inc.in	2004-11-03 08:00:03.501366932 +0000
++***************
++*** 16,22 ****
++  include $(top_builddir)/icudefs.mk
++  
++  CPPFLAGS+= -I$(top_builddir)/common -I$(top_srcdir)/common
++- LDFLAGS=@LDFLAGS@ 
++  FFLAGS=@FFLAGS@
++  LIBS=@LIBS@ 
++  ICULIBS=$(LIBS) -licu-uc -licu-i18n
++--- 16,21 ----
diff --git a/patches/OOO_1_1/rpath-origin-python.diff b/patches/OOO_1_1/rpath-origin-python.diff
new file mode 100644
index 000000000..e79069f21
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-python.diff
@@ -0,0 +1,16 @@
+--- python/makefile.mk
++++ python/makefile.mk
+@@ -200,9 +200,13 @@ $(PYTHONCORESHL) : makefile.mk $(PACKAGE
+ .IF "$(OS)" == "MACOSX"
+ 	cp $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(OUT)$/lib
+ .ELSE
++.IF "$(OS)" == "LINUX"
++	ld -shared -o $@ -rpath \''$$ORIGIN'\' --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -ldl -lutil -lc -lpthread
++.ELSE
+ 	echo "$(OS)"
+ 	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -ldl -lutil -lc -lpthread
+ .ENDIF # MACOSX
++.ENDIF # LINUX
+ .ENDIF # IRIX
+ .ENDIF # NETBSD
+ .ENDIF # FREEBSD
diff --git a/patches/OOO_1_1/rpath-origin-solenv.diff b/patches/OOO_1_1/rpath-origin-solenv.diff
new file mode 100644
index 000000000..19425a218
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-solenv.diff
@@ -0,0 +1,43 @@
+--- solenv/inc/unxlngppc.mk	9 Jan 2004 18:59:14 -0000	1.11.50.1
++++ solenv/inc/unxlngppc.mk	3 Nov 2004 17:58:20 -0000
+@@ -144,14 +144,15 @@ DYNAMIC = -Wl,-Bdynamic 
+ # name of linker
+ LINK*=gcc 
+ # default linker flags
+-LINKFLAGS= 
++LINKFLAGS=-Wl,-rpath,\''$$ORIGIN'\'
++
+ 
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic 
+ LINKFLAGSAPPCUI= -Wl,-export-dynamic 
+ # linker flags for linking shared libraries
+-LINKFLAGSSHLGUI= -shared 
+-LINKFLAGSSHLCUI= -shared 
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
+ 
+ LINKFLAGSTACK= 
+ LINKFLAGSPROF= 
+--- solenv/inc/unxlngppc4.mk	9 Jan 2004 18:59:15 -0000	1.5.26.1
++++ solenv/inc/unxlngppc4.mk	3 Nov 2004 17:58:20 -0000
+@@ -154,7 +154,7 @@ DYNAMIC		= -Wl,-Bdynamic
+ # name of linker
+ LINK=gcc
+ # default linker flags
+-LINKFLAGS=
++LINKFLAGS=-Wl,-rpath,\''$$ORIGIN'\'
+ 
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+--- solenv/inc/unxlngs.mk	30 Mar 2004 13:17:38 -0000	1.2.50.2
++++ solenv/inc/unxlngs.mk	3 Nov 2004 17:58:20 -0000
+@@ -148,7 +148,7 @@ DYNAMIC		= -Wl,-Bdynamic
+ LINK*=$(CC)
+ 
+ # default linker flags
+-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
++LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
+ LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
diff --git a/patches/OOO_1_1/rpath-origin-stlport.diff b/patches/OOO_1_1/rpath-origin-stlport.diff
new file mode 100644
index 000000000..1126bc9b2
--- /dev/null
+++ b/patches/OOO_1_1/rpath-origin-stlport.diff
@@ -0,0 +1,11 @@
+--- stlport/STLport-4.5.patch
++++ stlport/STLport-4.5.patch
+@@ -169,7 +169,7 @@
+ ! #
+ ! #
+ ! LINK=ar cr
+-! DYN_LINK=$(CXX) --fexceptions -shared -o
++! DYN_LINK=$(CXX) -Wl,-rpath,\''$$ORIGIN'\' --fexceptions -shared -o
+ ! 
+ ! OBJEXT=o
+ ! DYNEXT=so
diff --git a/patches/OOO_1_1/rsc-default-to-english.diff b/patches/OOO_1_1/rsc-default-to-english.diff
new file mode 100644
index 000000000..fd1913721
--- /dev/null
+++ b/patches/OOO_1_1/rsc-default-to-english.diff
@@ -0,0 +1,261 @@
+--- rsc/source/parser/rscdb.cxx.english-default	2004-12-08 16:17:45.000000000 -0500
++++ rsc/source/parser/rscdb.cxx	2004-12-08 17:16:49.267795520 -0500
+@@ -766,6 +766,177 @@
+ }
+ IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteRcCtor, RscTop *, pRef )
+ 
++
++// There's no good place to get this from... transex3/export.hxx isn't yet delivered,
++// and we can't create a ResMgr instance to use ResMgr::GetLang() because we don't
++// have a resource file at all yet.  Seems like this stuff should be in the tools'
++// modules Language->ISO routines, but use of phone code #s is gone with 2.0 anyway, so...
++sal_Char* RscGetLang( LanguageType nType )
++{
++	switch ( nType )
++	{
++	     case LANGUAGE_DANISH:
++	          return "45";
++
++	     case LANGUAGE_DUTCH:
++	     case LANGUAGE_DUTCH_BELGIAN:
++	          return "31";
++
++	     case LANGUAGE_ENGLISH:
++	     case LANGUAGE_ENGLISH_UK:
++	     case LANGUAGE_ENGLISH_EIRE:
++	     case LANGUAGE_ENGLISH_SAFRICA:
++	     case LANGUAGE_ENGLISH_JAMAICA:
++	     case LANGUAGE_ENGLISH_BELIZE:
++	     case LANGUAGE_ENGLISH_TRINIDAD:
++	     case LANGUAGE_ENGLISH_ZIMBABWE:
++	     case LANGUAGE_ENGLISH_PHILIPPINES:
++	          return "44";
++
++	     case LANGUAGE_ENGLISH_US:
++	     case LANGUAGE_ENGLISH_CAN:
++	          return "01";
++
++	     case LANGUAGE_ENGLISH_AUS:
++	     case LANGUAGE_ENGLISH_NZ:
++	          return "61";
++	     case LANGUAGE_ESTONIAN:
++	          return "77";
++
++
++	     case LANGUAGE_FINNISH:
++	          return "35";
++
++	     case LANGUAGE_FRENCH_CANADIAN:
++	          return "02";
++
++	     case LANGUAGE_FRENCH:
++	     case LANGUAGE_FRENCH_BELGIAN:
++	     case LANGUAGE_FRENCH_SWISS:
++	     case LANGUAGE_FRENCH_LUXEMBOURG:
++	     case LANGUAGE_FRENCH_MONACO:
++	          return "33";
++
++	     case LANGUAGE_GERMAN:
++	     case LANGUAGE_GERMAN_SWISS:
++	     case LANGUAGE_GERMAN_AUSTRIAN:
++	     case LANGUAGE_GERMAN_LUXEMBOURG:
++	     case LANGUAGE_GERMAN_LIECHTENSTEIN:
++	          return "49";
++
++	     case LANGUAGE_ITALIAN:
++	     case LANGUAGE_ITALIAN_SWISS:
++	          return "39";
++
++	     case LANGUAGE_NORWEGIAN:
++	     case LANGUAGE_NORWEGIAN_BOKMAL:
++	          return "47";
++
++	     case LANGUAGE_NORWEGIAN_NYNORSK:
++	          return "79";
++
++	     case LANGUAGE_PORTUGUESE:
++	          return "03";
++
++	     case LANGUAGE_PORTUGUESE_BRAZILIAN:
++	          return "55";
++
++	     case LANGUAGE_SPANISH:
++	     case LANGUAGE_SPANISH_MEXICAN:
++	     case LANGUAGE_SPANISH_MODERN:
++	     case LANGUAGE_SPANISH_GUATEMALA:
++	     case LANGUAGE_SPANISH_COSTARICA:
++	     case LANGUAGE_SPANISH_PANAMA:
++	     case LANGUAGE_SPANISH_DOMINICAN_REPUBLIC:
++	     case LANGUAGE_SPANISH_VENEZUELA:
++	     case LANGUAGE_SPANISH_COLOMBIA:
++	     case LANGUAGE_SPANISH_PERU:
++	     case LANGUAGE_SPANISH_ARGENTINA:
++	     case LANGUAGE_SPANISH_ECUADOR:
++	     case LANGUAGE_SPANISH_CHILE:
++	     case LANGUAGE_SPANISH_URUGUAY:
++	     case LANGUAGE_SPANISH_PARAGUAY:
++	     case LANGUAGE_SPANISH_BOLIVIA:
++	          return "34";
++
++	     case LANGUAGE_SWEDISH:
++	          return "46";
++
++	     case LANGUAGE_POLISH:
++	          return "48";
++	     case LANGUAGE_CZECH:
++	          return "42";
++	     case LANGUAGE_SLOVENIAN:
++	          return "50";
++	     case LANGUAGE_WELSH:
++	          return "53";
++	     case LANGUAGE_HUNGARIAN:
++	          return "36";
++	     case LANGUAGE_RUSSIAN:
++	          return "07";
++	     case LANGUAGE_SLOVAK:
++	          return "43";
++	     case LANGUAGE_GREEK:
++	          return "30";
++	     case LANGUAGE_TURKISH:
++	          return "90";
++
++	     case LANGUAGE_CHINESE_SIMPLIFIED:
++	          return "86";
++	     case LANGUAGE_CHINESE_TRADITIONAL:
++	          return "88";
++	     case LANGUAGE_JAPANESE:
++	          return "81";
++	     case LANGUAGE_KOREAN:
++	     case LANGUAGE_KOREAN_JOHAB:
++	          return "82";
++	     case LANGUAGE_THAI:
++			return "66";
++	     case LANGUAGE_HINDI:
++	          return "91";
++	     case LANGUAGE_TAMIL:
++	          return "92";
++	     case LANGUAGE_GUJARATI:
++	          return "94";
++
++	     case LANGUAGE_ARABIC:
++	     case LANGUAGE_ARABIC_IRAQ:
++	     case LANGUAGE_ARABIC_EGYPT:
++	     case LANGUAGE_ARABIC_LIBYA:
++	     case LANGUAGE_ARABIC_ALGERIA:
++	     case LANGUAGE_ARABIC_MOROCCO:
++	     case LANGUAGE_ARABIC_TUNISIA:
++	     case LANGUAGE_ARABIC_OMAN:
++	     case LANGUAGE_ARABIC_YEMEN:
++	     case LANGUAGE_ARABIC_SYRIA:
++	     case LANGUAGE_ARABIC_JORDAN:
++	     case LANGUAGE_ARABIC_LEBANON:
++	     case LANGUAGE_ARABIC_KUWAIT:
++	     case LANGUAGE_ARABIC_UAE:
++	     case LANGUAGE_ARABIC_BAHRAIN:
++	     case LANGUAGE_ARABIC_QATAR:
++	          return "96";
++
++	     case LANGUAGE_HEBREW:
++	          return "97";
++
++	     case LANGUAGE_CATALAN:
++	          return "37";
++
++	     case LANGUAGE_NORTHERNSOTHO:
++	          return "26";
++
++	     case LANGUAGE_AFRIKAANS:
++	          return "27";
++
++	     case LANGUAGE_ZULU:
++	          return "28";
++
++	     default:
++	          return "99";
++	}
++}
++
+ /*************************************************************************
+ |*
+ |*	  RscTypCont :: WriteRc
+@@ -795,7 +966,31 @@
+ 		{
+ 			UniString aUniFileName( pSysEntry->aFileName, RTL_TEXTENCODING_ASCII_US );
+ 			DirEntry aFullName( aUniFileName );
+-			aFullName.Find( UniString( GetSysSearchPath(), RTL_TEXTENCODING_ASCII_US ) );
++
++			if (!aFullName.Find( UniString( GetSysSearchPath(), RTL_TEXTENCODING_ASCII_US ) )
++				&& (aUniFileName.SearchAscii(".bmp") != STRING_NOTFOUND))
++			{
++				// Ok, if that didn't get found, lets try adding the language # before the file
++				// extension if its a bitmap.  Sometimes the file will be specified as "un_op.bmp"
++				// when what we really want is "un_op01.bmp" or "un_op33.bmp"
++				sal_Char *pLang = RscGetLang (nLangTypeId);
++				if (!pLang)
++					pLang = RscGetLang (nDfltLangTypeId);
++				if (!pLang)
++					pLang = "";
++				ByteString aTmp (pLang);
++				aTmp.Append (".bmp");
++				UniString aNewExt (aTmp, RTL_TEXTENCODING_ASCII_US);
++
++				aUniFileName.SearchAndReplaceAscii (".bmp", aNewExt);
++				aFullName.SetName (aUniFileName);
++				if (!aFullName.Find( UniString( GetSysSearchPath(), RTL_TEXTENCODING_ASCII_US ) ))
++				{
++					aUniFileName.AssignAscii (pSysEntry->aFileName.GetBuffer());
++					aFullName.SetName (aUniFileName);
++				}
++			}
++
+ 			pSysEntry->aFileName = ByteString( aFullName.GetFull(), RTL_TEXTENCODING_ASCII_US );
+ #if OSL_DEBUG_LEVEL > 1
+             fprintf( stderr, "found sys dep file %s\n", pSysEntry->aFileName.GetBuffer() );
+--- rsc/source/res/rscmgr.cxx.default-english	2004-12-07 21:39:08.071066736 -0500
++++ rsc/source/res/rscmgr.cxx	2004-12-07 21:48:48.271862808 -0500
+@@ -303,6 +303,11 @@
+     LanguageType aOldDefLanguage = LANGUAGE_DONTKNOW;
+     if( pTC && rInst.IsInst() )
+     {
++        /* Change default language to English (instead of German) so that 
++         * incomplete translations aren't smattered with German.
++         */
++        pTC->ChangeDefLanguage( LANGUAGE_ENGLISH_US );
++
+         /*
+          *  if language is different than german and rInst
+          *  is of type Accelerator then tweak the default
+--- rsc/source/res/rscarray.cxx.default-english	2004-12-07 21:49:22.321686448 -0500
++++ rsc/source/res/rscarray.cxx	2004-12-07 21:51:26.103868696 -0500
+@@ -621,7 +621,11 @@
+ 	{
+         pNode = pClassData->pNode->Search( *pWriteTypeValue );
+ 		if( !pNode && *pWriteTypeValue != *pWriteDfltTypeValue )
++          {
+ 		    pNode = pClassData->pNode->Search( *pWriteDfltTypeValue );
++              if( !pNode && *pWriteTypeValue != *pWriteDfltTypeValue )
++		        pNode = pClassData->pNode->Search( LANGUAGE_ENGLISH );
++          }
+ 	}
+ 
+     if( pNode )
+--- solenv/inc/postset.mk.english-default	2004-12-08 15:21:33.000000000 -0500
++++ solenv/inc/postset.mk	2004-12-08 15:21:56.000000000 -0500
+@@ -73,7 +73,7 @@
+ rescharset_49=$(deut$(LANG_GUI))
+ RCLANGFLAGS_49+= -d GERMAN
+ iso_49=de
+-defaultlangext=49
++defaultlangext=01
+ #.ENDIF
+ 
+ .IF "$(RES_ENUS)"!="" || "$(give_me_all_languages)"!=""
+@@ -88,7 +88,7 @@
+ rescharset_01=$(enus$(LANG_GUI))
+ RCLANGFLAGS_01+= -d ENGLISH
+ iso_01=en-US
+-#defaultlangext=01
++defaultlangext=01
+ 
+ .IF "$(RES_ITAL)"!="" || "$(give_me_all_languages)"!=""
+ alllangext+=39
diff --git a/patches/OOO_1_1/sc-paste-limitedsize.diff b/patches/OOO_1_1/sc-paste-limitedsize.diff
new file mode 100644
index 000000000..57484236d
--- /dev/null
+++ b/patches/OOO_1_1/sc-paste-limitedsize.diff
@@ -0,0 +1,25 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/view/viewfun3.cxx	2003-10-31 21:40:15.000000000 +0530
++++ sc/source/ui/view/viewfun3.cxx	2004-10-13 14:23:56.248238672 +0530
+@@ -721,15 +721,14 @@
+ 			}
+ 		}
+ 
+-		if (nBlockAddX > nDestSizeX)
+-			nMarkAddX = nBlockAddX - nDestSizeX;			// fuer Merge-Test
+-		else
+-			nEndCol = nStartCol + nDestSizeX;
++		/*
++		  * Therz no use in copying lesser data multiple times in a bigger marked area
++		  * So Im just reducing the size of the marked area.
++		  */
++		nEndCol = nStartCol + nDestSizeX;
+ 
+-		if (nBlockAddY > nDestSizeY)
+-			nMarkAddY = nBlockAddY - nDestSizeY;			// fuer Merge-Test
+-		else
+-			nEndRow = nStartRow + nDestSizeY;
++		nEndRow = nStartRow + nDestSizeY;
++		
+ 	}
+ 	else
+ 	{
diff --git a/patches/OOO_1_1/sc-standard-filter-options.diff b/patches/OOO_1_1/sc-standard-filter-options.diff
new file mode 100644
index 000000000..676d97b2d
--- /dev/null
+++ b/patches/OOO_1_1/sc-standard-filter-options.diff
@@ -0,0 +1,362 @@
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/inc/global.hxx	2003-04-28 21:00:46.000000000 +0530
++++ sc/inc/global.hxx	2004-10-08 16:23:48.000000000 +0530
+@@ -1329,6 +1329,8 @@
+ 
+ enum ScQueryOp
+ 	{
++		SC_BEGINS_WITH,
++		SC_ENDS_WITH,
+ 		SC_EQUAL,
+ 		SC_LESS,
+ 		SC_GREATER,
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/filtdlg.cxx	2004-01-09 20:11:10.000000000 +0530
++++ sc/source/ui/dbgui/filtdlg.cxx	2004-10-08 16:24:56.000000000 +0530
+@@ -83,6 +83,7 @@
+ #include "viewdata.hxx"
+ #include "document.hxx"
+ #include "scresid.hxx"
++#include "docoptio.hxx"
+ 
+ #include "foptmgr.hxx"
+ 
+@@ -219,6 +220,7 @@
+ 							aBtnMore,
+ 							aBtnCase,
+ 							aBtnRegExp,
++							aBtnWholeWord,
+ 							aBtnHeader,
+ 							aBtnUnique,
+ 							aBtnCopyResult,
+@@ -573,6 +575,17 @@
+ 		bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) );
+ 	}
+ 
++	/*
++	  * The reg exp checkbutton read is moved up, since,
++	  * for begins and ends with query we are makeing them as re query transparently
++	  * Checking this later spoils the entire transparent work.
++	  */
++	theParam.bRegExp		= aBtnRegExp.IsChecked();
++
++	ScDocOptions pDocOpts = pDoc->GetDocOptions();
++	pDocOpts.SetMatchWholeCell(aBtnWholeWord.IsChecked());
++	pDoc->SetDocOptions(pDocOpts);
++
+ 	for ( USHORT i=0; i<3; i++ )
+ 	{
+ 		USHORT 		nField	= aFieldLbArr[i]->GetSelectEntryPos();
+@@ -606,6 +619,19 @@
+ 			}
+ 			else
+ 			{
++				if (eOp == SC_BEGINS_WITH ) {
++					String tmp ('^');
++					tmp .Append(aStrVal);
++					::rtl::OUString str (tmp);
++					aStrVal.Assign(tmp);
++					eOp = SC_EQUAL;
++					theParam.bRegExp		= TRUE;
++				}
++				else if (eOp == SC_ENDS_WITH ) {
++					aStrVal.Append (String('$'));
++					eOp = SC_EQUAL;
++					theParam.bRegExp		= TRUE;
++				}
+ 				*rEntry.pStr		  = aStrVal;
+ 				rEntry.nVal			  = 0;
+ 				rEntry.bQueryByString = TRUE;
+@@ -642,7 +668,7 @@
+ 	theParam.bByRow			= TRUE;
+ 	theParam.bDuplicate		= !aBtnUnique.IsChecked();
+ 	theParam.bCaseSens 		= aBtnCase.IsChecked();
+-	theParam.bRegExp		= aBtnRegExp.IsChecked();
++	
+ 	theParam.bDestPers		= aBtnDestPers.IsChecked();
+ 
+ 	//	nur die drei eingestellten - alles andere zuruecksetzen
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filtdlg.hxx	2001-09-24 22:59:58.000000000 +0530
++++ sc/source/ui/inc/filtdlg.hxx	2004-10-08 12:23:49.000000000 +0530
+@@ -101,6 +101,7 @@
+ 	CheckBox		aBtnCase; \
+ 	CheckBox		aBtnRegExp; \
+ 	CheckBox		aBtnHeader; \
++	CheckBox		aBtnWholeWord; \
+ 	CheckBox		aBtnUnique; \
+ 	CheckBox		aBtnCopyResult; \
+ 	ListBox			aLbCopyArea; \
+@@ -122,6 +123,7 @@
+     aFlOptions      ( this, ScResId( FL_OPTIONS ) ), \
+ 	aBtnCase		( this, ScResId( BTN_CASE ) ), \
+ 	aBtnRegExp		( this, ScResId( BTN_REGEXP ) ), \
++	aBtnWholeWord	( this, ScResId( BTN_MATCH) ), \
+ 	aBtnHeader		( this, ScResId( BTN_HEADER ) ), \
+ 	aBtnUnique		( this, ScResId( BTN_UNIQUE ) ), \
+ 	aBtnCopyResult	( this, ScResId( BTN_COPY_RESULT ) ), \
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filter.hrc	2001-05-21 14:52:56.000000000 +0530
++++ sc/source/ui/inc/filter.hrc	2004-10-08 12:27:21.000000000 +0530
+@@ -81,7 +81,7 @@
+ #define FT_DBAREA_LABEL		10
+ #define FT_DBAREA			11
+ #define BTN_DEST_PERS		12
+-
++#define BTN_MATCH		13
+ // Filter:
+ #define FT_OP				20
+ #define FT_FIELD			21
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/src/filter.src	2004-04-27 22:31:47.000000000 +0530
++++ sc/source/ui/src/filter.src	2004-10-08 14:55:38.000000000 +0530
+@@ -66,7 +66,7 @@
+ 	HelpId = SID_FILTER ;
+ 	Hide = TRUE ;
+ 	SVLook = TRUE ;
+-	Size = MAP_APPFONT ( 298 , 83 ) ;
++	Size = MAP_APPFONT ( 298 , 98 ) ;
+ 	Text = "Standardfilter" ;
+ 	Text [ ENGLISH ] = "Standard Filter" ;
+ 	Text [ norwegian ] = "Standardfilter" ;
+@@ -708,12 +708,14 @@
+ 		};
+ 		stringlist [ english_us ] =
+ 		{
+-			< "=" ; Default ; > ;
++			< "Begins with" ; Default ; > ;
++			< "Ends with" ; Default ; > ;
++			< "Equals" ; Default ; > ;
+ 			< "<" ; Default ; > ;
+ 			< ">" ; Default ; > ;
+ 			< "<=" ; Default ; > ;
+ 			< ">=" ; Default ; > ;
+-			< "<>" ; Default ; > ;
++			< "Not equals" ; Default ; > ;
+ 			< "Largest" ; Default ; > ;
+ 			< "Smallest" ; Default ; > ;
+ 			< "Largest %" ; Default ; > ;
+@@ -2278,6 +2280,14 @@
+ 		Text[ zulu ] = "Isisho esi~jwayelekile";
+ 		Text[ norwegian_nynorsk ] = "~Regulært uttrykk";
+ 	};
++
++        CheckBox BTN_MATCH
++        {
++        Pos = MAP_APPFONT ( 12 , 126 ) ;
++        Size = MAP_APPFONT ( 239 , 10 ) ;
++                Text [ english_us ] = "Search criteria must apply to ~whole cells" ;
++	};
++
+ 	CheckBox BTN_HEADER
+ 	{
+ 		Hide = TRUE ;
+@@ -2458,7 +2468,7 @@
+ 	{
+ 		Border = TRUE ;
+ 		Hide = TRUE ;
+-        Pos = MAP_APPFONT ( 21 , 126 ) ;
++        Pos = MAP_APPFONT ( 21 , 138 ) ;
+ 		Size = MAP_APPFONT ( 90 , 90 ) ;
+ 		TabStop = TRUE ;
+ 		DropDown = TRUE ;
+@@ -2467,7 +2477,7 @@
+ 	{
+ 		Border = TRUE ;
+ 		Hide = TRUE ;
+-        Pos = MAP_APPFONT ( 115 , 126 ) ;
++        Pos = MAP_APPFONT ( 115 , 138 ) ;
+         Size = MAP_APPFONT ( 104 , 12 ) ;
+ 		TabStop = TRUE ;
+ 	};
+@@ -2475,7 +2485,7 @@
+ 	{
+ 		QuickHelpText = "Verkleinern" ;
+ 		QuickHelpText [ ENGLISH ] = "Shrink" ;
+-        Pos = MAP_APPFONT ( 221 , 126 ) ;
++        Pos = MAP_APPFONT ( 221 , 138 ) ;
+ 		Size = MAP_APPFONT ( 12 , 12 ) ;
+ 		TabStop = FALSE ;
+ 		QuickHelpText [ english_us ] = "Shrink" ;
+@@ -2605,7 +2615,7 @@
+ 	FixedText FT_DBAREA_LABEL
+ 	{
+ 		Hide = TRUE ;
+-        Pos = MAP_APPFONT ( 6 , 144 ) ;
++        Pos = MAP_APPFONT ( 6 , 156 ) ;
+         Size = MAP_APPFONT ( 58 , 8 ) ;
+ 		Text = "Datenbereich:" ;
+ 		Text [ ENGLISH ] = "Data area:" ;
+@@ -3204,10 +3214,10 @@
+ 		Text [ danish ] = "dummy" ;
+ 		Text [ french ] = "factice" ;
+ 		Text [ swedish ] = "dummy" ;
++		Left = TRUE ;
+ 		Text [ dutch ] = "dummy" ;
+ 		Text [ spanish ] = "Texto ejemplo" ;
+ 		Text [ english_us ] = "dummy" ;
+-		Left = TRUE ;
+ 		Text[ chinese_simplified ] = "样本";
+ 		Text[ russian ] = "ôèêòèâíûé";
+ 		Text[ polish ] = "Zaœlepka";
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/foptmgr.cxx	2001-10-23 14:35:11.000000000 +0530
++++ sc/source/ui/dbgui/foptmgr.cxx	2004-10-08 16:04:15.000000000 +0530
+@@ -76,6 +76,7 @@
+ #include "dbcolect.hxx"
+ #include "viewdata.hxx"
+ #include "document.hxx"
++#include "docoptio.hxx"
+ 
+ #define _FOPTMGR_CXX
+ #include "foptmgr.hxx"
+@@ -111,6 +111,7 @@
+ 		rBtnMore		( refBtnMore ),
+ 		rBtnCase		( refBtnCase ),
+ 		rBtnRegExp		( refBtnRegExp ),
++		rBtnWholeWord		( refBtnRegExp ),
+ 		rBtnHeader		( refBtnHeader ),
+ 		rBtnUnique		( refBtnUnique ),
+ 		rBtnCopyResult	( refBtnCopyResult ),
+@@ -123,9 +124,53 @@
+ 		rStrNoName		( refStrNoName ),
+ 		rStrUndefined	( refStrUndefined )
+ {
+-	Init();
++	Init(FALSE);
+ }
+ 
++ScFilterOptionsMgr::ScFilterOptionsMgr(
++								Dialog*				ptrDlg,
++								ScViewData*			ptrViewData,
++								const ScQueryParam&	refQueryData,
++								MoreButton&			refBtnMore,
++								CheckBox&			refBtnCase,
++								CheckBox&			refBtnRegExp,
++								CheckBox&			refBtnWholeWord,								
++								CheckBox&			refBtnHeader,
++								CheckBox&			refBtnUnique,
++								CheckBox&			refBtnCopyResult,
++								CheckBox&			refBtnDestPers,
++								ListBox&			refLbCopyArea,
++								Edit&				refEdCopyArea,
++								ScRefButton&		refRbCopyArea,
++								FixedText&			refFtDbAreaLabel,
++								FixedInfo&			refFtDbArea,
++                                FixedLine&          refFlOptions,
++								const String&		refStrNoName,
++								const String&		refStrUndefined )
++
++	:	pDlg			( ptrDlg ),
++		pViewData		( ptrViewData ),
++		pDoc			( ptrViewData ? ptrViewData->GetDocument() : NULL ),
++		rQueryData		( refQueryData ),
++		rBtnMore		( refBtnMore ),
++		rBtnCase		( refBtnCase ),
++		rBtnRegExp		( refBtnRegExp ),
++		rBtnWholeWord      ( refBtnWholeWord),
++		rBtnHeader		( refBtnHeader ),
++		rBtnUnique		( refBtnUnique ),
++		rBtnCopyResult	( refBtnCopyResult ),
++		rBtnDestPers	( refBtnDestPers ),
++		rLbCopyPos		( refLbCopyArea ),
++		rEdCopyPos		( refEdCopyArea ),
++		rRbCopyPos		( refRbCopyArea ),
++		rFtDbAreaLabel	( refFtDbAreaLabel ),
++		rFtDbArea		( refFtDbArea ),
++        rFlOptions      ( refFlOptions ),
++		rStrNoName		( refStrNoName ),
++		rStrUndefined	( refStrUndefined )
++{
++	Init(TRUE);
++}
+ 
+ //----------------------------------------------------------------------------
+ 
+@@ -141,7 +186,7 @@
+ 
+ //----------------------------------------------------------------------------
+ 
+-void ScFilterOptionsMgr::Init()
++void ScFilterOptionsMgr::Init(BOOL param)
+ {
+ 	DBG_ASSERT( pViewData && pDoc, "Init failed :-/" );
+ 
+@@ -151,6 +196,8 @@
+ 
+ 	rBtnMore.AddWindow( &rBtnCase );
+ 	rBtnMore.AddWindow( &rBtnRegExp );
++	if (param)
++		rBtnMore.AddWindow(&rBtnWholeWord);	
+ 	rBtnMore.AddWindow( &rBtnHeader );
+ 	rBtnMore.AddWindow( &rBtnUnique );
+ 	rBtnMore.AddWindow( &rBtnCopyResult );
+@@ -160,13 +207,18 @@
+ 	rBtnMore.AddWindow( &rRbCopyPos );
+ 	rBtnMore.AddWindow( &rFtDbAreaLabel );
+ 	rBtnMore.AddWindow( &rFtDbArea );
+-    rBtnMore.AddWindow( &rFlOptions );
++       rBtnMore.AddWindow( &rFlOptions );
++
+ 
+ 	rBtnCase	.Check( rQueryData.bCaseSens );
+ 	rBtnHeader	.Check( rQueryData.bHasHeader );
+ 	rBtnRegExp	.Check( rQueryData.bRegExp );
+ 	rBtnUnique	.Check( !rQueryData.bDuplicate );
+-
++	if (param) {
++		BOOL	bMatchWholeCell = pDoc->GetDocOptions().IsMatchWholeCell();
++		rBtnWholeWord.Check(bMatchWholeCell);
++	}
++	
+ 	if ( pViewData && pDoc )
+ 	{
+ 		String			theAreaStr;
+@@ -266,6 +318,7 @@
+ 	}
+ 	else
+ 		rEdCopyPos.SetText( EMPTY_STRING );
++	rFtDbArea.SetPosPixel(Point(158,331));
+ }
+ 
+ 
+--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/foptmgr.hxx	2001-05-21 14:52:56.000000000 +0530
++++ sc/source/ui/inc/foptmgr.hxx	2004-10-08 16:02:56.000000000 +0530
+@@ -108,6 +108,26 @@
+                                 FixedLine&          refFlOptions,
+ 								const String&		refStrNoName,
+ 								const String&		refStrUndefined );
++			ScFilterOptionsMgr( Dialog*				ptrDlg,
++								ScViewData*			ptrViewData,
++								const ScQueryParam&	refQueryData,
++								MoreButton&			refBtnMore,
++								CheckBox&			refBtnCase,
++								CheckBox&			refBtnRegExp,
++								CheckBox&			refBtnWholeWord,
++								CheckBox&			refBtnHeader,
++								CheckBox&			refBtnUnique,
++								CheckBox&			refBtnCopyResult,
++								CheckBox&			refBtnDestPers,
++								ListBox&			refLbCopyArea,
++								Edit&				refEdCopyArea,
++								ScRefButton&		refRbCopyArea,
++								FixedText&			refFtDbAreaLabel,
++								FixedInfo&			refFtDbArea,
++                                FixedLine&          refFlOptions,
++								const String&		refStrNoName,
++								const String&		refStrUndefined );
++			
+ 			~ScFilterOptionsMgr();
+ 
+ 	BOOL	VerifyPosStr ( const String& rPosStr ) const;
+@@ -119,6 +139,7 @@
+ 
+ 	MoreButton&		rBtnMore;
+ 	CheckBox&		rBtnCase;
++	CheckBox&		rBtnWholeWord;
+ 	CheckBox&		rBtnRegExp;
+ 	CheckBox&		rBtnHeader;
+ 	CheckBox&		rBtnUnique;
+@@ -138,7 +159,7 @@
+ 
+ #ifdef _FOPTMGR_CXX
+ private:
+-	void Init();
++	void Init(BOOL param);
+ 
+ 	// Handler:
+ 	DECL_LINK( EdPosModifyHdl,		Edit* );
diff --git a/patches/OOO_1_1/sw-autopilot-fallback-to-vor.diff b/patches/OOO_1_1/sw-autopilot-fallback-to-vor.diff
new file mode 100644
index 000000000..d68279b91
--- /dev/null
+++ b/patches/OOO_1_1/sw-autopilot-fallback-to-vor.diff
@@ -0,0 +1,43 @@
+--- sw/source/ui/wizard/wizgo2.cxx	2004-11-03 15:13:43.000000000 -0500
++++ sw/source/ui/wizard/wizgo2.cxx	2004-11-03 15:14:56.841265872 -0500
+@@ -155,18 +155,35 @@
+ {
+ 	SfxApplication *pSApp = SFX_APP();
+ 	BOOL bRet = FALSE;
++	BOOL success = FALSE;
+ 
+ 	String sTemplate( String::CreateFromAscii("wizard") );
+ 	sTemplate += INET_PATH_TOKEN;
+ 	sTemplate += rVorlage;
+-#ifndef MAC_WITHOUT_EXT
+-    sTemplate.AppendAscii(".stw");
+-#endif
+ 
+ 	const SfxFilter* pFilter = (SfxFilter*)-1;
+ 	SvtPathOptions aOpt;
+-    if( (aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ))
+-        &&  0 != (pFilter = SwIoSystem::GetFileFilter(sTemplate, aEmptyStr)) )
++
++	// Try first with .stw extension, then with .vor
++	String sTmp (sTemplate);
++	sTmp.AppendAscii(".stw");
++	if(aOpt.SearchFile (sTmp, SvtPathOptions::PATH_TEMPLATE))
++	{
++		success = TRUE;
++		sTemplate = sTmp;
++	}
++	else
++	{
++		sTmp.Assign (sTemplate);
++		sTmp.AppendAscii(".vor");
++		if(aOpt.SearchFile (sTmp, SvtPathOptions::PATH_TEMPLATE))
++		{
++			success = TRUE;
++			sTemplate = sTmp;
++		}
++	}
++
++	if (success && (0 != (pFilter = SwIoSystem::GetFileFilter (sTemplate, aEmptyStr))))
+ 	{
+         sTemplate = URIHelper::SmartRelToAbs( sTemplate );
+ 
diff --git a/patches/OOO_1_1/sw-online-layout-crash-fix.diff b/patches/OOO_1_1/sw-online-layout-crash-fix.diff
new file mode 100644
index 000000000..5e80568bd
--- /dev/null
+++ b/patches/OOO_1_1/sw-online-layout-crash-fix.diff
@@ -0,0 +1,19 @@
+Index: source/core/layout/fly.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/layout/fly.cxx,v
+retrieving revision 1.46.52.3
+diff -u -p -r1.46.52.3 fly.cxx
+--- sw/source/core/layout/fly.cxx	28 Apr 2004 10:29:47 -0000	1.46.52.3
++++ sw/source/core/layout/fly.cxx	5 Nov 2004 11:15:08 -0000
+@@ -1695,8 +1695,9 @@ void SwFlyFrm::MakeFlyPos()
+ 			const long nBottom = GetAnchor()->Frm().Top() + aRelPos.Y() + Frm().Height();
+ 			if ( nAnchorBottom < nBottom )
+ 			{
+-				((SwPageFrm*)GetAnchor())->FindBodyCont()->
+-                                    Grow( nBottom - nAnchorBottom PHEIGHT );
++				if (SwPageFrm *pOne = ((SwPageFrm*)GetAnchor()))
++						if (SwLayoutFrm *pTwo = pOne->FindBodyCont())
++							pTwo->Grow( nBottom - nAnchorBottom PHEIGHT );
+ 			}
+ 		}
+ 
diff --git a/patches/OOO_1_1/system-db.diff b/patches/OOO_1_1/system-db.diff
index 59ea89389..f46694941 100644
--- a/patches/OOO_1_1/system-db.diff
+++ b/patches/OOO_1_1/system-db.diff
@@ -1,49 +1,42 @@
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/external/berkeleydb/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- berkeleydb/makefile.mk	12 Jun 2003 09:50:38 -0000	1.13
-+++ berkeleydb/makefile.mk	29 Oct 2003 01:09:05 -0000
-@@ -77,6 +77,7 @@
- PATCH_FILE_NAME=db-3.2.9.patch
+--- berkeleydb/makefile.mk	2004-10-28 13:54:48.000000000 +0200
++++ berkeleydb/makefile.mk	2005-01-23 23:04:15.000000000 +0100
+@@ -76,6 +76,7 @@
+ # not needed for win32. comment out when causing problems...
  
  .IF "$(GUI)"=="UNX"
 +.IF "$(SYSTEM_DB)" != "YES"
  CONFIGURE_DIR=out
  #relative to CONFIGURE_DIR
  CONFIGURE_ACTION=..$/dist$/configure
-@@ -93,12 +94,30 @@ BUILD_ACTION=gmake
+@@ -91,12 +92,28 @@
+ .ELSE
  BUILD_ACTION=make
  .ENDIF
- 
 +.ENDIF
-+
+ 
 +.IF "$(SYSTEM_DB)" != "YES"
  OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
- 
  .IF "$(SOLAR_JAVA)"!=""
- OUT2BIN=java$/classes$/db.jar
+ OUT2BIN=$(BUILD_DIR)$/db.jar
+ OUT2CLASS=$(BUILD_DIR)$/db.jar
  .ENDIF
 +.ELSE
- 
 +DB_LIB = \
-+       $/usr$/lib$/libdb-$(DB_VERSION).so \
-+       $/usr$/lib$/libdb_cxx-$(DB_VERSION).so
-+.IF "$(SOLAR_JAVA)" != ""
-+       DB_LIB += $/usr$/lib$/libdb_java-$(DB_VERSION).so
++	$/usr$/lib$/libdb-$(DB_VERSION).so
++.IF "$(SOLAR_JAVA)"!=""
++	DB_LIB += $/usr$/lib$/libdb_java-$(DB_VERSION).so
 +.ENDIF
 +
 +all: $(DB_JAR) $(DB_INC) $(DB_LIB)
 +.IF "$(SOLAR_JAVA)" != ""
-+      +$(COPY) $(DB_JAR) $(BIN)/db.jar
-+      +$(COPY) $(DB_JAR) $(CLASSDIR)/db.jar
++	+$(COPY) $(DB_JAR) $(BIN)/db.jar
++	+$(COPY) $(DB_JAR) $(CLASSDIR)/db.jar
 +.ENDIF
 +
 +.ENDIF
+ 
  .ENDIF			# "$(GUI)"=="UNX"
  
- .IF "$(GUI)"=="WNT"
 Index: xmlhelp/source/cxxhelp/provider/makefile.mk
 ===================================================================
 --- xmlhelp/source/cxxhelp/provider/makefile.mk.orig	2003-04-28 18:19:35.000000000 +0200
@@ -58,142 +51,49 @@ Index: xmlhelp/source/cxxhelp/provider/makefile.mk
  
  .IF "$(GUI)"=="WNT"
  CFLAGS+=-GR
-Index: xmlhelp/source/cxxhelp/provider/databases.cxx
-===================================================================
---- xmlhelp/source/cxxhelp/provider/databases.cxx.orig	2003-04-04 19:09:36.000000000 +0200
-+++ xmlhelp/source/cxxhelp/provider/databases.cxx	2004-01-08 00:36:53.000000000 +0100
-@@ -60,7 +60,11 @@
-  ************************************************************************/
- 
- 
-+#ifdef SYSTEM_DB
-+#include <db_cxx.h>
-+#else
- #include <berkeleydb/db_cxx.h>
-+#endif
- #ifndef _VOS_DIAGNOSE_HXX_
- #include <vos/diagnose.hxx>
- #endif
-@@ -497,7 +501,12 @@ Db* Databases::getBerkeley( const rtl::O
- 		
- 		rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
- 		
--		if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 1)
-+		int db_open_failure = table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#else
-+		int db_open_failure = table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#endif
-+		if( db_open_failure )
- 		{
- 			table->close( 0 );
- 			delete table;
-@@ -711,7 +720,12 @@ KeywordInfo* Databases::getKeyword( cons
-                                osl_getThreadTextEncoding() );
- 		
- 		Db table(0,DB_CXX_NO_EXCEPTIONS);
--		if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 1)
-+		int db_open_failure = table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#else
-+		int db_open_failure = table.open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 );
-+#endif
-+		if( 0 == db_open_failure )
- 		{   
- 			std::vector<KeywordInfo::KeywordElement> aVector;
- 			Db* idmap = getBerkeley( Database,Language );
-Index: xmlhelp/source/cxxhelp/provider/urlparameter.cxx
-===================================================================
---- xmlhelp/source/cxxhelp/provider/urlparameter.cxx.orig	2004-01-07 23:21:33.000000000 +0100
-+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx	2004-01-08 00:36:53.000000000 +0100
-@@ -94,8 +94,12 @@
- #include <sablot/shandler.h>
- #endif
- #ifndef _DB_CXX_H_
-+#ifdef SYSTEM_DB
-+#include <db_cxx.h>
-+#else
- #include <berkeleydb/db_cxx.h>
- #endif
-+#endif
- #ifndef _URLPARAMETER_HXX_
- #include <provider/urlparameter.hxx>
- #endif
-Index: solenv/inc/libs.mk
-===================================================================
---- solenv/inc/libs.mk.orig	2003-12-12 18:23:04.000000000 +0100
-+++ solenv/inc/libs.mk	2004-01-08 00:36:53.000000000 +0100
-@@ -180,8 +180,8 @@ ZLIB3RDLIB=-lzlib
+--- solenv/inc/libs.mk	2004-10-28 13:50:35.000000000 +0200
++++ solenv/inc/libs.mk	2005-01-23 22:56:49.000000000 +0100
+@@ -183,7 +183,7 @@
  .ENDIF
  JPEG3RDLIB=-ljpeglib
  NEON3RDLIB=-lneon
--BERKELEYLIB=-ldb-3.2
--BERKELEYCPPLIB=-ldb_cxx-3.2
+-BERKELEYLIB=-ldb-4.2
 +BERKELEYLIB=-ldb-$(DB_VERSION)
-+BERKELEYCPPLIB=-ldb_cxx-$(DB_VERSION)
  CURLLIB=-lcurl
  SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
  SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
-Index: files.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/files.scp,v
-retrieving revision 1.369.16.2.8.2
-diff -u -r1.369.16.2.8.2 files.scp
---- scp/source/office/files.scp	14 Oct 2003 15:44:57 -0000	1.369.16.2.8.2
-+++ scp/source/office/files.scp	2 Nov 2003 01:21:27 -0000
-@@ -960,42 +960,50 @@
+--- scp/source/office/files.scp	2005-01-23 22:51:55.000000000 +0100
++++ scp/source/office/files.scp	2005-01-23 22:56:14.000000000 +0100
+@@ -1019,12 +1019,13 @@
  
  #endif
  
 +#ifndef SYSTEM_DB
-+
- File GID_FILE_LIB_DB31
+ File GID_FILE_LIB_DB42
          TXT_FILE_BODY;
          Styles          = (PACKED);
          Dir             = GID_DIR_PROGRAM;
          #ifdef UNX
--        Name            = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
+-        Name            = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
 +        Name            = STRING(CONCAT3(libdb-,DB_VERSION,UNXSUFFIX));
          #else
-         Name            = "libdb32.dll";
+         Name            = "libdb42.dll";
          #endif
- End
- 
-+#endif
-+
- #ifdef SOLAR_JAVA
-+#ifndef SYSTEM_DB
- 
- File GID_FILE_LIB_DBJAVA31
-         TXT_FILE_BODY;
+@@ -1037,13 +1038,14 @@
          Styles          = (PACKED);
          Dir             = GID_DIR_PROGRAM;
          #ifdef UNX
--        Name            = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
+-        Name            = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
 +        Name            = STRING(CONCAT3(libdb_java-,DB_VERSION,UNXSUFFIX));
          #else
-         Name            = "libdb_java32.dll";
+         Name            = "libdb_java42.dll";
          #endif
  End
  
  #endif
 +#endif
  
- #ifdef UNX
-+#ifndef SYSTEM_DB
- 
- File GID_FILE_LIB_DB_CXX
-         TXT_FILE_BODY;
-         Styles          = (PACKED);
-         Dir             = GID_DIR_PROGRAM;
--        Name            = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
-+        Name            = STRING(CONCAT3(libdb_cxx-,DB_VERSION,UNXSUFFIX));
- End
- 
- #endif
-+#endif
- 
- #ifdef UNX
+ // Helpfiles for version src640
  
 --- /dev/null	2003-12-04 23:59:45.000000000 +0100
 +++ xmlhelp/source/com/sun/star/help/db4/CreateDb.java	2004-01-22 22:48:17.000000000 +0100
@@ -1810,3 +1710,18 @@ diff -u -r1.369.16.2.8.2 files.scp
  
  UNIXTEXT= \
  	$(MISC)$/helpserver.sh
+--- xmlhelp/inc/provider/db.hxx.ark	2005-01-24 00:46:03.000000000 +0100
++++ xmlhelp/inc/provider/db.hxx		2005-01-24 00:46:57.000000000 +0100
+@@ -2,8 +2,12 @@
+ #define _DB_HXX_
+ 
+ #ifndef _DB_H_
++#ifdef SYSTEM_DB
++#include <db.h>
++#else
+ #include <berkeleydb/db.h>
+ #endif
++#endif
+ 
+ 
+ namespace chelp {
diff --git a/patches/OOO_1_1/vba-scanner-fix.diff b/patches/OOO_1_1/vba-scanner-fix.diff
index 79053b734..210a75302 100644
--- a/patches/OOO_1_1/vba-scanner-fix.diff
+++ b/patches/OOO_1_1/vba-scanner-fix.diff
@@ -14,32 +14,14 @@ diff -u -p -u -r1.8 scanner.cxx
  	USHORT nOldCol1 = nCol1;
  	USHORT nOldCol2 = nCol2;
  	sal_Unicode buf[ BUF_SIZE ], *p = buf;
-@@ -198,8 +198,8 @@ BOOL SbiScanner::NextSym()
- 	// Zeile einlesen?
- 	if( !pLine )
- 	{
--		USHORT n = nBufPos;
--		USHORT nLen = aBuf.getLength();
-+		UINT32 n = nBufPos;
-+		UINT32 nLen = aBuf.getLength();
- 		if( nBufPos >= nLen )
- 			return FALSE;
- 		const sal_Unicode* p = aBuf.getStr();
-Index: basic/source/inc/scanner.hxx
-===================================================================
-RCS file: /cvs/script/basic/source/inc/scanner.hxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 scanner.hxx
---- basic/source/inc/scanner.hxx	23 Apr 2003 16:57:54 -0000	1.3
-+++ basic/source/inc/scanner.hxx	11 Mar 2004 15:10:40 -0000
-@@ -94,8 +94,8 @@ protected:
- 	short  nCol; 						// aktuelle Spaltennummer
+--- basic/source/inc/scanner.hxx	2005-01-17 14:08:28.867361749 -0800
++++ basic/source/inc/scanner.hxx	2005-01-17 14:08:52.439391875 -0800
+@@ -95,7 +95,7 @@
  	short  nErrors;						// Anzahl Fehler
  	short  nColLock;					// Lock-Zaehler fuer Col1
--	USHORT nBufPos;						// aktuelle Buffer-Pos
+ 	INT32  nBufPos;						// aktuelle Buffer-Pos
 -	USHORT nLine;						// aktuelle Zeile
-+    UINT32 nBufPos;						// buffer position
-+    UINT32 nLine;						// line no.
++	UINT32 nLine;						// aktuelle Zeile
  	USHORT nCol1, nCol2;				// aktuelle 1. und 2. Spalte
  	BOOL   bSymbol;						// TRUE: Symbol gescannt
  	BOOL   bNumber;						// TRUE: Zahl gescannt
diff --git a/patches/OOO_1_1/vfs-uri-filter.diff b/patches/OOO_1_1/vfs-uri-filter.diff
new file mode 100644
index 000000000..131aa94e8
--- /dev/null
+++ b/patches/OOO_1_1/vfs-uri-filter.diff
@@ -0,0 +1,66 @@
+Index: ucb/source/regexp/regexp.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/regexp/regexp.cxx,v
+retrieving revision 1.3
+diff -u -p -u -r1.3 regexp.cxx
+--- ucb/source/regexp/regexp.cxx	7 Nov 2001 08:15:54 -0000	1.3
++++ ucb/source/regexp/regexp.cxx	30 Mar 2005 15:22:46 -0000
+@@ -77,6 +77,7 @@
+ #ifndef _VOS_DIAGNOSE_H_ 
+ #include <vos/diagnose.hxx>
+ #endif
++#include <tools/urlobj.hxx>
+ 
+ namespace unnamed_ucb_regexp {} using namespace unnamed_ucb_regexp;
+ 	// unnamed namespaces don't work well yet...
+@@ -196,6 +197,13 @@ bool Regexp::matches(rtl::OUString const
+ 				break;
+ 		}
+ 
++		if (bMatches && isDefault())
++		{ // Gnome VFS matching eg. slot:.* in error
++			INetURLObject aURL( rString );
++			if( aURL.GetProtocol() < INET_PROT_END )
++				bMatches = false;
++		}
++
+ 		if (bMatches)
+ 			if (m_bTranslation)
+ 			{
+
+Index: ucb/source/core/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/ucb/source/core/makefile.mk,v
+retrieving revision 1.14.82.1
+diff -u -p -u -r1.14.82.1 makefile.mk
+--- ucb/source/core/makefile.mk	28 Jan 2004 10:13:13 -0000	1.14.82.1
++++ ucb/source/core/makefile.mk	30 Mar 2005 15:22:46 -0000
+@@ -92,7 +92,8 @@ SHL1STDLIBS=\
+ 	$(CPPUHELPERLIB) \
+ 	$(CPPULIB) \
+ 	$(SALLIB) \
+-        $(UCBHELPERLIB)
++        $(UCBHELPERLIB) \
++	$(TOOLSLIB)
+ SHL1LIBS=\
+ 	$(LIB1TARGET) \
+ 	$(SLB)$/regexp.lib
+
+
+Index: ucb/source/ucp/remote/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/remote/Attic/makefile.mk,v
+retrieving revision 1.10.30.1
+diff -u -p -u -r1.10.30.1 makefile.mk
+--- ucb/source/ucp/remote/makefile.mk	28 Jan 2004 10:15:11 -0000	1.10.30.1
++++ ucb/source/ucp/remote/makefile.mk	30 Mar 2005 15:22:46 -0000
+@@ -101,7 +101,8 @@ SHL1STDLIBS = \
+     $(CPPUHELPERLIB) \
+     $(CPPULIB) \
+     $(SALHELPERLIB) \
+-    $(SALLIB)
++    $(SALLIB) \
++    $(TOOLSLIB)
+ SHL1DEPN = \
+     $(L)$/iucbhelper.lib \
+     $(L)$/icppuhelper.lib \
diff --git a/patches/OOO_1_1/win32-gw-send-mail.diff b/patches/OOO_1_1/win32-gw-send-mail.diff
index d3e8c71ee..ae9322ac9 100755
--- a/patches/OOO_1_1/win32-gw-send-mail.diff
+++ b/patches/OOO_1_1/win32-gw-send-mail.diff
@@ -10,7 +10,7 @@
 -                aSysPath.getLength( ), 
 -                osl_getThreadTextEncoding( ) ) );
 -       
-+	OString aFullPath = OUStringToOString( aSysPath,
++	OString aFullPath = ::rtl::OUStringToOString( aSysPath,
 +					       osl_getThreadTextEncoding() );
 +	sal_Int32 nLastSlash = aFullPath.lastIndexOf('\\');
 +	OString aFileName = aFullPath.copy( nLastSlash + 1 );
diff --git a/patches/OOO_1_1/win32-msvs-2003-misc.diff b/patches/OOO_1_1/win32-msvs-2003-misc.diff
index 179bf20da..5c4c8890b 100644
--- a/patches/OOO_1_1/win32-msvs-2003-misc.diff
+++ b/patches/OOO_1_1/win32-msvs-2003-misc.diff
@@ -21,43 +21,10 @@ retrieving revision 1.4.10.1
 diff -u -p -u -w -r1.4.10.1 boost_1_27_0.patch
 --- boost/boost_1_27_0.patch	15 Aug 2003 11:47:26 -0000	1.4.10.1
 +++ boost/boost_1_27_0.patch	1 Apr 2004 22:44:43 -0000
-@@ -1,21 +1,66 @@
----- misc/boost_1_27_0/boost/config/compiler/gcc.hpp
--+++ misc/build/boost_1_27_0/boost/config/compiler/gcc.hpp
--@@ -49,10 +49,10 @@
-+*** misc/boost_1_27_0/boost/config/compiler/gcc.hpp	Thu Feb  7 16:26:06 2002
-+--- misc/build/boost_1_27_0/boost/config/compiler/gcc.hpp	Mon Sep 15 13:00:28 2003
-+***************
-+*** 49,58 ****
-+  #  error "Compiler not configured - please reconfigure"
-+  #endif
-+  //
-+! // last known and checked version is 3.1:
-+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 1))
-+  #  if defined(BOOST_ASSERT_CONFIG)
-+! #     error "Unknown compiler version - please run the configure tests and report the results"
-+  #  else
-+  #     warning "Unknown compiler version - please run the configure tests and report the results"
-+  #  endif
-+--- 49,58 ----
-  #  error "Compiler not configured - please reconfigure"
-  #endif
-  //
---// last known and checked version is 3.1:
---#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 1))
--+// last known and checked version is 3.3:
--+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
-+! // last known and checked version is 3.3:
-+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
-  #  if defined(BOOST_ASSERT_CONFIG)
---#     error "Unknown compiler version - please run the configure tests and report the results"
--+#     error "Unknown / untested compiler version - please run the configure tests and report the results"
-+! #     error "Unknown / untested compiler version - please run the configure tests and report the results"
-  #  else
-  #     warning "Unknown compiler version - please run the configure tests and report the results"
-  #  endif
--*** misc/boost_1_27_0/boost/config/user.hpp	Thu Feb  7 10:26:05 2002
----- misc/build/boost_1_27_0/boost/config/user.hpp	Fri Apr 11 17:50:51 2003
+@@ -23,6 +23,42 @@
+   #  else
+   #     warning "Unknown compiler version - please run the configure tests and report the results"
+   #  endif
 +*** misc/boost_1_27_0/boost/config/compiler/visualc.hpp	Thu Feb  7 16:26:08 2002
 +--- misc/build/boost_1_27_0/boost/config/compiler/visualc.hpp	Mon Sep 15 13:01:38 2003
 +***************
@@ -94,11 +61,9 @@ diff -u -p -u -w -r1.4.10.1 boost_1_27_0.patch
 +  #  if defined(BOOST_ASSERT_CONFIG)
 +  #     error "Unknown compiler version - please run the configure tests and report the results"
 +  #  else
-+*** misc/boost_1_27_0/boost/config/user.hpp	Thu Feb  7 16:26:05 2002
-+--- misc/build/boost_1_27_0/boost/config/user.hpp	Mon Sep 15 13:00:28 2003
+ *** misc/boost_1_27_0/boost/config/user.hpp	2002-02-07 16:26:05.000000000 +0100
+ --- misc/build/boost_1_27_0/boost/config/user.hpp	2004-10-04 19:33:26.631731992 +0200
  ***************
- *** 56,58 ****
- --- 56,68 ----
 Index: configmgr/source/api2/apiaccessobj.hxx
 ===================================================================
 RCS file: /cvs/util/configmgr/source/api2/apiaccessobj.hxx,v
@@ -674,39 +639,6 @@ diff -u -p -u -w -r1.62.20.1 makefile.mk
  
  DOCUSTUDIO4INTEGRATIONHTMLFILES= \
  	$(DESTDIRDOCU)$/DevStudioWizards$/CalcAddinWizard.html \
-@@ -238,7 +239,10 @@ INSTALLSCRIPT= \
- 	$(DESTDIR)$/setsdkenv_windows.bat
- .ENDIF
- 
--DIR_FILE_LIST=\
-+#--------------------------------------------------
-+# TARGETS
-+#--------------------------------------------------
-+all : \
- 	$(EXELIST) \
- 	$(XMLLIST) \
- 	$(SDKDLLLIST) \
-@@ -251,19 +255,9 @@ DIR_FILE_LIST=\
- 	$(DESTDIRDOCU)$/common$/spec$/xml_format$/xml_specification.pdf
- #	$(DESTDIRCLASSES)$/oosupport.nbm \
- 
--DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
--DIR_CREATE_FLAG=$(MISC)$/copying_dirs_created.txt
--DIR_FILE_FLAG=$(MISC)$/copying_files.txt
--
--#--------------------------------------------------
--# TARGETS
--#--------------------------------------------------
--all : \
--	$(DIR_FILE_LIST) \
--	$(DIR_FILE_FLAG)
--
- #--------------------------------------------------
- # use global rules
- #--------------------------------------------------   
- .INCLUDE: $(PRJ)$/util$/odk_rules.pmk
- 
-+    
 Index: python/makefile.mk
 ===================================================================
 RCS file: /cvs/external/python/makefile.mk,v
diff --git a/patches/OOO_1_1_2/.cvsignore b/patches/OOO_1_1_2/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/patches/OOO_1_1_2/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/patches/OOO_1_1_2/Makefile.am b/patches/OOO_1_1_2/Makefile.am
deleted file mode 100644
index 9c7adf699..000000000
--- a/patches/OOO_1_1_2/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = apply ${wildcard *.diff} ${wildcard *.patch}
diff --git a/patches/OOO_1_1_2/apply b/patches/OOO_1_1_2/apply
deleted file mode 100644
index 57edf4b01..000000000
--- a/patches/OOO_1_1_2/apply
+++ /dev/null
@@ -1,1157 +0,0 @@
-#
-# The format of this file is:
-#
-
-# -------- Options --------
-
-PATCHPATH=.:../OOO_1_1:../evo2:../vclplug:../wpd
-
-# -------- Functional sub-sets --------
-
-Minimal : MinimalOnly, BuildBits
-Common : Upstreamed, BuildBits, IconRender, Misc, MenuFixes, CalcFixes, DBFixes, WordPerfect
-LinuxCommon : Common, VCLPlug, FilePickers, FontBits, i18n, SystemBits, RecentFiles, LinuxOnly
-#DebianBase : DebianOnly, LinuxCommon
-DebianBase : DebianOnly, LinuxCommon
-Debian : DebianBase, XineramaPIC
-DebianWoody: DebianBase, OldLibArt
-
-NonDebianCommon : ODKFixes, VBABits, Lotus, StartupNotification
-RedHatBase : LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonDebianCommon, Evo2, RedHatOnly
-RHFedora : RedHatBase, RHFedoraOnly
-RHEL3    : RedHatBase, RHEL3Only, OldLibArt
-RHL9     : RedHatBase, RHL9Only, OldLibArt
-
-NovellBase : LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonDebianCommon, Evo2, NovellOnly
-SUSE : NovellBase, SUSEOnly
-NLD  : NovellBase, NLDOnly
-PLD  : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon
-KDE  : LinuxCommon, KDEOnly
-
-# Odd one, very few patches:
-Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles, ODKFixes, VBABits
-# somewhat odder:
-Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only
-
-# -------- [ Tag ], patch sets --------
-
-#######################################################
-
-#
-# These patches are already in a cws for OOo 1.1.3+ and are zeroth
-# so that more patches can be shared between 1_1_2 and later
-#
-[ Upstreamed ]
-# use system nas, 23779
-system-nas.diff
-
-# Xinerama linking 32066
-vcl-xinerama-link-dynamic.diff
-
-# KDE cut'n'paste problem fix, IZ# 29078, IZ# 28193
-kde-cut-paste-fix.diff
-
-#
-# VCL plug back-port is first, since we want to patch
-# against these (the state of HEAD), so our patches are
-# more easily up-streamable ...
-# 
-[ VCLPlug ]
-psprint-m46-backport.diff
-vcl-inc.diff
-vcl-prj.diff
-vcl-source-app.diff
-vcl-source-control.diff
-vcl-source-gdi.diff
-vcl-source-glyphs.diff
-vcl-source-helper.diff
-vcl-source-src.diff
-vcl-source-window.diff
-vcl-unx-dummy.diff
-vcl-unx-gtk.diff
-vcl-unx-inc.diff
-vcl-unx-inc-plugins.diff
-vcl-unx-source-app.diff
-vcl-unx-source-gdi.diff
-vcl-unx-source-inc.diff
-vcl-unx-source-plugadapt.diff
-vcl-unx-source-window.diff
-vcl-unx-kde-data-cxx.diff
-vcl-unx-kde-data-hxx.diff
-vcl-unx-kde-makefile.diff
-vcl-unx-kde-nwf.diff
-vcl-unx-kde-sm.diff
-vcl-util.diff
-svtools-bmpmaker.diff
-scp-plug.diff
-config-office-plug.diff
-solenv-inc-settings-mk.diff
-# Windows bits:
-vcl-win-inc.diff
-vcl-win-source-app.diff
-vcl-win-source-gdi.diff
-vcl-win-source-window.diff
-
-# Fix from IZ#28567 (should be in 1.1.3)
-vcl-arabic-fallback.diff
-
-# awful HMENU hacks (back-ported)
-framework-win-handle.diff
-sj2-win-handle.diff
-dbaccess-win-handle.diff
-
-# Use the right colors for menus/menuitems #?????
-vcl-unx-gtk-menu-style.diff
-
-# Fix for autocompletion of words that have an apostrophe in them- bug #63231
-vcl-gtk-keycode.diff
-
-# Allow forcing which desktop we run under to override autodetection - #????? (not reported yet)
-# Just export OOO_FORCE_DESKTOP=KDE|Gnome|CDE|none before running
-vcl-force-desktop.diff
-
-# grab from cvs; should really re-sync from new branch - X#64220
-vcl-dnd-fix.diff
-
-# get the font from fontconfig and set as per the locale - X#63129, #62272
-vcl-gtk-fontconfig-fonts.diff
-
-# back-port some more pieces
-vcl-unx-gtk-m46-to-m53.diff
-
-# fix from Stefan for #30335, X#63104
-vcl-m47-transparent-fix.diff
-
-# fix for crasher post frame deletion
-crash-deletion.diff
-
-# fix for ppds cups refuses to parse
-crash-ppd-parse.diff
-
-# Fix XIM a little (urgh, incomplete)
-xim-fixes.diff
-
-[ FilePickers ]
-
-#
-# Common part
-#
-
-# Back-port from HEAD. Current context's getValueByName() can return value of
-# the "system.desktop-environment".
-fpicker-desktop-environment.diff
-
-# Search for GtkFilePicker or KDEFilePicker service when running in one of
-# the environments to allow both file pickers to be installed at the same time.
-fpicker-svtools-gtk-or-kde.diff
-
-# Enable the folder picker to be launched from svtools
-fpicker-gnome-svtools-folderpicker.diff
-
-# Build bits
-fpicker-gnome-build.diff
-
-# Copying & registering stuff
-fpicker-gnome-scp.diff
-
-# Allow enabling/disabling of the native file picker in
-# Tools->Options...->OpenOffice.org->General
-fpicker-show-checkbox.diff
-
-#
-# Gtk file picker implementation
-#
-fpicker-gnome-entry.diff
-fpicker-gnome-eventnotification.diff
-fpicker-gnome-asynceventnotifier.diff
-fpicker-gnome-picker-hxx.diff
-fpicker-gnome-picker-cxx.diff
-fpicker-gnome-folderpicker-hxx.diff
-fpicker-gnome-folderpicker-cxx.diff
-fpicker-gnome-filepicker-hxx.diff
-fpicker-gnome-filepicker-cxx.diff
-fpicker-gnome-resource.diff
-fpicker-gnome-serviceinfo.diff
-fpicker-gnome-xml.diff
-# fix for the csv import filter bug #62833
-sfx2-fpicker-gnome-filter-fix.diff
-
-#
-# KDE file picker implementation
-#
-
-# Common code for out-of-process file picker implementation
-fpicker-common.diff
-
-# KDE specific code
-fpicker-kde.diff
-
-#######################################################
-
-[ BuildBits ]
-# don't touch a header unless it's really changed #8817
-deliver-compare.diff
-
-# do an optimizing link
-build-optimized-link.diff
-
-# fix daft cut / paste mess. #24917 - up-stream.
-flash-compile-fix.diff
-
-# help people get debugging
-debug-helper.diff
-
-# fix debug build in desktop/, #28330
-desktop-debug-fix.diff
-
-# do not build extras for icu, workaround for http://bugs.debian.org/210608
-icu-build-no-extras.diff
-
-# Use $ARCH_FLAGS env. var instead of hard-coded -mcpu=pentiumpro, #29537
-build-arch-flags.diff
-
-# Make NAS use $ARCH_FLAGS
-nas-use-arch-flags.diff
-
-# Dan's re-work
-build-pl-conditionals.diff
-
-# Blacklist some of the dirs during parallel dmake
-build-pl-parallel-dmake-blacklist.diff
-
-[ Misc ]
-# Fix double-free in rsc caused by fclose()-ing the same file stream
-# --- HACK ---
-rsc-double-free-fix.diff
-
-# Fix silly with gcc translating things unnecessarily - #33031
-gcc-i18n.diff
-
-# Allow building with new (4.6.x) STLport - #28564
-stlport-compile-fix.diff
-
-# Some people are unbelievable ;-)
-# spell-ximian.diff
-
-# don't do hundreds of sched_yields; each taking 100ms on RH 9.0 #9277: dafter fix
-thread-yield.diff
-
-# Insert symbol defaults to the Symbol font - not a random one #15512: rc3
-gui-sw-insert-symbol.diff
-
-# Make list boxes clickable on the right of the text's bounds # 17182: rc3
-list-box-click.diff
-
-# Use nicer colors for the charts X#64359
-sc-default-color-modify.diff
-
-# Make cut and paste nicer #15509
-gui-sc-paste.diff
-
-# Make cursor two lines
-gui-sc-cursor.diff
-
-# use fork in tools/source/solar.c to make it work with 2.5/2.6 kernels, #17241
-solar-use-fork.diff
-
-# speedup object movement
-speed-lang-cache.diff
-
-# speedup string compares #29154
-speed-sal-string.diff
-
-# speedup status notifications
-speed-status-bar.diff
-
-# Sensitize show in row/col depending on the selection  #24137 
-sc-show-sensitize.diff
-
-# Fix mind-mangled evo. addressbook path #26309
-evo-addrbook.diff
-
-# Fix disable java problem #27746
-disable-java.diff
-
-# Fix non-java build #31778
-java-build.diff
-
-# Fix build with IBM Java, version 1.4, #32524
-java_build_with_ibm_1_4.diff
-
-# If Java is enabled, ship the XSLT (docbook etc.) bits
-java-use-xslt-filters.diff
-
-# The blackdown .debs put the JDK in /usr/lib/j2se/1.4
-java-path-blackdown.diff
-
-# this is so brain damaged - guess a number/bitfield ...
-doc-defaults.diff
-
-# Allow the document to be re-titled to "" in properties #22340
-doc-retitle.diff
-
-# be a bit helpful ... #8581
-debug-appinit.diff
-
-# tweak Gtk+ theming a little
-# #28798 for the getstyle-gnome bit
-gtk-themeing.diff
-
-# prevent control characters from being included in the
-# reason_phrase field filled in by ne_parse_statusline(), and in
-# the session error string, #30051
-neon-control-characters.diff
-
-# Fix svtools build dependencies #28379
-build-svtools-dep.diff
-
-# Add an ooo-build version in ProductExtension
-version-strike.diff
-
-# Make officecfg parallel-build safe
-officecfg-parallel-build-fix.diff
-
-# dlopen libcrypt.so.1 / libpam.so.0, not librypt.so / libpam.so, #31187
-security-sonames.diff
-
-# do not pack any potential .orig files with ppds
-psprint_config-no-orig.diff
-
-# make libsal v8 on sparc, #30774
-sparc-v8-fixes.diff
-
-# fix lingucomponent memleaks, #30486
-lingucomponent-memleaks.diff
-
-# prompt for save options - X#62182, #33686
-gui-interop-warnings.diff
-
-# fix updating symlinks; the symlink must be removed before it is replaced [X#66902]
-setup2-update-symlink.diff
-
-[ ODKFixes ]
-
-# Fix ODK Java bits
-odk-java-wizpanel.diff
-
-[ IconRender ]
-
-# add support for 32-bit bitmaps and icons.
-bmp32.diff
-# Transfer alpha masks around
-icon-render.diff
-# Make insensitive icons look pleasant
-gui-insensitive.diff
-# high quality interpolate for tbx button selector
-gui-tbxcust.diff
-# image loading needs to split off the alpha mask
-gui-image-load.diff
-# fix some broken icon compositing foo #20470
-icon-masks.diff
-# Compositing fixes for alpha bg's - some (functional) hacks
-gui-icon-composite.diff
-gui-tbx-ctrl-bg.diff
-# Fix htmltoolbar image alpha
-gui-alpha-hypertoolbar.diff
-
-# replace uber-ugly symbols with corresponding images
-# gui-symbol-replace.diff
-
-# make the toolbox separators look saner, mouseover triangles
-# resize & make set large icons as the default.
-# Make tri-states look un-pressed - don't confuse the clients
-# Don't draw uber-ugly prelight mess
-gui-toolbox.diff
-gui-toolbox-large-icons.diff
-gui-toolbox-tristate.diff
-gui-toolbox-prelight.diff
-
-[ FontBits ]
-
-# Don't bloat the ruler et. al. at larger font sizes #22098
-gui-scale-ruler.diff
-
-# Fully destroy resolution adaptive DPI scaling
-gui-font-scale.diff
-
-gui-font-antialias-size.diff
-# undo some horrible mistake #16682
-gui-font-size-unbreak.diff
-
-# Default font size of 8pt is too small
-gui-font-default-size.diff
-
-# Get KDE font weight and size, and use menuFont for menus
-gui-fonts-kde.diff
-
-# These are not included in the OOO_STABLE_1 build
-# - Use the new Freetype API
-# - Use the hinting parameters that we use in the rest of the desktop
-gui-ft-21-compat.patch
-gui-ft-set-hint.patch
-
-[ Misc ]
-
-# fallback to the lang used for menu if we don't have the language
-# requested by LC_MESSAGES; utlimate fallback to the English help, #32505
-help-fallback.diff
-
-# Fix some keybindings
-gui-keybindings.diff
-
-# Don't clutter us with dialogs at startup
-gui-startup-declutter.diff
-
-# Always throw up a new window when we ask for one,
-# instead of brokenly re-using old ones #19712
-# Don't do a 'raise' after load: #19976
-# Disable for now - causes grief with multi-displays etc. pending #19976
-# gui-appear.diff
-
-# Try and make the installer slightly wise to [OO]DESTDIR # 12781
-inst-destdir.diff
-
-# Improve ergonomics of slide / sheet rename #21659
-gui-rename-dlg.diff
-
-# Make the default writer bullet larger #21829
-sw-default-bullet.diff
-
-# Fix loads of styles re-import crasher #26550
-sw-ms-fmt-import.diff
-
-# Fix unicode export to Word95 #33074
-sw-export-word95.diff
-
-# Dramatically improve MS import / export cf. #8276 et. al.
-ms-filter-convert.diff
-
-# A bullet is not a field - at least in MS land it isn't #21916
-sw-bullet-not-field.diff
-
-# The world need not see that I can't spell #21440
-sd-export-no-spell-check.diff
-
-# Save as menuitem for image context menus in impress #13816 gnome #127556
-sd-save-image-context-menu.diff
-
-# mozilla wrapper as complement to nswrapper..., #29514
-desktop-mozwrapper.diff
-
-# Knock 50ms+ off pagein time #23350
-pagein-speedup.diff
-
-# I'm assured this is faster #24997
-pagein-speedup-2.diff
-
-# disable the check box 'Tools/Options/OpenOffice.org/General/Document Status/Printing
-# sets "document modified" status' by default, #15395
-print-do-not-change-document.diff
-
-[ GnomeVFS ]
-
-# New VFS provider stuff ..
-vfs-offapi.diff
-vfs-provider.diff
-vfs-content.diff
-vfs-directory.diff
-vfs-stream.diff
-vfs-uno-register.diff
-vfs-ucp-setup.diff
-vfs-uno-uri.diff
-
-[ Misc ]
-# Some of the new help & other icons we need
-gui-new-icons.diff
-
-[ MenuFixes ]
-
-# Fix menu bloat / icon rendering / layout issues #17937
-gui-menu-fixes.diff
-# Use rendered images for check boxes instead of ugly symbols
-gui-menu-check-images.diff
-gui-menu-check-render.diff
-# Fix menu checkitems, disable rendering of icons when the items unchecked #17937
-gui-menu-checkitems.diff
-
-[ Misc ]
-# fix 'new' button sizing #15208
-gui-tbx-new-size.diff
-
-# Dialog remembers file save path, type & stores type right #17967
-print-dialog.diff
-
-[ FontBits ]
-
-# Disable X font usage (and horrific aliasing) completely
-gui-font-fontconfig-only.diff
-
-# disable font management dialog in padmin
-padmin-nofontconfig.diff
-
-# fix some brokenness with font sync settings #15507, #16683
-gui-ft-use-system-font.diff
-
-[ NovellOnly, RedHatOnly, PLDOnly ]
-# Disable broken crashdialog bits
-module-buildset-crashrep.diff
-
-[ GlobalDesktopFiles ]
-# DebianOnly: we use the generated desktop files by moving them to
-#         the right place in the filesystem
-# RH: we also use generated KDE desktop files and mime-types
-# don't install duff / ugly KDE/Gnome integration bits
-user-desktop-install.diff
-
-# still install the wrapper "fromtemplate", it is needed for SUSE at least
-fromtemplate-wrapper-install.diff
-
-[ Misc ]
-
-# stop the user having to fight ooimpress constantly
-capitalization.diff
-
-# warn the user about printer errors #17966
-print-error.diff
-
-# Add 'Word count' to the Tools menu - i18n issues ? #17964
-word-count.diff
-
-# Replace the Zoom icon with a Combo box in toolbars #11354
-zoom-combobox.diff
-
-# Hide the URI box
-gui-toolbox-cleanup.diff
-
-# Make the delete key happy again in starcalc #17965 - wontfix [!]
-gui-sc-delete.diff
-
-# Don't build simply huge language specific sets
-build-lang-no-pack.diff
-
-# Try to get the font mapping right
-gui-metric-fonts.diff
-# Describe the metric compatible fonts for export mappings
-gui-metric-fonts-descr.diff
-# Use 'Andy' after comicsansms, before kidprint
-font-andy.diff
-
-# use 'OOO_MS_DEFAULTS' to turn on MS compatible export as default
-app-compatible.diff
-
-# Translate File->New, ->Wizard menus when using langpacks #20537
-gui-menu-new-wizard-translations.diff
-
-[ RecentFiles ]
-
-# Add support for the freedesktop.org ~/.recently-used spec. #24253
-recent-files.diff
-
-[ NovellOnly, MinimalOnly, RedHatOnly, PLDOnly ]
-# This needs binning in favour of the debian version I think.
-build-instsetoo-lang.diff
-
-[ DebianOnly ]
-# Temporary until above patch adapted for DebianOnly's needs
-build-instsetoo-langext.diff
-
-[ i18n ]
-
-# Use the environment to determine locale #21191
-i18n-sal.diff
-i18n-rehash.diff
-
-#18157
-i18n-cleanup.diff
-
-# package hungarian help, #29528
-hungarian-help.diff
-
-# build bindi and thai stuff
-i18n-build-hindi-thai.diff
-
-# add translations to sysui and remove bogus ones, #28201
-sysui-translations.diff
-
-# shrink exported ISO_8859_2 & MS_1250 html
-# most people will use UTF-8 and never see this, #19514
-html-8bit-export-shrink.diff
-
-# fix calc .lng file encoding for lang 03, #29504
-i18n-calc-encoding.diff
-
-# Fix silly brokenness in langtab lists - #18826
-translation-shift.diff
-
-[ SystemBits ]
-
-# use system db. 23779 
-system-db.diff
-# use system curl, 23779
-system-curl.diff
-# use system sane.h, 23779
-system-sane.diff
-# use system myspell, 23779
-system-myspell.diff
-# use system altlinuxhyph, 23779
-system-altlinuxhyph.diff
-# use system neon, 23779
-system-neon.diff
-# use system xrender
-system-xrender.diff
-# use system freetype, 23779, 29765
-system-freetype.diff
-# use system unixODBC headers, 23779
-system-unixodbc.diff
-# use system python, not yet complete
-system-python.diff
-# disable FontOOo if we want and build with system mspack
-disable-fontooo.diff
-disable-msfontextract-build.diff
-system-mspack.diff
-
-[ BuildBits ]
-# add --without-fonts, --with-python, --disable-rpath,
-# --enable-mozilla, --enable-fontconfig, --with-system-{zlib,nas,db,freetype}
-# config switches #21920, #23779
-config-switches.diff
-
-# add --without-myspell-dictionaries, #29937
-disable-myspell-dicts.diff
-
-# update aclocal, for AM_PATH_PYTHON
-config-aclocal.diff
-
-# Disable old installation language comparison when upgrading
-setup-no-langcheck.diff
-
-# do not extract vera fonts when we don't want them :-)
-disable-vera-extraction.diff
-
-# Fix the splash to not screwup on redraw #19646
-gui-splash-redraw.diff
-
-# Don't let the splash screen take over #23609
-no-splash-takeover.patch
-
-[ Misc ]
-
-# Icu was patched to include rpath - remove it.
-icu-no-rpath.diff
-
-# Improve the web bullet export / export to png not gif. #23353
-sd-export-html-theme.diff
-sd-export-html.diff
-sd-export-html-translations.diff
-sd-export-html-descr.diff
-
-# Fix the nasty default palette sizing #19158
-gui-tbx-palette.diff
-
-# Don't die with some strange incoming scp #19496
-crash-mapmode.diff
-
-# don't crash re-configuring the status bar #31837
-crash-statusbar.diff
-
-# Fix doc load crasher X#59373, #27243
-crash-sw-import.diff
-
-# Fix .doc import crasher #29731
-crash-sw-redline.diff
-
-# Fix impress spellcheck #32320
-crash-sd-spellcheck.diff
-
-# Fix doc load crasher X#59375
-sw-crash-fix.diff
-
-# Fix doc load crasher X#64030
-sw-import-crash.diff
-
-# Fix checkbox field crash #33980
-crash-sw-checkbox-field.diff
-
-# back-port accelerated bootstrap behavior #8359
-# speed-bootstrap-cache.diff
-
-# Initialize some values
-# cf. #20184 & back-ported from cws_src680_valgrind01
-valgrind-clean.diff
-
-# Make valgrinding easier
-valgrind-alloc.diff
-
-# Make the scroll-wheel / page popup more sane #20826
-gui-sw-scroll.diff
-
-# Disable style-list popup on first startup
-gui-startup-style.diff
-
-# Use 'utility' type for floaters - fixes click-on-panel-task-switch bug
-wm-dialog-utility.diff
-
-# Fix some incorrect assumptions about registers (x86-only)
-asm-fixes.patch
-
-# File->New->Spreadsheet freezes on some versions of GCC
-svx-freeze-fix.patch
-
-# Fix silly crash in escher code & improve export - #26747
-crash-escherex.diff
-
-# fix pyuno for pythons which were compiled with ucs-4 support
-pyuno-ucs-4-fixes.diff
-
-# update pyuno docs from www.oo.o
-pyuno-update-docs.diff
-
-# Make the GUI installer less painful
-setup-license.diff
-
-# Address data source ordering X#62860
-addrbk-datasrc-ordering.diff
-
-[ LinuxOnly ]
-
-# do not pack .orig and .bak files to the english help content
-helpcontent-no-bak.diff
-
-# Optimize linkage of some xmlhelp libraries
-xmlhelp-optimize-linkage.patch
-
-# Fix silly security problem - #33357, X#60965 (CAN-2004-0752)
-security-tmp-dir.diff
-
-[ StartupNotification ]
-
-# Startup notification fixes #18970
-startup-fix.diff
-
-[ DBFixes ]
-# enlarge the mail-merge database view pane - #34297
-db-mail-merge-size.diff
-# don't create duplicate table names in SQL - #34306
-db-duplicate-tables.diff
-
-[ CalcFixes ]
-# egregious calc bug fixes - #25883, #25890
-sc-fn-eng.diff
-# start of improved value compatibility - #25898
-sc-xl-io.diff
-# don't be silly with A1=B2:B2 - #25924
-sc-singleton-intersect.diff
-# allow biff dumping - #25430
-sc-biffdump.diff
-# csv importing copes with embedded new-lines - X#62446, #32966
-sc-csv-newline.diff
-sc-csv-gui.diff
-# add 'merge & center' toolbar button - #33126
-sc-merge-cell.diff
-# Precision improvements - #22811
-sc-precision-var.diff
-sc-precision-skew.diff
-
-[ VBABits ]
-
-# Don't split macro files up gratuitously - #26345
-vba-scanner-fix.diff
-
-# Do a better job of importing Excel macros - #26402, X#64115
-vba-not-comments.diff
-vba-sc-import.diff
-vba-sc-export.diff
-
-# Parse (but ignore) VBA attribute statements
-vba-attribute.diff
-
-# Be VBA compatible always at the expense of StarBasic compatibility
-vba-compatible.diff
-
-# Alt-F11 does something useful - #29138
-vba-keybinding-f11.diff
-
-# Add foreach - #<tocome>
-vba-foreach.diff
-
-# Add bit-shift - #<tocome>
-vba-bitshift.diff
-
-# Export VBA macros - but only to office XP, and that unconditionally
-# vba-export.diff
-# vba-export-dir.diff
-
-#######################################################
-# Patches applied in limited cases
-
-[ XineramaPIC ]
-# use libXinerama_pic.a on all archs
-xinerama-pic-on-all-archs.diff
-
-[ MinimalOnly ]
-# disable odk build since we removed it from the tarball
-disable-odk-build.diff
-
-[ NovellOnly, RedHatOnly ]
-
-# Use bug buddy
-bug-buddy.diff
-
-[ DebianOnly, NovellOnly, RedHatOnly ]
-# Bin nasty bitstream fonts from most (English) mappings
-font-de-bitstreamize-en.diff
-
-# save everything to ~/Documents by default
-path-home-documents.diff
-
-[ OldLibArt ]
-# add missing libart functions for older backports
-build-use-old-libart.diff
-
-#######################################################
-
-[ DebianOnly ]
-
-# Don't statically link setup to libstlport
-stlport-dynamic-link.diff
-
-# set OOO_DEBUG to strace or gdb soffice.bin
-debug-ooo.diff
-
-# readd LZW code since we originally removed the file from the .orig.tar.gz
-readd-lzwc.diff
-
-# compile msgbox-gnome every time (we have to support ppc, s390, ... too)
-# #28798
-compile-msgbox-gnome.diff
-
-# Debian splashscreen
-debian-splash.diff
-
-# disable odk build since we removed it from the tarball
-disable-odk-build.diff
-
-# use sensible-browser
-sensible-browser.diff
-
-# Blackdown JDK doesn't have _01 version suffix
-java-blackdown-ver.diff
-
-#######################################################
-
-[ RedHatOnly ]
-# Munge default fonts to match Red Hat-shipped ones
-#redhat-default-fonts.patch
-
-# Patch to point gnome-vfs to correct RH OOo icons
-redhat-nautilus-icons.patch
-
-# Red Hat splash screen
-redhat-splash.diff
-
-# Use gnome-open to open URIs
-helper-programs-redhat.diff
-
-# Fix up IIIMF support (RH #124538)
-iiimf-multilingual-extension-2-enable.diff
-
-# hackish system-libstdc++ patch
-system-libstdcpp.diff
-
-# mark the files in share/template/<lang>/wizard/bitmap as lang specific
-build-wizard-bitmap-scp.diff
-
-# Push fonts into the ps stream always
-print-type42.diff
-
-# resolution independant printing bits, #29483
-print-resolution-generic.diff
-
-# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is
-# not installed or broken; used for example if OOo is installed from an
-# installation set by ./install --interactive
-gui-font-paranoid-fallback.diff
-
-# Replace "Sun x" colors with "Red Hat x" colors.  Sigh.
-redhat-standard-colors.diff
-
-
-#######################################################
-
-[ NLDOnly ]
-
-# Some branding action
-nld-splash.diff
-
-#######################################################
-
-[ SUSEOnly ]
-
-# some branding
-suse-splash.diff
-
-#######################################################
-
-[ NovellOnly ]
-
-# Integrate external programs; an attempt to propose a vendor independent solution
-# Preset Tools->Options->OpenOffice.org->External
-# programs->(HTTP|HTTPS|FTP|MAILTO) to "desktop-launch"
-helper-programs.diff
-
-# Help -> support X65554
-help-support.diff
-
-# hackish system-libstdc++ patch
-system-libstdcpp.diff
-
-# FIXME: ooo-res seems to be needed only for "Local Installation"
-# which is not well supported with multiple localizations anyway
-# ooo-res is copied to the really used iso-res by gid_Procedure_Copy_Iso_Res
-# this patch updates the procedure to delete the unused ooo-res
-# won't be needed in OOo, version 2.0, #28285
-scp-no-ooo-res.diff
-
-# configure some Japanese fonts used on Novell products
-# (patch by Mike Fabian mfabian@suse.de)
-# FIXME: We should rename this one to novell-cjk-fonts.diff
-novell-japanese-fonts.diff
-
-#######################################################
-
-[ NovellOnly, PLDOnly ]
-
-# mark the files in share/template/<lang>/wizard/bitmap as lang specific
-build-wizard-bitmap-scp.diff
-
-# An hack to install KDE amd Ximian's icons in paralel
-# 1) search also the path defined by the variable OOO_PREFERRED_RESOURCE_PATH
-# for resource files. This path is preferred over the default one.
-# Allows to switch between two versions of resource files at runtime.
-# 2) add one more default path for resources (program/resource.default)
-# This allows to make a symlink to the default resource path which is different
-# from the original resource path. It is needed to allow update of RPM packages.
-# RPM is not able to replace a directory with the symlink within an update.
-resmgr-resource-path.diff
-
-# Push fonts into the ps stream always
-print-type42.diff
-
-# resolution independant printing bits, #29483
-print-resolution-generic.diff
-
-# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is
-# not installed or broken; used for example if OOo is installed from an
-# installation set by ./install --interactive
-gui-font-paranoid-fallback.diff
-
-#######################################################
-
-[ PLDOnly ]
-
-# splash
-pld-splash.diff
-
-#######################################################
-[ ArkOnly ]
-
-# splash / branding
-ark-splash.diff
-
-# hackish system-libstdc++ patch
-system-libstdcpp.diff
-
-#######################################################
-[ Win32Only ]
-
-# A number of nasty VS.Net 2003 fixes #27980
-win32-msvs-2003-configure.diff
-win32-msvs-2003-misc.diff
-win32-msvs-2003-misc2.diff
-win32-msvs-2003-misc3.diff
-win32-msvs-2003-vclplug.diff
-
-# Build berkeleydb with dmake not crack-rock-make #27400
-win32-berkeleydb-toplevel.diff
-win32-berkeleydb-make-patch.diff
-
-# Odd sj2 / sjlib behavior on Win32 - badly fitted for no-java too.
-win32-sjlib.diff
-
-# libart on win32 hack - needs scp support
-win32-libart-build.diff
-win32-internal-libart.diff
-
-# Stephan's fixes from alphaart cws - should be merged with above patches
-win32-bmp32-ssa-fixes.diff
-
-# Accelerate / cache DIB creation ( don't keep doing it )
-win32-bmp32-speedup.diff
-
-# Disable odk build
-disable-odk-build.diff
-
-# Novell splash - prolly belongs in a NovellWin32Only section but ...
-novell-splash.diff
-
-# A number of nasty MSVC6 fixes
-win32-sd-vc6.diff
-
-# This is a pretty nasty IE problem #19510
-win32-activex-disable.diff
-
-# Misc. fixes for java disabled on win32
-win32-nojava.diff
-
-# ODMA support, back-ported from HEAD
-win32-odma.diff
-win32-odma-build.diff
-
-# Scott Clayton's fixes for recent G/W development #32741
-win32-odma-gw-fix.diff
-
-# Novell internal support / file-bug page
-novell-filebug.diff
-
-# Try to trace some strange bug in this
-win32-stlport-build.diff
-
-# Fix alpha cut/paste problem
-win32-transfer-alpha.diff
-
-# Work around stupidity in GW #34264
-win32-gw-send-mail.diff
-
-#######################################################
-
-[ Win32BinConvertDSW ]
-# Attempt to work around ICU evilness ...
-# Not-yet-functional, but desirable:
-win32-icu-config.diff
-win32-icu-make.diff
-win32-icu-build.diff
-
-[ TestGtkIntegration ]
-# Glib / gtk+ integration
-glib-integration.diff
-gtk-integration-salinst.diff
-gtk-integration-saldata.diff
-gtk-integration-saldisp.diff
-
-#######################################################
-
-[ Evo2 ]
-# evolution addressbook driver version 2
-connectivity-source-drivers-evoab1-5-dataaccess-xcu.diff
-connectivity-source-drivers-evoab1-5-evoab1-5-map.diff
-connectivity-source-drivers-evoab1-5-evoab-xml.diff
-connectivity-source-drivers-evoab1-5-makefile-mk.diff
-connectivity-source-drivers-evoab1-5-nconnection-cxx.diff
-connectivity-source-drivers-evoab1-5-nconnection-hxx.diff
-connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff
-connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff
-connectivity-source-drivers-evoab1-5-ndebug-cxx.diff
-connectivity-source-drivers-evoab1-5-ndebug-hxx.diff
-connectivity-source-drivers-evoab1-5-ndriver-cxx.diff
-connectivity-source-drivers-evoab1-5-ndriver-hxx.diff
-connectivity-source-drivers-evoab1-5-npreparedstatement-cxx.diff
-connectivity-source-drivers-evoab1-5-npreparedstatement-hxx.diff
-connectivity-source-drivers-evoab1-5-nresultset-cxx.diff
-connectivity-source-drivers-evoab1-5-nresultset-hxx.diff
-connectivity-source-drivers-evoab1-5-nresultsetmetadata-cxx.diff
-connectivity-source-drivers-evoab1-5-nresultsetmetadata-hxx.diff
-connectivity-source-drivers-evoab1-5-nservices-cxx.diff
-connectivity-source-drivers-evoab1-5-nstatement-cxx.diff
-connectivity-source-drivers-evoab1-5-nstatement-hxx.diff
-connectivity-source-drivers-evoab1-5-ncatalog-cxx.diff
-connectivity-source-drivers-evoab1-5-ncatalog-hxx.diff
-connectivity-source-drivers-evoab1-5-ntables-cxx.diff
-connectivity-source-drivers-evoab1-5-ntables-hxx.diff
-evoab2_default.diff
-evoab2_prj.diff
-evoab2_scp.diff
-
-#######################################################
-
-[ Lotus ]
-# detect SmartSuite97 files
-sc-lotus-filter.diff
-# read basics from SmartSuite97 files
-sc-lotus-code.diff
-
-#######################################################
-
-[ WordPerfect ]
-wpd-scp.diff
-wpd-win32.diff
-wpd-sw-prj.diff
-wpd-sw-iodetect.diff
-wpd-officecfg-typedetection.diff
-libwpd-makefile-mk.diff
-libwpd-prj-d-lst.diff
-libwpd-prj-build-lst.diff
-writerperfect-prj-d-lst.diff
-writerperfect-prj-build-lst.diff
-writerperfect-source-filter-documentelement-cxx.diff
-writerperfect-source-filter-documentelement-hxx.diff
-writerperfect-source-filter-filterinternal-hxx.diff
-writerperfect-source-filter-fontmap-cxx.diff
-writerperfect-source-filter-fontmap-hxx.diff
-writerperfect-source-filter-fontstyle-cxx.diff
-writerperfect-source-filter-fontstyle-hxx.diff
-writerperfect-source-filter-genericfilter-cxx.diff
-writerperfect-source-filter-liststyle-cxx.diff
-writerperfect-source-filter-liststyle-hxx.diff
-writerperfect-source-filter-makefile-mk.diff
-writerperfect-source-filter-pagespan-cxx.diff
-writerperfect-source-filter-pagespan-hxx.diff
-writerperfect-source-filter-sectionstyle-cxx.diff
-writerperfect-source-filter-sectionstyle-hxx.diff
-writerperfect-source-filter-style-hxx.diff
-writerperfect-source-filter-tablestyle-cxx.diff
-writerperfect-source-filter-tablestyle-hxx.diff
-writerperfect-source-filter-textrunstyle-cxx.diff
-writerperfect-source-filter-textrunstyle-hxx.diff
-writerperfect-source-filter-wordperfectcollector-cxx.diff
-writerperfect-source-filter-wordperfectcollector-hxx.diff
-writerperfect-source-filter-wordperfectimportfilter-cxx.diff
-writerperfect-source-filter-wordperfectimportfilter-hxx.diff
-writerperfect-source-filter-writerproperties-hxx.diff
-writerperfect-source-stream-makefile-mk.diff
-writerperfect-source-stream-wpxsvstream-cxx.diff
-writerperfect-source-stream-wpxsvstream-h.diff
-writerperfect-util-makefile-mk.diff
-writerperfect-util-wpft-map.diff
-
-########################################################
-
-[ KDEOnly ]
-# Some "branding"
-kde-splash.diff
-
-########################################################
-
-[ KDEOnly, PLDOnly ]
-# Preset Tools->Options->OpenOffice.org->External
-# programs->(HTTP|HTTPS|FTP|MAILTO) to "kfmclient exec"
-helper-programs-kde.diff
-
-########################################################
-
-[ KDECommon, NovellOnly ]
-# Allow parameters in Tools->Options->OpenOffice.org->External
-# programs->(HTTP|HTTPS|FTP|MAILTO) - #28720
-shellexec_allow_params.diff
-
-########################################################
-
-[ TestLayout ]
-# the beginnings of layout
-gui-window-layout.diff
-gui-control-layout.diff
-# the ends of layout
-layout-ids.diff
-layout-rsc.diff
-layout-vcl-layout.diff
-layout-vcl-window.diff
-layout-test.diff
diff --git a/patches/OOO_1_1_2/config-switches.diff b/patches/OOO_1_1_2/config-switches.diff
deleted file mode 100644
index f23efdfda..000000000
--- a/patches/OOO_1_1_2/config-switches.diff
+++ /dev/null
@@ -1,655 +0,0 @@
-Index: config_office/configure.in
-===================================================================
---- config_office/configure.in.orig	2004-08-14 01:19:26.245183120 +0200
-+++ config_office/configure.in	2004-08-14 01:22:21.372559712 +0200
-@@ -97,6 +97,68 @@ AC_ARG_ENABLE(kde,
- 
-                           Usage: --enable-kde
- ],,)
-+AC_ARG_WITH(system-nas,
-+[  --with-system-nas       Use nas already on system
-+],,)
-+AC_ARG_WITH(system-freetype,
-+   --with-system-freetype  Use freetype already on system
-+],,)
-+AC_ARG_WITH(system-db,
-+[  --with-system-db        Use berkeleydb already on system
-+],,)
-+AC_ARG_WITH(db-version,
-+[  --with-db-version=VERSION       Specify db version manually ],
-+[	DB_VERSION="$withval"
-+	DB_VERSION_MAJOR=$(echo $DB_VERSION | cut -d"." -f1)
-+])
-+AC_ARG_WITH(db-jar,
-+[  --with-db-jar=JARFILE          Specify path to jarfile manually ],
-+[ DB_JAR="$withval"
-+])
-+AC_ARG_WITH(system-sane,
-+[  --with-system-sane-headers      Use sane.h already on system
-+],,)
-+AC_ARG_WITH(system-x11ext,
-+[  --with-system-x11-extensions-headers  Use X11 extensions headers on system
-+],,)
-+AC_ARG_WITH(system-unixodbc,
-+[   --with-system-unixodbc-headers  Use unixODBC headers on system
-+],,)
-+AC_ARG_WITH(system-curl,
-+[  --with-system-curl      Use curl already on system
-+],,)
-+AC_ARG_WITH(system-myspell,
-+[  --with-system-myspell      Use myspell already on system
-+],,)
-+AC_ARG_WITH(system-altlinuxhyph,
-+[  --with-system-altlinuxhyph      Use altlinuxhyph already on system
-+],,)
-+AC_ARG_WITH(system-neon,
-+[  --with-system-neon	    Use system neon 0.23.x
-+],,)
-+AC_ARG_WITH(system-xrender,
-+[  --with-system-xrender           Use system Xrender
-+],,)
-+AC_ARG_WITH(system-libs,
-+[  --with-system-libs      Use libs already on system (enables all
-+                           --with-system-* (_not_ -headers)
-+],,)
-+AC_ARG_WITH(myspell-dicts,
-+[  --without-myspell-dicts   Removes myspell dictionaries from openoffice.org
-+                         installation set, for people building for specific
-+                         distributions where the myspell dictionaries are
-+                         installed from other sources
-+],,)
-+AC_ARG_ENABLE(fontconfig,
-+[  --enable-fontconfig     Enables the use of fontconfig
-+],,)
-+AC_ARG_ENABLE(fontooo,
-+[  --disable-fontooo       Disables FontOOo
-+                           (useful for distributions using fontconfig for OOo)
-+],,enable_fontooo="yes")
-+AC_ARG_WITH(system-mspack,
-+[  --with-system-mspack      Use libmspack already on system
-+],,)
- AC_ARG_WITH(stlport4-home,
- [  --with-stlport4-home    The location that STLport4 is installed in. The STL
-                           header files are assumed to be in stlport4-home/stlport
-@@ -138,6 +200,12 @@ AC_ARG_WITH(perl-home,
-  
-                           Usage: --with-perl-home=<absolute path to Perl 5 home>
- ],,)
-+AC_ARG_WITH(python,
-+[  --with-python           If you want to use the Python on your system, instead of
-+                          the internal version included in the source, use this flag.
-+
-+                          Usage: --with-python[=path-to-python]
-+],,)
- AC_ARG_WITH(cl-home,
- [  --with-cl-home          For Windows NT users, please supply the path
-                           for the Microsoft C/C++ compiler. 
-@@ -869,16 +937,11 @@ if test "$_os" != "WINNT" -o "$WITH_MING
- fi
- 
- dnl ===================================================================
--dnl Check if pam-appl.h is available on Linux or FreeBSD
-+dnl Check if pam_appl.h is available on Linux or FreeBSD
- dnl ===================================================================
- if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
--   AC_MSG_CHECKING([pam_appl.h])
--   if test -f "/usr/include/security/pam_appl.h"; then
--      AC_MSG_RESULT([yes])
--   else
--      AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security])
--      echo "pam_appl.h could not be found in /usr/include/security" >> warn
--   fi
-+   AC_CHECK_HEADER(security/pam_appl.h, [],
-+   [AC_MSG_ERROR([pam_appl.h could not be found. libpam-dev missing?])], [])
- fi
- 
- dnl ===================================================================
-@@ -1321,6 +1384,8 @@ dnl Check whether there's a C++ pre-proc
- if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
-    AC_PROG_CXXCPP
- fi
-+#AC_SUBST(CPP)
-+#AC_SUBST(CXXCPP)
- 
- dnl ===================================================================
- dnl Check whether xmkmf program can be used, x systems only
-@@ -1420,6 +1485,183 @@ fi
- AC_SUBST(SYSTEM_ZLIB)
- 
- dnl ===================================================================
-+dnl Check for system python
-+dnl ===================================================================
-+AC_MSG_CHECKING([which python to use])
-+if test -n "$with_python"; then
-+    AC_MSG_RESULT([external])
-+    if test "$with_python" != "yes"; then
-+        PYTHON="$with_python"
-+    fi
-+    AM_PATH_PYTHON([2.2])
-+
-+    py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+    py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-+
-+    PYTHONHOME="$py_prefix"
-+    PYTHON_CFLAGS="-I$py_prefix/include/python$PYTHON_VERSION"
-+    if test "$py_prefix" != "$py_exec_prefix"; then
-+      PYTHONHOME="$PYTHONHOME:$py_exec_prefix"
-+      PYTHON_CFLAGS="$PYTHON_CFLAGS -I$py_exec_prefix/include/python$PYTHON_VERSION"
-+    fi
-+    save_CPPFLAGS="$CPPFLAGS"
-+    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-+    AC_CHECK_HEADER(Python.h, [],
-+        [AC_MSG_ERROR(Python.h not found. Install python headers/development package.)], [])
-+    CPPFLAGS="$save_CPPFLAGS"
-+
-+    PYMAJOR=$($PYTHON -c "import sys; print sys.version_info[[0]]")
-+    PYMINOR=$($PYTHON -c "import sys; print sys.version_info[[1]]")
-+    PYMICRO=$($PYTHON -c "import sys; print sys.version_info[[2]]")
-+    PYVERSION=$($PYTHON -c "import sys; print '%d.%d.%d' % sys.version_info[[:3]]")
-+else
-+    AC_MSG_RESULT([internal])
-+    SCPDEFS="$SCPDEFS -DWITH_PYTHON"
-+fi
-+AC_SUBST(PYTHON)
-+AC_SUBST(PYTHONHOME)
-+AC_SUBST(PYTHON_CFLAGS)
-+AC_SUBST(PYMAJOR)
-+AC_SUBST(PYMINOR)
-+AC_SUBST(PYMICRO)
-+AC_SUBST(PYVERSION)
-+
-+dnl ===================================================================
-+dnl Check for system db
-+dnl ===================================================================
-+AC_MSG_CHECKING([which db to use])
-+if test -n "$with_system_db" -o -n "$with_system_libs"; then
-+    SYSTEM_DB=YES
-+    AC_MSG_RESULT([external])
-+    if test -z $DB_VERSION && test -z $DB_VERSION_MAJOR; then
-+      AC_CHECK_FILE(/usr/lib/libdb_cxx.so, [],
-+         [AC_MSG_ERROR(no. install db)])
-+      # (almost) all db packages (rpm/deb) I saw have this link pointing to
-+      # libdb-cxx_X.so where X is the first two digits of the db version ..
-+      # and because of that two versions cannot be installed at the same time..
-+      DB_VERSION=$(readlink /usr/lib/libdb_cxx.so \
-+	  | $SED -e s/libdb_cxx-// | $SED -e s/\.so//)
-+      DB_VERSION_MAJOR=$(echo $DB_VERSION | cut -d"." -f1)
-+    fi
-+    AC_MSG_CHECKING([which db version to use])
-+    AC_MSG_RESULT(db$DB_VERSION_MAJOR version $DB_VERSION)
-+    AC_LANG(C++)
-+    AC_CHECK_HEADER(db_cxx.h, [ DB_INCLUDES=/usr/include ],
-+        [
-+             CFLAGS=-I/usr/include/db$DB_VERSION_MAJOR
-+             AC_CHECK_HEADER(db$DB_VERSION_MAJOR/db_cxx.h,
-+             [ DB_INCLUDES=/usr/include/db$DB_VERSION_MAJOR ],
-+             [ AC_MSG_ERROR(no. install the dbDB_VERSION_MAJOR libraries) ], []
-+             )
-+        ], []
-+    )
-+     if test "$enable_java" != "no"; then
-+       if test -z $DB_JAR; then
-+	  # three different naming methods *grumble* Are there even more?
-+         AC_CHECK_FILE(/usr/share/java/db.jar, [ JARVER=0 ],
-+           [
-+             AC_CHECK_FILE(/usr/share/java/db-$DB_VERSION.jar, [ JARVER=1 ],
-+               [ AC_CHECK_FILE(/usr/share/java/libdb$DB_VERSION-java.jar,
-+                   [ JARVER_LONGSTYLE=1 ],
-+                   [ AC_MSG_ERROR(db$DB_VERSION_MAJOR Java bindings not found)]
-+                 )
-+               ]
-+             )
-+           ]
-+         )
-+         if test "$JARVER" = "1"; then
-+           DB_JAR=jar-$DB_VERSION.jar
-+         else
-+           DB_JAR=db.jar
-+         fi
-+         if test "$JARVER_LONGSTYLE" = "1"; then
-+           DB_JAR=libdb$DB_VERSION-java.jar
-+         fi
-+       fi
-+    fi
-+    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_DB=NO
-+    DB_VERSION=$(ls -1 ../berkeleydb/download/db* \
-+       | $SED -e s,\.\./berkeleydb/download/db-,, | $SED -e s,\.tar\.gz,, \
-+       | cut -d"." -f1,2)
-+    DB_VERSION_MAJOR=$(echo $DB_VERSION | cut -d"." -f1)
-+    DB_JAR=db.jar
-+fi
-+SCPDEFS="$SCPDEFS -DDB_VERSION=$DB_VERSION"
-+AC_SUBST(SYSTEM_DB)
-+AC_SUBST(DB_INCLUDES)
-+AC_SUBST(DB_VERSION)
-+AC_SUBST(DB_VERSION_MAJOR)
-+AC_SUBST(DB_JAR)
-+AC_SUBST(SCPDEFS)
-+
-+dnl ===================================================================
-+dnl Check for system neon
-+dnl ===================================================================
-+AC_MSG_CHECKING([which neon to use])
-+if test -z "$without_system_neon"; then
-+    if test -n "$with_system_neon" -o -n "$with_system_libs"; then
-+        AC_MSG_RESULT([external])
-+        AC_PATH_PROG(NEON_CONFIG, neon-config, no)
-+        AC_MSG_CHECKING([whether neon version is 0.23.x])
-+        # check whether we have 0.23.x. 0.24.x is API-incompatible....
-+        NEON_VER=$($NEON_CONFIG --version | $AWK '{print $2}' \
-+            | cut -d"." -f1,2)
-+        if test "$NEON_VER" = "0.23"; then
-+            AC_MSG_RESULT([yes])
-+            SYSTEM_NEON=YES
-+            NEON_CFLAGS="$($NEON_CONFIG --cflags) -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-+            NEON_LIBS=$($NEON_CONFIG --libs)
-+        else
-+            AC_MSG_ERROR([no. neon 0.24.x is API-incompatible. use 0.23.x])
-+        fi
-+    else
-+        AC_MSG_RESULT([internal])
-+        SYSTEM_NEON=NO
-+        NEON_LIBS=-lneon
-+        NEON_CFLAGS=
-+    fi
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_NEON=NO
-+    NEON_LIBS=-lneon
-+    NEON_CFLAGS=
-+fi
-+AC_SUBST(SYSTEM_NEON)
-+AC_SUBST(NEON_LIBS)
-+AC_SUBST(NEON_CFLAGS)
-+
-+dnl ===================================================================
-+dnl Check for system sane
-+dnl ===================================================================
-+AC_MSG_CHECKING([which sane.h to use])
-+if test -n "$with_system_sane_headers"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_SANE_H=YES
-+    AC_CHECK_HEADER(sane/sane.h, [],
-+        [AC_MSG_ERROR(sane.h not found. install the sane headers)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+fi
-+AC_SUBST(SYSTEM_SANE_H)
-+
-+dnl ===================================================================
-+dnl Check for system unixODBC
-+dnl ===================================================================
-+AC_MSG_CHECKING([which unixODBC headers to use])
-+if test -n "$with_system_unixodbc_headers"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_UNIXODBC_H=YES
-+    AC_CHECK_HEADER(sqlext.h, [],
-+        [AC_MSG_ERROR(unixODBC's aqlext.h not found. install the headers)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+fi
-+AC_SUBST(SYSTEM_UNIXODBC_H)
-+
-+dnl ===================================================================
- dnl Check whether the gtk 2.0 libraries are available.
- dnl ===================================================================
- if test -n "$ENABLE_CRASHDUMP" ; then
-@@ -1431,6 +1673,101 @@ if test -n "$ENABLE_CRASHDUMP" ; then
- fi
- 
- dnl ===================================================================
-+dnl Check whether we want to use fontconfig and if the library is
-+dnl available.
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to use fontconfig])
-+if test -n "$enable_fontconfig"; then
-+    AC_MSG_RESULT([yes])
-+    PKG_CHECK_MODULES( FONTCONFIG, fontconfig >= 1.0.1 )
-+    FONTCONFIG_FONTS=YES
-+else
-+    AC_MSG_RESULT([no])
-+    FONTCONFIG_FONTS=NO
-+fi
-+AC_SUBST(FONTCONFIG_FONTS)
-+AC_SUBST(FONTCONFIG_LIBS)
-+
-+dnl ===================================================================
-+dnl Check for system freetype
-+dnl ===================================================================
-+AC_MSG_CHECKING([which freetype to use])
-+if test -n "$with_system_freetype" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_FREETYPE=YES
-+    USE_FREETYPE_CONFIG=NO
-+    PKG_CHECK_MODULES( FREETYPE, freetype2,
-+        [ USE_FREETYPE_CONFIG=NO ],
-+        [ 
-+            AC_PATH_PROG( FREETYPE_CONFIG, freetype-config )
-+            if test -f "$FREETYPE_CONFIG"; then
-+                USE_FREETYPE_CONFIG=YES
-+            fi
-+        ]
-+    )
-+    if test "$USE_FREETYPE_CONFIG" = "YES"; then
-+        FREETYPE_LIBS=$(freetype-config --libs)
-+        FREETYPE_CFLAGS=$(freetype-config --cflags)
-+    fi
-+    SCPDEFS="$SCPDEFS -DSYSTEM_FREETYPE"
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_FREETYPE=NO
-+fi
-+AC_SUBST(SYSTEM_FREETYPE)
-+AC_SUBST(FREETYPE_LIBS)
-+AC_SUBST(FREETYPE_CFLAGS)
-+AC_SUBST(SCPDEFS)
-+
-+dnl ===================================================================
-+dnl Check for system myspell
-+dnl ===================================================================
-+AC_MSG_CHECKING([which myspell to use])
-+if test -n "$with_system_myspell" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_MYSPELL=YES
-+    PKG_CHECK_MODULES( MYSPELL, myspell,
-+      [ MYSPELL_PKGCONFIG=YES ],
-+      [
-+         AC_CHECK_HEADER(myspell/myspell.hxx, [],
-+	     [AC_MSG_ERROR(myspell headers not found.)], [])
-+         MYSPELL_CFLAGS=-I/usr/include/myspell
-+         AC_LANG(C++)
-+         AC_CHECK_LIB(myspell, main, [],
-+           [ AC_MSG_ERROR(myspell library not found.) ], [])
-+         MYSPELL_LIBS=-lmyspell
-+      ]
-+    )
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_MYSPELL=NO
-+    MYSPELL_LIBS=-lmyspell
-+fi
-+AC_SUBST(SYSTEM_MYSPELL)
-+AC_SUBST(MYSPELL_CFLAGS)
-+AC_SUBST(MYSPELL_LIBS)
-+
-+dnl ===================================================================
-+dnl Checking for altlinuxhyph
-+dnl ===================================================================
-+AC_MSG_CHECKING([which altlinuxhyph to use])
-+if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_HYPH=YES
-+    AC_CHECK_HEADER(hyphen.h, [],
-+       [ AC_MSG_ERROR(altlinuxhyph headers not found.)], [])
-+    AC_CHECK_MEMBER(struct _HyphenDict.cset, [],
-+       [ AC_MSG_ERROR(no. You are sure you have altlinuyhyph headers?)],
-+       [#include <hyphen.h>])
-+    AC_CHECK_LIB(hyph, hnj_hyphen_hyphenate, [],
-+        [ AC_MSG_ERROR(altlinuxhyph library not found.)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_HYPH=NO
-+fi
-+AC_SUBST(SYSTEM_HYPH)
-+
-+dnl ===================================================================
- dnl Checks for libraries.
- dnl ===================================================================
- dnl Check for Mac OS X native GUI, which may be used instead of X11.
-@@ -1917,6 +2254,182 @@ AC_SUBST(WITH_FONTS)
- AC_SUBST(SCPDEFS)
- 
- dnl ===================================================================
-+dnl ===================================================================
-+dnl Check whether to build with system XRender
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to use system XRender])
-+if test -n "$with_system_xrender"; then
-+  AC_MSG_RESULT([yes])
-+  SYSTEM_XRENDER=YES
-+  AC_CHECK_LIB(Xrender, XRenderQueryVersion, [],
-+     [AC_MSG_ERROR(Xrender not found or functional)], [])
-+else
-+  AC_MSG_RESULT([no])
-+  SYSTEM_XRENDER=NO
-+fi
-+AC_SUBST(SYSTEM_XRENDER)
-+
-+dnl Test whether to include MySpell dictionaries
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to include MySpell dictionaries])
-+if test -z "$with_myspell_dicts"; then
-+  AC_MSG_RESULT([yes])
-+  WITH_MYSPELL_DICTS=YES
-+else
-+  AC_MSG_RESULT([no])
-+  WITH_MYSPELL_DICTS=NO
-+fi
-+AC_SUBST(WITH_MYSPELL_DICTS)
-+
-+dnl ===================================================================
-+dnl Test whether to include FontOOo
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to include FontOOo])
-+if test -n "$enable_fontooo"; then
-+  if test "$enable_fontooo" = "no"; then
-+    AC_MSG_RESULT([no])
-+    WITH_FONTOOO=NO
-+    SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-+  else
-+    AC_MSG_RESULT([yes])
-+    WITH_FONTOOO=YES
-+  fi
-+else
-+  AC_MSG_RESULT([no])
-+  WITH_FONTOOO=NO
-+  SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-+fi
-+AC_SUBST(WITH_FONTOOO)
-+
-+if test "$WITH_FONTOOO" = "YES"; then
-+  dnl ===============================================================
-+  dnl Check whether to use libmspack from system
-+  dnl ===============================================================
-+  AC_MSG_CHECKING([whether to use system libmspack])
-+  if test -n "$with_system_mspack" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([yes])
-+    SYSTEM_MSPACK=YES
-+    AC_CHECK_HEADER(mspack.h, [],
-+      [AC_MSG_ERROR(mspack.h not found, install libmspack)], [])
-+    AC_CHECK_LIB(mspack, mspack_create_cab_decompressor, [],
-+      [AC_MSG_ERROR(libmspack not installed or functional)], [])
-+  else
-+    AC_MSG_RESULT([no])
-+    SYSTEM_MSPACK=NO
-+  fi
-+fi
-+AC_SUBST(SYSTEM_MSPACK)
-+
-+dnl ==================================================================
-+dnl Check for system nas
-+dnl ===================================================================
-+AC_MSG_CHECKING([which nas to use])
-+if test -n "$with_system_nas" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_NAS=YES
-+    AC_CHECK_HEADER(audio/audiolib.h, [ NAS_INCLUDES=/usr/include ],
-+        [
-+             CFLAGS=-I/usr/X11R6/include
-+             AC_CHECK_HEADER(audio/audiolib.h,
-+                 [ NAS_INCLUDES=/usr/X11R6/include ],
-+                 [ AC_MSG_ERROR(no. install nas) ], []
-+             )
-+        ], []
-+    )
-+    AC_CHECK_LIB(audio, AuOpenServer, [],
-+        [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_NAS=NO
-+fi
-+AC_SUBST(SYSTEM_NAS)
-+AC_SUBST(NAS_INCLUDES)
-+
-+dnl ===================================================================
-+dnl Check for system curl
-+dnl ===================================================================
-+AC_MSG_CHECKING([which curl to use])
-+if test -n "$with_system_curl" -o -n "$with_system_libs"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_CURL=YES
-+    AC_CHECK_HEADER(curl/curl.h, [],
-+    [ AC_MSG_ERROR([curl headers not found. install curl])], [])
-+    AC_CHECK_LIB(curl, curl_easy_setopt, [],
-+       [AC_MSG_ERROR(curl not found or functional)], [-L$XLIB -lXt])
-+    SCPDEFS="$SCPDEFS -DSYSTEM_CURL"
-+else
-+    AC_MSG_RESULT([internal])
-+    SYSTEM_CURL=NO
-+fi
-+AC_SUBST(SYSTEM_CURL)
-+AC_SUBST(SCPDEFS)
-+
-+dnl ===================================================================
-+dnl Check for system X11 extensions
-+dnl ===================================================================
-+AC_MSG_CHECKING([which X11 extensions headers to use])
-+if test -n "$with_system_x11_extensions_headers"; then
-+    AC_MSG_RESULT([external])
-+    SYSTEM_X11EXT_H=YES
-+    AC_CHECK_HEADER(X11/extensions/render.h, [],
-+        [AC_MSG_ERROR(X11's render.h not found.)], [])
-+    AC_CHECK_HEADER(X11/extensions/renderproto.h, [],
-+        [AC_MSG_ERROR(X11's renderproto.h not found.)], [])
-+    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
-+        [AC_MSG_ERROR(X11's Xrender.h not found.)], [])
-+else
-+    AC_MSG_RESULT([internal])
-+fi
-+AC_SUBST(SYSTEM_X11EXT_H)
-+
-+AC_MSG_CHECKING([whether and how to use Xinerama])
-+if test "$_os" = "Darwin"; then
-+   USE_XINERAMA=YES
-+   AC_MSG_RESULT([yes])
-+elif test "$_os" = "Linux"; then
-+   if test -f "$XLIB/libXinerama.so" -a -f "$XLIB/libXinerama.a"; then
-+      # we have both versions, let the user decide but use the static one
-+      # per default
-+      USE_XINERAMA=YES
-+      if test -n "$with_dynamic_xinerama" -o "$with_system_libs"; then
-+         XINERAMA_LINK=dynamic
-+      else
-+         XINERAMA_LINK=static
-+      fi
-+   elif test -f "$XLIB/libXinerama.so" -a ! -f "XLIB/libXinerama.a"; then
-+      # we have only the dynamic version
-+      USE_XINERAMA=YES
-+      XINERAMA_LINK=dynamic
-+   elif test -f "$XLIB/libXinerama.a"; then
-+      # static version
-+      if test "`uname -m`" = "i586" -o "`uname -m`" = "i686"; then
-+         USE_XINERAMA=YES
-+         XINERAMA_LINK=static
-+      else
-+         USE_XINERAMA_=NO
-+         XINERAMA_LINK=none
-+      fi
-+   else
-+      # no Xinerama
-+      USE_XINERAMA=NO
-+      XINERAMA_LINK=none
-+   fi
-+   if test "$USE_XINERAMA" = "YES"; then
-+      AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
-+      AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
-+          [AC_MSG_ERROR(Xinerama header not found.)], [])
-+      AC_CHECK_LIB(Xinerama, XineramaIsActive, [],
-+          [AC_MSG_ERROR(Xinerama not functional?)], [-L$XLIB -lXext])
-+   else
-+      AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
-+   fi
-+else
-+   AC_MSG_RESULT([no])
-+fi
-+AC_SUBST(USE_XINERAMA)
-+AC_SUBST(XINERAMA_LINK)
-+
-+dnl ===================================================================
- dnl Test for the presence of Ant and that it works
- dnl ===================================================================
- 
-Index: config_office/set_soenv.in
-===================================================================
---- config_office/set_soenv.in.orig	2004-08-14 01:19:51.354365944 +0200
-+++ config_office/set_soenv.in	2004-08-14 01:23:23.676088136 +0200
-@@ -1310,7 +1310,14 @@ else
- }
- 
- $PYTHONPATH           = '.'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ds.'lib-dynload';
--$PYTHONHOME           = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH';
-+if ("@PYTHON@" eq "")
-+{
-+  $PYTHONHOME           = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH';
-+}
-+else
-+{
-+  $PYTHONHOME		= '@PYTHONHOME@';
-+}
- 
- #
- print "done\n";
-@@ -1734,11 +1741,50 @@ ToFile( "LIBSN_CFLAGS",      "@LIBSN_CFL
- ToFile( "LIBSN_LIBS",        "@LIBSN_LIBS@",       "e" );
- ToFile( "WITH_MOZILLA",      "@WITH_MOZILLA@",     "e" );
- ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
-+ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
-+ToFile( "WITH_FONTOOO",      "@WITH_FONTOOO@",     "e" );
-+ToFile( "SYSTEM_MSPACK",     "@SYSTEM_MSPACK@",    "e" );
-+ToFile( "SYSTEM_PYTHON",     "@PYTHON@",           "e" );
-+ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
-+ToFile( "PYMAJOR",           "@PYMAJOR@",          "e" );
-+ToFile( "PYMINOR",           "@PYMINOR@",          "e" );
-+ToFile( "PYMICRO",           "@PYMICRO@",          "e" );
-+ToFile( "PYVERSION",         "@PYVERSION@",        "e" );
- if ( '@ENABLE_RPATH@' eq "no" ) {
-   ToFile( "LINKFLAGSRUNPATH",'',                   "e" );
- }
- ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
- ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
-+ToFile( "ENABLE_CUPS",       "YES",                "e" );
-+ToFile( "SYSTEM_NAS",        "@SYSTEM_NAS@",       "e" );
-+ToFile( "NAS_INCLUDES",      "@NAS_INCLUDES@",     "e" );
-+ToFile( "FONTCONFIG_FONTS",  "@FONTCONFIG_FONTS@", "e" );
-+ToFile( "FONTCONFIG_LIBS",   "@FONTCONFIG_LIBS@",  "e" );
-+ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
-+ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
-+ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
-+ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
-+ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
-+ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
-+ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
-+ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
-+ToFile( "SYSTEM_SANE_H",     "@SYSTEM_SANE_H@",    "e" );
-+ToFile( "SYSTEM_X11EXT_H",   "@SYSTEM_X11EXT_H@",  "e" );
-+ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
-+ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
-+ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-+ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
-+ToFile( "SYSTEM_MYSPELL",    "@SYSTEM_MYSPELL@",   "e" );
-+ToFile( "MYSPELL_CFLAGS",    "@MYSPELL_CFLAGS@",   "e" );
-+ToFile( "MYSPELL_LIBS",      "@MYSPELL_LIBS@",     "e" );
-+ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
-+ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
-+ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
-+ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
-+ToFile( "SYSTEM_UNIXODBC_H", "@SYSTEM_UNIXODBC_H@","e" );
-+ToFile( "SYSTEM_XRENDER",    "@SYSTEM_XRENDER@",   "e" );
-+#ToFile( "CPP",               "@CPP@",              "e" );
-+#ToFile( "CPPCXX",            "@CPPCXX@",           "e" );
- ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@", "e" );
- ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );
- ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
diff --git a/patches/OOO_1_1_2/crash-statusbar.diff b/patches/OOO_1_1_2/crash-statusbar.diff
deleted file mode 100644
index b9dd962bc..000000000
--- a/patches/OOO_1_1_2/crash-statusbar.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: sfx2/source/statbar/stbmgr.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/statbar/stbmgr.cxx,v
-retrieving revision 1.5
-diff -u -p -u -r1.5 stbmgr.cxx
---- sfx2/source/statbar/stbmgr.cxx	27 Mar 2003 11:28:54 -0000	1.5
-+++ sfx2/source/statbar/stbmgr.cxx	21 Jul 2004 11:26:19 -0000
-@@ -143,6 +143,7 @@ friend class SfxStatusBarManager;
- 
- private:
- 	SfxStatusBarControl* GetItemAt( const MouseEvent &rEvt );
-+    DECL_LINK( ItemRemoved_Impl, void* );
- 
- protected:
- 	virtual void    Click();
-@@ -157,6 +158,7 @@ protected:
- public:
- 					SfxStatusBar_Impl( Window* pParent,
- 									   SfxStatusBarManager& rMgr );
-+					~SfxStatusBar_Impl();
- 	void			Init( SfxStatusBarManager* rMgr );
- 
- 	void			CaptureMouse( SfxStatusBarControl &rCtrl );
-@@ -182,6 +184,29 @@ SfxStatusBar_Impl::SfxStatusBar_Impl( Wi
- 	pLastFocusWin(0)
- {
- 	SetUniqueId( HID_STATUSBAR );
-+
-+	AddEventListener( LINK( this, SfxStatusBar_Impl, ItemRemoved_Impl ) );
-+}
-+
-+SfxStatusBar_Impl::~SfxStatusBar_Impl()
-+{
-+	RemoveEventListener( LINK( this, SfxStatusBar_Impl, ItemRemoved_Impl ) );
-+}
-+
-+IMPL_LINK( SfxStatusBar_Impl, ItemRemoved_Impl, void*, pVoid )
-+{
-+	VclWindowEvent *pEvent = (VclWindowEvent *) pVoid;
-+
-+	if (pEvent)
-+	{
-+		if( pEvent->GetId() == VCLEVENT_STATUSBAR_ITEMREMOVED ||
-+			pEvent->GetId() == VCLEVENT_STATUSBAR_ALLITEMSREMOVED )
-+		{
-+			pLastControl = 0;
-+		}
-+	}
-+
-+    return 0L;
- }
- 
- void SfxStatusBar_Impl::Init( SfxStatusBarManager* p  )
diff --git a/patches/OOO_1_1_2/fpicker-build.diff b/patches/OOO_1_1_2/fpicker-build.diff
deleted file mode 100644
index 02b96fde4..000000000
--- a/patches/OOO_1_1_2/fpicker-build.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: fpicker/prj/build.lst
-===================================================================
-RCS file: /cvs/gsl/fpicker/prj/build.lst,v
-retrieving revision 1.6
-diff -u -p -r1.6 build.lst
---- fpicker/prj/build.lst	14 Feb 2002 13:30:37 -0000	1.6
-+++ fpicker/prj/build.lst	15 Jun 2004 09:22:42 -0000
-@@ -2,4 +2,6 @@ fp	fpicker	:	rdbmaker svtools NULL
- fp	fpicker\source\win32\filepicker		nmake	-	w	fp_win32_filepicker NULL
- fp	fpicker\source\win32\folderpicker	nmake	-	w	fp_win32_folderpicker NULL
- fp  fpicker\source\win32\misc			nmake	-	w	fp_win32_misc fp_win32_filepicker.w fp_win32_folderpicker.w NULL
--fp	fpicker\util						nmake	-	w	fp_util fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
-+fp	fpicker\source\unx					nmake	-	u	fp_unx_common NULL
-+fp	fpicker\source\unx\kde				nmake	-	u	fp_unx_kde_filepicker NULL
-+fp	fpicker\util						nmake	-	all	fp_util fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w fp_unx_common.u fp_unx_kde_filepicker.u NULL
-Index: fpicker/prj/d.lst
-===================================================================
-RCS file: /cvs/gsl/fpicker/prj/d.lst,v
-retrieving revision 1.1
-diff -u -p -r1.1 d.lst
---- fpicker/prj/d.lst	28 Jun 2001 11:06:44 -0000	1.1
-+++ fpicker/prj/d.lst	15 Jun 2004 09:22:42 -0000
-@@ -1,4 +1,8 @@
- ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*
-+..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-+..\%__SRC%\bin\kdefilepicker %_DEST%\bin%_EXT%\kdefilepicker
- 
- ..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
- ..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-+..\source\unx\*.xml %_DEST%\xml%_EXT%\*.xml
-Index: fpicker/util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/fpicker/util/makefile.mk,v
-retrieving revision 1.3
-diff -u -p -r1.3 makefile.mk
---- fpicker/util/makefile.mk	26 Aug 2002 14:03:30 -0000	1.3
-+++ fpicker/util/makefile.mk	15 Jun 2004 09:22:43 -0000
-@@ -143,6 +143,52 @@ DEF2EXPORTFILE=	exports.dxp
- # "$(GUI)"=="WNT"
- .ENDIF			
- 
-+# --- unx -----------------------------------------------------
-+
-+.IF "$(GUIBASE)" == "unx"
-+
-+.IF "$(ENABLE_FPICKER_KDE)" == "TRUE"
-+
-+SHL1TARGET=$(TARGET1)
-+
-+SHL1STDLIBS=$(CPPULIB)\
-+			$(CPPUHELPERLIB)\
-+			$(SALLIB)\
-+			$(VCLLIB)\
-+			$(TOOLSLIB)\
-+			$(SVTOOLLIB)
-+
-+SHL1DEPN=
-+SHL1IMPLIB=i$(SHL1TARGET)
-+
-+SHL1LIBS=$(SLB)$/fps.lib
-+
-+SHL1OBJS=$(SLOFILES)
-+			
-+#SHL1RES=$(RES)$/$(TARGET1).res
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+
-+DEF1NAME=$(SHL1TARGET)
-+DEF1EXPORTFILE=	exports.dxp
-+
-+# kdefilepicker binary
-+
-+APP2TARGET=kdefilepicker
-+
-+APP2STDLIBS=\
-+			$(SALLIB) \
-+			$(FPICKER_KDE_LIBS) -lkio
-+
-+APP2OBJS=\
-+			$(SLO)$/kdecommandthread.obj \
-+			$(SLO)$/kdefilepicker.obj \
-+			$(SLO)$/kdefilepicker.moc.obj \
-+			$(SLO)$/kdefpmain.obj \
-+			$(SLO)$/kdemodalityfilter.obj
-+
-+.ENDIF # "$(ENABLE_FPICKER_KDE)" == "TRUE"
-+
-+.ENDIF # "$(GUIBASE)" == "unx"
- 
- .INCLUDE :  target.mk
- 
diff --git a/patches/OOO_1_1_2/gcc-i18n.diff b/patches/OOO_1_1_2/gcc-i18n.diff
deleted file mode 100644
index a6adc53f2..000000000
--- a/patches/OOO_1_1_2/gcc-i18n.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: solenv/bin/gccinstlib.pl
-===================================================================
-RCS file: /cvs/tools/solenv/bin/gccinstlib.pl,v
-retrieving revision 1.2.50.1
-diff -u -r1.2.50.1 gccinstlib.pl
---- solenv/bin/gccinstlib.pl	16 Mar 2004 10:15:42 -0000	1.2.50.1
-+++ solenv/bin/gccinstlib.pl	16 Aug 2004 10:07:34 -0000
-@@ -74,8 +74,7 @@
- $Dest = pop(@ARGV) || die "No destination to copy to";
- 
- if ($Dest =~ /--help/ || @ARGV < 1) {
--	printf ("Syntax:\n  gcc-instlib <library-in-libpath ...>
--		<destination-dir>\n");
-+    print "Syntax:\n  gcc-instlib <library-in-libpath ...> <destination-dir>\n";
-     exit (0);
- }
- foreach $File (@ARGV) {
-@@ -105,7 +104,7 @@
- 
-     $cc = $ENV{'CC'} || die "No CC environment set";
- 
--    open (GCCOut, "$cc -print-search-dirs|") || die "Failed to exec $cc -print-search-dirs: $!";
-+    open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-search-dirs|") || die "Failed to exec $cc -print-search-dirs: $!";
- 
-     while (<GCCOut>) {
-         if (/^([a-zA-Z]+): [=]{0,1}(.*)/) {
diff --git a/patches/OOO_1_1_2/hungarian-help.diff b/patches/OOO_1_1_2/hungarian-help.diff
deleted file mode 100644
index d1c478ff4..000000000
--- a/patches/OOO_1_1_2/hungarian-help.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- scp/source/office/dir.scp
-+++ scp/source/office/dir.scp
-@@ -967,6 +967,11 @@
-     DosName         = "35";
- End
- 
-+Directory GID_DIR_HELP_36
-+	ParentID		= GID_DIR_HELP;
-+    DosName         = "36";
-+End
-+
- Directory GID_DIR_HELP_37
- 	ParentID		= GID_DIR_HELP;
-     DosName         = "37";
-
---- scp/inc/gid.inc
-+++ scp/inc/gid.inc
-@@ -329,6 +329,7 @@
- #define GID_DIR_HELP_33								gid_Dir_Help_33
- #define GID_DIR_HELP_34                             gid_Dir_Help_34
- #define GID_DIR_HELP_35                             gid_Dir_Help_35
-+#define GID_DIR_HELP_36                             gid_Dir_Help_36
- #define GID_DIR_HELP_37                             gid_Dir_Help_37
- #define GID_DIR_HELP_50                             gid_Dir_Help_50
- #define GID_DIR_HELP_39								gid_Dir_Help_39
diff --git a/patches/OOO_1_1_2/i18n-build-hindi-thai.diff b/patches/OOO_1_1_2/i18n-build-hindi-thai.diff
deleted file mode 100644
index 2fcd9e4df..000000000
--- a/patches/OOO_1_1_2/i18n-build-hindi-thai.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.10.6.8
-diff -u -r1.10.6.8 set_soenv.in
---- config_office/set_soenv.in	3 May 2004 15:26:57 -0000	1.10.6.8
-+++ config_office/set_soenv.in	10 Jun 2004 21:36:25 -0000
-@@ -50,7 +50,7 @@
- #
- # Platform independent constant values.
- my @LANGUAGES = ("AFRIK", "ARAB", "CAT", "CHINSIM", "CHINTRAD", "CZECH", "DAN", "DTCH", "ENUS", "ESTONIAN", "FINN", "FREN", "GREEK", "HEBREW", "HUNG", "ITAL",
--"JAPN", "KOREAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "TURK", "WELSH", "ZULU" ); 
-+"JAPN", "KOREAN", "NORBOK", "NORNYN", "NSOTHO", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "TURK", "WELSH", "ZULU", "THAI", "HINDI" ); 
- my @DICTIONARIES = ("DADK", "DEDE", "ENGB", "ENUS", "ITIT", "RURU" );
- my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
-      $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
diff --git a/patches/OOO_1_1_2/java_build_with_ibm_1_4.diff b/patches/OOO_1_1_2/java_build_with_ibm_1_4.diff
deleted file mode 100644
index 125dae1d3..000000000
--- a/patches/OOO_1_1_2/java_build_with_ibm_1_4.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- config_office/configure.in
-+++ config_office/configure.in
-@@ -1335,6 +1335,14 @@
-         AC_MSG_RESULT([checked (JDK $_jdk)])
-       fi
-       JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
-+
-+      dnl test for the jar archive with core classes
-+      dnl IBM Java, verison 1.4 uses core.jar instead of rt.jar
-+      if test -f "$JAVA_HOME/jre/lib/core.jar" ; then
-+        CORECLASS="core.jar"
-+      else
-+        CORECLASS="rt.jar"
-+      fi
-    else
-       AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
-    fi
-@@ -1351,6 +1359,7 @@
- fi
- AC_SUBST(JAVA_HOME)
- AC_SUBST(JDK)
-+AC_SUBST(CORECLASS)
- AC_SUBST(XSLTPROC)
- 
- dnl ===================================================================
---- config_office/set_soenv.in
-+++ config_office/set_soenv.in
-@@ -374,9 +374,15 @@
-       $CPU            = "I";
-       $CPUNAME        = "INTEL";
-       $DLLSUFFIX      = "li";
--      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
--      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
--      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      if ( '@JDK@' eq 'IBM') {
-+         $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
-+         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-+         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
-+      } else {
-+         $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-+         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-+         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      }
-    }
-    elsif (($machine_type eq "sparc") or ($machine_type eq "sparc64"))
-  
-@@ -868,10 +874,11 @@
- $DMAKEROOT            = '$SOLARENVINC'.$ds."startup";
- # Location of JDK classes .zip file.
- # but in jdk 1.2 it is called rt.jar and it lives in jre/lib
--$CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
-+# and IBM Java, version 1.4 uses core.jar instead of rt.jar
-+$CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds.'@CORECLASS@'.$ps.'.';
- # Location of the JDK supported standard classes.zip file.
- # see above for why the change
--$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
-+$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds.'@CORECLASS@'.$ps.'.';
- 
- # Paths to run time shared libraries.
- if ($platform eq "$Solaris") 
diff --git a/patches/OOO_1_1_2/kde-cut-paste-fix.diff b/patches/OOO_1_1_2/kde-cut-paste-fix.diff
deleted file mode 100644
index a938cf67c..000000000
--- a/patches/OOO_1_1_2/kde-cut-paste-fix.diff
+++ /dev/null
@@ -1,257 +0,0 @@
-Index: dtrans/source/X11/X11_selection.hxx
-===================================================================
-RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.hxx,v
-retrieving revision 1.23.10.2
-retrieving revision 1.23.10.2.18.1
-diff -u -p -r1.23.10.2 -r1.23.10.2.18.1
---- dtrans/source/X11/X11_selection.hxx	15 Jan 2004 12:46:17 -0000	1.23.10.2
-+++ dtrans/source/X11/X11_selection.hxx	12 May 2004 12:40:07 -0000	1.23.10.2.18.1
-@@ -236,17 +236,15 @@ namespace x11 {
- 		// property used to transfer the data
- 		struct IncrementalTransfer
- 		{
--			Sequence< sal_Int8 >
--											m_aData;
-+			Sequence< sal_Int8 >			m_aData;
- 			int								m_nBufferPos;
- 			Window							m_aRequestor;
- 			Atom							m_aProperty;
- 			Atom							m_aTarget;
- 			int								m_nFormat;
- 			int								m_nTransferStartTime;
--
--			IncrementalTransfer( const Sequence< sal_Int8 >& rData, Window aRequestor, Atom aProperty, Atom aTarget, int nFormat );
- 		};
-+        int m_nIncrementalThreshold;
- 
- 		// a struct to hold the data associated with a selection
- 		struct Selection
-@@ -431,7 +429,7 @@ namespace x11 {
- 		::std::hash_map< Atom, Selection* >
- 									m_aSelections;
- 		// IncrementalTransfers in progress
--		::std::hash_map< Window, ::std::list< IncrementalTransfer > >
-+		std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >
- 									m_aIncrementals;
- 		
- 		// do not use X11 multithreading capabilities
-Index: dtrans/source/X11/X11_selection.cxx
-===================================================================
-RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.cxx,v
-retrieving revision 1.64.6.3
-retrieving revision 1.64.6.3.12.1
-diff -u -p -r1.64.6.3 -r1.64.6.3.12.1
---- dtrans/source/X11/X11_selection.cxx	26 Jan 2004 17:38:29 -0000	1.64.6.3
-+++ dtrans/source/X11/X11_selection.cxx	12 May 2004 12:40:07 -0000	1.64.6.3.12.1
-@@ -109,7 +109,6 @@
- #include <rtl/tencinfo.h>
- #endif
- 
--#define INCR_MIN_SIZE	1024
- #define INCR_TIMEOUT		5
- 
- #define DRAG_EVENT_MASK	ButtonPressMask			|\
-@@ -238,26 +237,8 @@ rtl_TextEncoding x11::getTextPlainEncodi
- 
- // ------------------------------------------------------------------------
- 
--SelectionManager::IncrementalTransfer::IncrementalTransfer(
--                                                           const Sequence< sal_Int8 >& rData,
--                                                           Window aRequestor,
--                                                           Atom aProperty,
--                                                           Atom aTarget,
--                                                           int nFormat
--                                                           ) :
--		m_aData( rData ),
--		m_aRequestor( aRequestor ),
--		m_aProperty( aProperty ),
--		m_aTarget( aTarget ),
--		m_nFormat( nFormat ),
--		m_nBufferPos( 0 ),
--		m_nTransferStartTime( time( NULL ) )
--{
--}
--
--// ------------------------------------------------------------------------
--
- SelectionManager::SelectionManager() :
-+        m_nIncrementalThreshold( 15*1024 ),
-         m_pDisplay( NULL ),
-         m_aWindow( None ),
-         m_aDropWindow( None ),
-@@ -436,6 +417,11 @@ void SelectionManager::initialize( const
- 			m_aWindow = XCreateSimpleWindow( m_pDisplay, DefaultRootWindow( m_pDisplay ),
- 											 10, 10, 10, 10, 0, 0, 1 );
- 
-+            // initialize threshold for incremetal transfers
-+            // ICCCM says it should be smaller that the max request size
-+            // which in turn is guaranteed to be at least 16k bytes
-+            m_nIncrementalThreshold = XMaxRequestSize( m_pDisplay ) - 1024;
-+
- 			if( m_aWindow )
- 			{
- 				// initialize default cursors
-@@ -1546,24 +1532,43 @@ bool SelectionManager::sendData( Selecti
-     if( bConverted )
-     {
-         // conversion succeeded
--        if( aData.getLength() > INCR_MIN_SIZE )
-+        if( aData.getLength() > m_nIncrementalThreshold )
-         {
- #if OSL_DEBUG_LEVEL > 1
-             fprintf( stderr, "using INCR protocol\n" );
-+            std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor );
-+            if( win_it != m_aIncrementals.end() )
-+            {
-+                std::hash_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property );
-+                if( inc_it != win_it->second.end() )
-+                {
-+                    const IncrementalTransfer& rInc = inc_it->second;
-+                    fprintf( stderr, "premature end and new start for INCR transfer for window 0x%x, property %s, type %s\n",
-+                             rInc.m_aRequestor,
-+                             OUStringToOString( getString( rInc.m_aProperty ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-+                             OUStringToOString( getString( rInc.m_aTarget ), RTL_TEXTENCODING_ISO_8859_1 ).getStr()
-+                             );
-+                }
-+            }
- #endif
--            // use incr protocol
-+
-+            // insert IncrementalTransfer
-+            IncrementalTransfer& rInc	= m_aIncrementals[ requestor ][ property ];
-+            rInc.m_aData				= aData;
-+            rInc.m_nBufferPos			= 0;
-+            rInc.m_aRequestor			= requestor;
-+            rInc.m_aProperty			= property;
-+            rInc.m_aTarget				= target;
-+            rInc.m_nFormat				= nFormat;
-+            rInc.m_nTransferStartTime	= time( NULL );
-+
-+            // use incr protocol, signal start to requestor
-             int nBufferPos = 0;
--            int nMinSize = INCR_MIN_SIZE;
-+            int nMinSize = m_nIncrementalThreshold;
-+            XSelectInput( m_pDisplay, requestor, PropertyChangeMask );
-             XChangeProperty( m_pDisplay, requestor, property,
-                              m_nINCRAtom, 32,  PropModeReplace, (unsigned char*)&nMinSize, 1 );
--            XSelectInput( m_pDisplay, requestor, PropertyChangeMask );
--            IncrementalTransfer aTransfer( aData,
--                                           requestor,
--                                           property,
--                                           target,
--                                           nFormat
--                                           );
--            m_aIncrementals[ requestor ].push_back( aTransfer );
-+            XFlush( m_pDisplay );
-         }
-         else
-             XChangeProperty( m_pDisplay,
-@@ -1907,43 +1912,80 @@ void SelectionManager::handleSendPropert
-     // feed incrementals
-     if( rNotify.state == PropertyDelete )
-     {
--        ::std::hash_map< Window, ::std::list< IncrementalTransfer > >::iterator it;
-+        std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >::iterator it;
-         it = m_aIncrementals.find( rNotify.window );
--        int nCurrentTime = time( NULL );
-         if( it != m_aIncrementals.end() )
-         {
--            ::std::list< IncrementalTransfer >::iterator inc_it = it->second.begin();
--            while( inc_it != it->second.end() )
-+            int nCurrentTime = time( NULL );
-+            std::hash_map< Atom, IncrementalTransfer >::iterator inc_it;
-+            // throw out aborted transfers
-+            std::list< Atom > aTimeouts;
-+            for( inc_it = it->second.begin(); inc_it != it->second.end(); ++inc_it )
-             {
--                bool bDone = false;
--                if( inc_it->m_aProperty == rNotify.atom )
-+                if( (nCurrentTime - inc_it->second.m_nTransferStartTime) > INCR_TIMEOUT )
-                 {
--                    int nBytes = inc_it->m_aData.getLength() - inc_it->m_nBufferPos;
--                    nBytes = nBytes > INCR_MIN_SIZE ? INCR_MIN_SIZE : nBytes;
--                    XChangeProperty(
--                                    m_pDisplay,
--                                    inc_it->m_aRequestor,
--                                    inc_it->m_aProperty,
--                                    inc_it->m_aTarget,
--                                    inc_it->m_nFormat,
--                                    PropModeReplace,
--                                    (const unsigned char*)inc_it->m_aData.getConstArray()+inc_it->m_nBufferPos,
--                                    nBytes/(inc_it->m_nFormat/8) );
--                    inc_it->m_nBufferPos += nBytes;
--                    if( nBytes == 0 )
--                        bDone = true;
-+                    aTimeouts.push_back( inc_it->first );
-+#if OSL_DEBUG_LEVEL > 1
-+                    const IncrementalTransfer& rInc = inc_it->second;
-+                    fprintf( stderr, "timeout on INCR transfer for window 0x%x, property %s, type %s\n",
-+                             rInc.m_aRequestor,
-+                             OUStringToOString( getString( rInc.m_aProperty ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-+                             OUStringToOString( getString( rInc.m_aTarget ), RTL_TEXTENCODING_ISO_8859_1 ).getStr()
-+                             );
-+#endif
-                 }
--                else if( nCurrentTime - inc_it->m_nTransferStartTime > INCR_TIMEOUT )
--                    bDone = true;
--                if( bDone )
-+            }
-+
-+            while( aTimeouts.begin() != aTimeouts.end() )
-+            {
-+                // transfer broken, might even be a new client with the
-+                // same window id
-+                it->second.erase( aTimeouts.front() );
-+                aTimeouts.pop_front();
-+            }
-+
-+            inc_it = it->second.find( rNotify.atom );
-+            if( inc_it != it->second.end() )
-+            {
-+                IncrementalTransfer& rInc = inc_it->second;
-+
-+                int nBytes = rInc.m_aData.getLength() - rInc.m_nBufferPos;
-+                nBytes = (nBytes > m_nIncrementalThreshold) ? m_nIncrementalThreshold : nBytes;
-+                if( nBytes < 0 )  // sanity check
-+                    nBytes = 0;
-+#if OSL_DEBUG_LEVEL > 1
-+                fprintf( stderr, "pushing %d bytes: \"%.*s\"...\n",
-+                         nBytes, nBytes > 32 ? 32 : nBytes,
-+                         (const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos );
-+#endif
-+                
-+                XChangeProperty( m_pDisplay,
-+                                 rInc.m_aRequestor,
-+                                 rInc.m_aProperty,
-+                                 rInc.m_aTarget,
-+                                 rInc.m_nFormat,
-+                                 PropModeReplace,
-+                                 (const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos,
-+                                 nBytes/(rInc.m_nFormat/8) );
-+                rInc.m_nBufferPos += nBytes;
-+                rInc.m_nTransferStartTime = nCurrentTime;
-+
-+                if( nBytes == 0 ) // transfer finished
-                 {
--                    ::std::list< IncrementalTransfer >::iterator temp_it = inc_it;
--                    ++inc_it;
--                    it->second.erase( temp_it );
-+#if OSL_DEBUG_LEVEL > 1
-+                    fprintf( stderr, "finished INCR transfer for window 0x%x, property %s, type %s\n",
-+                             rInc.m_aRequestor,
-+                             OUStringToOString( getString( rInc.m_aProperty ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-+                             OUStringToOString( getString( rInc.m_aTarget ), RTL_TEXTENCODING_ISO_8859_1 ).getStr()
-+                             );
-+#endif
-+                    it->second.erase( inc_it );
-                 }
--                else
--                    ++inc_it;
-+
-             }
-+            // eventually clean up the hash map
-+            if( it->second.begin() == it->second.end() )
-+                m_aIncrementals.erase( it );
-         }
-     }
- }
diff --git a/patches/OOO_1_1_2/lingucomponent-memleaks.diff b/patches/OOO_1_1_2/lingucomponent-memleaks.diff
deleted file mode 100644
index 8c474c25a..000000000
--- a/patches/OOO_1_1_2/lingucomponent-memleaks.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- lingucomponent/source/spellcheck/myspell/affixmgr.cxx.~1.12.14.1.~	Fri May  7 11:48:19 2004
-+++ lingucomponent/source/spellcheck/myspell/affixmgr.cxx	Sun Jun  6 10:34:16 2004
-@@ -763,7 +763,7 @@
- char * AffixMgr::get_compound()
- {
-   if (! compound ) return NULL;
--  return mystrdup(compound);
-+  return compound;
- }
- 
- // utility method to look up root words in hash table
---- lingucomponent/source/spellcheck/myspell/suggestmgr.cxx.~1.7.14.3.~	Fri May  7 11:48:19 2004
-+++ lingucomponent/source/spellcheck/myspell/suggestmgr.cxx	Sat Jun  5 17:08:29 2004
-@@ -375,21 +375,28 @@
-                                         rp->astr, rp->alen);
-         for (int k = 0; k < nw; k++) {
-            sc = ngram(n, word, glst[k].word, NGRAM_ANY_MISMATCH);
--           if (sc > thresh) {
--              if (sc > gscore[lp]) {
--	         if (guess[lp]) free (guess[lp]);
--                 gscore[lp] = sc;
--                 guess[lp] = glst[k].word;
--                 lval = sc;
--                 for (j=0; j < MAX_GUESS; j++)
--	            if (gscore[j] < lval) {
--	               lp = j;
--                       lval = gscore[j];
--	            }
--	      } else {
--                 free (glst[k].word);  
--              }
--	   }            
-+	   if (sc > thresh)
-+	   {
-+		if (sc > gscore[lp])
-+		{
-+			if (guess[lp]) free(guess[lp]);
-+			gscore[lp] = sc;
-+			guess[lp] = glst[k].word;
-+			glst[k].word = NULL;
-+			lval = sc;
-+			for (j=0; j < MAX_GUESS; j++)
-+			{
-+				if (gscore[j] < lval)
-+				{
-+					lp = j;
-+					lval = gscore[j];
-+				}
-+			}
-+		}
-+	   }
-+	   free (glst[k].word);
-+	   glst[k].word = NULL;
-+	   glst[k].allow = 0;
- 	}
-       }
-   }
diff --git a/patches/OOO_1_1_2/neon-control-characters.diff b/patches/OOO_1_1_2/neon-control-characters.diff
deleted file mode 100644
index 473f8b709..000000000
--- a/patches/OOO_1_1_2/neon-control-characters.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- neon/neon.patch.orig	2004-06-08 20:32:52.000000000 +0200
-+++ neon/neon.patch	2004-06-08 20:33:00.369904697 +0200
-@@ -438,3 +438,88 @@
-       /* RFC850/1036 style dates: Sunday, 06-Nov-94 08:49:37 GMT */
-       n = sscanf(date, RFC1036_FORMAT,
-   		wkday, &gmt.tm_mday, mon, &gmt.tm_year,
-+*** misc/neon-0.23.5/src/ne_session.c	2002-09-17 22:08:01.000000000 +0200
-+--- misc/build/neon-0.23.5/src/ne_session.c	2004-06-08 19:21:04.683116987 +0200
-+***************
-+*** 33,38 ****
-+--- 33,40 ----
-+  #include <errno.h>
-+  #endif
-+  
-++ #include <ctype.h> /* for cleanse() */
-++ 
-+  #ifdef NEON_SSL
-+  #include <openssl/ssl.h>
-+  #include <openssl/err.h>
-+***************
-+*** 242,250 ****
-+      uri->scheme = ne_strdup(sess->scheme);
-+  }
-+  
-+  const char *ne_get_error(ne_session *sess)
-+  {
-+!     return sess->error;
-+  }
-+  
-+  void ne_close_connection(ne_session *sess)
-+--- 244,263 ----
-+      uri->scheme = ne_strdup(sess->scheme);
-+  }
-+  
-++ /* Cleanse 'str' of non-printable characters.  Duplicated in
-++  * ne_utils.c for the duration of neon 0.23.x to prevent ABI
-++  * change. */
-++ static char *cleanse(char *str)
-++ {
-++     char *pnt;
-++     for (pnt = str; *pnt; pnt++)
-++         if (iscntrl(*pnt) || !isprint(*pnt)) *pnt = ' ';
-++     return str;
-++ }
-++ 
-+  const char *ne_get_error(ne_session *sess)
-+  {
-+!     return cleanse(sess->error);
-+  }
-+  
-+  void ne_close_connection(ne_session *sess)
-+diff -cr misc/neon-0.23.5/src/ne_utils.c misc/build/neon-0.23.5/src/ne_utils.c
-+*** misc/neon-0.23.5/src/ne_utils.c	2002-07-18 00:19:46.000000000 +0200
-+--- misc/build/neon-0.23.5/src/ne_utils.c	2004-06-08 19:21:04.684116818 +0200
-+***************
-+*** 129,134 ****
-+--- 129,145 ----
-+  #endif
-+  }
-+  
-++ /* Cleanse 'str' of non-printable characters.  Duplicated in
-++  * ne_session.c for the duration of neon 0.23.x to prevent ABI
-++  * change. */
-++ static char *cleanse(char *str)
-++ {
-++     char *pnt;
-++     for (pnt = str; *pnt; pnt++)
-++         if (iscntrl(*pnt) || !isprint(*pnt)) *pnt = ' ';
-++     return str;
-++ }
-++ 
-+  int ne_parse_statusline(const char *status_line, ne_status *st)
-+  {
-+      const char *part;
-+***************
-+*** 177,183 ****
-+      /* Fill in the results */
-+      st->major_version = major;
-+      st->minor_version = minor;
-+!     st->reason_phrase = ne_strdup(part);
-+      st->code = status_code;
-+      st->klass = klass;
-+      return 0;
-+--- 188,194 ----
-+      /* Fill in the results */
-+      st->major_version = major;
-+      st->minor_version = minor;
-+!     st->reason_phrase = cleanse(ne_strdup(part));
-+      st->code = status_code;
-+      st->klass = klass;
-+      return 0;
diff --git a/patches/OOO_1_1_2/readd-lzwc.diff b/patches/OOO_1_1_2/readd-lzwc.diff
deleted file mode 100644
index a11b24fb0..000000000
--- a/patches/OOO_1_1_2/readd-lzwc.diff
+++ /dev/null
@@ -1,290 +0,0 @@
---- /dev/null	2004-04-29 03:59:24.000000000 +0200
-+++ goodies/source/filter.vcl/egif/giflzwc.cxx	2000-09-18 18:30:11.000000000 +0200
-@@ -0,0 +1,287 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <tools/stream.hxx>
-+#include "giflzwc.hxx"
-+
-+// ----------------------------
-+// - GIFImageDataOutputStream -
-+// ----------------------------
-+
-+class GIFImageDataOutputStream
-+{
-+private:
-+
-+	void		FlushBlockBuf();
-+	inline void	FlushBitsBufsFullBytes();
-+
-+	SvStream&	rStream;
-+	BYTE*		pBlockBuf;
-+	BYTE		nBlockBufSize;
-+	ULONG		nBitsBuf;
-+	USHORT		nBitsBufSize;
-+
-+public:
-+
-+				GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
-+				~GIFImageDataOutputStream();
-+
-+	inline void	WriteBits( USHORT nCode, USHORT nCodeLen );
-+};
-+
-+// ------------------------------------------------------------------------
-+
-+inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
-+{
-+	while (nBitsBufSize>=8)
-+	{
-+		if( nBlockBufSize==255 )
-+			FlushBlockBuf();
-+
-+		pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
-+		nBitsBuf >>= 8;
-+		nBitsBufSize -= 8;
-+	}
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
-+{
-+	if( nBitsBufSize+nCodeLen>32 )
-+		FlushBitsBufsFullBytes();
-+
-+	nBitsBuf |= (ULONG) nCode << nBitsBufSize;
-+	nBitsBufSize += nCodeLen;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
-+		rStream(rGIF)
-+{
-+	pBlockBuf = new BYTE[ 255 ];
-+	nBlockBufSize = 0;
-+	nBitsBufSize = 0;
-+	nBitsBuf = 0;
-+	rStream << nLZWDataSize;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+
-+GIFImageDataOutputStream::~GIFImageDataOutputStream()
-+{
-+	WriteBits(0,7);
-+	FlushBitsBufsFullBytes();
-+	FlushBlockBuf();
-+	rStream << (BYTE)0;
-+	delete[] pBlockBuf;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFImageDataOutputStream::FlushBlockBuf()
-+{
-+	if( nBlockBufSize )
-+	{
-+		rStream << (BYTE) nBlockBufSize;
-+		rStream.Write( pBlockBuf,nBlockBufSize );
-+		nBlockBufSize = 0;
-+	}
-+}
-+
-+// -------------------
-+// - GIFLZWCTreeNode -
-+// -------------------
-+
-+struct GIFLZWCTreeNode
-+{
-+
-+	GIFLZWCTreeNode*	pBrother;		// naechster Knoten, der den selben Vater hat
-+	GIFLZWCTreeNode*	pFirstChild;	// erster Sohn
-+	USHORT				nCode;			// Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
-+	USHORT				nValue;			// Der Pixelwert
-+};
-+
-+// --------------------
-+// - GIFLZWCompressor -
-+// --------------------
-+
-+GIFLZWCompressor::GIFLZWCompressor()
-+{
-+	pIDOS=NULL;
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+GIFLZWCompressor::~GIFLZWCompressor()
-+{
-+	if (pIDOS!=NULL) EndCompression();
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
-+{
-+	if( !pIDOS )
-+	{
-+		USHORT i;
-+
-+		nDataSize = nPixelSize;
-+
-+		if( nDataSize < 2 )
-+			nDataSize=2;
-+
-+		nClearCode=1<<nDataSize;
-+		nEOICode=nClearCode+1;
-+		nTableSize=nEOICode+1;
-+		nCodeSize=nDataSize+1;
-+
-+		pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
-+		pTable=new GIFLZWCTreeNode[4096];
-+
-+		for (i=0; i<4096; i++)
-+		{
-+			pTable[i].pBrother = pTable[i].pFirstChild = NULL;
-+			pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
-+		}
-+
-+		pPrefix = NULL;
-+		pIDOS->WriteBits( nClearCode,nCodeSize );
-+	}
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
-+{
-+	if( pIDOS )
-+	{
-+		GIFLZWCTreeNode*	p;
-+		USHORT				i;
-+		BYTE				nV;
-+
-+		if( !pPrefix && nSize )
-+		{
-+			pPrefix=pTable+(*pSrc++);
-+			nSize--;
-+		}
-+
-+		while( nSize )
-+		{
-+			nSize--;
-+			nV=*pSrc++;
-+			for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
-+			{
-+				if (p->nValue==nV)
-+					break;
-+			}
-+
-+			if( p)
-+				pPrefix=p;
-+			else
-+			{
-+				pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-+
-+				if (nTableSize==4096)
-+				{
-+					pIDOS->WriteBits(nClearCode,nCodeSize);
-+
-+					for (i=0; i<nClearCode; i++)
-+						pTable[i].pFirstChild=NULL;
-+
-+					nCodeSize=nDataSize+1;
-+					nTableSize=nEOICode+1;
-+				}
-+				else
-+				{
-+					if(nTableSize==(USHORT)(1<<nCodeSize))
-+						nCodeSize++;
-+
-+					p=pTable+(nTableSize++);
-+					p->pBrother=pPrefix->pFirstChild;
-+					pPrefix->pFirstChild=p;
-+					p->nValue=nV;
-+					p->pFirstChild=NULL;
-+				}
-+
-+				pPrefix=pTable+nV;
-+			}
-+		}
-+	}
-+}
-+
-+// ------------------------------------------------------------------------
-+
-+void GIFLZWCompressor::EndCompression()
-+{
-+	if( pIDOS )
-+	{
-+		if( pPrefix )
-+			pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-+
-+		pIDOS->WriteBits( nEOICode,nCodeSize );
-+		delete[] pTable;
-+		delete pIDOS;
-+		pIDOS=NULL;
-+	}
-+}
diff --git a/patches/OOO_1_1_2/security-sonames.diff b/patches/OOO_1_1_2/security-sonames.diff
deleted file mode 100644
index bf907067f..000000000
--- a/patches/OOO_1_1_2/security-sonames.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- sal/osl/unx/security.c-old	2004-05-29 22:10:26.000000000 +0200
-+++ sal/osl/unx/security.c	2004-05-29 22:15:28.000000000 +0200
-@@ -248,7 +248,7 @@
- 		   (but not for PAM-0.66 RH 6.0) */
- 		void *pam_hdl;
- 		
--		pam_hdl = dlopen( "libpam.so", RTLD_GLOBAL | RTLD_LAZY );  
-+		pam_hdl = dlopen( "libpam.so.0" , RTLD_GLOBAL | RTLD_LAZY );  
- 		
- 		if ( pam_hdl != NULL )
- 			pam_module = (sal_PamModule*)calloc( 1, sizeof(sal_PamModule) );
-@@ -341,7 +345,7 @@
- 	{
- 		oslModule crypt_library;
- 
--		crypt_library = osl_psz_loadModule( "libcrypt.so", SAL_LOADMODULE_DEFAULT );  /* never closed */
-+		crypt_library = osl_psz_loadModule( "libcrypt.so.1", SAL_LOADMODULE_DEFAULT );  /* never closed */
- 		if ( crypt_library != NULL )
- 			crypt_sym = (char* (*)(const char *, const char *)) osl_psz_getSymbol(crypt_library, "crypt" );
- 		if ( crypt_sym == NULL ) /* no libcrypt or libcrypt without crypt */
diff --git a/patches/OOO_1_1_2/shellexec_allow_params.diff b/patches/OOO_1_1_2/shellexec_allow_params.diff
deleted file mode 100644
index bdb203306..000000000
--- a/patches/OOO_1_1_2/shellexec_allow_params.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- shell/source/unix/exec/shellexec.cxx	2004-05-04 14:17:59.740508616 +0200
-+++ shell/source/unix/exec/shellexec.cxx	2004-05-04 15:23:15.561213384 +0200
-@@ -294,6 +294,15 @@ void SAL_CALL ShellExec::execute( const 
-         
-         if( aHandler.getLength() )
-         {
-+            OUString aHandlerParams;
-+            
-+            sal_Int32 nParamsIdx = aHandler.indexOf( (sal_Unicode) ' ' );
-+            if ( nParamsIdx > 0 && nParamsIdx < aHandler.getLength() )
-+            {
-+                aHandlerParams = aHandler.copy( nParamsIdx + 1, aHandler.getLength() - nParamsIdx - 1 );
-+                aHandler = aHandler.copy( 0, nParamsIdx );
-+            }
-+	    
-             // search handler in system path if no absolute path given
-             FileBase::searchFileURL( aHandler, OUString(), aHandler );
-             
-@@ -302,12 +311,17 @@ void SAL_CALL ShellExec::execute( const 
-             
-             // due to a possible convertion to file url, 
-             // rebuild command line from scratch
--            OUStringBuffer aBuffer( aHandler.getLength() + aURL.getLength() + 5 );
-+            OUStringBuffer aBuffer( aHandler.getLength() + aURL.getLength() + 6 );
-             
-             aBuffer.append( (sal_Unicode) '\"' );
-             aBuffer.append( aHandler );
-             aBuffer.append( (sal_Unicode) '\"' );
-             aBuffer.append( (sal_Unicode) ' ' );
-+            if ( aHandlerParams.getLength() )
-+            {
-+                aBuffer.append( aHandlerParams );
-+                aBuffer.append( (sal_Unicode) ' ' );
-+            }
-             aBuffer.append( (sal_Unicode) '\'' );
-             aBuffer.append( aURL );
-             aBuffer.append( (sal_Unicode) '\'' );
diff --git a/patches/OOO_1_1_2/sparc-v8-fixes.diff b/patches/OOO_1_1_2/sparc-v8-fixes.diff
deleted file mode 100644
index 6a3e7d095..000000000
--- a/patches/OOO_1_1_2/sparc-v8-fixes.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: sal/osl/unx/util.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/util.c,v
-retrieving revision 1.5
-diff -u -u -r1.5 util.c
---- sal/osl/unx/util.c	2 Jul 2003 13:35:19 -0000	1.5
-+++ sal/osl/unx/util.c	12 Jul 2004 08:02:39 -0000
-@@ -398,3 +398,23 @@
- 
- #endif
- 
-+#if defined ( LINUX ) && defined ( SPARC )
-+#include <sys/utsname.h>
-+void osl_InitSparcV9(void)  __attribute__((constructor));
-+void osl_InterlockedCountSetV9(sal_Bool bV9);
-+/* Determine which machine we are running on (sparc or sparc64)
-+ * The approach is very similar to Solaris.
-+ */
-+void osl_InitSparcV9(void)
-+{
-+	struct utsname name;
-+	int rc;	
-+	rc = uname(&name);
-+	if ( rc != -1 ) {
-+		if ( !strcmp( "sparc", name.machine )) 
-+			return;
-+	osl_InterlockedCountSetV9(sal_True);
-+	}
-+}
-+
-+#endif
-Index: sal/osl/unx/asm/interlck_sparc.s
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/asm/interlck_sparc.s,v
-retrieving revision 1.3
-diff -u -u -r1.3 interlck_sparc.s
---- sal/osl/unx/asm/interlck_sparc.s	28 Apr 2003 17:13:44 -0000	1.3
-+++ sal/osl/unx/asm/interlck_sparc.s	12 Jul 2004 08:02:39 -0000
-@@ -248,7 +248,9 @@
- 
- 1:      ld      [%o0], %o1
-         add     %o1, 1, %o2
--        cas     [%o0], %o1, %o2
-+!       allow linux to build for v8
-+        .word 0xD5E21009 
-+!       cas     [%o0], %o1, %o2
-         cmp     %o1, %o2
-         bne     1b
-         nop                         ! delay slot
-@@ -267,7 +269,9 @@
- 
- 1:      ld      [%o0], %o1
-         sub     %o1, 1, %o2
--        cas     [%o0], %o1, %o2
-+!       allow linux to build for v8
-+        .word 0xD5E21009            
-+!       cas     [%o0], %o1, %o2
-         cmp     %o1, %o2
-         bne     1b
-         nop                         ! delay slot
-@@ -276,4 +280,3 @@
- 
-  .type  osl_decrementInterlockedCountV9,#function
-  .size  osl_decrementInterlockedCountV9,.-osl_decrementInterlockedCountV9
--
-Index: sc/source/core/data/makefile.mk
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/makefile.mk,v
-retrieving revision 1.6.260.3
-diff -u -u -r1.6.260.3 makefile.mk
---- sc/source/core/data/makefile.mk	28 Jan 2004 10:02:07 -0000	1.6.260.3
-+++ sc/source/core/data/makefile.mk	12 Jul 2004 08:02:42 -0000
-@@ -205,7 +205,8 @@
- 		$(SLO)$/table3.obj \
- 		$(SLO)$/table4.obj  \
- 		$(SLO)$/documen4.obj \
--		$(SLO)$/conditio.obj
-+		$(SLO)$/conditio.obj \
-+		$(SLO)$/validat.obj
- .ENDIF
- 
- EXCEPTIONSFILES= \
-Index: solenv/inc/unxlngs.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxlngs.mk,v
-retrieving revision 1.2.50.2
-diff -u -u -r1.2.50.2 unxlngs.mk
---- solenv/inc/unxlngs.mk	30 Mar 2004 13:17:38 -0000	1.2.50.2
-+++ solenv/inc/unxlngs.mk	12 Jul 2004 08:02:55 -0000
-@@ -62,7 +62,7 @@
- 
- # mk file for unxlngs
- ASM=$(CC)
--AFLAGS=-Wa,-Av8plus,-K,PIC -c $(CDEFS)
-+AFLAGS=-Wa,-K,PIC -c $(CDEFS)
- 
- SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
diff --git a/patches/OOO_1_1_2/stlport-compile-fix.diff b/patches/OOO_1_1_2/stlport-compile-fix.diff
deleted file mode 100644
index 282dc11cf..000000000
--- a/patches/OOO_1_1_2/stlport-compile-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- sw/source/ui/frmdlg/frmpage.cxx.orig	2004-03-31 14:55:12.000000000 +0000
-+++ sw/source/ui/frmdlg/frmpage.cxx	2004-03-31 14:55:23.000000000 +0000
-@@ -551,7 +551,7 @@
-     const ::std::vector< String >& rPrev, const ::std::vector< String >& rThis,
-     const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain)
- {
--    ::std::vector< const String >::iterator aIt;
-+    ::std::vector< String >::const_iterator aIt;
-     USHORT nEntry = 0;
-     for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++)
-         nEntry = rBox.InsertEntry(*aIt);
-
diff --git a/patches/OOO_1_1_2/system-curl.diff b/patches/OOO_1_1_2/system-curl.diff
deleted file mode 100644
index ddeca044e..000000000
--- a/patches/OOO_1_1_2/system-curl.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- curl/makefile.mk	16 Jul 2003 17:24:06 -0000	1.8
-+++ curl/makefile.mk	22 Dec 2003 15:07:10 -0000
-@@ -71,6 +71,12 @@
- 
- # --- Files --------------------------------------------------------
- 
-+.IF "$(SYSTEM_CURL)" == "YES"
-+@all:
-+
-+	echo "Using curl already installed on system."
-+.ENDIF
-+
- TARFILE_NAME=curl-7.9.8
- 
- .IF "$(GUI)"=="UNX"
-Index: office/files.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/files.scp,v
-retrieving revision 1.369.16.3.12.3
-diff -u -r1.369.16.3.12.3 files.scp
---- scp/source/office/files.scp	13 Dec 2003 15:36:15 -0000	1.369.16.3.12.3
-+++ scp/source/office/files.scp	22 Dec 2003 19:38:30 -0000
-@@ -938,6 +938,8 @@
-         #endif
- End
- 
-+#ifndef SYSTEM_CURL
-+
- File GID_FILE_LIB_CURL
-         TXT_FILE_BODY;
-         Styles          = (PACKED);
-@@ -949,6 +951,7 @@
-         #endif
- End
- 
-+#endif
- 
- File GID_FILE_LIB_I18NREGEXP
-         TXT_FILE_BODY;
-Index: ftpurl.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftpurl.hxx,v
-retrieving revision 1.11
-diff -u -r1.11 ftpurl.hxx
---- ucb/source/ucp/ftp/ftpurl.hxx	27 Mar 2003 17:26:48 -0000	1.11
-+++ ucb/source/ucp/ftp/ftpurl.hxx	15 Jan 2004 03:16:09 -0000
-@@ -80,6 +80,9 @@
- #include "ftpdirp.hxx"
- #include "ftpcfunc.hxx"
- 
-+#define TRUE 1
-+#define FALSE 0
-+
- namespace ftp {
- 
- 	/** Forward declarations.
-Index: ftphandleprovider.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftphandleprovider.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 ftphandleprovider.hxx
---- ucb/source/ucp/ftp/ftphandleprovider.hxx	15 Oct 2002 09:21:17 -0000	1.2
-+++ ucb/source/ucp/ftp/ftphandleprovider.hxx	20 Jul 2004 22:02:48 -0000
-@@ -1,5 +1,5 @@
- #include <rtl/ustring.hxx>
--#include <curl/types.h>
-+#include <curl/curl.h>
- 
- namespace ftp {
- 	
-Index: ftploaderthread.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftploaderthread.hxx,v
-retrieving revision 1.5
-diff -u -r1.5 ftploaderthread.hxx
---- ucb/source/ucp/ftp/ftploaderthread.hxx	28 Aug 2002 07:23:14 -0000	1.5
-+++ ucb/source/ucp/ftp/ftploaderthread.hxx	20 Jul 2004 22:02:48 -0000
-@@ -71,11 +71,10 @@
- #ifndef _OSL_THREAD_H_
- #include <osl/thread.h>
- #endif
--#ifndef __CURL_TYPES_H
--#include <curl/types.h>
-+#ifndef __CURL_CURL_H
-+#include <curl/curl.h>
- #endif
- 
--
- namespace ftp {
- 	
- 	/** A loaderthread acts as factory for CURL-handles,
diff --git a/patches/OOO_1_1_2/system-freetype.diff b/patches/OOO_1_1_2/system-freetype.diff
deleted file mode 100644
index f60d6a2c7..000000000
--- a/patches/OOO_1_1_2/system-freetype.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- solenv/inc/libs.mk	31 Oct 2003 16:23:21 -0000	1.66.14.1
-+++ solenv/inc/libs.mk	9 Dec 2003 11:50:20 -0000
-@@ -135,9 +135,12 @@
- BSTRPLIB=-lbtstrp
- VCLLIBST=-lvcl
- VCLLIB=$(SVLIB)
--FREETYPELIB=-lfreetype
--FREETYPELIBST=$(STATIC) -lfreetype $(DYNAMIC)
-+.IF "$(SYSTEM_FREETYPE)"!="YES"
-+  FREETYPE_LIBS=-lfreetype
-+.ENDIF
-+FREETYPELIB=$(FREETYPE_LIBS)
-+FREETYPELIBST=$(STATIC) $(FREETYPE_LIBS) $(DYNAMIC)
- XPLIB=-l_xp
- TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
- SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
-
---- vcl/source/glyphs/makefile.mk	15 Feb 2002 15:52:27 -0000	1.5
-+++ vcl/source/glyphs/makefile.mk	9 Dec 2003 11:50:47 -0000
-@@ -73,6 +73,7 @@
- # --- Files --------------------------------------------------------
- 
- .IF "$(USE_BUILTIN_RASTERIZER)" != ""
-+CFLAGS += $(FREETYPE_CFLAGS)
- SLOFILES=\
- 		$(SLO)$/glyphcache.obj		\
- 		$(SLO)$/gcach_rbmp.obj		\
-Index: freetype/makefile.mk
-===================================================================
---- freetype/makefile.mk.orig	2003-05-28 14:41:19.000000000 +0200
-+++ freetype/makefile.mk	2004-01-08 00:48:40.000000000 +0100
-@@ -75,12 +75,12 @@ TARGET=so_freetype
- # the X11 port because there are some header conflicts
- # and linktime conflicts as well.  It is simply less of
- # a headache to use the one provided.
--.IF "$(OS)" == "MACOSX"
-+.IF "$(OS)" == "MACOSX" || "$(SYSTEM_FREETYPE)" == "YES"
- 
- dummy:
--	@echo "Nothing to build for MACOSX"
-+	@echo "Nothing to build for OS $(OS)"
- 
--.ELSE	# "$(OS)" == "MACOSX"
-+.ELSE	# "$(OS)" == "MACOSX" || "$(SYSTEM_FREETYPE)" == "YES"
- 
- TARFILE_NAME=freetype-2.1.4
- 
-Index: scp/source/global/setupzip.scp
-===================================================================
---- scp/source/global/setupzip.scp.orig	2003-12-12 21:11:03.000000000 +0100
-+++ scp/source/global/setupzip.scp	2004-01-08 00:49:26.000000000 +0100
-@@ -556,6 +556,8 @@ End
- 
- #ifdef UNX
- 
-+#ifndef SYSTEM_FREETYPE
-+
- #ifndef MACOSX
- File GID_FILE_LIB_FREETYPE
-     #if defined (LINUX)  &&  ( defined (CLASSIC_FAT_PRODUCT) || defined (OSL_PRODUCT) || defined (FAM_PRODUCT) )
-@@ -573,6 +575,8 @@ File GID_FILE_LIB_FREETYPE
- End
- #endif
- 
-+#endif
-+
- #if defined (OSL_PRODUCT) && !defined(WITHOUT_FONTS)
- STD_FONTUNX_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans)
- #endif
diff --git a/patches/OOO_1_1_2/system-nas.diff b/patches/OOO_1_1_2/system-nas.diff
deleted file mode 100644
index 18eb6a81f..000000000
--- a/patches/OOO_1_1_2/system-nas.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- vcl/unx/source/app/makefile.mk	15 Aug 2003 11:25:34 -0000	1.9.250.1
-+++ vcl/unx/source/app/makefile.mk	6 Dec 2003 19:16:55 -0000
-@@ -116,6 +116,11 @@
- CDEFS+=-DHAVE_LIBSN
- CFLAGS+=$(LIBSN_CFLAGS)
- .ENDIF
- 
-+.IF "$(SYSTEM_NAS)"=="YES"
-+CDEFS+=-DSYSTEM_NAS
-+CFLAGS+=-I$(NAS_INCLUDES)
-+.ENDIF
-+
- .IF "$(OS)$(CPU)" == "SOLARISS"
- .IF "$(COM)"!="GCC"
-
-Index: nas/makefile.mk
-===================================================================
---- nas/makefile.mk.orig	2003-06-12 11:45:13.000000000 +0200
-+++ nas/makefile.mk	2004-08-13 20:36:27.571942400 +0200
-@@ -71,13 +71,14 @@ TARGET=nas
- 
- # --- Files --------------------------------------------------------
- 
--.IF "$(OS)" == "MACOSX" || "$(OS)" == "IRIX"
-+.IF "$(GUI)"!="UNX" || "$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
- 
- dummy:
- 	@echo "Nothing to build for OS $(OS)"
- 
--.ELSE	"$(OS)" == "MACOSX" || "$(OS)" == "IRIX"
-+.ELSE	"$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
- 
-+.IF "$(SYSTEM_NAS)"!="YES"
- TARFILE_NAME=nas-1.6
- 
- PATCH_FILE_NAME=nas-1.6.patch
-@@ -101,11 +102,15 @@ BUILD_FLAGS=CC="$(CC)" CXX="$(CXX)" -j$(
- BUILD_FLAGS=CC="$(CC)" CXX="$(CXX)" 
- .ENDIF
- 
-+.ENDIF
-+
-+.IF "$(SYSTEM_NAS)"!="YES"
- OUT2LIB= \
- 	lib/audio/libaudio.a
- 	
- OUT2INC= \
- 	include/audio/*.h
-+.ENDIF
- 
- .ENDIF			# "$(GUI)"=="UNX"
- 
-Index: vcl/util/makefile.mk
-===================================================================
---- vcl/util/makefile.mk.orig	2004-03-03 15:33:18.000000000 +0100
-+++ vcl/util/makefile.mk	2004-08-13 20:38:35.327520600 +0200
-@@ -311,6 +311,8 @@ SHL1STDLIBS += -lXinerama
- .ENDIF
- 
- .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
-+# some nas versions need -lXt, too
-+SHL1STDLIBS += -lXt
- SHL1STDLIBS += -laudio
- .IF "$(OS)"=="SOLARIS"
- # needed by libaudio.a
diff --git a/patches/OOO_1_1_2/system-neon.diff b/patches/OOO_1_1_2/system-neon.diff
deleted file mode 100644
index e4cd1c01a..000000000
--- a/patches/OOO_1_1_2/system-neon.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- neon/makefile.mk	24 Oct 2002 11:50:58 -0000	1.5
-+++ neon/makefile.mk	3 Mar 2004 01:30:41 -0000
-@@ -71,6 +71,11 @@
- 
- # --- Files --------------------------------------------------------
- 
-+.IF "$(SYSTEM_NEON)" == "YES"
-+@all:
-+	@echo "Using system neon...."
-+.ENDIF
-+
- NEON_NAME=neon-0.23.5
- 
- TARFILE_NAME=$(NEON_NAME)
---- ucb/source/ucp/webdav/makefile.mk	28 Jan 2004 10:15:32 -0000	1.20.4.1
-+++ ucb/source/ucp/webdav/makefile.mk	3 Mar 2004 23:18:51 -0000
-@@ -84,8 +84,12 @@
- .INCLUDE: settings.mk
- .INCLUDE: sv.mk
- 
-+.IF "$(SYSTEM_NEON)" == "YES"
-+CFLAGS+= $(NEON_CFLAGS)
-+.ELSE
- NEONINCDIR=external$/neon
- CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR)
-+.ENDIF
- 
- # --- General -----------------------------------------------------
- 
-Index: NeonSession.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v
-retrieving revision 1.28.4.1
-diff -u -r1.28.4.1 NeonSession.cxx
---- ucb/source/ucp/webdav/NeonSession.cxx	9 Jan 2004 19:07:09 -0000	1.28.4.1
-+++ ucb/source/ucp/webdav/NeonSession.cxx	4 Mar 2004 00:07:29 -0000
-@@ -63,7 +63,11 @@
- 
- #include <string.h>
- 
-+#ifndef USE_DAV_LOCKS
-+#ifndef SYSTEM_NEON
- #include <neon/config.h> /* for USE_DAV_LOCKS */
-+#endif
-+#endif
- 
- #ifndef NE_AUTH_H
- #include <neon/ne_auth.h>
diff --git a/patches/OOO_1_1_2/sysui-translations.diff b/patches/OOO_1_1_2/sysui-translations.diff
deleted file mode 100644
index 126a704fd..000000000
--- a/patches/OOO_1_1_2/sysui-translations.diff
+++ /dev/null
@@ -1,537 +0,0 @@
-Index: documents.ulf
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/share/documents.ulf,v
-retrieving revision 1.7.8.5
-diff -u -r1.7.8.5 documents.ulf
---- sysui/desktop/share/documents.ulf	27 Apr 2004 18:01:05 -0000	1.7.8.5
-+++ sysui/desktop/share/documents.ulf	10 Jun 2004 17:51:01 -0000
-@@ -1,12 +1,11 @@
- [writer]
- en = "%PRODUCTNAME Text Document"
- de = "%PRODUCTNAME Textdokument"
--pt = "%PRODUCTNAME Textdokument"
- el = "%PRODUCTNAME Έγγ�αφο κειμένου"
- nl = "%PRODUCTNAME Tekstdocument"
- fr = "%PRODUCTNAME Texte"
- es = "Documento de texto de %PRODUCTNAME "
--fi = "%PRODUCTNAME Textdokument"
-+fi = "%PRODUCTNAME Tekstiasiakirja"
- hu = "%PRODUCTNAME-szövegesdokumentum"
- it = "%PRODUCTNAME Documento di testo"
- cs = "Textový dokument %PRODUCTNAME"
-@@ -21,10 +20,7 @@
- zh-TW = "%PRODUCTNAME 文字文件"
- tr = "PRODUCTNAME Metin belgesi"
- ar = "%PRODUCTNAME مستند نص"
--he = "%PRODUCTNAME Textdokument"
--ca = "%PRODUCTNAME Document de text"
--th = "%PRODUCTNAME Textdokument"
--hi-IN = "%PRODUCTNAME Textdokument"
-+ca = "Document de text d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i tekstidokument"
- sl = "Dokument z besedilom programa %PRODUCTNAME"
- ru = "%PRODUCTNAME Тек�товый документ"
-@@ -35,13 +31,10 @@
- [writer-template]
- en = "%PRODUCTNAME Text Document Template"
- de = "%PRODUCTNAME Textdokumentvorlage"
--pt = "%PRODUCTNAME Textdokumentvorlage"
--ru = "%PRODUCTNAME Textdokumentvorlage"
--el = "%PRODUCTNAME Textdokumentvorlage"
- nl = "%PRODUCTNAME Tekstdocumentsjabloon"
- fr = "Modèle de texte %PRODUCTNAME"
- es = "Plantilla de documento de texto de %PRODUCTNAME"
--fi = "%PRODUCTNAME Textdokumentvorlage"
-+fi = "%PRODUCTNAME Tekstiasiakirjamalli"
- hu = "%PRODUCTNAME-szövegesdokumentumsablon"
- it = "Modello di documento di testo %PRODUCTNAME"
- cs = "Šablona textového dokumentu %PRODUCTNAME"
-@@ -54,12 +47,7 @@
- ko = "%PRODUCTNAME �스트 문서 서� 파�"
- zh-CN = "%PRODUCTNAME 文本文档样�"
- zh-TW = "%PRODUCTNAME 文字文件樣�"
--tr = "%PRODUCTNAME Textdokumentvorlage"
--ar = "%PRODUCTNAME Textdokumentvorlage"
--he = "%PRODUCTNAME Textdokumentvorlage"
--ca = "%PRODUCTNAME Textdokumentvorlage"
--th = "%PRODUCTNAME Textdokumentvorlage"
--hi-IN = "%PRODUCTNAME Textdokumentvorlage"
-+ca = "%PRODUCTNAME Plantilla de document de text d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i tekstidokumendi mall"
- sl = "Predloga dokumenta z besedilom programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya Tokumente ya Sengwalwa"
-@@ -69,13 +57,12 @@
- [writer-global]
- en = "%PRODUCTNAME Master Document"
- de = "%PRODUCTNAME Globaldokument"
--pt = "%PRODUCTNAME Globaldokument"
- ru = "%PRODUCTNAME Со�тавной документ"
- el = "%PRODUCTNAME K��ιο έγγ�αφο"
- nl = "%PRODUCTNAME Masterdocument"
- fr = "%PRODUCTNAME Document maître"
- es = "Documento maestro de %PRODUCTNAME "
--fi = "%PRODUCTNAME Globaldokument"
-+fi = "%PRODUCTNAME Pääasiakirja"
- hu = "%PRODUCTNAME-fődokumentum"
- it = "%PRODUCTNAME Documento master"
- cs = "Hlavní dokument %PRODUCTNAME"
-@@ -90,10 +77,7 @@
- zh-TW = "%PRODUCTNAME 主控文件"
- tr = "%PRODUCTNAME Ana belge"
- ar = "%PRODUCTNAME مستند شام?"
--he = "%PRODUCTNAME Globaldokument"
--ca = "%PRODUCTNAME Globaldokument"
--th = "%PRODUCTNAME Globaldokument"
--hi-IN = "%PRODUCTNAME Globaldokument"
-+ca = "%PRODUCTNAME "Document mestre d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i põhidokument"
- sl = "Glavni dokument programa %PRODUCTNAME"
- ns = "Tokumente ya Master ya %PRODUCTNAME"
-@@ -103,13 +87,12 @@
- [writer-math]
- en = "%PRODUCTNAME Formula"
- de = "%PRODUCTNAME Formel"
--pt = "%PRODUCTNAME Formel"
- ru = "%PRODUCTNAME Формула"
- el = "%PRODUCTNAME Τ�πος"
- nl = "%PRODUCTNAME Formule"
- fr = "%PRODUCTNAME Formule"
- es = "Fórmula %PRODUCTNAME "
--fi = "%PRODUCTNAME Formel"
-+fi = "%PRODUCTNAME Kaava"
- hu = "%PRODUCTNAME-képlet"
- it = "%PRODUCTNAME Formula"
- cs = "Vzorec %PRODUCTNAME"
-@@ -124,10 +107,7 @@
- zh-TW = "%PRODUCTNAME 公�"
- tr = "%PRODUCTNAME Formül"
- ar = "%PRODUCTNAME صيغة"
--he = "%PRODUCTNAME Formel"
--ca = "%PRODUCTNAME Formel"
--th = "%PRODUCTNAME Formel"
--hi-IN = "%PRODUCTNAME Formel"
-+ca = "Fòrmula d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i valem"
- sl = "Formula programa %PRODUCTNAME"
- ns = "Fomula ya %PRODUCTNAME"
-@@ -137,13 +117,12 @@
- [impress]
- en = "%PRODUCTNAME Presentation"
- de = "%PRODUCTNAME Präsentation"
--pt = "%PRODUCTNAME Präsentation"
- ru = "%PRODUCTNAME Презентаци�"
- el = "%PRODUCTNAME Πα�ουσίαση"
- nl = "%PRODUCTNAME Presentatie"
- fr = "%PRODUCTNAME Présentation"
--es = "Presentación %PRODUCTNAME "
--fi = "%PRODUCTNAME Präsentation"
-+es = "Presentación %PRODUCTNAME"
-+fi = "%PRODUCTNAME Esitys"
- hu = "%PRODUCTNAME-bemutató"
- it = "%PRODUCTNAME Presentazione"
- cs = "Prezentace %PRODUCTNAME"
-@@ -156,12 +135,7 @@
- ko = "%PRODUCTNAME 프레젠테�션"
- zh-CN = "%PRODUCTNAME 演示文稿"
- zh-TW = "%PRODUCTNAME ç°¡å ±"
--tr = "%PRODUCTNAME Pr?sentation"
--ar = "%PRODUCTNAME Pr?sentation"
--he = "%PRODUCTNAME Präsentation"
--ca = "%PRODUCTNAME Pr„sentation"
--th = "%PRODUCTNAME Präsentation"
--hi-IN = "%PRODUCTNAME Präsentation"
-+ca = "Presentació d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i esitlus"
- sl = "Predstavitev programa %PRODUCTNAME"
- ns = "Tlhagišo ya %PRODUCTNAME"
-@@ -171,31 +145,22 @@
- [impress-template]
- en = "%PRODUCTNAME Presentation Template"
- de = "%PRODUCTNAME Präsentationsvorlage"
--pt = "%PRODUCTNAME Präsentationsvorlage"
--ru = "%PRODUCTNAME Pr?sentationsvorlage"
--el = "%PRODUCTNAME Pr?sentationsvorlage"
- nl = "%PRODUCTNAME Presentatiesjabloon"
- fr = "Modèle de présentation %PRODUCTNAME"
- es = "Plantilla de presentación de %PRODUCTNAME"
--fi = "%PRODUCTNAME Präsentationsvorlage"
-+fi = "%PRODUCTNAME Esitysmalli"
- hu = "%PRODUCTNAME-bemutatósablon"
- it = "Modello di presentazione %PRODUCTNAME"
- cs = "Å ablona prezentace %PRODUCTNAME"
- sk = "Šablóna prezentácie %PRODUCTNAME"
- da = "%PRODUCTNAME-præsentationsskabelon"
- sv = "%PRODUCTNAME-presentationsmall"
--pl = "%PRODUCTNAME Präsentationsvorlage"
- pt-BR = "Modelo de apresentação %PRODUCTNAME"
- ja = "%PRODUCTNAME プレゼンテーション テンプレート"
- ko = "%PRODUCTNAME 프레젠테�션 서� 파�"
- zh-CN = "%PRODUCTNAME 演示文稿样�"
- zh-TW = "%PRODUCTNAME 簡報樣�"
--tr = "%PRODUCTNAME Präsentationsvorlage"
--ar = "%PRODUCTNAME Pr?sentationsvorlage"
--he = "%PRODUCTNAME Präsentationsvorlage"
--ca = "%PRODUCTNAME Präsentationsvorlage"
--th = "%PRODUCTNAME Präsentationsvorlage"
--hi-IN = "%PRODUCTNAME Präsentationsvorlage"
-+ca = ""Plantilla de presentació d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i esitluse mall"
- sl = "Predloga predstavitve programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya Tlhagišo"
-@@ -205,13 +170,12 @@
- [draw]
- en = "%PRODUCTNAME Drawing"
- de = "%PRODUCTNAME Zeichnung"
--pt = "%PRODUCTNAME Zeichnung"
- ru = "%PRODUCTNAME Ри�унок"
- el = "%PRODUCTNAME Σχέδιο"
- nl = "%PRODUCTNAME Tekening"
- fr = "%PRODUCTNAME Dessin"
- es = "Dibujo %PRODUCTNAME"
--fi = "%PRODUCTNAME Zeichnung"
-+fi = "%PRODUCTNAME Piirros"
- hu = "%PRODUCTNAME-rajz"
- it = "%PRODUCTNAME Disegno"
- cs = "Kresba %PRODUCTNAME"
-@@ -226,10 +190,7 @@
- zh-TW = "%PRODUCTNAME 繪圖"
- tr = "%PRODUCTNAME Çizim"
- ar = "%PRODUCTNAME رسم"
--he = "%PRODUCTNAME Zeichnung"
--ca = "%PRODUCTNAME Dibuix"
--th = "%PRODUCTNAME Zeichnung"
--hi-IN = "%PRODUCTNAME Zeichnung"
-+ca = "Dibuix d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i joonistus"
- sl = "Risba programa %PRODUCTNAME"
- ns = "Go thala ga %PRODUCTNAME"
-@@ -239,31 +200,22 @@
- [draw-template]
- en = "%PRODUCTNAME Drawing Template"
- de = "%PRODUCTNAME Zeichnungsvorlage"
--pt = "%PRODUCTNAME Zeichnungsvorlage"
--ru = "%PRODUCTNAME Zeichnungsvorlage"
--el = "%PRODUCTNAME Zeichnungsvorlage"
- nl = "%PRODUCTNAME Tekeningsjabloon"
- fr = "Modèle de dessin %PRODUCTNAME"
- es = "Plantilla de dibujo de %PRODUCTNAME"
--fi = "%PRODUCTNAME Zeichnungsvorlage"
-+fi = "%PRODUCTNAME Piirrosmalli"
- hu = "%PRODUCTNAME-rajzsablon"
- it = "Modello di disegno %PRODUCTNAME"
- cs = "Å ablona kresby %PRODUCTNAME"
- sk = "Šablóna kresby %PRODUCTNAME"
- da = "%PRODUCTNAME-tegningsskabelon"
- sv = "%PRODUCTNAME-teckningsmall"
--pl = "%PRODUCTNAME Zeichnungsvorlage"
- pt-BR = "Modelo de desenho %PRODUCTNAME"
- ja = "%PRODUCTNAME 図形�画テンプレート"
- ko = "%PRODUCTNAME 그리기 서� 파�"
- zh-CN = "%PRODUCTNAME 绘图样�"
- zh-TW = "%PRODUCTNAME 繪圖樣�"
--tr = "%PRODUCTNAME Zeichnungsvorlage"
--ar = "%PRODUCTNAME Zeichnungsvorlage"
--he = "%PRODUCTNAME Zeichnungsvorlage"
--ca = "%PRODUCTNAME Zeichnungsvorlage"
--th = "%PRODUCTNAME Zeichnungsvorlage"
--hi-IN = "%PRODUCTNAME Zeichnungsvorlage"
-+ca = "Plantilla de dibuix d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i joonistuse mall"
- sl = "Predloga risbe programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya go Thala"
-@@ -273,13 +225,12 @@
- [calc]
- en = "%PRODUCTNAME Spreadsheet"
- de = "%PRODUCTNAME Tabelle"
--pt = "%PRODUCTNAME Tabelle"
- ru = "%PRODUCTNAME Электронна� таблица"
- el = "%PRODUCTNAME Πίνακας"
- nl = "%PRODUCTNAME Tabel"
- fr = "%PRODUCTNAME Classeur"
--es = "Hoja de cálculo de %PRODUCTNAME "
--fi = "%PRODUCTNAME Tabelle"
-+es = "Hoja de cálculo de %PRODUCTNAME"
-+fi = "%PRODUCTNAME Laskentataulukko"
- hu = "%PRODUCTNAME-munkafüzet"
- it = "%PRODUCTNAME Tabella"
- cs = "Sešit %PRODUCTNAME"
-@@ -293,11 +244,7 @@
- zh-CN = "%PRODUCTNAME 工作表"
- zh-TW = "%PRODUCTNAME 工作表"
- tr = "%PRODUCTNAME Tablo"
--ar = "%PRODUCTNAME Tabelle"
--he = "%PRODUCTNAME Tabelle"
--ca = "%PRODUCTNAME Tabelle"
--th = "%PRODUCTNAME Tabelle"
--hi-IN = "%PRODUCTNAME Tabelle"
-+ca = "Fulla de cÃ| lcul d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i arvutustabel"
- sl = "Preglednica programa %PRODUCTNAME"
- ns = "Pampiri ya go anega ya %PRODUCTNAME"
-@@ -307,31 +254,22 @@
- [calc-template]
- en = "%PRODUCTNAME Spreadsheet Template"
- de = "%PRODUCTNAME Tabellenvorlage"
--pt = "%PRODUCTNAME Tabellenvorlage"
--ru = "%PRODUCTNAME Tabellenvorlage"
--el = "%PRODUCTNAME Tabellenvorlage"
- nl = "%PRODUCTNAME Werkbladsjabloon"
- fr = "Modèle de classeur %PRODUCTNAME"
- es = "Plantilla de hoja de cálculo de %PRODUCTNAME"
--fi = "%PRODUCTNAME Tabellenvorlage"
-+fi = "%PRODUCTNAME Laskentataulukkomalli"
- hu = "%PRODUCTNAME-munkafüzetsablon"
- it = "Modello di foglio elettronico %PRODUCTNAME"
- cs = "Šablona sešitu %PRODUCTNAME"
- sk = "Šablóna tabuľky %PRODUCTNAME"
- da = "%PRODUCTNAME-regnearksskabelon"
- sv = "%PRODUCTNAME-tabellmall"
--pl = "%PRODUCTNAME Tabellenvorlage"
- pt-BR = "Modelo de planilha %PRODUCTNAME"
- ja = "%PRODUCTNAME 表計算テンプレート"
- ko = "%PRODUCTNAME 스프레드시트 서� 파�"
- zh-CN = "%PRODUCTNAME 工作表样�"
- zh-TW = "%PRODUCTNAME 工作表樣�"
--tr = "%PRODUCTNAME Tabellenvorlage"
--ar = "%PRODUCTNAME Tabellenvorlage"
--he = "%PRODUCTNAME Tabellenvorlage"
--ca = "%PRODUCTNAME Tabellenvorlage"
--th = "%PRODUCTNAME Tabellenvorlage"
--hi-IN = "%PRODUCTNAME Tabellenvorlage"
-+ca = "Plantilla de fulla de cÃ| lcul d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i arvutustabeli mall"
- sl = "Predloga preglednice programa %PRODUCTNAME"
- ns = "%PRODUCTNAME Template ya Pampiri ya go Anega"
-Index: launcher_comment.ulf
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/share/launcher_comment.ulf,v
-retrieving revision 1.8.8.6
-diff -u -r1.8.8.6 launcher_comment.ulf
---- sysui/desktop/share/launcher_comment.ulf	27 Apr 2004 18:01:17 -0000	1.8.8.6
-+++ sysui/desktop/share/launcher_comment.ulf	10 Jun 2004 17:51:01 -0000
-@@ -1,13 +1,12 @@
- [writer]
- en = "%PRODUCTNAME Text Document"
- de = "%PRODUCTNAME Textdokument"
--pt = "%PRODUCTNAME Textdokument"
- ru = "%PRODUCTNAME Тек�товый документ"
- el = "%PRODUCTNAME Έγγ�αφο κειμένου"
- nl = "%PRODUCTNAME Tekstdocument"
- fr = "%PRODUCTNAME Texte"
--es = "Documento de texto %PRODUCTNAME "
--fi = "%PRODUCTNAME Textdokument"
-+es = "Documento de texto %PRODUCTNAME"
-+fi = "%PRODUCTNAME Tekstiasiakirja"
- hu = "%PRODUCTNAME-szövegesdokumentum"
- it = "%PRODUCTNAME Documento di testo"
- cs = "Textový dokument %PRODUCTNAME"
-@@ -22,10 +21,7 @@
- zh-TW = "%PRODUCTNAME 文字文件"
- tr = "PRODUCTNAME Metin belgesi"
- ar = "%PRODUCTNAME مستند نص"
--he = "%PRODUCTNAME Textdokument"
--ca = "%PRODUCTNAME Document de text"
--th = "%PRODUCTNAME Textdokument"
--hi-IN = "%PRODUCTNAME Textdokument"
-+ca = "Document de text d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i tekstidokument"
- sl = "Dokument z besedilom programa %PRODUCTNAME"
- cy = "Dogfen Testun %PRODUCTNAME"
-@@ -36,13 +32,12 @@
- [web]
- en = "%PRODUCTNAME HTML Document"
- de = "%PRODUCTNAME HTML Dokument"
--pt = "%PRODUCTNAME HTML Dokument"
- ru = "%PRODUCTNAME HTML-документ"
- el = "%PRODUCTNAME Έγγ�αφο HTML"
- nl = "%PRODUCTNAME HTML-document"
- fr = "%PRODUCTNAME Document HTML"
--es = "Documento HTML %PRODUCTNAME "
--fi = "%PRODUCTNAME HTML Dokument"
-+es = "Documento HTML %PRODUCTNAME"
-+fi = "%PRODUCTNAME HTML-asiakirja"
- hu = "%PRODUCTNAME HTML-dokumentum"
- it = "%PRODUCTNAME Documento HTML"
- cs = "HTML dokument %PRODUCTNAME"
-@@ -55,12 +50,7 @@
- ko = "%PRODUCTNAME HTML 문서"
- zh-CN = "%PRODUCTNAME HTML 文档"
- zh-TW = "%PRODUCTNAME HTML 文件"
--tr = "%PRODUCTNAME HTML Dokument"
--ar = "%PRODUCTNAME HTML Dokument"
--he = "%PRODUCTNAME HTML Dokument"
--ca = "%PRODUCTNAME HTML Dokument"
--th = "%PRODUCTNAME HTML Dokument"
--hi-IN = "%PRODUCTNAME HTML Dokument"
-+ca = "Document HTML d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i HTML-dokument"
- sl = "HTML dokument programa %PRODUCTNAME"
- ns = "Tokumente ya HTML ya %PRODUCTNAME"
-@@ -70,13 +60,12 @@
- [impress]
- en = "%PRODUCTNAME Presentation"
- de = "%PRODUCTNAME Präsentation"
--pt = "%PRODUCTNAME Präsentation"
- ru = "%PRODUCTNAME Презентаци�"
- el = "%PRODUCTNAME Πα�ουσίαση"
- nl = "%PRODUCTNAME Presentatie"
- fr = "%PRODUCTNAME Présentation"
--es = "Presentación %PRODUCTNAME "
--fi = "%PRODUCTNAME Präsentation"
-+es = "Presentación %PRODUCTNAME"
-+fi = "%PRODUCTNAME Esitys"
- hu = "%PRODUCTNAME-bemutató"
- it = "%PRODUCTNAME Presentazione"
- cs = "Prezentace %PRODUCTNAME"
-@@ -89,12 +78,7 @@
- ko = "%PRODUCTNAME 프레젠테�션"
- zh-CN = "%PRODUCTNAME 演示文稿"
- zh-TW = "%PRODUCTNAME ç°¡å ±"
--tr = "%PRODUCTNAME Pr?sentation"
--ar = "%PRODUCTNAME Pr?sentation"
--he = "%PRODUCTNAME Präsentation"
--ca = "%PRODUCTNAME Pr„sentation"
--th = "%PRODUCTNAME Präsentation"
--hi-IN = "%PRODUCTNAME Präsentation"
-+ca = "Presentació d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i esitlus"
- sl = "Predstavitev programa %PRODUCTNAME"
- ns = "Tlhagišo ya %PRODUCTNAME"
-@@ -110,7 +94,7 @@
- nl = "%PRODUCTNAME Tekening"
- fr = "%PRODUCTNAME Dessin"
- es = "Dibujo %PRODUCTNAME"
--fi = "%PRODUCTNAME Zeichnung"
-+fi = "%PRODUCTNAME Pirros"
- hu = "%PRODUCTNAME-rajz"
- it = "%PRODUCTNAME Disegno"
- cs = "Kresba %PRODUCTNAME"
-@@ -126,7 +110,7 @@
- tr = "%PRODUCTNAME Çizim"
- ar = "%PRODUCTNAME رسم"
- he = "%PRODUCTNAME Zeichnung"
--ca = "%PRODUCTNAME Dibuix"
-+ca = "Dibuix d'%PRODUCTNAME"
- th = "%PRODUCTNAME Zeichnung"
- hi-IN = "%PRODUCTNAME Zeichnung"
- et = "%PRODUCTNAME-i joonistus"
-@@ -138,13 +122,12 @@
- [calc]
- en = "%PRODUCTNAME Spreadsheet"
- de = "%PRODUCTNAME Tabelle"
--pt = "%PRODUCTNAME Tabelle"
- ru = "%PRODUCTNAME Электронна� таблица"
- el = "%PRODUCTNAME Πίνακας"
- nl = "%PRODUCTNAME Tabel"
- fr = "%PRODUCTNAME Classeur"
- es = "Hoja de cálculo %PRODUCTNAME"
--fi = "%PRODUCTNAME Tabelle"
-+fi = "%PRODUCTNAME Laskentataulukko"
- hu = "PRODUCTNAME-munkafüzet"
- it = "%PRODUCTNAME Tabella"
- cs = "Sešit %PRODUCTNAME"
-@@ -158,11 +141,7 @@
- zh-CN = "%PRODUCTNAME 工作表"
- zh-TW = "%PRODUCTNAME 工作表"
- tr = "%PRODUCTNAME Tablo"
--ar = "%PRODUCTNAME Tabelle"
--he = "%PRODUCTNAME Tabelle"
--ca = "%PRODUCTNAME Tabelle"
--th = "%PRODUCTNAME Tabelle"
--hi-IN = "%PRODUCTNAME Tabelle"
-+ca = "Fulla de cÃ| lcul d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i arvutustabel"
- sl = "Preglednica programa %PRODUCTNAME"
- ns = "Pampiri ya go anega ya %PRODUCTNAME"
-@@ -172,13 +151,12 @@
- [math]
- en = "%PRODUCTNAME Formula"
- de = "%PRODUCTNAME Formel"
--pt = "%PRODUCTNAME Formel"
- ru = "%PRODUCTNAME Формула"
- el = "%PRODUCTNAME Τ�πος"
- nl = "%PRODUCTNAME Formule"
- fr = "%PRODUCTNAME Formule"
- es = "Fórmula %PRODUCTNAME "
--fi = "%PRODUCTNAME Formel"
-+fi = "%PRODUCTNAME Kaava"
- hu = "%PRODUCTNAME-képlet"
- it = "%PRODUCTNAME Formula"
- cs = "Vzorec %PRODUCTNAME"
-@@ -193,10 +171,7 @@
- zh-TW = "%PRODUCTNAME 公�"
- tr = "%PRODUCTNAME Formül"
- ar = "%PRODUCTNAME صيغة"
--he = "%PRODUCTNAME Formel"
--ca = "%PRODUCTNAME Formel"
--th = "%PRODUCTNAME Formel"
--hi-IN = "%PRODUCTNAME Formel"
-+ca = "Fòrmula d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i valem"
- sl = "Formula programa %PRODUCTNAME"
- ns = "Fomula ya %PRODUCTNAME"
-Index: launcher_name.ulf
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/share/launcher_name.ulf,v
-retrieving revision 1.7.8.5
-diff -u -r1.7.8.5 launcher_name.ulf
---- sysui/desktop/share/launcher_name.ulf	27 Apr 2004 18:01:32 -0000	1.7.8.5
-+++ sysui/desktop/share/launcher_name.ulf	10 Jun 2004 17:51:01 -0000
-@@ -1,13 +1,11 @@
- [printeradmin]
- en = "%PRODUCTNAME Printer Administration"
- de = "%PRODUCTNAME Drucker Verwaltung"
--pt = "%PRODUCTNAME Drucker Verwaltung"
- ru = "%PRODUCTNAME Управление принтером"
--el = "%PRODUCTNAME Drucker Verwaltung"
- nl = "%PRODUCTNAME printerbeheer"
- fr = "%PRODUCTNAME Gestion des imprimantes"
--es = "Administración de la impresora de %PRODUCTNAME "
--fi = "%PRODUCTNAME Drucker Verwaltung"
-+es = "Administración de la impresora de %PRODUCTNAME
-+fi = "%PRODUCTNAME Tulostinhallinta"
- hu = "%PRODUCTNAME Nyomtatókezelés"
- it = "%PRODUCTNAME Gestione stampanti"
- cs = "Administrace tiskáren %PRODUCTNAME"
-@@ -21,11 +19,7 @@
- zh-CN = "%PRODUCTNAME 打�机管�"
- zh-TW = "%PRODUCTNAME �表機管�"
- tr = "%PRODUCTNAME Printer Administration"
--ar = "%PRODUCTNAME Drucker Verwaltung"
--he = "%PRODUCTNAME Drucker Verwaltung"
--ca = "%PRODUCTNAME Drucker Verwaltung"
--th = "%PRODUCTNAME Drucker Verwaltung"
--hi-IN = "%PRODUCTNAME Drucker Verwaltung"
-+ca = "Administració d'impressó d'%PRODUCTNAME"
- et = "%PRODUCTNAME-i printerite haldamine"
- sl = "%PRODUCTNAME nastavitve tiskalnika"
- cy = "Gweinyddiad Argraffu %PRODUCTNAME"
-@@ -36,13 +30,12 @@
- [template]
- en = "%PRODUCTNAME From Template"
- de = "%PRODUCTNAME Aus Vorlage"
--pt = "%PRODUCTNAME Aus Vorlage"
- ru = "%PRODUCTNAME Из шаблона"
- el = "%PRODUCTNAME Από π�ότυπο"
- nl = "%PRODUCTNAME Uit sjabloon"
- fr = "À partir d'un modèle %PRODUCTNAME"
- es = "A partir de una plantilla de %PRODUCTNAME"
--fi = "%PRODUCTNAME Aus Vorlage"
-+fi = "%PRODUCTNAME Asiakirjamallipohjasta"
- hu = "%PRODUCTNAME sablonból"
- it = "%PRODUCTNAME Da modello"
- cs = "Ze Å¡ablony %PRODUCTNAME"
-@@ -55,12 +48,7 @@
- ko = "%PRODUCTNAME 서� 파�로부터"
- zh-CN = "%PRODUCTNAME 采用样�"
- zh-TW = "%PRODUCTNAME 採用樣�"
--tr = "%PRODUCTNAME Aus Vorlage"
--ar = "%PRODUCTNAME Aus Vorlage"
--he = "%PRODUCTNAME Aus Vorlage"
--ca = "%PRODUCTNAME Aus Vorlage"
--th = "%PRODUCTNAME Aus Vorlage"
--hi-IN = "%PRODUCTNAME Aus Vorlage"
-+ca = "Des d'una plantilla d'%PRODUCTNAME"
- et = "%PRODUCTNAME mallist"
- sl = "%PRODUCTNAME iz predloge"
- ns = "%PRODUCTNAME go tšwa go Template"
diff --git a/patches/OOO_1_1_2/vcl-arabic-fallback.diff b/patches/OOO_1_1_2/vcl-arabic-fallback.diff
deleted file mode 100644
index 33cc5574f..000000000
--- a/patches/OOO_1_1_2/vcl-arabic-fallback.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-===================================================================
-RCS file: /opt/sourcecast/data/ccvs/repository/gsl/vcl/source/gdi/sallayout.cxx,v
-retrieving revision 1.46.10.6
-retrieving revision 1.46.10.6.8.1
-diff -u -r1.46.10.6 -r1.46.10.6.8.1
---- vcl/source/gdi/sallayout.cxx	2004/04/07 11:02:20	1.46.10.6
-+++ vcl/source/gdi/sallayout.cxx	2004/05/03 11:04:49	1.46.10.6.8.1
-@@ -822,9 +822,10 @@
-                 nXPosMax = nXPos;
-         }
- 
--        // rightmost cluster edge is leftmost edge of next cluster
-+        // when the current cluster overlaps with the next one assume
-+        // rightmost cluster edge is the leftmost edge of next cluster
-         if( (i > 0) && (nXPosMax > pG[1].maLinearPos.X()) )
--            nXPosMax = pG->maLinearPos.X();
-+            nXPosMax = pG[1].maLinearPos.X();
- 
-         // character width is sum of glyph cluster widths
-         pCharWidths[n] += nXPosMax - nXPosMin;
diff --git a/patches/OOO_1_1_2/vcl-xinerama-link-dynamic.diff b/patches/OOO_1_1_2/vcl-xinerama-link-dynamic.diff
deleted file mode 100644
index 3f239eb7c..000000000
--- a/patches/OOO_1_1_2/vcl-xinerama-link-dynamic.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: vcl/unx/source/app/makefile.mk
-===================================================================
---- vcl/unx/source/app/makefile.mk.orig	2004-08-13 21:12:07.124680944 +0200
-+++ vcl/unx/source/app/makefile.mk	2004-08-14 01:13:03.649346528 +0200
-@@ -116,6 +116,11 @@ CDEFS+=-DHAVE_LIBSN
- CFLAGS+=$(LIBSN_CFLAGS)
- .ENDIF
- 
-+
-+.IF "$(USE_XINERAMA)" != "NO"
-+CDEFS+=-DUSE_XINERAMA
-+.ENDIF
-+
- .IF "$(OS)$(CPU)" == "SOLARISS"
- .IF "$(COM)"!="GCC"
- SLOFILES+=$(SLO)$/getfpsols.obj
-Index: vcl/unx/source/app/saldisp.cxx
-===================================================================
---- vcl/unx/source/app/saldisp.cxx.orig	2004-08-13 21:12:07.142678208 +0200
-+++ vcl/unx/source/app/saldisp.cxx	2004-08-14 01:13:03.670343336 +0200
-@@ -235,7 +235,7 @@ extern "C" { int gethostname(char*,int);
- 
- #include <X11/Xatom.h>
- #ifndef SOLARIS
--#if defined(X86) || defined(MACOSX)
-+#ifdef USE_XINERAMA
- #include <X11/extensions/Xinerama.h>
- #endif
- #endif
-@@ -3029,6 +3029,7 @@ void SalDisplay::GetScreenFontResolution
- 
- void SalDisplay::InitXinerama()
- {
-+#ifdef USE_XINERAMA
- #if defined( SOLARIS )
-     // do this load on call for benefit of Solaris < 8
-     rtl::OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libXext.so" ) );
-@@ -3088,6 +3089,7 @@ void SalDisplay::InitXinerama()
-     }
- #endif
- #endif
-+#endif
- #ifdef DEBUG
-     if( m_bXinerama )
-     {
-Index: vcl/util/makefile.mk
-===================================================================
---- vcl/util/makefile.mk.orig	2004-08-14 01:12:59.544970488 +0200
-+++ vcl/util/makefile.mk	2004-08-14 01:13:03.672343032 +0200
-@@ -298,9 +298,13 @@ SHL1STDLIBS += -lXext -lSM -lICE -lX11
- .IF "$(USE_XPRINT)" == "TRUE"
- SHL1STDLIBS += -lXp -lXext -lSM -lICE -lX11
- .ELSE
--.IF "$(CPU)" == "I"
-+.IF "$(USE_XINERAMA)" != "NO"
-+.IF "$(XINERAMA_LINK)" == "dynamic"
-+SHL1STDLIBS += -lXinerama
-+.ELSE
- SHL1STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic 
--.ENDIF
-+.ENDIF          # $(XINERAMA_LINK)
-+.ENDIF          # $(USE_XINERAMA)
- SHL1STDLIBS += -lXext -lSM -lICE -lX11
- .ENDIF          # "$(USE_XPRINT)" == "TRUE"
- .ENDIF          # "$(OS)"=="SOLARIS"
diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff
new file mode 100644
index 000000000..2904ec4b0
--- /dev/null
+++ b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff
@@ -0,0 +1,167 @@
+--- /dev/null	2004-08-25 23:04:59.000000000 +0530
++++ connectivity/source/drivers/evoab1.5/EApi.cxx	2005-02-22 17:41:54.999516706 +0530
+@@ -0,0 +1,164 @@
++ /*************************************************************************
++ *
++ *  $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): Michael Meeks, Jayant Madavi
++ *
++ *
++ ************************************************************************/
++
++#include <rtl/ustring.hxx>
++#include <osl/module.h>
++#include <stdio.h>
++#define _EVOLUTION_ALREADY_DEFINED_ 1
++#ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
++#include "EApi.h"
++#endif
++static char *eBookLibNames[] = {
++	"libebook.so.8",	// evolution-2.0
++	"libebook-1.2.so.3"	// evolution-2.2
++	// FIXME: ask JPR about ABI compatibility going forwards
++	// "libebook-1.3.so.0",
++	// "libebook-1.4.so.0",
++	// "libebook-1.5.so.0"
++};
++
++typedef void (*SymbolFunc) (void);
++
++#define SYM_MAP(a) { #a, (SymbolFunc *)&a }
++    static struct {
++	const char *sym_name;
++	SymbolFunc *ref_value;
++    } aApiMap[] = {
++	SYM_MAP( e_contact_get_type ),
++	SYM_MAP( e_contact_field_id ),
++	SYM_MAP( e_source_peek_name ),
++	SYM_MAP( e_source_get_property ),
++	SYM_MAP( e_source_list_peek_groups ),
++	SYM_MAP( e_source_group_peek_sources ),
++	SYM_MAP( e_book_new ),
++	SYM_MAP( e_book_open ),
++	SYM_MAP( e_book_get_uri ),
++	SYM_MAP( e_book_get_source ),
++	SYM_MAP( e_book_get_addressbooks ),
++	SYM_MAP( e_book_get_contacts ),
++	SYM_MAP( e_book_authenticate_user ),
++	SYM_MAP( e_book_query_field_test ),
++	SYM_MAP( e_book_query_and ),
++	SYM_MAP( e_book_query_or ),
++	SYM_MAP( e_book_query_not ),
++	SYM_MAP( e_book_query_unref ),
++	SYM_MAP( e_book_query_to_string ),
++	SYM_MAP( e_book_query_field_exists ),
++	SYM_MAP( e_source_group_peek_base_uri)
++    }; 
++#undef SYM_MAP
++
++static bool
++tryLink( oslModule &aModule, const char *pName )
++{
++    for( guint i = 0; i < G_N_ELEMENTS( aApiMap ); i++ )
++    {
++	SymbolFunc aMethod;
++	aMethod = (SymbolFunc) osl_getSymbol
++		( aModule, rtl::OUString::createFromAscii ( aApiMap[ i ].sym_name ).pData );
++	if( !aMethod )
++	{
++	    fprintf( stderr, "Warning: missing symbol '%s' in '%s'",
++		     aApiMap[ i ].sym_name, pName );
++	    return false;
++	}
++	* aApiMap[ i ].ref_value = aMethod;
++    }
++    return true;
++}
++
++bool EApiInit()
++{
++    oslModule aModule;
++
++    for( guint j = 0; j < G_N_ELEMENTS( eBookLibNames ); j++ )
++    {
++	aModule = osl_loadModule( rtl::OUString::createFromAscii
++				  ( eBookLibNames[ j ] ).pData,
++				  SAL_LOADMODULE_DEFAULT );
++	if( aModule)
++	{
++	    if ( tryLink( aModule, eBookLibNames[ j ] ) )
++		return true;
++	    osl_unloadModule( aModule );
++	}
++    }
++    fprintf( stderr, "Can find no compliant libebook client libraries\n" );
++    return false;
++}
++
++#if 0
++
++  Test code - enable & 
++ *
++ * Compile with ( after source LinuxIntelEnv.Set.sh )
++   gcc $SOLARDEF -I $SOLARSRC/sal/inc -I $SOLARSRC/sal/unxlngi4.pro/inc \
++     -I. `pkg-config --cflags --libs gobject-2.0` \
++     -L $SOLARSRC/sal/unxlngi4.pro/lib -luno_sal -lstdc++ EApi.cxx
++ 
++
++int main( int argc, char **argv)
++{
++    return EApiInit();
++}
++
++#endif
++
diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff
index e65345fc6..14807ac2c 100644
--- a/patches/evo2/connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff
+++ b/patches/evo2/connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff
@@ -1,6 +1,6 @@
 --- /dev/null	
 +++ connectivity/source/drivers/evoab1.5/NDatabaseMetaData.cxx	
-@@ -0,0 +1,1327 @@
+@@ -0,0 +1,1331 @@
 +/*************************************************************************
 + *
 + *  The Contents of this file are made available subject to the terms of
@@ -83,6 +83,10 @@
 +
 +#include <vector>
 +
++#ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
++#include "EApi.h"
++#endif
++
 +#if OSL_DEBUG_LEVEL > 0
 +# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
 +#else /* OSL_DEBUG_LEVEL */
diff --git a/patches/vclplug/fpicker-gnome-folderpicker-hxx.diff b/patches/vclplug/fpicker-gnome-folderpicker-hxx.diff
index 737d62867..4a4ff895e 100644
--- a/patches/vclplug/fpicker-gnome-folderpicker-hxx.diff
+++ b/patches/vclplug/fpicker-gnome-folderpicker-hxx.diff
@@ -1,5 +1,5 @@
 --- /dev/null	2004-08-25 23:04:59.000000000 +0530
-+++ fpicker/source/unx/gnome/SalGtkFolderPicker.hxx	2004-09-10 14:33:32.000000000 +0530
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.hxx	2004-09-08 22:38:07.000000000 +0530
 @@ -0,0 +1,169 @@
 +/*************************************************************************
 + *
diff --git a/patches/vclplug/fpicker-gnome-picker-hxx.diff b/patches/vclplug/fpicker-gnome-picker-hxx.diff
index 9ec6e568e..86ebc4a53 100644
--- a/patches/vclplug/fpicker-gnome-picker-hxx.diff
+++ b/patches/vclplug/fpicker-gnome-picker-hxx.diff
@@ -1,6 +1,6 @@
 --- /dev/null	2004-08-25 23:04:59.000000000 +0530
-+++ fpicker/source/unx/gnome/SalGtkPicker.hxx	2004-09-10 14:33:32.000000000 +0530
-@@ -0,0 +1,116 @@
++++ fpicker/source/unx/gnome/SalGtkPicker.hxx	2005-03-11 11:44:03.000000000 +0530
+@@ -0,0 +1,128 @@
 +/*************************************************************************
 + *
 + *  $RCSfile$
@@ -116,4 +116,16 @@
 +
 +};
 +
++class RunDialog
++{
++private:
++    bool bFinished;
++    gint mnStatus;
++    GtkWidget *m_pDialog;
++public:
++    void run();
++    RunDialog(GtkWidget *pDialog) : bFinished(false), m_pDialog(pDialog) { }
++    gint runandwaitforresult();
++};
++
 +#endif
diff --git a/patches/vclplug/vcl-gtk-rtl-fix.diff b/patches/vclplug/vcl-gtk-rtl-fix.diff
new file mode 100644
index 000000000..0c242023e
--- /dev/null
+++ b/patches/vclplug/vcl-gtk-rtl-fix.diff
@@ -0,0 +1,64 @@
+--- vcl/unx/gtk/window/gtkframe.cxx.bak	2004-11-24 11:28:39.000000000 +0530
++++ vcl/unx/gtk/window/gtkframe.cxx	2004-11-30 10:51:59.785225136 +0530
+@@ -75,6 +75,8 @@
+ #include <dlfcn.h>
+ #include <soicon.hxx>
+ 
++#include <svapp.hxx>
++
+ #ifndef _OSL_PROCESS_H_
+ #include <osl/process.h>
+ #endif
+@@ -648,6 +650,8 @@
+ #endif
+ 		if( m_pParent )
+ 		{
++		        if( Application::GetSettings().GetLayoutRTL() )
++			    nX = m_pParent->maGeometry.nWidth-maGeometry.nWidth-1-nX;
+ 			nX += m_pParent->maGeometry.nX;
+ 			nY += m_pParent->maGeometry.nY;
+ 		}
+@@ -1380,6 +1384,10 @@
+             gdk_display_pointer_ungrab( pThis->getGdkDisplay(), GDK_CURRENT_TIME );
+     }
+ 
++    // --- RTL --- (mirror mouse pos)
++    if( Application::GetSettings().GetLayoutRTL() )
++         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
++
+     GTK_YIELD_GRAB();
+ 
+ 	vcl::DeletionListener aDel( pThis );
+@@ -1426,6 +1434,10 @@
+     aEvent.mnCode			= GetModCode( pSEvent->state );
+     aEvent.mbHorz			= (pSEvent->direction == GDK_SCROLL_LEFT || pSEvent->direction == GDK_SCROLL_RIGHT);
+     
++    // --- RTL --- (mirror mouse pos)
++    if( Application::GetSettings().GetLayoutRTL() )
++         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
++
+     GTK_YIELD_GRAB();
+     pThis->CallCallback( SALEVENT_WHEELMOUSE, &aEvent );
+     
+@@ -1442,6 +1454,10 @@
+     aEvent.mnCode	= GetModCode( pEvent->state );
+     aEvent.mnButton	= 0;
+ 
++    // --- RTL --- (mirror mouse pos)
++    if( Application::GetSettings().GetLayoutRTL() )
++         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
++
+     GTK_YIELD_GRAB();
+ 	vcl::DeletionListener aDel( pThis );
+ 
+@@ -1484,6 +1500,10 @@
+     aEvent.mnBoundWidth		= pEvent->area.width;
+     aEvent.mnBoundHeight	= pEvent->area.height;
+ 
++    // --- RTL --- (mirror mouse pos)
++    if( Application::GetSettings().GetLayoutRTL() )
++         aEvent.mnBoundX = pThis->maGeometry.nWidth-aEvent.mnBoundWidth-aEvent.mnBoundX;
++
+     GTK_YIELD_GRAB();
+     pThis->CallCallback( SALEVENT_PAINT, &aEvent );
+     
diff --git a/patches/vclplug/vcl-nwf-kde-font-resolving.diff b/patches/vclplug/vcl-nwf-kde-font-resolving.diff
new file mode 100644
index 000000000..2142dfa19
--- /dev/null
+++ b/patches/vclplug/vcl-nwf-kde-font-resolving.diff
@@ -0,0 +1,199 @@
+--- vcl/unx/kde/salnativewidgets-kde.cxx	2005-03-24 14:15:25.620450399 +0100
++++ vcl/unx/kde/salnativewidgets-kde.cxx	2005-03-24 15:24:07.582058524 +0100
+@@ -126,6 +126,14 @@
+ #include <iostream>
+ #include <sm.hxx>
+ 
++#ifndef _OSL_PROCESS_H_
++#include <osl/process.h>
++#endif
++#ifndef _RTL_LOCALE_HXX_
++#include <rtl/locale.hxx>
++#endif
++#include <fontconfig/fontconfig.h>
++
+ using namespace ::rtl;
+ 
+ /** Cached native widgets.
+@@ -1427,36 +1435,109 @@ static Color readColor( KConfig *pConfig
+     return toColor( pConfig->readColorEntry( pKey ) );
+ }
+ 
++/*getFontconfigAlias - get the appropriate font the specific locale
++   from font-config
++   
++   Cut&paste from the Gtk+ vclplug
++*/
++void getFontconfigAlias( const OUString &aFont)
++{
++	// Unfortunately, OOo is not smart enough to take font coverages into
++	// account when falling back to get the UI font.  For example, since the
++	// "Sans" font returned by Fontconfig as the system default gets re-mapped
++	// to an actual font from VCL.xcu, but that font may or may not have the
++	// correct coverage for all locales, we run into a situation where the
++	// locale is ja_JP but the font specified by VCL.xcu doesn't have Japanese
++	// coverage, resulting in no text drawn at all.  So, use fontconfig to
++	// return a font that actually can display the current locale's glyphs
++
++	FcPattern *    pFcOldFont;
++	FcPattern *    pFcNewFont;
++	FcResult       result = (FcResult)0;   // Matching fails if result is not initialized to 0
++	ByteString     aFontName;
++	FcChar8 *      pNewFontName = NULL;
++	OLocale        loc( osl_getSystemLocale(rtl_LocaleSystemMessages) );
++	ByteString     aLocale( UniString(loc.getRawName()), osl_getThreadTextEncoding() );
++
++	aFontName = ByteString(OUStringToOString(aFont, osl_getThreadTextEncoding()));
++	
++	pFcOldFont = FcPatternCreate();
++	if ( pFcOldFont )
++	{
++	        FcValue    aFcValLang;
++	        FcValue    aFcValName;
++
++	        // Since we always want to make sure that the font can display
++	        // characters in the current langauge, the font name is added
++	        // as a weak value, so that the locale will override it.
++	        aFcValLang.type = FcTypeString;
++	        aFcValLang.u.s = (FcChar8 *)(aLocale.GetBuffer());
++	        aFcValName.type = FcTypeString;
++	        aFcValName.u.s = (FcChar8 *)(aFontName.GetBuffer());
++
++	        FcPatternAdd( pFcOldFont, FC_LANG, aFcValLang, false );
++	        FcPatternAddWeak( pFcOldFont, FC_FAMILY, aFcValName, true );
++
++	        FcConfigSubstitute( 0, pFcOldFont, FcMatchPattern );
++	        FcDefaultSubstitute( pFcOldFont );
++
++	        // Ask fontconfig to pull together a list of fonts that match
++	        // our criteria, language coverage first, then font name
++	        pFcNewFont = FcFontMatch( NULL, pFcOldFont, &result );
++	        if ( (FcResultMatch == result) && pFcNewFont )
++	        {
++	            // Use the first font that Fontconfig returns
++	            result = FcPatternGetString( pFcNewFont, FC_FAMILY, 0, &pNewFontName );
++	            if ( FcResultMatch == result )
++	            {
++			aFont = rtl::OUString::createFromAscii((sal_Char *)pNewFontName);
++#if OSL_DEBUG_LEVEL > 1
++			fprintf(stderr, "aFont.getStr() = %s\n", 
++				OUStringToOString( aFont, RTL_TEXTENCODING_UTF8 ).getStr());
++#endif
++	            }
++	        }
++
++	        if ( pFcNewFont )
++	            FcPatternDestroy( pFcNewFont );
++
++	        FcPatternDestroy( pFcOldFont );
++    	}
++
++    	return;
++}
++
+ /** Helper function to add information to Font from QFont.
+ */
+-static void modifyFont( Font &rFont, const QFont &rQFont )
++static Font toFont( const QFont &rQFont )
+ {
+     QFontInfo qFontInfo( rQFont );
+     
+-    // Prepend the KDE font, do not override
+-    OUString aQFontName = String( rQFont.family().utf8(), RTL_TEXTENCODING_UTF8 );
+-    OUString aFontName = rFont.GetName();
+-
+-    if ( aQFontName.getLength() > 0 &&
+-         aFontName.compareTo( aQFontName, aQFontName.getLength() ) != 0 )
+-    {
+-        OUStringBuffer aBuffer( 1024 );
+-        aBuffer.append( aQFontName );
+-        aBuffer.appendAscii( ";", 1 );
+-        aBuffer.append( aFontName );
+-        
+-        rFont.SetName( aBuffer.makeStringAndClear() );
+-    }
++    // Get the real name of the KDE font
++    OUString aFontName = String( rQFont.family().utf8(), RTL_TEXTENCODING_UTF8 );
++    getFontconfigAlias( aFontName );
+     
+     // QFontInfo should give the right point size, but sometimes it does not,
+     // it seems.
+-    int nPointSize = qFontInfo.pointSize();
+-    if ( nPointSize <= 0 )
+-        nPointSize = rQFont.pointSize();
+-    if ( nPointSize > 0 )
+-        rFont.SetHeight( nPointSize );
++    int nPointHeight = qFontInfo.pointSize();
++    if ( nPointHeight <= 0 )
++        nPointHeight = rQFont.pointSize();
++
++    sal_Int32 nDPIX, nDPIY;
++    sal_Int32 nDispDPIY = GetSalData()->GetDisplay()->GetResolution().B();
++    GetSalData()->GetDisplay()->GetScreenFontResolution( nDPIX, nDPIY );
++
++    int nHeight = nPointHeight * nDispDPIY / nDPIY;
++    // allow for rounding in back conversion (at SetFont)
++    while( (nHeight * nDPIY / nDispDPIY) > nPointHeight )
++        nHeight--;
++    while( (nHeight * nDPIY / nDispDPIY) < nPointHeight )
++        nHeight++;
++
++    // Create the font and set its attributes
++    Font aFont( aFontName, Size( 0, nHeight ) );
+     
+-    rFont.SetItalic( qFontInfo.italic()? ITALIC_NORMAL: ITALIC_NONE );
++    aFont.SetItalic( qFontInfo.italic()? ITALIC_NORMAL: ITALIC_NONE );
+     
+     FontWeight eWeight = WEIGHT_DONTKNOW;
+     int nWeight = qFontInfo.weight();
+@@ -1470,7 +1551,9 @@ static void modifyFont( Font &rFont, con
+         eWeight = WEIGHT_BOLD;
+     else
+         eWeight = WEIGHT_BLACK;
+-    rFont.SetWeight( eWeight );
++    aFont.SetWeight( eWeight );
++
++    return aFont;
+ }
+ 
+ /** Implementation of KDE integration's main method.
+@@ -1514,8 +1597,7 @@ void KDESalFrame::UpdateSettings( AllSet
+         pKey = "titleFont";
+         if ( pConfig->hasKey( pKey ) )
+         {
+-            Font aFont= aStyleSettings.GetTitleFont();
+-            modifyFont( aFont, pConfig->readFontEntry( pKey ) );
++            Font aFont = toFont( pConfig->readFontEntry( pKey ) );
+             aStyleSettings.SetTitleFont( aFont );
+ 			bSetTitleFont = true;
+         }
+@@ -1564,8 +1646,7 @@ void KDESalFrame::UpdateSettings( AllSet
+     aStyleSettings.SetHighlightTextColor( toColor( qColorGroup.highlightedText() ) );
+ 
+     // Font
+-    Font aFont= aStyleSettings.GetAppFont();
+-    modifyFont( aFont, kapp->font() );
++    Font aFont = toFont( kapp->font() );
+ 
+     aStyleSettings.SetAppFont( aFont );
+     aStyleSettings.SetHelpFont( aFont );
+@@ -1598,8 +1679,7 @@ void KDESalFrame::UpdateSettings( AllSet
+         aStyleSettings.SetMenuHighlightTextColor( toColor ( qMenuCG.highlightedText() ) );
+ 
+         // Font
+-        Font aFont= aStyleSettings.GetMenuFont();
+-        modifyFont( aFont, pMenuBar->font() );
++        Font aFont = toFont( pMenuBar->font() );
+         aStyleSettings.SetMenuFont( aFont );
+     }
+ 
+@@ -1607,8 +1687,7 @@ void KDESalFrame::UpdateSettings( AllSet
+     KToolBar *pToolBar = qMainWindow.toolBar();
+     if ( pToolBar )
+     {
+-        Font aFont= aStyleSettings.GetToolFont();
+-        modifyFont( aFont, pToolBar->font() );
++        Font aFont = toFont( pToolBar->font() );
+         aStyleSettings.SetToolFont( aFont );
+     }
+ 
diff --git a/patches/vclplug/vcl-source-gdi.diff b/patches/vclplug/vcl-source-gdi.diff
index 6d059d99c..39cff42c1 100644
--- a/patches/vclplug/vcl-source-gdi.diff
+++ b/patches/vclplug/vcl-source-gdi.diff
@@ -536,15 +536,7 @@ diff -u -p -u -r1.2.292.1 -r1.5
  
  	switch( eFilter )
  	{
-@@ -620,7 +618,7 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFi
- 							aGrey.SetIndex( 0 );
- 						else
- 						{
--							const double fGrey = nDotL / sqrt( nNx * nNx + nNy * nNy + nZ2 );
-+							const double fGrey = nDotL / sqrt( (double)(nNx * nNx + nNy * nNy + nZ2) );
- 							aGrey.SetIndex( (BYTE) VOS_BOUND( fGrey, 0, 255 ) );
- 						}
- 						
+
 Index: vcl/source/gdi/color.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/gdi/color.cxx,v
@@ -1454,18 +1446,6 @@ diff -u -p -u -r1.13 -r1.14
          }
      }
  }
-@@ -1317,11 +1308,7 @@ String StarSymbolToMSMultiFontImpl::Conv
- String StarSymbolToMSMultiFontImpl::ConvertString(String &rString, 
-     xub_StrLen& rIndex)
- { 
--#if 1
-     typedef ::std::multimap<sal_Unicode, SymbolEntry>::iterator MI;
--#else
--    typedef ::std::multimap<sal_Unicode, SymbolEntry>::const_iterator MI;
--#endif
-     typedef ::std::pair<MI, MI> Result;
-     
-     String sRet;
 Index: vcl/source/gdi/gdimtf.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/gdi/gdimtf.cxx,v
diff --git a/patches/vclplug/vcl-source-glyphs-indic-spacing-fix.diff b/patches/vclplug/vcl-source-glyphs-indic-spacing-fix.diff
new file mode 100644
index 000000000..1882f401f
--- /dev/null
+++ b/patches/vclplug/vcl-source-glyphs-indic-spacing-fix.diff
@@ -0,0 +1,56 @@
+--- vcl/source/gdi/outdev3.cxx.indic	2004-12-06 17:00:44.690937103 -0500
++++ vcl/source/gdi/outdev3.cxx	2004-12-06 17:02:10.472264483 -0500
+@@ -2757,6 +2757,7 @@
+         // TODO: implement dynamic lists or improve static lists
+         #define FALLBACKFONT_NAMELIST \
+             "arialunicodems;andalesansui;cyberbit;starsymbol;opensymbol;lucidatypewriter;"  \
++            "nimbussansl;nimbusromanno9l;luxisans;"                         \
+             "fzmingti;sunbatang;sundotum;baekmukdotum;"                     \
+             "hgmincholightj;msunglightsc;msunglighttc;hymyeongjolightk;"    \
+             "lucidasans;tahoma;"                                            \
+--- vcl/source/glyphs/gcach_layout.cxx.indic	2004-12-06 17:01:09.997200069 -0500
++++ vcl/source/glyphs/gcach_layout.cxx	2004-12-06 17:03:43.048572012 -0500
+@@ -546,6 +546,7 @@
+         // layout bidi/script runs and export them to a ServerFontLayout
+         // convert results to GlyphItems
+         const IcuPosition* pPos = pGlyphPositions;
++        int nLastCharPos = -1;
+         for( int i = 0; i < nRunGlyphCount; ++i, ++pPos )
+         {
+             int nCharPos = pCharIndices[i] + nMinRunPos;
+@@ -558,6 +559,15 @@
+                     continue;
+             }
+ 
++            // Otherwise, if ICU feeds us a character index sequence like [1,0,1] (which is
++            // completely valid), smooth out the sequence so that our cluster detection
++            // routines work (they are a bit dumb and do sequential detection of clusters
++            // based on character indexes, so [1,0,1] translates to 3 clusters when its
++            // really only 1).
++            if (nLastCharPos != -1)
++                if ((nCharPos < nLastCharPos) ^ bRightToLeft )
++                    nCharPos = nLastCharPos;
++
+             // apply vertical flags, etc.
+             sal_Unicode aChar = rArgs.mpStr[ nCharPos ];
+             nGlyphIndex = rFont.FixupGlyphIndex( nGlyphIndex, aChar );
+@@ -565,11 +575,18 @@
+             aNewPos = Point( (int)(pPos->fX+0.5), (int)(pPos->fY+0.5) );
+             const GlyphMetric& rGM = rFont.GetGlyphMetric( nGlyphIndex );
+             int nGlyphWidth = rGM.GetCharWidth();
+-            long nGlyphFlags = (nGlyphWidth > 0) ? 0 : GlyphItem::IS_IN_CLUSTER;
++            // If this glyph has the same character position as the previous glyph (as
++            // reported by ICU), its in the same cluster
++            long nGlyphFlags = 0;
++            if ((nLastCharPos != -1) && (nCharPos == nLastCharPos))
++                nGlyphFlags = GlyphItem::IS_IN_CLUSTER;
++            else
++                nGlyphFlags = (nGlyphWidth > 0) ? 0 : GlyphItem::IS_IN_CLUSTER;
+             if( bRightToLeft )
+                 nGlyphFlags |= GlyphItem::IS_RTL_GLYPH;
+             GlyphItem aGI( nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nGlyphWidth );
+             rLayout.AppendGlyph( aGI );
++            nLastCharPos = nCharPos;
+         }
+         aNewPos = Point( (int)(pPos->fX+0.5), (int)(pPos->fY+0.5) );
+         nGlyphCount += nRunGlyphCount;
diff --git a/patches/vclplug/vcl-source-glyphs.diff b/patches/vclplug/vcl-source-glyphs.diff
index b401f7d15..5121c80f1 100644
--- a/patches/vclplug/vcl-source-glyphs.diff
+++ b/patches/vclplug/vcl-source-glyphs.diff
@@ -2,10 +2,11 @@ Index: vcl/source/glyphs/gcach_ftyp.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
 retrieving revision 1.98.20.2
-diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
---- vcl/source/glyphs/gcach_ftyp.cxx	28 Jan 2004 15:22:42 -0000	1.98.20.2
-+++ vcl/source/glyphs/gcach_ftyp.cxx	5 Jul 2004 14:01:28 -0000
-@@ -58,13 +59,10 @@
+Index: vcl/source/glyphs/gcach_ftyp.cxx
+===================================================================
+--- vcl/source/glyphs/gcach_ftyp.cxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/source/glyphs/gcach_ftyp.cxx	2004-09-14 13:53:47.306959408 +0200
+@@ -58,13 +58,10 @@
   *
   ************************************************************************/
  
@@ -20,7 +21,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  
  #include <gcach_ftyp.hxx>
  
-@@ -72,17 +70,25 @@
+@@ -72,17 +69,25 @@
  #include <outfont.hxx>
  #include <bitmap.hxx>
  #include <bmpacc.hxx>
@@ -53,19 +54,9 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  
  #ifndef FREETYPE_PATCH
      // VERSION_MINOR in freetype.h is too coarse
-@@ -251,15 +258,22 @@ void FtFontFile::Unmap()
- // =======================================================================
- 
- FtFontInfo::FtFontInfo( const ImplFontData& rFontData,
--    const ::rtl::OString& rNativeFileName, int nFaceNum, int nFontId, int nSynthetic )
--:   mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
-+                        const ::rtl::OString& rNativeFileName,
-+                        int nFaceNum, int nFontId, int nSynthetic,
-+                        const unicodeKernMap* pKern
-+                        )
-+:   
+@@ -258,8 +263,8 @@ FtFontInfo::FtFontInfo( const ImplFontDa
+ :   mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
      maFontData( rFontData ),
-+    mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
      mnFaceNum( nFaceNum ),
 -    mnFontId( nFontId ),
      mnSynthetic( nSynthetic ),
@@ -73,57 +64,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      maFaceFT( NULL ),
      mnRefCount( 0 )
  {
-+    if( pKern )
-+        maUnicodeKernPairs = *pKern;
-+
-     maFontData.mpSysData = (void*)nFontId;
-     maFontData.mpNext    = NULL;
- 
-@@ -336,6 +350,43 @@ void FtFontInfo::ReleaseFaceFT( FT_FaceR
-     }
- }
- 
-+void FtFontInfo::CacheGlyphIndex( sal_Unicode cChar, int nGI ) const
-+{
-+    maGlyphMap[ cChar ] = nGI;
-+
-+    if( maUnicodeKernPairs.size() != maGlyphKernPairs.size() )
-+    {
-+        // move kerning to glyph kerning map
-+        unicodeKernMap::const_iterator left_it =
-+            maUnicodeKernPairs.find( cChar );
-+        std::map< sal_Unicode, int >::const_iterator right_it;
-+        for( left_it = maUnicodeKernPairs.begin(); left_it != maUnicodeKernPairs.end(); ++left_it )
-+        {
-+            if( left_it->first == cChar )
-+            {
-+                for( right_it = left_it->second.begin(); right_it != left_it->second.end(); ++right_it )
-+                {
-+                    int nRightGlyph = GetGlyphIndex( right_it->first );
-+                    if( nRightGlyph != -1 )
-+                        maGlyphKernPairs[ nGI ][ nRightGlyph ] = right_it->second;
-+                }
-+            }
-+            else
-+            {
-+                int nLeftGlyph = GetGlyphIndex( left_it->first );
-+                if( nLeftGlyph != -1 )
-+                {
-+                    for( right_it = left_it->second.begin(); right_it != left_it->second.end(); ++right_it )
-+                    {
-+                        if( right_it->first == cChar )
-+                            maGlyphKernPairs[ nLeftGlyph ][ nGI ] = right_it->second;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+}
-+
- // -----------------------------------------------------------------------
- 
- static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
-@@ -382,11 +433,10 @@ const unsigned char* FtFontInfo::GetTabl
+@@ -425,11 +467,10 @@ const unsigned char* FtFontInfo::GetTabl
  // =======================================================================
  
  FreetypeManager::FreetypeManager()
@@ -137,28 +78,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  #ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included
      // Get version of freetype library to enable workarounds.
      // Freetype <= 2.0.9 does not have FT_Library_Version().
-@@ -449,7 +499,10 @@ void* FreetypeManager::GetFontHandle( in
- // -----------------------------------------------------------------------
- 
- void FreetypeManager::AddFontFile( const rtl::OString& rNormalizedName,
--    int nFaceNum, int nFontId, const ImplFontData* pData )
-+                                   int nFaceNum, int nFontId,
-+                                   const ImplFontData* pData,
-+                                   const unicodeKernMap* pKern
-+                                   )
- {
-     if( !rNormalizedName.getLength() )
-         return;
-@@ -457,7 +510,7 @@ void FreetypeManager::AddFontFile( const
-     if( maFontList.find( nFontId ) != maFontList.end() )
-         return;
- 
--    FtFontInfo* pFI = new FtFontInfo( *pData, rNormalizedName, nFaceNum, nFontId, 0 );
-+    FtFontInfo* pFI = new FtFontInfo( *pData, rNormalizedName, nFaceNum, nFontId, 0, pKern );
-     maFontList[ nFontId ] = pFI;
-     if( mnMaxFontId < nFontId )
-         mnMaxFontId = nFontId;
-@@ -482,8 +535,8 @@ long FreetypeManager::AddFontDir( const 
+@@ -527,8 +568,8 @@ long FreetypeManager::AddFontDir( const 
          rcOSL = aDirItem.getFileStatus( aFileStatus );
  
          ::rtl::OUString aUSytemPath;
@@ -169,7 +89,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
          ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, theEncoding );
          const char* pszFontFileName = aCFileName.getStr();
  
-@@ -556,8 +609,21 @@ long FreetypeManager::FetchFontList( Imp
+@@ -601,8 +642,21 @@ long FreetypeManager::FetchFontList( Imp
      for( FontList::const_iterator it(maFontList.begin()); it != maFontList.end(); ++it, ++nCount )
      {
          const FtFontInfo& rFFI = *it->second;
@@ -193,27 +113,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      }
  
      return nCount;
-@@ -581,7 +647,7 @@ FreetypeServerFont* FreetypeManager::Cre
-     if( it != maFontList.end() )
-     {
-         FtFontInfo* pFI = it->second;
--        FreetypeServerFont* pFont = new FreetypeServerFont( rFSD, pFI );
-+        FreetypeServerFont* pFont = new FreetypeServerFont( rFSD, pFI, pFI->GetGlyphKernMap(), pFI->GetUnicodeKernMap() );
-         return pFont;
-     }
- 
-@@ -592,8 +658,8 @@ FreetypeServerFont* FreetypeManager::Cre
- // FreetypeServerFont
- // =======================================================================
- 
--FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
--:   ServerFont( rFSD ),
-+FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI, const glyphKernMap* pKern, const unicodeKernMap* pUniKern )
-+:   ServerFont( rFSD, pKern, pUniKern ),
-     mpFontInfo( pFI ),
-     maFaceFT( NULL ),
-     maSizeFT( NULL ),
-@@ -856,23 +944,23 @@ int FreetypeServerFont::ApplyGlyphTransf
+@@ -903,23 +957,23 @@ int FreetypeServerFont::ApplyGlyphTransf
      case GF_ROTL:    // left
          nAngle += 900;
          bStretched = (mfStretch != 1.0);
@@ -248,7 +148,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
          break;
      }
  
-@@ -1049,9 +1137,9 @@ void FreetypeServerFont::InitGlyphData( 
+@@ -1096,9 +1150,9 @@ void FreetypeServerFont::InitGlyphData( 
      if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
          const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
  #if (FTVERSION < 2000)
@@ -260,7 +160,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
  #endif
      }
      rGD.SetCharWidth( (nCharWidth + 32) >> 6 );
-@@ -1314,34 +1402,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
+@@ -1361,34 +1415,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
  {
      int nRangeCount = 0;
  
@@ -295,7 +195,7 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      const unsigned char* pCmap = NULL;
      ULONG nLength = 0;
      if( FT_IS_SFNT( maFaceFT ) )
-@@ -1409,8 +1469,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
+@@ -1456,8 +1482,6 @@ ULONG FreetypeServerFont::GetFontCodeRan
                  *(pCodes++) = cCode;
          }
      }
@@ -304,34 +204,10 @@ diff -u -p -u -r1.98.20.2 gcach_ftyp.cxx
      return nRangeCount;
  }
  // -----------------------------------------------------------------------
-@@ -1420,7 +1478,10 @@ ULONG FreetypeServerFont::GetFontCodeRan
- int FreetypeServerFont::GetGlyphKernValue( int nGlyphLeft, int nGlyphRight ) const
- {
-     if( maSizeFT )
-+
-         pFTActivateSize( maSizeFT );
-+    if( !FT_HAS_KERNING( maFaceFT ) || !FT_IS_SFNT( maFaceFT ) )
-+        return ServerFont::GetGlyphKernValue( nGlyphLeft, nGlyphRight );
- 
-     FT_Vector aKernVal;
-     FT_Error rcFT = FT_Get_Kerning( maFaceFT, nGlyphLeft, nGlyphRight,
-@@ -1438,7 +1499,7 @@ ULONG FreetypeServerFont::GetKernPairs( 
- 
-     *ppKernPairs = NULL;
-     if( !FT_HAS_KERNING( maFaceFT ) || !FT_IS_SFNT( maFaceFT ) )
--        return 0;
-+        return ServerFont::GetKernPairs( ppKernPairs );
- 
-     // first figure out which glyph pairs are involved in kerning
-     ULONG nKernLength = 0;
 Index: vcl/source/glyphs/gcach_ftyp.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v
-retrieving revision 1.24
-retrieving revision 1.27
-diff -u -p -u -r1.24 -r1.27
---- vcl/source/glyphs/gcach_ftyp.hxx	4 Jul 2003 12:51:33 -0000	1.24
-+++ vcl/source/glyphs/gcach_ftyp.hxx	18 May 2004 10:55:11 -0000	1.27
+--- vcl/source/glyphs/gcach_ftyp.hxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/source/glyphs/gcach_ftyp.hxx	2004-09-14 13:53:47.307959256 +0200
 @@ -65,11 +65,15 @@
  #include <glyphcache.hxx>
  #include <rtl/textcvt.h>
@@ -352,7 +228,7 @@ diff -u -p -u -r1.24 -r1.27
  
  // -----------------------------------------------------------------------
  
-@@ -87,7 +85,6 @@ public:
+@@ -87,7 +91,6 @@ public:
      const unsigned char*    GetBuffer() const { return mpFileMap; }
      int                     GetFileSize() const { return mnFileSize; }
      const ::rtl::OString*   GetFileName() const { return &maNativeFileName; }
@@ -360,72 +236,7 @@ diff -u -p -u -r1.24 -r1.27
  private:
                              FtFontFile( const ::rtl::OString& rNativeFileName );
  
-@@ -104,7 +101,9 @@ class FtFontInfo
- {
- public:
-     FtFontInfo( const ImplFontData&, const ::rtl::OString&,
--        int nFaceNum, int nFontId, int nSynthetic );
-+                int nFaceNum, int nFontId, int nSynthetic,
-+                const unicodeKernMap* pUnicodeKern = NULL
-+                );
- 
-     const unsigned char*  GetTable( const char*, ULONG* pLength=0 ) const;
- 
-@@ -121,6 +120,11 @@ public:
- 
-     int                   GetGlyphIndex( sal_Unicode cChar ) const;
-     void                  CacheGlyphIndex( sal_Unicode cChar, int nGI ) const;
-+    const glyphKernMap*	  GetGlyphKernMap() const
-+    { return (maUnicodeKernPairs.size() || maGlyphKernPairs.size()) ? &maGlyphKernPairs : NULL; }
-+    const unicodeKernMap* GetUnicodeKernMap() const
-+    { return maUnicodeKernPairs.size() ? &maUnicodeKernPairs : NULL; }
-+
- 
- private:
-     ImplFontData    maFontData;
-@@ -135,6 +139,9 @@ private:
-     // cache unicode->glyphid mapping because looking it up is expensive
-     typedef ::std::hash_map<sal_Unicode,int> FIGlyphMap;
-     mutable FIGlyphMap maGlyphMap;
-+
-+    mutable glyphKernMap maGlyphKernPairs;
-+    unicodeKernMap maUnicodeKernPairs;
- };
- 
- // these two inlines are very important for performance
-@@ -147,11 +154,6 @@ inline int FtFontInfo::GetGlyphIndex( sa
-     return -1;
- }
- 
--inline void FtFontInfo::CacheGlyphIndex( sal_Unicode cChar, int nGI ) const
--{
--    maGlyphMap[ cChar ] = nGI;
--}
--
- // -----------------------------------------------------------------------
- 
- class FreetypeManager
-@@ -162,7 +164,9 @@ public:
- 
-     long                AddFontDir( const String& rUrlName );
-     void                AddFontFile( const rtl::OString& rNormalizedName,
--                            int nFaceNum, int nFontId, const ImplFontData* );
-+                                     int nFaceNum, int nFontId, const ImplFontData*,
-+                                     const unicodeKernMap* pKern = NULL
-+                                     );
-     long                FetchFontList( ImplDevFontList* ) const;
-     void                ClearFontList();
- 
-@@ -182,7 +186,7 @@ private:
- class FreetypeServerFont : public ServerFont
- {
- public:
--                                FreetypeServerFont( const ImplFontSelectData&, FtFontInfo* );
-+                                FreetypeServerFont( const ImplFontSelectData&, FtFontInfo*, const glyphKernMap*, const unicodeKernMap* );
-     virtual                     ~FreetypeServerFont();
- 
-     virtual const ::rtl::OString* GetFontFileName() const { return mpFontInfo->GetFontFileName(); }
-@@ -206,9 +210,10 @@ public:
+@@ -211,9 +222,10 @@ public:
      const unsigned char*        GetTable( const char* pName, ULONG* pLength )
                                  { return mpFontInfo->GetTable( pName, pLength ); }
      int                         GetEmUnits() const;
@@ -439,13 +250,9 @@ diff -u -p -u -r1.24 -r1.27
      virtual void                InitGlyphData( int nGlyphIndex, GlyphData& ) const;
 Index: vcl/source/glyphs/gcach_layout.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_layout.cxx,v
-retrieving revision 1.23.20.1
-retrieving revision 1.29
-diff -u -p -u -r1.23.20.1 -r1.29
---- vcl/source/glyphs/gcach_layout.cxx	9 Jan 2004 18:13:49 -0000	1.23.20.1
-+++ vcl/source/glyphs/gcach_layout.cxx	25 Jun 2004 17:09:25 -0000	1.29
-@@ -59,30 +59,29 @@
+--- vcl/source/glyphs/gcach_layout.cxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_layout.cxx	2004-09-14 13:53:47.310958800 +0200
+@@ -59,28 +59,27 @@
   ************************************************************************/
  
  #define ENABLE_ICU_LAYOUT
@@ -483,9 +290,7 @@ diff -u -p -u -r1.23.20.1 -r1.29
  #endif
  
  #if OSL_DEBUG_LEVEL > 1
- #include <cstdio>
- #endif
-@@ -446,6 +446,13 @@
+@@ -450,6 +449,13 @@ IcuLayoutEngine::IcuLayoutEngine( Freety
      meScriptCode( USCRIPT_INVALID_CODE )
  {}
  
@@ -501,12 +306,8 @@ diff -u -p -u -r1.23.20.1 -r1.29
  IcuLayoutEngine::~IcuLayoutEngine()
 Index: vcl/source/glyphs/gcach_rbmp.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_rbmp.cxx,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -u -r1.3 -r1.4
---- vcl/source/glyphs/gcach_rbmp.cxx	13 Dec 2001 14:54:19 -0000	1.3
-+++ vcl/source/glyphs/gcach_rbmp.cxx	6 Jan 2004 13:58:48 -0000	1.4
+--- vcl/source/glyphs/gcach_rbmp.cxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_rbmp.cxx	2004-09-14 13:53:47.311958648 +0200
 @@ -64,7 +64,7 @@
  //------------------------------------------------------------------------
  
@@ -518,12 +319,8 @@ diff -u -p -u -r1.3 -r1.4
  //------------------------------------------------------------------------
 Index: vcl/source/glyphs/gcach_vdev.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_vdev.cxx,v
-retrieving revision 1.11
-retrieving revision 1.15
-diff -u -p -u -r1.11 -r1.15
---- vcl/source/glyphs/gcach_vdev.cxx	5 Aug 2002 07:19:22 -0000	1.11
-+++ vcl/source/glyphs/gcach_vdev.cxx	17 Jun 2004 12:21:43 -0000	1.15
+--- vcl/source/glyphs/gcach_vdev.cxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_vdev.cxx	2004-09-14 13:53:47.312958496 +0200
 @@ -75,10 +75,6 @@
  
  long VirtDevServerFont::FetchFontList( ImplDevFontList* pToAdd )
@@ -544,7 +341,7 @@ diff -u -p -u -r1.11 -r1.15
  	return nCount;
  }
  
-@@ -202,13 +197,16 @@ void VirtDevServerFont::InitGlyphData( i
+@@ -202,13 +196,16 @@ void VirtDevServerFont::InitGlyphData( i
  	vdev.SetFont( aFont );
  
  	// get glyph metrics
@@ -564,7 +361,7 @@ diff -u -p -u -r1.11 -r1.15
  	rGD.SetSize( aRect.GetSize() );
  }
  
-@@ -223,7 +221,7 @@ bool VirtDevServerFont::GetAntialiasAdvi
+@@ -223,7 +220,7 @@ bool VirtDevServerFont::GetAntialiasAdvi
  
  bool VirtDevServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const
  {
@@ -573,7 +370,7 @@ diff -u -p -u -r1.11 -r1.15
  	// draw bitmap
  	vdev.SetOutputSizePixel( aSize, TRUE );
  	vdev.DrawText( Point(0,0)-rGD.GetMetric().GetOffset(), nGlyphIndex );
-@@ -233,9 +231,8 @@ bool VirtDevServerFont::GetGlyphBitmap1(
+@@ -233,9 +230,8 @@ bool VirtDevServerFont::GetGlyphBitmap1(
  	const Bitmap& rBitmap = vdev.GetBitmap( Point(0,0), aSize );
  	rGD.SetBitmap( new Bitmap( rBitmap ) );
  	return true;
@@ -584,7 +381,7 @@ diff -u -p -u -r1.11 -r1.15
  }
  
  // -----------------------------------------------------------------------
-@@ -295,9 +292,8 @@ ULONG VirtDevServerFont::GetKernPairs( I
+@@ -295,9 +291,8 @@ ULONG VirtDevServerFont::GetKernPairs( I
  
  bool VirtDevServerFont::GetGlyphOutline( int nGlyphIndex, PolyPolygon& rPolyPoly ) const
  {
@@ -595,7 +392,7 @@ diff -u -p -u -r1.11 -r1.15
      Font aFont;
  	aFont.SetName		( GetFontSelData().maName );
  	aFont.SetStyleName	( GetFontSelData().maStyleName );
-@@ -311,7 +307,7 @@ bool VirtDevServerFont::GetGlyphOutline(
+@@ -311,7 +306,7 @@ bool VirtDevServerFont::GetGlyphOutline(
  
  	const bool bOptimize = true;
  	return vdev.GetGlyphOutline( nGlyphIndex, rPolyPoly, bOptimize );
@@ -606,12 +403,8 @@ diff -u -p -u -r1.11 -r1.15
  // =======================================================================
 Index: vcl/source/glyphs/gcach_vdev.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_vdev.hxx,v
-retrieving revision 1.5
-retrieving revision 1.7
-diff -u -p -u -r1.5 -r1.7
---- vcl/source/glyphs/gcach_vdev.hxx	15 Feb 2002 15:58:57 -0000	1.5
-+++ vcl/source/glyphs/gcach_vdev.hxx	4 Feb 2004 15:59:34 -0000	1.7
+--- vcl/source/glyphs/gcach_vdev.hxx.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/gcach_vdev.hxx	2004-09-14 13:53:47.312958496 +0200
 @@ -72,7 +72,7 @@ public:
  	virtual bool				GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const;
  
@@ -623,12 +416,8 @@ diff -u -p -u -r1.5 -r1.7
  
 Index: vcl/source/glyphs/glyphcache.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/glyphcache.cxx,v
-retrieving revision 1.22.40.2
-retrieving revision 1.26
-diff -u -p -u -r1.22.40.2 -r1.26
---- vcl/source/glyphs/glyphcache.cxx	26 Jan 2004 17:23:59 -0000	1.22.40.2
-+++ vcl/source/glyphs/glyphcache.cxx	18 May 2004 10:55:25 -0000	1.26
+--- vcl/source/glyphs/glyphcache.cxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/source/glyphs/glyphcache.cxx	2004-09-14 13:53:47.313958344 +0200
 @@ -88,8 +88,8 @@ GlyphCache::GlyphCache( ULONG nMaxSize )
      mnBytesUsed(sizeof(GlyphCache)),
      mnLruIndex(0),
@@ -649,22 +438,7 @@ diff -u -p -u -r1.22.40.2 -r1.26
          if( pFontData != it->first.mpFontData )
              continue;
  
-@@ -219,10 +219,12 @@ void GlyphCache::AddFontPath( const Stri
- // -----------------------------------------------------------------------
- 
- void GlyphCache::AddFontFile( const rtl::OString& rNormalizedName, int nFaceNum,
--    int nFontId, const ImplFontData* pFontData )
-+                              int nFontId, const ImplFontData* pFontData,
-+                              const unicodeKernMap* pKern
-+                              )
- {
-     if( mpFtManager )
--        mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, pFontData );
-+        mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, pFontData, pKern );
- }
- 
- // -----------------------------------------------------------------------
-@@ -337,7 +339,7 @@ void GlyphCache::GarbageCollect()
+@@ -338,7 +338,7 @@ void GlyphCache::GarbageCollect()
              FontList::iterator it_next = maFontList.begin(), it;
              while( it_next != maFontList.end() )
              {
@@ -673,13 +447,7 @@ diff -u -p -u -r1.22.40.2 -r1.26
                  ServerFont* pSF = it->second;
                  if( (pSF != NULL)
                  &&  (pSF->GetRefCount() <= 0)
-@@ -401,15 +403,17 @@ inline void GlyphCache::RemovingGlyph( S
- // ServerFont
- // =======================================================================
- 
--ServerFont::ServerFont( const ImplFontSelectData& rFSD )
-+ServerFont::ServerFont( const ImplFontSelectData& rFSD, const glyphKernMap* pKern, const unicodeKernMap* pUniKern )
- :   maFontSelData(rFSD),
+@@ -407,8 +407,8 @@ ServerFont::ServerFont( const ImplFontSe
      mnExtInfo(0),
      mnRefCount(1),
      mnBytesUsed( sizeof(ServerFont) ),
@@ -687,80 +455,9 @@ diff -u -p -u -r1.22.40.2 -r1.26
      mpPrevGCFont( NULL ),
 +    mpNextGCFont( NULL ),
      nCos( 0x10000),
--    nSin( 0)
-+    nSin( 0),
-+    mpKernPairs( pKern ),
-+    mpUnicodeKernPairs( pUniKern )
- {
-     if( rFSD.mnOrientation != 0 )
-     {
-@@ -440,6 +444,65 @@ long ServerFont::Release() const
- 
- // -----------------------------------------------------------------------
- 
-+int ServerFont::GetGlyphKernValue( int left, int right ) const
-+{
-+    int kern = 0;
-+    if( mpKernPairs )
-+    {
-+        std::map< int, std::map< int, int > >::const_iterator left_it =
-+            mpKernPairs->find( left );
-+        if( left_it != mpKernPairs->end() )
-+        {
-+            std::map< int, int >::const_iterator right_it = left_it->second.find( right );
-+            if( right_it != left_it->second.end() )
-+                kern = right_it->second;
-+        }
-+    }
-+    return kern*(maFontSelData.mnWidth ? maFontSelData.mnWidth : maFontSelData.mnHeight)/1000;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG ServerFont::GetKernPairs( struct ImplKernPairData** ppKernPairs ) const
-+{
-+    int nKernEntry = 0;
-+    unicodeKernMap::const_iterator left_it;
-+    std::map< sal_Unicode, int >::const_iterator right_it;
-+    if( mpUnicodeKernPairs )
-+    {
-+        // count the kern entries
-+        for( left_it = mpUnicodeKernPairs->begin(); left_it != mpUnicodeKernPairs->end(); ++left_it )
-+        {
-+            nKernEntry += left_it->second.size();
-+        }
-+    }
-+
-+    // allocate kern pair table
-+    if( nKernEntry )
-+    {
-+        *ppKernPairs = new ImplKernPairData[ nKernEntry ];
-+
-+        // fill in kern pairs
-+        nKernEntry = 0;
-+        for( left_it = mpUnicodeKernPairs->begin(); left_it != mpUnicodeKernPairs->end(); ++left_it )
-+        {
-+            for( right_it = left_it->second.begin(); right_it != left_it->second.end(); ++right_it )
-+            {
-+                (*ppKernPairs)[ nKernEntry ].mnChar1 = (USHORT)left_it->first;
-+                (*ppKernPairs)[ nKernEntry ].mnChar2 = (USHORT)right_it->first;
-+                (*ppKernPairs)[ nKernEntry ].mnKern = right_it->second*(maFontSelData.mnWidth ? maFontSelData.mnWidth : maFontSelData.mnHeight)/1000;
-+                nKernEntry++;
-+            }
-+        }
-+    }
-+    else
-+        *ppKernPairs = NULL;
-+
-+    return (ULONG)nKernEntry;
-+}
-+
-+// -----------------------------------------------------------------------
-+
- GlyphData& ServerFont::GetGlyphData( int nGlyphIndex )
- {
-     // usually the GlyphData is cached
-@@ -465,7 +528,7 @@ void ServerFont::GarbageCollect( long nM
+     nSin( 0),
+     mpKernPairs( pKern ),
+@@ -527,7 +586,7 @@ void ServerFont::GarbageCollect( long nM
      GlyphList::iterator it_next = maGlyphList.begin(), it;
      while( it_next != maGlyphList.end() )
      {
@@ -771,13 +468,9 @@ diff -u -p -u -r1.22.40.2 -r1.26
          {
 Index: vcl/source/glyphs/makefile.mk
 ===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -p -u -r1.5 -r1.6
---- vcl/source/glyphs/makefile.mk	15 Feb 2002 15:52:27 -0000	1.5
-+++ vcl/source/glyphs/makefile.mk	6 Jan 2004 14:00:38 -0000	1.6
-@@ -76,11 +76,9 @@ TARGET=glyphs
+--- vcl/source/glyphs/makefile.mk.orig	2004-09-12 14:26:10.000000000 +0200
++++ vcl/source/glyphs/makefile.mk	2004-09-14 13:53:47.314958192 +0200
+@@ -77,11 +77,9 @@ CFLAGS += $(FREETYPE_CFLAGS)
  SLOFILES=\
  		$(SLO)$/glyphcache.obj		\
  		$(SLO)$/gcach_rbmp.obj		\
diff --git a/patches/vclplug/vcl-source-window.diff b/patches/vclplug/vcl-source-window.diff
index 5557cccba..67920befb 100644
--- a/patches/vclplug/vcl-source-window.diff
+++ b/patches/vclplug/vcl-source-window.diff
@@ -3152,7 +3152,7 @@ diff -u -p -u -r1.96.60.1 -r1.106
  
  #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
  #include <com/sun/star/uno/Reference.h>
-@@ -196,11 +202,6 @@ DBG_NAME( Menu );
+@@ -196,12 +202,6 @@ DBG_NAME( Menu );
  // document closer
  #define IID_DOCUMENTCLOSE 1
  
@@ -3161,6 +3161,7 @@ diff -u -p -u -r1.96.60.1 -r1.106
 -    return ( Application::GetSettings().GetMouseSettings().GetFollow() & MOUSE_FOLLOW_MENU ) ? TRUE : FALSE;
 -}
 -
+-
  struct MenuItemData
  {
      USHORT          nId;					// SV Id
diff --git a/patches/vclplug/vcl-unx-source-gdi.diff b/patches/vclplug/vcl-unx-source-gdi.diff
index 29d649121..7989f4d08 100644
--- a/patches/vclplug/vcl-unx-source-gdi.diff
+++ b/patches/vclplug/vcl-unx-source-gdi.diff
@@ -3,9 +3,10 @@ Index: vcl/unx/source/gdi/cdeint.cxx
 RCS file: /cvs/gsl/vcl/unx/source/gdi/cdeint.cxx,v
 retrieving revision 1.8
 retrieving revision 1.9
-diff -u -p -u -r1.8 -r1.9
---- vcl/unx/source/gdi/cdeint.cxx	24 Jun 2002 15:53:02 -0000	1.8
-+++ vcl/unx/source/gdi/cdeint.cxx	18 Nov 2003 14:44:27 -0000	1.9
+Index: vcl/unx/source/gdi/cdeint.cxx
+===================================================================
+--- vcl/unx/source/gdi/cdeint.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/cdeint.cxx	2004-09-14 14:09:32.367288400 +0200
 @@ -64,14 +64,12 @@
  #include <salunx.h>
  #include <saldisp.hxx>
@@ -24,12 +25,8 @@ diff -u -p -u -r1.8 -r1.9
  	mnRefCount++;
 Index: vcl/unx/source/gdi/dtint.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/dtint.cxx,v
-retrieving revision 1.16.82.1
-retrieving revision 1.22
-diff -u -p -u -r1.16.82.1 -r1.22
---- vcl/unx/source/gdi/dtint.cxx	15 Jan 2004 12:52:24 -0000	1.16.82.1
-+++ vcl/unx/source/gdi/dtint.cxx	10 May 2004 15:58:19 -0000	1.22
+--- vcl/unx/source/gdi/dtint.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/dtint.cxx	2004-09-14 14:09:32.371287792 +0200
 @@ -72,10 +72,8 @@
  #include <cdeint.hxx>
  #endif
@@ -143,7 +140,7 @@ diff -u -p -u -r1.16.82.1 -r1.22
  
  void DtIntegrator::GetSystemLook( AllSettings& rSettings )
  {
--}
+ }
 -
 -Color DtIntegrator::parseColor( const ByteString& rLine )
 -{
@@ -563,15 +560,11 @@ diff -u -p -u -r1.16.82.1 -r1.22
 -        rSettings.SetMouseSettings( aMouseSettings );
 -        rSettings.SetStyleSettings( aStyleSettings );
 -    }
- }
+-}
 Index: vcl/unx/source/gdi/gcach_xpeer.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/gcach_xpeer.cxx,v
-retrieving revision 1.32.18.1
-retrieving revision 1.37
-diff -u -p -u -r1.32.18.1 -r1.37
---- vcl/unx/source/gdi/gcach_xpeer.cxx	9 Jan 2004 18:14:01 -0000	1.32.18.1
-+++ vcl/unx/source/gdi/gcach_xpeer.cxx	4 Feb 2004 11:05:23 -0000	1.37
+--- vcl/unx/source/gdi/gcach_xpeer.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/gcach_xpeer.cxx	2004-09-14 14:09:32.372287640 +0200
 @@ -61,6 +61,7 @@
  
  #include <rtl/ustring.hxx>
@@ -643,12 +636,8 @@ diff -u -p -u -r1.32.18.1 -r1.37
              rGlyphData.SetOffset( +maRawBitmap.mnXOffset, +maRawBitmap.mnYOffset );
 Index: vcl/unx/source/gdi/kdeint.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/kdeint.cxx,v
-retrieving revision 1.10
-retrieving revision 1.12
-diff -u -p -u -r1.10 -r1.12
---- vcl/unx/source/gdi/kdeint.cxx	16 Jul 2003 17:46:57 -0000	1.10
-+++ vcl/unx/source/gdi/kdeint.cxx	6 Jan 2004 14:37:00 -0000	1.12
+--- vcl/unx/source/gdi/kdeint.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/kdeint.cxx	2004-09-14 14:09:32.373287488 +0200
 @@ -60,18 +60,18 @@
   ************************************************************************/
  
@@ -691,12 +680,8 @@ diff -u -p -u -r1.10 -r1.12
  		if( pTryFiles[i][0] == '~' )
 Index: vcl/unx/source/gdi/makefile.mk
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/makefile.mk,v
-retrieving revision 1.9
-retrieving revision 1.13
-diff -u -p -u -r1.9 -r1.13
---- vcl/unx/source/gdi/makefile.mk	27 Aug 2002 14:52:35 -0000	1.9
-+++ vcl/unx/source/gdi/makefile.mk	10 May 2004 15:58:32 -0000	1.13
+--- vcl/unx/source/gdi/makefile.mk.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/makefile.mk	2004-09-14 14:09:32.374287336 +0200
 @@ -80,24 +80,29 @@ dummy:
  
  .ELSE		# "$(GUIBASE)"!="unx"
@@ -733,21 +718,19 @@ diff -u -p -u -r1.9 -r1.13
  
  .IF "$(USE_XPRINT)" == "TRUE"
  CFLAGS+=-D_USE_PRINT_EXTENSION_=1
-@@ -113,8 +118,6 @@ ENVCFLAGS+=-DUSE_CDE
- 
- .IF "$(USE_BUILTIN_RASTERIZER)" != ""
+@@ -115,8 +120,6 @@ ENVCFLAGS+=-DUSE_CDE
  SLOFILES+=	$(SLO)$/gcach_xpeer.obj
--.ENDIF
--
  .ENDIF
  
+-.ENDIF
+-
  .ENDIF	# "$(GUIBASE)"!="unx"
+ 
+ # --- Targets ------------------------------------------------------
 Index: vcl/unx/source/gdi/pspgraphics.cxx
 ===================================================================
-RCS file: vcl/unx/source/gdi/pspgraphics.cxx
-diff -N vcl/unx/source/gdi/pspgraphics.cxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/unx/source/gdi/pspgraphics.cxx	17 Jun 2004 12:28:07 -0000	1.4
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/unx/source/gdi/pspgraphics.cxx	2004-09-14 14:09:32.377286880 +0200
 @@ -0,0 +1,1355 @@
 +/*************************************************************************
 + *
@@ -2106,12 +2089,8 @@ diff -N vcl/unx/source/gdi/pspgraphics.cxx
 +}
 Index: vcl/unx/source/gdi/salbmp.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salbmp.cxx,v
-retrieving revision 1.8.274.1
-retrieving revision 1.14
-diff -u -p -u -r1.8.274.1 -r1.14
---- vcl/unx/source/gdi/salbmp.cxx	15 Jan 2004 12:52:46 -0000	1.8.274.1
-+++ vcl/unx/source/gdi/salbmp.cxx	22 Jun 2004 17:42:38 -0000	1.14
+--- vcl/unx/source/gdi/salbmp.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salbmp.cxx	2004-09-14 14:09:32.382286120 +0200
 @@ -59,20 +59,18 @@
   *
   ************************************************************************/
@@ -2638,12 +2617,8 @@ diff -u -p -u -r1.8.274.1 -r1.14
  	{
 Index: vcl/unx/source/gdi/salgdi.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi.cxx,v
-retrieving revision 1.24.120.2
-retrieving revision 1.33
-diff -u -p -u -r1.24.120.2 -r1.33
---- vcl/unx/source/gdi/salgdi.cxx	15 Jan 2004 12:53:28 -0000	1.24.120.2
-+++ vcl/unx/source/gdi/salgdi.cxx	22 Jun 2004 17:42:18 -0000	1.33
+--- vcl/unx/source/gdi/salgdi.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salgdi.cxx	2004-09-14 14:09:32.386285512 +0200
 @@ -59,14 +59,22 @@
   *
   ************************************************************************/
@@ -3951,12 +3926,8 @@ diff -u -p -u -r1.24.120.2 -r1.33
 -
 Index: vcl/unx/source/gdi/salgdi2.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi2.cxx,v
-retrieving revision 1.18.68.1
-retrieving revision 1.25
-diff -u -p -u -r1.18.68.1 -r1.25
---- vcl/unx/source/gdi/salgdi2.cxx	15 Jan 2004 12:53:52 -0000	1.18.68.1
-+++ vcl/unx/source/gdi/salgdi2.cxx	22 Jun 2004 17:42:46 -0000	1.25
+--- vcl/unx/source/gdi/salgdi2.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salgdi2.cxx	2004-09-14 14:09:32.406282472 +0200
 @@ -59,9 +59,6 @@
   *
   ************************************************************************/
@@ -5315,12 +5286,8 @@ diff -u -p -u -r1.18.68.1 -r1.25
  
 Index: vcl/unx/source/gdi/salgdi3.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v
-retrieving revision 1.105.46.5
-retrieving revision 1.119
-diff -u -p -u -r1.105.46.5 -r1.119
---- vcl/unx/source/gdi/salgdi3.cxx	13 Feb 2004 14:03:54 -0000	1.105.46.5
-+++ vcl/unx/source/gdi/salgdi3.cxx	17 Jun 2004 12:29:09 -0000	1.119
+--- vcl/unx/source/gdi/salgdi3.cxx.orig	2004-09-12 14:46:23.000000000 +0200
++++ vcl/unx/source/gdi/salgdi3.cxx	2004-09-14 14:11:55.218571704 +0200
 @@ -59,10 +59,6 @@
   *
   ************************************************************************/
@@ -5664,7 +5631,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      for( int nStart = 0; rSalLayout.GetNextGlyphs( 1, &nGlyph, aPos, nStart ); )
      {
          Pixmap aStipple = aX11GlyphPeer.GetPixmap( rFont, nGlyph );
-@@ -1124,186 +1015,27 @@ void SalGraphicsData::DrawServerSimpleFo
+@@ -1124,200 +1015,27 @@ void SalGraphicsData::DrawServerSimpleFo
  
  //--------------------------------------------------------------------------
  
@@ -5733,10 +5700,24 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -        // apply pair kerning to prev glyph if requested
 -        if( SAL_LAYOUT_KERNING_PAIRS & rArgs.mnFlags )
 -        {
--            // TODO: get kerning value from printer
--            int nKern = 0; //GetGlyphKernValue( nOldGlyphId, nGlyphIndex );
--            nGlyphWidth += nKern;
--            aPrevItem.mnNewWidth = nGlyphWidth;
+-            if( nOldGlyphId > 0 )
+-            {
+-                const std::list< psp::KernPair >& rKernPairs = mrPrinterGfx.getKernPairs(mbVertical);
+-                for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
+-                     it != rKernPairs.end(); ++it )
+-                {
+-                    if( it->first == nOldGlyphId && it->second == nGlyphIndex )
+-                    {
+-                        int nTextScale = mrPrinterGfx.GetFontWidth();
+-                        if( ! nTextScale )
+-                            nTextScale = mrPrinterGfx.GetFontHeight();
+-                        int nKern = (mbVertical ? it->kern_y : it->kern_x) * nTextScale;
+-                        nGlyphWidth += nKern;
+-                        aPrevItem.mnNewWidth = nGlyphWidth;
+-                        break;
+-                    }
+-                }
+-            }
 -        }
 -        
 -        // finish previous glyph
@@ -5866,7 +5847,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      else
      {
          // draw complex text
-@@ -1326,35 +1058,7 @@ void SalGraphicsData::DispatchServerFont
+@@ -1340,35 +1058,7 @@ void SalGraphicsData::DispatchServerFont
  
  //--------------------------------------------------------------------------
  
@@ -5903,7 +5884,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      const Point& rPoint, const sal_Unicode* pStr, int nLength )
  {
      Display* pDisplay   = GetXDisplay();
-@@ -1383,8 +1087,9 @@ void SalGraphicsData::DrawStringUCS2MB( 
+@@ -1397,8 +1087,9 @@ void SalGraphicsData::DrawStringUCS2MB( 
      {
          XTextItem16 *pTextItem = (XTextItem16*)alloca( nLength * sizeof(XTextItem16) );
          XChar2b     *pMBChar   = (XChar2b*)pStr;
@@ -5914,7 +5895,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
          {
              rtl_TextEncoding  nEnc;
              XFontStruct* pFontStruct = rFont.GetFontStruct( pStr[nChar], &nEnc );
-@@ -1406,15 +1111,13 @@ void SalGraphicsData::DrawStringUCS2MB( 
+@@ -1420,15 +1111,13 @@ void SalGraphicsData::DrawStringUCS2MB( 
  
  //--------------------------------------------------------------------------
  
@@ -5931,7 +5912,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      if( mXFont[0] )
          nPairs = mXFont[0]->GetFontCodeRanges( pCodePairs );
      return nPairs;
-@@ -1449,204 +1152,32 @@ CheckNoNegativeCoordinateWorkaround()
+@@ -1463,204 +1152,32 @@ CheckNoNegativeCoordinateWorkaround()
  //
  // ----------------------------------------------------------------------------
  
@@ -5990,29 +5971,29 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
 -#ifndef _USE_PRINT_EXTENSION_
 -    if (maGraphicsData.m_pPrinterGfx != NULL)
--    {
++    if( nTextColor_	!= nSalColor )
+     {
 -        psp::PrinterColor aColor (SALCOLOR_RED   (nSalColor),
 -                                  SALCOLOR_GREEN (nSalColor),
 -                                  SALCOLOR_BLUE  (nSalColor));
 -        maGraphicsData.m_pPrinterGfx->SetTextColor (aColor);
--    }
++        nTextColor_     = nSalColor;
++        nTextPixel_     = GetPixel( nSalColor );
++        bFontGC_         = FALSE;
+     }
 -    else
 -    {
 -#endif
 -
 -    if( _GetTextColor()	!= nSalColor )
-+    if( nTextColor_	!= nSalColor )
-     {
+-    {
 -        _GetTextColor()     = nSalColor;
 -        _GetTextPixel()     = _GetPixel( nSalColor );
 -        _IsFontGC()         = FALSE;
 -    }
 -
 -#ifndef _USE_PRINT_EXTENSION_
-+        nTextColor_     = nSalColor;
-+        nTextPixel_     = GetPixel( nSalColor );
-+        bFontGC_         = FALSE;
-     }
+-    }
 -#endif
  }
  
@@ -6149,7 +6130,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
      // inform font manager
      rtl::OUString aUSystemPath;
-@@ -1662,7 +1193,7 @@ ImplFontData* SalGraphics::AddTempDevFon
+@@ -1676,7 +1193,7 @@ ImplFontData* SalGraphics::AddTempDevFon
      psp::FastPrintFontInfo aInfo;
      rMgr.getFontFastInfo( nFontId, aInfo );
      ImplFontData* pFontData = new ImplFontData;
@@ -6158,7 +6139,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      pFontData->maName = rFontName;
      pFontData->mnQuality += 5800;
  
-@@ -1676,148 +1207,83 @@ ImplFontData* SalGraphics::AddTempDevFon
+@@ -1690,164 +1207,82 @@ ImplFontData* SalGraphics::AddTempDevFon
  
  // ----------------------------------------------------------------------------
  
@@ -6167,35 +6148,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
 -#ifndef _USE_PRINT_EXTENSION_
 -    if (maGraphicsData.m_pJobData != NULL)
-+    XlfdStorage* pFonts = GetDisplay()->GetXlfdList();
-+    
-+    for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
-+    {
-+        ImplFontData *pFontData = new ImplFontData;
-+        pFonts->Get(nIdx)->ToImplFontData( pFontData );
-+        if( pFontData->maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
-+            pFontData->maName = pFontData->maName.Copy( 4 );
-+        pFontData->mbSubsettable    = FALSE;
-+        pFontData->mbEmbeddable     = FALSE;
-+        pList->Add( pFontData );
-+    }
-+    
-+    aX11GlyphPeer.SetDisplay( GetXDisplay(),
-+                              GetDisplay()->GetVisual()->GetVisual() );
-+#ifdef MACOSX
-+    GlyphCache::EnsureInstance( aX11GlyphPeer, true );
-+#else
-+    GlyphCache::EnsureInstance( aX11GlyphPeer, false );
-+#endif
-+    GlyphCache& rGC = GlyphCache::GetInstance();
-+    
-+    const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
-+    ::std::list< psp::fontID > aList;
-+    ::std::list< psp::fontID >::iterator it;
-+    rMgr.getFontList( aList );
-+    unicodeKernMap aKernTab;
-+    for( it = aList.begin(); it != aList.end(); ++it )
-     {
+-    {
 -        const char* pLangBoost = NULL;
 -        const LanguageType aLang = Application::GetSettings().GetUILanguage();
 -        switch( aLang )
@@ -6225,39 +6178,17 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -
 -        ::std::list< psp::fontID >::iterator it;
 -        for (it = aList.begin(); it != aList.end(); ++it)
-+        psp::FastPrintFontInfo aInfo;
-+        if( rMgr.getFontFastInfo( *it, aInfo ) )
-         {
+-        {
 -            psp::FastPrintFontInfo aInfo;
 -            if (rMgr.getFontFastInfo (*it, aInfo))
-+            if( aInfo.m_eType == psp::fonttype::Builtin )
-+                continue;
-+            ImplFontData aFontData;
-+            PspGraphics::SetImplFontData( aInfo, aFontData );
-+            // prefer builtin_rasterizer fonts
-+            aFontData.mnQuality += 4096;
-+            // prefer truetype fonts
-+            if( aInfo.m_eType == psp::fonttype::TrueType )
-+                aFontData.mnQuality += 1000;
-+            int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
-+            if( aFontData.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
-+                aFontData.maName = aFontData.maName.Copy( 4 );
-+            if( nFaceNum < 0 )
-+                nFaceNum = 0;
-+
-+            
-+            const unicodeKernMap* pKernTab = NULL;
-+            if( aInfo.m_eType == psp::fonttype::Type1 )
-             {
+-            {
 -                ImplFontData *pFontData = new ImplFontData;
 -                SetImplFontData( aInfo, *pFontData );
 -                pFontData->mpSysData = (void*)*it;
 -                if( pFontData->maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
 -                    pFontData->maName = pFontData->maName.Copy( 4 );
 -                if( aInfo.m_eType == psp::fonttype::TrueType )
-+                const std::list< psp::KernPair >& rKernPairs = rMgr.getKernPairs( *it );
-+                if( rKernPairs.size() )
-                 {
+-                {
 -                    // prefer truetype fonts
 -                    pFontData->mnQuality += 10;
 -                    // asian type 1 fonts are not known
@@ -6270,29 +6201,35 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -                        if( pLangBoost && aFileName.Copy( nPos+1, 3 ).EqualsIgnoreCaseAscii( pLangBoost ) )
 -                            pFontData->mnQuality += 10;
 -                    }
-+                    aKernTab.clear();
-+                    for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
-+                         it != rKernPairs.end(); ++it )
-+                        aKernTab[ it->first ][ it->second ] = it->kern_x;
-+                    pKernTab = & aKernTab;
-                 }
+-                }
 -                pList->Add( pFontData );
-             }
-+            
-+            // handling of alias names is done by GlyphCache::FetchFontList
-+            rGC.AddFontFile( rMgr.getFontFileSysPath( aInfo.m_nID ), nFaceNum,
-+                             aInfo.m_nID, &aFontData, pKernTab );
-         }
-     }
+-            }
+-        }
+-    }
 -    else
 -#endif
 -    {
 -        XlfdStorage* pFonts = _GetDisplay()->GetXlfdList();
- 
+-
 -        for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
 -        {
 -            ImplFontData *pFontData = new ImplFontData;
--#ifdef MACOSX
++    XlfdStorage* pFonts = GetDisplay()->GetXlfdList();
++    
++    for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
++    {
++        ImplFontData *pFontData = new ImplFontData;
++        pFonts->Get(nIdx)->ToImplFontData( pFontData );
++        if( pFontData->maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
++            pFontData->maName = pFontData->maName.Copy( 4 );
++        pFontData->mbSubsettable    = FALSE;
++        pFontData->mbEmbeddable     = FALSE;
++        pList->Add( pFontData );
++    }
++    
++    aX11GlyphPeer.SetDisplay( GetXDisplay(),
++                              GetDisplay()->GetVisual()->GetVisual() );
+ #ifdef MACOSX
 -            // don't use bitmap X fonts on OS X
 -            if ( pFonts->Get(nIdx)->GetFontType() != TYPE_RASTER )
 -#endif
@@ -6311,17 +6248,31 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -            maGraphicsData.GetDisplay()->GetVisual()->GetVisual() );
 -#ifdef MACOSX
 -        GlyphCache::EnsureInstance( aX11GlyphPeer, true );
--#else
++    GlyphCache::EnsureInstance( aX11GlyphPeer, true );
+ #else
 -        GlyphCache::EnsureInstance( aX11GlyphPeer, false );
--#endif
++    GlyphCache::EnsureInstance( aX11GlyphPeer, false );
+ #endif
 -        GlyphCache& rGC = GlyphCache::GetInstance();
 -
 -        const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
 -        ::std::list< psp::fontID > aList;
 -        ::std::list< psp::fontID >::iterator it;
 -        rMgr.getFontList( aList );
+-        unicodeKernMap aKernTab;
 -        for( it = aList.begin(); it != aList.end(); ++it )
--        {
++    GlyphCache& rGC = GlyphCache::GetInstance();
++    
++    const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
++    ::std::list< psp::fontID > aList;
++    ::std::list< psp::fontID >::iterator it;
++    rMgr.getFontList( aList );
++    unicodeKernMap aKernTab;
++    for( it = aList.begin(); it != aList.end(); ++it )
++    {
++        psp::FastPrintFontInfo aInfo;
++        if( rMgr.getFontFastInfo( *it, aInfo ) )
+         {
 -            psp::FastPrintFontInfo aInfo;
 -            if( rMgr.getFontFastInfo( *it, aInfo ) )
 -            {
@@ -6339,14 +6290,58 @@ diff -u -p -u -r1.105.46.5 -r1.119
 -                    aFontData.maName = aFontData.maName.Copy( 4 );
 -                if( nFaceNum < 0 )
 -                    nFaceNum = 0;
++            if( aInfo.m_eType == psp::fonttype::Builtin )
++                continue;
++            ImplFontData aFontData;
++            PspGraphics::SetImplFontData( aInfo, aFontData );
++            // prefer builtin_rasterizer fonts
++            aFontData.mnQuality += 4096;
++            // prefer truetype fonts
++            if( aInfo.m_eType == psp::fonttype::TrueType )
++                aFontData.mnQuality += 1000;
++            int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
++            if( aFontData.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
++                aFontData.maName = aFontData.maName.Copy( 4 );
++            if( nFaceNum < 0 )
++                nFaceNum = 0;
++
+             
+-                const unicodeKernMap* pKernTab = NULL;
+-                if( aInfo.m_eType == psp::fonttype::Type1 )
++            const unicodeKernMap* pKernTab = NULL;
++            if( aInfo.m_eType == psp::fonttype::Type1 )
++            {
++                const std::list< psp::KernPair >& rKernPairs = rMgr.getKernPairs( *it );
++                if( rKernPairs.size() )
+                 {
+-                    const std::list< psp::KernPair >& rKernPairs = rMgr.getKernPairs( *it );
+-                    if( rKernPairs.size() )
+-                    {
+-                        aKernTab.clear();
+-                        for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
+-                             it != rKernPairs.end(); ++it )
+-                            aKernTab[ it->first ][ it->second ] = it->kern_x;
+-                        pKernTab = & aKernTab;
+-                    }
++                    aKernTab.clear();
++                    for( std::list< psp::KernPair >::const_iterator it = rKernPairs.begin();
++                         it != rKernPairs.end(); ++it )
++                        aKernTab[ it->first ][ it->second ] = it->kern_x;
++                    pKernTab = & aKernTab;
+                 }
+-
 -                rGC.AddFontFile( rMgr.getFontFileSysPath( aInfo.m_nID ), nFaceNum,
--                    aInfo.m_nID, &aFontData );
--            }
--        }
+-                                 aInfo.m_nID, &aFontData, pKernTab );
+             }
++            
++            // handling of alias names is done by GlyphCache::FetchFontList
++            rGC.AddFontFile( rMgr.getFontFileSysPath( aInfo.m_nID ), nFaceNum,
++                             aInfo.m_nID, &aFontData, pKernTab );
+         }
 -
 -        rGC.FetchFontList( pList );
 -#endif // USE_BUILTIN_RASTERIZER
--    }
+     }
 +    rGC.FetchFontList( pList );
  }
  
@@ -6369,7 +6364,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  }
  
  // ----------------------------------------------------------------------------
-@@ -1831,136 +1297,53 @@ sal_DivideNeg( long n1, long n2 )
+@@ -1861,136 +1296,53 @@ sal_DivideNeg( long n1, long n2 )
  // ----------------------------------------------------------------------------
  
  void
@@ -6517,7 +6512,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      if( !pSF )
          return FALSE;
  
-@@ -1972,13 +1355,13 @@ BOOL SalGraphics::GetGlyphBoundRect( lon
+@@ -2002,13 +1354,13 @@ BOOL SalGraphics::GetGlyphBoundRect( lon
  
  // ---------------------------------------------------------------------------
  
@@ -6533,7 +6528,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      if( !pSF )
          return FALSE;
  
-@@ -1991,29 +1374,13 @@ BOOL SalGraphics::GetGlyphOutline( long 
+@@ -2021,29 +1373,13 @@ BOOL SalGraphics::GetGlyphOutline( long 
  
  //--------------------------------------------------------------------------
  
@@ -6565,7 +6560,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
      else if( mXFont[ nFallbackLevel ] )
          pLayout = new X11FontLayout( *mXFont[ nFallbackLevel ] );
      else
-@@ -2024,18 +1391,10 @@ SalLayout* SalGraphicsData::GetTextLayou
+@@ -2054,18 +1390,10 @@ SalLayout* SalGraphicsData::GetTextLayou
  
  //--------------------------------------------------------------------------
  
@@ -6586,7 +6581,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
                                     sal_uInt8* pEncoding,
                                     sal_Int32* pWidths,
                                     int nGlyphs,
-@@ -2049,41 +1408,7 @@ BOOL SalGraphics::CreateFontSubset(
+@@ -2079,41 +1407,7 @@ BOOL SalGraphics::CreateFontSubset(
      // which this method was created). The correct way would
      // be to have the GlyphCache search for the ImplFontData pFont
      psp::fontID aFont = (psp::fontID)pFont->mpSysData;
@@ -6629,7 +6624,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  #else
      return FALSE;
  #endif
-@@ -2091,7 +1416,7 @@ BOOL SalGraphics::CreateFontSubset(
+@@ -2121,7 +1415,7 @@ BOOL SalGraphics::CreateFontSubset(
  
  //--------------------------------------------------------------------------
  
@@ -6638,7 +6633,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
  #ifndef _USE_PRINT_EXTENSION_
      // in this context the sysdata member of pFont should
-@@ -2100,61 +1425,7 @@ const void* SalGraphics::GetEmbedFontDat
+@@ -2130,61 +1424,7 @@ const void* SalGraphics::GetEmbedFontDat
      // which this method was created). The correct way would
      // be to have the GlyphCache search for the ImplFontData pFont
      psp::fontID aFont = (psp::fontID)pFont->mpSysData;
@@ -6701,7 +6696,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  #else
      return NULL;
  #endif
-@@ -2162,14 +1433,16 @@ const void* SalGraphics::GetEmbedFontDat
+@@ -2192,14 +1432,16 @@ const void* SalGraphics::GetEmbedFontDat
  
  //--------------------------------------------------------------------------
  
@@ -6721,7 +6716,7 @@ diff -u -p -u -r1.105.46.5 -r1.119
  {
  #ifndef _USE_PRINT_EXTENSION_
      // in this context the sysdata member of pFont should
-@@ -2178,17 +1451,7 @@ const std::map< sal_Unicode, sal_Int32 >
+@@ -2208,17 +1450,7 @@ const std::map< sal_Unicode, sal_Int32 >
      // which this method was created). The correct way would
      // be to have the GlyphCache search for the ImplFontData pFont
      psp::fontID aFont = (psp::fontID)pFont->mpSysData;
@@ -6742,10 +6737,8 @@ diff -u -p -u -r1.105.46.5 -r1.119
  #endif
 Index: vcl/unx/source/gdi/salnativewidgets-kde.cxx
 ===================================================================
-RCS file: vcl/unx/source/gdi/salnativewidgets-kde.cxx
-diff -N vcl/unx/source/gdi/salnativewidgets-kde.cxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ vcl/unx/source/gdi/salnativewidgets-kde.cxx	10 May 2004 15:59:25 -0000	1.2
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ vcl/unx/source/gdi/salnativewidgets-kde.cxx	2004-09-14 14:09:32.421280192 +0200
 @@ -0,0 +1,1633 @@
 +/*************************************************************************
 + *
@@ -8382,12 +8375,8 @@ diff -N vcl/unx/source/gdi/salnativewidgets-kde.cxx
 +/* vim: set tabstop=8 shiftwidth=4: */
 Index: vcl/unx/source/gdi/salogl.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salogl.cxx,v
-retrieving revision 1.7
-retrieving revision 1.11
-diff -u -p -u -r1.7 -r1.11
---- vcl/unx/source/gdi/salogl.cxx	15 Apr 2003 16:10:05 -0000	1.7
-+++ vcl/unx/source/gdi/salogl.cxx	10 May 2004 15:59:38 -0000	1.11
+--- vcl/unx/source/gdi/salogl.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salogl.cxx	2004-09-14 14:09:32.422280040 +0200
 @@ -59,8 +59,6 @@
   *
   ************************************************************************/
@@ -8679,12 +8668,8 @@ diff -u -p -u -r1.7 -r1.11
  								   int nVisuals )
 Index: vcl/unx/source/gdi/salprnpsp.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
-retrieving revision 1.27.40.2
-retrieving revision 1.33
-diff -u -p -u -r1.27.40.2 -r1.33
---- vcl/unx/source/gdi/salprnpsp.cxx	28 Jan 2004 15:25:52 -0000	1.27.40.2
-+++ vcl/unx/source/gdi/salprnpsp.cxx	10 May 2004 15:59:51 -0000	1.33
+--- vcl/unx/source/gdi/salprnpsp.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salprnpsp.cxx	2004-09-14 14:09:32.426279432 +0200
 @@ -79,14 +79,14 @@
  #ifndef _SV_JOBSET_H
  #include <jobset.h>
@@ -9256,12 +9241,8 @@ diff -u -p -u -r1.27.40.2 -r1.33
  
 Index: vcl/unx/source/gdi/salvd.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salvd.cxx,v
-retrieving revision 1.4
-retrieving revision 1.8
-diff -u -p -u -r1.4 -r1.8
---- vcl/unx/source/gdi/salvd.cxx	27 Mar 2003 17:58:52 -0000	1.4
-+++ vcl/unx/source/gdi/salvd.cxx	10 May 2004 16:00:04 -0000	1.8
+--- vcl/unx/source/gdi/salvd.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/salvd.cxx	2004-09-14 14:09:32.427279280 +0200
 @@ -59,9 +59,6 @@
   *
   ************************************************************************/
@@ -9484,12 +9465,8 @@ diff -u -p -u -r1.4 -r1.8
  }
 Index: vcl/unx/source/gdi/xfont.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xfont.cxx,v
-retrieving revision 1.29.82.2
-retrieving revision 1.36
-diff -u -p -u -r1.29.82.2 -r1.36
---- vcl/unx/source/gdi/xfont.cxx	26 Jan 2004 17:26:20 -0000	1.29.82.2
-+++ vcl/unx/source/gdi/xfont.cxx	17 Jun 2004 12:29:36 -0000	1.36
+--- vcl/unx/source/gdi/xfont.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xfont.cxx	2004-09-14 14:09:32.428279128 +0200
 @@ -76,8 +76,11 @@
  #ifndef _SV_OUTFONT_HXX
  #include <outfont.hxx>
@@ -9514,7 +9491,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
          mpRangeCodes(NULL),
          mnRangeCount(-1)
  {
-@@ -434,7 +438,7 @@ ExtendedFontStruct::GetDefaultWidth()
+@@ -437,7 +440,7 @@ ExtendedFontStruct::GetDefaultWidth()
  // is compatible with iso8859-X at least in the range to 0x7f
  sal_Size
  ExtendedFontStruct::GetCharWidth8( sal_Unicode nFrom, sal_Unicode nTo,
@@ -9523,7 +9500,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
  	if ( !(nFrom <= nTo) )
  		return 0;
-@@ -477,7 +481,7 @@ ExtendedFontStruct::GetCharWidth8( sal_U
+@@ -480,7 +483,7 @@ ExtendedFontStruct::GetCharWidth8( sal_U
  // Handle utf16 encoded fonts, which do not require conversion
  sal_Size
  ExtendedFontStruct::GetCharWidthUTF16( sal_Unicode nFrom, sal_Unicode nTo,
@@ -9532,7 +9509,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
  	if ( !(nFrom <= nTo) )
  		return 0;
-@@ -523,7 +527,7 @@ ExtendedFontStruct::GetCharWidthUTF16( s
+@@ -526,7 +529,7 @@ ExtendedFontStruct::GetCharWidthUTF16( s
  // font in fontstruct, 8 and 16 bit fonts are handled the same way
  sal_Size
  ExtendedFontStruct::GetCharWidth16( sal_Unicode nFrom, sal_Unicode nTo,
@@ -9541,7 +9518,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
      if ( nFrom > nTo )
          return 0;
-@@ -608,8 +612,8 @@ ExtendedFontStruct::GetCharWidth16( sal_
+@@ -611,8 +614,8 @@ ExtendedFontStruct::GetCharWidth16( sal_
  }
  
  sal_Size
@@ -9552,7 +9529,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
  {
      sal_Size nConverted = 0;
  
-@@ -707,7 +711,9 @@ bool X11FontLayout::LayoutText( ImplLayo
+@@ -710,7 +713,9 @@ bool X11FontLayout::LayoutText( ImplLayo
  {
      Point aNewPos( 0, 0 );
      bool bRightToLeft;
@@ -9563,7 +9540,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
      {
          sal_Unicode cChar = rArgs.mpStr[ nCharPos ];
          if( bRightToLeft )
-@@ -722,7 +728,7 @@ bool X11FontLayout::LayoutText( ImplLayo
+@@ -725,7 +730,7 @@ bool X11FontLayout::LayoutText( ImplLayo
                  nGlyphIndex = 0; // drop NotDef fallback glyphs
          }
  
@@ -9572,7 +9549,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
          mrFont.GetCharWidth( cChar, &nPhysGlyphWidth, &nLogGlyphWidth );
          int nGlyphFlags = (nPhysGlyphWidth > 0) ? 0 : GlyphItem::IS_IN_CLUSTER;
          if( bRightToLeft )
-@@ -753,7 +759,7 @@ void X11FontLayout::DrawText( SalGraphic
+@@ -756,7 +761,7 @@ void X11FontLayout::DrawText( SalGraphic
      int nMaxGlyphs = GetOrientation() ? 1 : MAXGLYPHS;
  
      Point aPos;
@@ -9581,7 +9558,7 @@ diff -u -p -u -r1.29.82.2 -r1.36
      sal_Unicode pStr[ MAXGLYPHS ];
      for( int nStart=0;;)
      {
-@@ -764,7 +770,7 @@ void X11FontLayout::DrawText( SalGraphic
+@@ -767,7 +772,7 @@ void X11FontLayout::DrawText( SalGraphic
          for( int i = 0; i < nGlyphCount; ++i )
              pStr[ i ] = aGlyphAry[ i ] & GF_IDXMASK;
  
@@ -9592,12 +9569,8 @@ diff -u -p -u -r1.29.82.2 -r1.36
  
 Index: vcl/unx/source/gdi/xlfd_attr.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_attr.cxx,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -p -u -r1.14 -r1.15
---- vcl/unx/source/gdi/xlfd_attr.cxx	12 Jun 2003 08:19:39 -0000	1.14
-+++ vcl/unx/source/gdi/xlfd_attr.cxx	6 Jan 2004 14:41:47 -0000	1.15
+--- vcl/unx/source/gdi/xlfd_attr.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_attr.cxx	2004-09-14 14:09:32.433278368 +0200
 @@ -120,10 +120,12 @@ Attribute::Compare( const char *p, int n
  const rtl::OString&
  Attribute::GetKey ()
@@ -9614,12 +9587,8 @@ diff -u -p -u -r1.14 -r1.15
  
 Index: vcl/unx/source/gdi/xlfd_extd.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_extd.cxx,v
-retrieving revision 1.16.46.2
-retrieving revision 1.21
-diff -u -p -u -r1.16.46.2 -r1.21
---- vcl/unx/source/gdi/xlfd_extd.cxx	26 Jan 2004 17:26:45 -0000	1.16.46.2
-+++ vcl/unx/source/gdi/xlfd_extd.cxx	30 Mar 2004 13:43:43 -0000	1.21
+--- vcl/unx/source/gdi/xlfd_extd.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_extd.cxx	2004-09-14 14:09:32.435278064 +0200
 @@ -652,7 +652,7 @@ ScalableBitmapXlfd::ToString( ByteString
  	rString += '-';
  	rString += ByteString::CreateFromInt32( rInfo.mnResolutionY );
@@ -9733,12 +9702,8 @@ diff -u -p -u -r1.16.46.2 -r1.21
  	AppendAttribute( mpFactory->RetrieveCharset(rInfo.mnCharset), rString );
 Index: vcl/unx/source/gdi/xlfd_extd.hxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_extd.hxx,v
-retrieving revision 1.9.120.2
-retrieving revision 1.12
-diff -u -p -u -r1.9.120.2 -r1.12
---- vcl/unx/source/gdi/xlfd_extd.hxx	26 Jan 2004 17:27:37 -0000	1.9.120.2
-+++ vcl/unx/source/gdi/xlfd_extd.hxx	17 Mar 2004 10:07:56 -0000	1.12
+--- vcl/unx/source/gdi/xlfd_extd.hxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_extd.hxx	2004-09-14 14:09:32.435278064 +0200
 @@ -93,8 +93,8 @@ class XlfdStorage;
  
  class ExtendedXlfd {
@@ -9752,12 +9717,8 @@ diff -u -p -u -r1.9.120.2 -r1.12
  			 				ExtendedXlfd();
 Index: vcl/unx/source/gdi/xlfd_smpl.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_smpl.cxx,v
-retrieving revision 1.5
-retrieving revision 1.7
-diff -u -p -u -r1.5 -r1.7
---- vcl/unx/source/gdi/xlfd_smpl.cxx	15 Apr 2003 16:11:23 -0000	1.5
-+++ vcl/unx/source/gdi/xlfd_smpl.cxx	18 May 2004 13:49:24 -0000	1.7
+--- vcl/unx/source/gdi/xlfd_smpl.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xlfd_smpl.cxx	2004-09-14 14:09:32.436277912 +0200
 @@ -282,12 +282,12 @@ Xlfd::ToString( ByteString &rString ) co
  	AppendAttribute( mpFactory->RetrieveSetwidth(mnSetwidth), rString );
  	AppendAttribute( mpFactory->RetrieveAddstyle(mnAddstyle), rString );
@@ -9779,12 +9740,8 @@ diff -u -p -u -r1.5 -r1.7
  
 Index: vcl/unx/source/gdi/xprintext.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/xprintext.cxx,v
-retrieving revision 1.6
-retrieving revision 1.8
-diff -u -p -u -r1.6 -r1.8
---- vcl/unx/source/gdi/xprintext.cxx	15 Apr 2003 16:11:42 -0000	1.6
-+++ vcl/unx/source/gdi/xprintext.cxx	30 Mar 2004 13:43:56 -0000	1.8
+--- vcl/unx/source/gdi/xprintext.cxx.orig	2004-09-12 14:26:04.000000000 +0200
++++ vcl/unx/source/gdi/xprintext.cxx	2004-09-14 14:09:32.437277760 +0200
 @@ -59,8 +59,6 @@
   *
   ************************************************************************/
diff --git a/src/openabout_mandrakelinux.bmp b/src/openabout_mandrakelinux.bmp
new file mode 100644
index 000000000..a936b8982
--- /dev/null
+++ b/src/openabout_mandrakelinux.bmp