MWS_SRX644: migrate branch mws_srx644 -> HEAD

117 files changed, 6955 insertions, 3257 deletions

diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index 9c9865b9e8ad..afbd4a6e0e33 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bmpcore.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: ka $ $Date: 2002-10-30 16:27:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:35:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,8 +109,13 @@ void BmpCreator::ImplCreate( SvStream& rStm,
                              const String& rName,
                              const LangInfo& rLang )
 {
-       const char*         pCollectPath = getenv( "BMP_COLLECT_PATH" );
     const sal_uInt32    nOldPos = pSRS->Tell();
+       const char*         pCollectFile = getenv( "BMP_COLLECT_FILE" );
+       SvFileStream*       pCollectStm = pCollectFile ? new SvFileStream( String( pCollectFile, RTL_TEXTENCODING_ASCII_US ),
+                                                                          STREAM_WRITE ) : NULL;
+
+    if( pCollectStm )
+        pCollectStm->Seek( STREAM_SEEK_TO_END );
 
     if( rInDirs.size() )
     {
@@ -189,30 +194,6 @@ void BmpCreator::ImplCreate( SvStream& rStm,
             aInfo += String( RTL_CONSTASCII_USTRINGPARAM( " ]" ) );
             Message( aInfo );
 
-/*
-            if( pCollectPath )
-            {
-                String aLocalStr( aLocalPath.GetPath().GetFull() );
-                aLocalStr.EraseLeadingChars( '/' );
-                aLocalStr.SearchAndReplace( ':', '_' );
-                aLocalCollectPath = DirEntry( String( pCollectPath, RTL_TEXTENCODING_ASCII_US ) );
-                aLocalCollectPath += DirEntry( aLocalStr );
-                aLocalCollectPath.MakeDir();
-
-                String aGlobalStr( aGlobalPath.GetPath().GetFull() );
-                aGlobalStr.EraseLeadingChars( '/' );
-                aGlobalStr.SearchAndReplace( ':', '_' );
-                aGlobalCollectPath = DirEntry( String( pCollectPath, RTL_TEXTENCODING_ASCII_US ) );
-                aGlobalCollectPath += DirEntry( aGlobalStr );
-                aGlobalCollectPath.MakeDir();
-
-                if( !aLocalCollectPath.Exists() || !aGlobalCollectPath.Exists() )
-                {
-                    pCollectPath = NULL;
-                    Message( String( RTL_CONSTASCII_USTRINGPARAM( "ERROR: couldn't create collect path" ) ), 0 );
-                }
-            }
-*/
 
             // create bit vector to hold flags for valid bitmaps
             ::std::bit_vector aValidBmpBitVector( aNameVector.size(), false );
@@ -234,13 +215,11 @@ void BmpCreator::ImplCreate( SvStream& rStm,
                         aIStm >> aBmp;
                         aIStm.Close();
 
-/*
-                        if( pCollectPath && !aBmp.IsEmpty() )
+                        if( pCollectStm && !aBmp.IsEmpty() )
                         {
-                            DirEntry aSrcPath( aFileName ), aDstPath( aLocalCollectPath );
-                            aSrcPath.CopyTo( aDstPath += aSrcPath.GetName(), FSYS_ACTION_COPYFILE );
+                            const ByteString aCollectString( aFileName, RTL_TEXTENCODING_ASCII_US );
+                            pCollectStm->WriteLine( aCollectString );
                         }
-*/
                     }
                 }
 
@@ -341,6 +320,7 @@ void BmpCreator::ImplCreate( SvStream& rStm,
         Message( String( RTL_CONSTASCII_USTRINGPARAM( "ERROR: SOLARSRC environment variable not set!" ) ), EXIT_MISSING_SOLARSRC_ENV );
 
     pSRS->Seek( nOldPos );
+    delete pCollectStm;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
new file mode 100644
index 000000000000..ce5295c1cdc6
--- /dev/null
+++ b/svtools/bmpmaker/bmpsum.cxx
@@ -0,0 +1,482 @@
+/*************************************************************************
+ *
+ *  $RCSfile: bmpsum.cxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:35:54 $
+ *
+ *  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 <stdio.h>
+#include <signal.h>
+#include <vector>
+#include <set>
+#include <map>
+
+#include <rtl/crc.h>
+#include <tools/stream.hxx>
+#include <tools/fsys.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/bitmap.hxx>
+#include <vcl/bmpacc.hxx>
+
+#include "solar.hrc"
+#include "filedlg.hxx"
+
+#define EXIT_NOERROR        0x00000000
+#define EXIT_INVALIDFILE    0x00000001
+#define EXIT_COMMONERROR    0x80000000
+
+// ----------
+// - BmpSum -
+// ----------
+
+class BmpSum
+{
+private:
+
+    sal_uInt32      cExitCode;
+
+    BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
+    BOOL            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
+
+    void            SetExitCode( BYTE cExit )
+                    {
+                        if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) )
+                            cExitCode = cExit;
+                    }
+    void            ShowUsage();
+    void            Message( const String& rText, BYTE cExitCode );
+
+    sal_uInt64      GetCRC( Bitmap& rBmp );
+
+    void            ProcessFile( const String& rBmpFileName );
+    void            ProcessFileList( const String& rInFileList, const String& rOutFileList, const String& rOutPath );
+
+public:
+
+                    BmpSum();
+                    ~BmpSum();
+
+    int             Start( const ::std::vector< String >& rArgs );
+};
+
+// -----------------------------------------------------------------------------
+
+BmpSum::BmpSum()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+BmpSum::~BmpSum()
+{
+}
+
+// -----------------------------------------------------------------------
+
+BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam )
+{
+    BOOL bRet = FALSE;
+
+    for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
+    {
+        String  aTestStr( '-' );
+
+        for( int n = 0; ( n < 2 ) && !bRet; n++ )
+        {
+            aTestStr += rSwitch;
+
+            if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL )
+            {
+                bRet = TRUE;
+
+                if( i < ( nCount - 1 ) )
+                    rParam = rArgs[ i + 1 ];
+                else
+                    rParam = String();
+            }
+
+            if( 0 == n )
+                aTestStr = '/';
+        }
+    }
+
+    return bRet;
+}
+
+// -----------------------------------------------------------------------
+
+BOOL BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams )
+{
+    BOOL bRet = FALSE;
+
+    for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
+    {
+        String  aTestStr( '-' );
+
+        for( int n = 0; ( n < 2 ) && !bRet; n++ )
+        {
+            aTestStr += rSwitch;
+
+            if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL )
+            {
+                if( i < ( nCount - 1 ) )
+                    rParams.push_back( rArgs[ i + 1 ] );
+                else
+                    rParams.push_back( String() );
+
+                break;
+            }
+
+            if( 0 == n )
+                aTestStr = '/';
+        }
+    }
+
+    return( rParams.size() > 0 );
+}
+
+// -----------------------------------------------------------------------
+
+void BmpSum::Message( const String& rText, BYTE cExitCode )
+{
+    if( EXIT_NOERROR != cExitCode )
+        SetExitCode( cExitCode );
+
+    ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
+    aText.Append( "\r\n" );
+    fprintf( stderr, aText.GetBuffer() );
+}
+
+// -----------------------------------------------------------------------------
+
+void BmpSum::ShowUsage()
+{
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "Usage:" ) ), EXIT_NOERROR );
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "    bmpsum bmp_inputfile" ) ), EXIT_NOERROR );
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "    bmpsum -i input_filelist -o output_filelist [-p path_for_copied_bitmaps]" ) ), EXIT_NOERROR );
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "Options:" ) ), EXIT_NOERROR );
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "Examples:" ) ), EXIT_NOERROR );
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "    bmpsum /home/test.bmp" ) ), EXIT_NOERROR );
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "    bmpsum -i /home/inlist.txt -o /home/outlist.txt" ) ), EXIT_NOERROR );
+    Message( String( RTL_CONSTASCII_USTRINGPARAM( "    bmpsum -i /home/inlist.txt -o /home/outlist.txt -p /home/outpath" ) ), EXIT_NOERROR );
+}
+
+// -----------------------------------------------------------------------------
+
+int BmpSum::Start( const ::std::vector< String >& rArgs )
+{
+    cExitCode = EXIT_NOERROR;
+
+    if( rArgs.size() >= 1 )
+    {
+        String  aInFileList, aOutFileList, aOutPath;
+
+        if( GetCommandOption( rArgs, 'i', aInFileList ) &&
+            GetCommandOption( rArgs, 'o', aOutFileList ) )
+        {
+            GetCommandOption( rArgs, 'p', aOutPath );
+            ProcessFileList( aInFileList, aOutFileList, aOutPath );
+        }
+        else
+        {
+            ProcessFile( rArgs[ 0 ] );
+        }
+    }
+    else
+    {
+        ShowUsage();
+        cExitCode = EXIT_COMMONERROR;
+    }
+
+    if ( EXIT_NOERROR != cExitCode )
+        raise( SIGABRT );
+
+    return cExitCode;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_uInt64 BmpSum::GetCRC( Bitmap& rBmp )
+{
+    BitmapReadAccess* pRAcc = rBmp.AcquireReadAccess();
+    sal_uInt64        nRet = 0;
+    sal_uInt32        nCrc = 0;
+
+    if( pRAcc && pRAcc->Width() && pRAcc->Height() )
+    {
+        SVBT32 aBT32;
+
+        for( long nY = 0; nY < pRAcc->Height(); ++nY )
+        {
+            for( long nX = 0; nX < pRAcc->Width(); ++nX )
+            {
+                const BitmapColor aCol( pRAcc->GetColor( nY, nX ) );
+
+                LongToSVBT32( aCol.GetRed(), aBT32 );
+                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+
+                LongToSVBT32( aCol.GetGreen(), aBT32 );
+                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+
+                LongToSVBT32( aCol.GetBlue(), aBT32 );
+                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+            }
+        }
+
+        nRet = ( ( (sal_uInt64) pRAcc->Width() ) << 48 ) |
+               ( ( (sal_uInt64) pRAcc->Height() ) << 32 ) |
+               ( (sal_uInt64) nCrc );
+    }
+
+    rBmp.ReleaseAccess( pRAcc );
+
+    return nRet;
+}
+
+// -----------------------------------------------------------------------------
+
+void BmpSum::ProcessFile( const String& rBmpFileName )
+{
+    SvFileStream aIStm( rBmpFileName, STREAM_READ );
+
+    if( aIStm.IsOpen() )
+    {
+        Bitmap aBmp;
+
+        aIStm >> aBmp;
+
+        if( !aBmp.IsEmpty() )
+        {
+#ifdef WNT
+            fprintf( stdout, "%I64u\r\n", GetCRC( aBmp ) );
+#else
+            fprintf( stdout, "%llu\r\n", GetCRC( aBmp ) );
+#endif
+        }
+        else
+            Message( String( RTL_CONSTASCII_USTRINGPARAM( "file not valid" ) ), EXIT_INVALIDFILE );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void BmpSum::ProcessFileList( const String& rInFileList,
+                              const String& rOutFileList,
+                              const String& rOutPath )
+{
+    SvFileStream    aIStm( rInFileList, STREAM_READ );
+    SvFileStream    aOStm( rOutFileList, STREAM_WRITE | STREAM_TRUNC );
+    const DirEntry  aBaseDir( rOutPath );
+
+    if( rOutPath.Len() )
+        aBaseDir.MakeDir();
+
+    if( aIStm.IsOpen() && aOStm.IsOpen() )
+    {
+        ByteString                  aReadLine;
+        ::std::set< ByteString >    aFileNameSet;
+
+        while( aIStm.ReadLine( aReadLine ) )
+        {
+            if( aReadLine.Len() )
+                aFileNameSet.insert( aReadLine );
+
+            if( aReadLine.Search( "enus" ) != STRING_NOTFOUND )
+            {
+                static const char* aLanguages[] =
+                {
+                    "chinsim",
+                    "chintrad",
+                    "dtch",
+                    "enus",
+                    "fren",
+                    "ital",
+                    "japn",
+                    "korean",
+                    "pol",
+                    "poln",
+                    "port",
+                    "russ",
+                    "span",
+                    "turk"
+                };
+
+                for( sal_uInt32 n = 0; n < 14; ++n )
+                {
+                    ByteString aLangPath( aReadLine );
+
+                    aLangPath.SearchAndReplace( "enus", aLanguages[ n ] );
+
+                    DirEntry aTestFile( aLangPath );
+
+                    if( aTestFile.Exists() )
+                        aFileNameSet.insert( aLangPath );
+                }
+            }
+
+            aReadLine.Erase();
+        }
+
+        aIStm.Close();
+
+        ::std::set< ByteString >::iterator aIter( aFileNameSet.begin() );
+        ::std::map< sal_uInt64, ::std::vector< ByteString > > aFileNameMap;
+
+        while( aIter != aFileNameSet.end() )
+        {
+            ByteString      aStr( *aIter++ );
+            Bitmap          aBmp;
+            SvFileStream    aBmpStm( String( aStr.GetBuffer(), RTL_TEXTENCODING_ASCII_US ), STREAM_READ );
+            sal_uInt64      nCRC = 0;
+
+            if( aBmpStm.IsOpen() )
+            {
+                Bitmap aBmp;
+
+                aBmpStm >> aBmp;
+
+                if( !aBmp.IsEmpty() )
+                    nCRC = GetCRC( aBmp );
+                else
+                    fprintf( stderr, "%s could not be opened\n", aStr.GetBuffer() );
+
+                aBmpStm.Close();
+            }
+
+            if( nCRC )
+            {
+                ::std::map< sal_uInt64, ::std::vector< ByteString > >::iterator aFound( aFileNameMap.find( nCRC ) );
+
+                if( aFound != aFileNameMap.end() )
+                    (*aFound).second.push_back( aStr );
+                else
+                {
+                    ::std::vector< ByteString > aVector( 1, aStr );
+                    aFileNameMap[ nCRC ]  = aVector;
+                }
+
+            }
+            else
+            {
+                ::std::vector< ByteString > aVector( 1, aStr );
+                aFileNameMap[ nCRC ]  = aVector;
+            }
+        }
+
+        ::std::map< sal_uInt64, ::std::vector< ByteString > >::iterator aMapIter( aFileNameMap.begin() );
+        sal_uInt32 nFileCount = 0;
+
+        while( aMapIter != aFileNameMap.end() )
+        {
+            ::std::pair< const sal_uInt64, ::std::vector< ByteString > > aPair( *aMapIter++ );
+            ::std::vector< ByteString > aFileNameVector( aPair.second );
+
+            // write new entries
+            for( sal_uInt32 i = 0; i < aFileNameVector.size(); ++i )
+            {
+                ByteString  aStr( ByteString::CreateFromInt64( aPair.first ) );
+                ByteString  aFileName( aFileNameVector[ i ] );
+                DirEntry    aSrcFile( aFileName );
+
+                aStr += '\t';
+                aStr += aFileName;
+
+                aOStm.WriteLine( aStr );
+
+                // copy bitmap
+                if( rOutPath.Len() )
+                {
+                    if( aFileName.Search( ":\\" ) != STRING_NOTFOUND )
+                        aFileName.Erase( 0, aFileName.Search( ":\\" ) + 2 );
+
+                    aFileName.SearchAndReplaceAll( '\\', '/' );
+
+                    sal_uInt16  nTokenCount = aFileName.GetTokenCount( '/' );
+                    DirEntry    aNewDir( aBaseDir );
+
+                    for( sal_uInt16 n = 0; ( n < nTokenCount - 1 ); n++ )
+                    {
+                        aNewDir += DirEntry( aFileName.GetToken( n, '/' ) );
+                        aNewDir.MakeDir();
+                    }
+
+                    aNewDir += DirEntry( aFileName.GetToken( nTokenCount - 1, '/' ) );
+                    aSrcFile.CopyTo( aNewDir, FSYS_ACTION_COPYFILE );
+                }
+            }
+
+            ++nFileCount;
+        }
+
+        fprintf( stdout, "unique file count: %u", nFileCount );
+    }
+}
+
+// --------
+// - Main -
+// --------
+
+int main( int nArgCount, char* ppArgs[] )
+{
+    ::std::vector< String > aArgs;
+    BmpSum                  aBmpSum;
+
+    for( int i = 1; i < nArgCount; i++ )
+        aArgs.push_back( String( ppArgs[ i ], RTL_TEXTENCODING_ASCII_US ) );
+
+    return aBmpSum.Start( aArgs );
+}
diff --git a/svtools/bmpmaker/makefile.mk b/svtools/bmpmaker/makefile.mk
index 33314737db7c..f049fec71064 100644
--- a/svtools/bmpmaker/makefile.mk
+++ b/svtools/bmpmaker/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: ka $ $Date: 2002-01-10 10:08:41 $
+#   last change: $Author: hr $ $Date: 2003-03-27 14:35:55 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -77,7 +77,8 @@ LIBTARGET=NO
 OBJFILES=   $(OBJ)$/bmp.obj			\
             $(OBJ)$/bmpgui.obj		\
             $(OBJ)$/bmpcore.obj		\
-            $(OBJ)$/g2g.obj			
+            $(OBJ)$/g2g.obj			\
+            $(OBJ)$/bmpsum.obj      
 
 
 SRC1FILES=bmp.src
@@ -85,6 +86,8 @@ SRS1NAME=bmp
 RES1TARGET=bmp
 SRS1FILES=$(SRS)$/bmp.srs
 
+# --- APP1TARGET ---------------------------------------------------
+
 APP1TARGET= $(TARGET)
 
 APP1STDLIBS =		\
@@ -111,6 +114,18 @@ APP1BASE=0x10000000
 ALL:	$(BIN)$/$(RES1TARGET).res ALLTAR
 .ENDIF
 
+# --- APP2TARGET --------------------------------------------------
+
+APP2TARGET	=	bmpsum
+APP2BASE	=	0x10000000
+APP2DEPN	=   $(L)$/itools.lib  $(SVLIBDEPEND)
+APP2OBJS	=   $(OBJ)$/bmpsum.obj
+
+APP2STDLIBS	=	$(SVLIB)		\
+                $(TOOLSLIB)		\
+                $(VOSLIB) 		\
+                $(SALLIB)
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx
index 17c0abff89ac..8fa314473582 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/fileview.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fileview.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-17 15:04:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,11 +116,11 @@ public:
     sal_uInt32              GetHelpId( ) const;
     void                    SetSizePixel( const Size& rNewSize );
     void                    SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
-    void                    Initialize( const String& rURL, const String& rFilter );
-    void                    Initialize( const String& rURL,
+    sal_Bool                Initialize( const String& rURL, const String& rFilter );
+    sal_Bool                Initialize( const String& rURL,
                                         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents );
 
-    void                    ExecuteFilter( const String& rFilter );
+    sal_Bool                ExecuteFilter( const String& rFilter );
     void                    SetNoSelection();
     void                    ResetCursor();
 
diff --git a/svtools/inc/gradwrap.hxx b/svtools/inc/gradwrap.hxx
new file mode 100644
index 000000000000..fbe03909ad1a
--- /dev/null
+++ b/svtools/inc/gradwrap.hxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ *  $RCSfile: gradwrap.hxx,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:16 $
+ *
+ *  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): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+
+#ifndef _SVGEN_HXX
+#include <svgen.hxx>
+#endif
+
+
+/******************************************************************************
+|*
+|*  class GradientWrapper
+|*
+|*  Ersterstellung:     KA 24.11.95
+|*  letzte Aenderung:   KA 24.11.95
+|*
+|*  Zeck:   dient beim MetaFile-Export dazu, die eigentliche Berechungs-
+|*          funktionalitaet zu kapseln. Das Schreiben der Records fuer
+|*          die unterschiedlichen File-Formate geschieht ueber LinkHandler.
+|*
+|*          Klassen, die diesen Wrapper benutzen, muessen drei Linkhandler
+|*          zur Verfuegung stellen, die im Ctor uebergeben werden:
+|*
+|*              1. Linkhandler zum Schreiben eines Records fuer Polygonausgabe
+|*              2. Linkhandler zum Schreiben eines Records fuer PolyPolygonausgabe
+|*              3. Linkhandler zum Schreiben eines Records fuer Setzen der Brush
+|*
+\******************************************************************************/
+
+
+class GradientWrapper
+{
+    Link        aDrawPolyRecordHdl;
+    Link        aDrawPolyPolyRecordHdl;
+    Link        aSetFillInBrushRecordHdl;
+
+                GradientWrapper() {};
+
+
+public:
+                GradientWrapper(const Link& rDrawPolyRecordHdl,
+                                const Link& rDrawPolyPolyRecordHdl,
+                                const Link& rSetFillInBrushHdl);
+                ~GradientWrapper();
+
+
+    void        WriteLinearGradient(const Rectangle& rRect,
+                                    const Gradient& rGradient);
+    void        WriteRadialGradient(const Rectangle& rRect,
+                                    const Gradient& rGradient);
+    void        WriteRectGradient(const Rectangle& rRect,
+                                  const Gradient& rGradient);
+};
diff --git a/svtools/inc/helpagentwindow.hxx b/svtools/inc/helpagentwindow.hxx
index bde750583391..e2e436aa8f57 100644
--- a/svtools/inc/helpagentwindow.hxx
+++ b/svtools/inc/helpagentwindow.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helpagentwindow.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-07 15:15:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,13 +123,3 @@ namespace svt
 
 #endif  // _SVTOOLS_HELPAGENTWIDNOW_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/05/07 13:39:39  fs
- *  initial checkin - help agent window
- *
- *
- *  Revision 1.0 03.05.01 11:49:19  fs
- ************************************************************************/
-
diff --git a/svtools/inc/htmlkywd.hxx b/svtools/inc/htmlkywd.hxx
index 293c464c943b..8ab2d87ac6c4 100644
--- a/svtools/inc/htmlkywd.hxx
+++ b/svtools/inc/htmlkywd.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlkywd.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mib $ $Date: 2002-08-01 13:24:46 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,6 +76,8 @@
 
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_doctype32,
     "HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\"" );
+extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_doctype40,
+    "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" );
 
 
 // diese werden nur eingeschaltet
diff --git a/svtools/inc/javaoptions.hxx b/svtools/inc/javaoptions.hxx
index e341003bc38d..de15efba0a73 100644
--- a/svtools/inc/javaoptions.hxx
+++ b/svtools/inc/javaoptions.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: javaoptions.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: os $ $Date: 2001-05-18 13:09:33 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,15 @@ class SvtJavaOptions : utl::ConfigItem
 {
     SvtJavaOptions_Impl* pImpl;
 public:
+    enum EOption
+    {
+        E_ENABLED,
+        E_SECURITY,
+        E_NETACCESS,
+        E_USERCLASSPATH,
+        E_EXECUTEAPPLETS
+    };
+
     SvtJavaOptions();
     ~SvtJavaOptions();
 
@@ -93,6 +102,8 @@ public:
     void SetNetAccess(sal_Int32 nSet) ;
     void SetUserClassPath(const rtl::OUString& rSet);
     void SetExecuteApplets(sal_Bool bSet);
+
+    sal_Bool IsReadOnly( EOption eOption ) const;
 };
 
 #endif //
diff --git a/svtools/inc/lngmisc.hxx b/svtools/inc/lngmisc.hxx
index 3488ae5d7ba2..e8e2a0176f92 100644
--- a/svtools/inc/lngmisc.hxx
+++ b/svtools/inc/lngmisc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lngmisc.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: tl $ $Date: 2000-12-22 12:40:40 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,6 +105,8 @@ INT32   GetNumControlChars( const rtl::OUString &rTxt );
 BOOL    RemoveHyphens( rtl::OUString &rTxt );
 BOOL    RemoveControlChars( rtl::OUString &rTxt );
 
+BOOL    ReplaceControlChars( rtl::OUString &rTxt, sal_Char aRplcChar = ' ' );
+
 } // namespace linguistic
 
 #endif
diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/localresaccess.hxx
index b5562852395d..3e109152f17d 100644
--- a/svtools/inc/localresaccess.hxx
+++ b/svtools/inc/localresaccess.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: localresaccess.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: gt $ $Date: 2002-06-06 07:19:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,19 +115,3 @@ namespace svt
 
 #endif // _SVTOOLS_LOCALRESACCESS_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2002/05/24 16:48:37  fs
- *  #99484# new (easier) ctor, +IsAvailableRes
- *
- *  Revision 1.1  2001/02/05 17:04:48  fs
- *  initial checkin - accessing local resources
- *
- *  Revision 1.1  2000/10/05 10:08:35  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 28.09.00 10:43:07  fs
- ************************************************************************/
-
diff --git a/svtools/inc/pickerhistory.hxx b/svtools/inc/pickerhistory.hxx
index 26a495b8b80c..6f98f7a7bf6c 100644
--- a/svtools/inc/pickerhistory.hxx
+++ b/svtools/inc/pickerhistory.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pickerhistory.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-31 09:20:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,10 +84,3 @@ namespace svt
 
 #endif // SVTOOLS_PICKERHISTORY_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 31.10.01 09:47:02  fs
- ************************************************************************/
-
diff --git a/svtools/inc/regoptions.hxx b/svtools/inc/regoptions.hxx
index 3a36bf5baf2f..ae3a4d849a41 100644
--- a/svtools/inc/regoptions.hxx
+++ b/svtools/inc/regoptions.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regoptions.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-12-20 13:06:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,10 +144,3 @@ namespace svt
 
 #endif // SVTOOLS_REGOPTIONS_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 19.12.01 13:41:17  fs
- ************************************************************************/
-
diff --git a/svtools/inc/svimpbox.hxx b/svtools/inc/svimpbox.hxx
index 4bb8362e1b8d..ed1a7c7a37a0 100644
--- a/svtools/inc/svimpbox.hxx
+++ b/svtools/inc/svimpbox.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svimpbox.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: fs $ $Date: 2002-09-06 09:05:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,8 @@
 #ifndef _UNOTOOLS_INTLWRAPPER_HXX
 #include <unotools/intlwrapper.hxx>
 #endif
+// #97680# -----------------
+#include <vector>
 
 class SvTreeListBox;
 class Point;
@@ -184,6 +186,7 @@ private:
     ULONG               nCurUserEvent; //-1 == kein Userevent amn Laufen
     short               nHorSBarHeight, nVerSBarWidth;
     USHORT              nFlags;
+    USHORT              nCurTabPos;
 
     WinBits             nWinBits;
     BOOL                bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION
@@ -193,6 +196,7 @@ private:
     BOOL                bSubLstOpRet : 1;   // open/close sublist with return/enter, defaulted with FALSE
     BOOL                bSubLstOpLR : 1;    // open/close sublist with cursor left/right, defaulted with FALSE
     BOOL                bContextMenuHandling : 1;
+    BOOL                bIsCellFocusEnabled : 1;
 
     Point               aEditClickPos;
     Timer               aEditTimer;
@@ -200,6 +204,9 @@ private:
     // #102891# -------------------
     IntlWrapper *       pIntlWrapper;
 
+    // #97680# --------------------
+    std::vector< short > aContextBmpWidthVector;
+
     DECL_LINK( EditTimerCall, Timer * );
 
     DECL_LINK( BeginDragHdl, void* );
@@ -274,6 +281,13 @@ private:
     // #102891# -------------------
     void                UpdateIntlWrapper();
 
+    // #97680# --------------------
+    short               UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth );
+    void                UpdateContextBmpWidthMax( SvLBoxEntry* pEntry );
+    void                UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry );
+
+    void                CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect );
+
 public:
     SvImpLBox( SvTreeListBox* pView, SvLBoxTreeList*, WinBits nWinStyle );
     ~SvImpLBox();
@@ -379,6 +393,12 @@ public:
     void                CallEventListeners( ULONG nEvent, void* pData = NULL );
     void                AddEventListener( const Link& rEventListener );
     void                RemoveEventListener( const Link& rEventListener );
+
+    /** Enables, that one cell of a tablistbox entry can be focused */
+    inline BOOL         IsCellFocusEnabled() const { return bIsCellFocusEnabled; }
+    inline void         EnableCellFocus() { bIsCellFocusEnabled = TRUE; }
+    bool                SetCurrentTabPos( USHORT _nNewPos );
+    inline USHORT       GetCurrentTabPos() const { return nCurTabPos; }
 };
 
 inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType, BmpColorMode _eMode )
@@ -464,7 +484,6 @@ inline void SvImpLBox::PaintEntry( SvLBoxEntry* pEntry )
     pView->PaintEntry( pEntry, nY );
 }
 
-
 inline BOOL SvImpLBox::IsLineVisible( long nY ) const
 {
     BOOL bRet = TRUE;
@@ -478,7 +497,5 @@ inline void SvImpLBox::TreeInserted( SvLBoxEntry* pTree )
     EntryInserted( pTree );
 }
 
-
-#endif
-
+#endif // #ifndef _SVIMPLBOX_HXX
 
diff --git a/svtools/inc/templatefoldercache.hxx b/svtools/inc/templatefoldercache.hxx
index 1fc5dc67d5e8..49458635288b 100644
--- a/svtools/inc/templatefoldercache.hxx
+++ b/svtools/inc/templatefoldercache.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templatefoldercache.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-12-06 12:30:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -142,13 +142,3 @@ namespace svt
 
 #endif // SFX2_TEMPLATEFOLDERCACHE_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/11/07 14:27:58  fs
- *  initial checkin - helper class for caching the state of OOo's template folders
- *
- *
- *  Revision 1.0 07.11.01 12:38:24  fs
- ************************************************************************/
-
diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx
index 497df617f61e..5d5a91f50621 100644
--- a/svtools/inc/wallitem.hxx
+++ b/svtools/inc/wallitem.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wallitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mav $ $Date: 2002-11-06 13:53:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:36:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,58 +97,5 @@ public:
 };
 #endif  // _SFX_BRUSHITEMLINK_DECLARED
 
-////////////////////////////////////////////////////////////////////////////////
-/*
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 16:58:54  hr
-    initial import
-
-    Revision 1.15  2000/09/18 14:13:18  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.14  2000/08/31 13:41:16  willem.vandorp
-    Header and footer replaced
-
-    Revision 1.13  2000/03/22 11:47:48  kso
-    Removed: SmartUno leftovers.
-
-    Revision 1.12  2000/03/21 11:39:32  kso
-    Added: [Put|QueryValue( ... com::sun::star::uno::Any ... )
-
-    Revision 1.11  2000/02/09 16:16:37  hr
-    #70473# changes for unicode ( patched by automated patchtool )
-
-    Revision 1.10  1999/08/19 14:23:00  dv
-    no include cntwall.hxx needed
-
-    Revision 1.9  1999/08/18 23:33:43  hjs
-    includes
-
-    Revision 1.8  1999/08/18 09:17:45  dv
-    #66082# The WallpaperLoader is now constructed with a CntWallpaperItem
-
-    Revision 1.7  1999/06/25 09:02:25  dv
-    #63380# WallpaperLoader neu
-
-    Revision 1.6  1999/06/15 12:29:07  hjs
-    once again...
-
-    Revision 1.4  1998/08/13 15:17:28  DV
-    #52764# Put/Query Value neu
-
-      Rev 1.3   13 Aug 1998 17:17:28   DV
-   #52764# Put/Query Value neu
-
-      Rev 1.2   03 Jul 1998 09:42:08   OV
-   Impl.
-
-      Rev 1.1   01 Jul 1998 09:28:02   OV
-   Erweiterungen, Umstellungen
-
-      Rev 1.0   30 Jun 1998 10:50:56   OV
-   Neu: SfxWallpaperItem
-
-*/
-
 #endif // _WALLITEM_HXX
 
diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index ff458672b662..60270361c97f 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -1,4 +1,4 @@
-st	svtools	:	toolkit ucbhelper unotools jpeg NULL
+st	svtools	:	offuh toolkit ucbhelper unotools jpeg NULL
 st	svtools						usr1	-	all	st_mkout NULL
 st	svtools\inc					get	-	all	st_inc NULL
 st	svtools\inc\sane				get	-	all	st_incsa NULL
@@ -13,7 +13,7 @@ st	svtools\unx\inc					get	-	all	st_uinc NULL
 st	svtools\bmpmaker				nmake	-	all	st_bmp NULL
 st	svtools\source\cmdparse				nmake	-	all	st_cmdparse NULL
 st	svtools\source\memtools				nmake	-	all	st_mem NULL
-st	svtools\source\numbers				nmake	-	all	st_num NULL
+st	svtools\source\numbers				nmake	-	all	st_num st_edit NULL
 st	svtools\source\notify				nmake	-	all	st_not NULL
 st	svtools\source\sbx				nmake	-	all	st_sbx NULL
 st	svtools\source\config				nmake	-	all	st_conf NULL
@@ -25,7 +25,7 @@ st	svtools\mac\source\svdde			nmake	-	m	st_msdde NULL
 st	svtools\mac\source\misc				nmake	-	m	st_msc NULL
 st	svtools\source\control				nmake	-	all	st_ctl NULL
 st	svtools\source\filerec				nmake	-	all	st_file NULL
-st	svtools\source\filter.vcl\filter		nmake	-	all	st_vfilt NULL
+st	svtools\source\filter.vcl\filter		nmake	-	all	st_vfilt st_uno NULL
 st	svtools\source\filter.vcl\wmf			nmake	-	all	st_vwmf NULL
 st	svtools\source\filter.vcl\igif			nmake	-	all	st_vigif NULL
 st	svtools\source\filter.vcl\jpeg			nmake	-	all	st_vjpeg NULL
@@ -33,18 +33,18 @@ st	svtools\source\filter.vcl\ixbm			nmake	-	all	st_vixbm NULL
 st	svtools\source\filter.vcl\ixpm			nmake	-	all	st_vixpm NULL
 st	svtools\source\filter.vcl\ipng			nmake	-	all	st_vipng NULL
 st	svtools\source\brwbox				nmake	-	all	st__brw st_bmp NULL
-st      svtools\source\Accessibility                    nmake   -       all     st__access NULL
+st  svtools\source\Accessibility                    nmake   -       all     st__access NULL
 st	svtools\source\urlobj				nmake	-	all	st__url NULL
 st	svtools\source\misc				nmake	-	all	st__misc st_bmp NULL
 st	svtools\source\contnr				nmake	-	all	st__ctr NULL
 st	svtools\source\search				nmake	-	all	st__srch NULL
 st	svtools\source\svdde				nmake	-	all	st__dde NULL
-st	svtools\source\items				nmake	-	all	st__item NULL
+st	svtools\source\items				nmake	-	all	st__item st__misc NULL
 st	svtools\source\undo				nmake	-	all	st_undo NULL
 st	svtools\source\plugapp				nmake	-	all	st_papp NULL
 st	svtools\source\dialogs				nmake	-	all	st_dial NULL
-st	svtools\source\edit				nmake	-	all	st_edit NULL
-st	svtools\source\uno				nmake	-	all	st_uno NULL
+st	svtools\source\edit				nmake	-	all	st_edit st__item NULL
+st	svtools\source\uno				nmake	-	all	st_uno st_num NULL
 st	svtools\source\svrtf				nmake	-	all	st_rtf NULL
 st	svtools\source\svsql				nmake	-	all	st_sql NULL
 st	svtools\source\svhtml				nmake	-	all	st_html NULL
diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index 891222d6015c..6ddbf16afd50 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -27,9 +27,11 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\%__SRC%\bin\svt?????.sym %_DEST%\bin%_EXT%\svt?????.sym
 ..\%__SRC%\bin\svl?????.dll %_DEST%\bin%_EXT%\svl?????.dll
 ..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.*
+..\%__SRC%\bin\bmpsum.* %_DEST%\bin%_EXT%\bmpsum.*
 ..\%__SRC%\bin\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.*
 ..\%__SRC%\bin\g2g.* %_DEST%\bin%_EXT%\g2g.*
 ..\%__SRC%\bin\bmp %_DEST%\bin%_EXT%\bmp
+..\%__SRC%\bin\bmpsum %_DEST%\bin%_EXT%\bmpsum
 ..\%__SRC%\bin\bmpgui %_DEST%\bin%_EXT%\bmpgui
 ..\%__SRC%\bin\g2g %_DEST%\bin%_EXT%\g2g
 ..\%__SRC%\res\bmp.* %_DEST%\bin%_EXT%\bmp.*
@@ -40,6 +42,7 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\%__SRC%\misc\svtools.hid %_DEST%\bin%_EXT%\svtools.hid
 ..\%__SRC%\inc\svtools\proped.hxx %_DEST%\inc%_EXT%\svtools\proped.hxx
 
+hedabu: ..\inc\globalnameitem.hxx %_DEST%\inc%_EXT%\svtools\globalnameitem.hxx
 hedabu: ..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\svtools\imagemgr.hxx
 hedabu: ..\inc\imagemgr.hrc %_DEST%\inc%_EXT%\svtools\imagemgr.hrc
 hedabu: ..\inc\testtool.hxx %_DEST%\inc%_EXT%\svtools\testtool.hxx
@@ -178,7 +181,6 @@ hedabu: ..\inc\txtcmp.hxx %_DEST%\inc%_EXT%\svtools\txtcmp.hxx
 hedabu: ..\inc\urlbmk.hxx %_DEST%\inc%_EXT%\svtools\urlbmk.hxx
 hedabu: ..\inc\inetimg.hxx %_DEST%\inc%_EXT%\svtools\inetimg.hxx
 hedabu: ..\inc\svmedit.hxx %_DEST%\inc%_EXT%\svtools\svmedit.hxx
-hedabu: ..\inc\svmedit2.hxx %_DEST%\inc%_EXT%\svtools\svmedit2.hxx
 hedabu: ..\inc\svstdarr.hxx %_DEST%\inc%_EXT%\svtools\svstdarr.hxx
 hedabu: ..\inc\extattr.hxx %_DEST%\inc%_EXT%\svtools\extattr.hxx
 hedabu: ..\inc\metitem.hxx %_DEST%\inc%_EXT%\svtools\metitem.hxx
@@ -320,6 +322,7 @@ hedabu: ..\inc\cmdoptions.hxx %_DEST%\inc%_EXT%\svtools\cmdoptions.hxx
 hedabu: ..\inc\ctloptions.hxx %_DEST%\inc%_EXT%\svtools\ctloptions.hxx
 hedabu: ..\inc\languageoptions.hxx %_DEST%\inc%_EXT%\svtools\languageoptions.hxx
 hedabu: ..\inc\sourceviewconfig.hxx %_DEST%\inc%_EXT%\svtools\sourceviewconfig.hxx
+hedabu: ..\inc\colorcfg.hxx %_DEST%\inc%_EXT%\svtools\colorcfg.hxx
 
 hedabu: ..\inc\lngmisc.hxx %_DEST%\inc%_EXT%\svtools\lngmisc.hxx
 hedabu: ..\inc\lingucfg.hxx %_DEST%\inc%_EXT%\svtools\lingucfg.hxx
diff --git a/svtools/prj/svtools.xml b/svtools/prj/svtools.xml
index f1803b4ade21..4223ccf70d90 100644
--- a/svtools/prj/svtools.xml
+++ b/svtools/prj/svtools.xml
@@ -63,7 +63,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="final"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleTreeListBox</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleTreeListBox</supported-service>
     </component-description>
     <component-description>
         <author>Hans-Peter Burow</author>
@@ -72,7 +72,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="final"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleTreeListBoxEntry</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleTreeListBoxEntry</supported-service>
     </component-description>
     <component-description>
         <author>Hans-Peter Burow</author>
@@ -81,7 +81,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="final"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleIconChoiceControl</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleIconChoiceControl</supported-service>
     </component-description>
     <component-description>
         <author>Hans-Peter Burow</author>
@@ -90,7 +90,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="final"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleIconChoiceControlEntry</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleIconChoiceControlEntry</supported-service>
     </component-description>
     <component-description>
         <author>Thomas Benisch</author>
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 80e5d93ba3c0..35f0d18bcec3 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwbox1.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-03 10:55:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -859,11 +859,14 @@ void BrowseBox::RemoveColumn( USHORT nItemId )
     if ( nCurColId == nItemId )
         nCurColId = 0;
 
-    if ( nFirstCol >= nPos && nFirstCol > 0 )
-        --nFirstCol;
-
     // Spalte entfernen
     delete( pCols->Remove( (ULONG) nPos ));
+    // OJ #93534#
+    if ( nFirstCol >= nPos && nFirstCol > FrozenColCount() )
+    {
+        OSL_ENSURE(nFirstCol > 0,"FirstCol must be greater zero!");
+        --nFirstCol;
+    }
 
     // Handlecolumn nicht in der Headerbar
     if (nItemId)
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 339881eda005..c2cd3b5082a8 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ebbcontrols.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-15 07:36:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -290,8 +290,11 @@ namespace svt
             SetBackground();
         }
 
-        pBox = new TriStateBox(this);
-        pBox->SetSizePixel(CheckBox::GetCheckImage(pBox->GetSettings(), BUTTON_DRAW_CHECKED).GetSizePixel());
+        EnableChildTransparentMode();
+
+        pBox = new TriStateBox(this,WB_CENTER|WB_VCENTER);
+        pBox->EnableChildTransparentMode();
+        pBox->SetPaintTransparent( sal_True );
         pBox->SetClickHdl( LINK( this, CheckBoxControl, OnClick ) );
         pBox->Show();
     }
@@ -313,12 +316,21 @@ namespace svt
     void CheckBoxControl::Resize()
     {
         Control::Resize();
-        Rectangle aRect(Point(0,0) , GetSizePixel());
-        Size aCheckSize = pBox->GetSizePixel();
-        aFocusRect = aRect;
-        aRect.Left() += std::max(0L,(aRect.GetSize().Width() >> 1)  - (aCheckSize.Width() >> 1));
-        aRect.Top()  += std::max(0L,(aRect.GetSize().Height() >> 1) - (aCheckSize.Height() >> 1));
-        pBox->SetPosPixel(aRect.TopLeft());
+        pBox->SetPosSizePixel(Point(0,0),GetSizePixel());
+    }
+
+    //------------------------------------------------------------------------------
+    void CheckBoxControl::StateChanged( StateChangedType nStateChange )
+    {
+        Control::StateChanged(nStateChange);
+        if ( nStateChange == STATE_CHANGE_ZOOM )
+            pBox->SetZoom(GetZoom());
+    }
+
+    //------------------------------------------------------------------------------
+    void CheckBoxControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags )
+    {
+        pBox->Draw(pDev,rPos,rSize,nFlags);
     }
 
     //------------------------------------------------------------------------------
@@ -503,19 +515,4 @@ namespace svt
 }   // namespace svt
 // .......................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.3  2001/10/12 16:57:26  hr
- *  #92830#: required change: std::min()/std::max()
- *
- *  Revision 1.2  2001/09/28 12:57:51  hr
- *  #65293#: std::min/std::max
- *
- *  Revision 1.1  2001/06/15 12:49:36  fs
- *  initial checkin - moved this herein from svx/source/fmcomp/dbchk*
- *
- *
- *  Revision 1.0 15.06.01 14:09:52  fs
- ************************************************************************/
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 565b1007912b..ac445901d595 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editbrowsebox.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-15 07:35:52 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1448,57 +1448,3 @@ namespace svt
 }   // namespace svt
 // .......................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.15  2002/09/10 14:32:09  fs
- *  #102119# added optional smart tab traveling (focus first/last cell when getting the focus)
- *
- *  Revision 1.14  2002/08/08 11:43:35  oj
- *  #102008# only send a ACCESSIBLE_ACTIVE_DESCENDANT_EVENT event when we have the focus
- *
- *  Revision 1.13  2002/07/26 07:44:24  bm
- *  #101228# new browser flag EBBF_HANDLE_COLUMN_TEXT for displaying text in column
- *           0 in the handle column (like in the normal browse-box).
- *           EBBF_NOROWPICTURE => EBBF_NO_HANDLE_COLUMN_CONTENT to reduce confusion now
- *
- *  Revision 1.12  2002/06/21 14:04:32  oj
- *  #99812# new helper method used to know if accessible object was already created
- *
- *  Revision 1.11  2002/06/21 08:29:15  oj
- *  #99812# correct event notifications to make the browsebox accessible
- *
- *  Revision 1.10  2002/06/12 13:41:38  dr
- *  #99812# create an acc. cell before asking for it
- *
- *  Revision 1.9  2002/05/31 13:25:17  oj
- *  #99812# accessible adjustments
- *
- *  Revision 1.8  2002/04/30 15:27:44  fs
- *  #99048# corrected column selection
- *
- *  Revision 1.7  2002/04/29 14:25:33  oj
- *  #98772# enable new imagelist
- *
- *  Revision 1.6  2002/04/17 11:56:23  oj
- *  #98286# improve accessibility
- *
- *  Revision 1.5  2002/04/11 15:57:05  fs
- *  #98483# allow for row/column selection (event when currently editing)
- *
- *  Revision 1.4  2001/12/05 14:37:37  oj
- *  #95598# PaintTristate correct for parentupdate
- *
- *  Revision 1.3  2001/10/12 16:57:26  hr
- *  #92830#: required change: std::min()/std::max()
- *
- *  Revision 1.2  2001/09/28 13:00:28  hr
- *  #65293#: gcc-3.0.1. needs lvalue
- *
- *  Revision 1.1  2001/06/15 12:49:19  fs
- *  initial checkin - moved this herein from svx/source/fmcomp/dbbrowse*
- *
- *
- *  Revision 1.0 15.06.01 12:45:03  fs
- ************************************************************************/
-
diff --git a/svtools/source/brwbox/editbrowsebox.hrc b/svtools/source/brwbox/editbrowsebox.hrc
index 64eb7698f0d8..eac2414da576 100644
--- a/svtools/source/brwbox/editbrowsebox.hrc
+++ b/svtools/source/brwbox/editbrowsebox.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editbrowsebox.hrc,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-15 12:49:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,10 +73,3 @@
 
 #endif // _SVTOOLS_EDITBROWSEBOX_HRC_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 15.06.01 13:39:55  fs
- ************************************************************************/
-
diff --git a/svtools/source/config/cjkoptions.cxx b/svtools/source/config/cjkoptions.cxx
index 9605dd9726b6..f8bfefb83dcd 100644
--- a/svtools/source/config/cjkoptions.cxx
+++ b/svtools/source/config/cjkoptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cjkoptions.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dg $ $Date: 2001-09-26 15:41:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,6 +84,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
+#define CFG_READONLY_DEFAULT sal_False
 /* -----------------------------10.04.01 12:39--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -102,6 +103,16 @@ class SvtCJKOptions_Impl : public utl::ConfigItem
     sal_Bool        bEmphasisMarks;
     sal_Bool        bVerticalCallOut;
 
+    sal_Bool        bROCJKFont;
+    sal_Bool        bROVerticalText;
+    sal_Bool        bROAsianTypography;
+    sal_Bool        bROJapaneseFind;
+    sal_Bool        bRORuby;
+    sal_Bool        bROChangeCaseMap;
+    sal_Bool        bRODoubleLines;
+    sal_Bool        bROEmphasisMarks;
+    sal_Bool        bROVerticalCallOut;
+
 public:
     SvtCJKOptions_Impl();
     ~SvtCJKOptions_Impl();
@@ -126,6 +137,7 @@ public:
         return  bCJKFont||bVerticalText||bAsianTypography||bJapaneseFind||
                 bRuby||bChangeCaseMap||bDoubleLines||bEmphasisMarks||bVerticalCallOut;   }
     void    SetAll(sal_Bool bSet);
+    sal_Bool IsReadOnly(SvtCJKOptions::EOption eOption) const;
 };
 /*-- 10.04.01 12:41:57---------------------------------------------------
 
@@ -143,7 +155,16 @@ SvtCJKOptions_Impl::SvtCJKOptions_Impl() :
     bChangeCaseMap(sal_True),
     bDoubleLines(sal_True),
     bEmphasisMarks(sal_True),
-    bVerticalCallOut(sal_True)
+    bVerticalCallOut(sal_True),
+    bROCJKFont(CFG_READONLY_DEFAULT),
+    bROVerticalText(CFG_READONLY_DEFAULT),
+    bROAsianTypography(CFG_READONLY_DEFAULT),
+    bROJapaneseFind(CFG_READONLY_DEFAULT),
+    bRORuby(CFG_READONLY_DEFAULT),
+    bROChangeCaseMap(CFG_READONLY_DEFAULT),
+    bRODoubleLines(CFG_READONLY_DEFAULT),
+    bROEmphasisMarks(CFG_READONLY_DEFAULT),
+    bROVerticalCallOut(CFG_READONLY_DEFAULT)
 {
 }
 /*-- 10.04.01 12:41:57---------------------------------------------------
@@ -157,9 +178,32 @@ SvtCJKOptions_Impl::~SvtCJKOptions_Impl()
  ---------------------------------------------------------------------------*/
 void    SvtCJKOptions_Impl::SetAll(sal_Bool bSet)
 {
-    bCJKFont = bVerticalText = bAsianTypography = bJapaneseFind =
-            bRuby = bChangeCaseMap = bDoubleLines = bEmphasisMarks = bVerticalCallOut = bSet;
-    SetModified();
+    sal_Bool bModified = sal_False;
+
+    if (
+        !bROCJKFont          &&
+        !bROVerticalText     &&
+        !bROAsianTypography  &&
+        !bROJapaneseFind     &&
+        !bRORuby             &&
+        !bROChangeCaseMap    &&
+        !bRODoubleLines      &&
+        !bROEmphasisMarks    &&
+        !bROVerticalCallOut
+       )
+    {
+        bCJKFont=bSet;
+        bVerticalText=bSet;
+        bAsianTypography=bSet;
+        bJapaneseFind=bSet;
+        bRuby=bSet;
+        bChangeCaseMap=bSet;
+        bDoubleLines=bSet;
+        bEmphasisMarks=bSet;
+        bVerticalCallOut=bSet;
+
+        SetModified();
+    }
 }
 /*-- 10.04.01 12:41:56---------------------------------------------------
 
@@ -184,9 +228,12 @@ void SvtCJKOptions_Impl::Load()
         EnableNotification( aPropertyNames );
     }
     Sequence< Any > aValues = GetProperties(aPropertyNames);
+    Sequence< sal_Bool > aROStates = GetReadOnlyStates(aPropertyNames);
     const Any* pValues = aValues.getConstArray();
+    const sal_Bool* pROStates = aROStates.getConstArray();
     DBG_ASSERT( aValues.getLength() == aPropertyNames.getLength(), "GetProperties failed" );
-    if ( aValues.getLength() == aPropertyNames.getLength() )
+    DBG_ASSERT( aROStates.getLength() == aPropertyNames.getLength(), "GetReadOnlyStates failed" );
+    if ( aValues.getLength() == aPropertyNames.getLength() && aROStates.getLength() == aPropertyNames.getLength() )
     {
         for ( int nProp = 0; nProp < aPropertyNames.getLength(); nProp++ )
         {
@@ -195,15 +242,15 @@ void SvtCJKOptions_Impl::Load()
                 sal_Bool bValue = *(sal_Bool*)pValues[nProp].getValue();
                 switch ( nProp )
                 {
-                    case 0: bCJKFont = bValue; break;
-                    case 1: bVerticalText = bValue; break;
-                    case 2: bAsianTypography = bValue; break;
-                    case 3: bJapaneseFind = bValue; break;
-                    case 4: bRuby = bValue; break;
-                    case 5: bChangeCaseMap = bValue; break;
-                    case 6: bDoubleLines = bValue; break;
-                    case 7: bEmphasisMarks = bValue; break;
-                    case 8: bVerticalCallOut = bValue; break;
+                    case 0: { bCJKFont = bValue; bROCJKFont = pROStates[nProp]; } break;
+                    case 1: { bVerticalText = bValue; bROVerticalText = pROStates[nProp]; } break;
+                    case 2: { bAsianTypography = bValue; bROAsianTypography = pROStates[nProp]; } break;
+                    case 3: { bJapaneseFind = bValue; bROJapaneseFind = pROStates[nProp]; } break;
+                    case 4: { bRuby = bValue; bRORuby = pROStates[nProp]; } break;
+                    case 5: { bChangeCaseMap = bValue; bROChangeCaseMap = pROStates[nProp]; } break;
+                    case 6: { bDoubleLines = bValue; bRODoubleLines = pROStates[nProp]; } break;
+                    case 7: { bEmphasisMarks = bValue; bROEmphasisMarks = pROStates[nProp]; } break;
+                    case 8: { bVerticalCallOut = bValue; bROVerticalCallOut = pROStates[nProp]; } break;
                 }
             }
         }
@@ -222,30 +269,149 @@ void    SvtCJKOptions_Impl::Notify( const Sequence< OUString >& aPropertyNames )
   -----------------------------------------------------------------------*/
 void    SvtCJKOptions_Impl::Commit()
 {
-    OUString* pNames = aPropertyNames.getArray();
-    Sequence<Any> aValues(aPropertyNames.getLength());
+    OUString* pOrgNames = aPropertyNames.getArray();
+    sal_Int32 nOrgCount = aPropertyNames.getLength();
+
+    Sequence< OUString > aNames(nOrgCount);
+    Sequence< Any > aValues(nOrgCount);
+
+    OUString* pNames = aNames.getArray();
     Any* pValues = aValues.getArray();
+    sal_Int32 nRealCount = 0;
 
     const Type& rType = ::getBooleanCppuType();
-    BOOL bVal;
-    for(int nProp = 0; nProp < aPropertyNames.getLength(); nProp++)
+    for(int nProp = 0; nProp < nOrgCount; nProp++)
     {
         switch(nProp)
         {
-            case  0: bVal = bCJKFont; break;
-            case  1: bVal = bVerticalText; break;
-            case  2: bVal = bAsianTypography; break;
-            case  3: bVal = bJapaneseFind; break;
-            case  4: bVal = bRuby; break;
-            case  5: bVal = bChangeCaseMap; break;
-            case  6: bVal = bDoubleLines; break;
-            case  7: bVal = bEmphasisMarks; break;
-            case  8: bVal = bVerticalCallOut; break;
+            case  0:
+                {
+                    if (!bROCJKFont)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bCJKFont, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  1:
+                {
+                    if (!bROVerticalText)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bVerticalText, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  2:
+                {
+                    if (!bROAsianTypography)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bAsianTypography, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  3:
+                {
+                    if (!bROJapaneseFind)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bJapaneseFind, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  4:
+                {
+                    if (!bRORuby)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bRuby, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  5:
+                {
+                    if (!bROChangeCaseMap)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bChangeCaseMap, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  6:
+                {
+                    if (!bRODoubleLines)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bDoubleLines, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  7:
+                {
+                    if (!bROEmphasisMarks)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bEmphasisMarks, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
+
+            case  8:
+                {
+                    if (!bROVerticalCallOut)
+                    {
+                        pNames[nRealCount] = pOrgNames[nProp];
+                        pValues[nRealCount].setValue(&bVerticalCallOut, rType);
+                        ++nRealCount;
+                    }
+                }
+                break;
         }
-        pValues[nProp].setValue(&bVal, getBooleanCppuType());
     }
-    PutProperties(aPropertyNames, aValues);
+    aNames.realloc(nRealCount);
+    aValues.realloc(nRealCount);
+    PutProperties(aNames, aValues);
+}
+/*-- 13.02.2003 12:12---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+sal_Bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const
+{
+    sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+    switch(eOption)
+    {
+        case SvtCJKOptions::E_CJKFONT : bReadOnly = bROCJKFont; break;
+        case SvtCJKOptions::E_VERTICALTEXT : bReadOnly = bROVerticalText; break;
+        case SvtCJKOptions::E_ASIANTYPOGRAPHY : bReadOnly = bROAsianTypography; break;
+        case SvtCJKOptions::E_JAPANESEFIND : bReadOnly = bROJapaneseFind; break;
+        case SvtCJKOptions::E_RUBY : bReadOnly = bRORuby; break;
+        case SvtCJKOptions::E_CHANGECASEMAP : bReadOnly = bROChangeCaseMap; break;
+        case SvtCJKOptions::E_DOUBLELINES : bReadOnly = bRODoubleLines; break;
+        case SvtCJKOptions::E_EMPHASISMARKS : bReadOnly = bROEmphasisMarks; break;
+        case SvtCJKOptions::E_VERTICALCALLOUT : bReadOnly = bROVerticalCallOut; break;
+        case SvtCJKOptions::E_ALL : if (bROCJKFont || bROVerticalText || bROAsianTypography || bROJapaneseFind || bRORuby || bROChangeCaseMap || bRODoubleLines || bROEmphasisMarks || bROVerticalCallOut)
+                                        bReadOnly = sal_True;
+                                break;
+    }
+    return bReadOnly;
 }
+
 // global ----------------------------------------------------------------
 
 static SvtCJKOptions_Impl*  pCJKOptions = NULL;
@@ -346,6 +512,11 @@ sal_Bool    SvtCJKOptions::IsAnyEnabled() const
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
     return pCJKOptions->IsAnyEnabled();
 }
+/*-- 13.02.2003 12:11---------------------------------------------------
 
-
-
+  -----------------------------------------------------------------------*/
+sal_Bool    SvtCJKOptions::IsReadOnly(EOption eOption) const
+{
+    DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+    return pCJKOptions->IsReadOnly(eOption);
+}
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
new file mode 100644
index 000000000000..a16fb92ac86f
--- /dev/null
+++ b/svtools/source/config/colorcfg.cxx
@@ -0,0 +1,765 @@
+/*************************************************************************
+ *
+ *  $RCSfile: colorcfg.cxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:32 $
+ *
+ *  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): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#pragma hdrstop
+
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <colorcfg.hxx>
+#endif
+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
+#include <com/sun/star/uno/Any.hxx>
+#endif
+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
+#include <com/sun/star/uno/Sequence.hxx>
+#endif
+#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
+#include <com/sun/star/lang/Locale.hpp>
+#endif
+#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
+#include <com/sun/star/beans/PropertyValue.hpp>
+#endif
+#ifndef _TOOLS_COLOR_HXX
+#include <tools/color.hxx>
+#endif
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
+#ifndef _UTL_CONFIGITEM_HXX_
+#include <unotools/configitem.hxx>
+#endif
+#ifndef UNOTOOLS_CONFIGPATHES_HXX_INCLUDED
+#include <unotools/configpathes.hxx>
+#endif
+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
+#include <com/sun/star/uno/Sequence.h>
+#endif
+#ifndef _SFXPOOLITEM_HXX
+#include <poolitem.hxx> //Any2Bool
+#endif
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+#ifndef _SFXSMPLHINT_HXX
+#include <smplhint.hxx>
+#endif
+#ifndef _VOS_MUTEX_HXX_
+#include <vos/mutex.hxx>
+#endif
+
+ /* #100822# ----
+#ifndef _SV_WRKWIN_HXX
+#include <vcl/wrkwin.hxx>
+#endif
+ ------------- */
+#ifndef _SV_EVENT_HXX
+#include <vcl/event.hxx>
+#endif
+
+//-----------------------------------------------------------------------------
+using namespace utl;
+using namespace rtl;
+using namespace com::sun::star;
+
+namespace svtools
+{
+
+#define C2U(cChar) OUString::createFromAscii(cChar)
+static const sal_Char cColor[] = "/Color";
+static const sal_Char cColorSchemes[] = "ColorSchemes/";
+sal_Int32            nColorRefCount_Impl = 0;
+::osl::Mutex         aColorMutex_Impl;
+ColorConfig_Impl*    ColorConfig::m_pImpl = NULL;
+
+/* -----------------------------16.01.01 15:36--------------------------------
+ ---------------------------------------------------------------------------*/
+class ColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
+{
+    ColorConfigValue    m_aConfigValues[ColorConfigEntryCount];
+    sal_Bool            m_bEditMode;
+    rtl::OUString       m_sIsVisible;
+    rtl::OUString       m_sLoadedScheme;
+    static sal_Bool     m_bLockBroadcast;
+    static sal_Bool     m_bBroadcastWhenUnlocked;
+
+    uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme);
+public:
+    ColorConfig_Impl(sal_Bool bEditMode = sal_False);
+    virtual ~ColorConfig_Impl();
+
+    void                            Load(const rtl::OUString& rScheme);
+    void                            CommitCurrentSchemeName();
+    //changes the name of the current scheme but doesn't load it!
+    void                            SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;}
+    virtual void                    Commit();
+    virtual void                    Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
+
+    const ColorConfigValue&         GetColorConfigValue(ColorConfigEntry eValue)
+                                                            {return m_aConfigValues[eValue];}
+    void                            SetColorConfigValue(ColorConfigEntry eValue,
+                                                            const ColorConfigValue& rValue );
+
+    const rtl::OUString&            GetLoadedScheme() const {return m_sLoadedScheme;}
+
+    uno::Sequence< ::rtl::OUString> GetSchemeNames();
+
+    sal_Bool                        AddScheme(const rtl::OUString& rNode);
+    sal_Bool                        RemoveScheme(const rtl::OUString& rNode);
+    void                            SetModified(){ConfigItem::SetModified();}
+    void                            ClearModified(){ConfigItem::ClearModified();}
+    void                            SettingsChanged();
+
+    static void                     LockBroadcast();
+    static void                     UnlockBroadcast();
+
+    // #100822#
+    DECL_LINK( DataChangedEventListener, VclWindowEvent* );
+
+    void ImplUpdateApplicationSettings();
+};
+
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme)
+{
+    uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount);
+    OUString* pNames = aNames.getArray();
+    struct ColorConfigEntryData_Impl
+    {
+        const sal_Char* cName;
+        sal_Int32       nLength;
+        rtl_TextEncoding eEncoding;
+        sal_Bool bCanBeVisible;
+    };
+    static const ColorConfigEntryData_Impl cNames[] =
+    {
+        RTL_CONSTASCII_USTRINGPARAM("/DocColor")        ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/DocBoundaries")   ,sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/AppBackground")   ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/ObjectBoundaries"),sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/TableBoundaries") ,sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/FontColor")       ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/Links")           ,sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/LinksVisited")    ,sal_True,
+#if SUPD<658
+        RTL_CONSTASCII_USTRINGPARAM("/Anchor")          ,sal_False,
+#endif
+        RTL_CONSTASCII_USTRINGPARAM("/Spell")     ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterTextGrid")  ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterFieldShadings"),sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterIdxShadings")     ,sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterDirectCursor")    ,sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterNotesIndicator")    ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterScriptIndicator")    ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterSectionBoundaries")    ,sal_True,
+        RTL_CONSTASCII_USTRINGPARAM("/WriterPageBreaks")    ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/HTMLSGML")        ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/HTMLComment")     ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/HTMLKeyword")     ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/HTMLUnknown")     ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcGrid")        ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreak"), sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreakManual"), sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreakAutomatic"), sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcDetective")   ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcDetectiveError")   ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcReference")   ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/CalcNotesBackground") ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/DrawGrid")        ,sal_True,
+#if SUPD<664
+        RTL_CONSTASCII_USTRINGPARAM("/DrawDrawing")     ,sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/DrawFill")        ,sal_False,
+#endif
+        RTL_CONSTASCII_USTRINGPARAM("/BASICIdentifier"),  sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/BASICComment")   ,  sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/BASICNumber")    ,  sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/BASICString")    ,  sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/BASICOperator")  ,  sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/BASICKeyword")   ,  sal_False,
+        RTL_CONSTASCII_USTRINGPARAM("/BASICError"),  sal_False
+    };
+    int nIndex = 0;
+    OUString sColor = C2U(cColor);
+    OUString sBase(C2U(cColorSchemes));
+    sBase += utl::wrapConfigurationElementName(rScheme);
+    const int nCount = ColorConfigEntryCount;
+    for(sal_Int32 i = 0; i < 4 * nCount; i+= 4)
+    {
+        rtl::OUString sBaseName(sBase);
+        sal_Int32 nPos = i / 4;
+        sBaseName += OUString(cNames[nPos].cName, cNames[nPos].nLength, cNames[nPos].eEncoding);
+        pNames[nIndex] += sBaseName;
+        pNames[nIndex++] += sColor;
+        if(cNames[nPos].bCanBeVisible)
+        {
+            pNames[nIndex] += sBaseName;
+            pNames[nIndex++] += m_sIsVisible;
+        }
+    }
+    aNames.realloc(nIndex);
+    return aNames;
+}
+/* -----------------------------22.03.2002 14:37------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Bool ColorConfig_Impl::m_bLockBroadcast = sal_False;
+sal_Bool ColorConfig_Impl::m_bBroadcastWhenUnlocked = sal_False;
+ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
+    ConfigItem(C2U("Office.UI/ColorScheme")),
+    m_sIsVisible(C2U("/IsVisible")),
+    m_bEditMode(bEditMode)
+{
+    if(!m_bEditMode)
+    {
+        //try to register on the root node - if possible
+        uno::Sequence < ::rtl::OUString > aNames(1);
+        EnableNotification( aNames );
+    }
+    Load(::rtl::OUString());
+
+    ImplUpdateApplicationSettings();
+
+    // #100822#
+    ::Application::AddEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
+
+}
+/* -----------------------------25.03.2002 12:28------------------------------
+
+ ---------------------------------------------------------------------------*/
+ColorConfig_Impl::~ColorConfig_Impl()
+{
+    // #100822#
+    ::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
+}
+/* -----------------------------22.03.2002 14:38------------------------------
+
+ ---------------------------------------------------------------------------*/
+void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
+{
+    rtl::OUString sScheme(rScheme);
+    if(!sScheme.getLength())
+    {
+        //detect current scheme name
+        uno::Sequence < ::rtl::OUString > aCurrent(1);
+        aCurrent.getArray()[0] = C2U("CurrentColorScheme");
+        uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent );
+        aCurrentVal.getConstArray()[0] >>= sScheme;
+    }
+    m_sLoadedScheme = sScheme;
+    //
+    uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sScheme);
+    uno::Sequence< uno::Any > aColors = GetProperties( aColorNames );
+    const uno::Any* pColors = aColors.getConstArray();
+    const ::rtl::OUString* pColorNames = aColorNames.getConstArray();
+    sal_Int32 nIndex = 0;
+    for(int i = 0; i < 2 * ColorConfigEntryCount && aColors.getLength() > nIndex; i+= 2)
+    {
+        if(pColors[nIndex].hasValue())
+            pColors[nIndex] >>= m_aConfigValues[i / 2].nColor;
+        else
+            m_aConfigValues[i/2].nColor = COL_AUTO;
+        nIndex++;
+        if(nIndex >= aColors.getLength())
+            break;
+        //test for visibility property
+        if(pColorNames[nIndex].match(m_sIsVisible, pColorNames[nIndex].getLength() - m_sIsVisible.getLength()))
+             m_aConfigValues[i / 2].bIsVisible = Any2Bool(pColors[nIndex++]);
+    }
+}
+/* -----------------------------22.03.2002 14:38------------------------------
+
+ ---------------------------------------------------------------------------*/
+void    ColorConfig_Impl::Notify( const uno::Sequence<OUString>& rPropertyNames)
+{
+    //loading via notification always uses the default setting
+    Load(::rtl::OUString());
+
+    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+
+    if(m_bLockBroadcast)
+    {
+        m_bBroadcastWhenUnlocked = sal_True;
+        ImplUpdateApplicationSettings();
+    }
+    else
+        Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED));
+}
+/* -----------------------------22.03.2002 14:38------------------------------
+
+ ---------------------------------------------------------------------------*/
+void ColorConfig_Impl::Commit()
+{
+    uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(m_sLoadedScheme);
+    uno::Sequence < beans::PropertyValue > aPropValues(aColorNames.getLength());
+    beans::PropertyValue* pPropValues = aPropValues.getArray();
+    const ::rtl::OUString* pColorNames = aColorNames.getConstArray();
+    sal_Int32 nIndex = 0;
+    const uno::Type& rBoolType = ::getBooleanCppuType();
+    for(int i = 0; i < 2 * ColorConfigEntryCount && aColorNames.getLength() > nIndex; i+= 2)
+    {
+        pPropValues[nIndex].Name = pColorNames[nIndex];
+        //save automatic colors as void value
+        if(COL_AUTO != m_aConfigValues[i/2].nColor)
+            pPropValues[nIndex].Value <<= m_aConfigValues[i/2].nColor;
+
+        nIndex++;
+        if(nIndex >= aColorNames.getLength())
+            break;
+        //test for visibility property
+        if(pColorNames[nIndex].match(m_sIsVisible, pColorNames[nIndex].getLength() - m_sIsVisible.getLength()))
+        {
+             pPropValues[nIndex].Name = pColorNames[nIndex];
+             pPropValues[nIndex].Value.setValue(&m_aConfigValues[i/2].bIsVisible, rBoolType);
+             nIndex++;
+        }
+    }
+    rtl::OUString sNode(C2U("ColorSchemes"));
+    SetSetProperties(sNode, aPropValues);
+
+    CommitCurrentSchemeName();
+}
+/* -----------------11.12.2002 10:42-----------------
+ *
+ * --------------------------------------------------*/
+void ColorConfig_Impl::CommitCurrentSchemeName()
+{
+    //save current scheme name
+    uno::Sequence < ::rtl::OUString > aCurrent(1);
+    aCurrent.getArray()[0] = C2U("CurrentColorScheme");
+    uno::Sequence< uno::Any > aCurrentVal(1);
+    aCurrentVal.getArray()[0] <<= m_sLoadedScheme;
+    PutProperties(aCurrent, aCurrentVal);
+}
+/* -----------------------------25.03.2002 12:19------------------------------
+
+ ---------------------------------------------------------------------------*/
+void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorConfigValue& rValue )
+{
+    if(rValue != m_aConfigValues[eValue])
+    {
+        m_aConfigValues[eValue] = rValue;
+        SetModified();
+    }
+}
+/* -----------------------------25.03.2002 15:22------------------------------
+
+ ---------------------------------------------------------------------------*/
+uno::Sequence< ::rtl::OUString> ColorConfig_Impl::GetSchemeNames()
+{
+    return GetNodeNames(C2U("ColorSchemes"));
+}
+/* -----------------------------09.04.2002 17:19------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
+{
+    if(ConfigItem::AddNode(C2U("ColorSchemes"), rScheme))
+    {
+        m_sLoadedScheme = rScheme;
+        Commit();
+        return sal_True;
+    }
+    return sal_False;
+}
+/* -----------------------------09.04.2002 17:19------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
+{
+    uno::Sequence< rtl::OUString > aElements(1);
+    aElements.getArray()[0] = rScheme;
+    return ClearNodeElements(C2U("ColorSchemes"), aElements);
+}
+/* -----------------------------2002/06/20 13:03------------------------------
+
+ ---------------------------------------------------------------------------*/
+void ColorConfig_Impl::SettingsChanged()
+{
+    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+
+    Broadcast( SfxSimpleHint( SFX_HINT_COLORS_CHANGED ) );
+}
+/* -----------------11.12.2002 09:21-----------------
+ *
+ * --------------------------------------------------*/
+void ColorConfig_Impl::LockBroadcast()
+{
+    m_bLockBroadcast = sal_True;
+}
+/* -----------------11.12.2002 09:21-----------------
+ *
+ * --------------------------------------------------*/
+void ColorConfig_Impl::UnlockBroadcast()
+{
+    if(m_bBroadcastWhenUnlocked)
+    {
+
+        m_bBroadcastWhenUnlocked = sal_False;
+        if(ColorConfig::m_pImpl)
+        {
+            ColorConfig::m_pImpl->ImplUpdateApplicationSettings();
+            ColorConfig::m_pImpl->Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED));
+        }
+    }
+    m_bLockBroadcast = sal_False;
+}
+/* -----------------------------2002/08/16 12:07 -----------------------------
+   #100822#
+ --------------------------------------------------------------------------- */
+IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent )
+{
+    if ( pEvent->GetId() == VCLEVENT_APPLICATION_DATACHANGED )
+    {
+        DataChangedEvent* pData = (DataChangedEvent*)(pEvent->GetData());
+        if ( (pData->GetType() == DATACHANGED_SETTINGS) &&
+             (pData->GetFlags() & SETTINGS_STYLE) )
+        {
+            SettingsChanged();
+            return 1L;
+        } else
+            return 0L;
+    } else
+        return 0L;
+}
+
+// ---------------------------------------------------------------------------
+
+/** updates the font color in the vcl window settings */
+void ColorConfig_Impl::ImplUpdateApplicationSettings()
+{
+    Application* pApp = GetpApp();
+    if( pApp )
+    {
+        AllSettings aSettings = pApp->GetSettings();
+        StyleSettings aStyleSettings( aSettings.GetStyleSettings() );
+
+        ColorConfigValue aRet = GetColorConfigValue(svtools::FONTCOLOR);
+        if(COL_AUTO == aRet.nColor)
+            aRet.nColor = ColorConfig::GetDefaultColor(svtools::FONTCOLOR).GetColor();
+
+        Color aFontColor(aRet.nColor);
+
+        if( aStyleSettings.GetFontColor() != aFontColor )
+        {
+            aStyleSettings.SetFontColor( aFontColor );
+
+            aSettings.SetStyleSettings( aStyleSettings );
+            pApp->SetSettings( aSettings );
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+ColorConfig::ColorConfig()
+{
+    ::osl::MutexGuard aGuard( aColorMutex_Impl );
+    if ( !m_pImpl )
+        m_pImpl = new ColorConfig_Impl;
+    ++nColorRefCount_Impl;
+    StartListening( *m_pImpl);
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+ColorConfig::~ColorConfig()
+{
+    ::osl::MutexGuard aGuard( aColorMutex_Impl );
+    EndListening( *m_pImpl);
+    if(!--nColorRefCount_Impl)
+    {
+        delete m_pImpl;
+        m_pImpl = 0;
+    }
+}
+/* -----------------------------11.04.2002 11:49------------------------------
+
+ ---------------------------------------------------------------------------*/
+Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
+{
+    static const sal_Int32 aAutoColors[] =
+    {
+        0, // DOCCOLOR
+        0xc0c0c0, // DOCBOUNDARIES
+        0x808080, // APPBACKGROUND
+        0xc0c0c0, // OBJECTBOUNDARIES
+        0xc0c0c0, // TABLEBOUNDARIES
+        0, // FONTCOLOR
+        0xcc, // LINKS
+        0x80, // LINKSVISITED
+#if SUPD<658
+        0, // ANCHOR
+#endif
+        0xff0000, // SPELL
+        0xc0c0c0, // WRITERTEXTGRID
+        0xc0c0c0, // WRITERFIELDSHADIN
+        0xc0c0c0, // WRITERIDXSHADINGS
+        0, // WRITERDIRECTCURSOR
+        COL_YELLOW, //WRITERNOTESINDICATOR
+        COL_GREEN,  //WRITERSCRIPTINDICATOR
+        0xc0c0c0, //WRITERSECTIONBOUNDARIES
+        COL_BLUE, //WRITERPAGEBREAKS,
+        COL_LIGHTBLUE, // HTMLSGML
+        COL_LIGHTGREEN, // HTMLCOMMENT
+        COL_LIGHTRED, // HTMLKEYWORD
+        COL_GRAY, // HTMLUNKNOWN
+        COL_LIGHTGRAY, // CALCGRID
+        COL_BLUE, //CALCPAGEBREAK
+        0x2300dc, //CALCPAGEBREAKMANUAL
+        COL_GRAY, //CALCPAGEBREAKAUTOMATIC
+        COL_LIGHTBLUE, // CALCDETECTIVE
+        COL_LIGHTRED, // CALCDETECTIVEERROR
+        COL_LIGHTRED, // CALCREFERENCE
+        0xffffc0, // CALCNOTESBACKGROUND
+        0xc0c0c0, // DRAWGRID
+#if SUPD<664
+        0, // DRAWDRAWING
+        0xb8ff, // DRAWFILL
+#endif
+        COL_GREEN, // BASICIDENTIFIER,
+        COL_GRAY,// BASICCOMMENT   ,
+        COL_LIGHTRED,// BASICNUMBER    ,
+        COL_LIGHTRED,// BASICSTRING    ,
+        COL_BLUE, // BASICOPERATOR  ,
+        COL_BLUE, // BASICKEYWORD   ,
+        COL_RED //BASICERROR
+    };
+    Color aRet;
+    switch(eEntry)
+    {
+        case DOCCOLOR :
+            aRet = Application::GetSettings().GetStyleSettings().GetWindowColor();
+            break;
+
+        case APPBACKGROUND :
+            aRet = Application::GetSettings().GetStyleSettings().GetWorkspaceColor();
+            break;
+
+        case SPELL :
+#if SUPD<664
+        case DRAWDRAWING :
+#endif
+        {
+            const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+                aRet = rStyleSettings.GetHighContrastMode() ?
+                    rStyleSettings.GetDialogTextColor().GetColor() : aAutoColors[eEntry];
+        }
+        break;
+
+#if SUPD<664
+        case DRAWFILL            :
+                aRet = /*rStyleSettings.GetHighContrastMode() ?
+                    rStyleSettings.OutlineMode??? : */  aAutoColors[eEntry];
+        break;
+#endif
+
+        case FONTCOLOR :
+            aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
+            break;
+
+        default:
+            aRet = aAutoColors[eEntry];
+    }
+    return aRet;
+}
+/* -----------------------------11.04.2002 11:49------------------------------
+
+ ---------------------------------------------------------------------------*/
+ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart)const
+{
+    ColorConfigValue aRet = m_pImpl->GetColorConfigValue(eEntry);
+    if(bSmart)
+    {
+        if(COL_AUTO == aRet.nColor)
+            aRet.nColor = ColorConfig::GetDefaultColor(eEntry).GetColor();
+        //#103495# don't allow grey between 40% and 60% as application background
+        const UINT8 nRed = COLORDATA_RED( aRet.nColor);
+        if(eEntry == APPBACKGROUND &&
+                (nRed == COLORDATA_GREEN( aRet.nColor)) &&
+                    (nRed == COLORDATA_BLUE( aRet.nColor)) &&
+                nRed > 102 && nRed < 153 )
+        {
+            aRet.nColor = RGB_COLORDATA(153, 153, 153);
+        }
+    }
+
+    return aRet;
+}
+/* -----------------------------12.04.2002 09:25------------------------------
+
+ ---------------------------------------------------------------------------*/
+void ColorConfig::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+{
+    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+
+    Broadcast( rHint );
+}
+/* -----------------------------25.03.2002 12:01------------------------------
+
+ ---------------------------------------------------------------------------*/
+EditableColorConfig::EditableColorConfig() :
+    m_pImpl(new ColorConfig_Impl),
+    m_bModified(sal_False)
+{
+    m_pImpl->LockBroadcast();
+}
+/*-- 25.03.2002 12:03:08---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+EditableColorConfig::~EditableColorConfig()
+{
+    m_pImpl->UnlockBroadcast();
+    if(m_bModified)
+        m_pImpl->SetModified();
+    if(m_pImpl->IsModified())
+        m_pImpl->Commit();
+    delete m_pImpl;
+}
+
+/*-- 25.03.2002 12:03:15---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+uno::Sequence< ::rtl::OUString >  EditableColorConfig::GetSchemeNames() const
+{
+    return m_pImpl->GetSchemeNames();
+}
+/*-- 25.03.2002 12:03:16---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void EditableColorConfig::DeleteScheme(const ::rtl::OUString& rScheme )
+{
+    m_pImpl->RemoveScheme(rScheme);
+}
+/*-- 25.03.2002 12:03:16---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void EditableColorConfig::AddScheme(const ::rtl::OUString& rScheme )
+{
+    m_pImpl->AddScheme(rScheme);
+}
+/*-- 25.03.2002 12:03:16---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
+{
+    if(m_bModified)
+        m_pImpl->SetModified();
+    if(m_pImpl->IsModified())
+        m_pImpl->Commit();
+    m_bModified = sal_False;
+    m_pImpl->Load(rScheme);
+    //the name of the loaded scheme has to be committed separately
+    m_pImpl->CommitCurrentSchemeName();
+    return sal_True;
+}
+/*-- 25.03.2002 12:03:16---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+const ::rtl::OUString& EditableColorConfig::GetCurrentSchemeName()const
+{
+    return m_pImpl->GetLoadedScheme();
+}
+/* -----------------11.12.2002 10:56-----------------
+ *  changes the name of the current scheme but doesn't load it!
+ * --------------------------------------------------*/
+void EditableColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme)
+{
+    m_pImpl->SetCurrentSchemeName(rScheme);
+    m_pImpl->CommitCurrentSchemeName();
+}
+/*-- 25.03.2002 12:03:17---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+const ColorConfigValue& EditableColorConfig::GetColorValue(
+    ColorConfigEntry eEntry)const
+{
+    return m_pImpl->GetColorConfigValue(eEntry);
+}
+/*-- 25.03.2002 12:03:17---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void EditableColorConfig::SetColorValue(
+    ColorConfigEntry eEntry, const ColorConfigValue& rValue)
+{
+    m_pImpl->SetColorConfigValue(eEntry, rValue);
+    m_pImpl->ClearModified();
+    m_bModified = sal_True;
+}
+/* -----------------------------10.04.2002 13:22------------------------------
+
+ ---------------------------------------------------------------------------*/
+void EditableColorConfig::SetModified()
+{
+    m_bModified = sal_True;
+}
+/* -----------------15.10.2002 14:51-----------------
+ *
+ * --------------------------------------------------*/
+void EditableColorConfig::Commit()
+{
+    if(m_bModified)
+        m_pImpl->SetModified();
+    if(m_pImpl->IsModified())
+        m_pImpl->Commit();
+    m_bModified = sal_False;
+}
+
+}//namespace svtools
diff --git a/svtools/source/config/ctloptions.cxx b/svtools/source/config/ctloptions.cxx
index d6665bea9f12..073c7ce6786e 100644
--- a/svtools/source/config/ctloptions.cxx
+++ b/svtools/source/config/ctloptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ctloptions.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pb $ $Date: 2002-12-02 07:37:56 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,7 @@
 using namespace ::com::sun::star::uno;
 
 #define ASCII_STR(s)    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
+#define CFG_READONLY_DEFAULT    sal_False
 
 // SvtCJKOptions_Impl ----------------------------------------------------------
 
@@ -97,6 +98,11 @@ private:
     SvtCTLOptions::CursorMovement   m_eCTLCursorMovement;
     SvtCTLOptions::TextNumerals     m_eCTLTextNumerals;
 
+    sal_Bool                        m_bROCTLFontEnabled;
+    sal_Bool                        m_bROCTLSequenceChecking;
+    sal_Bool                        m_bROCTLCursorMovement;
+    sal_Bool                        m_bROCTLTextNumerals;
+
 public:
     SvtCTLOptions_Impl();
     ~SvtCTLOptions_Impl();
@@ -119,10 +125,25 @@ public:
     void            SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals );
     SvtCTLOptions::TextNumerals
                     GetCTLTextNumerals() const { return m_eCTLTextNumerals; }
+
+    sal_Bool        IsReadOnly(SvtCTLOptions::EOption eOption) const;
 };
 //------------------------------------------------------------------------------
 Sequence< rtl::OUString > SvtCTLOptions_Impl::m_aPropertyNames;
 //------------------------------------------------------------------------------
+sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
+{
+    sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+    switch(eOption)
+    {
+        case SvtCTLOptions::E_CTLFONT             : bReadOnly = m_bROCTLFontEnabled       ; break;
+        case SvtCTLOptions::E_CTLSEQUENCECHECKING : bReadOnly = m_bROCTLSequenceChecking  ; break;
+        case SvtCTLOptions::E_CTLCURSORMOVEMENT   : bReadOnly = m_bROCTLCursorMovement    ; break;
+        case SvtCTLOptions::E_CTLTEXTNUMERALS     : bReadOnly = m_bROCTLTextNumerals      ; break;
+    }
+    return bReadOnly;
+}
+//------------------------------------------------------------------------------
 SvtCTLOptions_Impl::SvtCTLOptions_Impl() :
 
     utl::ConfigItem( ASCII_STR("Office.Common/I18N/CTL") ),
@@ -131,8 +152,12 @@ SvtCTLOptions_Impl::SvtCTLOptions_Impl() :
     m_bCTLFontEnabled       ( sal_False ),
     m_bCTLSequenceChecking  ( sal_False ),
     m_eCTLCursorMovement    ( SvtCTLOptions::MOVEMENT_LOGICAL ),
-    m_eCTLTextNumerals      ( SvtCTLOptions::NUMERALS_ARABIC )
+    m_eCTLTextNumerals      ( SvtCTLOptions::NUMERALS_ARABIC ),
 
+    m_bROCTLFontEnabled     ( CFG_READONLY_DEFAULT ),
+    m_bROCTLSequenceChecking( CFG_READONLY_DEFAULT ),
+    m_bROCTLCursorMovement  ( CFG_READONLY_DEFAULT ),
+    m_bROCTLTextNumerals    ( CFG_READONLY_DEFAULT )
 {
 }
 //------------------------------------------------------------------------------
@@ -149,21 +174,70 @@ void SvtCTLOptions_Impl::Notify( const Sequence< rtl::OUString >& aPropertyNames
 // -----------------------------------------------------------------------------
 void SvtCTLOptions_Impl::Commit()
 {
-    rtl::OUString* pNames = m_aPropertyNames.getArray();
-    Sequence< Any > aValues( m_aPropertyNames.getLength() );
+    rtl::OUString* pOrgNames = m_aPropertyNames.getArray();
+    sal_Int32 nOrgCount = m_aPropertyNames.getLength();
+
+    Sequence< rtl::OUString > aNames( nOrgCount );
+    Sequence< Any > aValues( nOrgCount );
+
+    rtl::OUString* pNames = aNames.getArray();
     Any* pValues = aValues.getArray();
+    sal_Int32 nRealCount = 0;
+
     const Type& rType = ::getBooleanCppuType();
-    for ( int nProp = 0; nProp < m_aPropertyNames.getLength(); nProp++ )
+
+    for ( int nProp = 0; nProp < nOrgCount; nProp++ )
     {
         switch ( nProp )
         {
-            case  0: pValues[nProp].setValue( &m_bCTLFontEnabled, rType ); break;
-            case  1: pValues[nProp].setValue( &m_bCTLSequenceChecking, rType ); break;
-            case  2: pValues[nProp] <<= (sal_Int32)m_eCTLCursorMovement; break;
-            case  3: pValues[nProp] <<= (sal_Int32)m_eCTLTextNumerals; break;
+            case  0:
+            {
+                if (!m_bROCTLFontEnabled)
+                {
+                    pNames[nRealCount] = pOrgNames[nProp];
+                    pValues[nRealCount].setValue( &m_bCTLFontEnabled, rType );
+                    ++nRealCount;
+                }
+            }
+            break;
+
+            case  1:
+            {
+                if (!m_bROCTLSequenceChecking)
+                {
+                    pNames[nRealCount] = pOrgNames[nProp];
+                    pValues[nRealCount].setValue( &m_bCTLSequenceChecking, rType );
+                    ++nRealCount;
+                }
+            }
+            break;
+
+            case  2:
+            {
+                if (!m_bROCTLCursorMovement)
+                {
+                    pNames[nRealCount] = pOrgNames[nProp];
+                    pValues[nRealCount] <<= (sal_Int32)m_eCTLCursorMovement;
+                    ++nRealCount;
+                }
+            }
+            break;
+
+            case  3:
+            {
+                if (!m_bROCTLTextNumerals)
+                {
+                    pNames[nRealCount] = pOrgNames[nProp];
+                    pValues[nRealCount] <<= (sal_Int32)m_eCTLTextNumerals;
+                    ++nRealCount;
+                }
+            }
+            break;
         }
     }
-    PutProperties( m_aPropertyNames, aValues );
+    aNames.realloc(nRealCount);
+    aValues.realloc(nRealCount);
+    PutProperties( aNames, aValues );
 }
 // -----------------------------------------------------------------------------
 void SvtCTLOptions_Impl::Load()
@@ -179,9 +253,12 @@ void SvtCTLOptions_Impl::Load()
         EnableNotification( m_aPropertyNames );
     }
     Sequence< Any > aValues = GetProperties( m_aPropertyNames );
+    Sequence< sal_Bool > aROStates = GetReadOnlyStates( m_aPropertyNames );
     const Any* pValues = aValues.getConstArray();
+    const sal_Bool* pROStates = aROStates.getConstArray();
     DBG_ASSERT( aValues.getLength() == m_aPropertyNames.getLength(), "GetProperties failed" );
-    if ( aValues.getLength() == m_aPropertyNames.getLength() )
+    DBG_ASSERT( aROStates.getLength() == m_aPropertyNames.getLength(), "GetReadOnlyStates failed" );
+    if ( aValues.getLength() == m_aPropertyNames.getLength() && aROStates.getLength() == m_aPropertyNames.getLength() )
     {
         sal_Bool bValue = sal_False;
         sal_Int32 nValue = 0;
@@ -194,16 +271,16 @@ void SvtCTLOptions_Impl::Load()
                 {
                     switch ( nProp )
                     {
-                        case 0: m_bCTLFontEnabled = bValue; break;
-                        case 1: m_bCTLSequenceChecking = bValue;break;
+                        case 0: { m_bCTLFontEnabled = bValue; m_bROCTLFontEnabled = pROStates[nProp]; } break;
+                        case 1: { m_bCTLSequenceChecking = bValue; m_bROCTLSequenceChecking = pROStates[nProp]; } break;
                     }
                 }
                 else if ( pValues[nProp] >>= nValue )
                 {
                     switch ( nProp )
                     {
-                        case 2: m_eCTLCursorMovement = (SvtCTLOptions::CursorMovement)nValue; break;
-                        case 3: m_eCTLTextNumerals = (SvtCTLOptions::TextNumerals)nValue;break;
+                        case 2: { m_eCTLCursorMovement = (SvtCTLOptions::CursorMovement)nValue; m_bROCTLCursorMovement = pROStates[nProp]; } break;
+                        case 3: { m_eCTLTextNumerals = (SvtCTLOptions::TextNumerals)nValue; m_bROCTLTextNumerals = pROStates[nProp]; } break;
                     }
                 }
             }
@@ -214,7 +291,7 @@ void SvtCTLOptions_Impl::Load()
 //------------------------------------------------------------------------------
 void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
 {
-    if(m_bCTLFontEnabled != _bEnabled)
+    if(!m_bROCTLFontEnabled && m_bCTLFontEnabled != _bEnabled)
     {
         m_bCTLFontEnabled = _bEnabled;
         SetModified();
@@ -223,7 +300,7 @@ void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
 //------------------------------------------------------------------------------
 void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
 {
-    if(m_bCTLSequenceChecking != _bEnabled)
+    if(!m_bROCTLSequenceChecking && m_bCTLSequenceChecking != _bEnabled)
     {
         SetModified();
         m_bCTLSequenceChecking = _bEnabled;
@@ -232,7 +309,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
 //------------------------------------------------------------------------------
 void SvtCTLOptions_Impl::SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eMovement )
 {
-    if ( m_eCTLCursorMovement != _eMovement )
+    if (!m_bROCTLCursorMovement && m_eCTLCursorMovement != _eMovement )
     {
         SetModified();
         m_eCTLCursorMovement = _eMovement;
@@ -241,7 +318,7 @@ void SvtCTLOptions_Impl::SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eM
 //------------------------------------------------------------------------------
 void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals )
 {
-    if ( m_eCTLTextNumerals != _eNumerals )
+    if (!m_bROCTLTextNumerals && m_eCTLTextNumerals != _eNumerals )
     {
         SetModified();
         m_eCTLTextNumerals = _eNumerals;
@@ -326,3 +403,9 @@ SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() const
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->GetCTLTextNumerals();
 }
+// -----------------------------------------------------------------------------
+sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const
+{
+    DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
+    return pCTLOptions->IsReadOnly(eOption);
+}
diff --git a/svtools/source/config/javaoptions.cxx b/svtools/source/config/javaoptions.cxx
index 258326ed511c..c45cd285039a 100644
--- a/svtools/source/config/javaoptions.cxx
+++ b/svtools/source/config/javaoptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: javaoptions.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: os $ $Date: 2001-05-18 13:09:47 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,36 +75,60 @@ using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
+#define CFG_READONLY_DEFAULT    sal_False
 /* -----------------------------10.04.01 12:39--------------------------------
 
  ---------------------------------------------------------------------------*/
 class SvtExecAppletsItem_Impl : public utl::ConfigItem
 {
     sal_Bool  bExecute;
+    sal_Bool  bRO;
 public:
     SvtExecAppletsItem_Impl();
 
     virtual void    Commit();
 
     sal_Bool IsExecuteApplets() const {return bExecute;}
-    void     SetExecuteApplets(sal_Bool bSet) {bExecute = bSet;}
+    void     SetExecuteApplets(sal_Bool bSet);
+    sal_Bool IsReadOnly() const {return bRO;}
 };
+/* -----------------------------10.02.2003 07:46------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SvtExecAppletsItem_Impl::SetExecuteApplets(sal_Bool bSet)
+{
+    OSL_ENSURE(!bRO, "SvtExecAppletsItem_Impl::SetExecuteApplets()\nYou tried to write on a readonly value!\n");
+    if (!bRO)
+    {
+        bExecute = bSet;
+        SetModified();
+    }
+}
 /* -----------------------------18.05.01 14:44--------------------------------
 
  ---------------------------------------------------------------------------*/
 SvtExecAppletsItem_Impl::SvtExecAppletsItem_Impl() :
         utl::ConfigItem(C2U("Office.Common/Java/Applet")),
-        bExecute(sal_False)
+        bRO            (CFG_READONLY_DEFAULT            ),
+        bExecute       (sal_False                       )
 {
     Sequence< OUString > aNames(1);
     aNames.getArray()[0] = C2U("Enable");
     Sequence< Any > aValues = GetProperties(aNames);
+    Sequence< sal_Bool > aROStates = GetReadOnlyStates(aNames);
     const Any* pValues = aValues.getConstArray();
-    if(aValues.getLength() && pValues[0].hasValue())
+    const sal_Bool* pROStates = aROStates.getConstArray();
+    if(aValues.getLength() && aROStates.getLength() && pValues[0].hasValue())
+    {
         bExecute = *(sal_Bool*)pValues[0].getValue();
+        bRO = pROStates[0];
+    }
 }
 void    SvtExecAppletsItem_Impl::Commit()
 {
+    if (bRO)
+        return;
+
     Sequence< OUString > aNames(1);
     aNames.getArray()[0] = C2U("Enable");
     Sequence< Any > aValues(1);
@@ -122,10 +146,21 @@ struct SvtJavaOptions_Impl
     sal_Int32               nNetAccess;
     rtl::OUString           sUserClassPath;
 
+    sal_Bool                bROEnabled;
+    sal_Bool                bROSecurity;
+    sal_Bool                bRONetAccess;
+    sal_Bool                bROUserClassPath;
+    sal_Bool                bROExecuteApplets;
+
     SvtJavaOptions_Impl() :
-        bEnabled(sal_False),
-        bSecurity(sal_False),
-        nNetAccess(0),
+        bROEnabled          (CFG_READONLY_DEFAULT),
+        bROSecurity         (CFG_READONLY_DEFAULT),
+        bRONetAccess        (CFG_READONLY_DEFAULT),
+        bROUserClassPath    (CFG_READONLY_DEFAULT),
+        bROExecuteApplets   (CFG_READONLY_DEFAULT),
+        bEnabled            (sal_False),
+        bSecurity           (sal_False),
+        nNetAccess          (0),
         aPropertyNames(4)
         {
             OUString* pNames = aPropertyNames.getArray();
@@ -143,8 +178,10 @@ SvtJavaOptions::SvtJavaOptions() :
     pImpl(new SvtJavaOptions_Impl)
 {
     Sequence< Any > aValues = GetProperties(pImpl->aPropertyNames);
+    Sequence< sal_Bool > aROStates = GetReadOnlyStates(pImpl->aPropertyNames);
     const Any* pValues = aValues.getConstArray();
-    if ( aValues.getLength() == pImpl->aPropertyNames.getLength() )
+    const sal_Bool* pROStates = aROStates.getConstArray();
+    if ( aValues.getLength() == pImpl->aPropertyNames.getLength() && aROStates.getLength() == pImpl->aPropertyNames.getLength() )
     {
         for ( int nProp = 0; nProp < pImpl->aPropertyNames.getLength(); nProp++ )
         {
@@ -152,10 +189,30 @@ SvtJavaOptions::SvtJavaOptions() :
             {
                 switch ( nProp )
                 {
-                    case 0: pImpl->bEnabled = *(sal_Bool*)pValues[nProp].getValue(); break;
-                    case 1: pImpl->bSecurity = *(sal_Bool*)pValues[nProp].getValue(); break;
-                    case 2: pValues[nProp] >>= pImpl->nNetAccess; break;
-                    case 3: pValues[nProp] >>= pImpl->sUserClassPath; break;
+                    case 0:
+                    {
+                        pImpl->bEnabled = *(sal_Bool*)pValues[nProp].getValue();
+                        pImpl->bROEnabled = pROStates[nProp];
+                    }
+                    break;
+                    case 1:
+                    {
+                        pImpl->bSecurity = *(sal_Bool*)pValues[nProp].getValue();
+                        pImpl->bROSecurity = pROStates[nProp];
+                    }
+                    break;
+                    case 2:
+                    {
+                        pValues[nProp] >>= pImpl->nNetAccess;
+                        pImpl->bRONetAccess = pROStates[nProp];
+                    }
+                    break;
+                    case 3:
+                    {
+                        pValues[nProp] >>= pImpl->sUserClassPath;
+                        pImpl->bROUserClassPath = pROStates[nProp];
+                    }
+                    break;
                 }
             }
         }
@@ -174,22 +231,62 @@ SvtJavaOptions::~SvtJavaOptions()
 void    SvtJavaOptions::Commit()
 {
     pImpl->aExecItem.Commit();
-    OUString* pNames = pImpl->aPropertyNames.getArray();
-    Sequence<Any> aValues(pImpl->aPropertyNames.getLength());
-    Any* pValues = aValues.getArray();
+
+    sal_Int32 nOrgCount = pImpl->aPropertyNames.getLength();
+    Sequence< OUString > aNames(nOrgCount);
+    Sequence< Any > aValues(nOrgCount);
+    sal_Int32 nRealCount = 0;
 
     const Type& rType = ::getBooleanCppuType();
-    for(int nProp = 0; nProp < pImpl->aPropertyNames.getLength(); nProp++)
+    for(int nProp = 0; nProp < nOrgCount; nProp++)
     {
         switch(nProp)
         {
-            case  0: pValues[nProp].setValue(&pImpl->bEnabled, rType); break;
-            case  1: pValues[nProp].setValue(&pImpl->bSecurity, rType);break;
-            case  2: pValues[nProp] <<= pImpl->nNetAccess; break;
-            case  3: pValues[nProp] <<= pImpl->sUserClassPath; break;
+            case  0:
+            {
+                if (!pImpl->bROEnabled)
+                {
+                    aValues[nRealCount].setValue(&pImpl->bEnabled, rType);
+                    aNames[nRealCount] = pImpl->aPropertyNames[nProp];
+                    ++nRealCount;
+                }
+            }
+            break;
+            case  1:
+            {
+                if (!pImpl->bROSecurity)
+                {
+                    aValues[nRealCount].setValue(&pImpl->bSecurity, rType);
+                    aNames[nRealCount] = pImpl->aPropertyNames[nProp];
+                    ++nRealCount;
+                }
+            }
+            break;
+            case  2:
+            {
+                if (!pImpl->bRONetAccess)
+                {
+                    aValues[nRealCount] <<= pImpl->nNetAccess;
+                    aNames[nRealCount] = pImpl->aPropertyNames[nProp];
+                    ++nRealCount;
+                }
+            }
+            break;
+            case  3:
+            {
+                if (!pImpl->bROUserClassPath)
+                {
+                    aValues[nRealCount] <<= pImpl->sUserClassPath;
+                    aNames[nRealCount] = pImpl->aPropertyNames[nProp];
+                    ++nRealCount;
+                }
+            }
+            break;
         }
     }
-    PutProperties(pImpl->aPropertyNames, aValues);
+    aValues.realloc(nRealCount);
+    aNames.realloc(nRealCount);
+    PutProperties(aNames,aValues);
 }
 /*-- 18.05.01 13:28:35---------------------------------------------------
 
@@ -224,7 +321,8 @@ rtl::OUString&  SvtJavaOptions::GetUserClassPath()const
   -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetEnabled(sal_Bool bSet)
 {
-    if(pImpl->bEnabled != bSet)
+    OSL_ENSURE(!pImpl->bROEnabled, "SvtJavaOptions::SetEnabled()\nYou tried to write on a readonly value!\n");
+    if(!pImpl->bROEnabled && pImpl->bEnabled != bSet)
     {
         pImpl->bEnabled = bSet;
         SetModified();
@@ -235,7 +333,8 @@ void SvtJavaOptions::SetEnabled(sal_Bool bSet)
   -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetSecurity(sal_Bool bSet)
 {
-    if(pImpl->bSecurity != bSet)
+    OSL_ENSURE(!pImpl->bROSecurity, "SvtJavaOptions::SetSecurity()\nYou tried to write on a readonly value!\n");
+    if(!pImpl->bROSecurity && pImpl->bSecurity != bSet)
     {
         pImpl->bSecurity = bSet;
         SetModified();
@@ -246,7 +345,8 @@ void SvtJavaOptions::SetSecurity(sal_Bool bSet)
   -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetNetAccess(sal_Int32 nSet)
 {
-    if(pImpl->nNetAccess != nSet)
+    OSL_ENSURE(!pImpl->bRONetAccess, "SvtJavaOptions::SetNetAccess()\nYou tried to write on a readonly value!\n");
+    if(!pImpl->bRONetAccess && pImpl->nNetAccess != nSet)
     {
         pImpl->nNetAccess = nSet;
         SetModified();
@@ -257,7 +357,8 @@ void SvtJavaOptions::SetNetAccess(sal_Int32 nSet)
   -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetUserClassPath(const rtl::OUString& rSet)
 {
-    if(pImpl->sUserClassPath != rSet)
+    OSL_ENSURE(!pImpl->bROUserClassPath, "SvtJavaOptions::SetUserClassPath()\nYou tried to write on a readonly value!\n");
+    if(!pImpl->bROUserClassPath && pImpl->sUserClassPath != rSet)
     {
         pImpl->sUserClassPath = rSet;
         SetModified();
@@ -276,13 +377,35 @@ sal_Bool        SvtJavaOptions::IsExecuteApplets() const
   -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetExecuteApplets(sal_Bool bSet)
 {
-    if(pImpl->aExecItem.IsExecuteApplets() != bSet)
+    if(!pImpl->aExecItem.IsReadOnly() && pImpl->aExecItem.IsExecuteApplets() != bSet)
     {
         pImpl->aExecItem.SetExecuteApplets(bSet);
         SetModified();
     }
 }
+/*--10.02.2003 08:40---------------------------------------------------
 
-
-
-
+-----------------------------------------------------------------------*/
+sal_Bool SvtJavaOptions::IsReadOnly( EOption eOption ) const
+{
+    sal_Bool bRO = sal_True;
+    switch(eOption)
+    {
+        case E_ENABLED :
+            bRO = pImpl->bROEnabled;
+            break;
+        case E_SECURITY :
+            bRO = pImpl->bROSecurity;
+            break;
+        case E_NETACCESS :
+            bRO = pImpl->bRONetAccess;
+            break;
+        case E_USERCLASSPATH :
+            bRO = pImpl->bROUserClassPath;
+            break;
+        case E_EXECUTEAPPLETS :
+            bRO = pImpl->aExecItem.IsReadOnly();
+            break;
+    }
+    return bRO;
+}
diff --git a/svtools/source/config/languageoptions.cxx b/svtools/source/config/languageoptions.cxx
index ec258fdfd67b..6d9f7eae6013 100644
--- a/svtools/source/config/languageoptions.cxx
+++ b/svtools/source/config/languageoptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: languageoptions.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2002-08-14 11:02:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -177,4 +177,28 @@ sal_Bool SvtLanguageOptions::IsCTLSequenceChecking() const
 {
     return m_pCTLOptions->IsCTLSequenceChecking();
 }
-
+//------------------------------------------------------------------------------
+sal_Bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) const
+{
+    sal_Bool bReadOnly = sal_False;
+    switch(eOption)
+    {
+        // cjk options
+        case SvtLanguageOptions::E_CJKFONT          : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_CJKFONT        ); break;
+        case SvtLanguageOptions::E_VERTICALTEXT     : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_VERTICALTEXT   ); break;
+        case SvtLanguageOptions::E_ASIANTYPOGRAPHY  : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_ASIANTYPOGRAPHY); break;
+        case SvtLanguageOptions::E_JAPANESEFIND     : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_JAPANESEFIND   ); break;
+        case SvtLanguageOptions::E_RUBY             : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_RUBY           ); break;
+        case SvtLanguageOptions::E_CHANGECASEMAP    : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_CHANGECASEMAP  ); break;
+        case SvtLanguageOptions::E_DOUBLELINES      : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_DOUBLELINES    ); break;
+        case SvtLanguageOptions::E_EMPHASISMARKS    : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_EMPHASISMARKS  ); break;
+        case SvtLanguageOptions::E_VERTICALCALLOUT  : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_VERTICALCALLOUT); break;
+        case SvtLanguageOptions::E_ALLCJK           : bReadOnly = m_pCJKOptions->IsReadOnly(SvtCJKOptions::E_ALL            ); break;
+        // ctl options
+        case SvtLanguageOptions::E_CTLFONT              : bReadOnly = m_pCTLOptions->IsReadOnly(SvtCTLOptions::E_CTLFONT            ); break;
+        case SvtLanguageOptions::E_CTLSEQUENCECHECKING  : bReadOnly = m_pCTLOptions->IsReadOnly(SvtCTLOptions::E_CTLSEQUENCECHECKING); break;
+        case SvtLanguageOptions::E_CTLCURSORMOVEMENT    : bReadOnly = m_pCTLOptions->IsReadOnly(SvtCTLOptions::E_CTLCURSORMOVEMENT  ); break;
+        case SvtLanguageOptions::E_CTLTEXTNUMERALS      : bReadOnly = m_pCTLOptions->IsReadOnly(SvtCTLOptions::E_CTLTEXTNUMERALS    ); break;
+    }
+    return bReadOnly;
+}
diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk
index d84929c81a01..c9e24341c7d5 100644
--- a/svtools/source/config/makefile.mk
+++ b/svtools/source/config/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.38 $
+#   $Revision: 1.39 $
 #
-#   last change: $Author: os $ $Date: 2002-08-30 09:52:28 $
+#   last change: $Author: hr $ $Date: 2003-03-27 14:37:34 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -63,6 +63,7 @@ PRJ=..$/..
 
 PRJNAME=SVTOOLS
 TARGET=config
+TARGET1=heavyconfig
 
 # --- Settings -----------------------------------------------------
 
@@ -117,6 +118,13 @@ EXCEPTIONSFILES = \
     $(SLO)$/xmlaccelcfg.obj			\
     $(SLO)$/pathoptions.obj
 
+# --- heavyconfig.lib Files --------------------------------------------------------
+
+LIB1TARGET= $(SLB)$/$(TARGET1).lib
+
+LIB1OBJFILES=  \
+        $(SLO)$/colorcfg.obj
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svtools/source/config/pathoptions.cxx b/svtools/source/config/pathoptions.cxx
index 064c74659be6..26690ac74327 100644
--- a/svtools/source/config/pathoptions.cxx
+++ b/svtools/source/config/pathoptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pathoptions.cxx,v $
  *
- *  $Revision: 1.61 $
+ *  $Revision: 1.62 $
  *
- *  last change: $Author: os $ $Date: 2002-12-05 14:50:36 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -390,7 +390,9 @@ BOOL SvtPathOptions_Impl::IsPathReadonly(SvtPathOptions::Pathes ePath)const
         if(xPrSet.is())
         {
             Reference<XPropertySetInfo> xInfo = xPrSet->getPropertySetInfo();
-            Property aProperty = xInfo->getPropertyByName(OUString::createFromAscii(aPropNames[ePath].pPropName));
+            const char* pA = aPropNames[ePath].pPropName;
+            ::rtl::OUString sU = OUString::createFromAscii(pA);
+            Property aProperty = xInfo->getPropertyByName(sU);
             bReadonly = 0 != (aProperty.Attributes & PropertyAttribute::READONLY);
         }
     }
@@ -433,7 +435,7 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Pathes ePath, const String& r
         {
             m_xPathSettings->setFastPropertyValue( m_aMapEnumToPropHandle[ (sal_Int32)ePath], a );
         }
-        catch ( IllegalArgumentException& )
+        catch (const Exception&)
         {
         }
     }
diff --git a/svtools/source/config/saveopt.cxx b/svtools/source/config/saveopt.cxx
index b732d53bde69..59a91c42bbd1 100644
--- a/svtools/source/config/saveopt.cxx
+++ b/svtools/source/config/saveopt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: saveopt.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-19 10:22:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,6 +84,8 @@ using namespace com::sun::star::uno;
 class SvtSaveOptions_Impl;
 class SvtLoadOptions_Impl;
 
+#define CFG_READONLY_DEFAULT    sal_False
+
 struct SvtLoadSaveOptions_Impl
 {
     SvtSaveOptions_Impl* pSaveOpt;
@@ -109,6 +111,21 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
                                         bSaveRelFSys,
                                         bSaveUnpacked,
                                         bDoPrettyPrinting;
+
+    sal_Bool                            bROAutoSaveTime,
+                                        bROSaveGraphics,
+                                        bROUseUserData,
+                                        bROBackup,
+                                        bROAutoSave,
+                                        bROAutoSavePrompt,
+                                        bRODocInfSave,
+                                        bROSaveWorkingSet,
+                                        bROSaveDocWins,
+                                        bROSaveDocView,
+                                        bROSaveRelINet,
+                                        bROSaveRelFSys,
+                                        bROSaveUnpacked,
+                                        bRODoPrettyPrinting;
 public:
                             SvtSaveOptions_Impl();
                             ~SvtSaveOptions_Impl();
@@ -116,37 +133,216 @@ public:
     virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     virtual void            Commit();
 
-    void                    SetAutoSaveTime( sal_Int32 n )      { nAutoSaveTime = n; SetModified();  }
     sal_Int32               GetAutoSaveTime() const             { return nAutoSaveTime; }
-    void                    SetUseUserData( BOOL b )            { bUseUserData = b; SetModified();}
     BOOL                    IsUseUserData() const               { return bUseUserData; }
-    void                    SetBackup( BOOL b )                 { bBackup = b; SetModified();}
     BOOL                    IsBackup() const                    { return bBackup; }
-    void                    SetAutoSave( BOOL b )               { bAutoSave = b; SetModified();    }
     BOOL                    IsAutoSave() const                  { return bAutoSave; }
-    void                    SetAutoSavePrompt( BOOL b )         { bAutoSavePrompt = b; SetModified();  }
     BOOL                    IsAutoSavePrompt() const            { return bAutoSavePrompt; }
-    void                    SetDocInfoSave(BOOL b)              { bDocInfSave = b; SetModified(); }
     BOOL                    IsDocInfoSave() const               { return bDocInfSave; }
-    void                    SetSaveGraphicsMode( SvtSaveOptions::SaveGraphicsMode eMode )   { eSaveGraphics = eMode; SetModified(); }
     SvtSaveOptions::SaveGraphicsMode        GetSaveGraphicsMode() const         { return eSaveGraphics; }
-    void                    SetSaveWorkingSet( BOOL b )         { bSaveWorkingSet = b; SetModified();}
     BOOL                    IsSaveWorkingSet() const            { return bSaveWorkingSet;         }
-    void                    SetSaveDocWins( BOOL b )            { bSaveDocWins = b; SetModified();}
     BOOL                    IsSaveDocWins() const               { return bSaveDocWins; }
-    void                    SetSaveDocView( BOOL b )            { bSaveDocView = b; SetModified();}
     BOOL                    IsSaveDocView() const               { return bSaveDocView; }
-    void                    SetSaveRelINet( BOOL b )            { bSaveRelINet = b; SetModified();}
     BOOL                    IsSaveRelINet() const               { return bSaveRelINet; }
-    void                    SetSaveRelFSys( BOOL b )            { bSaveRelFSys = b; SetModified();}
     BOOL                    IsSaveRelFSys() const               { return bSaveRelFSys; }
-    void                    SetSaveUnpacked( BOOL b )           { bSaveUnpacked = b; SetModified();}
     BOOL                    IsSaveUnpacked() const              { return bSaveUnpacked; }
-
-    void                    EnablePrettyPrinting( sal_Bool _bDoPP ) { bDoPrettyPrinting = _bDoPP; SetModified(); }
-    sal_Bool                IsPrettyPrintingEnabled( ) const        { return bDoPrettyPrinting; }
+    sal_Bool                IsPrettyPrintingEnabled( ) const    { return bDoPrettyPrinting; }
+
+    void                    SetAutoSaveTime( sal_Int32 n );
+    void                    SetUseUserData( BOOL b );
+    void                    SetBackup( BOOL b );
+    void                    SetAutoSave( BOOL b );
+    void                    SetAutoSavePrompt( BOOL b );
+    void                    SetDocInfoSave( BOOL b );
+    void                    SetSaveGraphicsMode( SvtSaveOptions::SaveGraphicsMode eMode );
+    void                    SetSaveWorkingSet( BOOL b );
+    void                    SetSaveDocWins( BOOL b );
+    void                    SetSaveDocView( BOOL b );
+    void                    SetSaveRelINet( BOOL b );
+    void                    SetSaveRelFSys( BOOL b );
+    void                    SetSaveUnpacked( BOOL b );
+    void                    EnablePrettyPrinting( sal_Bool _bDoPP );
+
+    sal_Bool                IsReadOnly( SvtSaveOptions::EOption eOption ) const;
 };
 
+void SvtSaveOptions_Impl::SetAutoSaveTime( sal_Int32 n )
+{
+    if (!bROAutoSaveTime && nAutoSaveTime!=n)
+    {
+        nAutoSaveTime = n;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetUseUserData( BOOL b )
+{
+    if (!bROUseUserData && bUseUserData!=b)
+    {
+        bUseUserData = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetBackup( BOOL b )
+{
+    if (!bROBackup && bBackup!=b)
+    {
+        bBackup = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetAutoSave( BOOL b )
+{
+    if (!bROAutoSave && bAutoSave!=b)
+    {
+        bAutoSave = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetAutoSavePrompt( BOOL b )
+{
+    if (!bROAutoSavePrompt && bAutoSavePrompt!=b)
+    {
+        bAutoSavePrompt = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetDocInfoSave(BOOL b)
+{
+    if (!bRODocInfSave && bDocInfSave!=b)
+    {
+        bDocInfSave = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetSaveGraphicsMode( SvtSaveOptions::SaveGraphicsMode eMode )
+{
+    if (!bROSaveGraphics && eSaveGraphics!=eMode)
+    {
+        eSaveGraphics = eMode;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetSaveWorkingSet( BOOL b )
+{
+    if (!bROSaveWorkingSet && bSaveWorkingSet!=b)
+    {
+        bSaveWorkingSet = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetSaveDocWins( BOOL b )
+{
+    if (!bROSaveDocWins && bSaveDocWins!=b)
+    {
+        bSaveDocWins = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetSaveDocView( BOOL b )
+{
+    if (!bROSaveDocView && bSaveDocView!=b)
+    {
+        bSaveDocView = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetSaveRelINet( BOOL b )
+{
+    if (!bROSaveRelINet && bSaveRelINet!=b)
+    {
+        bSaveRelINet = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetSaveRelFSys( BOOL b )
+{
+    if (!bROSaveRelFSys && bSaveRelFSys!=b)
+    {
+        bSaveRelFSys = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetSaveUnpacked( BOOL b )
+{
+    if (!bROSaveUnpacked && bSaveUnpacked!=b)
+    {
+        bSaveUnpacked = b;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::EnablePrettyPrinting( sal_Bool _bDoPP )
+{
+    if (!bRODoPrettyPrinting && bDoPrettyPrinting!=_bDoPP)
+    {
+        bDoPrettyPrinting = _bDoPP;
+        SetModified();
+    }
+}
+
+sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
+{
+    sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+    switch(eOption)
+    {
+        case SvtSaveOptions::E_AUTOSAVETIME :
+            bReadOnly = bROAutoSaveTime;
+            break;
+        case SvtSaveOptions::E_SAVEGRAPHICS :
+            bReadOnly = bROSaveGraphics;
+            break;
+        case SvtSaveOptions::E_USEUSERDATA :
+            bReadOnly = bROUseUserData;
+            break;
+        case SvtSaveOptions::E_BACKUP :
+            bReadOnly = bROBackup;
+            break;
+        case SvtSaveOptions::E_AUTOSAVE :
+            bReadOnly = bROAutoSave;
+            break;
+        case SvtSaveOptions::E_AUTOSAVEPROMPT :
+            bReadOnly = bROAutoSavePrompt;
+            break;
+        case SvtSaveOptions::E_DOCINFSAVE :
+            bReadOnly = bRODocInfSave;
+            break;
+        case SvtSaveOptions::E_SAVEWORKINGSET :
+            bReadOnly = bROSaveWorkingSet;
+            break;
+        case SvtSaveOptions::E_SAVEDOCWINS :
+            bReadOnly = bROSaveDocWins;
+            break;
+        case SvtSaveOptions::E_SAVEDOCVIEW :
+            bReadOnly = bROSaveDocView;
+            break;
+        case SvtSaveOptions::E_SAVERELINET :
+            bReadOnly = bROSaveRelINet;
+            break;
+        case SvtSaveOptions::E_SAVERELFSYS :
+            bReadOnly = bROSaveRelFSys;
+            break;
+        case SvtSaveOptions::E_SAVEUNPACKED :
+            bReadOnly = bROSaveUnpacked;
+            break;
+        case SvtSaveOptions::E_DOPRETTYPRINTING :
+            bReadOnly = bRODoPrettyPrinting;
+            break;
+    }
+    return bReadOnly;
+}
+
 #define FORMAT           0
 #define TIMEINTERVALL    1
 #define USEUSERDATA      2
@@ -209,13 +405,30 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     , bSaveRelFSys( sal_False )
     , bSaveUnpacked( sal_False )
     , bDoPrettyPrinting( sal_False )
+    , bROAutoSaveTime( CFG_READONLY_DEFAULT )
+    , bROSaveGraphics( CFG_READONLY_DEFAULT )
+    , bROUseUserData( CFG_READONLY_DEFAULT )
+    , bROBackup( CFG_READONLY_DEFAULT )
+    , bROAutoSave( CFG_READONLY_DEFAULT )
+    , bROAutoSavePrompt( CFG_READONLY_DEFAULT )
+    , bRODocInfSave( CFG_READONLY_DEFAULT )
+    , bROSaveWorkingSet( CFG_READONLY_DEFAULT )
+    , bROSaveDocWins( CFG_READONLY_DEFAULT )
+    , bROSaveDocView( CFG_READONLY_DEFAULT )
+    , bROSaveRelINet( CFG_READONLY_DEFAULT )
+    , bROSaveRelFSys( CFG_READONLY_DEFAULT )
+    , bROSaveUnpacked( CFG_READONLY_DEFAULT )
+    , bRODoPrettyPrinting( CFG_READONLY_DEFAULT )
 {
     Sequence< OUString > aNames = GetPropertyNames();
     Sequence< Any > aValues = GetProperties( aNames );
+    Sequence< sal_Bool > aROStates = GetReadOnlyStates( aNames );
     EnableNotification( aNames );
     const Any* pValues = aValues.getConstArray();
+    const sal_Bool* pROStates = aROStates.getConstArray();
     DBG_ASSERT( aValues.getLength() == aNames.getLength(), "GetProperties failed" );
-    if ( aValues.getLength() == aNames.getLength() )
+    DBG_ASSERT( aROStates.getLength() == aNames.getLength(), "GetReadOnlyStates failed" );
+    if ( aValues.getLength() == aNames.getLength() && aROStates.getLength() == aNames.getLength() )
     {
         for ( int nProp = 0; nProp < aNames.getLength(); nProp++ )
         {
@@ -230,6 +443,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
                             nAutoSaveTime = nTemp;
                         else
                             DBG_ERROR( "Wrong Type!" );
+                        bROAutoSaveTime = pROStates[nProp];
                         break;
 
                     case FORMAT :
@@ -237,6 +451,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
                             eSaveGraphics = (SvtSaveOptions::SaveGraphicsMode) nTemp;
                         else
                             DBG_ERROR( "Wrong Type!" );
+                        bROSaveGraphics = pROStates[nProp];
                         break;
 
                     default:
@@ -248,40 +463,52 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
                             {
                                 case USEUSERDATA :
                                     bUseUserData = bTemp;
+                                    bROUseUserData = pROStates[nProp];
                                     break;
                                 case CREATEBACKUP :
                                     bBackup = bTemp;
+                                    bROBackup = pROStates[nProp];
                                     break;
                                 case AUTOSAVE :
                                     bAutoSave = bTemp;
+                                    bROAutoSave = pROStates[nProp];
                                     break;
                                 case PROMPT :
                                     bAutoSavePrompt = bTemp;
+                                    bROAutoSavePrompt = pROStates[nProp];
                                     break;
                                 case EDITPROPERTY :
                                     bDocInfSave = bTemp;
+                                    bRODocInfSave = pROStates[nProp];
                                     break;
                                 case SAVEWORKINGSET :
                                     bSaveWorkingSet = bTemp;
+                                    bROSaveWorkingSet = pROStates[nProp];
                                     break;
                                 case SAVEDOCWINS :
                                     bSaveDocWins = bTemp;
+                                    bROSaveDocWins = pROStates[nProp];
                                     break;
                                 case SAVEVIEWINFO :
                                     bSaveDocView = bTemp;
+                                    bROSaveDocView = pROStates[nProp];
                                     break;
                                 case FILESYSTEM :
                                     bSaveRelFSys = bTemp;
+                                    bROSaveRelFSys = pROStates[nProp];
                                     break;
                                 case INTERNET :
                                     bSaveRelINet = bTemp;
+                                    bROSaveRelINet = pROStates[nProp];
                                     break;
                                 case UNPACKED :
                                     bSaveUnpacked = bTemp;
+                                    bROSaveUnpacked = pROStates[nProp];
                                     break;
 
                                 case PRETTYPRINTING:
                                     bDoPrettyPrinting = bTemp;
+                                    bRODoPrettyPrinting = pROStates[nProp];
                                     break;
 
                                 default :
@@ -303,60 +530,131 @@ SvtSaveOptions_Impl::~SvtSaveOptions_Impl()
 
 void SvtSaveOptions_Impl::Commit()
 {
-    Sequence< OUString > aNames = GetPropertyNames();
-    OUString* pNames = aNames.getArray();
+    Sequence< OUString > aOrgNames = GetPropertyNames();
+    OUString* pOrgNames = aOrgNames.getArray();
+    sal_Int32 nOrgCount = aOrgNames.getLength();
 
-    Sequence< Any > aValues( aNames.getLength() );
-    Any* pValues    =               aValues.getArray();
-    Any* pValuesEnd = pValues   +   aValues.getLength();
+    Sequence< OUString > aNames( nOrgCount );
+    Sequence< Any > aValues( nOrgCount );
+    OUString* pNames = aNames.getArray();
+    Any* pValues = aValues.getArray();
+    sal_Int32 nRealCount = 0;
 
-    sal_Int32 nWhich = 0;
-    for ( ; pValues < pValuesEnd; ++pValues, ++nWhich )
+    for (sal_Int32 i=0; i<nOrgCount; ++i)
     {
-        switch ( nWhich )
+        switch (i)
         {
             case TIMEINTERVALL :
-                *pValues <<= nAutoSaveTime;
+                if (!bROAutoSaveTime)
+                {
+                    pValues[nRealCount] <<= nAutoSaveTime;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case FORMAT :
-                *pValues <<= (sal_Int16 ) eSaveGraphics;
+                if (!bROSaveGraphics)
+                {
+                    pValues[nRealCount] <<= (sal_Int16)eSaveGraphics;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case USEUSERDATA :
-                *pValues <<= bUseUserData;
+                if (!bROUseUserData)
+                {
+                    pValues[nRealCount] <<= bUseUserData;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case CREATEBACKUP :
-                *pValues <<= bBackup;
+                if (!bROBackup)
+                {
+                    pValues[nRealCount] <<= bBackup;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case AUTOSAVE :
-                *pValues <<= bAutoSave;
+                if (!bROAutoSave)
+                {
+                    pValues[nRealCount] <<= bAutoSave;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case PROMPT :
-                *pValues <<= bAutoSavePrompt;
+                if (!bROAutoSavePrompt)
+                {
+                    pValues[nRealCount] <<= bAutoSavePrompt;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case EDITPROPERTY :
-                *pValues <<= bDocInfSave;
+                if (!bRODocInfSave)
+                {
+                    pValues[nRealCount] <<= bDocInfSave;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case SAVEWORKINGSET :
-                *pValues <<= bSaveWorkingSet;
+                if (!bROSaveWorkingSet)
+                {
+                    pValues[nRealCount] <<= bSaveWorkingSet;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case SAVEDOCWINS :
-                *pValues <<= bSaveDocWins;
+                if (!bROSaveDocWins)
+                {
+                    pValues[nRealCount] <<= bSaveDocWins;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case SAVEVIEWINFO :
-                *pValues <<= bSaveDocView;
+                if (!bROSaveDocView)
+                {
+                    pValues[nRealCount] <<= bSaveDocView;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case FILESYSTEM :
-                *pValues <<= bSaveRelFSys;
+                if (!bROSaveRelFSys)
+                {
+                    pValues[nRealCount] <<= bSaveRelFSys;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case INTERNET :
-                *pValues <<= bSaveRelINet;
+                if (!bROSaveRelINet)
+                {
+                    pValues[nRealCount] <<= bSaveRelINet;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
             case UNPACKED :
-                *pValues <<= bSaveUnpacked;
+                if (!bROSaveUnpacked)
+                {
+                    pValues[nRealCount] <<= bSaveUnpacked;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
-
             case PRETTYPRINTING:
-                *pValues <<= bDoPrettyPrinting;
+                if (!bRODoPrettyPrinting)
+                {
+                    pValues[nRealCount] <<= bDoPrettyPrinting;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
                 break;
 
             default:
@@ -364,6 +662,8 @@ void SvtSaveOptions_Impl::Commit()
         }
     }
 
+    aNames.realloc(nRealCount);
+    aValues.realloc(nRealCount);
     PutProperties( aNames, aValues );
 }
 
@@ -609,3 +909,7 @@ sal_Bool SvtSaveOptions::IsPrettyPrinting() const
     return pImp->pSaveOpt->IsPrettyPrintingEnabled();
 }
 
+sal_Bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const
+{
+    return pImp->pSaveOpt->IsReadOnly(eOption);
+}
diff --git a/svtools/source/config/securityoptions.cxx b/svtools/source/config/securityoptions.cxx
index 2665a842bc72..4763eb2d7c18 100644
--- a/svtools/source/config/securityoptions.cxx
+++ b/svtools/source/config/securityoptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: securityoptions.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: mav $ $Date: 2002-11-05 09:32:36 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,6 +128,8 @@ using namespace ::com::sun::star::uno   ;
 
 #define PROPERTYCOUNT                   5
 
+#define CFG_READONLY_DEFAULT    sal_False
+
 //_________________________________________________________________________________________________________________
 //  private declarations!
 //_________________________________________________________________________________________________________________
@@ -199,6 +201,7 @@ class SvtSecurityOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
+        sal_Bool IsReadOnly( SvtSecurityOptions::EOption eOption ) const;
         sal_Bool IsWarningEnabled() const;
         void SetWarningEnabled( sal_Bool bSet );
         sal_Bool IsConfirmationEnabled() const;
@@ -239,11 +242,17 @@ class SvtSecurityOptions_Impl : public ConfigItem
 
     private:
 
-        Sequence< OUString >    m_seqSecureURLs     ;
-        EBasicSecurityMode      m_eBasicMode    ;
+        Sequence< OUString >    m_seqSecureURLs;
+        EBasicSecurityMode      m_eBasicMode;
         sal_Bool                m_bExecutePlugins;
         sal_Bool                m_bWarning;
         sal_Bool                m_bConfirmation;
+
+        sal_Bool                m_bROConfirmation;
+        sal_Bool                m_bROWarning;
+        sal_Bool                m_bROExecutePlugins;
+        sal_Bool                m_bROBasicMode;
+        sal_Bool                m_bROSecureURLs;
 };
 
 //_________________________________________________________________________________________________________________
@@ -255,17 +264,23 @@ class SvtSecurityOptions_Impl : public ConfigItem
 //*****************************************************************************************************************
 SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem          ( ROOTNODE_SECURITY         )
+    :   ConfigItem          ( ROOTNODE_SECURITY       )
     // Init member then.
-    ,   m_seqSecureURLs     ( DEFAULT_SECUREURL         )
-    ,   m_eBasicMode    ( DEFAULT_STAROFFICEBASIC   )
-    ,   m_bExecutePlugins( sal_True )
-    ,   m_bWarning( sal_True )
-    ,   m_bConfirmation( sal_True )
+    ,   m_seqSecureURLs     ( DEFAULT_SECUREURL       )
+    ,   m_eBasicMode        ( DEFAULT_STAROFFICEBASIC )
+    ,   m_bExecutePlugins   ( sal_True                )
+    ,   m_bWarning          ( sal_True                )
+    ,   m_bConfirmation     ( sal_True                )
+    ,   m_bROConfirmation   ( CFG_READONLY_DEFAULT    )
+    ,   m_bROWarning        ( CFG_READONLY_DEFAULT    )
+    ,   m_bROExecutePlugins ( CFG_READONLY_DEFAULT    )
+    ,   m_bROBasicMode      ( CFG_READONLY_DEFAULT    )
+    ,   m_bROSecureURLs     ( CFG_READONLY_DEFAULT    )
 {
     // Use our static list of configuration keys to get his values.
     Sequence< OUString >    seqNames    = GetPropertyNames  (           );
     Sequence< Any >         seqValues   = GetProperties     ( seqNames  );
+    Sequence< sal_Bool >    seqRO       = GetReadOnlyStates ( seqNames  );
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -288,6 +303,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
                                                         sal_uInt32 nCount = m_seqSecureURLs.getLength();
                                                         for( sal_uInt32 nItem=0; nItem<nCount; ++nItem )
                                                             m_seqSecureURLs[nItem] = aOpt.SubstituteVariable( m_seqSecureURLs[nItem] );
+                                                        m_bROSecureURLs = seqRO[nProperty];
                                                     }
                                                     break;
 
@@ -296,22 +312,26 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
                                                         sal_Int32 nMode;
                                                         seqValues[nProperty] >>= nMode;
                                                         m_eBasicMode = (EBasicSecurityMode)nMode;
+                                                        m_bROBasicMode = seqRO[nProperty];
                                                     }
                                                     break;
 
             case PROPERTYHANDLE_EXECUTEPLUGINS  :   {
                                                         if ( !( seqValues[nProperty] >>= m_bExecutePlugins ) )
                                                             DBG_ERROR("Wrong type for ExecutePlugins!");
+                                                        m_bROExecutePlugins = seqRO[nProperty];
                                                     }
                                                     break;
             case PROPERTYHANDLE_WARNINGENABLED  :   {
                                                         if ( !( seqValues[nProperty] >>= m_bWarning ) )
                                                             DBG_ERROR("Wrong type for Warning!");
+                                                        m_bROWarning = seqRO[nProperty];
                                                     }
                                                     break;
             case PROPERTYHANDLE_CONFIRMATIONENABLED :   {
                                                         if ( !( seqValues[nProperty] >>= m_bConfirmation ) )
                                                             DBG_ERROR("Wrong type for Confirmation!");
+                                                        m_bROConfirmation = seqRO[nProperty];
                                                     }
                                                     break;
         }
@@ -341,6 +361,7 @@ void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNam
 {
     // Use given list of updated properties to get his values from configuration directly!
     Sequence< Any > seqValues = GetProperties( seqPropertyNames );
+    Sequence< sal_Bool > seqRO = GetReadOnlyStates( seqPropertyNames );
     // Safe impossible cases.
     // We need values from ALL notified configuration keys.
     DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtSecurityOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
@@ -356,6 +377,7 @@ void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNam
             sal_uInt32 nCount = m_seqSecureURLs.getLength();
             for( sal_uInt32 nItem=0; nItem<nCount; ++nItem )
                 m_seqSecureURLs[nItem] = aOpt.SubstituteVariable( m_seqSecureURLs[nItem] );
+            m_bROSecureURLs = seqRO[nProperty];
         }
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_STAROFFICEBASIC )
         {
@@ -363,21 +385,25 @@ void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNam
             sal_Int32 nMode;
             seqValues[nProperty] >>= nMode;
             m_eBasicMode = (EBasicSecurityMode)nMode;
+            m_bROBasicMode = seqRO[nProperty];
         }
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_EXECUTEPLUGINS )
         {
             if ( !( seqValues[nProperty] >>= m_bExecutePlugins ) )
                 DBG_ERROR("Wrong type for ExecutePlugins!");
+            m_bROExecutePlugins = seqRO[nProperty];
         }
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_WARNINGENABLED )
         {
             if ( !( seqValues[nProperty] >>= m_bWarning ) )
                 DBG_ERROR("Wrong type for ExecutePlugins!");
+            m_bROWarning = seqRO[nProperty];
         }
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_CONFIRMATIONENABLED )
         {
             if ( !( seqValues[nProperty] >>= m_bConfirmation ) )
                 DBG_ERROR("Wrong type for ExecutePlugins!");
+            m_bROConfirmation = seqRO[nProperty];
         }
         #ifdef DEBUG
         else DBG_ASSERT( sal_False, "SvtSecurityOptions_Impl::Notify()\nUnkown property detected ... I can't handle these!\n" );
@@ -391,44 +417,105 @@ void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNam
 void SvtSecurityOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = GetPropertyNames  ();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
-    for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
+    Sequence< OUString >    lOrgNames = GetPropertyNames();
+    sal_Int32               nOrgCount = lOrgNames.getLength();
+
+    Sequence< OUString >    lNames(nOrgCount);
+    Sequence< Any >         lValues(nOrgCount);
+    sal_Int32               nRealCount = 0;
+
+    for( sal_Int32 nProperty=0; nProperty<nOrgCount; ++nProperty )
     {
         switch( nProperty )
         {
             case PROPERTYHANDLE_SECUREURL       :   {
-                                                        Sequence < OUString > seqURLs( m_seqSecureURLs );
-                                                        SvtPathOptions aOpt;
-                                                        sal_uInt32 nCount = seqURLs.getLength();
-                                                        for( sal_uInt32 nItem=0; nItem<nCount; ++nItem )
-                                                            seqURLs[nItem] = aOpt.UseVariable( seqURLs[nItem] );
-                                                        seqValues[nProperty] <<= seqURLs;
+                                                        if (!m_bROSecureURLs)
+                                                        {
+                                                            Sequence < OUString > lURLs( m_seqSecureURLs );
+                                                            SvtPathOptions aOpt;
+                                                            for( sal_Int32 nItem=0; nItem<lURLs.getLength(); ++nItem )
+                                                                lURLs[nItem] = aOpt.UseVariable( lURLs[nItem] );
+                                                            lValues[nRealCount] <<= lURLs;
+                                                            lNames[nRealCount] = lOrgNames[nProperty];
+                                                            ++nRealCount;
+                                                        }
                                                     }
                                                     break;
 
             case PROPERTYHANDLE_STAROFFICEBASIC :   {
-                                                        seqValues[nProperty] <<= (sal_Int32)m_eBasicMode;
+                                                        if (!m_bROBasicMode)
+                                                        {
+                                                            lValues[nRealCount] <<= (sal_Int32)m_eBasicMode;
+                                                            lNames[nRealCount] = lOrgNames[nProperty];
+                                                            ++nRealCount;
+                                                        }
                                                     }
                                                     break;
             case PROPERTYHANDLE_EXECUTEPLUGINS  :   {
-                                                        seqValues[nProperty] <<= m_bExecutePlugins;
+                                                        if (!m_bROExecutePlugins)
+                                                        {
+                                                            lValues[nRealCount] <<= m_bExecutePlugins;
+                                                            lNames[nRealCount] = lOrgNames[nProperty];
+                                                            ++nRealCount;
+                                                        }
                                                     }
                                                     break;
             case PROPERTYHANDLE_WARNINGENABLED  :   {
-                                                        seqValues[nProperty] <<= m_bWarning;
+                                                        if (!m_bROWarning)
+                                                        {
+                                                            lValues[nRealCount] <<= m_bWarning;
+                                                            lNames[nRealCount] = lOrgNames[nProperty];
+                                                            ++nRealCount;
+                                                        }
                                                     }
                                                     break;
             case PROPERTYHANDLE_CONFIRMATIONENABLED  :
                                                     {
-                                                        seqValues[nProperty] <<= m_bConfirmation;
+                                                        if (!m_bROConfirmation)
+                                                        {
+                                                            lValues[nRealCount] <<= m_bConfirmation;
+                                                            lNames[nRealCount] = lOrgNames[nProperty];
+                                                            ++nRealCount;
+                                                        }
                                                     }
                                                     break;
         }
     }
     // Set properties in configuration.
-    PutProperties( seqNames, seqValues );
+    lNames.realloc(nRealCount);
+    lValues.realloc(nRealCount);
+    PutProperties( lNames, lValues );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) const
+{
+    sal_Bool bReadonly = sal_True;
+    switch(eOption)
+    {
+        case SvtSecurityOptions::E_SECUREURLS :
+            bReadonly = m_bROSecureURLs;
+            break;
+
+        case SvtSecurityOptions::E_BASICMODE :
+            bReadonly = m_bROBasicMode;
+            break;
+
+        case SvtSecurityOptions::E_EXECUTEPLUGINS :
+            bReadonly = m_bROExecutePlugins;
+            break;
+
+        case SvtSecurityOptions::E_WARNING :
+            bReadonly = m_bROWarning;
+            break;
+
+        case SvtSecurityOptions::E_CONFIRMATION :
+            bReadonly = m_bROConfirmation;
+            break;
+    }
+    return bReadonly;
 }
 
 //*****************************************************************************************************************
@@ -444,8 +531,12 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetSecureURLs() const
 //*****************************************************************************************************************
 void SvtSecurityOptions_Impl::SetSecureURLs( const Sequence< OUString >& seqURLList )
 {
-    m_seqSecureURLs = seqURLList;
-    SetModified();
+    DBG_ASSERT(!m_bROSecureURLs, "SvtSecurityOptions_Impl::SetSecureURLs()\nYou tried to write on a readonly value!\n")
+    if (!m_bROSecureURLs && m_seqSecureURLs!=seqURLList)
+    {
+        m_seqSecureURLs = seqURLList;
+        SetModified();
+    }
 }
 
 //*****************************************************************************************************************
@@ -461,8 +552,12 @@ EBasicSecurityMode SvtSecurityOptions_Impl::GetBasicMode() const
 //*****************************************************************************************************************
 void SvtSecurityOptions_Impl::SetBasicMode( EBasicSecurityMode eMode )
 {
-    m_eBasicMode = eMode;
-    SetModified();
+    DBG_ASSERT(!m_bROBasicMode, "SvtSecurityOptions_Impl::SetBasicMode()\nYou tried to write on a readonly value!\n")
+    if (!m_bROBasicMode && m_eBasicMode!=eMode)
+    {
+        m_eBasicMode = eMode;
+        SetModified();
+    }
 }
 
 sal_Bool SvtSecurityOptions_Impl::IsExecutePlugins() const
@@ -472,8 +567,12 @@ sal_Bool SvtSecurityOptions_Impl::IsExecutePlugins() const
 
 void SvtSecurityOptions_Impl::SetExecutePlugins( sal_Bool bSet )
 {
-    m_bExecutePlugins =  bSet;
-    SetModified();
+    DBG_ASSERT(!m_bROExecutePlugins, "SvtSecurityOptions_Impl::SetExecutePlugins()\nYou tried to write on a readonly value!\n")
+    if (!m_bROExecutePlugins && m_bExecutePlugins!=bSet)
+    {
+        m_bExecutePlugins = bSet;
+        SetModified();
+    }
 }
 
 sal_Bool SvtSecurityOptions_Impl::IsWarningEnabled() const
@@ -483,8 +582,12 @@ sal_Bool SvtSecurityOptions_Impl::IsWarningEnabled() const
 
 void SvtSecurityOptions_Impl::SetWarningEnabled( sal_Bool bSet )
 {
-    m_bWarning =  bSet;
-    SetModified();
+    DBG_ASSERT(!m_bROWarning, "SvtSecurityOptions_Impl::SetWarningEnabled()\nYou tried to write on a readonly value!\n")
+    if (!m_bROWarning && m_bWarning!=bSet)
+    {
+        m_bWarning = bSet;
+        SetModified();
+    }
 }
 
 sal_Bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const
@@ -494,8 +597,12 @@ sal_Bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const
 
 void SvtSecurityOptions_Impl::SetConfirmationEnabled( sal_Bool bSet )
 {
-    m_bConfirmation =  bSet;
-    SetModified();
+    DBG_ASSERT(!m_bROConfirmation, "SvtSecurityOptions_Impl::SetConfirmationEnabled()\nYou tried to write on a readonly value!\n")
+    if (!m_bROConfirmation && m_bConfirmation!=bSet)
+    {
+        m_bConfirmation = bSet;
+        SetModified();
+    }
 }
 
 //*****************************************************************************************************************
@@ -615,6 +722,15 @@ SvtSecurityOptions::~SvtSecurityOptions()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
+sal_Bool SvtSecurityOptions::IsReadOnly( EOption eOption ) const
+{
+    MutexGuard aGuard( GetInitMutex() );
+    return m_pDataContainer->IsReadOnly(eOption);
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
 Sequence< OUString > SvtSecurityOptions::GetSecureURLs() const
 {
     MutexGuard aGuard( GetInitMutex() );
diff --git a/svtools/source/config/syslocaleoptions.cxx b/svtools/source/config/syslocaleoptions.cxx
index 52e3749db309..be3483872c38 100644
--- a/svtools/source/config/syslocaleoptions.cxx
+++ b/svtools/source/config/syslocaleoptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: syslocaleoptions.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: er $ $Date: 2002-09-23 13:44:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -101,6 +101,8 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #endif
 
+#define CFG_READONLY_DEFAULT    sal_False
+
 using namespace osl;
 using namespace utl;
 using namespace rtl;
@@ -122,6 +124,9 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
         ULONG                   m_nBlockedHint;     // pending hints
         sal_Int32               m_nBroadcastBlocked;     // broadcast only if this is 0
 
+        sal_Bool                m_bROLocale;
+        sal_Bool                m_bROCurrency;
+
     static  const Sequence< /* const */ OUString >  GetPropertyNames();
 
             ULONG               ChangeLocaleSettings();
@@ -148,7 +153,7 @@ public:
             SvtBroadcaster&     GetBroadcaster()
                                     { return m_aBroadcaster; }
             void                BlockBroadcasts( BOOL bBlock );
-
+            sal_Bool            IsReadOnly( SvtSysLocaleOptions::EOption eOption ) const;
 };
 
 
@@ -180,6 +185,8 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
     : ConfigItem( ROOTNODE_SYSLOCALE )
     , m_nBlockedHint( 0 )
     , m_nBroadcastBlocked( 0 )
+    , m_bROLocale(CFG_READONLY_DEFAULT)
+    , m_bROCurrency(CFG_READONLY_DEFAULT)
 {
     if ( !IsValidConfigMgr() )
         ChangeLocaleSettings();     // assume SYSTEM defaults during Setup
@@ -187,9 +194,12 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
     {
         const Sequence< OUString > aNames = GetPropertyNames();
         Sequence< Any > aValues = GetProperties( aNames );
+        Sequence< sal_Bool > aROStates = GetReadOnlyStates( aNames );
         const Any* pValues = aValues.getConstArray();
+        const sal_Bool* pROStates = aROStates.getConstArray();
         DBG_ASSERT( aValues.getLength() == aNames.getLength(), "GetProperties failed" );
-        if ( aValues.getLength() == aNames.getLength() )
+        DBG_ASSERT( aROStates.getLength() == aNames.getLength(), "GetReadOnlyStates failed" );
+        if ( aValues.getLength() == aNames.getLength() && aROStates.getLength() == aNames.getLength() )
         {
             for ( sal_Int32 nProp = 0; nProp < aNames.getLength(); nProp++ )
             {
@@ -205,6 +215,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
                                     m_aLocaleString = aStr;
                                 else
                                     DBG_ERRORFILE( "Wrong property type!" );
+                                m_bROLocale = pROStates[nProp];
                             }
                             break;
                         case PROPERTYHANDLE_CURRENCY :
@@ -214,6 +225,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
                                     m_aCurrencyString = aStr;
                                 else
                                     DBG_ERRORFILE( "Wrong property type!" );
+                                m_bROCurrency = pROStates[nProp];
                             }
                             break;
                         default:
@@ -246,6 +258,25 @@ void SvtSysLocaleOptions_Impl::BlockBroadcasts( BOOL bBlock )
     }
 }
 
+sal_Bool SvtSysLocaleOptions_Impl::IsReadOnly( SvtSysLocaleOptions::EOption eOption ) const
+{
+    sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+    switch(eOption)
+    {
+        case SvtSysLocaleOptions::E_LOCALE :
+            {
+                bReadOnly = m_bROLocale;
+                break;
+            }
+        case SvtSysLocaleOptions::E_CURRENCY :
+            {
+                bReadOnly = m_bROCurrency;
+                break;
+            }
+    }
+    return bReadOnly;
+}
+
 
 void SvtSysLocaleOptions_Impl::Broadcast( ULONG nHint )
 {
@@ -268,23 +299,46 @@ void SvtSysLocaleOptions_Impl::Broadcast( ULONG nHint )
 
 void SvtSysLocaleOptions_Impl::Commit()
 {
-    const Sequence< OUString > aNames = GetPropertyNames();
-    Sequence< Any > aValues( aNames.getLength() );
+    const Sequence< OUString > aOrgNames = GetPropertyNames();
+    sal_Int32 nOrgCount = aOrgNames.getLength();
+
+    Sequence< OUString > aNames( nOrgCount );
+    Sequence< Any > aValues( nOrgCount );
+
+    OUString* pNames = aNames.getArray();
     Any* pValues = aValues.getArray();
-    for ( sal_Int32 nProp = 0; nProp < aNames.getLength(); nProp++ )
+    sal_Int32 nRealCount = 0;
+
+    for ( sal_Int32 nProp = 0; nProp < nOrgCount; nProp++ )
     {
         switch ( nProp )
         {
             case PROPERTYHANDLE_LOCALE :
-                pValues[nProp] <<= m_aLocaleString;
-            break;
+                {
+                    if (!m_bROLocale)
+                    {
+                        pNames[nRealCount] = aOrgNames[nProp];
+                        pValues[nRealCount] <<= m_aLocaleString;
+                        ++nRealCount;
+                    }
+                }
+                break;
             case PROPERTYHANDLE_CURRENCY :
-                pValues[nProp] <<= m_aCurrencyString;
-            break;
+                {
+                    if (!m_bROLocale)
+                    {
+                        pNames[nRealCount] = aOrgNames[nProp];
+                        pValues[nRealCount] <<= m_aCurrencyString;
+                        ++nRealCount;
+                    }
+                }
+                break;
             default:
                 DBG_ERRORFILE( "invalid index to save a path" );
         }
     }
+    aNames.realloc(nRealCount);
+    aValues.realloc(nRealCount);
     PutProperties( aNames, aValues );
     ClearModified();
 }
@@ -292,7 +346,7 @@ void SvtSysLocaleOptions_Impl::Commit()
 
 void SvtSysLocaleOptions_Impl::SetLocaleString( const OUString& rStr )
 {
-    if ( rStr != m_aLocaleString )
+    if (!m_bROLocale && rStr != m_aLocaleString )
     {
         m_aLocaleString = rStr;
         SetModified();
@@ -320,7 +374,7 @@ ULONG SvtSysLocaleOptions_Impl::ChangeLocaleSettings()
 
 void SvtSysLocaleOptions_Impl::SetCurrencyString( const OUString& rStr )
 {
-    if ( rStr != m_aCurrencyString )
+    if (!m_bROCurrency && rStr != m_aCurrencyString )
     {
         m_aCurrencyString = rStr;
         SetModified();
@@ -341,6 +395,7 @@ void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPrope
 {
     ULONG nHint = 0;
     Sequence< Any > seqValues = GetProperties( seqPropertyNames );
+    Sequence< sal_Bool > seqROStates = GetReadOnlyStates( seqPropertyNames );
     sal_Int32 nCount = seqPropertyNames.getLength();
     for( sal_Int32 nProp = 0; nProp < nCount; ++nProp )
     {
@@ -348,6 +403,7 @@ void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPrope
         {
             DBG_ASSERT( seqValues[nProp].getValueTypeClass() == TypeClass_STRING, "Locale property type" );
             seqValues[nProp] >>= m_aLocaleString;
+            m_bROLocale = seqROStates[nProp];
             nHint |= SYSLOCALEOPTIONS_HINT_LOCALE;
             nHint |= ChangeLocaleSettings();
         }
@@ -355,6 +411,7 @@ void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPrope
         {
             DBG_ASSERT( seqValues[nProp].getValueTypeClass() == TypeClass_STRING, "Currency property type" );
             seqValues[nProp] >>= m_aCurrencyString;
+            m_bROCurrency = seqROStates[nProp];
             nHint |= SYSLOCALEOPTIONS_HINT_CURRENCY;
         }
     }
@@ -471,6 +528,11 @@ LanguageType SvtSysLocaleOptions::GetLocaleLanguageType() const
     return pOptions->GetLocaleLanguageType();
 }
 
+sal_Bool SvtSysLocaleOptions::IsReadOnly( EOption eOption ) const
+{
+    MutexGuard aGuard( GetMutex() );
+    return pOptions->IsReadOnly( eOption );
+}
 
 // static
 void SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( String& rAbbrev,
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 2c16ace13414..907e2d9b9945 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fileview.cxx,v $
  *
- *  $Revision: 1.52 $
+ *  $Revision: 1.53 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-06 16:21:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,7 +59,7 @@
  *
  ************************************************************************/
 
-#include <string>
+#include <functional>
 #include "fileview.hxx"
 #include "svtdata.hxx"
 #include "imagemgr.hxx"
@@ -151,8 +151,8 @@
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
 #endif
-#ifndef _TOOLS_SOLMATH_HXX
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_H
+#include <rtl/math.hxx>
 #endif
 #ifndef _WLDCRD_HXX
 #include <tools/wldcrd.hxx>
@@ -679,7 +679,7 @@ public:
 
     void                    Clear();
 
-    void                    GetFolderContent_Impl( const String& rFolder );
+    sal_Bool                GetFolderContent_Impl( const String& rFolder );
     void                    FilterFolderContent_Impl( const OUString &rFilter );
 
     void                    OpenFolder_Impl();
@@ -803,10 +803,9 @@ OUString CreateExactSizeText_Impl( sal_Int64 nSize )
         nDec = 3;
     }
 
-    String aSizeStr;
-    SvtSysLocale aSysLocale;
-    SolarMath::DoubleToString(
-        aSizeStr, fSize, 'F', nDec, aSysLocale.GetLocaleData().getNumDecimalSep().GetChar(0) );
+    OUString aSizeStr( ::rtl::math::doubleToUString( fSize,
+                rtl_math_StringFormat_F, nDec,
+                SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0)));
     aSizeStr += aUnitStr;
 
     return aSizeStr;
@@ -1338,7 +1337,7 @@ sal_Bool SvtFileView::CreateNewFolder( const String& rNewFolder )
     INetURLObject aObj( mpImp->maViewURL );
     aObj.insertName( rNewFolder, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
     String sURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
-    if ( ::utl::UCBContentHelper::MakeFolder( sURL ) )
+    if ( ::utl::UCBContentHelper::MakeFolder( sURL, sal_True ) )
     {
         String sTitle = aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
         String sEntry = mpImp->FolderInserted( sURL, sTitle );
@@ -1385,10 +1384,7 @@ sal_Bool SvtFileView::PreviousLevel( String& rNewURL )
 {
     sal_Bool bRet = sal_False;
     if ( HasPreviousLevel( rNewURL ) )
-    {
-        Initialize( rNewURL, mpImp->maCurrentFilter );
-        bRet = sal_True;
-    }
+        bRet = Initialize( rNewURL, mpImp->maCurrentFilter );
 
     return bRet;
 }
@@ -1425,18 +1421,21 @@ void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
 
 // -----------------------------------------------------------------------
 
-void SvtFileView::Initialize( const String& rURL, const String& rFilter )
+sal_Bool SvtFileView::Initialize( const String& rURL, const String& rFilter )
 {
     WaitObject aWaitCursor( this );
 
     mpImp->maViewURL = rURL;
-    ExecuteFilter( rFilter );
+    if ( !ExecuteFilter( rFilter ) )
+        return sal_False;
+
     mpImp->maOpenDoneLink.Call( this );
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-void SvtFileView::Initialize( const String& rURL, const Sequence< OUString >& aContents )
+sal_Bool SvtFileView::Initialize( const String& rURL, const Sequence< OUString >& aContents )
 {
     WaitObject aWaitCursor( this );
 
@@ -1450,22 +1449,27 @@ void SvtFileView::Initialize( const String& rURL, const Sequence< OUString >& aC
     mpImp->OpenFolder_Impl();
 
     mpImp->maOpenDoneLink.Call( this );
+
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-void SvtFileView::ExecuteFilter( const String& rFilter )
+sal_Bool SvtFileView::ExecuteFilter( const String& rFilter )
 {
     mpImp->maCurrentFilter = rFilter;
     mpImp->maCurrentFilter.ToLowerAscii();
 
     mpImp->Clear();
-    mpImp->GetFolderContent_Impl( mpImp->maViewURL );
+    if ( !mpImp->GetFolderContent_Impl( mpImp->maViewURL ) )
+        return sal_False;
+
     mpImp->FilterFolderContent_Impl( rFilter );
 
     mpImp->SortFolderContent_Impl();    // possibly not necessary!!!!!!!!!!
     mpImp->CreateDisplayText_Impl();
     mpImp->OpenFolder_Impl();
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -1780,6 +1784,7 @@ SvtFileView_Impl::SvtFileView_Impl( Window* pParent, sal_Int16 nFlags, sal_Bool
 {
     maAllFilter = String::CreateFromAscii( "*.*" );
     mpView = new ViewTabListBox_Impl( pParent, this, nFlags );
+    mpView->EnableCellFocus();
 }
 
 // -----------------------------------------------------------------------
@@ -1810,7 +1815,7 @@ void SvtFileView_Impl::Clear()
 }
 
 // -----------------------------------------------------------------------
-void SvtFileView_Impl::GetFolderContent_Impl( const String& rFolder )
+sal_Bool SvtFileView_Impl::GetFolderContent_Impl( const String& rFolder )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -1819,6 +1824,8 @@ void SvtFileView_Impl::GetFolderContent_Impl( const String& rFolder )
     INetURLObject aFolderObj( rFolder );
     DBG_ASSERT( aFolderObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
 
+    sal_Bool bSuccess = sal_False;
+
     try
     {
         // prepare name translation
@@ -1936,6 +1943,7 @@ void SvtFileView_Impl::GetFolderContent_Impl( const String& rFolder )
                         maContent.push_back( pData );
                     }
                 }
+                bSuccess = sal_True;
             }
             catch( CommandAbortedException& )
             {
@@ -1955,6 +1963,12 @@ void SvtFileView_Impl::GetFolderContent_Impl( const String& rFolder )
     {
         DBG_ERRORFILE( "GetFolderContents: Any other exception" );
     }
+
+    if ( !bSuccess )
+        // clear any "intermediate" and unfinished result
+        maContent.clear();
+
+    return bSuccess;
 }
 // -----------------------------------------------------------------------
 namespace
@@ -2035,7 +2049,7 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter )
     String sCompareString;
     do
     {
-        if ( (*aContentLoop)->mbIsFolder == sal_True )
+        if ( (*aContentLoop)->mbIsFolder )
             ++aContentLoop;
         else
         {
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index 59e122b26743..d3782d9aef80 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fileview.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: vg $ $Date: 2002-11-27 16:23:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -138,7 +138,7 @@ String STR_SVT_FILEVIEW_COLUMN_DATE
     Text[ polish ] = "Data modyfikacji";
     Text[ portuguese_brazilian ] = "Modified Date";
     Text[ japanese ] = "変更日時";
-    Text[ korean ] = "변경날짜";
+    Text[ korean ] = "변경 날짜";
     Text[ chinese_simplified ] = "修改的时间";
     Text[ chinese_traditional ] = "修改的日期";
     Text[ turkish ] = "Modified Date";
@@ -192,7 +192,7 @@ String STR_SVT_FILEVIEW_ERR_MAKEFOLDER
     Text[ polish ] = "Utworzenie folderu %1 nie powiod�o si�.";
     Text[ portuguese_brazilian ] = "Could not create the folder %1.";
     Text[ japanese ] = "フォルダ %1 は格納されませんでした。";
-    Text[ korean ] = "폴더 %1을(를) 만들 수 없습니다";
+    Text[ korean ] = "폴더 %1을(를) 만들 수 없습니다.";
     Text[ chinese_simplified ] = "无法创建文件夹 %1 。";
     Text[ chinese_traditional ] = "無法新增資料夾 %1 。";
     Text[ turkish ] = "Could not create the folder %1.";
@@ -242,7 +242,7 @@ String STR_SVT_KB
     Text [ french ] = "Ko" ;
     Text [ dutch ] = "KB" ;
     Text[ chinese_simplified ] = "千字节";
-    Text[ russian ] = "��";
+    Text[ russian ] = "��";
     Text[ polish ] = "KB";
     Text[ japanese ] = "キロバイト";
     Text[ chinese_traditional ] = "KB";
@@ -336,7 +336,7 @@ Menu RID_FILEVIEW_CONTEXTMENU
             Text[ greek ] = "Delete";
             Text[ dutch ] = "~Wissen";
             Text[ french ] = "~Supprimer";
-            Text[ spanish ] = "~Eliminar";
+            Text[ spanish ] = "~Borrar";
             Text[ finnish ] = "~Poista";
             Text[ italian ] = "~Elimina";
             Text[ danish ] = "~Slet";
@@ -393,7 +393,7 @@ ModalDialog DLG_SVT_QUERYDELETE
     Text [ English ] = "Confirm delete" ;
     Text [ english_us ] = "Confirm Delete" ;
     Text [ italian ] = "Conferma 'Elimina'" ;
-    Text [ spanish ] = "Confirmar eliminaci�n" ;
+    Text [ spanish ] = "Confirmar \"borrado\"" ;
     Text [ french ] = "Confirmation de suppression" ;
     Text [ dutch ] = "Wisopdracht bevestigen" ;
     Text [ swedish ] = "Bekr�fta radering" ;
@@ -464,7 +464,7 @@ ModalDialog DLG_SVT_QUERYDELETE
         Text [ swedish ] = "�r du s�ker p� att du vill radera de markerade data?" ;
         Text [ danish ] = "Vil du virkelig slette de markerede data?" ;
         Text [ italian ] = "Volete davvero cancellare i dati selezionati?" ;
-        Text [ spanish ] = "�Desea realmente eliminar los datos seleccionados?" ;
+        Text [ spanish ] = "�Desea realmente borrar los datos seleccionados?" ;
         Text [ french ] = "�tes vous s�r de vouloir supprimer les donn�es s�lectionn�es ?" ;
         Text [ dutch ] = "Wilt u de geselecteerde gegevens werkelijk wissen?" ;
         Text [ portuguese_brazilian ] = "Sind Sie sicher, da? Sie die selektierten Daten l?chen wollen?" ;
@@ -478,7 +478,7 @@ ModalDialog DLG_SVT_QUERYDELETE
         Text[ dutch ] = "Wilt u de geselecteerde gegevens werkelijk wissen?";
         Text[ chinese_simplified ] = "真要删除选中的数据？";
         Text[ greek ] = "������ ���������� �� ���������� �� ���������� ��������;";
-        Text[ korean ] = "선택한 데이터를 정말로 삭제하겠습니까?";
+        Text[ korean ] = "선택한 데이터를 정말로 삭제하시겠습니까?";
         Text[ turkish ] = "Se�ilen verileri ger�ekten silmek istiyor musunuz?";
         Text[ finnish ] = "Haluatko varmasti poistaa valitut tiedot?";
         Text[ catalan ] = "Voleu realment suprimir les dades seleccionades?";
@@ -498,7 +498,7 @@ ModalDialog DLG_SVT_QUERYDELETE
         Text[ greek ] = "��������";
         Text[ dutch ] = "~Wissen";
         Text[ french ] = "Supprimer";
-        Text[ spanish ] = "~Eliminar";
+        Text[ spanish ] = "~Borrar";
         Text[ swedish ] = "~Radera";
         Text[ russian ] = "�������";
         Text[ italian ] = "E~limina";
@@ -529,7 +529,7 @@ ModalDialog DLG_SVT_QUERYDELETE
         Text[ greek ] = "�������� ��~�";
         Text[ dutch ] = "~Alle wissen";
         Text[ french ] = "Supprimer ~tout";
-        Text[ spanish ] = "~Eliminar todos";
+        Text[ spanish ] = "~Borrar todo";
         Text[ swedish ] = "Radera ~alla";
         Text[ russian ] = "������� ���";
         Text[ italian ] = "~Elimina tutti";
@@ -559,7 +559,7 @@ ModalDialog DLG_SVT_QUERYDELETE
         Text[ greek ] = "~�� �� ���������";
         Text[ dutch ] = "~Niet wissen";
         Text[ french ] = "~Ne pas supprimer";
-        Text[ spanish ] = "~No eliminar";
+        Text[ spanish ] = "~No borrar";
         Text[ swedish ] = "Radera i~nte";
         Text[ russian ] = "�� �������";
         Text[ italian ] = "~Non eliminare";
@@ -567,7 +567,7 @@ ModalDialog DLG_SVT_QUERYDELETE
         Text[ polish ] = "Nie usuwaj";
         Text[ portuguese_brazilian ] = "~Nein";
         Text[ japanese ] = "削除しない(~N)";
-        Text[ korean ] = "삭제 취소(~N)";
+        Text[ korean ] = "삭제 안함(~N)";
         Text[ chinese_simplified ] = "不删除(~N)";
         Text[ chinese_traditional ] = "不要刪除(~N)";
         Text[ arabic ] = "��� �����";
@@ -585,3 +585,8 @@ ModalDialog DLG_SVT_QUERYDELETE
     };
 };
 
+
+
+
+
+
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
index 83082597e3cc..73eab7b00b81 100644
--- a/svtools/source/contnr/svcontnr.src
+++ b/svtools/source/contnr/svcontnr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svcontnr.src,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kz $ $Date: 2002-09-18 19:17:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,18 +95,18 @@ String STR_SVT_ACC_DESC_TABLISTBOX
     Text[ russian ] = "Row: %1, Column: %2";
     Text[ greek ] = "Row: %1, Column: %2";
     Text[ dutch ] = "Row: %1, Column: %2";
-    Text[ french ] = "Row: %1, Column: %2";
-    Text[ spanish ] = "Row: %1, Column: %2";
+    Text[ french ] = "Ligne : %1, colonne : %2";
+    Text[ spanish ] = "Fila: %1, columna: %2";
     Text[ finnish ] = "Row: %1, Column: %2";
-    Text[ italian ] = "Row: %1, Column: %2";
+    Text[ italian ] = "Riga: %1, colonna: %2";
     Text[ danish ] = "Row: %1, Column: %2";
-    Text[ swedish ] = "Row: %1, Column: %2";
+    Text[ swedish ] = "Rad: %1, kolumn: %2";
     Text[ polish ] = "Row: %1, Column: %2";
     Text[ portuguese_brazilian ] = "Row: %1, Column: %2";
-    Text[ japanese ] = "Row: %1, Column: %2";
-    Text[ korean ] = "Row: %1, Column: %2";
-    Text[ chinese_simplified ] = "Row: %1, Column: %2";
-    Text[ chinese_traditional ] = "Row: %1, Column: %2";
+    Text[ japanese ] = "行: %1, 列: %2";
+    Text[ korean ] = "행: %1, 열: %2";
+    Text[ chinese_simplified ] = "行：%1, 列：%2";
+    Text[ chinese_traditional ] = "列：%1，欄：%2";
     Text[ turkish ] = "Row: %1, Column: %2";
     Text[ arabic ] = "Row: %1, Column: %2";
     Text[ catalan ] = "Row: %1, Column: %2";
@@ -120,18 +120,18 @@ String STR_SVT_ACC_DESC_FILEVIEW
     Text[ russian ] = ", Type: %1, URL: %2";
     Text[ greek ] = ", Type: %1, URL: %2";
     Text[ dutch ] = ", Type: %1, URL: %2";
-    Text[ french ] = ", Type: %1, URL: %2";
-    Text[ spanish ] = ", Type: %1, URL: %2";
+    Text[ french ] = ", type : %1, URL : %2";
+    Text[ spanish ] = ", Tipo: %1, URL: %2";
     Text[ finnish ] = ", Type: %1, URL: %2";
-    Text[ italian ] = ", Type: %1, URL: %2";
+    Text[ italian ] = ", tipo: %1, URL: %2";
     Text[ danish ] = ", Type: %1, URL: %2";
-    Text[ swedish ] = ", Type: %1, URL: %2";
+    Text[ swedish ] = ", typ: %1, URL: %2";
     Text[ polish ] = ", Type: %1, URL: %2";
     Text[ portuguese_brazilian ] = ", Type: %1, URL: %2";
-    Text[ japanese ] = ", Type: %1, URL: %2";
-    Text[ korean ] = ", Type: %1, URL: %2";
-    Text[ chinese_simplified ] = ", Type: %1, URL: %2";
-    Text[ chinese_traditional ] = ", Type: %1, URL: %2";
+    Text[ japanese ] = ", タイプ: %1, URL: %2";
+    Text[ korean ] = ", 유형: %1, URL: %2";
+    Text[ chinese_simplified ] = "，类型：%1, URL: %2";
+    Text[ chinese_traditional ] = "，類型：%1，URL：%2";
     Text[ turkish ] = ", Type: %1, URL: %2";
     Text[ arabic ] = ", Type: %1, URL: %2";
     Text[ catalan ] = ", Type: %1, URL: %2";
@@ -145,18 +145,18 @@ String STR_SVT_ACC_DESC_FOLDER
     Text[ russian ] = "Folder";
     Text[ greek ] = "Folder";
     Text[ dutch ] = "Folder";
-    Text[ french ] = "Folder";
-    Text[ spanish ] = "Folder";
+    Text[ french ] = "Dossier";
+    Text[ spanish ] = "Carpeta";
     Text[ finnish ] = "Folder";
-    Text[ italian ] = "Folder";
+    Text[ italian ] = "Cartella";
     Text[ danish ] = "Folder";
-    Text[ swedish ] = "Folder";
+    Text[ swedish ] = "Mapp";
     Text[ polish ] = "Folder";
     Text[ portuguese_brazilian ] = "Folder";
-    Text[ japanese ] = "Folder";
-    Text[ korean ] = "Folder";
-    Text[ chinese_simplified ] = "Folder";
-    Text[ chinese_traditional ] = "Folder";
+    Text[ japanese ] = "フォルダ";
+    Text[ korean ] = "폴더";
+    Text[ chinese_simplified ] = "文件夹";
+    Text[ chinese_traditional ] = "資料夾";
     Text[ turkish ] = "Folder";
     Text[ arabic ] = "Folder";
     Text[ catalan ] = "Folder";
@@ -170,34 +170,50 @@ String STR_SVT_ACC_DESC_FILE
     Text[ russian ] = "File";
     Text[ greek ] = "File";
     Text[ dutch ] = "File";
-    Text[ french ] = "File";
-    Text[ spanish ] = "File";
+    Text[ french ] = "Fichier";
+    Text[ spanish ] = "Archivo";
     Text[ finnish ] = "File";
     Text[ italian ] = "File";
     Text[ danish ] = "File";
-    Text[ swedish ] = "File";
+    Text[ swedish ] = "Fil";
     Text[ polish ] = "File";
     Text[ portuguese_brazilian ] = "File";
-    Text[ japanese ] = "File";
-    Text[ korean ] = "File";
-    Text[ chinese_simplified ] = "File";
-    Text[ chinese_traditional ] = "File";
+    Text[ japanese ] = "ファイル";
+    Text[ korean ] = "파일";
+    Text[ chinese_simplified ] = "文件";
+    Text[ chinese_traditional ] = "檔案";
     Text[ turkish ] = "File";
     Text[ arabic ] = "File";
     Text[ catalan ] = "File";
     Text[ thai ] = "File";
 };
+String STR_SVT_ACC_EMPTY_FIELD
+{
+    Text = "Leeres Feld";
+    Text [ english_us ] = "Empty Field";
+    Text[ portuguese ] = "Empty Field";
+    Text[ russian ] = "Empty Field";
+    Text[ greek ] = "Empty Field";
+    Text[ dutch ] = "Empty Field";
+    Text[ french ] = "Champ vide";
+    Text[ spanish ] = "Campo vac�o";
+    Text[ finnish ] = "Empty Field";
+    Text[ italian ] = "Campo vuoto";
+    Text[ danish ] = "Empty Field";
+    Text[ swedish ] = "Tomt f�lt";
+    Text[ polish ] = "Empty Field";
+    Text[ japanese ] = "Empty Field";
+    Text[ korean ] = "빈 필드";
+    Text[ chinese_simplified ] = "空白字段";
+    Text[ chinese_traditional ] = "空白欄位";
+    Text[ turkish ] = "Empty Field";
+    Text[ arabic ] = "Empty Field";
+    Text[ catalan ] = "Empty Field";
+    Text[ thai ] = "Empty Field";
+};
+
+
+
+
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2002/09/13 12:36:56  pb
- *  fix: #102696# accessibility strings added
- *
- *  Revision 1.1  2002/07/19 13:26:53  fs
- *  initial checkin - shared resource file for this directory
- *
- *
- *  Revision 1.0 19.07.2002 14:28:03  fs
- ************************************************************************/
 
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index e52498f87fcc..afcfa603edc9 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svimpbox.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: gt $ $Date: 2002-12-11 13:42:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,23 +98,25 @@
 #include <comphelper/processfactory.hxx>
 #endif
 
-#define NODE_BMP_TABDIST_NOTVALID -2000000
+#define NODE_BMP_TABDIST_NOTVALID   -2000000
+#define FIRST_ENTRY_TAB             1
 
 Image   SvImpLBox::s_aDefCollapsed;
 Image   SvImpLBox::s_aDefExpanded;
 Image   SvImpLBox::s_aDefCollapsedHC;
 Image   SvImpLBox::s_aDefExpandedHC;
 
-
 SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits nWinStyle) :
+
     aVerSBar( pLBView, WB_DRAG | WB_VSCROLL ),
     aHorSBar( pLBView, WB_DRAG | WB_HSCROLL ),
     aScrBarBox( pLBView ),
-    aOutputSize( 0,0 ),
+    aOutputSize( 0, 0 ),
     aSelEng( pLBView, (FunctionSet*)0 ),
     aFctSet( this, &aSelEng, pLBView ),
     pIntlWrapper( NULL ), // #102891# -----------------------
-    pTabBar(0)
+    pTabBar( NULL )
+
 {
     pView = pLBView;
     pTree = pLBTree;
@@ -128,10 +130,8 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n
     aHorSBar.SetScrollHdl( LINK( this, SvImpLBox, ScrollLeftRightHdl ) );
     aHorSBar.SetEndScrollHdl( LINK( this, SvImpLBox, EndScrollHdl ) );
     aVerSBar.SetEndScrollHdl( LINK( this, SvImpLBox, EndScrollHdl ) );
-#if SUPD > 358
     aVerSBar.SetRange( Range(0,0) );
     aVerSBar.Hide();
-#endif
     aHorSBar.SetRange( Range(0,0) );
     aHorSBar.SetPageSize( 24 ); // Pixel
     aHorSBar.SetLineSize( 8 ); // Pixel
@@ -156,6 +156,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n
     pActiveTab = 0;
 
     nFlags = 0;
+    nCurTabPos = FIRST_ENTRY_TAB;
 
     aEditTimer.SetTimeout( 800 );
     aEditTimer.SetTimeoutHdl( LINK(this,SvImpLBox,EditTimerCall) );
@@ -168,7 +169,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n
     bInVScrollHdl = FALSE;
     nFlags |= F_FILLING;
 
-    bSubLstOpRet = bSubLstOpLR = bContextMenuHandling = FALSE;
+    bSubLstOpRet = bSubLstOpLR = bContextMenuHandling = bIsCellFocusEnabled = FALSE;
 }
 
 SvImpLBox::~SvImpLBox()
@@ -200,6 +201,81 @@ void SvImpLBox::UpdateIntlWrapper()
     }
 }
 
+// #97680# ----------------------
+short SvImpLBox::UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth )
+{
+    DBG_ASSERT( pView->pModel, "View and Model aren't valid!" );
+
+    USHORT nDepth = pView->pModel->GetDepth( pEntry );
+    DBG_ASSERT( aContextBmpWidthVector.size() >= nDepth, "Some level missing!" );
+    if( aContextBmpWidthVector.size() == nDepth )
+    {
+        aContextBmpWidthVector.resize( nDepth + 1 );
+        aContextBmpWidthVector.at( nDepth ) = 0;
+    }
+    short nContextBmpWidth = aContextBmpWidthVector[ nDepth ];
+    if( nContextBmpWidth < nWidth )
+    {
+        aContextBmpWidthVector.at( nDepth ) = nWidth;
+        return nWidth;
+    }
+    else
+        return nContextBmpWidth;
+}
+
+void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry )
+{
+    DBG_ASSERT( pEntry, "Moved Entry is invalid!" );
+
+    short nDepth = pView->pModel->GetDepth( pEntry );
+    SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
+    short nExpWidth = (short)pBmpItem->GetBitmap1().GetSizePixel().Width();
+    short nColWidth = (short)pBmpItem->GetBitmap2().GetSizePixel().Width();
+    short nMax = Max(nExpWidth, nColWidth);
+    UpdateContextBmpWidthVector( pEntry, nMax );
+
+    if( pEntry->HasChilds() ) // recursive call, whether expanded or not
+    {
+        SvLBoxEntry* pChild = pView->FirstChild( pEntry );
+        DBG_ASSERT( pChild, "The first child is invalid!" );
+        do
+        {
+            UpdateContextBmpWidthVectorFromMovedEntry( pChild );
+            pChild = pView->Next( pChild );
+        } while ( pChild );
+    }
+}
+
+void SvImpLBox::UpdateContextBmpWidthMax( SvLBoxEntry* pEntry )
+{
+    USHORT nDepth = pView->pModel->GetDepth( pEntry );
+    if( aContextBmpWidthVector.size() < 1 )
+        return;
+    short nWidth = aContextBmpWidthVector[ nDepth ];
+    if( nWidth != pView->nContextBmpWidthMax ) {
+        pView->nContextBmpWidthMax = nWidth;
+        nFlags |= F_IGNORE_CHANGED_TABS;
+        pView->SetTabs();
+        nFlags &= ~F_IGNORE_CHANGED_TABS;
+    }
+}
+
+void SvImpLBox::CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect )
+{
+    if ( pEntry && bIsCellFocusEnabled )
+    {
+        if ( nCurTabPos > FIRST_ENTRY_TAB )
+        {
+            SvLBoxItem* pItem = pCursor->GetItem( nCurTabPos );
+            rRect.Left() = pView->GetTab( pCursor, pItem )->GetPos();
+        }
+        SvLBoxItem* pNextItem = pCursor->GetItem( nCurTabPos + 1 );
+        long nRight = pView->GetTab( pCursor, pNextItem )->GetPos() - 1;
+        if ( nRight < rRect.Right() )
+            rRect.Right() = nRight;
+    }
+}
+
 void SvImpLBox::SetWindowBits( WinBits nWinStyle )
 {
     nWinBits = nWinStyle;
@@ -253,6 +329,9 @@ void SvImpLBox::Clear()
     nFlags |= F_FILLING;
     if( !aHorSBar.IsVisible() && !aVerSBar.IsVisible() )
         aScrBarBox.Hide();
+
+    // #97680# ---------
+    aContextBmpWidthVector.clear();
 }
 
 // *********************************************************************
@@ -552,6 +631,7 @@ void SvImpLBox::RecalcFocusRect()
         pView->HideFocus();
         long nY = GetEntryLine( pCursor );
         Rectangle aRect = pView->GetFocusRect( pCursor, nY );
+        CalcCellFocusRect( pCursor, aRect );
         Region aOldClip( pView->GetClipRegion());
         Region aClipRegion( GetClipRegionRect() );
         pView->SetClipRegion( aClipRegion );
@@ -629,6 +709,7 @@ void SvImpLBox::ShowCursor( BOOL bShow )
     {
         long nY = GetEntryLine( pCursor );
         Rectangle aRect = pView->GetFocusRect( pCursor, nY );
+        CalcCellFocusRect( pCursor, aRect );
         Region aOldClip( pView->GetClipRegion());
         Region aClipRegion( GetClipRegionRect() );
         pView->SetClipRegion( aClipRegion );
@@ -821,7 +902,6 @@ void SvImpLBox::Paint( const Rectangle& rRect )
 
     nFlags |= F_IN_PAINT;
 
-//#if SUPD > 364
     if( nFlags & F_FILLING )
     {
         SvLBoxEntry* pFirst = pView->First();
@@ -836,7 +916,6 @@ void SvImpLBox::Paint( const Rectangle& rRect )
             return;
         }
     }
-//#endif
 
     if( !pStartEntry )
     {
@@ -1097,19 +1176,7 @@ void SvImpLBox::DrawNet()
 
 static long GetOptSize( TabBar* pTabBar )
 {
-#if SUPD > 373
     return pTabBar->CalcWindowSizePixel().Width();
-#else
-    long nWidth = 0;
-    USHORT nCount = pTabBar->GetPageCount();
-    for( USHORT nCur = 0; nCur < nCount; nCur++ )
-    {
-        USHORT nId = pTabBar->GetPageId( nCur );
-        nWidth+= pTabBar->GetTextSize(pTabBar->GetPageText(nId)).Width();
-        nWidth += 18;
-    }
-    return nWidth;
-#endif
 }
 
 void SvImpLBox::PositionScrollBars( Size& rSize, USHORT nMask )
@@ -1791,6 +1858,9 @@ void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry )
 
 void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry )
 {
+    // #97680# --------------
+    UpdateContextBmpWidthVectorFromMovedEntry( pEntry );
+
     aVerSBar.SetRange( Range(0, pView->GetVisibleCount()-1));
     USHORT nFirstPos = (USHORT)pTree->GetAbsPos( pStartEntry );
     USHORT nNewPos = (USHORT)pTree->GetAbsPos( pEntry );
@@ -1887,10 +1957,8 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
         SyncVerThumb(); // falls vor Thumb eingefuegt wurde
         ShowVerSBar();
         ShowCursor( TRUE );
-//#if SUPD > 364
         if( pStartEntry != pView->First() && (nFlags & F_FILLING) )
             pView->Update();
-//#endif
     }
 }
 
@@ -2051,9 +2119,12 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
     if( aPos.X() > aOutputSize.Width() || aPos.Y() > aOutputSize.Height() )
         return;
 
+    SvLBoxEntry* pEntry = GetEntry( aPos );
+    if ( pEntry != pCursor )
+        // new entry selected -> reset current tab position to first tab
+        nCurTabPos = FIRST_ENTRY_TAB;
     nFlags &= (~F_FILLING);
     pView->GrabFocus();
-    SvLBoxEntry* pEntry = GetEntry( aPos );
     if( !pEntry )
         return;
 
@@ -2069,7 +2140,9 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
     if( pXItem )
     {
         SvLBoxTab* pXTab = pView->GetTab( pEntry, pXItem );
-        if ( !rMEvt.IsMod1() && !rMEvt.IsMod2() && rMEvt.IsLeft() && pXTab->IsEditable() )
+        if ( !rMEvt.IsMod1() && !rMEvt.IsMod2() && rMEvt.IsLeft() && pXTab->IsEditable()
+            && pEntry == pView->FirstSelected() && NULL == pView->NextSelected( pEntry ) )
+                // #i8234# FirstSelected() and NextSelected() ensures, that inplace editing is only triggered, when only one entry is selected
             nFlags |= F_START_EDITTIMER;
 #ifndef MAC
         if ( !pView->IsSelected( pEntry ) )
@@ -2204,7 +2277,9 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             if( !IsEntryInView( pCursor ) )
                 MakeVisible( pCursor );
             pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pCursor ));
-
+            if ( pNewCursor )
+                // new entry selected -> reset current tab position to first tab
+                nCurTabPos = FIRST_ENTRY_TAB;
             // if there is no next entry, take the current one
             // this ensures that in case of _one_ entry in the list, this entry is selected when pressing
             // the cursor key
@@ -2225,6 +2300,9 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             if( !IsEntryInView( pCursor ) )
                 MakeVisible( pCursor );
             pNewCursor = (SvLBoxEntry*)(pView->NextVisible( pCursor ));
+            if ( pNewCursor )
+                // new entry selected -> reset current tab position to first tab
+                nCurTabPos = FIRST_ENTRY_TAB;
 
             // if there is no next entry, take the current one
             // this ensures that in case of _one_ entry in the list, this entry is selected when pressing
@@ -2252,6 +2330,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             break;
 
         case KEY_RIGHT:
+        {
             if( bSubLstOpLR && IsNowExpandable() )
                 pView->Expand( pCursor );
             else if( pView->nWindowStyle & WB_HSCROLL )
@@ -2269,11 +2348,22 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                     EndScroll();
                 }
             }
+            else if ( bIsCellFocusEnabled && pCursor )
+            {
+                if ( nCurTabPos < ( pView->TabCount() - 2 ) )
+                {
+                    ++nCurTabPos;
+                    ShowCursor( TRUE );
+                    CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
+                }
+            }
             else
                 bKeyUsed = FALSE;
             break;
+        }
 
         case KEY_LEFT:
+        {
             if( pView->nWindowStyle & WB_HSCROLL )
             {
                 long    nThumb = aHorSBar.GetThumbPos();
@@ -2301,9 +2391,19 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             }
             else if( bSubLstOpLR && IsExpandable() )
                 pView->Collapse( pCursor );
+            else if ( bIsCellFocusEnabled )
+            {
+                if ( nCurTabPos > FIRST_ENTRY_TAB )
+                {
+                    --nCurTabPos;
+                    ShowCursor( TRUE );
+                    CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
+                }
+            }
             else
                 bKeyUsed = FALSE;
             break;
+        }
 
         case KEY_PAGEUP:
             if( !bMod1 )
@@ -3444,3 +3544,19 @@ void SvImpLBox::RemoveEventListener( const Link& rEventListener )
     maEventListeners.remove( rEventListener );
 }
 
+// -----------------------------------------------------------------------
+
+bool SvImpLBox::SetCurrentTabPos( USHORT _nNewPos )
+{
+    bool bRet = false;
+
+    if ( pView && _nNewPos < ( pView->TabCount() - 2 ) )
+    {
+        nCurTabPos = _nNewPos;
+        ShowCursor( TRUE );
+        bRet = true;
+    }
+
+    return bRet;
+}
+
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 31696118cbc6..b7a8eda5eb99 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svlbox.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-02 08:57:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1820,6 +1820,8 @@ Link SvLBox::GetDragFinishedHdl() const
 void SvLBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const
 {
     rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+    rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANT );
+
     if ( IsEnabled() )
         rStateSet.AddState( AccessibleStateType::ENABLED );
     if ( GetSelectionMode() == MULTIPLE_SELECTION )
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 6510f758980b..15f61125ea62 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svtabbx.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sab $ $Date: 2002-11-15 09:48:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -458,12 +458,12 @@ String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry, USHORT nCol ) const
                 {
                     if( aResult.Len() )
                         aResult += '\t';
-                    aResult += ((SvLBoxString*)pStr)->GetText();
+                    aResult += static_cast<SvLBoxString*>( pStr )->GetText();
                 }
                 else
                 {
                     if( nCol == 0 )
-                        return ((SvLBoxString*)pStr)->GetText();
+                        return static_cast<SvLBoxString*>( pStr )->GetText();
                     nCol--;
                 }
             }
@@ -479,15 +479,13 @@ String SvTabListBox::GetEntryText( ULONG nPos, USHORT nCol ) const
     return GetEntryText( pEntry, nCol );
 }
 
-void SvTabListBox::SetEntryText( const XubString& rStr, ULONG nPos,
-    USHORT nCol )
+void SvTabListBox::SetEntryText( const XubString& rStr, ULONG nPos, USHORT nCol )
 {
     SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos );
     SetEntryText( rStr, pEntry, nCol );
 }
 
-void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry,
-    USHORT nCol )
+void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, USHORT nCol )
 {
     DBG_ASSERT(pEntry,"SetEntryText:Invalid Entry");
     if( !pEntry )
@@ -535,8 +533,6 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry,
     GetModel()->InvalidateEntry( pEntry );
 }
 
-
-
 ULONG SvTabListBox::GetEntryPos( const XubString& rStr, USHORT nCol )
 {
     ULONG nPos = 0;
@@ -595,6 +591,43 @@ const xub_Unicode* SvTabListBox::GetToken( const xub_Unicode* pPtr, USHORT& rLen
     return pPtr;
 }
 
+String SvTabListBox::GetTabEntryText( ULONG nPos, USHORT nCol ) const
+{
+    SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos );
+    DBG_ASSERT( pEntry, "GetTabEntryText(): Invalid entry " );
+    XubString aResult;
+    if ( pEntry )
+    {
+        USHORT nCount = pEntry->ItemCount();
+        USHORT nCur = ( 0 == nCol && IsCellFocusEnabled() ) ? GetCurrentTabPos() : 0;
+        while( nCur < nCount )
+        {
+            SvLBoxItem* pStr = pEntry->GetItem( nCur );
+            if ( pStr->IsA() == SV_ITEM_ID_LBOXSTRING )
+            {
+                if ( nCol == 0xffff )
+                {
+                    if ( aResult.Len() )
+                        aResult += '\t';
+                    aResult += static_cast<SvLBoxString*>( pStr )->GetText();
+                }
+                else
+                {
+                    if ( nCol == 0 )
+                    {
+                        String sRet = static_cast<SvLBoxString*>( pStr )->GetText();
+                        if ( sRet.Len() == 0 )
+                            sRet = String( SvtResId( STR_SVT_ACC_EMPTY_FIELD ) );
+                        return sRet;
+                    }
+                    --nCol;
+                }
+            }
+            ++nCur;
+        }
+    }
+    return aResult;
+}
 
 void SvTabListBox::SetTabJustify( USHORT nTab, SvTabJustify eJustify)
 {
@@ -766,12 +799,20 @@ sal_Bool SvHeaderTabListBox::HasRowHeader() const
 // -----------------------------------------------------------------------
 sal_Bool SvHeaderTabListBox::IsCellFocusable() const
 {
-    return sal_False;
+    return IsCellFocusEnabled();
 }
 // -----------------------------------------------------------------------
 sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
 {
-    return sal_False;
+    sal_Bool bRet = ( IsCellFocusEnabled() == TRUE );
+    if ( bRet )
+    {
+        // first set cursor to _nRow
+        SetCursor( GetEntry( _nRow ), TRUE );
+        // then set the focus into _nColumn
+        bRet = ( SetCurrentTabPos( _nColumn ) == true );
+    }
+    return bRet;
 }
 // -----------------------------------------------------------------------
 void SvHeaderTabListBox::SetNoSelection()
@@ -836,7 +877,7 @@ sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn
 // -----------------------------------------------------------------------
 String SvHeaderTabListBox::GetCellText( long _nRow, USHORT _nColumn ) const
 {
-    return ::rtl::OUString( GetEntryText( _nRow, _nColumn ) );
+    return ::rtl::OUString( GetTabEntryText( _nRow, _nColumn ) );
 }
 // -----------------------------------------------------------------------
 Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen )
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index ecf8ef2fd540..f892b3267947 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svtreebx.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: pb $ $Date: 2002-11-26 10:14:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -474,6 +474,17 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,SvLBoxEntry* pPa
     else
         SvLBox::Insert( pEntry, pParent, nPos );
 
+    short nExpWidth = (short)rDefExpBmp.GetSizePixel().Width();
+    short nColWidth = (short)rDefColBmp.GetSizePixel().Width();
+    short nMax = Max(nExpWidth, nColWidth);
+    // #97680# ----------------
+    nMax = pImp->UpdateContextBmpWidthVector( pEntry, nMax );
+    if( nMax > nContextBmpWidthMax )
+    {
+        nContextBmpWidthMax = nMax;
+        SetTabs();
+    }
+
     aPrevInsertedExpBmp = rDefExpBmp;
     aPrevInsertedColBmp = rDefColBmp;
 
@@ -492,15 +503,6 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
     aCurInsertedExpBmp = aExpEntryBmp;
     aCurInsertedColBmp = aCollEntryBmp;
 
-    short nExpWidth = (short)aExpEntryBmp.GetSizePixel().Width();
-    short nColWidth = (short)aCollEntryBmp.GetSizePixel().Width();
-    short nMax = Max(nExpWidth, nColWidth);
-    if( nMax > nContextBmpWidthMax )
-    {
-        nContextBmpWidthMax = nMax;
-        SetTabs();
-    }
-
     SvLBoxEntry* pEntry = CreateEntry();
     pEntry->SetUserData( pUser );
     InitEntry( pEntry, aText, aCollEntryBmp, aExpEntryBmp );
@@ -512,6 +514,17 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
     else
         SvLBox::Insert( pEntry, pParent, nPos );
 
+    short nExpWidth = (short)aExpEntryBmp.GetSizePixel().Width();
+    short nColWidth = (short)aCollEntryBmp.GetSizePixel().Width();
+    short nMax = Max(nExpWidth, nColWidth);
+    // #97680# ----------------
+    nMax = pImp->UpdateContextBmpWidthVector( pEntry, nMax );
+    if( nMax > nContextBmpWidthMax )
+    {
+        nContextBmpWidthMax = nMax;
+        SetTabs();
+    }
+
     aPrevInsertedExpBmp = aExpEntryBmp;
     aPrevInsertedColBmp = aCollEntryBmp;
 
@@ -541,9 +554,11 @@ void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp,
     GetModel()->InvalidateEntry( pEntry );
     SetEntryHeight( pEntry );
     Size aSize = aBmp.GetSizePixel();
-    if( aSize.Width() > nContextBmpWidthMax )
+    // #97680# ---------------
+    short nWidth = pImp->UpdateContextBmpWidthVector( pEntry, (short)aSize.Width() );
+    if( nWidth > nContextBmpWidthMax )
     {
-        nContextBmpWidthMax = (short)aSize.Width();
+        nContextBmpWidthMax = nWidth;
         SetTabs();
     }
 }
@@ -559,9 +574,11 @@ void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp,
     GetModel()->InvalidateEntry( pEntry );
     SetEntryHeight( pEntry );
     Size aSize = aBmp.GetSizePixel();
-    if( aSize.Width() > nContextBmpWidthMax )
+    // #97680# -----------
+    short nWidth = pImp->UpdateContextBmpWidthVector( pEntry, (short)aSize.Width() );
+    if( nWidth > nContextBmpWidthMax )
     {
-        nContextBmpWidthMax = (short)aSize.Width();
+        nContextBmpWidthMax = nWidth;
         SetTabs();
     }
 }
@@ -1538,6 +1555,9 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
     BOOL bHorSBar = pImp->HasHorScrollBar();
     PreparePaint( pEntry );
 
+    // #97680# ------------------
+    pImp->UpdateContextBmpWidthMax( pEntry );
+
     if( nTreeFlags & TREEFLAG_RECALCTABS )
         SetTabs();
 
@@ -2463,6 +2483,21 @@ void SvTreeListBox::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground)
         pCheckButtonData->SetDefaultImages( this );
 }
 
+BOOL SvTreeListBox::IsCellFocusEnabled() const
+{
+    return pImp->IsCellFocusEnabled();
+}
+
+bool SvTreeListBox::SetCurrentTabPos( USHORT _nNewPos )
+{
+    return pImp->SetCurrentTabPos( _nNewPos );
+}
+
+USHORT SvTreeListBox::GetCurrentTabPos() const
+{
+    return pImp->GetCurrentTabPos();
+}
+
 void SvTreeListBox::InitStartEntry()
 {
     if( !pImp->pStartEntry )
@@ -2560,3 +2595,8 @@ Rectangle SvTreeListBox::GetBoundingRect( SvLBoxEntry* pEntry )
     return aRect;
 }
 
+void SvTreeListBox::EnableCellFocus()
+{
+    pImp->EnableCellFocus();
+}
+
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 00cf861bf1be..8f4335695c4c 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templwin.cxx,v $
  *
- *  $Revision: 1.51 $
+ *  $Revision: 1.52 $
  *
- *  last change: $Author: os $ $Date: 2002-11-29 17:22:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1006,7 +1006,6 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
         aCurrentURL = rURL;
 
     ViewNonEmptyWin();
-
     pEditWin->Clear();
 
     if ( rURL.Len() > 0 && bPreview && xDocInfo.is() )
@@ -1043,37 +1042,42 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
         {
             if ( bPreview )
             {
-                WaitObject aWaitCursor( GetParent() );
-                // disabling must be done here, does not work in ctor because
-                // execute of the dialog will overwrite it
-                // ( own execute method would help )
-                pTextWin->EnableInput( FALSE, TRUE );
-                if ( pTextWin->IsReallyVisible() )
+                if ( m_aOpenURL != aURL.Complete )
                 {
-                    sal_Bool    b = sal_True;
-                    Sequence < PropertyValue > aArgs( 3 );
-                    aArgs[0].Name = ASCII_STR("Preview");
-                    aArgs[0].Value.setValue( &b, ::getBooleanCppuType() );
-                    aArgs[1].Name = ASCII_STR("ReadOnly");
-                    aArgs[1].Value.setValue( &b, ::getBooleanCppuType() );
-                    aArgs[2].Name = ASCII_STR("AsTemplate");    // prevents getting an empty URL with getURL()!
-                    b = sal_False;
-                    aArgs[2].Value.setValue( &b, ::getBooleanCppuType() );
-                    xDisp->dispatch( aURL, aArgs );
-
-                    ::rtl::OUString                                         aDispURL;
-                    Reference< ::com::sun::star::frame::XController >       xCtrl = xFrame->getController();
-                    if( xCtrl.is() )
+                    WaitObject aWaitCursor( GetParent() );
+                    // disabling must be done here, does not work in ctor because
+                    // execute of the dialog will overwrite it
+                    // ( own execute method would help )
+                    pTextWin->EnableInput( FALSE, TRUE );
+                    if ( pTextWin->IsReallyVisible() )
                     {
-                        Reference< ::com::sun::star::frame::XModel >        xMdl = xCtrl->getModel();
-                        if( xMdl.is() )
-                            aDispURL = xMdl->getURL();
-                    }
+                        sal_Bool    b = sal_True;
+                        Sequence < PropertyValue > aArgs( 3 );
+                        aArgs[0].Name = ASCII_STR("Preview");
+                        aArgs[0].Value.setValue( &b, ::getBooleanCppuType() );
+                        aArgs[1].Name = ASCII_STR("ReadOnly");
+                        aArgs[1].Value.setValue( &b, ::getBooleanCppuType() );
+                        aArgs[2].Name = ASCII_STR("AsTemplate");    // prevents getting an empty URL with getURL()!
+                        b = sal_False;
+                        aArgs[2].Value.setValue( &b, ::getBooleanCppuType() );
+                        xDisp->dispatch( aURL, aArgs );
+
+                        ::rtl::OUString                                         aDispURL;
+                        Reference< ::com::sun::star::frame::XController >       xCtrl = xFrame->getController();
+                        if( xCtrl.is() )
+                        {
+                            Reference< ::com::sun::star::frame::XModel >        xMdl = xCtrl->getModel();
+                            if( xMdl.is() )
+                                aDispURL = xMdl->getURL();
+                        }
 
-                    if( aDispURL != aURL.Complete )
-                    {
-                        xFrame->setComponent( Reference < com::sun::star::awt::XWindow >(), Reference < XController >() );
-                        ViewEmptyWin();
+                        if( aDispURL != aURL.Complete )
+                        {
+                            xFrame->setComponent( Reference < com::sun::star::awt::XWindow >(), Reference < XController >() );
+                            ViewEmptyWin();
+                        }
+                        else
+                            m_aOpenURL = aDispURL;
                     }
                 }
             }
@@ -1083,9 +1087,13 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
                 aArgs[0].Name = ASCII_STR("AsTemplate");
                 aArgs[0].Value <<= bAsTemplate;
                 xDisp->dispatch( aURL, aArgs );
+                m_aOpenURL = rtl::OUString();
             }
             else
+            {
                 xDisp->dispatch( aURL, Sequence < PropertyValue >() );
+                m_aOpenURL = rtl::OUString();
+            }
         }
     }
 }
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 85ee9c4e444e..c292f771bc8d 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templwin.hxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: os $ $Date: 2002-11-29 17:22:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -245,6 +245,7 @@ private:
     LanguageType                    eLangType;
     SvtDocInfoTable_Impl            aInfoTable;
     String                          aCurrentURL;
+    ::rtl::OUString                 m_aOpenURL;
     sal_Bool                        bDocInfo;
 
     void                    ShowDocInfo( const String& rURL );
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index 4d9751dbcb7f..5d8ee355cc92 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templwin.src,v $
  *
- *  $Revision: 1.51 $
+ *  $Revision: 1.52 $
  *
- *  last change: $Author: vg $ $Date: 2002-11-27 16:24:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,7 +83,7 @@ String STR_SVT_NEWDOC
     Text[ greek ] = "New Document";
     Text[ dutch ] = "Nieuw document";
     Text[ french ] = "Nouveau document";
-    Text[ spanish ] = "Nuevo documento";
+    Text[ spanish ] = "Documento nuevo";
     Text[ finnish ] = "Uusi asiakirja";
     Text[ italian ] = "Nuovo documento";
     Text[ danish ] = "Nyt dokument";
@@ -129,7 +129,7 @@ String STR_SVT_MYDOCS
     Text[ polish ] = "Moje dokumenty";
     Text[ portuguese_brazilian ] = "My Documents";
     Text[ japanese ] = "マイドキュメント";
-    Text[ korean ] = "고유 문서";
+    Text[ korean ] = "내 문서";
     Text[ chinese_simplified ] = "我的文档";
     Text[ chinese_traditional ] = "我的文件夾";
     Text[ turkish ] = "My Documents";
@@ -167,7 +167,7 @@ String STR_SVT_TEMPLATES
     Text[ polish ] = "Szablony";
     Text[ portuguese_brazilian ] = "Templates";
     Text[ japanese ] = "テンプレート";
-    Text[ korean ] = "템플릿";
+    Text[ korean ] = "서식 파일";
     Text[ chinese_simplified ] = "样式";
     Text[ chinese_traditional ] = "樣式";
     Text[ turkish ] = "Templates";
@@ -204,7 +204,7 @@ String STR_SVT_SAMPLES
     Text[ polish ] = "Przyk�ady";
     Text[ portuguese_brazilian ] = "Samples";
     Text[ japanese ] = "サンプル文書";
-    Text[ korean ] = "예";
+    Text[ korean ] = "샘플 문서";
     Text[ chinese_simplified ] = "示例文档";
     Text[ chinese_traditional ] = "示例";
     Text[ turkish ] = "Samples";
@@ -279,7 +279,7 @@ ToolBox TB_SVT_FILEVIEW
             Text[ polish ] = "Katalog wy�ej";
             Text[ portuguese_brazilian ] = "Higher";
             Text[ japanese ] = "１つ上のフォルダへ";
-            Text[ korean ] = "한 레벨 위로";
+            Text[ korean ] = "한 수준 위로";
             Text[ chinese_simplified ] = "目录向上一层";
             Text[ chinese_traditional ] = "目錄向上一層";
             Text[ turkish ] = "Higher";
@@ -411,7 +411,7 @@ ToolBox TB_SVT_FRAMEWIN
             Text[ polish ] = "W�a�ciwo�ci dokumentu";
             Text[ portuguese_brazilian ] = "Docinfo";
             Text[ japanese ] = "ドキュメントのプロパティ";
-            Text[ korean ] = "문서 등록정보";
+            Text[ korean ] = "문서 등록 정보";
             Text[ chinese_simplified ] = "文档属性";
             Text[ chinese_traditional ] = "文件屬性";
             Text[ turkish ] = "Docinfo";
@@ -512,7 +512,7 @@ ModalDialog DLG_DOCTEMPLATE
     Text[ polish ] = "Szablony i dokumenty";
     Text[ portuguese_brazilian ] = "Templates and Documents";
     Text[ japanese ] = "テンプレートとドキュメント";
-    Text[ korean ] = "스타일과 문서";
+    Text[ korean ] = "서식 파일 및 문서";
     Text[ chinese_simplified ] = "样式和文档";
     Text[ chinese_traditional ] = "樣式和文件";
     Text[ turkish ] = "Templates and Documents";
@@ -754,7 +754,7 @@ StringArray STRARY_SVT_DOCINFO
         < "Modificado por" ; DI_MODIFIEDBY ; > ;
         < "Fecha de impresi�n" ; DI_PRINTDATE ; > ;
         < "Impreso por" ; DI_PRINTBY ; > ;
-        < "Tema" ; DI_THEME ; > ;
+        < "Asunto" ; DI_THEME ; > ;
         < "Tama�o" ; DI_SIZE ; > ;
     };
     ItemList [ finnish ] =
@@ -865,15 +865,15 @@ StringArray STRARY_SVT_DOCINFO
     ItemList [ korean ] =
     {
         < "제목" ; DI_TITLE ; > ;
-        < "(으)로 부터" ; DI_FROM ; > ;
+        < "작성자" ; DI_FROM ; > ;
         < "날짜" ; DI_DATE ; > ;
-        < "키워드들" ; DI_KEYWORDS ; > ;
+        < "키워드" ; DI_KEYWORDS ; > ;
         < "설명" ; DI_DESCRIPTION ; > ;
-        < "내용 유형" ; DI_MIMETYPE ; > ;
-        < "변경 일자" ; DI_MODIFIEDDATE ; > ;
-        < "..에 의해 변경" ; DI_MODIFIEDBY ; > ;
-        < "인쇄일자" ; DI_PRINTDATE ; > ;
-        < "..에 의해 인쇄" ; DI_PRINTBY ; > ;
+        < "유형" ; DI_MIMETYPE ; > ;
+        < "변경 날짜" ; DI_MODIFIEDDATE ; > ;
+        < "변경 날짜" ; DI_MODIFIEDBY ; > ;
+        < "인쇄 날짜" ; DI_PRINTDATE ; > ;
+        < "인쇄 날짜" ; DI_PRINTBY ; > ;
         < "주제" ; DI_THEME ; > ;
         < "크기" ; DI_SIZE ; > ;
     };
@@ -985,7 +985,7 @@ String STR_SVT_NEWDOC_HELP
     Text[ swedish ] = "Klicka h�r f�r att skapa nya dokument.";
     Text[ polish ] = "Click here to create new documents.";
     Text[ japanese ] = "ここをクリックすると、新しいドキュメントが作成できます。";
-    Text[ korean ] = "새 문서를 만들기 위해 여기를 클릭해주십시오.";
+    Text[ korean ] = "새 문서를 만들려면 여기를 클릭해주십시오.";
     Text[ chinese_simplified ] = "在这里您能够建立新的文档。";
     Text[ chinese_traditional ] = "您在此能夠建立新的文件。";
     Text[ turkish ] = "Click here to create new documents.";
@@ -1029,7 +1029,7 @@ String STR_SVT_TEMPLATES_HELP
     Text[ swedish ] = "Inneh�ller mallar f�r att skapa nya dokument";
     Text[ polish ] = "Contains templates for creating new documents";
     Text[ japanese ] = "新しいドキュメントが作成できるテンプレートが含まれています";
-    Text[ korean ] = "새 문서 만들기용 템플릿이 수록되어 있습니다.";
+    Text[ korean ] = "새 문서 만들기용 서식 파일이 수록되어 있습니다.";
     Text[ chinese_simplified ] = "存放用来新增文档的样式文档";
     Text[ chinese_traditional ] = "存放用來新增文件的樣式文件";
     Text[ turkish ] = "Contains templates for creating new documents";
@@ -1051,10 +1051,15 @@ String STR_SVT_SAMPLES_HELP
     Text[ swedish ] = "Inneh�ller exempeldokument f�r brev, rapporter och andra dokument";
     Text[ polish ] = "Contains a selection of sample letters, reports and other documents";
     Text[ japanese ] = "レター、レポート、その他のドキュメントに使えるサンプル文書が含まれています";
-    Text[ korean ] = "편지, 보고서 및 기타 문서용 샘플 문서가 수록되어 있습니다.";
+    Text[ korean ] = "편지, 보고서 및 기타 문서용의 샘플 문서가 수록되어 있습니다.";
     Text[ chinese_simplified ] = "存放一套信件、报表及其他文档的事例文档";
     Text[ chinese_traditional ] = "存放一套信件、報表及其它文件的範例文件";
     Text[ turkish ] = "Contains a selection of sample letters, reports and other documents";
     Text[ arabic ] = "Contains a selection of sample letters, reports and other documents";
 };
 
+
+
+
+
+
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index ccd8ad473119..6d4a98f4b50c 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: treelist.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2002-01-18 18:15:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -179,7 +179,6 @@ void SvTreeEntryList::DestroyAll()
 
 
 
-DBG_NAME( SvTreeList )
 /*************************************************************************
 |*
 |*    SvTreeList::
@@ -192,7 +191,6 @@ DBG_NAME( SvTreeList )
 
 SvTreeList::SvTreeList()
 {
-    DBG_CTOR( SvTreeList, NULL );
     nEntryCount = 0;
     bAbsPositionsValid = FALSE;
     nRefCount = 1;
@@ -213,12 +211,8 @@ SvTreeList::SvTreeList()
 
 SvTreeList::~SvTreeList()
 {
-    DBG_DTOR( SvTreeList, NULL );
-    if ( pRootItem )
-    {
-        Clear();
-        delete pRootItem;
-    }
+    Clear();
+    delete pRootItem;
 #ifdef DBG_UTIL
     pRootItem = 0;
 #endif
@@ -1741,17 +1735,6 @@ SvListView::~SvListView()
 {
     DBG_DTOR(SvListView,0);
     ClearTable();
-
-    // if we still have a model -> remove ourself from it
-    if ( pModel )
-    {
-        pModel->RemoveView( this );
-        if ( pModel->GetRefCount() == 0 )
-        {
-            delete pModel;
-            pModel = NULL;
-        }
-    }
 }
 
 void SvListView::InitTable()
@@ -1836,7 +1819,6 @@ void SvListView::SetModel( SvTreeList* pNewModel )
         ModelNotification( LISTACTION_CLEARING,0,0,0 );
         if ( pModel->GetRefCount() == 0 )
             delete pModel;
-
     }
     pModel = pNewModel;
     InitTable();
diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src
index fee9fe74d78d..b0df13f77581 100644
--- a/svtools/source/control/calendar.src
+++ b/svtools/source/control/calendar.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: calendar.src,v $
  *
- *  $Revision: 1.1.1.9 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kz $ $Date: 2001-08-24 13:13:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,11 +82,12 @@ String STR_SVT_CALENDAR_DAY
     Text[ dutch ] = "Dag";
     Text[ chinese_simplified ] = "天";
     Text[ greek ] = "�����";
-    Text[ korean ] = "일자";
+    Text[ korean ] = "일";
     Text[ turkish ] = "G�n";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "D�a";
+    Text[ catalan ] = "Dia";
     Text[ finnish ] = "P�iv�";
+    Text[ thai ] = "วัน";
 };
 String STR_SVT_CALENDAR_WEEK
 {
@@ -113,8 +114,9 @@ String STR_SVT_CALENDAR_WEEK
     Text[ korean ] = "주";
     Text[ turkish ] = "Hafta";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Semana";
+    Text[ catalan ] = "Setmana";
     Text[ finnish ] = "Viikko";
+    Text[ thai ] = "สัปดาห์";
 };
 String STR_SVT_CALENDAR_TODAY
 {
@@ -141,8 +143,9 @@ String STR_SVT_CALENDAR_TODAY
     Text[ korean ] = "오늘";
     Text[ turkish ] = "Bug�n";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Hoy";
+    Text[ catalan ] = "Avui";
     Text[ finnish ] = "T�n��n";
+    Text[ thai ] = "วันนี้";
 };
 String STR_SVT_CALENDAR_NONE
 {
@@ -158,7 +161,7 @@ String STR_SVT_CALENDAR_NONE
     Text [ french ] = "Aucun(e)" ;
     Text [ dutch ] = "Geen" ;
     Text[ chinese_simplified ] = "无";
-    Text[ russian ] = "���";
+    Text[ russian ] = "�����";
     Text[ polish ] = "brak";
     Text[ japanese ] = "なし";
     Text[ chinese_traditional ] = "無";
@@ -169,8 +172,9 @@ String STR_SVT_CALENDAR_NONE
     Text[ korean ] = "없음";
     Text[ turkish ] = "Yok";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ninguno";
+    Text[ catalan ] = "Cap";
     Text[ finnish ] = "Ei mit��n";
+    Text[ thai ] = "ไม่มี";
 };
 
 
@@ -178,3 +182,12 @@ String STR_SVT_CALENDAR_NONE
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 8e85a3254697..17f225882e35 100644
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ctrlbox.src,v $
  *
- *  $Revision: 1.47 $
+ *  $Revision: 1.48 $
  *
- *  last change: $Author: rt $ $Date: 2002-11-27 16:23:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -178,7 +178,7 @@ String STR_SVT_COLLATE_NORMAL
     Text[ polish ] = "Standard";
     Text[ portuguese_brazilian ] = "Normal";
     Text[ japanese ] = "通常の字体";
-    Text[ korean ] = "정상";
+    Text[ korean ] = "일반";
     Text[ chinese_simplified ] = "一般";
     Text[ chinese_traditional ] = "一般";
     Text[ turkish ] = ", standart";
@@ -206,7 +206,7 @@ String STR_SVT_COLLATE_CHARSET
     Text[ polish ] = "Zbi�r znak�w";
     Text[ portuguese_brazilian ] = "Character Set";
     Text[ japanese ] = "文字種";
-    Text[ korean ] = "문자 집합";
+    Text[ korean ] = "문자집합";
     Text[ chinese_simplified ] = "字符集";
     Text[ chinese_traditional ] = "字型";
     Text[ turkish ] = "Character Set";
@@ -251,7 +251,7 @@ String STR_SVT_COLLATE_PINYIN
     Text [ ENGLISH ] = "Pinyin" ;
     Text[ english_us ] = "Pinyin";
     Text[ portuguese ] = "Pinyin";
-    Text[ russian ] = "Pinyin";
+    Text[ russian ] = "�������";
     Text[ greek ] = "Pinyin";
     Text[ dutch ] = "Pinyin";
     Text[ french ] = "Pinyin";
@@ -262,7 +262,7 @@ String STR_SVT_COLLATE_PINYIN
     Text[ polish ] = "Pinyin";
     Text[ portuguese_brazilian ] = "Pinyin";
     Text[ japanese ] = "ピンイン(中国語のローマ字表記法)";
-    Text[ korean ] = "Pinyin";
+    Text[ korean ] = "한어병음";
     Text[ chinese_simplified ] = "拼音";
     Text[ chinese_traditional ] = "拼音";
     Text[ turkish ] = "Pinyin";
@@ -290,7 +290,7 @@ String STR_SVT_COLLATE_STROKE
     Text[ polish ] = "Kreski (stroke)";
     Text[ portuguese_brazilian ] = "Stroke";
     Text[ japanese ] = "総画数";
-    Text[ korean ] = "스트로크";
+    Text[ korean ] = "획수";
     Text[ chinese_simplified ] = "笔画";
     Text[ chinese_traditional ] = "筆畫";
     Text[ turkish ] = "Stroke";
@@ -318,7 +318,7 @@ String STR_SVT_COLLATE_RADICAL
     Text[ polish ] = "Korze�-rdze�";
     Text[ portuguese_brazilian ] = "Radical";
     Text[ japanese ] = "漢字の部首";
-    Text[ korean ] = "극단";
+    Text[ korean ] = "부수";
     Text[ chinese_simplified ] = "部首";
     Text[ chinese_traditional ] = "部首";
     Text[ turkish ] = "Radical";
@@ -363,7 +363,7 @@ String STR_SVT_COLLATE_ZHUYIN
     Text [ ENGLISH ] = "Zhuyin" ;
     Text[ english_us ] = "Zhuyin";
     Text[ portuguese ] = "Zhuyin";
-    Text[ russian ] = "Zhuyin";
+    Text[ russian ] = "������";
     Text[ greek ] = "Zhuyin";
     Text[ dutch ] = "Zhuyin";
     Text[ french ] = "Zhuyin";
@@ -374,7 +374,7 @@ String STR_SVT_COLLATE_ZHUYIN
     Text[ polish ] = "Zhuyin";
     Text[ portuguese_brazilian ] = "Zhuyin";
     Text[ japanese ] = "注音（中国語の漢字の発音を表記するための表記文字）";
-    Text[ korean ] = "Zhuyin";
+    Text[ korean ] = "한어주음";
     Text[ chinese_simplified ] = "注音";
     Text[ chinese_traditional ] = "注音";
     Text[ turkish ] = "Zhuyin";
@@ -422,7 +422,7 @@ String STR_SVT_COLLATE_PHONETIC_F
     Text[ finnish ] = "Phonetic (alphanumeric first)";
     Text[ italian ] = "Fonetico (alfanumerico prima)";
     Text[ danish ] = "Phonetic (alphanumeric first)";
-    Text[ swedish ] = "Phonetiskt (alfanumeriskt f�rst)";
+    Text[ swedish ] = "Fonetiskt (alfanumeriskt f�rst)";
     Text[ polish ] = "Phonetic (alphanumeric first)";
     Text[ portuguese_brazilian ] = "Phonetic (alphanumeric first)";
     Text[ japanese ] = "読み（英数字を先に）";
@@ -533,7 +533,7 @@ String STR_SVT_INDEXENTRY_PINYIN
     Text[ polish ] = "Pinyin";
     Text[ portuguese_brazilian ] = "Pinyin";
     Text[ japanese ] = "ピンイン（中国語のローマ字表記法）";
-    Text[ korean ] = "중국어 병음";
+    Text[ korean ] = "한어병음";
     Text[ chinese_simplified ] = "拼音";
     Text[ chinese_traditional ] = "拼音";
     Text[ turkish ] = "Pinyin";
@@ -614,7 +614,7 @@ String STR_SVT_INDEXENTRY_ZHUYIN
     Text[ polish ] = "Zhuyin";
     Text[ portuguese_brazilian ] = "Zhuyin";
     Text[ japanese ] = "注音（中国語の漢字の発音を表記するための表記文字）";
-    Text[ korean ] = "중국어 주음";
+    Text[ korean ] = "한어주음";
     Text[ chinese_simplified ] = "注音";
     Text[ chinese_traditional ] = "注音";
     Text[ turkish ] = "Zhuyin";
@@ -636,7 +636,7 @@ String STR_SVT_INDEXENTRY_PHONETIC_FS
     Text[ finnish ] = "Phonetic (alphanumeric first, grouped by syllables)";
     Text[ italian ] = "Fonetico (alfanumerico prima ordinato per sillabe)";
     Text[ danish ] = "Phonetic (alphanumeric first, grouped by syllables)";
-    Text[ swedish ] = "Phonetiskt (alfanumeriskt f�rst, grupperat efter stavelser)";
+    Text[ swedish ] = "Fonetiskt (alfanumeriskt f�rst, grupperat efter stavelser)";
     Text[ polish ] = "Phonetic (alphanumeric first, grouped by syllables)";
     Text[ portuguese_brazilian ] = "Phonetic (alphanumeric first, grouped by syllables)";
     Text[ japanese ] = "読み（英数字を先に、あいうえお順）";
@@ -714,7 +714,7 @@ String STR_SVT_INDEXENTRY_PHONETIC_LC
     Text[ finnish ] = "Phonetic (alphanumeric last, grouped by consonants)";
     Text[ italian ] = "Fonetico (alfanumerico ultimo, ordinato per consonanti)";
     Text[ danish ] = "Phonetic (alphanumeric last, grouped by consonants)";
-    Text[ swedish ] = "Phonetiskt (alfanumeriskt sist, grupperat efter konsonanter)";
+    Text[ swedish ] = "Fonetiskt (alfanumeriskt sist, grupperat efter konsonanter)";
     Text[ polish ] = "Phonetic (alphanumeric last, grouped by consonants)";
     Text[ portuguese_brazilian ] = "Phonetic (alphanumeric last, grouped by consonants)";
     Text[ japanese ] = "読み（英数字を後に、あかさたな順）";
@@ -727,3 +727,8 @@ String STR_SVT_INDEXENTRY_PHONETIC_LC
     Text[ thai ] = "Phonetic (alphanumeric last, grouped by consonants)";
 };
 
+
+
+
+
+
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 02ea326684d3..9cab1bdd792b 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ctrltool.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mt $ $Date: 2001-08-28 10:23:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -427,7 +427,7 @@ FontList::~FontList()
 {
     // Gegebenenfalls SizeArray loeschen
     if ( mpSizeAry )
-        delete mpSizeAry;
+        delete[] mpSizeAry;
 
     // FontInfos loeschen
     ImplFontListNameInfo* pData = (ImplFontListNameInfo*)First();
@@ -840,7 +840,7 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const
     // Size-Array vorher loeschen
     if ( mpSizeAry )
     {
-        delete ((FontList*)this)->mpSizeAry;
+        delete[] ((FontList*)this)->mpSizeAry;
         ((FontList*)this)->mpSizeAry = NULL;
     }
 
diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src
index e00a46a29171..1edcdc8ff703 100644
--- a/svtools/source/control/ctrltool.src
+++ b/svtools/source/control/ctrltool.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ctrltool.src,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:11:30 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,7 @@ String STR_SVT_STYLE_LIGHT
     Text [ spanish ] = "Light" ;
     Text [ french ] = "Light" ;
     Text [ dutch ] = "Light" ;
-    Text [ swedish ] = "Ljus" ;
+    Text [ swedish ] = "Mager" ;
     Text [ danish ] = "Light" ;
     Text [ portuguese_brazilian ] = "Light" ;
     Text [ portuguese ] = "Claro" ;
@@ -80,11 +80,12 @@ String STR_SVT_STYLE_LIGHT
     Text[ chinese_traditional ] = "細";
     Text[ arabic ] = "����";
     Text[ greek ] = "�����";
-    Text[ korean ] = "얇게";
+    Text[ korean ] = "밝게";
     Text[ turkish ] = "�nce";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Light";
+    Text[ catalan ] = "Clar";
     Text[ finnish ] = "Vaalea";
+    Text[ thai ] = "น้อย";
 };
 
 String STR_SVT_STYLE_LIGHT_ITALIC
@@ -93,10 +94,10 @@ String STR_SVT_STYLE_LIGHT_ITALIC
     Text [ ENGLISH ] = "Light Italic" ;
     Text [ english_us ] = "Light Italic" ;
     Text [ italian ] = "Corsivo Light" ;
-    Text [ spanish ] = "Cursiva light" ;
+    Text [ spanish ] = "Cursiva ligera" ;
     Text [ french ] = "Italique Light" ;
     Text [ dutch ] = "Light Cursief" ;
-    Text [ swedish ] = "Ljus kursiv" ;
+    Text [ swedish ] = "Mager kursiv" ;
     Text [ danish ] = "Light kursiv" ;
     Text [ portuguese_brazilian ] = "Light Italic" ;
     Text [ portuguese ] = "It�lico claro" ;
@@ -107,11 +108,12 @@ String STR_SVT_STYLE_LIGHT_ITALIC
     Text[ chinese_traditional ] = "細斜體";
     Text[ arabic ] = "���� ����";
     Text[ greek ] = "������ �����";
-    Text[ korean ] = "가는 이탤릭체";
+    Text[ korean ] = "섬세한 이탤릭체";
     Text[ turkish ] = "�nce italik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cursiva light";
-    Text[ finnish ] = "Kevyt kursivointi";
+    Text[ catalan ] = "Cursiva lleu";
+    Text[ finnish ] = "Kevyesti kursivoitu";
+    Text[ thai ] = "เอียงน้อย";
 };
 
 String STR_SVT_STYLE_NORMAL
@@ -122,12 +124,12 @@ String STR_SVT_STYLE_NORMAL
     Text [ italian ] = "Standard" ;
     Text [ spanish ] = "Predeterminado" ;
     Text [ french ] = "Normal" ;
-    Text [ dutch ] = "Normaal" ;
+    Text [ dutch ] = "Standaard" ;
     Text [ swedish ] = "Standard" ;
     Text [ danish ] = "Normal" ;
     Text [ portuguese_brazilian ] = "Normal" ;
     Text [ portuguese ] = "Padr�o" ;
-    Text[ russian ] = "��������";
+    Text[ russian ] = "�������";
     Text[ polish ] = "Domy�lnie";
     Text[ japanese ] = "標準";
     Text[ chinese_simplified ] = "标准";
@@ -137,8 +139,9 @@ String STR_SVT_STYLE_NORMAL
     Text[ korean ] = "보통";
     Text[ turkish ] = "Normal";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Predeterminado";
-    Text[ finnish ] = "S??nn?linen";
+    Text[ catalan ] = "Normal";
+    Text[ finnish ] = "S��nn�llinen";
+    Text[ thai ] = "ปกติ";
 };
 
 String STR_SVT_STYLE_NORMAL_ITALIC
@@ -165,7 +168,8 @@ String STR_SVT_STYLE_NORMAL_ITALIC
     Text[ turkish ] = "�talik";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Cursiva";
-    Text[ finnish ] = "Kursivointi";
+    Text[ finnish ] = "Kursivoitu";
+    Text[ thai ] = "เอียง";
 };
 
 String STR_SVT_STYLE_BOLD
@@ -191,8 +195,9 @@ String STR_SVT_STYLE_BOLD
     Text[ korean ] = "굵게";
     Text[ turkish ] = "Kal�n";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Negrita";
-    Text[ finnish ] = "Lihavointi";
+    Text[ catalan ] = "Negreta";
+    Text[ finnish ] = "Lihavoitu";
+    Text[ thai ] = "หนา";
 };
 
 String STR_SVT_STYLE_BOLD_ITALIC
@@ -215,11 +220,12 @@ String STR_SVT_STYLE_BOLD_ITALIC
     Text[ chinese_traditional ] = "粗斜體";
     Text[ arabic ] = "���� ����";
     Text[ greek ] = "������ ������";
-    Text[ korean ] = "굵은 이탤릭체";
+    Text[ korean ] = "이탤릭체(굵게)";
     Text[ turkish ] = "Kal�n italik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cursiva negrita";
-    Text[ finnish ] = "Lihavointi ja kursivointi";
+    Text[ catalan ] = "Negreta cursiva";
+    Text[ finnish ] = "Lihavoitu ja kursivoitu";
+    Text[ thai ] = "หนาเอียง";
 };
 
 String STR_SVT_STYLE_BLACK
@@ -245,8 +251,9 @@ String STR_SVT_STYLE_BLACK
     Text[ greek ] = "�����";
     Text[ korean ] = "검게";
     Text[ turkish ] = "Siyah";
-    Text[ catalan ] = "Black";
+    Text[ catalan ] = "Negre";
     Text[ finnish ] = "Musta";
+    Text[ thai ] = "ดำ";
 };
 
 String STR_SVT_STYLE_BLACK_ITALIC
@@ -270,10 +277,11 @@ String STR_SVT_STYLE_BLACK_ITALIC
     Text[ chinese_traditional ] = "黑斜體";
     Text[ arabic ] = "���� ����";
     Text[ greek ] = "������ �����";
-    Text[ korean ] = "검게, 이탤릭체";
+    Text[ korean ] = "검게 이탤릭체";
     Text[ turkish ] = "Siyah italik";
-    Text[ catalan ] = "Cursiva black";
-    Text[ finnish ] = "Musta kursivointi";
+    Text[ catalan ] = "Negra cursiva";
+    Text[ finnish ] = "Musta kursivoitu";
+    Text[ thai ] = "ดำเอียง";
 };
 
 /*
@@ -296,24 +304,25 @@ String STR_SVT_FONTMAP_BOTH
     TEXT [ italian ] = "Questo tipo di carattere verr� utilizzato sia per lo schermo che per la stampante." ;
     TEXT [ portuguese_brazilian ] = "Esta mesma fonte ser  utilizada na impressora e na tela." ;
     TEXT [ portuguese ] = "O tipo de letra utilizado para a impressora e para o ecr� � o mesmo." ;
-    TEXT [ finnish ] = "Samaa fonttia k?ytet??n sek? tulostimessa ett? n?yt?s?." ;
+    TEXT [ finnish ] = "Samaa fonttia k�ytet��n sek� tulostimessa ett� n�yt�ss�." ;
     TEXT [ danish ] = "Denne skrifttype vil blive brugt b�de p� sk�rmen og p� printeren." ;
     TEXT [ french ] = "La m�me police est utilis�e pour l'impression et l'affichage � l'�cran." ;
     TEXT [ swedish ] = "Samma teckensnitt anv�nds f�r b�de skrivare och bildsk�rm." ;
     TEXT [ dutch ] = "Dit lettertype wordt voor zowel de printer als het scherm gebruikt." ;
-    TEXT [ spanish ] = "Se usar� la misma fuente en la impresora y en pantalla" ;
+    TEXT [ spanish ] = "Se usar� la misma fuente en la impresora y en la pantalla." ;
     TEXT [ english_us ] = "The same font will be used on both your printer and your screen." ;
     TEXT[ chinese_simplified ] = "屏幕显示和打印使用同一种字体。";
     TEXT[ russian ] = "��� ������ � ������ �� ����� ������������ ���� � ��� �� �����";
     TEXT[ polish ] = "U�yj tej samej czcionki dla wydruku i ekranu";
-    TEXT[ japanese ] = "印刷と画面表示には同じﾌｫﾝﾄが使用されます。";
+    TEXT[ japanese ] = "印刷と画面表示には同じフォントが使用されます。";
     TEXT[ chinese_traditional ] = "螢幕顯示和列印使用統一的字型";
     TEXT[ arabic ] = "��� ��� ������� ��� ���� ������� �������.";
     TEXT[ greek ] = "� ������������� ���� �� �������������� ��� ��� ����� ��� ��� ��� ��������.";
-    TEXT[ korean ] = "프린터와 화면에는 같은 글꼴이 사용될 것 입니다.";
+    TEXT[ korean ] = "프린터와 화면에는 같은 글꼴이 사용됩니다.";
     TEXT[ turkish ] = "Yazd�rma ve ekranda g�r�nt�leme i�in ayn� yaz�tipi kullan�lacak.";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Se usar� la misma fuente en la impresora y en pantalla";
+    TEXT[ catalan ] = "S'utilitzar� el mateix tipus de lletra a la impressora i a la pantalla";
+    TEXT[ thai ] = "ตัวอักษรเหมือนกันจะถูกใช้บนเครื่องพิมพ์และจอภาพของคุณทั้งคู่";
 };
 
 String STR_SVT_FONTMAP_PRINTERONLY
@@ -324,7 +333,7 @@ String STR_SVT_FONTMAP_PRINTERONLY
     TEXT [ italian ] = "Il tipo di carattere visualizzato differisce da quello stampato." ;
     TEXT [ portuguese_brazilian ] = "Esta ? uma fonte de impressora. A imagem na tela pode n?o corresponder exatamente." ;
     TEXT [ portuguese ] = "Letra de impressora. A letra vista no ecr� pode apresentar um pequeno desvio." ;
-    TEXT [ finnish ] = "T?m? on tulostinfontti. N?ytt?uva saattaa olla erilainen." ;
+    TEXT [ finnish ] = "T�m� on tulostinfontti. N�ytt�kuva saattaa olla erilainen." ;
     TEXT [ danish ] = "Dette er en printerskrifttype. Sk�rmbilledet svarer muligvis ikke helt til printerskrifttypen." ;
     TEXT [ french ] = "Police d'imprimante. L'affichage et l'impression ne seront pas toujours identiques." ;
     TEXT [ swedish ] = "Detta �r ett skrivarteckensnitt. Visningen p� sk�rmbilden kan avvika n�got." ;
@@ -332,15 +341,16 @@ String STR_SVT_FONTMAP_PRINTERONLY
     TEXT [ spanish ] = "Fuente de impresora. La imagen en pantalla podr�a ser diferente." ;
     TEXT [ english_us ] = "This is a printer font. The screen image may differ." ;
     TEXT[ chinese_simplified ] = "这是打印字体。屏幕显示的字体与其可能会有些偏差。";
-    TEXT[ russian ] = "����� ������. �� ������ ����� ������� ����������.";
+    TEXT[ russian ] = "����� ��������. ����������� �� ������ ����� ����������.";
     TEXT[ polish ] = "Czcionka drukarkowa. Obraz czcionek na ekranie mo�e si� troch� r�ni�.";
-    TEXT[ japanese ] = "ﾌﾟﾘﾝﾀ用のﾌｫﾝﾄです。画面表示とは少し異なります。";
+    TEXT[ japanese ] = "プリンタ用のフォントです。画面表示とは少し異なります。";
     TEXT[ chinese_traditional ] = "列印字型。螢幕顯示字型可能略微有些偏差。";
     TEXT[ arabic ] = "��� �� �������. �� ����� ������ ��� ������ ��� ����.";
     TEXT[ greek ] = "������������� ��������. � �������� ��� ���� ����� ����� ������� �� ��������.";
     TEXT[ korean ] = "이것은 프린터 글꼴입니다. 화면 이미지는 일부 다를 수 있습니다.";
     TEXT[ turkish ] = "Yaz�c� yaz�tipi. Ekrandaki g�r�nt� biraz farkl� olabilir.";
-    TEXT[ catalan ] = "Fuente de impresora. La imagen en pantalla podr�a ser diferente.";
+    TEXT[ catalan ] = "Lletra d'impressora. La imatge de pantalla podria ser diferent.";
+    TEXT[ thai ] = "นี้คือเครื่องพิมพ์ตัวอักษร จอภาพจะแตกต่างไป";
 };
 
 String STR_SVT_FONTMAP_SCREENONLY
@@ -351,7 +361,7 @@ String STR_SVT_FONTMAP_SCREENONLY
     TEXT [ italian ] = "Questo � un carattere per lo schermo. La stampa pu� essere leggermente diversa." ;
     TEXT [ portuguese_brazilian ] = "Esta ? uma fonte de tela. A imagem impressa pode n?o corresponder exatamente." ;
     TEXT [ portuguese ] = "Letra de ecr�. A letra impressa pode apresentar um pequeno desvio." ;
-    TEXT [ finnish ] = "T?m? on n?ytt?ontti. Tulostinkuva saattaa olla erilainen." ;
+    TEXT [ finnish ] = "T�m� on n�ytt�fontti. Tulostinkuva saattaa olla erilainen." ;
     TEXT [ danish ] = "Dette er en sk�rmskrifttype. Udskriften kan muligvis afvige lidt." ;
     TEXT [ french ] = "Police d'�cran. L'impression et l'affichage ne seront pas toujours identiques." ;
     TEXT [ swedish ] = "Detta �r ett sk�rmteckensnitt. Utskriften kan vara l�tt avvikande." ;
@@ -359,15 +369,16 @@ String STR_SVT_FONTMAP_SCREENONLY
     TEXT [ spanish ] = "Fuente de pantalla. La imagen en la impresora podr�a ser diferente." ;
     TEXT [ english_us ] = "This is a screen font. The printer image may differ." ;
     TEXT[ chinese_simplified ] = "这是屏幕字体。打印出来的字体与其可能会有一些偏差。";
-    TEXT[ russian ] = "����� ������. � ������ ����� ���� ����������.";
+    TEXT[ russian ] = "����� ������. ��� ������ ����� ���� �������.";
     TEXT[ polish ] = "To jest czcionka ekranowa. Wydruk b�dzie si� troch� r�ni�.";
-    TEXT[ japanese ] = "画面用のﾌｫﾝﾄです。印刷ｲﾒｰｼﾞとは少し異なります。";
+    TEXT[ japanese ] = "画面用のフォントです。印刷イメージとは少し異なります。";
     TEXT[ chinese_traditional ] = "螢幕字型。列印出可能會有一些偏差。";
     TEXT[ arabic ] = "��� �� ����. �� ����� ������ ��� ����� ������� ��� ����.";
     TEXT[ greek ] = "������������� ������. � �������� ��� ���� �������� ����� ������� �� ��������.";
-    TEXT[ korean ] = "이것은 화면 글꼴 입니다. 프린터 이미지는 일부 다를 수 있습니다.";
+    TEXT[ korean ] = "이것은 화면 글꼴입니다. 프린터 이미지는 일부 다를 수 있습니다.";
     TEXT[ turkish ] = "Ekran yaz�tipi. Yazd�rma biraz farkl� olabilir.";
-    TEXT[ catalan ] = "Fuente de pantalla. La imagen en la impresora podr�a ser diferente.";
+    TEXT[ catalan ] = "Lletra de pantalla. La imatge a la impressora podria ser diferent.";
+    TEXT[ thai ] = "นี้คือจอภาพตัวอักษร  ภาพเครื่องพิมพ์จะอตกต่างออกไป";
 };
 
 String STR_SVT_FONTMAP_SIZENOTAVAILABLE
@@ -376,9 +387,9 @@ String STR_SVT_FONTMAP_SIZENOTAVAILABLE
     TEXT [ English ] = "This font size is not installed. The closest available size will be used." ;
     TEXT[ english_us ] = "This font size has not been installed. The closest available size will be used.";
     TEXT[ portuguese ] = "Este tamanho de letra n�o est� instalado. Ser� utilizado o tamanho dispon�vel mais adequado.";
-    TEXT[ russian ] = "����� ������ ������ �� �������������. ������� ����� ����������� �������� ���������� ������.";
+    TEXT[ russian ] = "����� ������ ������ �� ����������. ����� ����������� �������� ������� ������.";
     TEXT[ greek ] = "�� ������� ��� �������������� ��� ���� ������������. ��������������� �� ����������� �������.";
-    TEXT[ dutch ] = "Deze schriftgrootte is niet ge�nstalleerd. De meest passende voorhanden zijnde grootte wordt toegepast.";
+    TEXT[ dutch ] = "Deze schriftgrootte is niet ge�nstalleerd. De meest overeenkomende beschikbare grootte wordt toegepast.";
     TEXT[ french ] = "Cette taille de police n'a pas �t� install�e. La taille disponible la plus appropri�e va �tre utilis�e.";
     TEXT[ spanish ] = "Este tama�o de fuente no est� instalado. Se usar� el tama�o disponible m�s adecuado.";
     TEXT[ italian ] = "Il font delle dimensioni indicate non � installato. Il programma utilizzer� le dimensioni disponibili.";
@@ -386,14 +397,15 @@ String STR_SVT_FONTMAP_SIZENOTAVAILABLE
     TEXT[ swedish ] = "Den h�r teckenstorleken �r inte installerad. Den tillg�ngliga storlek som passar b�st anv�nds.";
     TEXT[ polish ] = "Dany rozmiar czcionki nie jest zaistalowany. U�yty zostanie najbardziej pasuj�cy, ju� istniej�ca rozmiar.";
     TEXT[ portuguese_brazilian ] = "This font size is not installed. The closest available size will be used.";
-    TEXT[ japanese ] = "このﾌｫﾝﾄｻｲｽﾞはｲﾝｽﾄｰﾙされていません。最も適切なｻｲｽﾞが選ばれます。";
+    TEXT[ japanese ] = "このフォントサイズはインストールされていません。最も適切なサイズが選ばれます。";
     TEXT[ korean ] = "이 글꼴의 크기는 설치되지 않았습니다. 기존의 가장 적합한 크기가 사용됩니다.";
     TEXT[ chinese_simplified ] = "没有安装这种字体大小。使用的是现有的最接近的字体大小。";
     TEXT[ chinese_traditional ] = "沒有安裝這個字型。採用最近似的字型。";
     TEXT[ arabic ] = "��� ���� ��� ��� ����. ��� ��� ������� ���� ������� �������� ����� ��.";
     TEXT[ turkish ] = "Bu yaz�tipi boyu y�klenmedi. Mevcut boylardan en uygun olan� kullan�lacak.";
-    TEXT[ catalan ] = "Este tama�o de fuente no est� instalado. Se usar� el tama�o disponible m�s adecuado.";
-    TEXT[ finnish ] = "T?t? fonttikokoa ei ole asennettu. L?hint? k?ytett?viss? olevaa kokoa k?ytet??n.";
+    TEXT[ catalan ] = "Aquesta mida de lletra no est� instal.lada. S'utilitzar� la mida disponible m�s adequada.";
+    TEXT[ finnish ] = "T�t� fonttikokoa ei ole asennettu. L�hint� k�ytett�viss� olevaa kokoa k�ytet��n.";
+    TEXT[ thai ] = "ยังไม่ได้ติดตั้งขนาดตัวอักษรนี้   ขนาดที่ใกล้ที่สุดจะถูกใช้ได้";
 };
 
 String STR_SVT_FONTMAP_STYLENOTAVAILABLE
@@ -402,9 +414,9 @@ String STR_SVT_FONTMAP_STYLENOTAVAILABLE
     TEXT [ English ] = "This font style will be generated or the closest matching style will be used." ;
     TEXT[ english_us ] = "This font style will be simulated or the closest matching style will be used.";
     TEXT[ portuguese ] = "Este estilo de letra ser� simulado ou ser� utilizado o estilo dispon�vel mais adequado.";
-    TEXT[ russian ] = "����� ������ ���� ����� ����� ������, ���� ����� ����������� �������� �������.";
+    TEXT[ russian ] = "����� ������ ����� ����� ������ ��� ����� ����������� �������� �������.";
     TEXT[ greek ] = "�� ���� ���� �������������� �� ���������� � �� �������������� �� ����������� ����..";
-    TEXT[ dutch ] = "Dit lettertype wordt nagebootst of het meest overeenkomende voorhanden zijnde type wordt gebruikt.";
+    TEXT[ dutch ] = "Dit lettertype wordt nagebootst of het meest overeenkomende beschikbare type wordt gebruikt.";
     TEXT[ french ] = "Ce style de police sera imit� ou le style le plus appropri� sera utilis�.";
     TEXT[ spanish ] = "Se imitar� este estilo de fuente o se usar� el m�s adecuado.";
     TEXT[ italian ] = "Verr� riprodotto lo stile di questo font oppure verr� utilizzato quello che gli � pi� simile.";
@@ -412,15 +424,16 @@ String STR_SVT_FONTMAP_STYLENOTAVAILABLE
     TEXT[ swedish ] = "Det h�r teckensnittet efterbildas eller n�rmast motsvarande teckensnitt anv�nds.";
     TEXT[ polish ] = "Dany styl czcionki zostanie skopiowany lub zostanie u�yty najlepiej pasuj�cy styl.";
     TEXT[ portuguese_brazilian ] = "This font style will be generated or the closest matching style will be used.";
-    TEXT[ japanese ] = "このﾌｫﾝﾄｽﾀｲﾙは修正されるか、または最も適切なｽﾀｲﾙが使用されます。";
-    TEXT[ korean ] = "이 글꼴체에 가장 적합한 글꼴체가 사용됩니다.";
+    TEXT[ japanese ] = "このフォントスタイルは修正されるか、または最も適切なスタイルが使用されます。";
+    TEXT[ korean ] = "이 글꼴 스타일을 모의하거나 가장 적합한 글꼴 스타일이 사용됩니다.";
     TEXT[ chinese_simplified ] = "生成这种字体或使用最接近的字体。";
     TEXT[ chinese_traditional ] = "模仿這個字型或採用最近似的字型。";
     TEXT[ arabic ] = "��� ��� ����� ��� ���� ��ǡ �� ��� ��� ������� ���� ���� ��.";
     TEXT[ turkish ] = "Bu yaz�tipi taklit edilecek ya da en uygun olan bi�im kullan�lacak.";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Se imitar� este estilo de fuente o se usar� el m�s adecuado.";
-    TEXT[ finnish ] = "T?m? fonttityyli simuloidaan tai l?hint? vastaavaa tyyli? k?ytet??n.";
+    TEXT[ catalan ] = "S'imitar� aquest estil de lletra o s'utilitzar� el m�s adequat.";
+    TEXT[ finnish ] = "T�m� fonttityyli simuloidaan tai l�hint� vastaavaa tyyli� k�ytet��n.";
+    TEXT[ thai ] = "จำลองลักษณะตัวอักษรนี้หรือลักษณะที่ตรงกันมากที่สุดจะถูกใช้";
 };
 
 String STR_SVT_FONTMAP_NOTAVAILABLE
@@ -429,9 +442,9 @@ String STR_SVT_FONTMAP_NOTAVAILABLE
     TEXT [ English ] = "This font is not installed. The closest available font will be used." ;
     TEXT[ english_us ] = "This font has not been installed. The closest available font will be used.";
     TEXT[ portuguese ] = "Este tipo de letra n�o est� instalado. Ser� utilizado o tipo de letra dispon�vel mais adequado.";
-    TEXT[ russian ] = "���� ��� ������ �� �������������. ������� ����� ����������� ���� �� �������� ����������.";
+    TEXT[ russian ] = "���� ����� �� ����������. ����� ����������� �������� �������.";
     TEXT[ greek ] = "� ������������� ��� ���� ������������. ��������������� � ����������� (��� ����� ���������������) �������������.";
-    TEXT[ dutch ] = "Dit lettertype is niet ge�nstalleerd. Het meest overeenkomende voorhanden zijnde type wordt gebruikt.";
+    TEXT[ dutch ] = "Dit lettertype is niet ge�nstalleerd. Het meest overeenkomende beschikbare type wordt gebruikt.";
     TEXT[ french ] = "Ce type de police n'a pas �t� install�. Le type de police le plus appropri� va �tre utilis�.";
     TEXT[ spanish ] = "Esta fuente no est� instalada. Se usar� la fuente existente m�s adecuada.";
     TEXT[ italian ] = "Questo font non � installato. Il programma utilizzer� il font che gli � pi� simile.";
@@ -439,14 +452,15 @@ String STR_SVT_FONTMAP_NOTAVAILABLE
     TEXT[ swedish ] = "Det h�r teckensnittet �r inte installerat. Det tillg�ngliga teckensnitt som passar b�st anv�nds.";
     TEXT[ polish ] = "Dana czcionka nie jest zainstalowana.U�yta zostanie najbardziej pasuj�ca, ju� istniej�ca czcionka.";
     TEXT[ portuguese_brazilian ] = "This font is not installed. The closest available font will be used.";
-    TEXT[ japanese ] = "このﾌｫﾝﾄはｲﾝｽﾄｰﾙされていません。最も適切なﾌｫﾝﾄが選ばれます。";
+    TEXT[ japanese ] = "このフォントはインストールされていません。最も適切なフォントが選ばれます。";
     TEXT[ korean ] = "이 글꼴은 설치되지 않았습니다. 기존의 가장 적합한 글꼴이 사용됩니다.";
     TEXT[ chinese_simplified ] = "没有安装这种字体。使用的是现有的最接近的字体。";
     TEXT[ chinese_traditional ] = "沒有安裝這個字型。採用最近似的字型。";
     TEXT[ arabic ] = "��� ���� ��� ����. ��� ��� ������� ���� ������ �������� ����� ��.";
     TEXT[ turkish ] = "Bu yaz�tipi y�klenmedi. Mevcut yaz�tiplerinden en uygun olan� kullan�lacak.";
-    TEXT[ catalan ] = "Esta fuente no est� instalada. Se usar� la fuente existente m�s adecuada.";
-    TEXT[ finnish ] = "T?t? fonttia ei ole asennettu. L?hint? k?ytett?viss? olevaa fonttia k?ytet??n.";
+    TEXT[ catalan ] = "Aquest tipus de lletra no est� instal.lat. S'utilitzar� la lletra existent m�s adequada.";
+    TEXT[ finnish ] = "T�t� fonttia ei ole asennettu. L�hint� k�ytett�viss� olevaa fonttia k�ytet��n.";
+    TEXT[ thai ] = "ยังไม่ได้ติดตั้งตัวอักษรนี้ ตัวอักษรที่ใกล้เคียงมากที่สุดจะถูกใช้";
 };
 
 
@@ -461,3 +475,10 @@ String STR_SVT_FONTMAP_NOTAVAILABLE
 
 
 
+
+
+
+
+
+
+
diff --git a/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src
index 5e961f51cea4..3bcb85849786 100644
--- a/svtools/source/control/filectrl.src
+++ b/svtools/source/control/filectrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filectrl.src,v $
  *
- *  $Revision: 1.1.1.5 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kz $ $Date: 2001-08-08 09:05:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,7 @@ String STR_FILECTRL_BUTTONTEXT
     Text [ swedish ] = "Genoms�k..." ;
     Text [ danish ] = "Gennemse..." ;
     Text [ italian ] = "Sfoglia..." ;
-    Text [ spanish ] = "Examinar..." ;
+    Text [ spanish ] = "Buscar..." ;
     Text [ french ] = "Parcourir..." ;
     Text [ dutch ] = "Bladeren..." ;
     Text [ portuguese ] = "Pesquisar..." ;
@@ -82,8 +82,18 @@ String STR_FILECTRL_BUTTONTEXT
     Text[ greek ] = "���������...";
     Text[ korean ] = "찾아보기...";
     Text[ turkish ] = "Tara...";
-    Text[ catalan ] = "Examinar...";
-    Text[ finnish ] = "Selaa";
+    Text[ catalan ] = "Navega...";
+    Text[ finnish ] = "Selaa...";
+    Text[ thai ] = "เรียกดู...";
 };
 
 
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index f8142e44270c..5d72d7a3113f 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filectrl2.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mt $ $Date: 2002-10-10 08:55:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,16 +146,3 @@ void FileControl::ImplBrowseFile( )
     }
 }
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2002/08/22 13:44:16  mt
- *  #97709# Maybe URL is already a file URL...
- *
- *  Revision 1.1  2001/09/04 09:00:26  fs
- *  initial checkin - exception enabled parts of filectrl.cxx
- *
- *
- *  Revision 1.0 03.09.01 17:45:21  fs
- ************************************************************************/
-
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 212ad4dfe721..5708338f527e 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtfield.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-18 15:15:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,15 +105,260 @@
 #include <syslocale.hxx>
 #endif
 
+#ifndef REGEXP_SUPPORT
+#include <map>
+#endif
+
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
+
+#ifdef REGEXP_SUPPORT
+
 //==============================================================================
-// regulaerer Ausdruck, um komplette Zahlen und alles, was waehrend der Eingabe einer kompletten Zahl als Fragment vorkommt,
-// abzudecken :
-// [+/-][{ziffer}*.]*{ziffer}*[,{ziffer}*][e[+/-]{ziffer}*]
+// regular expression to validate complete numbers, plus every fragment which can occur during the input
+// of a complete number
+// [+/-][{digit}*.]*{digit}*[,{digit}*][e[+/-]{digit}*]
 const char __FAR_DATA szNumericInput[] = "_[-+]?([0-9]*\\,)*[0-9]*(\\.[0-9]*)?(e[-+]?[0-9]*)?_";
-    // (die beiden _ sind fuer die Normierung, damit kann ich erzwingen, dass nie ein Teilstring gefunden wird)
+    // (the two _ are for normalizing it: With this, we can ensure that a to-be-checked text is always
+    // matched as a _whole_)
+#else
+
+// hmm. No support for regular expression. Well, I always (not really :) wanted to write a finite automat
+// so here comes a finite automat ...
+
+namespace validation
+{
+    // the states of our automat.
+    enum State
+    {
+        START,              // at the very start of the string
+        NUM_START,          // the very start of the number
+
+        DIGIT_PRE_COMMA,    // some pre-comma digits are read, perhaps including some thousand separators
+
+        DIGIT_POST_COMMA,   // reading digits after the comma
+        EXPONENT_START,     // at the very start of the exponent value
+                            //    (means: not including the "e" which denotes the exponent)
+        EXPONENT_DIGIT,     // currently reading the digits of the exponent
+
+        END                 // reached the end of the string
+    };
+
+    // a row in the transition table (means the set of states to be reached from a given state)
+    typedef ::std::map< sal_Unicode, State >        StateTransitions;
+
+    // a single transition
+    typedef StateTransitions::value_type            Transition;
+
+    // the complete transition table
+    typedef ::std::map< State, StateTransitions >   TransitionTable;
+
+    // the validator class
+    class NumberValidator
+    {
+    private:
+        TransitionTable     m_aTransitions;
+        const sal_Unicode   m_cThSep;
+        const sal_Unicode   m_cDecSep;
+
+    public:
+        NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep );
+
+        sal_Bool isValidNumericFragment( const String& _rText );
+
+    private:
+        sal_Bool implValidateNormalized( const String& _rText );
+    };
+
+    //--------------------------------------------------------------------------
+    //..........................................................................
+    static void lcl_insertStopTransition( StateTransitions& _rRow )
+    {
+        _rRow.insert( Transition( '_', END ) );
+    }
+
+    //..........................................................................
+    static void lcl_insertStartExponentTransition( StateTransitions& _rRow )
+    {
+        _rRow.insert( Transition( 'e', EXPONENT_START ) );
+    }
+
+    //..........................................................................
+    static void lcl_insertSignTransitions( StateTransitions& _rRow, const State eNextState )
+    {
+        _rRow.insert( Transition( '-', eNextState ) );
+        _rRow.insert( Transition( '+', eNextState ) );
+    }
+
+    //..........................................................................
+    static void lcl_insertDigitTransitions( StateTransitions& _rRow, const State eNextState )
+    {
+        for ( sal_Unicode aChar = '0'; aChar <= '9'; ++aChar )
+            _rRow.insert( Transition( aChar, eNextState ) );
+    }
+
+    //..........................................................................
+    static void lcl_insertCommonPreCommaTransitions( StateTransitions& _rRow, const sal_Unicode _cThSep, const sal_Unicode _cDecSep )
+    {
+        // digits are allowed
+        lcl_insertDigitTransitions( _rRow, DIGIT_PRE_COMMA );
+
+        // the thousand separator is allowed
+        _rRow.insert( Transition( _cThSep, DIGIT_PRE_COMMA ) );
+
+        // a comma is allowed
+        _rRow.insert( Transition( _cDecSep, DIGIT_POST_COMMA ) );
+    }
+
+    //--------------------------------------------------------------------------
+    NumberValidator::NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep )
+        :m_cThSep( _cThSep )
+        ,m_cDecSep( _cDecSep )
+    {
+        // build up our transition table
+
+        // how to procede from START
+        {
+            StateTransitions& rRow = m_aTransitions[ START ];
+            rRow.insert( Transition( '_', NUM_START ) );
+                // if we encounter the normalizing character, we want to procede with the number
+        }
+
+        // how to procede from NUM_START
+        {
+            StateTransitions& rRow = m_aTransitions[ NUM_START ];
+
+            // a sign is allowed
+            lcl_insertSignTransitions( rRow, DIGIT_PRE_COMMA );
+
+            // common transitions for the two pre-comma states
+            lcl_insertCommonPreCommaTransitions( rRow, m_cThSep, m_cDecSep );
+
+            // the exponent may start here
+            // (this would mean string like "_+e10_", but this is a valid fragment, though no valid number)
+            lcl_insertStartExponentTransition( rRow );
+        }
+
+        // how to procede from DIGIT_PRE_COMMA
+        {
+            StateTransitions& rRow = m_aTransitions[ DIGIT_PRE_COMMA ];
+
+            // common transitions for the two pre-comma states
+            lcl_insertCommonPreCommaTransitions( rRow, m_cThSep, m_cDecSep );
+
+            // the exponent may start here
+            lcl_insertStartExponentTransition( rRow );
+
+            // the final transition indicating the end of the string
+            // (if there is no comma and no post-comma, then the string may end here)
+            lcl_insertStopTransition( rRow );
+        }
+
+        // how to procede from DIGIT_POST_COMMA
+        {
+            StateTransitions& rRow = m_aTransitions[ DIGIT_POST_COMMA ];
+
+            // there might be digits, which would keep the state at DIGIT_POST_COMMA
+            lcl_insertDigitTransitions( rRow, DIGIT_POST_COMMA );
+
+            // the exponent may start here
+            lcl_insertStartExponentTransition( rRow );
+
+            // the string may end here
+            lcl_insertStopTransition( rRow );
+        }
+
+        // how to procede from EXPONENT_START
+        {
+            StateTransitions& rRow = m_aTransitions[ EXPONENT_START ];
+
+            // there may be a sign
+            lcl_insertSignTransitions( rRow, EXPONENT_DIGIT );
+
+            // there may be digits
+            lcl_insertDigitTransitions( rRow, EXPONENT_DIGIT );
+
+            // the string may end here
+            lcl_insertStopTransition( rRow );
+        }
+
+        // how to procede from EXPONENT_DIGIT
+        {
+            StateTransitions& rRow = m_aTransitions[ EXPONENT_DIGIT ];
+
+            // there may be digits
+            lcl_insertDigitTransitions( rRow, EXPONENT_DIGIT );
+
+            // the string may end here
+            lcl_insertStopTransition( rRow );
+        }
+
+        // how to procede from END
+        {
+            StateTransitions& rRow = m_aTransitions[ EXPONENT_DIGIT ];
+            // no valid transition to leave this state
+            // (note that we, for consistency, nevertheless want to have a row in the table)
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    sal_Bool NumberValidator::implValidateNormalized( const String& _rText )
+    {
+        const sal_Unicode* pCheckPos = _rText.GetBuffer();
+        State eCurrentState = START;
+
+        while ( END != eCurrentState )
+        {
+            // look up the transition row for the current state
+            TransitionTable::const_iterator aRow = m_aTransitions.find( eCurrentState );
+            DBG_ASSERT( m_aTransitions.end() != aRow,
+                "NumberValidator::implValidateNormalized: invalid transition table (row not found)!" );
+
+            if ( m_aTransitions.end() != aRow )
+            {
+                // look up the current character in this row
+                StateTransitions::const_iterator aTransition = aRow->second.find( *pCheckPos );
+                if ( aRow->second.end() != aTransition )
+                {
+                    // there is a valid transition for this character
+                    eCurrentState = aTransition->second;
+                    ++pCheckPos;
+                    continue;
+                }
+            }
+
+            // if we're here, there is no valid transition
+            break;
+        }
+
+        DBG_ASSERT( ( END != eCurrentState ) || ( 0 == *pCheckPos ),
+            "NumberValidator::implValidateNormalized: inconsistency!" );
+            // if we're at END, then the string should be done, too - the string should be normalized, means ending
+            // a "_" and not containing any other "_" (except at the start), and "_" is the only possibility
+            // to reach the END state
+
+        // the string is valid if and only if we reached the final state
+        return ( END == eCurrentState );
+    }
+
+    //--------------------------------------------------------------------------
+    sal_Bool NumberValidator::isValidNumericFragment( const String& _rText )
+    {
+        if ( !_rText.Len() )
+            // empty strings are always allowed
+            return sal_True;
+
+        // normalize the string
+        String sNormalized( RTL_CONSTASCII_STRINGPARAM( "_") );
+        sNormalized.Append( _rText );
+        sNormalized.AppendAscii( "_" );
+
+        return implValidateNormalized( sNormalized );
+    }
+}
+
+#endif
 
 //==============================================================================
 SvNumberFormatter* FormattedField::StaticFormatter::s_cFormatter = NULL;
@@ -478,7 +723,7 @@ void FormattedField::GetFormat(XubString& rFormatString, LanguageType& eLang) co
 {
     DBG_CHKTHIS(FormattedField, NULL);
     const SvNumberformat* pFormatEntry = ImplGetFormatter()->GetEntry(m_nFormatKey);
-    DBG_ASSERT(pFormatEntry != NULL, "FormattedField::ResetConformanceTester : no number format for the given format key.");
+    DBG_ASSERT(pFormatEntry != NULL, "FormattedField::GetFormat: no number format for the given format key.");
     rFormatString = pFormatEntry ? pFormatEntry->GetFormatstring() : XubString();
     eLang = pFormatEntry ? pFormatEntry->GetLanguage() : LANGUAGE_DONTKNOW;
 }
@@ -910,7 +1155,11 @@ void FormattedField::Last()
 //------------------------------------------------------------------------------
 DoubleNumericField::~DoubleNumericField()
 {
+#ifdef REGEXP_SUPPORT
     delete m_pConformanceTester;
+#else
+    delete m_pNumberValidator;
+#endif
 }
 
 //------------------------------------------------------------------------------
@@ -923,10 +1172,11 @@ void DoubleNumericField::FormatChanged(FORMAT_CHANGE_TYPE nWhat)
 //------------------------------------------------------------------------------
 BOOL DoubleNumericField::CheckText(const XubString& sText) const
 {
-    // Ich wuerde das CheckText gern ueber den NumberFormatter laufen lassen (da gibt es schliesslich ein IsNumberFormat),
-    // aber der erkennt leider keine Fragmente (also zum Beispiel '1e', was waehrend der Eingabe zwangslaeufig irgendwann mal
-    // vorkommt), also dieser Umweg ueber einen SearchText.
+    // We'd like to implement this using the NumberFormatter::IsNumberFormat, but unfortunately, this doesn't
+    // recognize fragments of numbers (like, for instance "1e", which happens during entering e.g. "1e10")
+    // Thus, the roundabout way via a regular expression
 
+#ifdef REGEXP_SUPPORT
     if (!sText.Len())
         return TRUE;
 
@@ -941,12 +1191,14 @@ BOOL DoubleNumericField::CheckText(const XubString& sText) const
         return TRUE;
 
     return FALSE;
+#else
+    return m_pNumberValidator->isValidNumericFragment( sText );
+#endif
 }
 
 //------------------------------------------------------------------------------
 void DoubleNumericField::ResetConformanceTester()
 {
-    String sDescription = String::CreateFromAscii(szNumericInput);
     // the thousands and the decimal separator are language dependent
     const SvNumberformat* pFormatEntry = ImplGetFormatter()->GetEntry(m_nFormatKey);
 
@@ -967,6 +1219,9 @@ void DoubleNumericField::ResetConformanceTester()
             cSeparatorDecimal = sSeparator.GetBuffer()[0];
     }
 
+#ifdef REGEXP_SUPPORT
+    String sDescription = String::CreateFromAscii(szNumericInput);
+
     String sReplaceWith((sal_Unicode)'\\');
     sReplaceWith += cSeparatorThousand;
     sDescription.SearchAndReplaceAscii("\\,", sReplaceWith);
@@ -989,6 +1244,10 @@ void DoubleNumericField::ResetConformanceTester()
     aParam.Locale.Country = sCountry;
 
     m_pConformanceTester = new ::utl::TextSearch(aParam);
+#else
+    delete m_pNumberValidator;
+    m_pNumberValidator = new validation::NumberValidator( cSeparatorThousand, cSeparatorDecimal );
+#endif
 }
 
 
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 509d746c08c2..52ed5e512656 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ruler.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: os $ $Date: 2002-11-29 17:19:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -217,40 +217,22 @@ ImplRulerData::ImplRulerData()
 
 ImplRulerData::~ImplRulerData()
 {
-    if ( pLines )
-        delete pLines;
-
-    if ( pArrows )
-        delete pArrows;
-
-    if ( pBorders )
-        delete pBorders;
-
-    if ( pIndents )
-        delete pIndents;
-
-    if ( pTabs )
-        delete pTabs;
+    delete[] pLines;
+    delete[] pArrows;
+    delete[] pBorders;
+    delete[] pIndents;
+    delete[] pTabs;
 }
 
 // -----------------------------------------------------------------------
 
 ImplRulerData& ImplRulerData::operator=( const ImplRulerData& rData )
 {
-    if ( pLines )
-        delete pLines;
-
-    if ( pArrows )
-        delete pArrows;
-
-    if ( pBorders )
-        delete pBorders;
-
-    if ( pIndents )
-        delete pIndents;
-
-    if ( pTabs )
-        delete pTabs;
+    delete[] pLines;
+    delete[] pArrows;
+    delete[] pBorders;
+    delete[] pIndents;
+    delete[] pTabs;
 
     memcpy( this, &rData, sizeof( ImplRulerData ) );
 
@@ -1172,9 +1154,6 @@ void Ruler::ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom )
             continue;
 
         long n;
-        if(mpData->bTextRTL)
-            n =  mpData->nMargin2 - mpData->pTabs[i].nPos;
-        else
             n = mpData->pTabs[i].nPos;
         n += +mpData->nNullVirOff;
         long nTopBottom = GetStyle() & WB_RIGHT_ALIGNED ? nVirTop : nVirBottom;
@@ -1483,7 +1462,6 @@ void Ruler::ImplInitExtraField( BOOL bUpdate )
         maExtraRect.Top()    = RULER_OFF;
         maExtraRect.Right()  = RULER_OFF+mnVirHeight-1;
         maExtraRect.Bottom() = RULER_OFF+mnVirHeight-1;
-        mnVirOff = maExtraRect.Right()+1;
         if(mpData->bTextRTL)
         {
             Size aWinSize = GetOutputSizePixel();
@@ -1491,7 +1469,11 @@ void Ruler::ImplInitExtraField( BOOL bUpdate )
                 maExtraRect.Move(aWinSize.Width() - maExtraRect.GetWidth() - maExtraRect.Left(), 0);
             else
                 maExtraRect.Move(0, aWinSize.Height() - maExtraRect.GetHeight() - maExtraRect.Top());
+            mnVirOff = 0;
         }
+        else
+            mnVirOff = maExtraRect.Right()+1;
+
     }
     else
     {
@@ -1519,11 +1501,13 @@ void Ruler::ImplDraw()
         // Lineal ueber das VirtualDevice ausgeben
         Point   aOffPos;
         Size    aVirDevSize = maVirDev.GetOutputSizePixel();
-        Size    aVirDevSize2 = maVirDev.GetOutputSizePixel();
+//        Size    aVirDevSize2 = maVirDev.GetOutputSizePixel();
         if ( mnWinStyle & WB_HORZ )
         {
-            if(!mpData->bTextRTL)
-                aOffPos.X() = mnVirOff;
+            aOffPos.X() = mnVirOff;
+            if(mpData->bTextRTL)
+                aVirDevSize.Width() -= maExtraRect.GetWidth();
+
 //  else
 //      aVirDevSize.Width() -= mnVirOff;
             aOffPos.Y() = RULER_OFF;
@@ -1531,12 +1515,11 @@ void Ruler::ImplDraw()
         else
         {
             aOffPos.X() = RULER_OFF;
-            if(!mpData->bTextRTL)
-                aOffPos.Y() = mnVirOff;
+            aOffPos.Y() = mnVirOff;
 //  else
 //      aVirDevSize.Height() -= mnVirOff;
         }
-        DrawOutDev( aOffPos, aVirDevSize, Point(), aVirDevSize2, maVirDev );
+        DrawOutDev( aOffPos, aVirDevSize, Point(), aVirDevSize, maVirDev );
 
         // Positionslinien neu malen
         ImplInvertLines( TRUE );
@@ -1746,8 +1729,6 @@ BOOL Ruler::ImplHitTest( const Point& rPos, ImplRulerHitTest* pHitTest ) const
                         aRect.Right()   = n1-RULER_TAB_CWIDTH2+RULER_TAB_CWIDTH;
                     }
 
-                    if(mpData->bTextRTL)
-                        nX = mpData->nMargin2 - nX;
                     if ( aRect.IsInside( Point( nX, nY ) ) )
                     {
                         pHitTest->eType     = RULER_TYPE_TAB;
@@ -2956,7 +2937,7 @@ void Ruler::SetLines( USHORT n, const RulerLine* pLineAry )
     {
         if ( !mpData->pLines )
             return;
-        delete mpData->pLines;
+        delete[] mpData->pLines;
         mpData->nLines = 0;
         mpData->pLines = NULL;
     }
@@ -2964,8 +2945,7 @@ void Ruler::SetLines( USHORT n, const RulerLine* pLineAry )
     {
         if ( mpData->nLines != n )
         {
-            if ( mpData->pLines )
-                delete mpData->pLines;
+            delete[] mpData->pLines;
             mpData->nLines = n;
             mpData->pLines = new RulerLine[n];
         }
@@ -2986,7 +2966,7 @@ void Ruler::SetArrows( USHORT n, const RulerArrow* pArrowAry )
     {
         if ( !mpData->pArrows )
             return;
-        delete mpData->pArrows;
+        delete[] mpData->pArrows;
         mpData->nArrows = 0;
         mpData->pArrows = NULL;
     }
@@ -2994,8 +2974,7 @@ void Ruler::SetArrows( USHORT n, const RulerArrow* pArrowAry )
     {
         if ( mpData->nArrows != n )
         {
-            if ( mpData->pArrows )
-                delete mpData->pArrows;
+            delete[] mpData->pArrows;
             mpData->nArrows = n;
             mpData->pArrows = new RulerArrow[n];
         }
@@ -3033,7 +3012,7 @@ void Ruler::SetBorders( USHORT n, const RulerBorder* pBrdAry )
     {
         if ( !mpData->pBorders )
             return;
-        delete mpData->pBorders;
+        delete[] mpData->pBorders;
         mpData->nBorders = 0;
         mpData->pBorders = NULL;
     }
@@ -3041,8 +3020,7 @@ void Ruler::SetBorders( USHORT n, const RulerBorder* pBrdAry )
     {
         if ( mpData->nBorders != n )
         {
-            if ( mpData->pBorders )
-                delete mpData->pBorders;
+            delete[] mpData->pBorders;
             mpData->nBorders = n;
             mpData->pBorders = new RulerBorder[n];
         }
@@ -3080,7 +3058,7 @@ void Ruler::SetIndents( USHORT n, const RulerIndent* pIndentAry )
     {
         if ( !mpData->pIndents )
             return;
-        delete mpData->pIndents;
+        delete[] mpData->pIndents;
         mpData->nIndents = 0;
         mpData->pIndents = NULL;
     }
@@ -3088,8 +3066,7 @@ void Ruler::SetIndents( USHORT n, const RulerIndent* pIndentAry )
     {
         if ( mpData->nIndents != n )
         {
-            if ( mpData->pIndents )
-                delete mpData->pIndents;
+            delete[] mpData->pIndents;
             mpData->nIndents = n;
             mpData->pIndents = new RulerIndent[n];
         }
@@ -3125,7 +3102,7 @@ void Ruler::SetTabs( USHORT n, const RulerTab* pTabAry )
     {
         if ( !mpData->pTabs )
             return;
-        delete mpData->pTabs;
+        delete[] mpData->pTabs;
         mpData->nTabs = 0;
         mpData->pTabs = NULL;
     }
@@ -3133,8 +3110,7 @@ void Ruler::SetTabs( USHORT n, const RulerTab* pTabAry )
     {
         if ( mpData->nTabs != n )
         {
-            if ( mpData->pTabs )
-                delete mpData->pTabs;
+            delete[] mpData->pTabs;
             mpData->nTabs = n;
             mpData->pTabs = new RulerTab[n];
         }
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 8842d44269ae..7b5dbb49467f 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabbar.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: cd $ $Date: 2002-12-09 08:11:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,6 +100,8 @@
 #define TABBAR_DRAG_SCROLLOFF   5
 #define TABBAR_MINSIZE          5
 
+const USHORT ADDNEWPAGE_AREAWIDTH = 10;
+
 // =======================================================================
 
 struct ImplTabBarItem
@@ -649,7 +651,7 @@ USHORT TabBar::ImplGetLastFirstPos()
         return 0;
 
     USHORT  nLastFirstPos = nCount-1;
-    long    nWinWidth = mnOutWidth-mnOffX-TABBAR_OFFSET_X;
+    long    nWinWidth = mnOutWidth-mnOffX-TABBAR_OFFSET_X-ADDNEWPAGE_AREAWIDTH;
     long    nWidth = mpItemList->GetObject( nLastFirstPos )->mnWidth;
     while ( nLastFirstPos && (nWidth < nWinWidth) )
     {
@@ -1822,6 +1824,8 @@ void TabBar::SetCurPageId( USHORT nPageId )
                 long nWidth = mnOutWidth;
                 if ( nWidth > TABBAR_OFFSET_X )
                     nWidth -= TABBAR_OFFSET_X;
+                if ( nWidth > ADDNEWPAGE_AREAWIDTH )
+                    nWidth -= ADDNEWPAGE_AREAWIDTH;
 
                 if ( pItem->maRect.IsEmpty() )
                     ImplFormat();
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 34d512422639..773483cd731c 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: valueacc.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: af $ $Date: 2002-12-03 14:11:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -147,6 +147,7 @@ void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue
         accessibility::AccessibleEventObject                                                        aEvtObject;
 
         aEvtObject.EventId = nEventId;
+        aEvtObject.Source = static_cast<uno::XWeak*>(this);
         aEvtObject.NewValue = rNewValue;
         aEvtObject.OldValue = rOldValue;
 
@@ -204,6 +205,7 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     return this;
 }
 
@@ -213,6 +215,8 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount()
     throw (uno::RuntimeException)
 {
     const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ThrowIfDisposed();
+
     sal_Int32 nCount = 0;
     if ((mpParent->GetStyle() & ~WB_NONEFIELD) != 0)
         nCount += 1;
@@ -225,19 +229,10 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount()
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
     uno::Reference< accessibility::XAccessible >    xRet;
-    ValueSetItem* pItem = NULL;
-
-    if ((mpParent->GetStyle() & ~WB_NONEFIELD) != 0)
-        if (i == 0)
-            // When present the first item is the then allways visible none field.
-            pItem = mpParent->ImplGetItem (VALUESET_ITEM_NONEITEM);
-        else
-            // Shift down the index to compensate for the none field.
-            i -= 1;
-    if (pItem == NULL)
-        pItem = mpParent->ImplGetVisibleItem( static_cast< USHORT >( i ) );
+    ValueSetItem* pItem = getItem (i);
 
     if( pItem )
         xRet = pItem->GetAccessible();
@@ -252,6 +247,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
     Window*                                         pParent = mpParent->GetParent();
     uno::Reference< accessibility::XAccessible >    xRet;
@@ -267,6 +263,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
 sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard       aSolarGuard( Application::GetSolarMutex() );
     Window*                 pParent = mpParent->GetParent();
     sal_Int32               nRet = 0;
@@ -293,6 +290,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
 sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     return accessibility::AccessibleRole::LIST;
 }
 
@@ -301,6 +299,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
 ::rtl::OUString SAL_CALL ValueSetAcc::getAccessibleDescription()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
     String              aRet( RTL_CONSTASCII_USTRINGPARAM( "ValueSet" ) );
 
@@ -312,6 +311,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
 ::rtl::OUString SAL_CALL ValueSetAcc::getAccessibleName()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
     String              aRet;
 
@@ -329,6 +329,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
 uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     return uno::Reference< accessibility::XAccessibleRelationSet >();
 }
 
@@ -337,12 +338,14 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper();
 
     // Set some states.
     pStateSet->AddState (accessibility::AccessibleStateType::ENABLED);
     pStateSet->AddState (accessibility::AccessibleStateType::SHOWING);
     pStateSet->AddState (accessibility::AccessibleStateType::VISIBLE);
+    pStateSet->AddState (accessibility::AccessibleStateType::MANAGES_DESCENDANT);
 
     return pStateSet;
 }
@@ -352,6 +355,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAc
 lang::Locale SAL_CALL ValueSetAcc::getLocale()
     throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
     const ::rtl::OUString                           aEmptyStr;
     uno::Reference< accessibility::XAccessible >    xParent( getAccessibleParent() );
@@ -373,6 +377,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale()
 void SAL_CALL ValueSetAcc::addEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     ::osl::MutexGuard aGuard (m_aMutex);
 
     if( rxListener.is() )
@@ -398,6 +403,7 @@ void SAL_CALL ValueSetAcc::addEventListener( const uno::Reference< accessibility
 void SAL_CALL ValueSetAcc::removeEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     ::osl::MutexGuard aGuard (m_aMutex);
 
     if( rxListener.is() )
@@ -423,6 +429,7 @@ void SAL_CALL ValueSetAcc::removeEventListener( const uno::Reference< accessibil
 sal_Bool SAL_CALL ValueSetAcc::contains( const awt::Point& aPoint )
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
     const Point             aSize( aRect.Width, aRect.Height );
     const Point             aNullPoint, aTestPoint( aPoint.X, aPoint.Y );
@@ -435,6 +442,7 @@ sal_Bool SAL_CALL ValueSetAcc::contains( const awt::Point& aPoint )
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAt( const awt::Point& aPoint )
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
     const USHORT                                    nItemId = mpParent->GetItemId( Point( aPoint.X, aPoint.Y ) );
     uno::Reference< accessibility::XAccessible >    xRet;
@@ -448,7 +456,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
             ValueSetItem* pItem = mpParent->mpItemList->GetObject( nItemPos );
 
             if( ( pItem->meType != VALUESETITEM_SPACE ) && !pItem->maRect.IsEmpty() )
-                xRet = pItem->GetAccessible();
+               xRet = pItem->GetAccessible();
         }
     }
 
@@ -460,6 +468,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
 awt::Rectangle SAL_CALL ValueSetAcc::getBounds()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
     const Point         aOutPos( mpParent->GetPosPixel() );
     const Size          aOutSize( mpParent->GetOutputSizePixel() );
@@ -478,6 +487,7 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds()
 awt::Point SAL_CALL ValueSetAcc::getLocation()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
     awt::Point              aRet;
 
@@ -492,6 +502,7 @@ awt::Point SAL_CALL ValueSetAcc::getLocation()
 awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
     const Point         aScreenPos( mpParent->OutputToAbsoluteScreenPixel( Point() ) );
     awt::Point          aRet;
@@ -507,6 +518,7 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen()
 awt::Size SAL_CALL ValueSetAcc::getSize()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
     awt::Size               aRet;
 
@@ -521,6 +533,7 @@ awt::Size SAL_CALL ValueSetAcc::getSize()
 void SAL_CALL ValueSetAcc::grabFocus()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
     mpParent->GrabFocus();
 }
@@ -530,6 +543,7 @@ void SAL_CALL ValueSetAcc::grabFocus()
 uno::Any SAL_CALL ValueSetAcc::getAccessibleKeyBinding()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     return uno::Any();
 }
 
@@ -538,6 +552,7 @@ uno::Any SAL_CALL ValueSetAcc::getAccessibleKeyBinding()
 sal_Int32 SAL_CALL ValueSetAcc::getForeground(  )
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
@@ -547,6 +562,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getForeground(  )
 sal_Int32 SAL_CALL ValueSetAcc::getBackground(  )
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
@@ -556,11 +572,15 @@ sal_Int32 SAL_CALL ValueSetAcc::getBackground(  )
 void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
-    ValueSetItem*       pItem = mpParent->ImplGetVisibleItem( static_cast< USHORT >( nChildIndex ) );
+    ValueSetItem* pItem = getItem (nChildIndex);
 
-    if( pItem )
+    if(pItem != NULL)
+    {
         mpParent->SelectItem( pItem->mnId );
+        mpParent->Select ();
+    }
     else
         throw lang::IndexOutOfBoundsException();
 }
@@ -570,11 +590,12 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
 sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
-    ValueSetItem*       pItem = mpParent->ImplGetVisibleItem( static_cast< USHORT >( nChildIndex ) );
+    ValueSetItem* pItem = getItem (nChildIndex);
     sal_Bool            bRet = sal_False;
 
-    if( pItem )
+    if (pItem != NULL)
         bRet = mpParent->IsItemSelected( pItem->mnId );
     else
         throw lang::IndexOutOfBoundsException();
@@ -587,6 +608,7 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex
 void SAL_CALL ValueSetAcc::clearAccessibleSelection()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
     mpParent->SetNoSelection();
 }
@@ -596,6 +618,7 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection()
 void SAL_CALL ValueSetAcc::selectAllAccessible()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     // unsupported due to single selection only
 }
 
@@ -604,12 +627,13 @@ void SAL_CALL ValueSetAcc::selectAllAccessible()
 sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount()
     throw (uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
     sal_Int32           nRet = 0;
 
-    for( USHORT i = 0, nCount = mpParent->ImplGetVisibleItemCount(); i < nCount; i++ )
+    for( USHORT i = 0, nCount = getItemCount(); i < nCount; i++ )
     {
-        ValueSetItem* pItem = mpParent->ImplGetVisibleItem( i );
+        ValueSetItem* pItem = getItem (i);
 
         if( pItem && mpParent->IsItemSelected( pItem->mnId ) )
             ++nRet;
@@ -623,12 +647,13 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount()
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
     uno::Reference< accessibility::XAccessible >    xRet;
 
-    for( USHORT i = 0, nCount = mpParent->ImplGetVisibleItemCount(), nSel = 0; ( i < nCount ) && !xRet.is(); i++ )
+    for( USHORT i = 0, nCount = getItemCount(), nSel = 0; ( i < nCount ) && !xRet.is(); i++ )
     {
-        ValueSetItem* pItem = mpParent->ImplGetVisibleItem( i );
+        ValueSetItem* pItem = getItem(i);
 
         if( pItem && mpParent->IsItemSelected( pItem->mnId ) && ( nSelectedChildIndex == static_cast< sal_Int32 >( nSel++ ) ) )
             xRet = pItem->GetAccessible();
@@ -639,22 +664,17 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc
 
 // -----------------------------------------------------------------------------
 
-void SAL_CALL ValueSetAcc::deselectSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+void SAL_CALL ValueSetAcc::deselectSelectedAccessibleChild( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
+    ThrowIfDisposed();
     const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
     sal_Bool            bDone = sal_False;
 
-    for( USHORT i = 0, nCount = mpParent->ImplGetVisibleItemCount(), nSel = 0; ( i < nCount ) && !bDone; i++ )
-    {
-        ValueSetItem* pItem = mpParent->ImplGetVisibleItem( i );
-
-        if( pItem && mpParent->IsItemSelected( pItem->mnId ) && ( nSelectedChildIndex == static_cast< sal_Int32 >( nSel++ ) ) )
-        {
-            mpParent->SetNoSelection();
-            bDone = sal_True;
-        }
-    }
+    // Because of the single selection we can reset the whole selection when
+    // the specified child is currently selected.
+    if (isAccessibleChildSelected(nChildIndex))
+        mpParent->SetNoSelection();
 }
 
 // -----------------------------------------------------------------------------
@@ -680,9 +700,14 @@ void SAL_CALL ValueSetAcc::disposing (void)
 
     {
         // Make a copy of the list and clear the original.
+        const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
         ::osl::MutexGuard aGuard (m_aMutex);
         aListenerListCopy = mxEventListeners;
         mxEventListeners.clear();
+
+        // Reset the pointer to the parent.  It has to be the one who has
+        // disposed us because he is dying.
+        mpParent = NULL;
     }
 
     // Inform all listeners that this objects is disposing.
@@ -705,6 +730,61 @@ void SAL_CALL ValueSetAcc::disposing (void)
 }
 
 
+USHORT ValueSetAcc::getItemCount (void) const
+{
+    USHORT nCount = mpParent->ImplGetVisibleItemCount();
+    // When the None-Item is visible then increase the number of items by
+    // one.
+    if ((mpParent->GetStyle() & WB_NONEFIELD) != 0)
+        nCount += 1;
+    return nCount;
+}
+
+
+ValueSetItem* ValueSetAcc::getItem (USHORT nIndex) const
+{
+    ValueSetItem* pItem = NULL;
+
+    if ((mpParent->GetStyle() & WB_NONEFIELD) != 0)
+        if (nIndex == 0)
+            // When present the first item is the then allways visible none field.
+            pItem = mpParent->ImplGetItem (VALUESET_ITEM_NONEITEM);
+        else
+            // Shift down the index to compensate for the none field.
+            nIndex -= 1;
+    if (pItem == NULL)
+        pItem = mpParent->ImplGetVisibleItem (static_cast<USHORT>(nIndex));
+
+    return pItem;
+}
+
+
+
+
+void ValueSetAcc::ThrowIfDisposed (void)
+    throw (::com::sun::star::lang::DisposedException)
+{
+    if (rBHelper.bDisposed || rBHelper.bInDispose)
+    {
+        OSL_TRACE ("Calling disposed object. Throwing exception:");
+        throw lang::DisposedException (
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")),
+            static_cast<uno::XWeak*>(this));
+    }
+    else
+        DBG_ASSERT (mpParent!=NULL, "ValueSetAcc not disposed but mpParent == NULL");
+}
+
+
+
+sal_Bool ValueSetAcc::IsDisposed (void)
+{
+    return (rBHelper.bDisposed || rBHelper.bInDispose);
+}
+
+
+
+
 // ----------------
 // - ValueItemAcc -
 // ----------------
@@ -731,6 +811,7 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu
         accessibility::AccessibleEventObject                                                        aEvtObject;
 
         aEvtObject.EventId = nEventId;
+        aEvtObject.Source = static_cast<uno::XWeak*>(this);
         aEvtObject.NewValue = rNewValue;
         aEvtObject.OldValue = rOldValue;
 
@@ -912,16 +993,17 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA
         pStateSet->AddState (accessibility::AccessibleStateType::ENABLED);
         pStateSet->AddState (accessibility::AccessibleStateType::SHOWING);
         pStateSet->AddState (accessibility::AccessibleStateType::VISIBLE);
+        pStateSet->AddState (accessibility::AccessibleStateType::TRANSIENT);
 
         // SELECTABLE
         pStateSet->AddState( accessibility::AccessibleStateType::SELECTABLE );
-        pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE );
+        //      pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE );
 
         // SELECTED
         if( mpParent->mrParent.GetSelectItemId() == mpParent->mnId )
         {
             pStateSet->AddState( accessibility::AccessibleStateType::SELECTED );
-               pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED );
+            //              pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED );
         }
     }
 
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 19c08e4b34bb..45f6afe92f7e 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: valueimp.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: af $ $Date: 2002-11-20 16:35:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,6 +105,9 @@
 #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_
 #include <drafts/com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #endif
+#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
+#include <com/sun/star/lang/DisposedException.hpp>
+#endif
 
 #include <vector>
 
@@ -248,6 +251,37 @@ private:
         usually called from the WeakComponentImplHelper class.
     */
     virtual void SAL_CALL disposing (void);
+
+    /** Return the number of items.  This takes the None-Item into account.
+    */
+    USHORT getItemCount (void) const;
+
+    /** Return the item associated with the given index.  The None-Item is
+        taken into account which, when present, is taken to be the first
+        (with index 0) item.
+        @param nIndex
+            Index of the item to return.  The index 0 denotes the None-Item
+            when present.
+        @return
+            Returns NULL when the given index is out of range.
+    */
+    ValueSetItem* getItem (USHORT nIndex) const;
+
+    /** Check whether or not the object has been disposed (or is in the
+        state of beeing disposed).  If that is the case then
+        DisposedException is thrown to inform the (indirect) caller of the
+        foul deed.
+    */
+    void ValueSetAcc::ThrowIfDisposed (void)
+        throw (::com::sun::star::lang::DisposedException);
+
+    /** Check whether or not the object has been disposed (or is in the
+        state of beeing disposed).
+
+        @return sal_True, if the object is disposed or in the course
+        of being disposed. Otherwise, sal_False is returned.
+    */
+    sal_Bool IsDisposed (void);
 };
 
 // ----------------
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 4dd05bd145dc..2b2a9be3f8fe 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: valueset.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: af $ $Date: 2002-11-26 12:05:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,6 +136,9 @@ void ValueSet::ImplInit( WinBits nWinStyle )
     mbDropPos           = FALSE;
     mbFullMode          = TRUE;
 
+    // #106446#, #106601# force mirroring of virtual device
+    maVirDev.EnableRTL( GetParent()->IsRTLEnabled() );
+
     ImplInitSettings( TRUE, TRUE, TRUE );
 }
 
@@ -1457,41 +1460,50 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt )
             break;
 
         case KEY_LEFT:
-            do
+        case KEY_RIGHT:
+            // When RTL is active then reverst the meaning of the left and
+            // right cursor keys.  With this the cursor keys react even
+            // under RTL visually i.e. KEY_LEFT always goes left
+            // indepentantly of RTL.
+            if ((rKEvt.GetKeyCode().GetCode()==KEY_LEFT && ! IsRTLActive())
+                || (rKEvt.GetKeyCode().GetCode()==KEY_RIGHT && IsRTLActive()))
             {
-                if ( nCalcPos == VALUESET_ITEM_NONEITEM )
-                    nItemPos = nLastItem;
-                else if ( !nCalcPos )
+                do
                 {
-                    if ( mpNoneItem )
-                        nItemPos = VALUESET_ITEM_NONEITEM;
-                    else
+                    if ( nCalcPos == VALUESET_ITEM_NONEITEM )
                         nItemPos = nLastItem;
+                    else if ( !nCalcPos )
+                    {
+                        if ( mpNoneItem )
+                            nItemPos = VALUESET_ITEM_NONEITEM;
+                        else
+                            nItemPos = nLastItem;
+                    }
+                    else
+                        nItemPos = nCalcPos-1;
+                    nCalcPos = nItemPos;
                 }
-                else
-                    nItemPos = nCalcPos-1;
-                nCalcPos = nItemPos;
+                while ( ImplGetItem( nItemPos )->meType == VALUESETITEM_SPACE );
             }
-            while ( ImplGetItem( nItemPos )->meType == VALUESETITEM_SPACE );
-            break;
-
-        case KEY_RIGHT:
-            do
+            else
             {
-                if ( nCalcPos == VALUESET_ITEM_NONEITEM )
-                    nItemPos = 0;
-                else if ( nCalcPos == nLastItem )
+                do
                 {
-                    if ( mpNoneItem )
-                        nItemPos = VALUESET_ITEM_NONEITEM;
-                    else
+                    if ( nCalcPos == VALUESET_ITEM_NONEITEM )
                         nItemPos = 0;
+                    else if ( nCalcPos == nLastItem )
+                    {
+                        if ( mpNoneItem )
+                            nItemPos = VALUESET_ITEM_NONEITEM;
+                        else
+                            nItemPos = 0;
+                    }
+                    else
+                        nItemPos = nCalcPos+1;
+                    nCalcPos = nItemPos;
                 }
-                else
-                    nItemPos = nCalcPos+1;
-                nCalcPos = nItemPos;
+                while ( ImplGetItem( nItemPos )->meType == VALUESETITEM_SPACE );
             }
-            while ( ImplGetItem( nItemPos )->meType == VALUESETITEM_SPACE );
             break;
 
         case KEY_UP:
@@ -1645,19 +1657,36 @@ void ValueSet::Paint( const Rectangle& rRect )
 
 void ValueSet::GetFocus()
 {
+    OSL_TRACE ("value set getting focus");
     ImplDrawSelect();
     Control::GetFocus();
+
+    // Send accessibility event.
+    ::com::sun::star::uno::Any aOldState, aNewState;
+    aNewState <<= ::drafts::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
+    ImplFireAccessibleEvent (
+        ::drafts::com::sun::star::accessibility::AccessibleEventId::ACCESSIBLE_STATE_EVENT,
+        aOldState, aNewState);
+
 }
 
 // -----------------------------------------------------------------------
 
 void ValueSet::LoseFocus()
 {
+    OSL_TRACE ("value set losing focus");
     if ( mbNoSelection && mnSelItemId )
         ImplHideSelect( mnSelItemId );
     else
         HideFocus();
     Control::LoseFocus();
+
+    // Send accessibility event.
+    ::com::sun::star::uno::Any aOldState, aNewState;
+    aOldState <<= ::drafts::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
+    ImplFireAccessibleEvent (
+        ::drafts::com::sun::star::accessibility::AccessibleEventId::ACCESSIBLE_STATE_EVENT,
+        aOldState, aNewState);
 }
 
 // -----------------------------------------------------------------------
@@ -2186,8 +2215,8 @@ void ValueSet::SelectItem( USHORT nItemId )
                     if( pItemAcc )
                     {
                         ::com::sun::star::uno::Any aOldAny, aNewAny;
-                        aOldAny <<= ::drafts::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
-                        pItemAcc->FireAccessibleEvent( ::drafts::com::sun::star::accessibility::AccessibleEventId::ACCESSIBLE_STATE_EVENT, aOldAny, aNewAny );
+                        aOldAny <<= mpItemList->GetObject( nPos )->GetAccessible();
+                        ImplFireAccessibleEvent (::drafts::com::sun::star::accessibility::AccessibleEventId::ACCESSIBLE_ACTIVE_DESCENDANT_EVENT, aOldAny, aNewAny );
                     }
                 }
             }
@@ -2203,13 +2232,15 @@ void ValueSet::SelectItem( USHORT nItemId )
                 else
                     pItem = mpNoneItem;
 
-                ValueItemAcc* pItemAcc = ValueItemAcc::getImplementation(pItem->GetAccessible() );
+                ValueItemAcc* pItemAcc = NULL;
+                if (pItem != NULL)
+                    pItemAcc = ValueItemAcc::getImplementation(pItem->GetAccessible() );
 
                 if( pItemAcc )
                 {
                     ::com::sun::star::uno::Any aOldAny, aNewAny;
-                    aNewAny <<= ::drafts::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
-                    pItemAcc->FireAccessibleEvent( ::drafts::com::sun::star::accessibility::AccessibleEventId::ACCESSIBLE_STATE_EVENT, aOldAny, aNewAny );
+                    aNewAny <<= pItem->GetAccessible();
+                    ImplFireAccessibleEvent( ::drafts::com::sun::star::accessibility::AccessibleEventId::ACCESSIBLE_ACTIVE_DESCENDANT_EVENT, aOldAny, aNewAny );
                 }
             }
 
@@ -2684,3 +2715,12 @@ void ValueSet::HideDropPos()
         mbDropPos = FALSE;
     }
 }
+
+
+
+
+bool ValueSet::IsRTLActive (void)
+{
+    return Application::GetSettings().GetLayoutRTL ()
+        && IsRTLEnabled();
+}
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 318c109c0f5c..43f09b6ab6af 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: addresstemplate.src,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: kz $ $Date: 2002-09-05 14:58:40 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,7 +110,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ portuguese ] = "Fonte do livro de endere�os";
         Text[ russian ] = "�������� �������� �����";
         Text[ greek ] = "��������� �������� �����������";
-        Text[ dutch ] = "Bron voor adresboek";
+        Text[ dutch ] = "Bron adresboek";
         Text[ french ] = "Source du carnet d'adresses";
         Text[ spanish ] = "Fuente de libreta de direcciones";
         Text[ italian ] = "Sorgente Rubrica";
@@ -119,13 +119,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ polish ] = "�r�d�o ksi��ki adresowej";
         Text[ portuguese_brazilian ] = "Address Book Source";
         Text[ japanese ] = "アドレス帳ソース";
-        Text[ korean ] = "주소록";
+        Text[ korean ] = "주소록 원본";
         Text[ chinese_simplified ] = "通讯簿源";
         Text[ chinese_traditional ] = "通訊錄來源";
         Text[ turkish ] = "Address Book Source";
         Text[ arabic ] = "���� ���� ��������";
-        Text[ catalan ] = "Fuente de libreta de direcciones";
+        Text[ catalan ] = "Font de la llibreta d'adreces";
         Text[ finnish ] = "Osoitekirjan l�hde";
+        Text[ thai ] = "แหล่งสมุดที่อยู่";
     };
     FixedText FT_DATASOURCE
     {
@@ -138,7 +139,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
 
         Group = TRUE;
         Text[ portuguese ] = "Fonte de dados";
-        Text[ russian ] = "�������� ������";
+        Text[ russian ] = "�������� ������";
         Text[ greek ] = "��������� ���������";
         Text[ dutch ] = "Gegevensbron";
         Text[ french ] = "Source de donn�es";
@@ -149,13 +150,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ polish ] = "�r�d�o danych";
         Text[ portuguese_brazilian ] = "Datasource";
         Text[ japanese ] = "データソース";
-        Text[ korean ] = "데이터 소스";
+        Text[ korean ] = "데이터 원본";
         Text[ chinese_simplified ] = "数据源";
         Text[ chinese_traditional ] = "資料源";
         Text[ turkish ] = "Datasource";
         Text[ arabic ] = "���� ��������";
-        Text[ catalan ] = "Fuente de datos";
+        Text[ catalan ] = "Font de dades";
         Text[ finnish ] = "Tietol�hde";
+        Text[ thai ] = "แหล่งข้อมูล";
     };
     ComboBox CB_DATASOURCE
     {
@@ -176,7 +178,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE;
         Text[ portuguese ] = "~Administrar...";
-        Text[ russian ] = "~������������...";
+        Text[ russian ] = "~����������...";
         Text[ greek ] = "��~�������� ...";
         Text[ dutch ] = "~Beheren ...";
         Text[ french ] = "~G�rer ...";
@@ -192,8 +194,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ chinese_traditional ] = "管理 (~A)...";
         Text[ turkish ] = "~Administrate ...";
         Text[ arabic ] = "�����...";
-        Text[ catalan ] = "~Administrar ...";
-        Text[ finnish ] = "~Hallinta";
+        Text[ catalan ] = "~Administra...";
+        Text[ finnish ] = "~Hallinta...";
+        Text[ thai ] = "~บริหารจัดการ...";
     };
     FixedText FT_TABLE
     {
@@ -217,13 +220,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ polish ] = "Tabela";
         Text[ portuguese_brazilian ] = "Table";
         Text[ japanese ] = "テーブル";
-        Text[ korean ] = "시트";
+        Text[ korean ] = "테이블";
         Text[ chinese_simplified ] = "表格";
         Text[ chinese_traditional ] = "表格";
         Text[ turkish ] = "Table";
         Text[ arabic ] = "������";
-        Text[ catalan ] = "Tabla";
+        Text[ catalan ] = "Taula";
         Text[ finnish ] = "Taulukko";
+        Text[ thai ] = "ตาราง";
     };
     ComboBox CB_TABLE
     {
@@ -259,8 +263,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ chinese_traditional ] = "指定欄位";
         Text[ turkish ] = "Field assignment";
         Text[ arabic ] = "����� �����";
-        Text[ catalan ] = "Asignaci�n de campo";
+        Text[ catalan ] = "Assignaci� de camp";
         Text[ finnish ] = "Kentt�m��ritys";
+        Text[ thai ] = "กำหนดเขตข้อมูล";
     };
     Window CT_BORDER
     {
@@ -357,7 +362,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ english ] = "<none>";
         Text[ english_us ] = "<none>";
         Text[ portuguese ] = "<nenhum>";
-        Text[ russian ] = "<���>";
+        Text[ russian ] = "<���>";
         Text[ greek ] = "<������>";
         Text[ dutch ] = "<geen>";
         Text[ french ] = "<aucun>";
@@ -373,8 +378,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ chinese_traditional ] = "<無>";
         Text[ arabic ] = "<����>";
         Text[ turkish ] = "<Yok>";
-        Text[ catalan ] = "<ninguno>";
+        Text[ catalan ] = "<cap>";
             Text[ finnish ] = "<ei mit��n>";
+            Text[ thai ] = "<ไม่มี>";
         };
 
     String STR_FIELD_COMPANY
@@ -383,9 +389,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text [ english ] = "Company";
         Text [ english_us ] = "Company";
         Text[ portuguese ] = "Firma";
-    Text[ russian ] = "�����������";
+    Text[ russian ] = "�����������";
     Text[ greek ] = "�������";
-    Text[ dutch ] = "Firma";
+    Text[ dutch ] = "Bedrijf";
     Text[ french ] = "Soci�t�";
     Text[ spanish ] = "Empresa";
     Text[ italian ] = "Azienda";
@@ -401,6 +407,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ arabic ] = "������";
     Text[ catalan ] = "Empresa";
             Text[ finnish ] = "Yritys";
+            Text[ thai ] = "บริษัท";
         };
     String STR_FIELD_DEPARTMENT
     {
@@ -424,8 +431,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "部門";
     Text[ turkish ] = "Department";
     Text[ arabic ] = "�����";
-    Text[ catalan ] = "Departamento";
+    Text[ catalan ] = "Departament";
             Text[ finnish ] = "Osasto";
+            Text[ thai ] = "แผนก";
         };
     String STR_FIELD_FIRSTNAME
     {
@@ -449,20 +457,21 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "名字";
     Text[ turkish ] = "First name";
     Text[ arabic ] = "�����";
-    Text[ catalan ] = "Nombre";
+    Text[ catalan ] = "Nom";
             Text[ finnish ] = "Etunimi";
+            Text[ thai ] = "ชื่อ";
         };
     String STR_FIELD_LASTNAME
     {
         Text = "Name";
         Text [ english ] = "Last name";
         Text [ english_us ] = "Last name";
-        Text[ portuguese ] = "Nome";
+        Text[ portuguese ] = "Apelido";
     Text[ russian ] = "�������";
     Text[ greek ] = "�������";
     Text[ dutch ] = "Achternaam";
     Text[ french ] = "Nom";
-    Text[ spanish ] = "Nombre";
+    Text[ spanish ] = "Apellidos";
     Text[ italian ] = "Cognome";
     Text[ danish ] = "Eft~ernavn";
     Text[ swedish ] = "Efternamn";
@@ -474,8 +483,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "姓氏";
     Text[ turkish ] = "Last name";
     Text[ arabic ] = "��� �������";
-    Text[ catalan ] = "Nombre";
+    Text[ catalan ] = "Cognom";
             Text[ finnish ] = "Sukunimi";
+            Text[ thai ] = "นามสกุล";
         };
     String STR_FIELD_STREET
     {
@@ -494,13 +504,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Ulica";
     Text[ portuguese_brazilian ] = "Street";
     Text[ japanese ] = "市町村名";
-    Text[ korean ] = "거리　이름";
+    Text[ korean ] = "주소";
     Text[ chinese_simplified ] = "街道";
     Text[ chinese_traditional ] = "街道";
     Text[ turkish ] = "Street";
     Text[ arabic ] = "������";
-    Text[ catalan ] = "Calle";
+    Text[ catalan ] = "Carrer";
             Text[ finnish ] = "Katuosoite";
+            Text[ thai ] = "ถนน";
         };
     String STR_FIELD_COUNTRY
     {
@@ -526,6 +537,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ arabic ] = "�����";
     Text[ catalan ] = "Pa�s";
             Text[ finnish ] = "Maa";
+            Text[ thai ] = "ประเทศ";
         };
     String STR_FIELD_ZIPCODE
     {
@@ -537,7 +549,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ greek ] = "�.�.";
     Text[ dutch ] = "Postcode";
     Text[ french ] = "C.P.";
-    Text[ spanish ] = "CP";
+    Text[ spanish ] = "C.P.";
     Text[ italian ] = "CAP";
     Text[ danish ] = "~Postnr.";
     Text[ swedish ] = "Postnr";
@@ -549,8 +561,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "郵遞區號";
     Text[ turkish ] = "ZIP code";
     Text[ arabic ] = "����� �������";
-    Text[ catalan ] = "CP";
+    Text[ catalan ] = "Codi postal";
             Text[ finnish ] = "Postinumero";
+            Text[ thai ] = "รหัสไปรษณีย์";
         };
     String STR_FIELD_CITY
     {
@@ -566,16 +579,17 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ italian ] = "Localit�";
     Text[ danish ] = "B~y";
     Text[ swedish ] = "Ort";
-    Text[ polish ] = "Miejscowo?�";
+    Text[ polish ] = "Miejscowo��";
     Text[ portuguese_brazilian ] = "City";
     Text[ japanese ] = "都道府県名";
-    Text[ korean ] = "지역(도시)";
+    Text[ korean ] = "구/군/시";
     Text[ chinese_simplified ] = "城市";
     Text[ chinese_traditional ] = "城市";
     Text[ turkish ] = "City";
     Text[ arabic ] = "�������";
-    Text[ catalan ] = "Ciudad";
+    Text[ catalan ] = "Ciutat";
             Text[ finnish ] = "Postitoimipaikka";
+            Text[ thai ] = "เมือง";
         };
     String STR_FIELD_TITLE
     {
@@ -583,7 +597,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text [ english ] = "Title";
         Text [ english_us ] = "Title";
         Text[ portuguese ] = "T�tulo";
-    Text[ russian ] = "�����";
+    Text[ russian ] = "������";
     Text[ greek ] = "������";
     Text[ dutch ] = "Titel";
     Text[ french ] = "Titre";
@@ -599,8 +613,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "稱謂";
     Text[ turkish ] = "Title";
     Text[ arabic ] = "����� ������";
-    Text[ catalan ] = "T�tulo";
+    Text[ catalan ] = "T�tol";
             Text[ finnish ] = "Otsikko";
+            Text[ thai ] = "ยศ";
         };
     String STR_FIELD_POSITION
     {
@@ -622,10 +637,11 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ korean ] = "직위";
     Text[ chinese_simplified ] = "职位";
     Text[ chinese_traditional ] = "職務";
-    Text[ turkish ] = "�� unvan�";
+    Text[ turkish ] = "Pozisyon";
     Text[ arabic ] = "�������";
-    Text[ catalan ] = "Posici�n";
+    Text[ catalan ] = "Posici�";
             Text[ finnish ] = "Sijainti";
+            Text[ thai ] = "ตำแหน่ง";
         };
     String STR_FIELD_ADDRFORM
     {
@@ -644,13 +660,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Zwrot grzeczn.";
     Text[ portuguese_brazilian ] = "Addr. form";
     Text[ japanese ] = "敬称";
-    Text[ korean ] = "호칭";
-    Text[ chinese_simplified ] = "称谓";
+    Text[ korean ] = "경칭";
+    Text[ chinese_simplified ] = "称呼";
     Text[ chinese_traditional ] = "稱呼";
     Text[ turkish ] = "Addr. form";
     Text[ arabic ] = "��� ��������";
-    Text[ catalan ] = "Tratamiento";
-            Text[ finnish ] = "Osoite muoto";
+    Text[ catalan ] = "Tractament";
+            Text[ finnish ] = "Os. muoto";
+            Text[ thai ] = "แบบฟอร์มที่อยู่";
         };
     String STR_FIELD_INITIALS
     {
@@ -669,38 +686,40 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Inicja�y";
     Text[ portuguese_brazilian ] = "Initials";
     Text[ japanese ] = "イニシャル";
-    Text[ korean ] = "머리글자";
+    Text[ korean ] = "이니셜";
     Text[ chinese_simplified ] = "缩写";
     Text[ chinese_traditional ] = "縮寫";
     Text[ turkish ] = "Initials";
     Text[ arabic ] = "��������";
-    Text[ catalan ] = "Iniciales";
+    Text[ catalan ] = "Inicials";
             Text[ finnish ] = "Nimikirjaimet";
+            Text[ thai ] = "คำนำหน้าชื่อ";
         };
     String STR_FIELD_SALUTATION
     {
         Text = "Gru�formel";
         Text [ english ] = "Salutation";
-        Text [ english_us ] = "Salutation";
-        Text[ portuguese ] = "Vocativo";
-    Text[ russian ] = "���������";
+        Text [ english_us ] = "Complimentary close";
+        Text[ portuguese ] = "Tratamento";
+    Text[ russian ] = "�����������";
     Text[ greek ] = "����������";
     Text[ dutch ] = "Aanhef";
     Text[ french ] = "Formule finale";
-    Text[ spanish ] = "Tratamiento";
-    Text[ italian ] = "Inizio lettera";
+    Text[ spanish ] = "F�rmula de despedida";
+    Text[ italian ] = "Formula di apertura";
     Text[ danish ] = "Slut~hilsen";
     Text[ swedish ] = "H�lsningsfras";
     Text[ polish ] = "Zwrot grzeczn.";
     Text[ portuguese_brazilian ] = "Salutation";
     Text[ japanese ] = "挨拶文";
-    Text[ korean ] = "호칭";
+    Text[ korean ] = "인사말";
     Text[ chinese_simplified ] = "问候语";
     Text[ chinese_traditional ] = "問候語";
     Text[ turkish ] = "Salutation";
     Text[ arabic ] = "������";
-    Text[ catalan ] = "Tratamiento";
-            Text[ finnish ] = "Arvo";
+    Text[ catalan ] = "Tractament";
+            Text[ finnish ] = "Tervehdys";
+            Text[ thai ] = "ทักทาย";
         };
     String STR_FIELD_HOMETEL
     {
@@ -719,13 +738,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Telefon (pryw.)";
     Text[ portuguese_brazilian ] = "Telephon Home";
     Text[ japanese ] = "自宅電話";
-    Text[ korean ] = "Tel. 자택";
+    Text[ korean ] = "전화(자택)";
     Text[ chinese_simplified ] = "私人的电话号码";
     Text[ chinese_traditional ] = "私人電話號碼";
     Text[ turkish ] = "Telephon Home";
     Text[ arabic ] = "������ (����)";
-    Text[ catalan ] = "Tel�fono privado";
-            Text[ finnish ] = "Puh: koti";
+    Text[ catalan ] = "Tel.: particular";
+            Text[ finnish ] = "Puhelin (koti)";
+            Text[ thai ] = "เบอร์โทรศัพท์: บ้าน";
         };
     String STR_FIELD_WORKTEL
     {
@@ -735,7 +755,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ portuguese ] = "Telefone (emprego)";
     Text[ russian ] = "������� (���.)";
     Text[ greek ] = "�������� (�������)";
-    Text[ dutch ] = "Telefoon bedrijf";
+    Text[ dutch ] = "Telefoon werk";
     Text[ french ] = "T�l. bureau 1";
     Text[ spanish ] = "Tel�fono trabajo";
     Text[ italian ] = "Telefono (lavoro)";
@@ -744,13 +764,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Telefon (s�u�b.)";
     Text[ portuguese_brazilian ] = "Telephon Work";
     Text[ japanese ] = "会社電話";
-    Text[ korean ] = "Tel, 회사";
+    Text[ korean ] = "전화(회사)";
     Text[ chinese_simplified ] = "公司的电话号码";
     Text[ chinese_traditional ] = "公司電話號碼";
     Text[ turkish ] = "Telephon Work";
     Text[ arabic ] = "������ (���)";
-    Text[ catalan ] = "Tel�fono trabajo";
-            Text[ finnish ] = "Puh: ty�";
+    Text[ catalan ] = "Tel.: feina";
+            Text[ finnish ] = "Puhelin (ty�)";
+            Text[ thai ] = "เบอร์โทรศัพท์: ที่ทำงาน";
         };
     String STR_FIELD_FAX
     {
@@ -758,7 +779,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text [ english ] = "FAX";
         Text [ english_us ] = "FAX";
         Text[ portuguese ] = "Fax";
-    Text[ russian ] = "����";
+    Text[ russian ] = "����";
     Text[ greek ] = "FAX";
     Text[ dutch ] = "FAX";
     Text[ french ] = "Fax";
@@ -768,14 +789,15 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ swedish ] = "FAX";
     Text[ polish ] = "FAKS";
     Text[ portuguese_brazilian ] = "FAX";
-    Text[ japanese ] = "Fax 番号";
+    Text[ japanese ] = "FAX 番号";
     Text[ korean ] = "팩스";
     Text[ chinese_simplified ] = "传真号码";
     Text[ chinese_traditional ] = "傳真號碼";
     Text[ turkish ] = "Faks";
     Text[ arabic ] = "������";
-    Text[ catalan ] = "FAX";
+    Text[ catalan ] = "Fax";
             Text[ finnish ] = "Faksi";
+            Text[ thai ] = "โทรสาร";
         };
     String STR_FIELD_EMAIL
     {
@@ -783,24 +805,25 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text [ english ] = "E-Mail";
         Text [ english_us ] = "E-mail";
         Text[ portuguese ] = "E-mail";
-    Text[ russian ] = "����� ��. �����";
+    Text[ russian ] = "��. �����";
     Text[ greek ] = "E-Mail";
     Text[ dutch ] = "E-mail";
     Text[ french ] = "E-mail";
-    Text[ spanish ] = "E-mail";
+    Text[ spanish ] = "Correo-e";
     Text[ italian ] = "eMail";
     Text[ danish ] = "E~-mail";
     Text[ swedish ] = "E-post";
-    Text[ polish ] = "e-mail";
+    Text[ polish ] = "Adres e-mail";
     Text[ portuguese_brazilian ] = "E-Mail";
-    Text[ japanese ] = "Eーmail";
-    Text[ korean ] = "E-Mail";
+    Text[ japanese ] = "E-Mail";
+    Text[ korean ] = "전자 메일";
     Text[ chinese_simplified ] = "电子邮件地址";
     Text[ chinese_traditional ] = "電子郵件地址";
     Text[ turkish ] = "E-posta";
     Text[ arabic ] = "������ ����������";
-    Text[ catalan ] = "correu electr�ic";
+    Text[ catalan ] = "correu electr�nic";
             Text[ finnish ] = "S�hk�posti";
+            Text[ thai ] = "อีเมล์";
         };
     String STR_FIELD_URL
     {
@@ -826,6 +849,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ arabic ] = "URL";
     Text[ catalan ] = "URL";
             Text[ finnish ] = "URL-osoite";
+            Text[ thai ] = "URL";
         };
     String STR_FIELD_NOTE
     {
@@ -846,11 +870,12 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ japanese ] = "メモ";
     Text[ korean ] = "메모";
     Text[ chinese_simplified ] = "备注";
-    Text[ chinese_traditional ] = "備注";
+    Text[ chinese_traditional ] = "備註";
     Text[ turkish ] = "Note";
     Text[ arabic ] = "������";
     Text[ catalan ] = "Nota";
-            Text[ finnish ] = "Huomautus:";
+            Text[ finnish ] = "Huomautus";
+            Text[ thai ] = "บันทึกย่อ";
         };
     String STR_FIELD_USER1
     {
@@ -874,8 +899,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "使用者 1";
     Text[ turkish ] = "User 1";
     Text[ arabic ] = "������  1";
-    Text[ catalan ] = "Usuario 1";
+    Text[ catalan ] = "Usuari 1";
             Text[ finnish ] = "K�ytt�j� 1";
+            Text[ thai ] = "ผู้ใช้ 1";
         };
     String STR_FIELD_USER2
     {
@@ -898,9 +924,10 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_simplified ] = "使用者 2";
     Text[ chinese_traditional ] = "使用者 2";
     Text[ turkish ] = "User 2";
-    Text[ arabic ] = "������  2";
-    Text[ catalan ] = "Usuario 2";
+    Text[ arabic ] = "������ 2";
+    Text[ catalan ] = "Usuari 2";
             Text[ finnish ] = "K�ytt�j� 2";
+            Text[ thai ] = "ผู้ใช้ 2";
         };
     String STR_FIELD_USER3
     {
@@ -924,8 +951,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "使用者 3";
     Text[ turkish ] = "User 3";
     Text[ arabic ] = "������ 3";
-    Text[ catalan ] = "Usuario 3";
+    Text[ catalan ] = "Usuari 3";
             Text[ finnish ] = "K�ytt�j� 3";
+            Text[ thai ] = "ผู้ใช้ 3";
         };
     String STR_FIELD_USER4
     {
@@ -949,8 +977,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "使用者 4";
     Text[ turkish ] = "User 4";
     Text[ arabic ] = "������ 4";
-    Text[ catalan ] = "Usuario 4";
+    Text[ catalan ] = "Usuari 4";
             Text[ finnish ] = "K�ytt�j� 4";
+            Text[ thai ] = "ผู้ใช้ 4";
         };
 
     String STR_FIELD_ID
@@ -967,7 +996,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ italian ] = "ID";
     Text[ danish ] = "ID";
     Text[ swedish ] = "ID";
-    Text[ polish ] = "ID (identyfikator)";
+    Text[ polish ] = "Identyfikator (ID)";
     Text[ portuguese_brazilian ] = "ID";
     Text[ japanese ] = "ID";
     Text[ korean ] = "ID";
@@ -975,8 +1004,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "ID";
     Text[ turkish ] = "Tan�t�c�";
     Text[ arabic ] = "�������";
-    Text[ catalan ] = "ID";
+    Text[ catalan ] = "Identificador";
             Text[ finnish ] = "Tunnus";
+            Text[ thai ] = "ID";
         };
     String STR_FIELD_STATE
     {
@@ -988,7 +1018,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ russian ] = "�������";
     Text[ greek ] = "�����";
     Text[ dutch ] = "Provincie/Regio";
-    Text[ french ] = "Province";
+    Text[ french ] = "�tat";
     Text[ spanish ] = "Provincia";
     Text[ italian ] = "Provincia";
     Text[ danish ] = "Del~stat";
@@ -996,13 +1026,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Wojew�dztwo";
     Text[ portuguese_brazilian ] = "State";
     Text[ japanese ] = "州名";
-    Text[ korean ] = "도";
+    Text[ korean ] = "도/주";
     Text[ chinese_simplified ] = "省市";
     Text[ chinese_traditional ] = "省市";
     Text[ turkish ] = "State";
     Text[ arabic ] = "�������";
-    Text[ catalan ] = "Provincia";
+    Text[ catalan ] = "Comarca";
             Text[ finnish ] = "Osavaltio";
+            Text[ thai ] = "รัฐ";
         };
     String STR_FIELD_OFFICETEL
     {
@@ -1021,13 +1052,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Telefon (s�u�b.)";
     Text[ portuguese_brazilian ] = "Telephon Office";
     Text[ japanese ] = "オフィス電話";
-    Text[ korean ] = "Tel．사무실";
+    Text[ korean ] = "전화(사무실)";
     Text[ chinese_simplified ] = "办公室的电话号码";
     Text[ chinese_traditional ] = "辦公室電話號碼";
     Text[ turkish ] = "Telephon Office";
-    Text[ arabic ] = "������ (���)";
-    Text[ catalan ] = "Tel�fono trabajo";
-            Text[ finnish ] = "Puh: toimisto";
+    Text[ arabic ] = "������ (����)";
+    Text[ catalan ] = "Tel.: oficina";
+            Text[ finnish ] = "Puhelin (toimisto)";
+            Text[ thai ] = "เบอร์โทรศัพท์: ที่ทำงาน";
         };
     String STR_FIELD_PAGER
     {
@@ -1039,8 +1071,8 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ greek ] = "Pager";
     Text[ dutch ] = "Pager";
     Text[ french ] = "Pager";
-    Text[ spanish ] = "Radiotel�fono";
-    Text[ italian ] = "Pager";
+    Text[ spanish ] = "Busca";
+    Text[ italian ] = "Teledrin";
     Text[ danish ] = "Telefon Persons�ger";
     Text[ swedish ] = "Persons�kare";
     Text[ polish ] = "Telefon (kom�rkowy)";
@@ -1051,8 +1083,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "無線呼叫號碼";
     Text[ turkish ] = "Pager";
     Text[ arabic ] = "����";
-    Text[ catalan ] = "Buscapersonas";
+    Text[ catalan ] = "Buscapersones";
             Text[ finnish ] = "Hakulaite";
+            Text[ thai ] = "เพจเจอร์";
         };
     String STR_FIELD_MOBILE
     {
@@ -1062,7 +1095,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text[ portuguese ] = "Telem�vel";
     Text[ russian ] = "���������";
     Text[ greek ] = "������";
-    Text[ dutch ] = "Mobile";
+    Text[ dutch ] = "Mobiele telefoon";
     Text[ french ] = "T�l. portable";
     Text[ spanish ] = "M�vil";
     Text[ italian ] = "Cellulare";
@@ -1071,13 +1104,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ polish ] = "Telefon kom�rkowy";
     Text[ portuguese_brazilian ] = "Mobile";
     Text[ japanese ] = "携帯電話";
-    Text[ korean ] = "휴대용 전화";
+    Text[ korean ] = "휴대폰";
     Text[ chinese_simplified ] = "手机号码";
     Text[ chinese_traditional ] = "手機號碼";
     Text[ turkish ] = "Mobile";
     Text[ arabic ] = "�������";
-    Text[ catalan ] = "M�vil";
+    Text[ catalan ] = "Telf. m�bil";
             Text[ finnish ] = "Matkapuhelin";
+            Text[ thai ] = "มือถือ";
         };
     String STR_FIELD_TELOTHER
     {
@@ -1085,7 +1119,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Text [ english ] = "Telephon other";
         Text [ english_us ] = "Tel: Other";
         Text[ portuguese ] = "Telefone (outros)";
-    Text[ russian ] = "������� (������)";
+    Text[ russian ] = "������� (������)";
     Text[ greek ] = "�������� (�������)";
     Text[ dutch ] = "Telefoon andere";
     Text[ french ] = "T�l. autre";
@@ -1093,7 +1127,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ italian ] = "Telefono (altro)";
     Text[ danish ] = "Telefon andre";
     Text[ swedish ] = "Telefon annan";
-    Text[ polish ] = "Telefon (inny)";
+    Text[ polish ] = "Telefony (inne)";
     Text[ portuguese_brazilian ] = "Telephon other";
     Text[ japanese ] = "その他の電話";
     Text[ korean ] = "기타 전화";
@@ -1101,8 +1135,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "其他電話號碼";
     Text[ turkish ] = "Telephon other";
     Text[ arabic ] = "������ (���)";
-    Text[ catalan ] = "Tel�fono, otros";
-            Text[ finnish ] = "Puh: muu";
+    Text[ catalan ] = "Tel.: altres";
+            Text[ finnish ] = "Puhelin (muu)";
+            Text[ thai ] = "เบอร์โทรศัพท์: ที่อื่น ";
         };
     String STR_FIELD_CALENDAR
     {
@@ -1126,8 +1161,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "行事歷";
     Text[ turkish ] = "Calendar";
     Text[ arabic ] = "�������";
-    Text[ catalan ] = "Agenda";
+    Text[ catalan ] = "Calendari";
             Text[ finnish ] = "Kalenteri";
+            Text[ thai ] = "ปฏิทิน";
         };
     String STR_FIELD_INVITE
     {
@@ -1151,8 +1187,9 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     Text[ chinese_traditional ] = "邀請";
     Text[ turkish ] = "Invite";
     Text[ arabic ] = "����";
-    Text[ catalan ] = "Invitar";
+    Text[ catalan ] = "Invita";
             Text[ finnish ] = "Kutsu";
+            Text[ thai ] = "เชิญ";
         };
 };
 
@@ -1170,3 +1207,8 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
 
 
 
+
+
+
+
+
diff --git a/svtools/source/dialogs/colctrl.cxx b/svtools/source/dialogs/colctrl.cxx
index 5fcb86a5b675..397e1d2c2051 100644
--- a/svtools/source/dialogs/colctrl.cxx
+++ b/svtools/source/dialogs/colctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: colctrl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ka $ $Date: 2001-08-08 09:51:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -665,9 +665,12 @@ Color ColorHSB::GetRGB() const
         n = (UINT16) dH;
         f = dH - n;
 
-        UINT8 a = (UINT8) ( nB * ( 100 - mnSat ) / 100 );
-        UINT8 b = (UINT8) ( nB * ( 100 - ( (double)mnSat * f + 0.5 ) ) / 100 );
-        UINT8 c = (UINT8) ( nB * ( 100 - ( (double)mnSat * ( 1.0 - f ) + 0.5 ) ) / 100 );
+        // #107375# Doing the calculation completely in floating
+        // point, the former optimization gave sometimes negative
+        // results for c and was pointless anyway
+        UINT8 a = static_cast<UINT8>( nB * ( 100.0 - mnSat ) / 100.0 );
+        UINT8 b = static_cast<UINT8>( nB * ( 100.0 - mnSat * f ) / 100.0 );
+        UINT8 c = static_cast<UINT8>( nB * ( 100.0 - mnSat * ( 1.0 - f ) ) / 100.0 );
 
         switch( n )
         {
diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src
index d724d567fd36..d0ae88782502 100644
--- a/svtools/source/dialogs/colrdlg.src
+++ b/svtools/source/dialogs/colrdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: colrdlg.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: os $ $Date: 2001-12-18 15:10:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,8 +121,8 @@ ModalDialog DLG_COLOR
         Text [ portuguese_brazilian ] = "~Cyan" ;
         Text [ swedish ] = "~Cyan" ;
         Text [ danish ] = "Cyan" ;
-        Text [ italian ] = "~Ciano" ;
-        Text [ spanish ] = "~Cian" ;
+        Text [ italian ] = "Ciano" ;
+        Text [ spanish ] = "Cian" ;
         Text [ french ] = "~Cyan" ;
         Text [ dutch ] = "~Cyaan" ;
         Text [ portuguese ] = "~Ciano" ;
@@ -135,11 +135,12 @@ ModalDialog DLG_COLOR
         Text[ dutch ] = "~Cyaan";
         Text[ chinese_simplified ] = "蓝绿色(~C)";
         Text[ greek ] = "�����";
-        Text[ korean ] = "청록(~C)";
+        Text[ korean ] = "청록색(~C)";
         Text[ turkish ] = "~Camg�be�i";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Cian";
-        Text[ finnish ] = "~Syaani";
+        Text[ finnish ] = "S~yaani";
+        Text[ thai ] = "~ฟ้า";
     };
     FixedText FT_MAGENTA
     {
@@ -154,22 +155,23 @@ ModalDialog DLG_COLOR
         Text [ italian ] = "~Magenta" ;
         Text [ spanish ] = "~Magenta" ;
         Text [ french ] = "~Magenta" ;
-        Text [ dutch ] = "~Magenta" ;
+        Text [ dutch ] = "Vio~let" ;
         Text [ portuguese ] = "~Magenta" ;
         Text[ chinese_simplified ] = "紫红色(~M)";
-        Text[ russian ] = "~�������";
+        Text[ russian ] = "���������";
         Text[ polish ] = "Purpurowy";
         Text[ japanese ] = "マゼンタ(~M)";
         Text[ chinese_traditional ] = "紫紅色(~M)";
         Text[ arabic ] = "�������";
-        Text[ dutch ] = "~Magenta";
+        Text[ dutch ] = "Vio~let";
         Text[ chinese_simplified ] = "紫红色(~M)";
         Text[ greek ] = "��������";
         Text[ korean ] = "선홍색(~M)";
         Text[ turkish ] = "M~or";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Magenta";
-        Text[ finnish ] = "~Purppura";
+        Text[ finnish ] = "~Magenta";
+        Text[ thai ] = "~ม่วง";
     };
     FixedText FT_YELLOW
     {
@@ -182,24 +184,25 @@ ModalDialog DLG_COLOR
         Text [ swedish ] = "~Yellow" ;
         Text [ danish ] = "Gul" ;
         Text [ italian ] = "~Giallo" ;
-        Text [ spanish ] = "~Amarillo" ;
+        Text [ spanish ] = "Amarillo" ;
         Text [ french ] = "~Jaune" ;
-        Text [ dutch ] = "~Yellow" ;
+        Text [ dutch ] = "~Geel" ;
         Text [ portuguese ] = "~Amarelo" ;
         Text[ chinese_simplified ] = "黄色(~Y)";
-        Text[ russian ] = "~������";
+        Text[ russian ] = "������";
         Text[ polish ] = "��ty";
         Text[ japanese ] = "黄(~Y)";
         Text[ chinese_traditional ] = "黃色(~Y)";
         Text[ arabic ] = "����";
-        Text[ dutch ] = "~Yellow";
+        Text[ dutch ] = "~Geel";
         Text[ chinese_simplified ] = "黄色(~Y)";
         Text[ greek ] = "�������";
         Text[ korean ] = "황색(~Y)";
         Text[ turkish ] = "~Sar�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Amarillo";
-        Text[ finnish ] = "~Keltainen";
+        Text[ catalan ] = "~Groc";
+        Text[ finnish ] = "K~eltainen";
+        Text[ thai ] = "เ~หลือง";
     };
     FixedText FT_KEY
     {
@@ -209,15 +212,15 @@ ModalDialog DLG_COLOR
         Text [ ENGLISH ] = "~Key" ;
         Text [ english_us ] = "~Key" ;
         Text [ portuguese_brazilian ] = "~Key" ;
-        Text [ swedish ] = "~Key" ;
+        Text [ swedish ] = "~Nyckel" ;
         Text [ danish ] = "N�gle" ;
-        Text [ italian ] = "~Chiave" ;
+        Text [ italian ] = "Chiave" ;
         Text [ spanish ] = "~Llave" ;
         Text [ french ] = "~Kh�l" ;
         Text [ dutch ] = "~Key" ;
         Text [ portuguese ] = "~Chave" ;
         Text[ chinese_simplified ] = "键码(~K)";
-        Text[ russian ] = "~����";
+        Text[ russian ] = "����";
         Text[ polish ] = "Klucz";
         Text[ japanese ] = "黒(~K)";
         Text[ chinese_traditional ] = "鍵碼(~K)";
@@ -228,8 +231,9 @@ ModalDialog DLG_COLOR
         Text[ korean ] = "키(~K)";
         Text[ turkish ] = "~Key";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Llave";
-        Text[ finnish ] = "~Avain";
+        Text[ catalan ] = "~Clau";
+        Text[ finnish ] = "~Musta";
+        Text[ thai ] = "~กุญแจ";
     };
     MetricField NUM_CYAN
     {
@@ -299,7 +303,7 @@ ModalDialog DLG_COLOR
         Text [ dutch ] = "~Rood" ;
         Text [ portuguese ] = "~Vermelho" ;
         Text[ chinese_simplified ] = "红色(~R)";
-        Text[ russian ] = "~�����.";
+        Text[ russian ] = "�������";
         Text[ polish ] = "Czerwony";
         Text[ japanese ] = "赤(~R)";
         Text[ chinese_traditional ] = "紅色(~R)";
@@ -310,8 +314,9 @@ ModalDialog DLG_COLOR
         Text[ korean ] = "적색(~R)";
         Text[ turkish ] = "~K�rm�z�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Rojo";
+        Text[ catalan ] = "~Vermell";
         Text[ finnish ] = "~Punainen";
+        Text[ thai ] = "แ~ดง";
     };
     FixedText FT_GREEN
     {
@@ -329,7 +334,7 @@ ModalDialog DLG_COLOR
         Text [ dutch ] = "~Groen" ;
         Text [ portuguese ] = "~Verde" ;
         Text[ chinese_simplified ] = "绿色(~G)";
-        Text[ russian ] = "~�����.";
+        Text[ russian ] = "�������";
         Text[ polish ] = "Zielony";
         Text[ japanese ] = "緑(~G)";
         Text[ chinese_traditional ] = "綠色(~G)";
@@ -340,8 +345,9 @@ ModalDialog DLG_COLOR
         Text[ korean ] = "녹색(~G)";
         Text[ turkish ] = "~Ye�il";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Verde";
+        Text[ catalan ] = "~Verd";
         Text[ finnish ] = "~Vihre�";
+        Text[ thai ] = "เ~ขียว";
     };
     FixedText FT_BLUE
     {
@@ -370,8 +376,9 @@ ModalDialog DLG_COLOR
         Text[ korean ] = "청색(~B)";
         Text[ turkish ] = "~Mavi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Azul";
+        Text[ catalan ] = "~Blau";
         Text[ finnish ] = "~Sininen";
+        Text[ thai ] = "~น้ำเงิน";
     };
     NumericField NUM_RED
     {
@@ -416,13 +423,13 @@ ModalDialog DLG_COLOR
         Text [ portuguese_brazilian ] = "~Farbe" ;
         Text [ swedish ] = "~F�rg" ;
         Text [ danish ] = "Farve" ;
-        Text [ italian ] = "~Colore" ;
-        Text [ spanish ] = "~Color" ;
+        Text [ italian ] = "Colore" ;
+        Text [ spanish ] = "~Tinte" ;
         Text [ french ] = "~Teinte" ;
         Text [ dutch ] = "~Kleur" ;
         Text [ portuguese ] = "~Cor" ;
         Text[ chinese_simplified ] = "颜色(~U)";
-        Text[ russian ] = "����";
+        Text[ russian ] = "�������";
         Text[ polish ] = "Kolor";
         Text[ japanese ] = "色合い(~U)";
         Text[ chinese_traditional ] = "顏色(~U)";
@@ -433,8 +440,9 @@ ModalDialog DLG_COLOR
         Text[ korean ] = "색(~U)";
         Text[ turkish ] = "~Renk";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Color";
-        Text[ finnish ] = "~S?vy";
+        Text[ catalan ] = "~To de color";
+        Text[ finnish ] = "S~�vy";
+        Text[ thai ] = "~สี";
     };
     NumericField NUM_HUE
     {
@@ -463,7 +471,7 @@ ModalDialog DLG_COLOR
         Text [ dutch ] = "~Verzadiging" ;
         Text [ portuguese ] = "~Satura��o" ;
         Text[ chinese_simplified ] = "饱和度(~S)";
-        Text[ russian ] = "~�������.";
+        Text[ russian ] = "~���������";
         Text[ polish ] = "Nasycenie";
         Text[ japanese ] = "彩度(~S)";
         Text[ chinese_traditional ] = "飽和度(~S)";
@@ -474,8 +482,9 @@ ModalDialog DLG_COLOR
         Text[ korean ] = "채도(~S)";
         Text[ turkish ] = "~Doygunluk";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Saturaci�n";
-        Text[ finnish ] = "~Kyll?isyys";
+        Text[ catalan ] = "~Saturaci�";
+        Text[ finnish ] = "K~yll�isyys";
+        Text[ thai ] = "~อิ่มตัว";
     };
     NumericField NUM_SATURATION
     {
@@ -515,8 +524,9 @@ ModalDialog DLG_COLOR
         Text[ korean ] = "밝기(~N)";
         Text[ turkish ] = "Par~lakl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Brillo";
-        Text[ finnish ] = "~Kirkkaus";
+        Text[ catalan ] = "~Brillantor";
+        Text[ finnish ] = "Kirk~kaus";
+        Text[ thai ] = "ความ~สว่าง";
     };
     NumericField NUM_LUMINANCE
     {
@@ -570,5 +580,23 @@ ModalDialog DLG_COLOR
     Text[ turkish ] = "Renk";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Color";
-    Text[ finnish ] = "V?ri";
+    Text[ finnish ] = "V�ri";
+    Text[ thai ] = "สี";
 };
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src
index a4be6593e56e..bbc78c537b97 100644
--- a/svtools/source/dialogs/filedlg2.src
+++ b/svtools/source/dialogs/filedlg2.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filedlg2.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-27 06:17:19 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,19 +72,20 @@ String STR_FILEDLG_SELECT
     Text [ italian ] = "Scelta cartella" ;
     Text [ spanish ] = "Seleccionar directorio" ;
     Text [ french ] = "S�lection du r�pertoire" ;
-    Text [ dutch ] = "Map selecteren" ;
-    Text[ chinese_simplified ] = "ѡ��Ŀ¼";
+    Text [ dutch ] = "Directory selecteren" ;
+    Text[ chinese_simplified ] = "选择目录";
     Text[ russian ] = "����� ��������";
     Text[ polish ] = "Wybierz katalog";
-    Text[ japanese ] = "�ިڸ�؂�I��";
-    Text[ chinese_traditional ] = "��ܥؿ�";
+    Text[ japanese ] = "ディレクトリを選択";
+    Text[ chinese_traditional ] = "選擇目錄";
     Text[ arabic ] = "����� ������";
     Text[ greek ] = "������� ���������";
-    Text[ korean ] = "���丮 ����";
+    Text[ korean ] = "디렉토리 선택";
     Text[ turkish ] = "Dizin se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Seleccionar directorio";
+    Text[ catalan ] = "Seleccioneu el directori";
     Text[ finnish ] = "Valitse hakemisto";
+    Text[ thai ] = "เลือกสารบบ";
 };
 String STR_FILEDLG_CANTCHDIR
 {
@@ -99,18 +100,19 @@ String STR_FILEDLG_CANTCHDIR
     Text [ french ] = "Impossible de passer au r�pertoire" ;
     Text [ dutch ] = "Kan niet in map komen" ;
     Text [ portuguese ] = "Imposs�vel mudar para direct�rio" ;
-    Text[ chinese_simplified ] = "�޷�ת��Ŀ¼";
-    Text[ russian ] = "������� ������� ����������";
+    Text[ chinese_simplified ] = "无法转到目录";
+    Text[ russian ] = "���������� �������� �������";
     Text[ polish ] = "Nie mo�e zmieni� katalogu";
-    Text[ japanese ] = "�ިڸ�؂�ύX�ł��܂���B";
-    Text[ chinese_traditional ] = "�L�k���ؿ�";
+    Text[ japanese ] = "ディレクトリを変更できません。";
+    Text[ chinese_traditional ] = "無法轉到目錄";
     Text[ arabic ] = "�� ���� ����� ������";
     Text[ greek ] = "��� ����� ������� �� ����� ������ ���� ��������";
-    Text[ korean ] = "���丮�� ������ �� �����ϴ�.";
+    Text[ korean ] = "디렉토리를 변경할 수 없습니다.";
     Text[ turkish ] = "Dizin de�i�tirilemiyor";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No es posible cambiar en directorio";
+    Text[ catalan ] = "No es pot canviar el directori";
     Text[ finnish ] = "Hakemistoon ei voi siirty�";
+    Text[ thai ] = "ไม่สามารถเปลี่ยนไปที่สารบบ";
 };
 String STR_FILEDLG_OPEN
 {
@@ -125,18 +127,19 @@ String STR_FILEDLG_OPEN
     Text [ spanish ] = "Abrir" ;
     Text [ french ] = "Ouvrir" ;
     Text [ dutch ] = "Openen" ;
-    Text[ chinese_simplified ] = "��";
+    Text[ chinese_simplified ] = "打开";
     Text[ russian ] = "�������";
     Text[ polish ] = "Otw�rz";
-    Text[ japanese ] = "�J��";
-    Text[ chinese_traditional ] = "�}������";
+    Text[ japanese ] = "開く";
+    Text[ chinese_traditional ] = "開啟舊檔";
     Text[ arabic ] = "���";
     Text[ greek ] = "�������";
-    Text[ korean ] = "����";
+    Text[ korean ] = "열기";
     Text[ turkish ] = "A�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abrir";
+    Text[ catalan ] = "Obre";
     Text[ finnish ] = "Avaa";
+    Text[ thai ] = "เปิด";
 };
 String STR_FILEDLG_FILE
 {
@@ -151,18 +154,19 @@ String STR_FILEDLG_FILE
     Text [ spanish ] = "~Archivo" ;
     Text [ french ] = "~Fichier" ;
     Text [ dutch ] = "~Bestand" ;
-    Text[ chinese_simplified ] = "�ļ�(~F)";
+    Text[ chinese_simplified ] = "文件(~F)";
     Text[ russian ] = "~����";
     Text[ polish ] = "Plik";
-    Text[ japanese ] = "̧��(~F)";
-    Text[ chinese_traditional ] = "�ɮ�(~F)";
+    Text[ japanese ] = "ファイル(~F)";
+    Text[ chinese_traditional ] = "檔案(~F)";
     Text[ arabic ] = "���";
     Text[ greek ] = "������";
-    Text[ korean ] = "����(~F)";
+    Text[ korean ] = "파일(~F)";
     Text[ turkish ] = "~Dosya";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "~Archivo";
+    Text[ catalan ] = "~Fitxer";
     Text[ finnish ] = "~Tiedosto";
+    Text[ thai ] = "แ~ฟ้ม";
 };
 String STR_FILEDLG_DIR
 {
@@ -177,18 +181,19 @@ String STR_FILEDLG_DIR
     Text [ spanish ] = "~Directorio" ;
     Text [ french ] = "~R�pertoire" ;
     Text [ dutch ] = "~Directory" ;
-    Text[ chinese_simplified ] = "Ŀ¼(~D)";
+    Text[ chinese_simplified ] = "目录(~D)";
     Text[ russian ] = "�������";
     Text[ polish ] = "Katalog";
-    Text[ japanese ] = "�ިڸ��(~D)";
-    Text[ chinese_traditional ] = "�ؿ�(~D)";
+    Text[ japanese ] = "ディレクトリ(~D)";
+    Text[ chinese_traditional ] = "目錄(~D)";
     Text[ arabic ] = "����";
     Text[ greek ] = "���������";
-    Text[ korean ] = "���丮(~D)";
+    Text[ korean ] = "디렉토리(~D)";
     Text[ turkish ] = "~Dizin";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "~Directorio";
+    Text[ catalan ] = "~Directori";
     Text[ finnish ] = "~Hakemisto";
+    Text[ thai ] = "~สารบบ";
 };
 String STR_FILEDLG_TYPE
 {
@@ -201,20 +206,21 @@ String STR_FILEDLG_TYPE
     Text [ danish ] = "Filtype" ;
     Text [ italian ] = "Tipo di file" ;
     Text [ spanish ] = "Tipo de ar~chivo" ;
-    Text [ french ] = "~Type de fichier" ;
-    Text [ dutch ] = "Bestand~type" ;
-    Text[ chinese_simplified ] = "�ļ�����(~T)";
+    Text [ french ] = "Type de fichier" ;
+    Text [ dutch ] = "Bestands~type" ;
+    Text[ chinese_simplified ] = "文件类型(~T)";
     Text[ russian ] = "��� �����";
     Text[ polish ] = "Typ pliku";
-    Text[ japanese ] = "̧�ق̎��(~T)";
-    Text[ chinese_traditional ] = "�ɮ�����(~T)";
+    Text[ japanese ] = "ファイルの種類(~T)";
+    Text[ chinese_traditional ] = "檔案類型(~T)";
     Text[ arabic ] = "��� �����";
     Text[ greek ] = "����� �������";
-    Text[ korean ] = "����  ����(~T)";
+    Text[ korean ] = "파일 형식(~T)";
     Text[ turkish ] = "Dosya ~tipi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipo de ar~chivo";
+    Text[ catalan ] = "~Tipus de fitxer";
     Text[ finnish ] = "Tiedosto~tyyppi";
+    Text[ thai ] = "~ชนิดแฟ้ม";
 };
 String STR_FILEDLG_CANTOPENFILE
 {
@@ -229,18 +235,19 @@ String STR_FILEDLG_CANTOPENFILE
     Text [ spanish ] = "No es posible abrir el archivo" ;
     Text [ french ] = "Impossible d'ouvrir le fichier" ;
     Text [ dutch ] = "Kan bestand niet openen" ;
-    Text[ chinese_simplified ] = "�޷����ļ�";
-    Text[ russian ] = "������� ���� ����������";
+    Text[ chinese_simplified ] = "无法打开文件";
+    Text[ russian ] = "���������� ������� ����";
     Text[ polish ] = "Nie mo�e otworzy� pliku";
-    Text[ japanese ] = "̧�ق��J�����Ƃ��ł��܂���B";
-    Text[ chinese_traditional ] = "�L�k�}���ɮ�";
+    Text[ japanese ] = "ファイルを開くことができません。";
+    Text[ chinese_traditional ] = "無法開啟檔案";
     Text[ arabic ] = "�� ���� ��� �����";
     Text[ greek ] = "��� ����� ������� �� �������� �� ������";
-    Text[ korean ] = "������ �� �� �����ϴ�.";
+    Text[ korean ] = "파일을 열 수 없습니다.";
     Text[ turkish ] = "Dosya a��lam�yor";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No es posible abrir el archivo";
+    Text[ catalan ] = "No es pot obrir el fitxer";
     Text[ finnish ] = "Tiedostoa ei voi avata";
+    Text[ thai ] = "ไม่สามารถเปิดแฟ้มได้";
 };
 String STR_FILEDLG_CANTOPENDIR
 {
@@ -255,18 +262,19 @@ String STR_FILEDLG_CANTOPENDIR
     Text [ spanish ] = "No es posible abrir el directorio" ;
     Text [ french ] = "Impossible d'ouvrir le r�pertoire" ;
     Text [ dutch ] = "Kan map niet openen" ;
-    Text[ chinese_simplified ] = "�޷���Ŀ¼";
-    Text[ russian ] = "������� ������� ����������";
+    Text[ chinese_simplified ] = "无法打开目录";
+    Text[ russian ] = "���������� ������� �������";
     Text[ polish ] = "Nie mo�e otworzy� katalogu";
-    Text[ japanese ] = "�ިڸ�؂��J�����Ƃ��ł��܂���B";
-    Text[ chinese_traditional ] = "�L�k�}�ҥؿ�";
+    Text[ japanese ] = "ディレクトリを開くことができません。";
+    Text[ chinese_traditional ] = "無法開啟目錄";
     Text[ arabic ] = "�� ���� ��� ������";
     Text[ greek ] = "��� ����� ������� �� �������� � ���������";
-    Text[ korean ] = "���丮�� �� �� �����ϴ�.";
+    Text[ korean ] = "디렉토리를 열 수 없습니다.";
     Text[ turkish ] = "Dizin a��lam�yor";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No es posible abrir el directorio";
+    Text[ catalan ] = "No es pot obrir el directori";
     Text[ finnish ] = "Hakemistoa ei voi avata";
+    Text[ thai ] = "ไม่สามารถเปิดสารบบ";
 };
 String STR_FILEDLG_OVERWRITE
 {
@@ -281,18 +289,19 @@ String STR_FILEDLG_OVERWRITE
     Text [ spanish ] = "El archivo ya existe.\n�Desea sobrescribirlo?" ;
     Text [ french ] = "Ce fichier existe d�j�. \nVoulez-vous le remplacer ?" ;
     Text [ dutch ] = "Het bestand bestaat reeds. \nOverschrijven?" ;
-    Text[ chinese_simplified ] = "�ļ��Ѿ����ڡ� \nҪ��д�ļ���";
-    Text[ russian ] = "��� ���� ��� ����������. \n���������� ���?";
+    Text[ chinese_simplified ] = "文件已经存在。 \n要改写文件？";
+    Text[ russian ] = "���� ��� ����������. \n����������?";
     Text[ polish ] = "Plik ju� istnieje. \nSkasowa� plik przez zapisanie?";
-    Text[ japanese ] = "̧�ق͂���܂��B \n�㏑�����܂����H";
-    Text[ chinese_traditional ] = "�ɮצs�b�C \n�z�n�мg�ɮסH";
+    Text[ japanese ] = "ファイルはあります。 \n上書きしますか？";
+    Text[ chinese_traditional ] = "檔案存在。 \n您要覆寫檔案？";
     Text[ arabic ] = "��� ����� ����� ������.\n�� ���� ������� ����";
     Text[ greek ] = "�� ������ ���� ������� ���. \n�� ��������������;";
-    Text[ korean ] = "�� ������ �̹� �����մϴ�. \n�����ðڽ��ϱ�?";
+    Text[ korean ] = "이 파일이 이미 있습니다. \n덮어쓰시겠습니까?";
     Text[ turkish ] = "Dosya mevcut. \n�zerine yaz�ls�n m�?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El archivo ya existe.\n�Desea sobrescribirlo?";
+    Text[ catalan ] = "Aquest fitxer ja existeix. \nVoleu sobreescriure'l?";
     Text[ finnish ] = "Tiedosto on jo olemassa. \nKorvataanko?";
+    Text[ thai ] = "มีแฟ้มนี้อยู่แล้ว \nเขียนทับหรือไม่ ?";
 };
 String STR_FILEDLG_GOUP
 {
@@ -307,18 +316,19 @@ String STR_FILEDLG_GOUP
     Text [ spanish ] = "Subir un nivel" ;
     Text [ french ] = "Niveau sup�rieur" ;
     Text [ dutch ] = "Een niveau hoger" ;
-    Text[ chinese_simplified ] = "������һ��";
+    Text[ chinese_simplified ] = "向上升一级";
     Text[ russian ] = "�� ���� ������� �����";
     Text[ polish ] = "Jeden poziom wy�ej";
-    Text[ japanese ] = "�P���̫��ނ�";
-    Text[ chinese_traditional ] = "�V�W�@��";
+    Text[ japanese ] = "１つ上のフォルダへ";
+    Text[ chinese_traditional ] = "向上一級";
     Text[ arabic ] = "����� ���� ������";
     Text[ greek ] = "��� ������� ��� ����";
-    Text[ korean ] = "�� ���� ����";
+    Text[ korean ] = "한 수준 위로";
     Text[ turkish ] = "Bir seviye yukar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Subir un nivel";
-    Text[ finnish ] = "Yksi taso yl�s";
+    Text[ catalan ] = "Un nivell amunt";
+    Text[ finnish ] = "Tasoa ylemm�s";
+    Text[ thai ] = "ขึ้นหนึ่งระดับ";
 };
 String STR_FILEDLG_SAVE
 {
@@ -333,18 +343,19 @@ String STR_FILEDLG_SAVE
     Text [ spanish ] = "Guardar" ;
     Text [ french ] = "Enregistrer" ;
     Text [ dutch ] = "Opslaan" ;
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "存盘";
     Text[ russian ] = "���������";
     Text[ polish ] = "Zapisz";
-    Text[ japanese ] = "�ۑ�";
-    Text[ chinese_traditional ] = "�x�s";
+    Text[ japanese ] = "保存";
+    Text[ chinese_traditional ] = "儲存";
     Text[ arabic ] = "���";
     Text[ greek ] = "����������";
-    Text[ korean ] = "����";
+    Text[ korean ] = "저장";
     Text[ turkish ] = "Kaydet";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Guardar";
+    Text[ catalan ] = "Desa";
     Text[ finnish ] = "Tallenna";
+    Text[ thai ] = "บันทึก";
 };
 String STR_FILEDLG_DRIVES
 {
@@ -359,18 +370,19 @@ String STR_FILEDLG_DRIVES
     Text [ spanish ] = "~Unidades" ;
     Text [ french ] = "~Unit�s" ;
     Text [ dutch ] = "~Stations" ;
-    Text[ chinese_simplified ] = "������(~R)";
-    Text[ russian ] = "�����";
+    Text[ chinese_simplified ] = "驱动盘(~R)";
+    Text[ russian ] = "����";
     Text[ polish ] = "Nap�dy";
-    Text[ japanese ] = "��ײ��(~R)";
-    Text[ chinese_traditional ] = "�X�ʾ�(~R)";
+    Text[ japanese ] = "ドライブ(~R)";
+    Text[ chinese_traditional ] = "驅動器(~R)";
     Text[ arabic ] = "������ �������";
     Text[ greek ] = "������ ������";
-    Text[ korean ] = "����̺�(~R)";
+    Text[ korean ] = "드라이브(~R)";
     Text[ turkish ] = "~S�r�c�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "~Unidades";
+    Text[ catalan ] = "~Unitat";
     Text[ finnish ] = "A~sema";
+    Text[ thai ] = "ได~ร้ฟ์";
 };
 String STR_FILEDLG_HOME
 {
@@ -384,19 +396,20 @@ String STR_FILEDLG_HOME
     Text [ italian ] = "Cartella utente" ;
     Text [ spanish ] = "Directorio de usuario" ;
     Text [ french ] = "R�pertoire d'utilisateur" ;
-    Text [ dutch ] = "Gebruikers-map" ;
-    Text[ chinese_simplified ] = "ʹ����Ŀ¼";
+    Text [ dutch ] = "Gebruikersmap" ;
+    Text[ chinese_simplified ] = "使用者目录";
     Text[ russian ] = "������� ������������";
     Text[ polish ] = "Katalog u�ytkownik�w";
-    Text[ japanese ] = "հ�ް���ިڸ��";
-    Text[ chinese_traditional ] = "�ۭq�ؿ�";
+    Text[ japanese ] = "ユーザーのディレクトリ";
+    Text[ chinese_traditional ] = "自訂目錄";
     Text[ arabic ] = "���� ��������";
     Text[ greek ] = "��������� ������";
-    Text[ korean ] = "����� ���丮";
+    Text[ korean ] = "사용자 디렉토리";
     Text[ turkish ] = "Kullan�c� dizini";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Directorio de usuario";
+    Text[ catalan ] = "Directori de l'usuari";
     Text[ finnish ] = "Oma hakemisto";
+    Text[ thai ] = "สารบบผู้ใช้";
 };
 String STR_FILEDLG_NEWDIR
 {
@@ -410,19 +423,20 @@ String STR_FILEDLG_NEWDIR
     Text [ italian ] = "Crea cartella" ;
     Text [ spanish ] = "Crear directorio" ;
     Text [ french ] = "Cr�er un r�pertoire" ;
-    Text [ dutch ] = "Map maken" ;
-    Text[ chinese_simplified ] = "����Ŀ¼";
+    Text [ dutch ] = "Directory maken" ;
+    Text[ chinese_simplified ] = "创建目录";
     Text[ russian ] = "������� �������";
     Text[ polish ] = "Utw�rz katalog";
-    Text[ japanese ] = "�ިڸ�؂��쐬";
-    Text[ chinese_traditional ] = "�إߥؿ�";
+    Text[ japanese ] = "ディレクトリを作成";
+    Text[ chinese_traditional ] = "建立目錄";
     Text[ arabic ] = "����� ����";
     Text[ greek ] = "���������� ���������";
-    Text[ korean ] = "���丮 �����";
+    Text[ korean ] = "디렉토리 만들기";
     Text[ turkish ] = "Dizin olu�tur";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Crear directorio";
+    Text[ catalan ] = "Crea un directori";
     Text[ finnish ] = "Luo hakemisto";
+    Text[ thai ] = "สร้างสารบบ";
 };
 String STR_FILEDLG_ASKNEWDIR
 {
@@ -435,20 +449,21 @@ String STR_FILEDLG_ASKNEWDIR
     Text [ italian ] = "Volete creare una cartella %s ?" ;
     Text [ spanish ] = "�Desea crear el directorio %s?" ;
     Text [ french ] = "Souhaitez vous cr�er le r�pertoire %s ?" ;
-    Text [ dutch ] = "Wilt u dat map %s wordt aangelegd ?" ;
+    Text [ dutch ] = "Wilt u dat map %s wordt gemaakt?" ;
     Text [ portuguese ] = "Deseja criar o direct�rio %s ?" ;
-    Text[ chinese_simplified ] = "��Ҫ�������Ŀ¼ %s ��";
+    Text[ chinese_simplified ] = "您要建立这个目录 %s ？";
     Text[ russian ] = "������� ������� %s ?";
     Text[ polish ] = "Czy utworzy� katalog %s?";
-    Text[ japanese ] = "�ިڸ��%s���쐬���܂���?";
-    Text[ chinese_traditional ] = "�z�n�إ߳o�ӥؿ� %s �H";
+    Text[ japanese ] = "ディレクトリ %s を作成しますか。";
+    Text[ chinese_traditional ] = "您要建立這個目錄 %s ？";
     Text[ arabic ] = "�� ���� ����� ������ %s�";
     Text[ greek ] = "������ �� ������������ � ��������� %s;";
-    Text[ korean ] = "���丮 %s �� ����ðڽ��ϱ� ?";
+    Text[ korean ] = "디렉토리 %s 를 만드시겠습니까 ?";
     Text[ turkish ] = "%s olu�turulsun mu ?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�Desea crear el directorio %s?";
+    Text[ catalan ] = "Voleu crear el directori %s?";
     Text[ finnish ] = "Haluatko luoda hakemiston %s?";
+    Text[ thai ] = "คุณต้องการสร้างสารบบ %s หรือไม่?";
 };
 
 
@@ -457,3 +472,16 @@ String STR_FILEDLG_ASKNEWDIR
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/dialogs/logindlg.src b/svtools/source/dialogs/logindlg.src
index 47e8f81c0296..7793f0d48932 100644
--- a/svtools/source/dialogs/logindlg.src
+++ b/svtools/source/dialogs/logindlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: logindlg.src,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: fs $ $Date: 2002-02-07 14:19:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,7 +75,7 @@ ModalDialog DLG_LOGIN
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 265 , 158 ) ;
-    Text = "Benutzername und Passwort erforderlich" ;
+    Text = "Benutzername und Kennwort erforderlich" ;
     Text [ English ] = "User Name and Password required" ;
     FixedText INFO_LOGIN_ERROR
     {
@@ -92,51 +92,53 @@ ModalDialog DLG_LOGIN
         Text [ english_us ] = "Message from server" ;
         Text [ portuguese_brazilian ] = "Meldung vom Server" ;
         Text [ swedish ] = "Meddelande fr�n servern" ;
-        Text [ danish ] = "Melding fra serveren" ;
+        Text [ danish ] = "Meddelelse fra server" ;
         Text [ italian ] = "Segnalazione dal server" ;
         Text [ spanish ] = "Mensaje del servidor" ;
         Text [ french ] = "Message en provenance du serveur" ;
-        Text [ dutch ] = "Melding van de server" ;
+        Text [ dutch ] = "Servermelding" ;
         Text [ portuguese ] = "Mensagem do servidor" ;
         Text[ chinese_simplified ] = "服务器报告";
         Text[ russian ] = "��������� � �������";
         Text[ polish ] = "Wiadomo�� z serwera";
-        Text[ japanese ] = "ｻｰﾊﾞｰからのﾒｯｾｰｼﾞ";
+        Text[ japanese ] = "サーバーからのメッセージ";
         Text[ chinese_traditional ] = "伺服器報告";
         Text[ greek ] = "������ ��� ����������";
-        Text[ korean ] = "서버로부터의 메시지";
+        Text[ korean ] = "서버로부터 메시지";
         Text[ arabic ] = "����� �� �������";
         Text[ turkish ] = "Sunucudan ileti";
-        Text[ catalan ] = "Mensaje del servidor";
-        Text[ finnish ] = "Viesti palvelimelta";
+        Text[ catalan ] = "Missatge del servidor";
+        Text[ finnish ] = "Sanoma palvelimelta";
+        Text[ thai ] = "ข้อความจากเซิร์ฟเวอร์";
     };
     FixedText INFO_LOGIN_REQUEST
     {
         Pos = MAP_APPFONT ( 12 , 55 ) ;
         Size = MAP_APPFONT ( 185 , 18 ) ;
         WordBreak = TRUE ;
-        Text = "Bitte geben Sie hier Benutzernamen und Passwort f�r %1 ein." ;
+        Text = "Bitte geben Sie hier Benutzernamen und Kennwort f�r %1 ein." ;
         Text [ English ] = "Please enter user name and password here for %1." ;
         Text [ portuguese ] = "Indique o nome do utilizador e a senha para %1." ;
         Text [ english_us ] = "Please enter user name and password for %1." ;
         Text [ portuguese_brazilian ] = "Bitte geben Sie hier Benutzernamen und Passwort f? %1 ein." ;
         Text [ swedish ] = "Mata in anv�ndarnamn och l�senord h�r f�r %1." ;
-        Text [ danish ] = "Indtast her venligst brugernavnet og adgangkoden for %1." ;
+        Text [ danish ] = "Indtast brugernavn og adgangskode for %1 her." ;
         Text [ italian ] = "Digitate qui il nome dell'utente e la password per %1." ;
-        Text [ spanish ] = "Especifique su nombre de usuario y su contrase�a para %1." ;
-        Text [ french ] = "Veuilez saisir vos nom d'utilisateur et mot de passe pour %1." ;
-        Text [ dutch ] = "Vermeld hier de gebruiker en het wachtwoord voor %1." ;
+        Text [ spanish ] = "Especifique el nombre de usuario y la  contrase�a para %1." ;
+        Text [ french ] = "Saisissez vos nom d'utilisateur et mot de passe pour %1." ;
+        Text [ dutch ] = "Voer hier de gebruikersnaam en het wachtwoord voor %1 in." ;
         Text[ chinese_simplified ] = "请您在此为 %1 输入使用名和密码。";
-        Text[ russian ] = "�������, ����������, ��� ������������ � ������ ��� %1.";
+        Text[ russian ] = "������� ��� ������������ � ������ ��� %1.";
         Text[ polish ] = "Nale�y wpisa� nazw� u�ytkownika i has�o dla %1.";
-        Text[ japanese ] = "ここに %1 のﾕｰｻﾞｰ名とﾊﾟｽﾜｰﾄﾞを入力してください。";
-        Text[ chinese_traditional ] = "請為 %1 輸入使用者名稱和密碼。";
+        Text[ japanese ] = "%1 のユーザー名とパスワードをここに入力してください。";
+        Text[ chinese_traditional ] = "請爲 %1 輸入使用者名稱和密碼。";
         Text[ greek ] = "�������� �������� ��� �� ����� ��� ������ ��� ��� ������ ��������� ��� �� %1.";
-        Text[ korean ] = "여기에 %1의 패스워드와 사용자 이름을 입력하십시오.";
+        Text[ korean ] = "%1의 사용자 이름과 암호를 입력하십시오.";
         Text[ arabic ] = "������ ����� ��� �������� ����� ���� �� %1.";
         Text[ turkish ] = "%1 i�in buraya kullan�c� ad� ve �ifre girin.";
-        Text[ catalan ] = "Especifique su nombre de usuario y su contrase�a para %1.";
+        Text[ catalan ] = "Especifiqueu el nom d'usuari i contrasenya per %1.";
         Text[ finnish ] = "Anna kohteen %1 k�ytt�j�tunnus ja salasana.";
+        Text[ thai ] = "กรุณาใส่ชื่อผู้ใช้และรหัสผ่านสำหรับ %1";
     };
     FixedText FT_LOGIN_PATH
     {
@@ -147,16 +149,16 @@ ModalDialog DLG_LOGIN
         Text [ english_us ] = "~Path" ;
         Text [ portuguese_brazilian ] = "~Pfad" ;
         Text [ swedish ] = "~S�kv�g" ;
-        Text [ danish ] = "Sti" ;
+        Text [ danish ] = "~Sti" ;
         Text [ italian ] = "~Percorso" ;
         Text [ spanish ] = "~Ruta" ;
-        Text [ french ] = "~Chemin" ;
+        Text [ french ] = "Chemin" ;
         Text [ dutch ] = "~Pad" ;
         Text [ portuguese ] = "~Atalho" ;
         Text[ chinese_simplified ] = "路径(~P)";
         Text[ russian ] = "����";
         Text[ polish ] = "�cie�ka";
-        Text[ japanese ] = "ﾊﾟｽ(~P)";
+        Text[ japanese ] = "パス(~P)";
         Text[ chinese_traditional ] = "路徑(~P)";
         Text[ greek ] = "��������";
         Text[ korean ] = "경로(~P)";
@@ -164,6 +166,7 @@ ModalDialog DLG_LOGIN
         Text[ turkish ] = "Veri yolu";
         Text[ catalan ] = "~Ruta";
         Text[ finnish ] = "~Polku";
+        Text[ thai ] = "เ~ส้นทาง";
     };
     Edit ED_LOGIN_PATH
     {
@@ -192,23 +195,24 @@ ModalDialog DLG_LOGIN
         Text [ english_us ] = "~User name" ;
         Text [ portuguese_brazilian ] = "~Benutzername" ;
         Text [ swedish ] = "~Anv�ndarnamn" ;
-        Text [ danish ] = "Brugernavn" ;
+        Text [ danish ] = "~Brugernavn" ;
         Text [ italian ] = "Nome utente" ;
         Text [ spanish ] = "~Nombre del usuario" ;
         Text [ french ] = "~Nom d'utilisateur" ;
-        Text [ dutch ] = "Naam ~gebruiker" ;
+        Text [ dutch ] = "~Gebruikersnaam" ;
         Text [ portuguese ] = "~Nome do utilizador" ;
         Text[ chinese_simplified ] = "使用名(~U)";
         Text[ russian ] = "��� ������������";
         Text[ polish ] = "Nazwa u�ytkownika";
-        Text[ japanese ] = "ﾕｰｻﾞｰ名(~U)";
+        Text[ japanese ] = "ユーザー名(~U)";
         Text[ chinese_traditional ] = "使用者名稱(~U)";
         Text[ greek ] = "����� ������";
         Text[ korean ] = "사용자 이름(~U)";
         Text[ arabic ] = "��� ��������";
         Text[ turkish ] = "Kullan�c� ad�";
-        Text[ catalan ] = "~Usuario";
-        Text[ finnish ] = "~K�ytt�j�tunnus";
+        Text[ catalan ] = "Nom d'~usuari";
+        Text[ finnish ] = "K~�ytt�j�tunnus";
+        Text[ thai ] = "ชื่อ~ผู้ใช้";
     };
     Edit ED_LOGIN_USERNAME
     {
@@ -231,7 +235,7 @@ ModalDialog DLG_LOGIN
         Text [ english_us ] = "Pass~word" ;
         Text [ portuguese_brazilian ] = "P~asswort" ;
         Text [ swedish ] = "~L�senord" ;
-        Text [ danish ] = "Adgangskode" ;
+        Text [ danish ] = "A~dgangskode" ;
         Text [ italian ] = "P~assword" ;
         Text [ spanish ] = "~Contrase�a" ;
         Text [ french ] = "~Mot de passe" ;
@@ -240,14 +244,15 @@ ModalDialog DLG_LOGIN
         Text[ chinese_simplified ] = "密码(~W)";
         Text[ russian ] = "������";
         Text[ polish ] = "Has�o";
-        Text[ japanese ] = "ﾊﾟｽﾜｰﾄﾞ(~W)";
+        Text[ japanese ] = "パスワード(~W)";
         Text[ chinese_traditional ] = "密碼(~W)";
         Text[ greek ] = "������� �����~����";
-        Text[ korean ] = "패스워드(~W)";
+        Text[ korean ] = "암호(~W)";
         Text[ arabic ] = "���� ����";
         Text[ turkish ] = "�ifre";
-        Text[ catalan ] = "~Contrase�a";
+        Text[ catalan ] = "~Contrasenya";
         Text[ finnish ] = "Sala~sana";
+        Text[ thai ] = "รหัส~ผ่าน";
     };
     Edit ED_LOGIN_PASSWORD
     {
@@ -269,19 +274,20 @@ ModalDialog DLG_LOGIN
         Text[ french ] = "C~ompte";
         Text[ spanish ] = "~Cuenta";
         Text[ italian ] = "A~ccount";
-        Text[ danish ] = "Konto";
+        Text[ danish ] = "K~onto";
         Text[ swedish ] = "~Konto";
         Text[ polish ] = "Konto";
         Text[ portuguese_brazilian ] = "A~ccount";
-        Text[ japanese ] = "ｱｶｳﾝﾄ(~C)";
+        Text[ japanese ] = "アカウント(~C)";
         Text[ chinese_simplified ] = "帐号(~C)";
         Text[ chinese_traditional ] = "帳號(~C)";
         Text[ greek ] = "�����������";
         Text[ korean ] = "계정(~C)";
         Text[ arabic ] = "������";
         Text[ turkish ] = "Hesap";
-        Text[ catalan ] = "~Cuenta";
+        Text[ catalan ] = "~Compte";
         Text[ finnish ] = "T~ili";
+        Text[ thai ] = "บั~ญชีผู้ใช้";
     };
     Edit ED_LOGIN_ACCOUNT
     {
@@ -294,28 +300,29 @@ ModalDialog DLG_LOGIN
     {
         Pos = MAP_APPFONT ( 12 , 136 ) ;
         Size = MAP_APPFONT ( 185 , 10 ) ;
-        Text = "Passwort ~speichern" ;
+        Text = "Kennwort ~speichern" ;
         Text [ English ] = "~Save password" ;
         Text [ english_us ] = "~Save password" ;
-        Text [ italian ] = "Salva pa~ssword" ;
+        Text [ italian ] = "Memorizza pa~ssword" ;
         Text [ spanish ] = "Guardar ~contrase�a" ;
-        Text [ french ] = "~Enregistrer le mot de passe" ;
+        Text [ french ] = "Enregistrement du mot de passe" ;
         Text [ dutch ] = "Wachtwoord ~opslaan" ;
-        Text [ swedish ] = "Spara l�sen~ord" ;
-        Text [ danish ] = "Gem adgangskode" ;
+        Text [ swedish ] = "S~para l�senord" ;
+        Text [ danish ] = "~Gem adgangskode" ;
         Text [ portuguese ] = "Guardar ~senha" ;
-        Text [ portuguese_brazilian ] = "Passwort ~speichern" ;
+        Text [ portuguese_brazilian ] = "Salvar a ~senha" ;
         Text[ chinese_simplified ] = "存盘密码(~S)";
         Text[ russian ] = "��������� ������";
         Text[ polish ] = "Zapisz has�o";
-        Text[ japanese ] = "ﾊﾟｽﾜｰﾄﾞの保存(~S)";
+        Text[ japanese ] = "パスワードの保存(~S)";
         Text[ chinese_traditional ] = "儲存密碼(~S)";
         Text[ greek ] = "��������~�� ������� ���������";
-        Text[ korean ] = "패스워드 저장(~S)";
+        Text[ korean ] = "암호 저장(~S)";
         Text[ arabic ] = "��� ���� ����";
         Text[ turkish ] = "�ifreyi kaydet";
-        Text[ catalan ] = "Guardar ~contrase�a";
+        Text[ catalan ] = "~Desa la contrasenya";
         Text[ finnish ] = "~Tallenna salasana";
+        Text[ thai ] = "~บันทึกรหัสผ่าน";
     };
     FixedLine GB_LOGIN_LOGIN
     {
@@ -335,14 +342,15 @@ ModalDialog DLG_LOGIN
         Text[ chinese_simplified ] = "登录";
         Text[ russian ] = "���� � �������";
         Text[ polish ] = "Wej�cie do systemu";
-        Text[ japanese ] = "ﾛｸﾞｲﾝ";
+        Text[ japanese ] = "ログイン";
         Text[ chinese_traditional ] = "登入";
         Text[ greek ] = "������";
         Text[ korean ] = "로그인";
         Text[ arabic ] = "����� ������";
         Text[ turkish ] = "Oturum a�";
-        Text[ catalan ] = "Registrarse";
+        Text[ catalan ] = "Registrar-se";
         Text[ finnish ] = "Kirjaudu sis��n";
+        Text[ thai ] = "ลงบันทึกเข้า";
     };
     OKButton BTN_LOGIN_OK
     {
@@ -372,39 +380,41 @@ ModalDialog DLG_LOGIN
         Text [ italian ] = "su " ;
         Text [ spanish ] = "en   " ;
         Text [ french ] = "sur " ;
-        Text [ dutch ] = "op   " ;
+        Text [ dutch ] = "op" ;
         Text[ chinese_simplified ] = "在 ";
         Text[ russian ] = "�� ";
         Text[ polish ] = "na ";
-        Text[ japanese ] = "ﾛｸﾞｲﾝ先 ";
+        Text[ japanese ] = "ログイン先 ";
         Text[ chinese_traditional ] = "在 ";
         Text[ greek ] = "��� ";
-        Text[ korean ] = "에 ";
+        Text[ korean ] = "로그인 위치";
         Text[ arabic ] = "��� ";
         Text[ turkish ] = "yeri ";
-        Text[ catalan ] = "en   ";
-        Text[ finnish ] = "kohde";
+        Text[ catalan ] = "a";
+        Text[ finnish ] = "kohde ";
+        Text[ thai ] = "ถึง ";
     };
     Text [ english_us ] = "User Name and Password Required" ;
-    Text [ portuguese_brazilian ] = "Benutzername und Passwort erforderlich" ;
-    Text [ swedish ] = "Anv�ndarnamn och l�senord n�dv�ndigt" ;
-    Text [ danish ] = "Brugernavn og adgangskode kr�ves" ;
+    Text [ portuguese_brazilian ] = "� necess�rio o nome do usu�rio e senha" ;
+    Text [ swedish ] = "Anv�ndarnamn och l�senord kr�vs" ;
+    Text [ danish ] = "Brugernavn og adgangskode n�dvendig" ;
     Text [ italian ] = "Nome utente e password sono necessari" ;
     Text [ spanish ] = "Se requieren el nombre de usuario y la contrase�a" ;
     Text [ french ] = "Nom d'utilisateur et mot de passe requis" ;
-    Text [ dutch ] = "Naam gebruiker en wachtwoord vereist" ;
+    Text [ dutch ] = "Gebruikersnaam en wachtwoord vereist" ;
     Text [ portuguese ] = "Necess�rios nome de utilizador e senha" ;
     Text[ chinese_simplified ] = "要求输入使用者和密码";
     Text[ russian ] = "���������� ��� ������������ � ������";
     Text[ polish ] = "Nale�y wpisa� nazw� u�ytkownika i has�o";
-    Text[ japanese ] = "ﾕｰｻﾞｰ名とﾊﾟｽﾜｰﾄﾞが必要";
+    Text[ japanese ] = "ユーザー名とパスワードが必要";
     Text[ chinese_traditional ] = "必須輸入使用者名稱和密碼";
     Text[ greek ] = "���������� �� ����� ��� ������ ��� � ������� ���������";
-    Text[ korean ] = "사용자 이름과 패스워드가 필요합니다.";
+    Text[ korean ] = "사용자 이름 및 암호 필요";
     Text[ arabic ] = "����� ����� ��� �������� ����� ����";
     Text[ turkish ] = "Kullan�c� ad� ve �ifre gerekli";
-    Text[ catalan ] = "Se requieren el nombre de usuario y la contrase�a";
+    Text[ catalan ] = "Es necessita un nom d'usuari i una contrasenya";
     Text[ finnish ] = "K�ytt�j�tunnus ja salasana pakolliset";
+    Text[ thai ] = "ต้องการชื่อผู้ใช้และรหัสผ่าน";
 };
 
 
@@ -419,3 +429,11 @@ ModalDialog DLG_LOGIN
 
 
 
+
+
+
+
+
+
+
+
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index cad5df808375..0b84f3da90d5 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: printdlg.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: gt $ $Date: 2002-11-18 15:50:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -145,7 +145,7 @@ PrintDialog::PrintDialog( Window* pWindow ) :
     maFiComment     ( this, SvtResId( FI_COMMENT ) ),
     maCbxFilePrint  ( this, SvtResId( CBX_FILEPRINT ) ),
     maFiPrintFile   ( this, SvtResId( FI_PRINTFILE ) ),
-    maBtnBrowse     ( this, SvtResId( BTN_BROWSE ) ),
+    maBtnBrowse_nomore  ( this, SvtResId( BTN_BROWSE ) ),
     maFlPrintRange  ( this, SvtResId( FL_PRINTRANGE ) ),
     maRbtAll        ( this, SvtResId( RBT_ALL ) ),
     maRbtPages      ( this, SvtResId( RBT_PAGES ) ),
@@ -189,7 +189,6 @@ PrintDialog::PrintDialog( Window* pWindow ) :
     maStatusTimer.SetTimeoutHdl( LINK( this, PrintDialog, ImplStatusHdl ) );
     maBtnProperties.SetClickHdl( LINK( this, PrintDialog, ImplPropertiesHdl ) );
     maLbName.SetSelectHdl( LINK( this, PrintDialog, ImplChangePrinterHdl ) );
-    maBtnBrowse.SetClickHdl( LINK( this, PrintDialog, ImplBrowseHdl ) );
 
     maFiPrintFile.SetStyle( maFiPrintFile.GetStyle() | WB_PATHELLIPSIS );
 
@@ -203,6 +202,7 @@ PrintDialog::PrintDialog( Window* pWindow ) :
     maCbxCollate.SetClickHdl( aLink );
     maBtnOptions.SetClickHdl( aLink );
     maEdtFaxNo.SetModifyHdl( aLink );
+    maBtnOK.SetClickHdl( aLink );
 
     maRbtAll.Check();
     ImplSetImages();
@@ -258,7 +258,7 @@ void PrintDialog::ImplSetInfo()
     {
         maFiPrintFile.Show( FALSE );
         maCbxFilePrint.Show( FALSE );
-        maBtnBrowse.Show( FALSE );
+        maBtnBrowse_nomore.Show( FALSE );
         maFiFaxNo.Show( TRUE );
         maEdtFaxNo.Show( TRUE );
         Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter;
@@ -269,7 +269,7 @@ void PrintDialog::ImplSetInfo()
     {
         maFiPrintFile.Show( TRUE );
         maCbxFilePrint.Show( TRUE );
-        maBtnBrowse.Show( TRUE );
+        maBtnBrowse_nomore.Show( FALSE );
         maFiFaxNo.Show( FALSE );
         maEdtFaxNo.Show( FALSE );
     }
@@ -283,9 +283,6 @@ void PrintDialog::ImplCheckOK()
     // Ueberprueft, ob der OK-Button enabled ist
     BOOL bEnable = TRUE;
 
-    if ( maCbxFilePrint.IsChecked() )
-        bEnable = maFiPrintFile.GetText().Len() > 0;
-
     if ( bEnable && maRbtPages.IsChecked() )
         bEnable = maEdtPages.GetText().Len() > 0;
 
@@ -416,7 +413,7 @@ IMPL_LINK( PrintDialog, ImplChangePrinterHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( PrintDialog, ImplBrowseHdl, void*, EMPTYARG )
+bool PrintDialog::ImplGetFilename()
 {
     Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     if( xFactory.is() )
@@ -477,29 +474,18 @@ IMPL_LINK( PrintDialog, ImplBrowseHdl, void*, EMPTYARG )
                 Sequence< OUString > aPathSeq( xFilePicker->getFiles() );
                 INetURLObject aObj( aPathSeq[0] );
                 maFiPrintFile.SetText( aObj.PathToFileName() );
+                return true;
             }
-            ImplCheckOK();
-            return 0;
         }
     }
 
-    return 0;
+    return false;
 }
 
 // -----------------------------------------------------------------------
 
 IMPL_LINK( PrintDialog, ImplModifyControlHdl, void*, p )
 {
-    // Drucken in Datei
-    if ( !p || (p == &maCbxFilePrint) )
-    {
-        BOOL bCheck = maCbxFilePrint.IsChecked();
-        if ( bCheck && !maFiPrintFile.GetText().Len() )
-            ImplBrowseHdl( &maBtnBrowse );
-        maFiPrintFile.Enable( bCheck );
-        maBtnBrowse.Enable( bCheck );
-    }
-
     // Radiobuttons (Umfang)
     if ( !p || (p == &maRbtAll) || (p == &maRbtPages) || (p == &maRbtSelection) )
     {
@@ -510,7 +496,7 @@ IMPL_LINK( PrintDialog, ImplModifyControlHdl, void*, p )
         ImplCheckOK();
     }
 
-    // Edit-Felder (Dateiname, Seiten)
+    // Edit-Felder (Seiten)
     if ( p == &maEdtPages )
         ImplCheckOK();
 
@@ -560,6 +546,11 @@ IMPL_LINK( PrintDialog, ImplModifyControlHdl, void*, p )
     if ( p == &maBtnOptions )
         ClickOptionsHdl();
 
+    if( p == &maBtnOK )
+    {
+        EndDialog( maCbxFilePrint.IsChecked() ? ImplGetFilename() : TRUE );
+    }
+
     return 0;
 }
 
diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
index d9aba9c91dc5..50a850bc6847 100644
--- a/svtools/source/dialogs/printdlg.src
+++ b/svtools/source/dialogs/printdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: printdlg.src,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:24:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:37:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -168,7 +168,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "屬性(~I)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "���������...";
-        Text[ korean ] = "등록정보(~I)...";
+        Text[ korean ] = "등록 정보(~I)...";
         Text[ turkish ] = "~�zellikler...";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Propietats...";
@@ -231,7 +231,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "類型";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "유형";
+        Text[ korean ] = "종류";
         Text[ turkish ] = "Tip";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Tipus";
@@ -265,7 +265,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "位置";
         Text[ arabic ] = "������";
         Text[ greek ] = "����";
-        Text[ korean ] = "위치";
+        Text[ korean ] = "구/군/시";
         Text[ turkish ] = "Yer";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Ubicaci�";
@@ -299,7 +299,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "註解";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
-        Text[ korean ] = "주석";
+        Text[ korean ] = "설명";
         Text[ turkish ] = "A��klama";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Comentari";
@@ -407,7 +407,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "列印範圍";
         Text[ arabic ] = "���� �������";
         Text[ greek ] = "������� ���������";
-        Text[ korean ] = "인쇄 영역";
+        Text[ korean ] = "인쇄 범위";
         Text[ turkish ] = "Yazd�rma aral���";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "�rea d'impressi�";
@@ -465,7 +465,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "頁";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "페이지";
+        Text[ korean ] = "인쇄할 페이지";
         Text[ turkish ] = "~Sayfa";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~P�gines";
@@ -494,7 +494,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "選擇";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�������";
-        Text[ korean ] = "선택";
+        Text[ korean ] = "선택 영역";
         Text[ turkish ] = "Se�im";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Selecci�";
@@ -540,7 +540,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "件數";
         Text[ arabic ] = "���";
         Text[ greek ] = "���������";
-        Text[ korean ] = "복사";
+        Text[ korean ] = "인쇄 매수";
         Text[ turkish ] = "Kopya";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "C�pies";
@@ -569,7 +569,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "列印件數";
         Text[ arabic ] = "��� �����";
         Text[ greek ] = "����~�����";
-        Text[ korean ] = "사본 수";
+        Text[ korean ] = "매수";
         Text[ turkish ] = "~Kopya say�s�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Nombre de c�pies";
@@ -611,7 +611,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
         Text[ chinese_traditional ] = "排序(~L)";
         Text[ arabic ] = "����� �����";
         Text[ greek ] = "����������";
-        Text[ korean ] = "분류(~L)";
+        Text[ korean ] = "한 부씩 인쇄(~L)";
         Text[ turkish ] = "S~�rala";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Compara";
@@ -754,3 +754,8 @@ Image RID_IMG_PRNDLG_NOCOLLATE_HC
 
 
 
+
+
+
+
+
diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src
index 5fff8f5938c1..d7f76327a24e 100644
--- a/svtools/source/dialogs/prnsetup.src
+++ b/svtools/source/dialogs/prnsetup.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prnsetup.src,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-27 06:18:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,18 +74,19 @@ String STR_SVT_PRNDLG_READY
     Text [ spanish ] = "Preparado" ;
     Text [ french ] = "Disponible" ;
     Text [ dutch ] = "Klaar" ;
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "就绪";
     Text[ russian ] = "�����";
     Text[ polish ] = "Gotowe";
-    Text[ japanese ] = "�����ݸޒ�";
-    Text[ chinese_traditional ] = "�N��";
+    Text[ japanese ] = "アイドリング中";
+    Text[ chinese_traditional ] = "就緒";
     Text[ arabic ] = "�����";
     Text[ greek ] = "�� ����������";
-    Text[ korean ] = "�غ�";
+    Text[ korean ] = "준비";
     Text[ turkish ] = "Haz�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Preparado";
+    Text[ catalan ] = "Preparat";
     Text[ finnish ] = "Valmis";
+    Text[ thai ] = "พร้อม";
 };
 String STR_SVT_PRNDLG_PAUSED
 {
@@ -100,18 +101,19 @@ String STR_SVT_PRNDLG_PAUSED
     Text [ spanish ] = "Detenido" ;
     Text [ french ] = "Arr�t�" ;
     Text [ dutch ] = "Gestopt" ;
-    Text[ chinese_simplified ] = "��ͣ";
-    Text[ russian ] = "����������";
+    Text[ chinese_simplified ] = "暂停";
+    Text[ russian ] = "�������������";
     Text[ polish ] = "Zatrzymane";
-    Text[ japanese ] = "���f";
-    Text[ chinese_traditional ] = "�Ȱ�";
+    Text[ japanese ] = "中断";
+    Text[ chinese_traditional ] = "暫停";
     Text[ arabic ] = "������";
     Text[ greek ] = "�������";
-    Text[ korean ] = "�Ͻ�����";
+    Text[ korean ] = "일시 정지";
     Text[ turkish ] = "Durduruldu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Detenido";
+    Text[ catalan ] = "En pausa";
     Text[ finnish ] = "Keskeytetty";
+    Text[ thai ] = "หยุด";
 };
 String STR_SVT_PRNDLG_PENDING
 {
@@ -123,21 +125,22 @@ String STR_SVT_PRNDLG_PENDING
     Text [ swedish ] = "Radering i v�ntel�ge" ;
     Text [ danish ] = "Slet igangv�rende" ;
     Text [ italian ] = "In attesa di eliminare" ;
-    Text [ spanish ] = "Eliminaci�n pendiente" ;
+    Text [ spanish ] = "A la espera de ser borrado" ;
     Text [ french ] = "Suppression imminente" ;
     Text [ dutch ] = "Wissen verwacht" ;
-    Text[ chinese_simplified ] = "ɾ���Ⱥ��";
+    Text[ chinese_simplified ] = "删除等候的";
     Text[ russian ] = "�������� ��������";
     Text[ polish ] = "Oczekiwanie na usuni�cie";
-    Text[ japanese ] = "�폜��҂��Ă��܂�";
-    Text[ chinese_traditional ] = "�R�����Ԫ�";
+    Text[ japanese ] = "削除を待っています";
+    Text[ chinese_traditional ] = "刪除等候的";
     Text[ arabic ] = "����� ����";
     Text[ greek ] = "�������� ��� ��������";
-    Text[ korean ] = "����� �۾� ����";
+    Text[ korean ] = "밀린 작업 삭제";
     Text[ turkish ] = "Silinmek �zere";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminaci�n pendiente";
+    Text[ catalan ] = "Eliminaci� pendent";
     Text[ finnish ] = "Odotetaan poistamista";
+    Text[ thai ] = "กำลังรอการลบ";
 };
 String STR_SVT_PRNDLG_BUSY
 {
@@ -152,18 +155,19 @@ String STR_SVT_PRNDLG_BUSY
     Text [ spanish ] = "Ocupado" ;
     Text [ french ] = "Syst�me occup�" ;
     Text [ dutch ] = "Bezig" ;
-    Text[ chinese_simplified ] = "æµ";
-    Text[ russian ] = "� ��������";
+    Text[ chinese_simplified ] = "忙碌";
+    Text[ russian ] = "�����";
     Text[ polish ] = "Zaj�ty";
-    Text[ japanese ] = "�޼ް���";
-    Text[ chinese_traditional ] = "���L";
+    Text[ japanese ] = "ビジー状態";
+    Text[ chinese_traditional ] = "忙碌";
     Text[ arabic ] = "������";
     Text[ greek ] = "�������������";
-    Text[ korean ] = "�����";
+    Text[ korean ] = "사용 중";
     Text[ turkish ] = "Me�gul";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ocupado";
+    Text[ catalan ] = "Ocupat";
     Text[ finnish ] = "Varattu";
+    Text[ thai ] = "ไม่ว่าง";
 };
 String STR_SVT_PRNDLG_INITIALIZING
 {
@@ -178,18 +182,19 @@ String STR_SVT_PRNDLG_INITIALIZING
     Text [ spanish ] = "Inicializar" ;
     Text [ french ] = "Initialisation" ;
     Text [ dutch ] = "Initialiseren" ;
-    Text[ chinese_simplified ] = "��ʼ��";
-    Text[ russian ] = "����������������";
+    Text[ chinese_simplified ] = "初始化";
+    Text[ russian ] = "�������������";
     Text[ polish ] = "Inicjacja";
-    Text[ japanese ] = "������";
-    Text[ chinese_traditional ] = "��l��";
+    Text[ japanese ] = "初期化";
+    Text[ chinese_traditional ] = "初始化";
     Text[ arabic ] = "�����";
     Text[ greek ] = "������������";
-    Text[ korean ] = "�ʱ�ȭ";
+    Text[ korean ] = "초기화";
     Text[ turkish ] = "Ba�lat";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inicializar";
+    Text[ catalan ] = "S'est� inicialitzant";
     Text[ finnish ] = "Alustetaan";
+    Text[ thai ] = "เริ่ม";
 };
 String STR_SVT_PRNDLG_WAITING
 {
@@ -204,18 +209,19 @@ String STR_SVT_PRNDLG_WAITING
     Text [ spanish ] = "En espera" ;
     Text [ french ] = "En attente" ;
     Text [ dutch ] = "Wachtend" ;
-    Text[ chinese_simplified ] = "�Ⱥ�";
-    Text[ russian ] = "� ��������";
+    Text[ chinese_simplified ] = "等候";
+    Text[ russian ] = "��������";
     Text[ polish ] = "Oczekiwanie";
-    Text[ japanese ] = "�ҋ@��";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "待機中";
+    Text[ chinese_traditional ] = "等候";
     Text[ arabic ] = "������";
     Text[ greek ] = "�������";
-    Text[ korean ] = "�����";
+    Text[ korean ] = "대기 중";
     Text[ turkish ] = "Beklemede";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "En espera";
+    Text[ catalan ] = "S'est� esperant";
     Text[ finnish ] = "Odotetaan";
+    Text[ thai ] = "กำลังรอ";
 };
 String STR_SVT_PRNDLG_WARMING_UP
 {
@@ -230,18 +236,19 @@ String STR_SVT_PRNDLG_WARMING_UP
     Text [ spanish ] = "Arranque" ;
     Text [ french ] = "Pr�chauffage" ;
     Text [ dutch ] = "Beginnen" ;
-    Text[ chinese_simplified ] = "Ԥ��";
-    Text[ russian ] = "������";
+    Text[ chinese_simplified ] = "预热";
+    Text[ russian ] = "���������� � ������";
     Text[ polish ] = "Rozgrzewanie";
-    Text[ japanese ] = "������";
-    Text[ chinese_traditional ] = "�w��";
+    Text[ japanese ] = "準備中";
+    Text[ chinese_traditional ] = "預熱";
     Text[ arabic ] = "�������";
     Text[ language_user1 ] = " ";
     Text[ greek ] = "������������";
-    Text[ korean ] = "�غ���";
+    Text[ korean ] = "준비 중";
     Text[ turkish ] = "Is�n�yor";
-    Text[ catalan ] = "Arranque";
+    Text[ catalan ] = "S'est� arrencant";
     Text[ finnish ] = "L�mpenee";
+    Text[ thai ] = "กำลังอุ่นเครื่อง";
 };
 String STR_SVT_PRNDLG_PROCESSING
 {
@@ -256,18 +263,19 @@ String STR_SVT_PRNDLG_PROCESSING
     Text [ spanish ] = "Procesar" ;
     Text [ french ] = "Traiter" ;
     Text [ dutch ] = "Verwerken" ;
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "处理";
     Text[ russian ] = "���������";
     Text[ polish ] = "Opracuj";
-    Text[ japanese ] = "����";
-    Text[ chinese_traditional ] = "�B�z";
+    Text[ japanese ] = "処理";
+    Text[ chinese_traditional ] = "處理";
     Text[ arabic ] = "������";
     Text[ greek ] = "�����������";
-    Text[ korean ] = "������";
+    Text[ korean ] = "진행 중";
     Text[ turkish ] = "��leniyor";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Procesar";
+    Text[ catalan ] = "S'est� processant";
     Text[ finnish ] = "K�sitell��n";
+    Text[ thai ] = "กำลังดำเนินการ";
 };
 String STR_SVT_PRNDLG_PRINTING
 {
@@ -282,18 +290,19 @@ String STR_SVT_PRNDLG_PRINTING
     Text [ spanish ] = "Imprimir" ;
     Text [ french ] = "Imprimer" ;
     Text [ dutch ] = "Afdrukken" ;
-    Text[ chinese_simplified ] = "��ӡ";
+    Text[ chinese_simplified ] = "打印";
     Text[ russian ] = "������";
     Text[ polish ] = "Drukuj";
-    Text[ japanese ] = "���";
-    Text[ chinese_traditional ] = "�C�L";
+    Text[ japanese ] = "印刷";
+    Text[ chinese_traditional ] = "列印";
     Text[ arabic ] = "�����";
     Text[ greek ] = "��������";
-    Text[ korean ] = "�μ�";
+    Text[ korean ] = "인쇄";
     Text[ turkish ] = "Yazd�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Imprimir";
+    Text[ catalan ] = "S'est� imprimint";
     Text[ finnish ] = "Tulostetaan";
+    Text[ thai ] = "กำลังพิมพ์";
 };
 String STR_SVT_PRNDLG_OFFLINE
 {
@@ -308,18 +317,19 @@ String STR_SVT_PRNDLG_OFFLINE
     Text [ spanish ] = "Desconectado" ;
     Text [ french ] = "Hors ligne" ;
     Text [ dutch ] = "Offline" ;
-    Text[ chinese_simplified ] = "�ѻ�";
-    Text[ russian ] = "Offline";
+    Text[ chinese_simplified ] = "脱机";
+    Text[ russian ] = "������";
     Text[ polish ] = "Offline";
-    Text[ japanese ] = "��ײ�";
-    Text[ chinese_traditional ] = "���u";
+    Text[ japanese ] = "オフライン";
+    Text[ chinese_traditional ] = "離線";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "����� �������";
-    Text[ korean ] = "��������";
+    Text[ korean ] = "오프라인";
     Text[ turkish ] = "�evrimd���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desconectado";
-    Text[ finnish ] = "Offline";
+    Text[ catalan ] = "Desconnectat";
+    Text[ finnish ] = "Offline-tila";
+    Text[ thai ] = "ออฟไลน์";
 };
 String STR_SVT_PRNDLG_ERROR
 {
@@ -334,18 +344,19 @@ String STR_SVT_PRNDLG_ERROR
     Text [ spanish ] = "Error" ;
     Text [ french ] = "Erreur" ;
     Text [ dutch ] = "Fout" ;
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "错误";
     Text[ russian ] = "������";
     Text[ polish ] = "B��d";
-    Text[ japanese ] = "�װ";
-    Text[ chinese_traditional ] = "���~";
+    Text[ japanese ] = "エラー";
+    Text[ chinese_traditional ] = "錯誤";
     Text[ arabic ] = "���";
     Text[ greek ] = "������";
-    Text[ korean ] = "����";
+    Text[ korean ] = "오류";
     Text[ turkish ] = "Hata";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Error";
     Text[ finnish ] = "Virhe";
+    Text[ thai ] = "ผิดพลาด";
 };
 String STR_SVT_PRNDLG_SERVER_UNKNOWN
 {
@@ -360,18 +371,19 @@ String STR_SVT_PRNDLG_SERVER_UNKNOWN
     Text [ spanish ] = "Servidor desconocido" ;
     Text [ french ] = "Serveur inconnu" ;
     Text [ dutch ] = "Onbekende server" ;
-    Text[ chinese_simplified ] = "�����ķ�����";
+    Text[ chinese_simplified ] = "不明的服务器";
     Text[ russian ] = "����������� ������";
     Text[ polish ] = "Nieznany serwer";
-    Text[ japanese ] = "�s���̻��ް";
-    Text[ chinese_traditional ] = "���������A��";
+    Text[ japanese ] = "不明のサーバー";
+    Text[ chinese_traditional ] = "不明的伺服器";
     Text[ arabic ] = "����� ��� �����";
     Text[ greek ] = "�������� �����������";
-    Text[ korean ] = "�˷��� ���� ���� ����";
+    Text[ korean ] = "알 수 없는 서버";
     Text[ turkish ] = "Bilinmeyen sunucu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Servidor desconocido";
+    Text[ catalan ] = "Servidor desconegut";
     Text[ finnish ] = "Tuntematon palvelin";
+    Text[ thai ] = "ไม่รู้จักเซิร์ฟเวอร์";
 };
 String STR_SVT_PRNDLG_PAPER_JAM
 {
@@ -386,18 +398,19 @@ String STR_SVT_PRNDLG_PAPER_JAM
     Text [ spanish ] = "Bloqueo de papel" ;
     Text [ french ] = "Bourrage papier" ;
     Text [ dutch ] = "Papieropstopping" ;
-    Text[ chinese_simplified ] = "��ֽ";
+    Text[ chinese_simplified ] = "卡纸";
     Text[ russian ] = "�������� ������";
     Text[ polish ] = "Papier zablokowany";
-    Text[ japanese ] = "�p���l�܂�";
-    Text[ chinese_traditional ] = "�d��";
+    Text[ japanese ] = "用紙詰まり";
+    Text[ chinese_traditional ] = "卡紙";
     Text[ arabic ] = "���� �����";
     Text[ greek ] = "����������� �������";
-    Text[ korean ] = "���� �ɸ�";
+    Text[ korean ] = "용지 걸림";
     Text[ turkish ] = "Ka��t s�k��mas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Bloqueo de papel";
+    Text[ catalan ] = "Bloqueig de paper";
     Text[ finnish ] = "Paperitukos";
+    Text[ thai ] = "กระดาษติด";
 };
 String STR_SVT_PRNDLG_PAPER_OUT
 {
@@ -412,18 +425,19 @@ String STR_SVT_PRNDLG_PAPER_OUT
     Text [ spanish ] = "Falta de papel" ;
     Text [ french ] = "Manque de papier" ;
     Text [ dutch ] = "Geen papier" ;
-    Text[ chinese_simplified ] = "ֽ����";
+    Text[ chinese_simplified ] = "纸用完";
     Text[ russian ] = "�������� ������";
     Text[ polish ] = "Brak papieru";
-    Text[ japanese ] = "�p���s��";
-    Text[ chinese_traditional ] = "�ȥΧ�";
+    Text[ japanese ] = "用紙不足";
+    Text[ chinese_traditional ] = "紙用完";
     Text[ arabic ] = "��� �� �����";
     Text[ greek ] = "������� �������";
-    Text[ korean ] = "������ �����մϴ�.";
+    Text[ korean ] = "용지가 부족합니다.";
     Text[ turkish ] = "Yeterli miktarda ka��t yok";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Falta de papel";
+    Text[ catalan ] = "No hi ha prou paper";
     Text[ finnish ] = "Ei tarpeeksi paperia";
+    Text[ thai ] = "กระดาษไม่พอ";
 };
 String STR_SVT_PRNDLG_MANUAL_FEED
 {
@@ -438,18 +452,19 @@ String STR_SVT_PRNDLG_MANUAL_FEED
     Text [ spanish ] = "Alimentaci�n manual" ;
     Text [ french ] = "Alimentation manuelle" ;
     Text [ dutch ] = "Handmatige papiertoevoer" ;
-    Text[ chinese_simplified ] = "�ֹ���ֽ";
+    Text[ chinese_simplified ] = "手工送纸";
     Text[ russian ] = "������ ������ ������";
     Text[ polish ] = "R�czne podawanie papieru";
-    Text[ japanese ] = "�蓮�ŗp������";
-    Text[ chinese_traditional ] = "��ʰe��";
+    Text[ japanese ] = "手動で用紙供給";
+    Text[ chinese_traditional ] = "手動送紙";
     Text[ arabic ] = "������� ������ ������";
     Text[ greek ] = "������������ ���������� �������";
-    Text[ korean ] = "���� ����";
+    Text[ korean ] = "수동 급지";
     Text[ turkish ] = "El ile besleme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alimentaci�n manual";
+    Text[ catalan ] = "Alimentaci� manual";
     Text[ finnish ] = "Manuaalinen sy�tt�";
+    Text[ thai ] = "ป้อนด้วยตนเอง";
 };
 String STR_SVT_PRNDLG_PAPER_PROBLEM
 {
@@ -462,20 +477,21 @@ String STR_SVT_PRNDLG_PAPER_PROBLEM
     Text [ danish ] = "Papirproblem" ;
     Text [ italian ] = "Errore carta" ;
     Text [ spanish ] = "Problema de papel" ;
-    Text [ french ] = "Probl�me d'allimentation de papier" ;
+    Text [ french ] = "Probl�me d'alimentation de papier" ;
     Text [ dutch ] = "Papierprobleem" ;
-    Text[ chinese_simplified ] = "ֽ������";
+    Text[ chinese_simplified ] = "纸张问题";
     Text[ russian ] = "�������� � �������";
     Text[ polish ] = "Problem z papierem";
-    Text[ japanese ] = "�p���̖��";
-    Text[ chinese_traditional ] = "�ȱi���D";
+    Text[ japanese ] = "用紙の問題";
+    Text[ chinese_traditional ] = "紙張問題";
     Text[ arabic ] = "����� �� �����";
     Text[ greek ] = "�������� �� �� �����";
-    Text[ korean ] = "���� ����";
+    Text[ korean ] = "용지 문제";
     Text[ turkish ] = "Ka��t sorunu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Problema de papel";
+    Text[ catalan ] = "Problema amb el paper";
     Text[ finnish ] = "Paperiongelma";
+    Text[ thai ] = "ปัญหาเกี่ยวกับกระดาษ";
 };
 String STR_SVT_PRNDLG_IO_ACTIVE
 {
@@ -490,18 +506,19 @@ String STR_SVT_PRNDLG_IO_ACTIVE
     Text [ spanish ] = "I/O activos" ;
     Text [ french ] = "E/S active" ;
     Text [ dutch ] = "I/O actief" ;
-    Text[ chinese_simplified ] = "��������/���";
+    Text[ chinese_simplified ] = "启动输入/输出";
     Text[ russian ] = "�������� ����/�����";
     Text[ polish ] = "We/Wy aktywne";
-    Text[ japanese ] = "I/O ���";
-    Text[ chinese_traditional ] = "�Ұʿ�J/��X";
+    Text[ japanese ] = "I/O アクティブ";
+    Text[ chinese_traditional ] = "啟動輸入/輸出";
     Text[ arabic ] = "�������/������� ���";
     Text[ greek ] = "���/�� ������";
-    Text[ korean ] = "I/O Ȱ��";
+    Text[ korean ] = "I/O 활성";
     Text[ turkish ] = "G/� aktif";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "I/O activos";
-    Text[ finnish ] = "Keskeytys k�yt�ss�";
+    Text[ catalan ] = "E/S actives";
+    Text[ finnish ] = "I/O aktiivinen";
+    Text[ thai ] = "ใช้งาน I/O อยู่";
 };
 String STR_SVT_PRNDLG_OUTPUT_BIN_FULL
 {
@@ -516,18 +533,19 @@ String STR_SVT_PRNDLG_OUTPUT_BIN_FULL
     Text [ spanish ] = "La papelera de salida est� llena" ;
     Text [ french ] = "Le bac de sortie est plein" ;
     Text [ dutch ] = "Postvak UIT is vol" ;
-    Text[ chinese_simplified ] = "�������������";
-    Text[ russian ] = "���������� ������ ���������";
+    Text[ chinese_simplified ] = "输出缓冲区溢满";
+    Text[ russian ] = "�������� ����� ��������";
     Text[ polish ] = "Zasobnik wyj�ciowy zape�niony";
-    Text[ japanese ] = "�������߯ėp�̗e�킪�����ς��ł��B";
-    Text[ chinese_traditional ] = "�ץX�w�İϷ���";
+    Text[ japanese ] = "印刷アウトプット用の容器がいっぱいです。";
+    Text[ chinese_traditional ] = "匯出緩衝區溢滿";
     Text[ arabic ] = "��� ������� �����";
     Text[ greek ] = "�� ����� �������� ����� ������";
-    Text[ korean ] = "������� ���� ��";
+    Text[ korean ] = "출력함이 꽉 참";
     Text[ turkish ] = "��kt� �ekmecesi doldu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "La papelera de salida est� llena";
+    Text[ catalan ] = "La paperera de sortida est� plena";
     Text[ finnish ] = "Tulostuslokero t�ynn�";
+    Text[ thai ] = "ถังขยะรีไซเคิลมีผลลัพธ์เต็ม";
 };
 String STR_SVT_PRNDLG_TONER_LOW
 {
@@ -542,18 +560,19 @@ String STR_SVT_PRNDLG_TONER_LOW
     Text [ spanish ] = "T�ner bajo" ;
     Text [ french ] = "Faible r�serve de toner" ;
     Text [ dutch ] = "Lage tonerstand" ;
-    Text[ chinese_simplified ] = "ī�۲���";
-    Text[ russian ] = "������ ��������� ������";
+    Text[ chinese_simplified ] = "墨粉不足";
+    Text[ russian ] = "����� �� ������";
     Text[ polish ] = "Ma�o tonera";
-    Text[ japanese ] = "�Ű�̎c�ʂ����Ȃ��Ȃ��Ă��܂�";
-    Text[ chinese_traditional ] = "��������";
+    Text[ japanese ] = "トナーの残量が少なくなっています";
+    Text[ chinese_traditional ] = "墨粉不足";
     Text[ arabic ] = "������ ����� �����";
     Text[ greek ] = "������ ������ ��� Toner";
-    Text[ korean ] = "��ʰ� �����ϴ�.";
+    Text[ korean ] = "토너가 적습니다.";
     Text[ turkish ] = "Toner azald�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "T�ner bajo";
+    Text[ catalan ] = "T�ner baix";
     Text[ finnish ] = "V�riaine v�hiss�";
+    Text[ thai ] = "หมึกพิมพ์น้อย";
 };
 String STR_SVT_PRNDLG_NO_TONER
 {
@@ -568,18 +587,19 @@ String STR_SVT_PRNDLG_NO_TONER
     Text [ spanish ] = "No hay t�ner" ;
     Text [ french ] = "Pas de toner" ;
     Text [ dutch ] = "Geen toner" ;
-    Text[ chinese_simplified ] = "ī������";
+    Text[ chinese_simplified ] = "墨粉用完";
     Text[ russian ] = "��� ������";
     Text[ polish ] = "Brak tonera";
-    Text[ japanese ] = "�Ű������܂���B";
+    Text[ japanese ] = "トナーがありません。";
     Text[ language_user1 ] = " ";
-    Text[ chinese_traditional ] = "������";
+    Text[ chinese_traditional ] = "墨粉用完";
     Text[ arabic ] = "�� ���� ����� �����";
     Text[ greek ] = "��� ������� �oner";
-    Text[ korean ] = "��ʰ� �����ϴ�.";
+    Text[ korean ] = "토너 없음";
     Text[ turkish ] = "Toner bitti";
-    Text[ catalan ] = "No hay t�ner";
+    Text[ catalan ] = "No hi ha t�ner";
     Text[ finnish ] = "V�ri lopussa";
+    Text[ thai ] = "ไม่มีหมึกพิมพ์";
 };
 String STR_SVT_PRNDLG_PAGE_PUNT
 {
@@ -591,21 +611,22 @@ String STR_SVT_PRNDLG_PAGE_PUNT
     Text [ swedish ] = "Kassera sida" ;
     Text [ danish ] = "Kasser side" ;
     Text [ italian ] = "Esci" ;
-    Text [ spanish ] = "Eliminar p�gina" ;
+    Text [ spanish ] = "Borrar p�gina" ;
     Text [ french ] = "Suppression de page" ;
     Text [ dutch ] = "Pagina's uitzonderen" ;
-    Text[ chinese_simplified ] = "ɾ��ҳ";
-    Text[ russian ] = "�������� ��������";
+    Text[ chinese_simplified ] = "删除页";
+    Text[ russian ] = "������� ��������";
     Text[ polish ] = "Usu� stron�";
-    Text[ japanese ] = "�߰�ލ폜";
-    Text[ chinese_traditional ] = "�R����";
+    Text[ japanese ] = "ページの削除";
+    Text[ chinese_traditional ] = "刪除頁";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "�������� �������";
-    Text[ korean ] = "������ ����";
+    Text[ korean ] = "페이지 삭제";
     Text[ turkish ] = "Sayfay� sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar p�gina";
+    Text[ catalan ] = "Elimina la p�gina";
     Text[ finnish ] = "Poista sivu";
+    Text[ thai ] = "ลบหน้า";
 };
 String STR_SVT_PRNDLG_USER_INTERVENTION
 {
@@ -620,18 +641,19 @@ String STR_SVT_PRNDLG_USER_INTERVENTION
     Text [ spanish ] = "Intervenci�n necesaria del usuario " ;
     Text [ french ] = "Intervention de l'utilisateur requise" ;
     Text [ dutch ] = "Ingrijpen door gebruiker noodzakelijk" ;
-    Text[ chinese_simplified ] = "��Ҫʹ�����趨";
+    Text[ chinese_simplified ] = "需要使用者设定";
     Text[ russian ] = "���������� ������������� ������������";
     Text[ polish ] = "Konieczna interwencja u�ytkownika";
-    Text[ japanese ] = "հ�ް�̱������K�v";
-    Text[ chinese_traditional ] = "�ݭn�ۭq";
+    Text[ japanese ] = "ユーザーのアクセスが必要";
+    Text[ chinese_traditional ] = "需要自訂";
     Text[ arabic ] = "�� ������� �� ����� ��������";
     Text[ greek ] = "��������� ��� ������ ��������";
-    Text[ korean ] = "����� ������ �ʿ���";
+    Text[ korean ] = "사용자 간섭이 필요";
     Text[ turkish ] = "Kullan�c� m�dahalesi gerekiyor";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Intervenci�n necesaria del usuario ";
+    Text[ catalan ] = "Intervenci� necessaria de l'usuari";
     Text[ finnish ] = "K�ytt�j�n toimia tarvitaan";
+    Text[ thai ] = "จำเป็นต้องขัดจังหวะผู้ใช้";
 };
 String STR_SVT_PRNDLG_OUT_OF_MEMORY
 {
@@ -645,19 +667,20 @@ String STR_SVT_PRNDLG_OUT_OF_MEMORY
     Text [ italian ] = "Non c'� abbastanza memoria" ;
     Text [ spanish ] = "Memoria insuficiente" ;
     Text [ french ] = "M�moire insuffisante !" ;
-    Text [ dutch ] = "Niet voldoende opslagruimte" ;
-    Text[ chinese_simplified ] = "�ڴ治��";
+    Text [ dutch ] = "Onvoldoende geheugen" ;
+    Text[ chinese_simplified ] = "内存不足";
     Text[ russian ] = "������������ ������";
     Text[ polish ] = "Nie wystarczy pami�ci";
-    Text[ japanese ] = "�\\������؂�����܂���B";
-    Text[ chinese_traditional ] = "�O���餣��";
+    Text[ japanese ] = "ディスク空き容量が足りません。";
+    Text[ chinese_traditional ] = "記憶體不足";
     Text[ arabic ] = "������� ��� �����";
     Text[ greek ] = "� ����� ��� �������";
-    Text[ korean ] = "�޸𸮰� �����մϴ�.";
+    Text[ korean ] = "메모리가 부족합니다.";
     Text[ turkish ] = "Bellek yeterli de�il";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Memoria insuficiente";
+    Text[ catalan ] = "No hi ha prou mem�ria";
     Text[ finnish ] = "Muisti ei riit�";
+    Text[ thai ] = "หน่วยความจำไม่พอ";
 };
 String STR_SVT_PRNDLG_DOOR_OPEN
 {
@@ -671,19 +694,20 @@ String STR_SVT_PRNDLG_DOOR_OPEN
     Text [ italian ] = "Apri copertura" ;
     Text [ spanish ] = "Abrir cubierta" ;
     Text [ french ] = "Bo�tier ouvert" ;
-    Text [ dutch ] = "Afdekking  boven" ;
-    Text[ chinese_simplified ] = "���dz���";
-    Text[ russian ] = "������ �������";
+    Text [ dutch ] = "Afdekking boven" ;
+    Text[ chinese_simplified ] = "护盖敞开";
+    Text[ russian ] = "������ ����� �������";
     Text[ polish ] = "Pokrywa otwarta";
-    Text[ japanese ] = "�������̊W���J���Ă��܂�";
-    Text[ chinese_traditional ] = "�@�\\���}";
+    Text[ japanese ] = "プリンターの蓋が開いています";
+    Text[ chinese_traditional ] = "護蓋敞開";
     Text[ arabic ] = "������ �����";
     Text[ greek ] = "������� �������";
-    Text[ korean ] = "���� ����";
+    Text[ korean ] = "덮개가 열려 있습니다.";
     Text[ turkish ] = "Kapak a��k";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abrir cubierta";
+    Text[ catalan ] = "Coberta oberta";
     Text[ finnish ] = "Avoin kansi";
+    Text[ thai ] = "ฝาปิดเปิด";
 };
 String STR_SVT_PRNDLG_POWER_SAVE
 {
@@ -698,18 +722,19 @@ String STR_SVT_PRNDLG_POWER_SAVE
     Text [ spanish ] = "Modo de ahorro energ�tico" ;
     Text [ french ] = "Mode �conomie d'�nergie" ;
     Text [ dutch ] = "Energiespaarmodus" ;
-    Text[ chinese_simplified ] = "��Լ��Դģʽ";
-    Text[ russian ] = "����� �������� ��������������";
+    Text[ chinese_simplified ] = "节约电源模式";
+    Text[ russian ] = "����� �������� �������";
     Text[ polish ] = "Tryb oszcz�dzania energii";
-    Text[ japanese ] = "��ٷް�ߌ�Ӱ��";
-    Text[ chinese_traditional ] = "�`���q���Ҧ�";
+    Text[ japanese ] = "エネルギー節減モード";
+    Text[ chinese_traditional ] = "節約電源模式";
     Text[ arabic ] = "��� ����� ������";
     Text[ greek ] = "��������� ������������� ���������";
-    Text[ korean ] = "���� ���";
+    Text[ korean ] = "절전 모드";
     Text[ turkish ] = "Enerji tasarruf kipi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modo de ahorro energ�tico";
+    Text[ catalan ] = "Mode d'estalvi d'energia";
     Text[ finnish ] = "Virrans��st�tila";
+    Text[ thai ] = "โหมดประหยัดกำลัง";
 };
 String STR_SVT_PRNDLG_DEFPRINTER
 {
@@ -724,18 +749,19 @@ String STR_SVT_PRNDLG_DEFPRINTER
     Text [ spanish ] = "Predeterminada" ;
     Text [ french ] = "Imprimante par d�faut" ;
     Text [ dutch ] = "Standaardprinter" ;
-    Text[ chinese_simplified ] = "Ĭ�ϴ�ӡ��";
-    Text[ russian ] = "����������� �������";
+    Text[ chinese_simplified ] = "默认打印机";
+    Text[ russian ] = "������� �� ���������";
     Text[ polish ] = "Drukarka domy�lna";
-    Text[ japanese ] = "�W�������";
-    Text[ chinese_traditional ] = "�q�{�L����";
+    Text[ japanese ] = "標準プリンタ";
+    Text[ chinese_traditional ] = "默認印表機";
     Text[ arabic ] = "������� ����������";
     Text[ greek ] = "�������������� ���������";
-    Text[ korean ] = "�⺻ ������";
+    Text[ korean ] = "기본 프린터";
     Text[ turkish ] = "Standart yaz�c�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Predeterminada";
+    Text[ catalan ] = "Impressora per defecte";
     Text[ finnish ] = "Oletustulostin";
+    Text[ thai ] = "ค่าเริ่มต้นเครื่องพิมพ์";
 };
 String STR_SVT_PRNDLG_JOBCOUNT
 {
@@ -750,18 +776,19 @@ String STR_SVT_PRNDLG_JOBCOUNT
     Text [ spanish ] = "%d documentos" ;
     Text [ french ] = "%d documents" ;
     Text [ dutch ] = "%d documenten" ;
-    Text[ chinese_simplified ] = "%d �ĵ�";
+    Text[ chinese_simplified ] = "%d 文档";
     Text[ russian ] = "%d ���������(��)";
     Text[ polish ] = "%d dokumenty";
-    Text[ japanese ] = "%d���޷����";
-    Text[ chinese_traditional ] = "%d ���";
+    Text[ japanese ] = "%dのドキュメント";
+    Text[ chinese_traditional ] = "%d 文件";
     Text[ arabic ] = "�������%d ";
     Text[ greek ] = "%d �������";
-    Text[ korean ] = "%d ����";
+    Text[ korean ] = "%d 문서";
     Text[ turkish ] = "%d belge";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "%d documentos";
+    Text[ catalan ] = "%d documents";
     Text[ finnish ] = "%d asiakirjaa";
+    Text[ thai ] = "เอกสาร %d ";
 };
 
 ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
@@ -796,18 +823,19 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Text [ french ] = "Imprimante" ;
         Text [ dutch ] = "Printer" ;
         Text [ portuguese ] = "Impressora" ;
-        Text[ chinese_simplified ] = "��ӡ��";
+        Text[ chinese_simplified ] = "打印机";
         Text[ russian ] = "�������";
         Text[ polish ] = "Drukarka";
-        Text[ japanese ] = "�����";
-        Text[ chinese_traditional ] = "�L����";
+        Text[ japanese ] = "プリンタ";
+        Text[ chinese_traditional ] = "印表機";
         Text[ arabic ] = "�������";
         Text[ greek ] = "���������";
-        Text[ korean ] = "������";
+        Text[ korean ] = "프린터";
         Text[ turkish ] = "Yaz�c�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Impresora";
-        Text[ finnish ] = "Tulostin ";
+        Text[ catalan ] = "Impressora";
+        Text[ finnish ] = "Tulostin";
+        Text[ thai ] = "เครื่องพิมพ์";
     };
     FixedText FT_NAME
     {
@@ -821,21 +849,22 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Text [ danish ] = "Navn" ;
         Text [ italian ] = "~Nome" ;
         Text [ spanish ] = "~Nombre" ;
-        Text [ french ] = "~Nom" ;
+        Text [ french ] = "Nom" ;
         Text [ dutch ] = "~Naam" ;
         Text [ portuguese ] = "~Nome" ;
-        Text[ chinese_simplified ] = "����(~N)";
+        Text[ chinese_simplified ] = "名称(~N)";
         Text[ russian ] = "~���";
         Text[ polish ] = "Nazwa";
-        Text[ japanese ] = "���O(~N)";
-        Text[ chinese_traditional ] = "�W��(~N)";
+        Text[ japanese ] = "名前(~N)";
+        Text[ chinese_traditional ] = "名稱(~N)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "�̸�(~N)";
+        Text[ korean ] = "이름(~N)";
         Text[ turkish ] = "~Ad";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Nombre";
+        Text[ catalan ] = "~Nom";
         Text[ finnish ] = "~Nimi";
+        Text[ thai ] = "~ชื่อ";
     };
     ListBox LB_NAMES
     {
@@ -860,18 +889,19 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Text [ spanish ] = "~Propiedades..." ;
         Text [ french ] = "~Propri�t�s..." ;
         Text [ dutch ] = "~Eigenschappen..." ;
-        Text[ chinese_simplified ] = "����(~I)...";
+        Text[ chinese_simplified ] = "属性(~I)...";
         Text[ russian ] = "~��������...";
         Text[ polish ] = "W�a�ciwo�ci...";
-        Text[ japanese ] = "�����è(~I)...";
-        Text[ chinese_traditional ] = "�ݩ�(~I)...";
+        Text[ japanese ] = "プロパティ(~I)...";
+        Text[ chinese_traditional ] = "屬性(~I)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "���������...";
-        Text[ korean ] = "�������(~I)...";
+        Text[ korean ] = "등록 정보(~I)...";
         Text[ turkish ] = "~�zellikler...";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Propiedades...";
-        Text[ finnish ] = "~Ominaisuudet";
+        Text[ catalan ] = "~Propietats...";
+        Text[ finnish ] = "Ominaisuu~det...";
+        Text[ thai ] = "คุณสม~บัติ...";
     };
     FixedText FT_STATUS
     {
@@ -888,18 +918,19 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Text [ french ] = "�tat" ;
         Text [ dutch ] = "Status" ;
         Text [ portuguese ] = "Estado" ;
-        Text[ chinese_simplified ] = "״̬";
+        Text[ chinese_simplified ] = "状态";
         Text[ russian ] = "���������";
         Text[ polish ] = "Stan";
-        Text[ japanese ] = "�ð��";
-        Text[ chinese_traditional ] = "���A";
+        Text[ japanese ] = "ステータス";
+        Text[ chinese_traditional ] = "狀態";
         Text[ arabic ] = "������";
         Text[ greek ] = "���������";
-        Text[ korean ] = "����";
+        Text[ korean ] = "상태";
         Text[ turkish ] = "Durum";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Estado";
+        Text[ catalan ] = "Estat";
         Text[ finnish ] = "Tila";
+        Text[ thai ] = "สถานะ";
     };
     FixedText FI_STATUS
     {
@@ -921,18 +952,19 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Text [ french ] = "Type" ;
         Text [ dutch ] = "Type" ;
         Text [ portuguese ] = "Tipo" ;
-        Text[ chinese_simplified ] = "����";
+        Text[ chinese_simplified ] = "类型";
         Text[ russian ] = "���";
         Text[ polish ] = "Typ";
-        Text[ japanese ] = "����";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "種類";
+        Text[ chinese_traditional ] = "類型";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "����";
+        Text[ korean ] = "종류";
         Text[ turkish ] = "Tip";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Tipo";
+        Text[ catalan ] = "Tipus";
         Text[ finnish ] = "Tyyppi";
+        Text[ thai ] = "ชนิด";
     };
     FixedText FI_TYPE
     {
@@ -954,18 +986,19 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Text [ french ] = "Emplacement" ;
         Text [ dutch ] = "Plaats" ;
         Text [ portuguese ] = "Lugar" ;
-        Text[ chinese_simplified ] = "�";
-        Text[ russian ] = "�����";
+        Text[ chinese_simplified ] = "位置";
+        Text[ russian ] = "������������";
         Text[ polish ] = "Lokalizacja";
-        Text[ japanese ] = "�ꏊ";
-        Text[ chinese_traditional ] = "��m";
+        Text[ japanese ] = "場所";
+        Text[ chinese_traditional ] = "位置";
         Text[ arabic ] = "������";
         Text[ greek ] = "���������";
-        Text[ korean ] = "��ġ";
+        Text[ korean ] = "구/군/시";
         Text[ turkish ] = "Yer";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ubicaci�n";
+        Text[ catalan ] = "Ubicaci�";
         Text[ finnish ] = "Sijainti";
+        Text[ thai ] = "ที่ตั้ง";
     };
     FixedText FI_LOCATION
     {
@@ -985,20 +1018,21 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Text [ italian ] = "Commento" ;
         Text [ spanish ] = "Comentario" ;
         Text [ french ] = "Commentaire" ;
-        Text [ dutch ] = "Commentaar" ;
+        Text [ dutch ] = "Opmerkingen" ;
         Text [ portuguese ] = "Coment�rio" ;
-        Text[ chinese_simplified ] = "ע��";
+        Text[ chinese_simplified ] = "注解";
         Text[ russian ] = "�����������";
         Text[ polish ] = "Komentarz";
-        Text[ japanese ] = "����";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "コメント";
+        Text[ chinese_traditional ] = "註解";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
-        Text[ korean ] = "�ּ�";
+        Text[ korean ] = "설명";
         Text[ turkish ] = "A��klama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Comentario";
-        Text[ finnish ] = "Kommentti";
+        Text[ catalan ] = "Comentari";
+        Text[ finnish ] = "Huomautus";
+        Text[ thai ] = "ข้อคิดเห็น";
     };
     FixedText FI_COMMENT
     {
@@ -1026,18 +1060,19 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Pos = MAP_APPFONT ( 204 , 84 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
-    Text[ chinese_simplified ] = "�趨��ӡ��";
-    Text[ russian ] = "��������� �������";
+    Text[ chinese_simplified ] = "设定打印机";
+    Text[ russian ] = "��������� ��������";
     Text[ polish ] = "Ustaw drukark�";
-    Text[ japanese ] = "������ݒ�";
-    Text[ chinese_traditional ] = "�]�m�L����";
+    Text[ japanese ] = "プリンタ設定";
+    Text[ chinese_traditional ] = "設置印表機";
     Text[ arabic ] = "����� �������";
     Text[ language_user1 ] = " ";
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "������ ����";
+    Text[ korean ] = "프린터 설정";
     Text[ turkish ] = "Yaz�c� ayarlar�";
-    Text[ catalan ] = "Configurar impresora";
+    Text[ catalan ] = "Configura la impressora";
     Text[ finnish ] = "Tulostimen asetukset";
+    Text[ thai ] = "ตั้งค่าเครื่องพิมพ์";
 };
 
 
@@ -1046,3 +1081,16 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src
index 47a3b4f83f99..a333fc16f20f 100644
--- a/svtools/source/dialogs/wizardmachine.src
+++ b/svtools/source/dialogs/wizardmachine.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wizardmachine.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:14:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,21 +73,22 @@ String STR_WIZDLG_FINISH
     Text[ russian ] = "~������";
     Text[ greek ] = "����������";
     Text[ dutch ] = "~Voltooien";
-    Text[ french ] = "~Cr�er";
+    Text[ french ] = "Cr�er";
     Text[ spanish ] = "~Crear";
     Text[ italian ] = "~Crea";
-    Text[ danish ] = "~Finish";
+    Text[ danish ] = "~Udf�r";
     Text[ swedish ] = "~F�rdigst�ll";
     Text[ polish ] = "Utw�rz";
     Text[ portuguese_brazilian ] = "~Finish";
     Text[ japanese ] = "完了(~R)";
-    Text[ korean ] = "마침(~R)";
+    Text[ korean ] = "만들기(~R)";
     Text[ chinese_simplified ] = "完成(~R)";
     Text[ chinese_traditional ] = "完成(~R)";
     Text[ turkish ] = "~Finish";
     Text[ arabic ] = "�����";
-    Text[ catalan ] = "~Crear";
+    Text[ catalan ] = "~Crea";
     Text[ finnish ] = "~Luo";
+    Text[ thai ] = "ส~ร้าง";
 };
 
 String STR_WIZDLG_NEXT
@@ -99,22 +100,23 @@ String STR_WIZDLG_NEXT
     Text[ portuguese ] = "~Seguinte >>";
     Text[ russian ] = "~����� >>";
     Text[ greek ] = "������� >>";
-    Text[ dutch ] = "~Next >>";
-    Text[ french ] = "~Suivant >>";
+    Text[ dutch ] = "Volge~nde >>";
+    Text[ french ] = "Suivant >>";
     Text[ spanish ] = "~Siguiente >>";
     Text[ italian ] = "~Avanti >>";
-    Text[ danish ] = "~Next >>";
+    Text[ danish ] = "~N�ste >>";
     Text[ swedish ] = "~N�sta >>";
     Text[ polish ] = "Dalej >>";
     Text[ portuguese_brazilian ] = "~Next >>";
     Text[ japanese ] = "次へ(~N) >>";
-    Text[ korean ] = "다음 (~N) >>";
-    Text[ chinese_simplified ] = "继续  (~N) >>";
-    Text[ chinese_traditional ] = "繼續 (~N) >>";
+    Text[ korean ] = "다음(~N) >>";
+    Text[ chinese_simplified ] = "继续(~N) >>";
+    Text[ chinese_traditional ] = "繼續(~N) >>";
     Text[ turkish ] = "~Next >>";
     Text[ arabic ] = "������ <<";
-    Text[ catalan ] = "~Siguiente >>";
-    Text[ finnish ] = "Seuraava >>";
+    Text[ catalan ] = "~Seg�ent >>";
+    Text[ finnish ] = "~Seuraava >>";
+    Text[ thai ] = "~ถัดไป >>";
 };
 
 String STR_WIZDLG_PREVIOUS
@@ -127,10 +129,10 @@ String STR_WIZDLG_PREVIOUS
     Text[ russian ] = "<<~�����";
     Text[ greek ] = "<< ����";
     Text[ dutch ] = "<< ~Vorige";
-    Text[ french ] = "<< ~Pr�c�dent";
+    Text[ french ] = "<< Pr�c�dent";
     Text[ spanish ] = "<< ~Regresar";
     Text[ italian ] = "<<~Indietro";
-    Text[ danish ] = "<< ~Previous";
+    Text[ danish ] = "<< ~Tilbage";
     Text[ swedish ] = "<< T~illbaka";
     Text[ polish ] = "<< Wstecz";
     Text[ portuguese_brazilian ] = "<< ~Previous";
@@ -140,27 +142,60 @@ String STR_WIZDLG_PREVIOUS
     Text[ chinese_traditional ] = "<< 返回(~K)";
     Text[ turkish ] = "<< ~Previous";
     Text[ arabic ] = "<< ~Previous";
-    Text[ catalan ] = "<< ~Anterior";
-    Text[ finnish ] = "<< Takaisin";
+    Text[ catalan ] = "<< ~Enrere";
+    Text[ finnish ] = "<< ~Edellinen";
+    Text[ thai ] = "<< กลั~บไป";
 };
 
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
- *  Revision 1.22  2001/11/07 09:50:10  kz
- *  Merge SRC638: 07.11.01 - 10:50:15
+ *  Revision 1.17.2.8.4.4.2.1  2003/02/22 16:31:59  hr
+ *  INTEGRATION: CWS mergep (1.17.2.8.4.4.66); FILE MERGED
+ *  2003/02/22 10:37:47 nf 1.17.2.8.4.4.66.2: #107113# localization of StarOffice 6.1 Beta/OpenOffice.org 1.1 Beta. Represents content of translation database of 02/21/2003. Translation up to date for SUN big rules languages
+ *  2003/01/31 13:11:21 hjs 1.17.2.8.4.4.66.1: #107113# merge on SRX644p
  *
- *  Revision 1.21  2001/08/29 20:08:52  kz
- *  Merge SRC638: 08/29/01 - 22:08:32
+ *  Revision 1.17.2.8.4.4.66.2  2003/02/22 10:37:47  nf
+ *  #107113# localization of StarOffice 6.1 Beta/OpenOffice.org 1.1 Beta. Represents content of translation database of 02/21/2003. Translation up to date for SUN big rules languages
  *
- *  Revision 1.20  2001/08/24 13:31:01  rt
- *  Merge SRC638: 24.08.01 - 15:29:25
+ *  Revision 1.17.2.8.4.4.66.1  2003/01/31 13:11:21  hjs
+ *  #107113# merge on SRX644p
  *
- *  Revision 1.19  2001/08/21 20:21:36  kz
- *  Merge SRC638: 21.08.01 - 22:20:56
+ *  Revision 1.17.2.8.4.4  2002/11/27 16:27:56  kz
+ *  Merge SRX644: 27.11.02 - 17:24:03
  *
- *  Revision 1.18  2001/08/14 14:39:25  kz
- *  Merge SRC638: 14.08.01 - 16:38:56
+ *  Revision 1.17.2.8.4.3  2002/08/05 20:17:27  kz
+ *  Merge SRX643: 05.08.02 - 22:14:24
+ *
+ *  Revision 1.17.2.8.4.2  2002/08/01 20:13:34  kz
+ *  Merge SRX643: 01.08.02 - 22:10:05
+ *
+ *  Revision 1.17.2.8.4.1  2002/04/29 20:09:39  kz
+ *  Merge SRX642: 29.04.02 - 22:09:15
+ *
+ *  Revision 1.17.2.8  2001/11/23 22:46:12  rt
+ *  Merge SRC641: 23.11.01 - 22:44:59
+ *
+ *  Revision 1.17.2.7  2001/11/13 22:28:07  kz
+ *  Merge SRC641: 13.11.01 - 22:28:01
+ *
+ *  Revision 1.17.2.6  2001/11/01 21:28:34  kz
+ *  Merge SRC641: 01.11.01 - 22:28:12
+ *
+ *  Revision 1.17.2.5  2001/10/19 20:49:17  vg
+ *  Merge SRC641: 19.10.01 - 22:49:44
+ *
+ *  Revision 1.17.2.4  2001/10/17 20:41:52  kz
+ *  Merge SRC641: 17.10.01 - 22:40:51
+ *
+ *  Revision 1.17.2.3  2001/10/11 20:39:53  kz
+ *  Merge SRC641: 11.10.01 - 22:39:21
+ *
+ *  Revision 1.17.2.2  2001/09/25 21:05:13  kz
+ *  Merge SRC641: 25.09.01 - 23:04:43
+ *
+ *  Revision 1.17.2.1  2001/09/21 20:22:42  kz
+ *  Merge SRC641: 21.09.01 - 22:22:13
  *
  *  Revision 1.17  2001/08/08 09:10:26  kz
  *  Merge SRC638: 08.08.01 - 11:09:54
@@ -228,3 +263,7 @@ String STR_WIZDLG_PREVIOUS
 
 
 
+
+
+
+
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
index 335d46cf7d4d..4e9a08976031 100644
--- a/svtools/source/edit/makefile.mk
+++ b/svtools/source/edit/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: jbu $ $Date: 2002-10-01 12:56:33 $
+#   last change: $Author: hr $ $Date: 2003-03-27 14:38:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -74,21 +74,6 @@ LIBTARGET=NO
 
 .IF "$(header)" == ""
 
-UNOTYPES = \
-    com.sun.star.awt.FontWeight \
-    com.sun.star.awt.XTextArea \
-    com.sun.star.awt.XTextComponent \
-    com.sun.star.awt.XTextLayoutConstrains \
-    com.sun.star.lang.EventObject \
-    drafts.com.sun.star.accessibility.AccessibleEventId \
-    drafts.com.sun.star.accessibility.AccessibleRole \
-    drafts.com.sun.star.accessibility.AccessibleStateType \
-    drafts.com.sun.star.accessibility.AccessibleTextType \
-    drafts.com.sun.star.accessibility.XAccessible \
-    drafts.com.sun.star.accessibility.XAccessibleContext \
-    drafts.com.sun.star.accessibility.XAccessibleEditableText \
-    drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
-
 SLOFILES=   \
             $(SLO)$/textdata.obj	\
             $(SLO)$/textdoc.obj		\
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index a06a9606571c..6688280ee1c7 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svmedit.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: mt $ $Date: 2002-11-15 11:42:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -944,7 +944,7 @@ TextWindow::GetComponentInterface(BOOL bCreate)
         Window::GetComponentInterface(false));
     if (!xPeer.is() && bCreate)
     {
-        xPeer = new ::svtools::TextWindowAccessibility(*GetTextView());
+        xPeer = new ::svtools::TextWindowAccessibility(*GetTextView(), true);
         SetComponentInterface(xPeer);
     }
     return xPeer;
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index b1e5f85c310d..dbcf53e95567 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: texteng.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: mt $ $Date: 2002-11-20 15:43:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1681,7 +1681,8 @@ void TextEngine::ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion* pPor
     aUserOptions.allowPunctuationOutsideMargin = sal_False;
     aUserOptions.allowHyphenateEnglish = sal_False;
 
-    i18n::LineBreakResults aLBR = xBI->getLineBreak( pNode->GetText(), nMaxBreakPos, GetLocale(), pLine->GetStart(), aHyphOptions, aUserOptions );
+    static const com::sun::star::lang::Locale aDefLocale;
+    i18n::LineBreakResults aLBR = xBI->getLineBreak( pNode->GetText(), nMaxBreakPos, aDefLocale, pLine->GetStart(), aHyphOptions, aUserOptions );
     USHORT nBreakPos = (USHORT)aLBR.breakIndex;
     if ( nBreakPos <= pLine->GetStart() )
     {
diff --git a/svtools/source/filepicker/pickerhistory.cxx b/svtools/source/filepicker/pickerhistory.cxx
index 24ffbe2b9e4f..bc91024ebde0 100644
--- a/svtools/source/filepicker/pickerhistory.cxx
+++ b/svtools/source/filepicker/pickerhistory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pickerhistory.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-31 09:22:44 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -174,10 +174,3 @@ namespace svt
 }   // namespace svt
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 31.10.01 09:47:02  fs
- ************************************************************************/
-
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index 3281d2fd32ac..f7694aace435 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FilterConfigItem.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: sj $ $Date: 2002-11-28 10:07:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -433,7 +433,7 @@ OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDe
     {
         pPropVal->Value >>= aRetValue;
     }
-    else  if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
+    else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
     {
         aAny >>= aRetValue;
     }
@@ -444,6 +444,25 @@ OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDe
     return aRetValue;
 }
 
+Any FilterConfigItem::ReadAny( const ::rtl::OUString& rKey, const Any& rDefault )
+{
+    Any aAny, aRetValue( rDefault );
+    PropertyValue* pPropVal = GetPropertyValue( aFilterData, rKey );
+    if ( pPropVal )
+    {
+        aRetValue = pPropVal->Value;
+    }
+    else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
+    {
+        aRetValue = aAny;
+    }
+    PropertyValue aPropValue;
+    aPropValue.Name = rKey;
+    aPropValue.Value = aRetValue;
+    WritePropertyValue( aFilterData, aPropValue );
+    return aRetValue;
+}
+
 void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue )
 {
     PropertyValue aBool;
@@ -595,6 +614,34 @@ void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewVa
     }
 }
 
+void FilterConfigItem::WriteAny( const OUString& rKey, const Any& rNewAny )
+{
+    PropertyValue aPropValue;
+    aPropValue.Name = rKey;
+    aPropValue.Value = rNewAny;
+    WritePropertyValue( aFilterData, aPropValue );
+    if ( xPropSet.is() )
+    {
+        Any aAny;
+        if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
+        {
+            if ( aAny != rNewAny )
+            {
+                try
+                {
+                    xPropSet->setPropertyValue( rKey, rNewAny );
+                    bModified = sal_True;
+                }
+                catch ( com::sun::star::uno::Exception& )
+                {
+                    DBG_ERROR( "FilterConfigItem::WriteAny - could not set PropertyValue" );
+
+                }
+            }
+        }
+    }
+}
+
 // ------------------------------------------------------------------------
 
 Sequence< PropertyValue > FilterConfigItem::GetFilterData() const
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
index b0398d2a78da..96df28a11ff2 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SvFilterOptionsDialog.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sj $ $Date: 2002-07-16 09:27:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -101,6 +101,9 @@
 #ifndef _COM_SUN_STAR_UNO_ANY_H_
 #include <com/sun/star/uno/Any.h>
 #endif
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <syslocale.hxx>
+#endif
 
 #if defined WIN || (defined OS2 && !defined ICC)
 #define EXPDLG_FUNCTION_NAME    "_DoExportDialog"
@@ -362,7 +365,13 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp
         if ( aConfigPath.Len() )
         {
             FilterConfigItem aConfigItem( aConfigPath );
-            eFieldUnit = (FieldUnit)aConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) ), FUNIT_CM );
+            String aPropertyName;
+            SvtSysLocale aSysLocale;
+            if ( aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum() == MEASURE_METRIC )
+                aPropertyName = String( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) );
+            else
+                aPropertyName = String( RTL_CONSTASCII_USTRINGPARAM( "NonMetric" ) );
+            eFieldUnit = (FieldUnit)aConfigItem.ReadInt32( aPropertyName, FUNIT_CM );
         }
     }
 }
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src
index c1cb6796ba6b..63b1e9892cbe 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.src
+++ b/svtools/source/filter.vcl/filter/dlgejpg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgejpg.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-08-13 20:08:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,7 +107,7 @@ ModalDialog DLG_EXPORT_JPG
         Text [ french ] = "Qualit�" ;
         Text [ dutch ] = "Kwaliteit" ;
         Text [ swedish ] = "Kvalitet" ;
-        Text [ danish ] = "Kvalitet" ;
+        Text [ danish ] = "Kvalitet." ;
         Text [ portuguese_brazilian ] = "Qualit�t" ;
         Text [ portuguese ] = "Qualidade" ;
         Text[ chinese_simplified ] = "质量";
@@ -122,8 +122,9 @@ ModalDialog DLG_EXPORT_JPG
         Text[ korean ] = "화질";
         Text[ turkish ] = "Kalite";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Calidad";
+        Text[ catalan ] = "Qualitat";
         Text[ finnish ] = "Laatu";
+        Text[ thai ] = "คุณภาพ";
     };
     FixedText FI_DESCR
     {
@@ -137,11 +138,11 @@ ModalDialog DLG_EXPORT_JPG
         Text [ french ] = "1 : qualit� min.\n100 : qualit� max." ;
         Text [ dutch ] = "1: min. kwaliteit\n100: max. kwaliteit" ;
         Text [ swedish ] = "1: min. kvalitet\n100: max. kvalitet" ;
-        Text [ danish ] = "0: min. kvalitet\n100: maks. kvalitet" ;
+        Text [ danish ] = "~1: min. kvalitet\n100: maks. kvalitet" ;
         Text [ portuguese_brazilian ] = "0: min. Qualidade\n100: max. Qualidade" ;
         Text [ portuguese ] = "1: min. qualidade\n100: max. qualidade" ;
         Text[ chinese_simplified ] = "1: 最差质量 \n100: 最佳质量";
-        Text[ russian ] = "1: ������ ��������\n100: ������� ��������";
+        Text[ russian ] = "1: ������ ��������\\: ������� ��������";
         Text[ polish ] = "1: min. jako��\n100: maks. jako��";
         Text[ japanese ] = "1: 最低\n100: 最高";
         Text[ chinese_traditional ] = "1: 最差品質 \n100: 最佳品質";
@@ -149,11 +150,12 @@ ModalDialog DLG_EXPORT_JPG
         Text[ dutch ] = "1: min. kwaliteit\n100: max. kwaliteit";
         Text[ chinese_simplified ] = "1: 最差质量 \n100: 最佳质量";
         Text[ greek ] = "0: �������� ��������\n100: ������� ��������";
-        Text[ korean ] = "1: 최소 성능\n100: 최대 성능";
+        Text[ korean ] = "1: 최소 품질\n100: 최대 품질";
         Text[ turkish ] = "0: asg. kalite\n100: azm. kalite";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "0: m�n. calidad\n100: m�x. calidad";
-        Text[ finnish ] = "0: v�h. Laatu\n100: Enint. Laatu";
+        Text[ catalan ] = "0: m�n. qualitat\n100: m�x. qualitat";
+        Text[ finnish ] = "1: v�himm�islaatu \n100: enimm�islaatu";
+        Text[ thai ] = "1: คุณภาพต่ำสุด\n100: คุณภาพสูงสุด";
     };
     NumericField NUM_FLD_QUALITY
     {
@@ -184,19 +186,20 @@ ModalDialog DLG_EXPORT_JPG
         Text [ dutch ] = "Kleurdichtheid" ;
         Text [ portuguese ] = "Resolu��o de cores" ;
         Text[ chinese_simplified ] = "颜色分辨率";
-        Text[ russian ] = "�������� ����������";
+        Text[ russian ] = "������� �����";
         Text[ polish ] = "Rozdzielczo�� kolor�w";
         Text[ japanese ] = "色の解像度";
-        Text[ chinese_traditional ] = "顔色解析度";
+        Text[ chinese_traditional ] = "顏色解析度";
         Text[ arabic ] = "������� �����";
         Text[ dutch ] = "Kleurdichtheid";
         Text[ chinese_simplified ] = "颜色分辨率";
         Text[ greek ] = "������� ��������";
-        Text[ korean ] = "컬러 해상도";
+        Text[ korean ] = "색 해상도";
         Text[ turkish ] = "Renk ��z�n�rl���";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Resoluci�n del color";
-        Text[ finnish ] = "V�rin erottelukyky";
+        Text[ catalan ] = "Resoluci� del color";
+        Text[ finnish ] = "V�ritarkkuus";
+        Text[ thai ] = "ความละเอียดของสี";
     };
     RadioButton RB_GRAY
     {
@@ -217,17 +220,18 @@ ModalDialog DLG_EXPORT_JPG
         Text[ chinese_simplified ] = "灰度";
         Text[ russian ] = "������� ������";
         Text[ polish ] = "Odcienie szaro�ci";
-        Text[ japanese ] = "ｸﾞﾚｰｽｹｰﾙ";
+        Text[ japanese ] = "グレースケール";
         Text[ chinese_traditional ] = "灰階";
         Text[ arabic ] = "����� �������";
         Text[ dutch ] = "Grijswaarden";
         Text[ chinese_simplified ] = "灰度";
         Text[ greek ] = "���������� ��� ����";
-        Text[ korean ] = "회색도";
+        Text[ korean ] = "회색조";
         Text[ turkish ] = "Gri tonlama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Escala de grises";
+        Text[ catalan ] = "Escala de grisos";
         Text[ finnish ] = "Harmaas�vy";
+        Text[ thai ] = "สเกลสีเทา";
     };
     RadioButton RB_RGB
     {
@@ -243,29 +247,30 @@ ModalDialog DLG_EXPORT_JPG
         Text [ danish ] = "�gte farver" ;
         Text [ italian ] = "Colori reali" ;
         Text [ spanish ] = "Colores reales" ;
-        Text [ french ] = "Vraies couleurs (Truecolor)" ;
-        Text [ dutch ] = "Echte kleuren" ;
+        Text [ french ] = "Vraies couleurs (True color)" ;
+        Text [ dutch ] = "Ware kleuren" ;
         Text[ chinese_simplified ] = "仿真色";
-        Text[ russian ] = "����������� �����";
+        Text[ russian ] = "�������� ����";
         Text[ polish ] = "Trwa�e kolory";
         Text[ japanese ] = "True Color";
         Text[ chinese_traditional ] = "全彩";
         Text[ arabic ] = "����� ������";
-        Text[ dutch ] = "Echte kleuren";
+        Text[ dutch ] = "Ware kleuren";
         Text[ chinese_simplified ] = "仿真色";
         Text[ greek ] = "������ �������";
         Text[ korean ] = "트루 컬러";
         Text[ turkish ] = "Ger�ek renkler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Colores reales";
+        Text[ catalan ] = "Colors reals";
         Text[ finnish ] = "True Color -v�rit";
+        Text[ thai ] = "สีจริง";
     };
     Text [ portuguese_brazilian ] = "JPEG Optionen" ;
     Text [ portuguese ] = "Op��es JPEG" ;
     Text[ chinese_simplified ] = "JPEG 选项";
     Text[ russian ] = "��������� JPEG";
     Text[ polish ] = "Opcje JPEG";
-    Text[ japanese ] = "JPEG ｵﾌﾟｼｮﾝ";
+    Text[ japanese ] = "JPEG オプション";
     Text[ chinese_traditional ] = "JPEG 選項";
     Text[ arabic ] = "������JPEG ";
     Text[ dutch ] = "JPEG-opties";
@@ -274,8 +279,9 @@ ModalDialog DLG_EXPORT_JPG
     Text[ korean ] = "JPEG 옵션";
     Text[ turkish ] = "JPEG se�enekleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Opciones JPEG";
-    Text[ finnish ] = "JPEG-valinnat";
+    Text[ catalan ] = "Opcions JPEG";
+    Text[ finnish ] = "JPEG-vientiasetukset";
+    Text[ thai ] = "ตัวเลือก JPEG ";
 };
 
 
@@ -285,3 +291,15 @@ ModalDialog DLG_EXPORT_JPG
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src
index 78e0b1ff8487..96e5268921dd 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.src
+++ b/svtools/source/filter.vcl/filter/dlgexpor.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgexpor.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: obo $ $Date: 2001-08-24 13:17:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,17 +85,18 @@ ModalDialog DLG_EXPORT_PIX
         Text [ french ] = "R�solution couleur" ;
         Text [ dutch ] = "Kleurdichtheid" ;
         Text[ chinese_simplified ] = "彩色分辨率";
-        Text[ russian ] = "�������� ����������";
+        Text[ russian ] = "������� �����";
         Text[ polish ] = "Rozdzielczo�� kolor�w";
         Text[ japanese ] = "色の解像度";
         Text[ chinese_traditional ] = "彩色解析度";
         Text[ arabic ] = "������� �����";
         Text[ greek ] = "������� ��������";
-        Text[ korean ] = "컬러 해상도";
+        Text[ korean ] = "색 해상도";
         Text[ turkish ] = "Renk ��z�n�rl���";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Resoluci�n del color";
-        Text[ finnish ] = "V�rin erottelukyky";
+        Text[ catalan ] = "Resoluci� del color";
+        Text[ finnish ] = "V�ritarkkuus";
+        Text[ thai ] = "เลือกสี";
     };
     ListBox LB_COLORS
     {
@@ -166,8 +167,8 @@ ModalDialog DLG_EXPORT_PIX
             < "1bit-ditrering" ; Default ; > ;
             < "4bit-gr�skalepalett" ; Default ; > ;
             < "4bit-f�rgpalett" ; Default ; > ;
-            < "8Bit - gr�skalepalett" ; Default ; > ;
-            < "8Bit - f�rgpalett" ; Default ; > ;
+            < "8bit - gr�skalepalett" ; Default ; > ;
+            < "8bit - f�rgpalett" ; Default ; > ;
             < "24bit - True Colors" ; Default ; > ;
         };
         stringlist [ danish ] =
@@ -212,18 +213,18 @@ ModalDialog DLG_EXPORT_PIX
             < "Palette de couleurs 4 bits" ; Default ; > ;
             < "Niveaux de gris 8 bits" ; Default ; > ;
             < "Palette de couleurs 8 bits" ; Default ; > ;
-            < "Couleurs 24 bit (Truecolor)" ; Default ; > ;
+            < "Couleurs 24 bits (True color)" ; Default ; > ;
         };
         stringlist [ dutch ] =
         {
             < "Origineel" ; Default ; > ;
-            < "1Bit - grenswaarde" ; Default ; > ;
-            < "1Bit - geditherd" ; Default ; > ;
-            < "4Bit - grijswaardenpalet" ; Default ; > ;
-            < "4Bit - kleurenpalet" ; Default ; > ;
-            < "8Bit - grijswaardenpalet" ; Default ; > ;
-            < "8Bit - kleurenpalet" ; Default ; > ;
-            < "24Bit - echte kleuren" ; Default ; > ;
+            < "1-bits-drempelwaarde" ; Default ; > ;
+            < "1-bits-geditherd" ; Default ; > ;
+            < "4-bits-grijswaardenpalet" ; Default ; > ;
+            < "4-bits-kleurenpalet" ; Default ; > ;
+            < "8-bits-grijswaardenpalet" ; Default ; > ;
+            < "8-bits-kleurenpalet" ; Default ; > ;
+            < "24-bits-ware kleuren" ; Default ; > ;
         };
     StringList [ chinese_simplified ] =
     {
@@ -239,11 +240,11 @@ ModalDialog DLG_EXPORT_PIX
     StringList [ russian ] =
     {
     < "��������" ; Default ; > ;
-        < "1-��������� ��������� ��������" ; Default ; > ;
-        < "1-��������� ����������������� �����������" ; Default ; > ;
-        < "4-��������� ����� �������� ������" ; Default ; > ;
+        < "1-��������� ��������� ��������������" ; Default ; > ;
+        < "1-��������� ��������� ��������������" ; Default ; > ;
+        < "4-��������� ������� �������� ������" ; Default ; > ;
         < "4-��������� �������� �������" ; Default ; > ;
-        < "8-�������� ����� �������� ������" ; Default ; > ;
+        < "8-��������� ������� �������� ������" ; Default ; > ;
         < "8-��������� �������� �������" ; Default ; > ;
         < "24-��������� ����������� �����" ; Default ; > ;
     };
@@ -260,14 +261,14 @@ ModalDialog DLG_EXPORT_PIX
     };
     StringList [ japanese ] =
     {
-            < "ｵﾘｼﾞﾅﾙ" ; Default ; > ;
+            < "オリジナル" ; Default ; > ;
         < "1Bit しきい値" ; Default ; > ;
-        < "1Bit ﾃﾞｨｻﾞ法" ; Default ; > ;
-        < "4Bit-ｸﾞﾚｰｽｹｰﾙ" ; Default ; > ;
-        < "4Bit-ｶﾗｰﾊﾟﾚｯﾄ" ; Default ; > ;
-        < "8Bit-ｸﾞﾚｰｽｹｰﾙ" ; Default ; > ;
-        < "8Bit-ｶﾗｰﾊﾟﾚｯﾄ" ; Default ; > ;
-        < "24Bit ~True Color" ; Default ; > ;
+        < "1ビッドディザリング" ; Default ; > ;
+        < "4Bit-グレースケール" ; Default ; > ;
+        < "4ビット カラーパレット" ; Default ; > ;
+        < "8Bit-グレースケール" ; Default ; > ;
+        < "8ビット カラーパレット" ; Default ; > ;
+        < "24Bit True Color" ; Default ; > ;
     };
     StringList [ chinese_traditional ] =
     {
@@ -305,13 +306,13 @@ ModalDialog DLG_EXPORT_PIX
     StringList [ korean ] =
     {
             < "원본" ; Default ; > ;
-        < "1 비트- 임계값" ; Default ; > ;
-        < "1비트 - 디더링" ; Default ; > ;
-        < "4 비트 - 회색도팔레트" ; Default ; > ;
-        < "4 비트 - 색상 팔레트" ; Default ; > ;
-        < "8 비트 - 회색도 팔레트" ; Default ; > ;
-        < "8 비트-색상 팔레트" ; Default ; > ;
-        < "24 비트 - 트루 컬러" ; Default ; > ;
+        < "1 비트 임계값" ; Default ; > ;
+        < "1 비트 디더링" ; Default ; > ;
+        < "4 비트 회색조" ; Default ; > ;
+        < "4 비트 색상 팔레트" ; Default ; > ;
+        < "8 비트 회색조" ; Default ; > ;
+        < "8 비트 색상 팔레트" ; Default ; > ;
+        < "24 비트 트루 컬러" ; Default ; > ;
     };
     StringList [ turkish ] =
     {
@@ -338,18 +339,18 @@ ModalDialog DLG_EXPORT_PIX
     StringList [ catalan ] =
     {
             < "Original" ; Default ; > ;
-        < "Valor umbral de 1 bit" ; Default ; > ;
-        < "1 bit - difusionado" ; Default ; > ;
-        < "Paleta de escala de grises 4 bits" ; Default ; > ;
-        < "Paleta de colores de 4 bits" ; Default ; > ;
-        < "Paleta de escala de grises 8 bits" ; Default ; > ;
-        < "Paleta de colores de 8 bits" ; Default ; > ;
-        < "Color real 24 bits" ; Default ; > ;
+        < "1 bit - Valor llindar" ; Default ; > ;
+        < "1 bit - dif�s" ; Default ; > ;
+        < "4 bits - Escala de grisos" ; Default ; > ;
+        < "4 bits - Paleta de colors" ; Default ; > ;
+        < "8 bits - Escala de grisos" ; Default ; > ;
+        < "8 bits - Paleta de colors" ; Default ; > ;
+        < "24 bits - Colors reals" ; Default ; > ;
     };
     StringList [ finnish ] =
     {
             < "Alkuper�inen" ; Default ; > ;
-        < "1-bittinen - Raja-arvo" ; Default ; > ;
+        < "1-bittinen - Kynnysarvo" ; Default ; > ;
         < "1-bittinen - Rasterointi" ; Default ; > ;
         < "4-bittinen - Harmaas�vy" ; Default ; > ;
         < "4-bittinen - V�ripaletti" ; Default ; > ;
@@ -357,6 +358,17 @@ ModalDialog DLG_EXPORT_PIX
         < "8-bittinen - V�ripaletti" ; Default ; > ;
         < "24-bittinen - True Color -v�rit" ; Default ; > ;
     };
+    StringList [ thai ] =
+    {
+         < "ต้นฉบับ" ; Default ; > ;
+        < "1 บิท - ค่าการเริ่มต้น" ; Default ; > ;
+        < "1 บิท - สั่น" ; Default ; > ;
+        < "4 บิท - สเกลสีเทา" ; Default ; > ;
+        < "4 บิท - จานส" ; Default ; > ;
+        < "8 บิท - สเกลสีเทา" ; Default ; > ;
+        < "8 บิท - จานสี" ; Default ; > ;
+        < "24 บิท - สีจริง" ; Default ; > ;
+    };
     };
     CheckBox CBX_RLE
     {
@@ -377,15 +389,16 @@ ModalDialog DLG_EXPORT_PIX
         Text[ chinese_simplified ] = "RLE - 编码";
         Text[ russian ] = "��������� RLE";
         Text[ polish ] = "Kodowanie RLE";
-        Text[ japanese ] = "RLE ｺｰﾃﾞｨﾝｸﾞ";
+        Text[ japanese ] = "RLE コーディング";
         Text[ chinese_traditional ] = "RLE 編碼";
         Text[ arabic ] = "����� RLE";
         Text[ greek ] = "������������ RLE";
         Text[ korean ] = "RLE 코딩";
         Text[ turkish ] = "RLE kodlama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Codificaci�n RLE";
+        Text[ catalan ] = "Codificaci� RLE";
         Text[ finnish ] = "RLE-koodaus";
+        Text[ thai ] = "การเข้ารหัส RLE ";
     };
     FixedLine GRP_MODE_PIX
     {
@@ -405,15 +418,16 @@ ModalDialog DLG_EXPORT_PIX
         Text[ chinese_simplified ] = "模式";
         Text[ russian ] = "�����";
         Text[ polish ] = "Tryb";
-        Text[ japanese ] = "ﾓｰﾄﾞ";
+        Text[ japanese ] = "モード";
         Text[ chinese_traditional ] = "模式";
         Text[ arabic ] = "�����";
         Text[ greek ] = "���������";
         Text[ korean ] = "모드";
         Text[ turkish ] = "Kip";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Modo";
+        Text[ catalan ] = "Mode";
         Text[ finnish ] = "Tila";
+        Text[ thai ] = "โหมด";
     };
     RadioButton RB_ORIGINAL_PIX
     {
@@ -426,15 +440,15 @@ ModalDialog DLG_EXPORT_PIX
         Text [ english_us ] = "~Original" ;
         Text [ italian ] = "~Originale" ;
         Text [ spanish ] = "~Original" ;
-        Text [ french ] = "~Original" ;
+        Text [ french ] = "Original" ;
         Text [ swedish ] = "~Original" ;
         Text [ danish ] = "Original" ;
         Text [ portuguese ] = "~Original" ;
         Text [ portuguese_brazilian ] = "~Original" ;
         Text[ chinese_simplified ] = "原件(~O)";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "�������� �����";
         Text[ polish ] = "Orygina�";
-        Text[ japanese ] = "ｵﾘｼﾞﾅﾙ(~O)";
+        Text[ japanese ] = "オリジナル(~O)";
         Text[ chinese_traditional ] = "原件(~O)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
@@ -443,6 +457,7 @@ ModalDialog DLG_EXPORT_PIX
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Original";
         Text[ finnish ] = "~Alkuper�inen";
+        Text[ thai ] = "~ต้นฉบับ";
     };
     RadioButton RB_RES_PIX
     {
@@ -453,7 +468,7 @@ ModalDialog DLG_EXPORT_PIX
         TabStop = TRUE ;
         Text [ dutch ] = "~Resolutie" ;
         Text [ english_us ] = "~Resolution" ;
-        Text [ italian ] = "~Risoluzione" ;
+        Text [ italian ] = "Risoluzione" ;
         Text [ spanish ] = "~Resoluci�n" ;
         Text [ french ] = "R�solution" ;
         Text [ swedish ] = "~Uppl�sning" ;
@@ -470,8 +485,9 @@ ModalDialog DLG_EXPORT_PIX
         Text[ korean ] = "해상도(~R)";
         Text[ turkish ] = "~��z�n�rl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Resoluci�n";
+        Text[ catalan ] = "~Resoluci�";
         Text[ finnish ] = "~Tarkkuus";
+        Text[ thai ] = "~ความละเอียด";
     };
     ComboBox CBB_RES_PIX
     {
@@ -506,15 +522,16 @@ ModalDialog DLG_EXPORT_PIX
         Text[ chinese_simplified ] = "大小(~S)";
         Text[ russian ] = "������";
         Text[ polish ] = "Rozmiar";
-        Text[ japanese ] = "ｻｲｽﾞ(~S)";
+        Text[ japanese ] = "サイズ(~S)";
         Text[ chinese_traditional ] = "大小(~S)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�������";
         Text[ korean ] = "크기(~S)";
         Text[ turkish ] = "~B�y�kl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Tama�o";
+        Text[ catalan ] = "~Mida";
         Text[ finnish ] = "~Koko";
+        Text[ thai ] = "~ขนาด";
     };
     MetricField MTF_SIZEX_PIX
     {
@@ -558,8 +575,9 @@ ModalDialog DLG_EXPORT_PIX
         Text[ korean ] = "너비";
         Text[ turkish ] = "Geni�lik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ancho";
+        Text[ catalan ] = "Amplada";
         Text[ finnish ] = "Leveys";
+        Text[ thai ] = "ความกว้าง";
     };
     MetricField MTF_SIZEY_PIX
     {
@@ -605,6 +623,7 @@ ModalDialog DLG_EXPORT_PIX
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Altura";
         Text[ finnish ] = "Korkeus";
+        Text[ thai ] = "ความสูง";
     };
     OKButton BTN_OK_PIX
     {
@@ -652,15 +671,16 @@ ModalDialog DLG_EXPORT_VEC
         Text[ chinese_simplified ] = "模式";
         Text[ russian ] = "�����";
         Text[ polish ] = "Tryb";
-        Text[ japanese ] = "ﾓｰﾄﾞ";
+        Text[ japanese ] = "モード";
         Text[ chinese_traditional ] = "模式";
         Text[ arabic ] = "�����";
         Text[ greek ] = "���������";
         Text[ korean ] = "모드";
         Text[ turkish ] = "Kip";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Modo";
+        Text[ catalan ] = "Mode";
         Text[ finnish ] = "Tila";
+        Text[ thai ] = "โหมด";
     };
     RadioButton RB_ORIGINAL_VEC
     {
@@ -673,15 +693,15 @@ ModalDialog DLG_EXPORT_VEC
         Text [ english_us ] = "~Original" ;
         Text [ italian ] = "~Originale" ;
         Text [ spanish ] = "~Original" ;
-        Text [ french ] = "~Original" ;
+        Text [ french ] = "Original" ;
         Text [ swedish ] = "~Original" ;
         Text [ danish ] = "Original" ;
         Text [ portuguese_brazilian ] = "~Original" ;
         Text [ portuguese ] = "~Original" ;
         Text[ chinese_simplified ] = "原件(~O)";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "�������� ������";
         Text[ polish ] = "Orygina�";
-        Text[ japanese ] = "ｵﾘｼﾞﾅﾙ(~O)";
+        Text[ japanese ] = "オリジナル(~O)";
         Text[ chinese_traditional ] = "原件(~O)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
@@ -690,6 +710,7 @@ ModalDialog DLG_EXPORT_VEC
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Original";
         Text[ finnish ] = "~Alkuper�inen";
+        Text[ thai ] = "~ต้นฉบับ";
     };
     RadioButton RB_SIZE_VEC
     {
@@ -710,15 +731,16 @@ ModalDialog DLG_EXPORT_VEC
         Text[ chinese_simplified ] = "大小(~S)";
         Text[ russian ] = "������";
         Text[ polish ] = "Rozmiar";
-        Text[ japanese ] = "ｻｲｽﾞ(~S)";
+        Text[ japanese ] = "サイズ(~S)";
         Text[ chinese_traditional ] = "大小(~S)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�������";
         Text[ korean ] = "크기(~S)";
         Text[ turkish ] = "~B�y�kl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Tama�o";
+        Text[ catalan ] = "~Mida";
         Text[ finnish ] = "~Koko";
+        Text[ thai ] = "~ขนาด";
     };
     FixedLine GRP_SIZE_VEC
     {
@@ -738,15 +760,16 @@ ModalDialog DLG_EXPORT_VEC
         Text[ chinese_simplified ] = "大小";
         Text[ russian ] = "������";
         Text[ polish ] = "Rozmiar";
-        Text[ japanese ] = "ｻｲｽﾞ";
+        Text[ japanese ] = "サイズ";
         Text[ chinese_traditional ] = "大小";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�������";
         Text[ korean ] = "크기";
         Text[ turkish ] = "B�y�kl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Tama�o";
+        Text[ catalan ] = "Mida";
         Text[ finnish ] = "Koko";
+        Text[ thai ] = "ขนาด";
     };
     FixedText FT_SIZEX_VEC
     {
@@ -773,8 +796,9 @@ ModalDialog DLG_EXPORT_VEC
         Text[ korean ] = "너비";
         Text[ turkish ] = "Geni�lik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ancho";
+        Text[ catalan ] = "Amplada";
         Text[ finnish ] = "Leveys";
+        Text[ thai ] = "ความกว้าง";
     };
     MetricField MTF_SIZEX_VEC
     {
@@ -820,6 +844,7 @@ ModalDialog DLG_EXPORT_VEC
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Altura";
         Text[ finnish ] = "Korkeus";
+        Text[ thai ] = "ความสูง";
     };
     MetricField MTF_SIZEY_VEC
     {
@@ -869,3 +894,12 @@ ModalDialog DLG_EXPORT_VEC
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index b01d1527d72b..eb8449a1878e 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filter.cxx,v $
  *
- *  $Revision: 1.44 $
+ *  $Revision: 1.45 $
  *
- *  last change: $Author: sj $ $Date: 2002-07-16 09:26:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -173,7 +173,13 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
-static List* pFilterHdlList = NULL;
+static List*        pFilterHdlList = NULL;
+
+static ::osl::Mutex& getListMutex()
+{
+    static ::osl::Mutex s_aListProtection;
+    return s_aListProtection;
+}
 
 // -------------------------
 // - ImpFilterOutputStream -
@@ -849,11 +855,34 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
     aResMgrName.Append( ByteString::CreateFromInt32( SOLARUPD ) );
     pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILanguage() );
 
+    sal_Int32 nLogicalWidth = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ), 0 );
+    sal_Int32 nLogicalHeight = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ), 0 );
+
     if ( rGraphic.GetType() != GRAPHIC_NONE )
     {
-        sal_Int32   nMode = rConfigItem.ReadInt32( String( ResId( KEY_MODE, pResMgr ) ), 0 );
+        sal_Int32 nMode = rConfigItem.ReadInt32( String( ResId( KEY_MODE, pResMgr ) ), -1 );
+        if ( nMode == -1 )  // the property is not there, this is possible, if the graphic filter
+        {                   // is called via UnoGraphicExporter and not from a graphic export Dialog
+            nMode = 0;      // then we are defaulting this mode to 0
+            if ( nLogicalWidth || nLogicalHeight )
+                nMode = 2;
+        }
+
+
+        Size aOriginalSize;
+        Size aPrefSize( rGraphic.GetPrefSize() );
+        MapMode aPrefMapMode( rGraphic.GetPrefMapMode() );
+        if ( aPrefMapMode == MAP_PIXEL )
+            aOriginalSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MAP_100TH_MM );
+        else
+            aOriginalSize = Application::GetDefaultDevice()->LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM );
+        if ( !nLogicalWidth )
+            nLogicalWidth = aOriginalSize.Width();
+        if ( !nLogicalHeight )
+            nLogicalHeight = aOriginalSize.Height();
         if( rGraphic.GetType() == GRAPHIC_BITMAP )
         {
+
             // Aufl�sung wird eingestellt
             if( nMode == 1 )
             {
@@ -877,11 +906,8 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
             else if( nMode == 2 )
             {
                 Bitmap  aBitmap( rGraphic.GetBitmap() );
-
-                ::com::sun::star::awt::Size aDefaultSize( 10000, 10000 );
-                ::com::sun::star::awt::Size aSize = rConfigItem.ReadSize( String( ResId( KEY_SIZE, pResMgr ) ), aDefaultSize );
                 aBitmap.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
-                aBitmap.SetPrefSize( Size( aSize.Width, aSize.Height ) );
+                aBitmap.SetPrefSize( Size( nLogicalWidth, nLogicalHeight ) );
                 aGraphic = Graphic( aBitmap );
             }
             else
@@ -901,8 +927,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
             {
                 GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() );
                 ::com::sun::star::awt::Size aDefaultSize( 10000, 10000 );
-                ::com::sun::star::awt::Size aSize = rConfigItem.ReadSize( String( ResId( KEY_SIZE, pResMgr ) ), aDefaultSize );
-                Size aNewSize( OutputDevice::LogicToLogic( Size( aSize.Width, aSize.Height ), MAP_100TH_MM, aMtf.GetPrefMapMode() ) );
+                Size aNewSize( OutputDevice::LogicToLogic( Size( nLogicalWidth, nLogicalHeight ), MAP_100TH_MM, aMtf.GetPrefMapMode() ) );
 
                 if( aNewSize.Width() && aNewSize.Height() )
                 {
@@ -915,7 +940,8 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
             else
                 aGraphic = rGraphic;
         }
-       }
+
+    }
     else
         aGraphic = rGraphic;
 
@@ -1082,12 +1108,14 @@ GraphicFilter::GraphicFilter( sal_Bool bConfig ) :
 
 GraphicFilter::~GraphicFilter()
 {
-
-    pFilterHdlList->Remove( (void*)this );
-    if ( !pFilterHdlList->Count() )
     {
-        delete pFilterHdlList, pFilterHdlList = NULL;
-        delete pConfig;
+        ::osl::MutexGuard aGuard( getListMutex() );
+        pFilterHdlList->Remove( (void*)this );
+        if ( !pFilterHdlList->Count() )
+        {
+            delete pFilterHdlList, pFilterHdlList = NULL;
+            delete pConfig;
+        }
     }
 
 
@@ -1098,16 +1126,19 @@ GraphicFilter::~GraphicFilter()
 
 void GraphicFilter::ImplInit()
 {
-    if ( !pFilterHdlList )
     {
-        pFilterHdlList = new List;
-        pConfig = new FilterConfigCache( bUseConfig );
-    }
-    else
-        pConfig = ((GraphicFilter*)pFilterHdlList->First())->pConfig;
+        ::osl::MutexGuard aGuard( getListMutex() );
 
-    pFilterHdlList->Insert( (void*)this );
+        if ( !pFilterHdlList )
+        {
+            pFilterHdlList = new List;
+            pConfig = new FilterConfigCache( bUseConfig );
+        }
+        else
+            pConfig = ((GraphicFilter*)pFilterHdlList->First())->pConfig;
 
+        pFilterHdlList->Insert( (void*)this );
+    }
 
     if( bUseConfig )
     {
@@ -1453,6 +1484,11 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
             if( rGraphic.GetContext() == (GraphicReader*) 1 )
                 rGraphic.SetContext( NULL );
 
+            // set LOGSIZE flag always, if not explicitly disabled
+            // (see #90508 and #106763)
+            if( 0 == ( nImportFlags & GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG ) )
+                nImportFlags |= GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG;
+
             if( !ImportJPEG( rIStream, rGraphic, NULL, nImportFlags ) )
                 nStatus = GRFILTER_FILTERERROR;
             else
diff --git a/svtools/source/filter.vcl/filter/fldll.cxx b/svtools/source/filter.vcl/filter/fldll.cxx
new file mode 100644
index 000000000000..59ea5f2b06ee
--- /dev/null
+++ b/svtools/source/filter.vcl/filter/fldll.cxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ *  $RCSfile: fldll.cxx,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:28 $
+ *
+ *  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): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifdef WIN
+
+#ifndef _SVWIN_H
+#include <svwin.h>
+#endif
+
+// Statische DLL-Verwaltungs-Variablen
+static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
+
+
+/***************************************************************************
+|*
+|*    LibMain()
+|*
+|*    Beschreibung       Initialisierungsfunktion der DLL
+|*    Ersterstellung     TH 05.05.93
+|*    Letzte Aenderung   TH 05.05.93
+|*
+***************************************************************************/
+
+extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
+{
+#ifndef WNT
+    if ( nHeap )
+        UnlockData( 0 );
+#endif
+
+    hDLLInst = hDLL;
+
+    return TRUE;
+}
+
+/***************************************************************************
+|*
+|*    WEP()
+|*
+|*    Beschreibung      DLL-Deinitialisierung
+|*    Ersterstellung     TH 05.05.93
+|*    Letzte Aenderung   TH 05.05.93
+|*
+***************************************************************************/
+
+extern "C" int CALLBACK WEP( int )
+{
+    return 1;
+}
+
+#endif
+
diff --git a/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx
new file mode 100644
index 000000000000..b1fda7d2c627
--- /dev/null
+++ b/svtools/source/filter.vcl/filter/gradwrap.cxx
@@ -0,0 +1,607 @@
+/*************************************************************************
+ *
+ *  $RCSfile: gradwrap.cxx,v $
+ *
+ *  $Revision: 1.4 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:28 $
+ *
+ *  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 <math.h>
+#include <svgrad.hxx>
+#include <svbmpacc.hxx>
+#include <gradwrap.hxx>
+
+// -------------------
+// - GradientWrapper -
+// -------------------
+
+GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl,
+                                 const Link& rDrawPolyPolyRecordHdl,
+                                 const Link& rSetFillInBrushRecordHdl) :
+            aDrawPolyRecordHdl      (rDrawPolyRecordHdl),
+            aDrawPolyPolyRecordHdl  (rDrawPolyPolyRecordHdl),
+            aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl)
+{
+}
+
+// ------------------------------------------------------------------------
+
+GradientWrapper::~GradientWrapper()
+{
+}
+
+// ------------------------------------------------------------------------
+
+void GradientWrapper::WriteLinearGradient(const Rectangle& rRect,
+                                          const Gradient& rGradient)
+{
+    USHORT nStepCount = 100;
+
+    Rectangle aRect = rRect;
+    aRect.Left()--;
+    aRect.Top()--;
+    aRect.Right()++;
+    aRect.Bottom()++;
+
+    // rotiertes BoundRect ausrechnen
+    double  fAngle  = (rGradient.GetAngle() % 3600) * F_PI1800;
+    double  fWidth  = aRect.GetWidth();
+    double  fHeight = aRect.GetHeight();
+    double  fDX     = fWidth  * fabs( cos( fAngle ) ) +
+                      fHeight * fabs( sin( fAngle ) );
+    double  fDY     = fHeight * fabs( cos( fAngle ) ) +
+                      fWidth  * fabs( sin( fAngle ) );
+            fDX = (fDX - fWidth)  * 0.5 + 0.5;
+            fDY = (fDY - fHeight) * 0.5 + 0.5;
+    aRect.Left()   -= (long)fDX;
+    aRect.Right()  += (long)fDX;
+    aRect.Top()    -= (long)fDY;
+    aRect.Bottom() += (long)fDY;
+
+    // Rand berechnen und Rechteck neu setzen
+    Point       aCenter = rRect.Center();
+    Rectangle   aFullRect = aRect;
+    long        nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100;
+    BOOL        bLinear;
+
+    // Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf
+    if ( rGradient.GetStyle() == GRADIENT_LINEAR )
+    {
+        bLinear = TRUE;
+        aRect.Top() += nBorder;
+    }
+    // Rand berechnen und Rechteck neu setzen fuer axiale Farbverlauf
+    else
+    {
+        bLinear = FALSE;
+        nBorder >>= 1;
+
+        aRect.Top()    += nBorder;
+        aRect.Bottom() -= nBorder;
+    }
+
+    // Top darf nicht groesser als Bottom sein
+    aRect.Top() = Min( aRect.Top(), (long)(aRect.Bottom() - 1) );
+
+    long nMinRect = aRect.GetHeight();
+
+    // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
+    if ( !nStepCount )
+    {
+        long nInc = ((nMinRect >> 9) + 1) << 3;
+
+        if ( !nInc )
+            nInc = 1;
+
+        nStepCount = (USHORT)(nMinRect / nInc);
+    }
+    // minimal drei Schritte
+    long nSteps = Max( nStepCount, (USHORT)3 );
+
+    // Falls axialer Farbverlauf, muss die Schrittanzahl ungerade sein
+    if ( !bLinear && !(nSteps & 1) )
+        nSteps++;
+
+    // Berechnung ueber Double-Addition wegen Genauigkeit
+    double fScanLine = aRect.Top();
+    double fScanInc  = (double)aRect.GetHeight() / (double)nSteps;
+
+    // Intensitaeten von Start- und Endfarbe ggf. aendern und
+    // Farbschrittweiten berechnen
+    long            nFactor;
+    const Color&    rStartCol   = rGradient.GetStartColor();
+    const Color&    rEndCol     = rGradient.GetEndColor();
+    long            nRed        = rStartCol.GetRed();
+    long            nGreen      = rStartCol.GetGreen();
+    long            nBlue       = rStartCol.GetBlue();
+    long            nEndRed     = rEndCol.GetRed();
+    long            nEndGreen   = rEndCol.GetGreen();
+    long            nEndBlue    = rEndCol.GetBlue();
+    nFactor                     = rGradient.GetStartIntensity();
+    nRed                        = (nRed   * nFactor) / 100;
+    nGreen                      = (nGreen * nFactor) / 100;
+    nBlue                       = (nBlue  * nFactor) / 100;
+    nFactor                     = rGradient.GetEndIntensity();
+    nEndRed                     = (nEndRed   * nFactor) / 100;
+    nEndGreen                   = (nEndGreen * nFactor) / 100;
+    nEndBlue                    = (nEndBlue  * nFactor) / 100;
+    long            nStepRed    = (nEndRed   - nRed)   / nSteps;
+    long            nStepGreen  = (nEndGreen - nGreen) / nSteps;
+    long            nStepBlue   = (nEndBlue  - nBlue)  / nSteps;
+    long            nSteps2;
+
+    if ( bLinear )
+    {
+        // Um 1 erhoeht, um die Border innerhalb der Schleife
+        // zeichnen zu koennen
+        nSteps2 = nSteps + 1;
+    }
+    else
+    {
+        nStepRed   <<= 1;
+        nStepGreen <<= 1;
+        nStepBlue  <<= 1;
+        nRed   = nEndRed;
+        nGreen = nEndGreen;
+        nBlue  = nEndBlue;
+
+        // Um 2 erhoeht, um die Border innerhalb der Schleife
+        // zeichnen zu koennen
+        nSteps2 = nSteps + 2;
+    }
+    Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
+
+    // GDI-Objekte sichern und setzen
+    Brush aBrush( aCol );
+    aSetFillInBrushRecordHdl.Call(&aBrush);
+
+    // Startpolygon erzeugen (== Borderpolygon)
+    Polygon     aPoly( 4 );
+    Polygon     aTempPoly( 2 );
+    aPoly[0] = aFullRect.TopLeft();
+    aPoly[1] = aFullRect.TopRight();
+    aPoly[2] = aRect.TopRight();
+    aPoly[3] = aRect.TopLeft();
+    aPoly.Rotate( aCenter, rGradient.GetAngle() );
+
+    // Schleife, um rotierten Verlauf zu fuellen
+    for ( long i = 0; i < nSteps2; i++ )
+    {
+        Polygon aTempPoly = aPoly;
+        aTempPoly.Clip( rRect );
+        aDrawPolyRecordHdl.Call(&aTempPoly);
+        aTempPoly.SetSize( 2 );
+
+        // neues Polygon berechnen
+        aRect.Top() = (long)(fScanLine += fScanInc);
+
+        // unteren Rand komplett fuellen
+        if ( i == nSteps )
+        {
+            aTempPoly[0] = aFullRect.BottomLeft();
+            aTempPoly[1] = aFullRect.BottomRight();
+        }
+        else
+        {
+            aTempPoly[0] = aRect.TopLeft();
+            aTempPoly[1] = aRect.TopRight();
+        }
+        aTempPoly.Rotate( aCenter, rGradient.GetAngle() );
+
+        aPoly[0] = aPoly[3];
+        aPoly[1] = aPoly[2];
+        aPoly[2] = aTempPoly[1];
+        aPoly[3] = aTempPoly[0];
+
+        // Farbintensitaeten aendern...
+        // fuer lineare FV
+        if ( bLinear )
+        {
+            nRed   += nStepRed;
+            nGreen += nStepGreen;
+            nBlue  += nStepBlue;
+        }
+        // fuer radiale FV
+        else
+        {
+            if ( i <= (nSteps >> 1) )
+            {
+                nRed   -= nStepRed;
+                nGreen -= nStepGreen;
+                nBlue  -= nStepBlue;
+            }
+            // genau die Mitte und hoeher
+            else
+            {
+                nRed   += nStepRed;
+                nGreen += nStepGreen;
+                nBlue  += nStepBlue;
+            }
+        }
+
+        nRed    = MinMax( nRed,   0, 255 );
+        nGreen  = MinMax( nGreen, 0, 255 );
+        nBlue   = MinMax( nBlue,  0, 255 );
+
+        // fuer lineare FV ganz normale Bestimmung der Farbe
+        if ( bLinear || (i <= nSteps) )
+        {
+            aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
+        }
+        // fuer axiale FV muss die letzte Farbe der ersten
+        // Farbe entsprechen
+        else
+        {
+            aCol = Color( (BYTE) nEndRed, (BYTE) nEndGreen, (BYTE) nEndBlue );
+        }
+
+        aBrush.SetColor(aCol);
+        aSetFillInBrushRecordHdl.Call(&aBrush);
+    }
+}
+
+// ------------------------------------------------------------------------
+
+void GradientWrapper::WriteRadialGradient(const Rectangle& rRect,
+                                          const Gradient& rGradient)
+{
+    USHORT      nStepCount = 100;
+    Rectangle   aClipRect = rRect;
+    Rectangle   aRect   = rRect;
+    long        nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100;
+    long        nZHeight= aRect.GetHeight() * (long)rGradient.GetOfsY() / 100;
+    Size        aSize   = aRect.GetSize();
+    Point       aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
+
+    // Radien-Berechnung fuer Kreisausgabe (Kreis schliesst Rechteck ein)
+    if ( rGradient.GetStyle() == GRADIENT_RADIAL )
+    {
+        aSize.Width()   = (long)(0.5 + sqrt((double)aSize.Width()*(double)aSize.Width() +
+                                            (double)aSize.Height()*(double)aSize.Height()));
+        aSize.Height()  = aSize.Width();
+    }
+    // Radien-Berechnung fuer Ellipse
+    else
+    {
+        aSize.Width()   = (long)(0.5 + (double)aSize.Width()  * 1.4142);
+        aSize.Height()  = (long)(0.5 + (double)aSize.Height() * 1.4142);
+    }
+
+    long nBorderX   = (long)rGradient.GetBorder() * aSize.Width()  / 100;
+    long nBorderY   = (long)rGradient.GetBorder() * aSize.Height() / 100;
+    aSize.Width()  -= nBorderX;
+    aSize.Height() -= nBorderY;
+    aRect.Left()    = aCenter.X() - (aSize.Width()  >> 1);
+    aRect.Top()     = aCenter.Y() - (aSize.Height() >> 1);
+    aRect.SetSize( aSize );
+
+    long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() );
+
+    // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
+    if ( !nStepCount )
+    {
+        long nInc = ((nMinRect >> 9) + 1) << 3;
+
+        if ( !nInc )
+            nInc = 1;
+
+        nStepCount = (USHORT)(nMinRect / nInc);
+    }
+    // minimal drei Schritte
+    long nSteps = Max( nStepCount, (USHORT)3 );
+
+    // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen
+    double fScanLeft   = aRect.Left();
+    double fScanTop    = aRect.Top();
+    double fScanRight  = aRect.Right();
+    double fScanBottom = aRect.Bottom();
+    double fScanInc    = (double)nMinRect / (double)nSteps * 0.5;
+
+    // Intensitaeten von Start- und Endfarbe ggf. aendern und
+    // Farbschrittweiten berechnen
+    long            nFactor;
+    const Color&    rStartCol   = rGradient.GetStartColor();
+    const Color&    rEndCol     = rGradient.GetEndColor();
+    long            nRed        = rStartCol.GetRed();
+    long            nGreen      = rStartCol.GetGreen();
+    long            nBlue       = rStartCol.GetBlue();
+    long            nEndRed     = rEndCol.GetRed();
+    long            nEndGreen   = rEndCol.GetGreen();
+    long            nEndBlue    = rEndCol.GetBlue();
+    nFactor                     = rGradient.GetStartIntensity();
+    nRed                        = (nRed   * nFactor) / 100;
+    nGreen                      = (nGreen * nFactor) / 100;
+    nBlue                       = (nBlue  * nFactor) / 100;
+    nFactor                     = rGradient.GetEndIntensity();
+    nEndRed                     = (nEndRed   * nFactor) / 100;
+    nEndGreen                   = (nEndGreen * nFactor) / 100;
+    nEndBlue                    = (nEndBlue  * nFactor) / 100;
+    long            nStepRed    = (nEndRed   - nRed)   / nSteps;
+    long            nStepGreen  = (nEndGreen - nGreen) / nSteps;
+    long            nStepBlue   = (nEndBlue  - nBlue)  / nSteps;
+    Color           aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
+
+    // GDI-Objekte sichern und setzen
+    Brush aBrush( aCol );
+    aSetFillInBrushRecordHdl.Call(&aBrush);
+
+    // Recteck erstmal ausgeben
+    PolyPolygon aPolyPoly( 2 );
+    Polygon     aPoly( rRect );
+
+    aPolyPoly.Insert( aPoly );
+    aPoly = Polygon( aRect );
+    aPoly.Rotate( aCenter, rGradient.GetAngle() );
+    aPolyPoly.Insert( aPoly );
+
+    // erstes Polygon zeichnen (entspricht Rechteck)
+    PolyPolygon aTempPolyPoly = aPolyPoly;
+    aTempPolyPoly.Clip( aClipRect );
+    aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
+
+    for ( long i = 0; i < nSteps; i++ )
+    {
+        Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
+        aBrush.SetColor( aCol );
+        aSetFillInBrushRecordHdl.Call(&aBrush);
+
+        // neues Polygon berechnen
+        aRect.Left()    = (long)(fScanLeft   += fScanInc);
+        aRect.Top()     = (long)(fScanTop    += fScanInc);
+        aRect.Right()   = (long)(fScanRight  -= fScanInc);
+        aRect.Bottom()  = (long)(fScanBottom -= fScanInc);
+
+        if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) )
+            break;
+
+        aPoly = Polygon( aRect.Center(),
+                         aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 );
+        aPoly.Rotate( aCenter, rGradient.GetAngle() );
+
+        aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 );
+        aPolyPoly.Replace( aPoly, 1 );
+
+        PolyPolygon aTempPolyPoly = aPolyPoly;
+        aTempPolyPoly.Clip( aClipRect );
+        aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
+
+        // Farbe entsprechend anpassen
+        nRed   += nStepRed;
+        nGreen += nStepGreen;
+        nBlue  += nStepBlue;
+
+        nRed    = MinMax( nRed,   0, 0xFF );
+        nGreen  = MinMax( nGreen, 0, 0xFF );
+        nBlue   = MinMax( nBlue,  0, 0xFF );
+    }
+
+    // Falls PolyPolygon-Ausgabe, muessen wir noch ein letztes
+    // inneres Polygon zeichnen
+    aBrush.SetColor( Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ) );
+    aSetFillInBrushRecordHdl.Call(&aBrush);
+
+    aPoly = aPolyPoly.GetObject( 1 );
+    if ( !aPoly.GetBoundRect().IsEmpty() )
+    {
+        aPoly.Clip( aClipRect );
+        aDrawPolyRecordHdl.Call(&aPoly);
+    }
+}
+
+// ------------------------------------------------------------------------
+
+void GradientWrapper::WriteRectGradient(const Rectangle& rRect,
+                                        const Gradient& rGradient)
+{
+    USHORT      nStepCount = 100;
+    Rectangle   aClipRect = rRect;
+    Rectangle   aRect = rRect;
+
+    aRect.Left()--;
+    aRect.Top()--;
+    aRect.Right()++;
+    aRect.Bottom()++;
+
+    // rotiertes BoundRect ausrechnen
+    double  fAngle  = (rGradient.GetAngle() % 3600) * F_PI1800;
+    double  fWidth  = aRect.GetWidth();
+    double  fHeight = aRect.GetHeight();
+    double  fDX     = fWidth  * fabs( cos( fAngle ) ) +
+                      fHeight * fabs( sin( fAngle ) );
+    double  fDY     = fHeight * fabs( cos( fAngle ) ) +
+                      fWidth  * fabs( sin( fAngle ) );
+            fDX = (fDX - fWidth)  * 0.5 + 0.5;
+            fDY = (fDY - fHeight) * 0.5 + 0.5;
+    aRect.Left()   -= (long)fDX;
+    aRect.Right()  += (long)fDX;
+    aRect.Top()    -= (long)fDY;
+    aRect.Bottom() += (long)fDY;
+
+    // Quadratisch machen, wenn angefordert;
+    Size aSize = aRect.GetSize();
+    if ( rGradient.GetStyle() == GRADIENT_SQUARE )
+    {
+        if ( aSize.Width() > aSize.Height() )
+            aSize.Height() = aSize.Width();
+        else
+            aSize.Width() = aSize.Height();
+    }
+
+    // neue Mittelpunkte berechnen
+    long    nZWidth     = aRect.GetWidth()  * (long)rGradient.GetOfsX() / 100;
+    long    nZHeight    = aRect.GetHeight() * (long)rGradient.GetOfsY() / 100;
+    long    nBorderX    = (long)rGradient.GetBorder() * aSize.Width()  / 100;
+    long    nBorderY    = (long)rGradient.GetBorder() * aSize.Height() / 100;
+    Point   aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
+
+    // Rand beruecksichtigen
+    aSize.Width()   -= nBorderX;
+    aSize.Height()  -= nBorderY;
+
+    // Ausgaberechteck neu setzen
+    aRect.Left() = aCenter.X() - (aSize.Width() >> 1);
+    aRect.Top()  = aCenter.Y() - (aSize.Height() >> 1);
+    aRect.SetSize( aSize );
+
+    long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() );
+
+    // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
+    if ( !nStepCount )
+    {
+        long nInc = ((nMinRect >> 9) + 1) << 3;
+
+        if ( !nInc )
+            nInc = 1;
+
+        nStepCount = (USHORT)(nMinRect / nInc);
+    }
+    // minimal drei Schritte
+    long nSteps = Max( nStepCount, (USHORT)3 );
+
+    // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen
+    double fScanLeft   = aRect.Left();
+    double fScanTop    = aRect.Top();
+    double fScanRight  = aRect.Right();
+    double fScanBottom = aRect.Bottom();
+    double fScanInc    = (double)nMinRect / (double)nSteps * 0.5;
+
+    // Intensitaeten von Start- und Endfarbe ggf. aendern und
+    // Farbschrittweiten berechnen
+    long            nFactor;
+    const Color&    rStartCol   = rGradient.GetStartColor();
+    const Color&    rEndCol     = rGradient.GetEndColor();
+    long            nRed        = rStartCol.GetRed();
+    long            nGreen      = rStartCol.GetGreen();
+    long            nBlue       = rStartCol.GetBlue();
+    long            nEndRed     = rEndCol.GetRed();
+    long            nEndGreen   = rEndCol.GetGreen();
+    long            nEndBlue    = rEndCol.GetBlue();
+    nFactor                     = rGradient.GetStartIntensity();
+    nRed                        = (nRed   * nFactor) / 100;
+    nGreen                      = (nGreen * nFactor) / 100;
+    nBlue                       = (nBlue  * nFactor) / 100;
+    nFactor                     = rGradient.GetEndIntensity();
+    nEndRed                     = (nEndRed   * nFactor) / 100;
+    nEndGreen                   = (nEndGreen * nFactor) / 100;
+    nEndBlue                    = (nEndBlue  * nFactor) / 100;
+    long            nStepRed    = (nEndRed   - nRed)   / nSteps;
+    long            nStepGreen  = (nEndGreen - nGreen) / nSteps;
+    long            nStepBlue   = (nEndBlue  - nBlue)  / nSteps;
+    Color           aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
+
+    // GDI-Objekte sichern und setzen
+    Brush aBrush( aCol );
+    aSetFillInBrushRecordHdl.Call(&aBrush);
+
+    // Recteck erstmal ausgeben
+    PolyPolygon aPolyPoly( 2 );
+    Polygon     aPoly( rRect );
+
+    aPolyPoly.Insert( aPoly );
+    aPoly = Polygon( aRect );
+    aPoly.Rotate( aCenter, rGradient.GetAngle() );
+    aPolyPoly.Insert( aPoly );
+
+    PolyPolygon aTempPolyPoly = aPolyPoly;
+    aTempPolyPoly.Clip( aClipRect );
+    aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
+
+    // Schleife, um nacheinander die Polygone/PolyPolygone auszugeben
+    for ( long i = 0; i < nSteps; i++ )
+    {
+        Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
+        aBrush.SetColor( aCol );
+        aSetFillInBrushRecordHdl.Call(&aBrush);
+
+        // neues Polygon berechnen
+        aRect.Left()    = (long)(fScanLeft  += fScanInc);
+        aRect.Top()     = (long)(fScanTop   += fScanInc);
+        aRect.Right()   = (long)(fScanRight -= fScanInc);
+        aRect.Bottom()  = (long)(fScanBottom-= fScanInc);
+
+        if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) )
+            break;
+
+        aPoly = Polygon( aRect );
+        aPoly.Rotate( aCenter, rGradient.GetAngle() );
+
+        aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 );
+        aPolyPoly.Replace( aPoly, 1 );
+
+        PolyPolygon aTempPolyPoly = aPolyPoly;
+        aTempPolyPoly.Clip( aClipRect );
+        aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
+
+        // Farben aendern
+        nRed   += nStepRed;
+        nGreen += nStepGreen;
+        nBlue  += nStepBlue;
+
+        nRed    = MinMax( nRed,   0, 0xFF );
+        nGreen  = MinMax( nGreen, 0, 0xFF );
+        nBlue   = MinMax( nBlue,  0, 0xFF );
+    }
+
+    aBrush.SetColor( Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ) );
+    aSetFillInBrushRecordHdl.Call(&aBrush);
+
+    aPoly = aPolyPoly.GetObject( 1 );
+    if ( !aPoly.GetBoundRect().IsEmpty() )
+    {
+        aPoly.Clip( aClipRect );
+        aDrawPolyRecordHdl.Call(&aPoly);
+    }
+}
diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx
index 1b4d9235384c..9e8d9a5820fc 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter.vcl/filter/sgvspln.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sgvspln.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ka $ $Date: 2002-05-29 13:01:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,9 +92,7 @@ extern "C" {
 
 /*-----------------------  FILE u_const.h  ---------------------------*/
 
-#ifndef S390
 #define IEEE
-#endif
 
 /* IEEE - Norm fuer die Darstellung von Gleitkommazahlen:
 
@@ -133,12 +131,10 @@ extern "C" {
 
 #else               /*------------------ sonst -----------------------*/
 
-#ifndef S390
 double exp  (double);
 double atan (double);
 double pow  (double,double);
 double sqrt (double);
-#endif
 
 double masch()            /* MACH_EPS maschinenunabhaengig bestimmen  */
 {
@@ -167,14 +163,8 @@ short basis()             /* BASIS maschinenunabhaengig bestimmen     */
    gepasst werden.
    */
 
-#ifndef S390
 #define MAXEXPON  1023.0                   /* groesster Exponent      */
 #define MINEXPON -1024.0                   /* kleinster Exponent      */
-#else
-#include <float.h>
-#define MAXEXPON  75.0
-#define MINEXPON  -79.0
-#endif
 
 
 #define MACH_EPS  masch()
diff --git a/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src
index c21815dc61f0..d36d9bb99cca 100644
--- a/svtools/source/filter.vcl/filter/strings.src
+++ b/svtools/source/filter.vcl/filter/strings.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: strings.src,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: obo $ $Date: 2001-11-16 22:08:19 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,24 +68,25 @@ String EXPORT_DIALOG_TITLE
     Text [ english_us ] = " Options" ;
     Text [ italian ] = " Opzioni" ;
     Text [ spanish ] = "  Opciones" ;
-    Text [ french ] = "[_]Options" ;
-    Text [ dutch ] = "  Opties" ;
-    Text [ swedish ] = "  Alternativ" ;
+    Text [ french ] = " Options" ;
+    Text [ dutch ] = "Opties" ;
+    Text [ swedish ] = " -alternativ" ;
     Text [ danish ] = " Alternativer" ;
     Text [ portuguese_brazilian ] = " Optionen" ;
     Text [ portuguese ] = " Op��es" ;
     Text[ chinese_simplified ] = " 选项";
     Text[ russian ] = "  ���������";
     Text[ polish ] = " Opcje";
-    Text[ japanese ] = " ｵﾌﾟｼｮﾝ";
+    Text[ japanese ] = " オプション";
     Text[ chinese_traditional ] = " 選項";
     Text[ arabic ] = " ��������";
     Text[ greek ] = " ��������";
     Text[ korean ] = " 옵션";
     Text[ turkish ] = " Se�enekler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "  Opciones";
+    Text[ catalan ] = "Opcions";
     Text[ finnish ] = " Asetukset";
+    Text[ thai ] = " ตัวเลือก";
 };
 
 String KEY_MODE
@@ -120,3 +121,7 @@ String KEY_RLE_CODING
 
 
 
+
+
+
+
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index dea4af24183c..be3e2f541bfb 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: enhwmf.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: sj $ $Date: 2002-10-15 16:56:47 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -426,10 +426,25 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta
             case EMR_SETWINDOWORGEX :
             {
                 *pWMF >> nX32 >> nY32;
+                nX32 += FRound( ( (double) rclFrame.Left() * nPixX ) / ( nMillX * 100.0 ) );
+                nY32 += FRound( ( (double) rclFrame.Top() * nPixY ) / ( nMillY * 100.0 ) );
                 pOut->SetWinOrg( Point( nX32, nY32 ) );
             }
             break;
 
+            case EMR_SCALEWINDOWEXTEX :
+            {
+                *pWMF >> nNom1 >> nDen1 >> nNom2 >> nDen2;
+                pOut->ScaleWinExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
+            }
+            break;
+
+            case EMR_SETVIEWPORTORGEX :
+            {
+                *pWMF >> nX32 >> nY32;
+            }
+            break;
+
             case EMR_SCALEVIEWPORTEXTEX :
             {
                 *pWMF >> nNom1 >> nDen1 >> nNom2 >> nDen2;
@@ -437,10 +452,9 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta
             }
             break;
 
-            case EMR_SCALEWINDOWEXTEX :
+            case EMR_SETVIEWPORTEXTEX :
             {
-                *pWMF >> nNom1 >> nDen1 >> nNom2 >> nDen2;
-                pOut->ScaleWinExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
+                *pWMF >> nX32 >> nY32;
             }
             break;
 
@@ -960,6 +974,7 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta
             {
                 sal_Int32   nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale;
                 sal_uInt32  nCurPos, nLen, nOffString, nOptions, offDx;
+                sal_Int32*  pDX = NULL;
 
                 nCurPos = pWMF->Tell() - 8;
 
@@ -972,13 +987,21 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta
                 Point aPos( ptlReferenceX, ptlReferenceY );
                 if ( nLen )
                 {
+                    if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= nNextPos ) )
+                    {
+                        pWMF->Seek( nCurPos + offDx );
+                        pDX = new sal_Int32[ nLen ];
+                        sal_uInt32 i;
+                        for ( i = 0; i < nLen; i++ )
+                            *pWMF >> pDX[ i ];
+                    }
                     pWMF->Seek( nCurPos + nOffString );
+                    String aText;
                     if ( bFlag )
                     {
                         sal_Char* pBuf = new sal_Char[ nLen ];
                         pWMF->Read( pBuf, nLen );
-                        String aText( pBuf, (sal_uInt16)nLen, pOut->GetCharSet() );
-                        pOut->DrawText( aPos, aText, NULL, bRecordPath, nGfxMode );
+                        aText = String( pBuf, (sal_uInt16)nLen, pOut->GetCharSet() );
                         delete[] pBuf;
                     }
                     else
@@ -994,11 +1017,12 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta
                             *pTmp = nTmp;
                         }
 #endif
-                        String aText( pBuf, (xub_StrLen)nLen );
-                        pOut->DrawText( aPos, aText, NULL, bRecordPath, nGfxMode );
+                        aText = String( pBuf, (xub_StrLen)nLen );
                         delete[] pBuf;
                     }
+                    pOut->DrawText( aPos, aText, pDX, bRecordPath, nGfxMode );
                 }
+                delete[] pDX;
             }
             break;
 
@@ -1197,8 +1221,6 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta
             case EMR_SETTEXTJUSTIFICATION :     WinMtfAssertHandler( "SetTextJustification", 0 );   break;
 
             case EMR_GDICOMMENT :
-            case EMR_SETVIEWPORTEXTEX :
-            case EMR_SETVIEWPORTORGEX :
             case EMR_HEADER :               // has already been read at ReadHeader()
             break;
 #endif
@@ -1218,10 +1240,8 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta
 
 BOOL EnhWMFReader::ReadHeader()
 {
-    Rectangle   aPlaceableBound;
     UINT32      nUINT32, nHeaderSize, nPalEntries;
     INT32       nLeft, nTop, nRight, nBottom;
-    INT32       nPixX, nPixY, nMillX, nMillY;
 
     // METAFILEHEADER SPARE ICH MIR HIER
     // Einlesen des METAHEADER
@@ -1234,10 +1254,10 @@ BOOL EnhWMFReader::ReadHeader()
 
     // picture frame size
     *pWMF >> nLeft >> nTop >> nRight >> nBottom;
-    aPlaceableBound.Left() = nLeft;
-    aPlaceableBound.Top() = nTop;
-    aPlaceableBound.Right() = nRight;
-    aPlaceableBound.Bottom() = nBottom;
+    rclFrame.Left() = nLeft;
+    rclFrame.Top() = nTop;
+    rclFrame.Right() = nRight;
+    rclFrame.Bottom() = nBottom;
 
     *pWMF >> nUINT32;                                   // signature
 
@@ -1255,11 +1275,11 @@ BOOL EnhWMFReader::ReadHeader()
     pWMF->SeekRel( 0xc );
     *pWMF >> nPalEntries >> nPixX >> nPixY >> nMillX >> nMillY;
 
-    pOut->SetDevExt( aPlaceableBound.GetSize() );
-    pOut->SetWinOrg( Point( FRound( ( (double) aPlaceableBound.Left() * nPixX ) / ( nMillX * 100.0 ) ),
-                                FRound( ( (double) aPlaceableBound.Top() * nPixY ) / ( nMillY * 100.0 ) ) ) );
-    Size aRefSize( FRound( ( (double)aPlaceableBound.GetWidth() * nPixX ) / ( nMillX * 100.0 ) ),
-                            FRound( ( (double) aPlaceableBound.GetHeight() * nPixY ) / ( nMillY * 100.0 ) ) );
+    pOut->SetDevExt( rclFrame.GetSize() );
+    pOut->SetWinOrg( Point( FRound( ( (double) rclFrame.Left() * nPixX ) / ( nMillX * 100.0 ) ),
+                                FRound( ( (double) rclFrame.Top() * nPixY ) / ( nMillY * 100.0 ) ) ) );
+    Size aRefSize( FRound( ( (double)rclFrame.GetWidth() * nPixX ) / ( nMillX * 100.0 ) ),
+                            FRound( ( (double) rclFrame.GetHeight() * nPixY ) / ( nMillY * 100.0 ) ) );
     // set the ReferenceDevice which is necessary for mapmode MM_TEXT
     pOut->SetRefExt( aRefSize );
     pOut->SetWinExt( aRefSize );
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index 89ae81772a3a..f7c6453473d0 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: winmtf.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: sj $ $Date: 2002-12-04 12:27:35 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,9 @@
 
 #include "winmtf.hxx"
 #include <vcl/metaact.hxx>
-
+#ifndef _SV_METRIC_HXX
+#include <vcl/metric.hxx>
+#endif
 // ------------------------------------------------------------------------
 
 void WinMtfClipPath::ImpUpdateType()
@@ -185,9 +187,6 @@ void WinMtfPathObj::ClosePath()
 
 WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
 {
-    Size    aFontSize( Size( 0, rFont.lfHeight ) );
-
-    aFont.SetSize( aFontSize );
     CharSet eCharSet;
     switch ( rFont.lfCharSet )
     {
@@ -207,9 +206,12 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
             eCharSet = RTL_TEXTENCODING_BIG5;
         break;
 
+        case HANGEUL_CHARSET :
+            eCharSet = RTL_TEXTENCODING_MS_949;
+        break;
+
         case OEM_CHARSET:
         case DEFAULT_CHARSET:
-        case HANGEUL_CHARSET:
         default:
             eCharSet = gsl_getSystemTextEncoding();
         break;
@@ -296,6 +298,27 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
         aFont.SetOrientation( (short)rFont.lfOrientation );
     else
         aFont.SetOrientation( (short)rFont.lfEscapement );
+
+    Size aFontSize( Size( rFont.lfWidth, rFont.lfHeight ) );
+    if ( rFont.lfHeight > 0 )
+    {
+        // converting the cell height into a font height
+        VirtualDevice aVDev;
+        aVDev.SetMapMode( MapMode( MAP_100TH_MM ) );
+        aFont.SetSize( aFontSize );
+        aVDev.SetFont( aFont );
+        FontMetric aMetric( aVDev.GetFontMetric() );
+        long nHeight = aMetric.GetAscent() + aMetric.GetDescent();
+        if ( nHeight )
+        {
+            aFontSize.Height() *= rFont.lfHeight;
+            aFontSize.Height() /= nHeight;
+        }
+    }
+    else
+        aFontSize.Height() *= -1;
+
+    aFont.SetSize( aFontSize );
 };
 
 // ------------------------------------------------------------------------
@@ -402,10 +425,14 @@ Point WinMtfOutput::ImplMap( const Point& rPt )
         {
             if ( ( mnMapMode == MM_TEXT ) && mnRefExtX && mnRefExtY )
             {
+                fX2 -= mnWinOrgX;
+                fY2 -= mnWinOrgY;
                 fX2 *= mnDevWidth;
                 fY2 *= mnDevHeight;
                 fX2 /= mnRefExtX;
                 fY2 /= mnRefExtY;
+                fX2 += mnDevOrgX;
+                fY2 += mnDevOrgY;
             }
             else
             {
@@ -485,7 +512,7 @@ void WinMtfOutput::ImplMap( Font& rFont )
     if( aFontSize.Height() < 0 )
         aFontSize.Height() *= -1;
 
-    rFont.SetSize( Size( 0, aFontSize.Height() ) );
+    rFont.SetSize( aFontSize );
 
     if( ( mnWinExtX * mnWinExtY ) < 0 )
         rFont.SetOrientation( 3600 - rFont.GetOrientation() );
@@ -1326,7 +1353,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
 
     rPosition = ImplMap( nGfxMode == GM_ADVANCED ? Point() : rPosition );
     sal_Int32 nOldGfxMode = GetGfxMode();
-    SetGfxMode( nGfxMode );
+    SetGfxMode( GM_COMPATIBLE );
     if ( pDXArry )
     {
         sal_Int32 i, nSum, nLen = rText.Len();
@@ -1338,7 +1365,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
             pDXArry[ i ] = nSum;
         }
     }
-
+    SetGfxMode( nGfxMode );
     sal_Bool bChangeFont = sal_False;
     if ( mnLatestTextAlign != mnTextAlign )
     {
@@ -1438,8 +1465,12 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
         if( mnTextAlign & TA_UPDATECP )
             rPosition = maActPos;
 
-        if( mnTextAlign & TA_RIGHT_CENTER )
-            rPosition.X() -= ( ( mnTextAlign & TA_RIGHT_CENTER ) == TA_RIGHT ) ? nTextWidth : ( nTextWidth >> 1 );
+        if ( mnTextAlign & TA_RIGHT_CENTER )
+        {
+            double fLenght = ( ( mnTextAlign & TA_RIGHT_CENTER ) == TA_RIGHT ) ? nTextWidth : nTextWidth >> 1;
+            rPosition.X() -= (sal_Int32)( fLenght * cos( maFont.GetOrientation() * F_PI1800 ) );
+            rPosition.Y() -= (sal_Int32)(-( fLenght * sin( maFont.GetOrientation() * F_PI1800 ) ) );
+        }
 
         if( mnTextAlign & TA_UPDATECP )
             maActPos.X() = rPosition.X() + nTextWidth;
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index 16482f303b86..bcc108f83af4 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: winmtf.hxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: sj $ $Date: 2002-11-26 18:13:46 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -715,8 +715,8 @@ class WinMtf
 
 class EnhWMFReader : public WinMtf
 {
-
-private:
+    Rectangle       rclFrame;
+    sal_Int32       nPixX, nPixY, nMillX, nMillY;
 
     sal_Bool        bRecordPath;
     sal_Int32       nRecordCount;
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index b31614183414..4e25de5e4ad0 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: winwmf.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: sj $ $Date: 2002-11-01 13:50:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1271,8 +1271,6 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pWM
                 }
                 break;
             }
-            if ( nFunction == W_META_SETWINDOWEXT )
-                break;
             pWMF->Seek( nStartPos += nRecSize * 2 );
         }
     }
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index 8b82e5ea21fd..120a2bc703fe 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wmfwr.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: sj $ $Date: 2002-11-12 11:22:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -416,7 +416,7 @@ void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor)
 void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
 {
     USHORT nWeight,i;
-    BYTE nCharSet,nPitchFamily;
+    BYTE nPitchFamily;
 
     WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT);
 
@@ -443,13 +443,25 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
     if (rFont.GetUnderline()==UNDERLINE_NONE) *pWMF << (BYTE)0; else  *pWMF << (BYTE)1;
     if (rFont.GetStrikeout()==STRIKEOUT_NONE) *pWMF << (BYTE)0; else  *pWMF << (BYTE)1;
 
-    switch (rFont.GetCharSet())
+    sal_uInt8   nCharSet;
+    CharSet     eFontNameEncoding = rFont.GetCharSet();
+    switch ( eFontNameEncoding )
     {
-        case RTL_TEXTENCODING_SYMBOL    :   nCharSet = W_SYMBOL_CHARSET; break;
         case RTL_TEXTENCODING_SHIFT_JIS :   nCharSet = W_SHIFTJIS_CHARSET; break;
         case RTL_TEXTENCODING_BIG5      :   nCharSet = W_CHINESEBIG5_CHARSET; break;
+        case RTL_TEXTENCODING_MS_949    :   nCharSet = W_HANGEUL_CHARSET; break;
         case RTL_TEXTENCODING_MS_932    :   nCharSet = 0x3c; break;
-        default:                            nCharSet = W_ANSI_CHARSET;
+        case RTL_TEXTENCODING_SYMBOL    :
+        {
+            nCharSet = W_SYMBOL_CHARSET;
+            eFontNameEncoding = RTL_TEXTENCODING_MS_1252;
+        }
+        break;
+        default:
+        {
+            nCharSet = W_ANSI_CHARSET;
+            eFontNameEncoding = RTL_TEXTENCODING_MS_1252;
+        }
     }
     *pWMF << nCharSet;
 
@@ -470,7 +482,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
     }
     *pWMF << nPitchFamily;
 
-    ByteString aFontName( rFont.GetName(), gsl_getSystemTextEncoding() );
+    ByteString aFontName( rFont.GetName(), eFontNameEncoding );
     for ( i = 0; i < W_LF_FACESIZE; i++ )
     {
         sal_Char nChar = ( i < aFontName.Len() ) ? aFontName.GetChar( i ) : 0;
diff --git a/svtools/source/items/aeitem.cxx b/svtools/source/items/aeitem.cxx
index bdb1eb564ea3..1ff00e4a045e 100644
--- a/svtools/source/items/aeitem.cxx
+++ b/svtools/source/items/aeitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: aeitem.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mav $ $Date: 2002-11-27 09:11:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -300,7 +300,7 @@ void SfxAllEnumItem::DisableValue( USHORT nValue )
     pDisabledValues->Insert( nValue, pDisabledValues->Count() );
 }
 
-BOOL SfxAllEnumItem::IsEnabled( USHORT nValue )
+BOOL SfxAllEnumItem::IsEnabled( USHORT nValue ) const
 {
     if ( pDisabledValues )
     {
diff --git a/svtools/source/items/globalnameitem.cxx b/svtools/source/items/globalnameitem.cxx
new file mode 100644
index 000000000000..f33756d6722d
--- /dev/null
+++ b/svtools/source/items/globalnameitem.cxx
@@ -0,0 +1,152 @@
+/*************************************************************************
+ *
+ *  $RCSfile: globalnameitem.cxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:54 $
+ *
+ *  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): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
+#include <com/sun/star/uno/Any.hxx>
+#endif
+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
+#include <com/sun/star/uno/Sequence.hxx>
+#endif
+#ifndef _COM_SUN_STAR_SCRIPT_XTYPECONVERTER_HPP_
+#include <com/sun/star/script/XTypeConverter.hpp>
+#endif
+
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+#include <comphelper/processfactory.hxx>
+
+#include "globalnameitem.hxx"
+
+// STATIC DATA -----------------------------------------------------------
+
+
+// -----------------------------------------------------------------------
+
+TYPEINIT1_AUTOFACTORY(SfxGlobalNameItem, SfxPoolItem);
+
+// -----------------------------------------------------------------------
+
+SfxGlobalNameItem::SfxGlobalNameItem()
+{
+}
+
+// -----------------------------------------------------------------------
+
+SfxGlobalNameItem::SfxGlobalNameItem( USHORT nW, const SvGlobalName& rName )
+:   SfxPoolItem( nW ),
+    m_aName( rName )
+{
+}
+
+// -----------------------------------------------------------------------
+
+SfxGlobalNameItem::~SfxGlobalNameItem()
+{
+}
+
+// -----------------------------------------------------------------------
+
+int SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const
+{
+    return ((SfxGlobalNameItem&)rItem).m_aName == m_aName;
+}
+
+// -----------------------------------------------------------------------
+
+SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const
+{
+    return new SfxGlobalNameItem( *this );
+}
+
+//----------------------------------------------------------------------------
+// virtual
+BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+{
+    com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter
+            ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
+            com::sun::star::uno::UNO_QUERY );
+    com::sun::star::uno::Sequence< sal_Int8 > aSeq;
+    com::sun::star::uno::Any aNew;
+
+    try { aNew = xConverter->convertTo( rVal, ::getCppuType((const com::sun::star::uno::Sequence < sal_Int8 >*)0) ); }
+    catch (com::sun::star::uno::Exception&) {}
+    aNew >>= aSeq;
+    if ( aSeq.getLength() == 16 )
+    {
+        m_aName.MakeFromMemory( (void*) aSeq.getConstArray() );
+        return TRUE;
+    }
+
+    DBG_ERROR( "SfxGlobalNameItem::PutValue - Wrong type!" );
+    return FALSE;
+}
+
+//----------------------------------------------------------------------------
+// virtual
+BOOL SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+{
+       com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
+    void* pData = ( void* ) &m_aName.GetCLSID();
+    memcpy( aSeq.getArray(), pData, 16 );
+    rVal <<= aSeq;
+    return TRUE;
+}
+
diff --git a/svtools/source/items/itemdel.cxx b/svtools/source/items/itemdel.cxx
index d3acda749a45..e0eb279c352a 100644
--- a/svtools/source/items/itemdel.cxx
+++ b/svtools/source/items/itemdel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: itemdel.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:59:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:38:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,14 +104,14 @@ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ):
 {
     DBG_CTOR(SfxItemDesruptor_Impl, 0);
 
-    pItem->SetRef( SFX_ITEMS_DELETEONIDLE );
+    DBG_ASSERT( 0 == pItem->GetRefCount(), "desrupting pooled item" );
+    pItem->SetKind( SFX_ITEMS_DELETEONIDLE );
 
     // im Idle abarbeiten
     GetpApp()->InsertIdleHdl( aLink, 1 );
 
     // und in Liste eintragen (damit geflusht werden kann)
-    SfxItemDesruptorList_Impl* &rpList
-     = ImpSvtData::GetSvtData().pItemDesruptList;
+    SfxItemDesruptorList_Impl* &rpList = ImpSvtData::GetSvtData().pItemDesruptList;
     if ( !rpList )
         rpList = new SfxItemDesruptorList_Impl;
     const SfxItemDesruptor_Impl *pThis = this;
@@ -127,17 +127,15 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
     GetpApp()->RemoveIdleHdl( aLink );
 
     // und aus Liste austragen
-    SfxItemDesruptorList_Impl* &rpList
-     = ImpSvtData::GetSvtData().pItemDesruptList;
+    SfxItemDesruptorList_Impl* &rpList = ImpSvtData::GetSvtData().pItemDesruptList;
     DBG_ASSERT( rpList, "no DesruptorList" );
     const SfxItemDesruptor_Impl *pThis = this;
     if ( rpList ) HACK(warum?)
         rpList->Remove( rpList->GetPos(pThis) );
 
-    // Item l"oschen
-    pItem->SetRef( 0 );
+    // reset RefCount (was set to SFX_ITEMS_SPECIAL before!)
+    pItem->SetRefCount( 0 );
     DBG_CHKOBJ( pItem, SfxPoolItem, 0 );
-    DBG_ASSERT( 0 == pItem->GetRef(), "desrupting pooled item" );
     delete pItem;
 }
 
@@ -152,7 +150,7 @@ IMPL_LINK( SfxItemDesruptor_Impl, Delete, void *, pvoid )
 // ------------------------------------------------------------------------
 SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem )
 {
-    DBG_ASSERT( 0 == pItem->GetRef(), "deleting item in use" );
+    DBG_ASSERT( 0 == pItem->GetRefCount(), "deleting item in use" );
     new SfxItemDesruptor_Impl( pItem );
     return pItem;
 }
diff --git a/svtools/source/items/makefile.mk b/svtools/source/items/makefile.mk
index 6a0543fda515..1a6e18561898 100644
--- a/svtools/source/items/makefile.mk
+++ b/svtools/source/items/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: jbu $ $Date: 2002-10-01 12:53:53 $
+#   last change: $Author: hr $ $Date: 2003-03-27 14:38:57 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -139,6 +139,7 @@ LIB2OBJFILES=\
 
 LIB3TARGET=$(SLB)$/items2.lib
 LIB3OBJFILES=\
+    $(SLO)$/globalnameitem.obj	\
     $(SLO)$/aeitem.obj	\
     $(SLO)$/args.obj	\
     $(SLO)$/compat.obj	\
diff --git a/svtools/source/misc/config.src b/svtools/source/misc/config.src
index 0138eaa282c5..ef302af1ecb4 100644
--- a/svtools/source/misc/config.src
+++ b/svtools/source/misc/config.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: config.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:06:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,26 +69,27 @@ String STR_WARNING_ITEM
     TEXT [ italian ] = "La voce ha una versione errata!" ;
     TEXT [ portuguese_brazilian ] = "Vers?o errada do item!" ;
     TEXT [ portuguese ] = "O registo tem a vers�o errada!" ;
-    TEXT [ finnish ] = "Virheellinen versio!" ;
+    TEXT [ finnish ] = "Virheellinen versio" ;
     TEXT [ danish ] = "Elementets version er forkert! " ;
     TEXT [ french ] = "Version incorrecte !" ;
     TEXT [ swedish ] = "Post har fel version!" ;
-    TEXT [ dutch ] = "Verkeerde versie van item!" ;
+    TEXT [ dutch ] = "Foutieve versie van item!" ;
     TEXT [ spanish ] = "�La entrada contiene una versi�n incorrecta!" ;
     TEXT [ english_us ] = "Incorrect Version!" ;
     TEXT[ chinese_simplified ] = "条目版本无效";
-    TEXT[ russian ] = "������������ ������ ��������!";
+    TEXT[ russian ] = "������������ ������!";
     TEXT[ polish ] = "Wersja elementu jest nieprawid�owa!";
-    TEXT[ japanese ] = "ﾊﾞｰｼﾞｮﾝが正しくありません。";
+    TEXT[ japanese ] = "バージョンが正しくありません。";
     TEXT[ chinese_traditional ] = "條目版本無效";
     TEXT[ arabic ] = "������� �� ����� ����!";
-    TEXT[ dutch ] = "Verkeerde versie van item!";
+    TEXT[ dutch ] = "Foutieve versie van item!";
     TEXT[ chinese_simplified ] = "条目版本无效";
     TEXT[ greek ] = "� ���������� ������� �� ����� ������!";
-    TEXT[ korean ] = "아이템이 틀린 버전을 가지고 있습니다!";
+    TEXT[ korean ] = "잘못된 버전입니다.";
     TEXT[ turkish ] = "Giri�in s�r�m� yanl��!";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "�La entrada contiene una versi�n incorrecta!";
+    TEXT[ catalan ] = "Versi� incorrecta!";
+    TEXT[ thai ] = "เวอร์ชั่นไม่ถูกต้อง!";
 };
 
 
@@ -98,3 +99,10 @@ String STR_WARNING_ITEM
 
 
 
+
+
+
+
+
+
+
diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
index d78518956a1d..988bd6983421 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svtools/source/misc/errtxt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: errtxt.src,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: rt $ $Date: 2001-08-24 05:55:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,7 +81,7 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "错误";
         Text[ russian ] = "������";
         Text[ polish ] = "B��d";
-        Text[ japanese ] = "ｴﾗｰ";
+        Text[ japanese ] = "エラー";
         Text[ chinese_traditional ] = "錯誤";
         Text[ arabic ] = "���";
         Text[ dutch ] = "Fout";
@@ -90,8 +90,9 @@ Resource RID_ERRCTX
         Text[ korean ] = "오류";
         Text[ turkish ] = "Hata";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Error";
+        Text[ catalan ] = "S'ha produ�t un error";
         Text[ finnish ] = "Virhe";
+        Text[ thai ] = "ข้อผิดพลาด";
     };
     String ERRCTX_WARNING
     {
@@ -117,8 +118,9 @@ Resource RID_ERRCTX
         Text[ greek ] = "�������������";
         Text[ korean ] = "경고";
         Text[ turkish ] = "Uyar�";
-        Text[ catalan ] = "Advertencia";
+        Text[ catalan ] = "Advert�ncia";
         Text[ finnish ] = "Varoitus";
+        Text[ thai ] = "คำเตือน";
     };
     String ERRCTX_SFX_LOADTEMPLATE
     {
@@ -129,24 +131,25 @@ Resource RID_ERRCTX
         Text [ italian ] = "$(ERR) nel caricare il modello $(ARG1)" ;
         Text [ spanish ] = "$(ERR) al cargar la plantilla $(ARG1)" ;
         Text [ french ] = "$(ERR) lors du chargement du mod�le $(ARG1)" ;
-        Text [ swedish ] = "$(ERR) vid laddning av formatmallen $(ARG1)" ;
+        Text [ swedish ] = "$(ERR) vid laddning av mallen $(ARG1)" ;
         Text [ danish ] = "$(ERR) under indl�sning af skabelonen $(ARG1)" ;
         Text [ portuguese ] = "$(ERR) ao carregar o modelo $(ARG1)" ;
         Text [ portuguese_brazilian ] = "$(ERR) beim Laden der Vorlage $(ARG1)" ;
         Text[ chinese_simplified ] = "$(ERR)发生在装入样式$(ARG1)时";
         Text[ russian ] = "$(ERR) ��� �������� ������� $(ARG1)";
         Text[ polish ] = "$(ERR) przy �adowaniu szablonu $(ARG1)";
-        Text[ japanese ] = "ﾃﾝﾌﾟﾚｰﾄ $(ARG1) を読み込む際の $(ERR)";
+        Text[ japanese ] = "テンプレート $(ARG1) を読み込む際の $(ERR)";
         Text[ chinese_traditional ] = "載入樣式 $(ARG1) 時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ����� ������ $(ARG1)";
         Text[ dutch ] = "$(ERR) bij laden van sjabloon $(ARG1)";
         Text[ chinese_simplified ] = "$(ERR)发生在装入样式$(ARG1)时";
         Text[ greek ] = "$(ERR) ���� �� ������� ��� �������� $(ARG1)";
-        Text[ korean ] = "서식 파일 $(ARG1)을(를) 로드하던 중 $(ERR)";
+        Text[ korean ] = "서식 파일 $(ARG1)을(를) 로드하는 중에 $(ERR)";
         Text[ turkish ] = "$(ARG1) �ablonu y�klenirken $(ERR)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al cargar la plantilla $(ARG1)";
-        Text[ finnish ] = "$(ERR) ladattaessa mallipohjaa $(ARG1)";
+        Text[ catalan ] = "$(ERR) en carregar la plantilla $(ARG1)";
+        Text[ finnish ] = "$(ERR) ladattaessa mallia $(ARG1)";
+        Text[ thai ] = "$(ERR) กำลังโหลดแม่แบบ $(ARG1)";
     };
     String ERRCTX_SFX_SAVEDOC
     {
@@ -163,17 +166,18 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "存盘文档 $(ARG1) 时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� ���������� ��������� $(ARG1)";
         Text[ polish ] = "$(ERR) przy zapisywaniu dokumentu $(ARG1)";
-        Text[ japanese ] = "$(ERR)ﾄﾞｷｭﾒﾝﾄ$(ARG1)の保存の際";
+        Text[ japanese ] = "$(ERR)ドキュメント$(ARG1)の保存の際";
         Text[ chinese_traditional ] = "儲存文件 $(ARG1) 時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ��� ������� $(ARG1)";
         Text[ dutch ] = "$(ERR) bij opslaan van document $(ARG1)";
         Text[ chinese_simplified ] = "存盘文档 $(ARG1) 时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� ��� ������������� �������� $(ARG1)";
-        Text[ korean ] = "문서$(ARG1)을(를) 저장하던 중 $(ERR)";
+        Text[ korean ] = "문서$(ARG1)을(를) 저장하는 중에 $(ERR)";
         Text[ turkish ] = "$(ARG1) belgesi kaydedilirken $(ERR)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al guardar el documento $(ARG1)";
+        Text[ catalan ] = "$(ERR) en desar el document $(ARG1)";
         Text[ finnish ] = "$(ERR) tallennettaessa asiakirjaa $(ARG1)";
+        Text[ thai ] = "$(ERR) กำลังบันทึกเอกสาร $(ARG1)";
     };
     String ERRCTX_SFX_SAVEASDOC
     {
@@ -190,23 +194,24 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "存盘文档 $(ARG1) 时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� ���������� ��������� $(ARG1)";
         Text[ polish ] = "$(ERR) przy zapisywaniu dokumentu $(ARG1)";
-        Text[ japanese ] = "$(ERR)ﾄﾞｷｭﾒﾝﾄ$(ARG1)の保存の際";
+        Text[ japanese ] = "$(ERR)ドキュメント$(ARG1)の保存の際";
         Text[ chinese_traditional ] = "儲存文件 $(ARG1) 時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ��� ������� $(ARG1)";
         Text[ dutch ] = "$(ERR) bij opslaan van document $(ARG1)";
         Text[ chinese_simplified ] = "存盘文档 $(ARG1) 时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� ��� ������������� �������� $(ARG1)";
-        Text[ korean ] = "문서$(ARG1)을(를) 저장하던 중 $(ERR)";
+        Text[ korean ] = "문서$(ARG1)을(를) 저장하는 중에 $(ERR)";
         Text[ turkish ] = "$(ARG1) belgesi kaydedilirken $(ERR)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al guardar el documento $(ARG1)";
+        Text[ catalan ] = "$(ERR) en desar el document $(ARG1)";
         Text[ finnish ] = "$(ERR) tallennettaessa asiakirjaa $(ARG1)";
+        Text[ thai ] = "$(ERR) กำลังบันทึกเอกสาร $(ARG1)";
     };
     String ERRCTX_SFX_DOCINFO
     {
         Text = "$(ERR) beim Anzeigen der Docinfo des Dokumentes $(ARG1)" ;
         Text [ ENGLISH ] = "$(ERR) while showing docinfo for document $(ARG1)" ;
-        Text [ dutch ] = "$(ERR) bij weergeven van document info bij document $(ARG1)" ;
+        Text [ dutch ] = "$(ERR) bij weergeven van documentinfo bij document $(ARG1)" ;
         Text [ english_us ] = "$(ERR) displaying doc. information for document $(ARG1)" ;
         Text [ italian ] = "$(ERR) nel visualizzare le informazioni riguardanti il documento $(ARG1)" ;
         Text [ spanish ] = "$(ERR) al mostrar la informaci�n del documento $(ARG1)" ;
@@ -218,16 +223,17 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "显示文档 $(ARG1) 文档信息时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� ������ ���������� � ��������� $(ARG1)";
         Text[ polish ] = "$(ERR) przy wy�wietlaniu informacji o dokumencie dla dokumentu $(ARG1)";
-        Text[ japanese ] = "$(ERR)ﾄﾞｷｭﾒﾝﾄ$(ARG1)のﾄﾞｷｭﾒﾝﾄ情報の表示の際";
+        Text[ japanese ] = "$(ERR)ドキュメント$(ARG1)のドキュメント情報の表示の際";
         Text[ chinese_traditional ] = "顯示文件 $(ARG1) 的文件資訊時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ����� ������� ������� ������ �������� $(ARG1)";
-        Text[ dutch ] = "$(ERR) bij weergeven van document info bij document $(ARG1)";
+        Text[ dutch ] = "$(ERR) bij weergeven van documentinfo bij document $(ARG1)";
         Text[ chinese_simplified ] = "显示文档 $(ARG1) 文档信息时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� ��� �������� ��� ����������� ��� �������� $(ARG1)";
-        Text[ korean ] = "문서$(ARG1)의 문서 정보를 표시하던 중 $(ERR)";
+        Text[ korean ] = "문서$(ARG1)의 문서 정보를 표시하는 중에 $(ERR)";
         Text[ turkish ] = "$(ARG1) belgesinin, belge bilgileri g�r�nt�lenirken $(ERR)";
-        Text[ catalan ] = "$(ERR) al mostrar la informaci�n del documento $(ARG1)";
+        Text[ catalan ] = "$(ERR) en mostrar la informaci� del document $(ARG1)";
         Text[ finnish ] = "$(ERR) n�ytett�ess� asiakirjan $(ARG1) tietoja";
+        Text[ thai ] = "$(ERR) กำลังแสดงผลเอกสาร ข้อมูลสำหรับเอกสาร $(ARG1)";
     };
     String ERRCTX_SFX_DOCTEMPLATE
     {
@@ -238,24 +244,25 @@ Resource RID_ERRCTX
         Text [ italian ] = "$(ERR) nella scrittura del documento $(ARG1) come modello" ;
         Text [ spanish ] = "$(ERR) al escribir el documento $(ARG1) como plantilla" ;
         Text [ french ] = "$(ERR) lors de l'enregistrement du document $(ARG1) en tant que mod�le" ;
-        Text [ swedish ] = "$(ERR) vid n�r dokumentet $(ARG1) skrevs som formatmall" ;
+        Text [ swedish ] = "$(ERR) n�r dokumentet $(ARG1) skrevs som mall" ;
         Text [ danish ] = "$(ERR) under skrivning af dokumentet $(ARG1) som skabelon" ;
         Text [ portuguese ] = "$(ERR) ao escrever o documento $(ARG1) como modelo" ;
         Text [ portuguese_brazilian ] = "$(ERR) beim Schreiben des Dokumentes $(ARG1) als Vorlage" ;
         Text[ chinese_simplified ] = "在改写样式文档 $(ARG1) 时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� ������ ��������� $(ARG1) ��� �������";
         Text[ polish ] = "$(ERR) przy zapisywaniu dokumentu $(ARG1) jako szablonu";
-        Text[ japanese ] = "$(ERR)ﾃﾝﾌﾟﾚｰﾄとしてﾄﾞｷｭﾒﾝﾄ$(ARG1)を書き込む際";
+        Text[ japanese ] = "$(ERR)テンプレートとしてドキュメント$(ARG1)を書き込む際";
         Text[ chinese_traditional ] = "寫入樣式文件 $(ARG1) 時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ����� ������� $(ARG1) �����";
         Text[ dutch ] = "$(ERR) bij opslaan van document $(ARG1) als sjabloon";
         Text[ chinese_simplified ] = "在改写样式文档 $(ARG1) 时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� ��� ������� ��� �������� $(ARG1) �� �������";
-        Text[ korean ] = "문서$(ARG1)을(를) 서식 파일로 기록하던 중 $(ERR)";
+        Text[ korean ] = "문서$(ARG1)을(를) 서식 파일로 기록하는 중에 $(ERR)";
         Text[ turkish ] = "$(ARG1) belgesi �ablon olarak yaz�l�rken $(ERR)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al escribir el documento $(ARG1) como plantilla";
-        Text[ finnish ] = "$(ERR) kirjoitettaessa asiakirjaa $(ARG1) mallipohjaksi";
+        Text[ catalan ] = "$(ERR) en escriure el document $(ARG1) com a plantilla";
+        Text[ finnish ] = "$(ERR) kirjoitettaessa asiakirjaa $(ARG1) malliksi";
+        Text[ thai ] = "$(ERR) กำลังเขียนเอกสาร $(ARG1) เป็นแม่แบบ";
     };
     String ERRCTX_SFX_MOVEORCOPYCONTENTS
     {
@@ -267,22 +274,23 @@ Resource RID_ERRCTX
         Text [ swedish ] = "$(ERR) vid kopiering eller f�rflyttning av dokumentinneh�ll" ;
         Text [ danish ] = "$(ERR) under kopiering eller flytning af dokumentindhold" ;
         Text [ italian ] = "$(ERR) nel copiare o spostare i contenuti dei documenti" ;
-        Text [ spanish ] = "$(ERR) al copiar o desplazar los contenidos del documento." ;
+        Text [ spanish ] = "$(ERR) al copiar o desplazar el contenido del documento." ;
         Text [ french ] = "$(ERR) lors de la copie ou du d�placement du contenu des documents " ;
         Text [ dutch ] = "$(ERR) bij kopi�ren of verplaatsen van documentinhoud" ;
         Text[ chinese_simplified ] = "复制或移动文档内容时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� ����������� ��� ����������� ����������� ���������";
         Text[ polish ] = "$(ERR) przy kopiowaniu lub przenoszeniu zawarto�ci wiadomo�ci";
-        Text[ japanese ] = "$(ERR)ﾄﾞｷｭﾒﾝﾄの内容をｺﾋﾟｰまたは移動する際";
+        Text[ japanese ] = "$(ERR)ドキュメントの内容をコピーまたは移動する際";
         Text[ chinese_traditional ] = "複製和移動文件內容時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ��� �� ����� ������� �������";
         Text[ dutch ] = "$(ERR) bij kopi�ren of verplaatsen van documentinhoud";
         Text[ chinese_simplified ] = "复制或移动文档内容时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� ��� ��������� � ���������� ��� ������������ ��� ��������";
-        Text[ korean ] = "문서 내용을 복사 또는 이동시에 $(ERR)";
+        Text[ korean ] = "문서 내용을 복사 또는 이동 시에 $(ERR)";
         Text[ turkish ] = "Belge i�eri�i kopyalan�rken ya da ta��n�rken $(ERR)";
-        Text[ catalan ] = "$(ERR) al copiar o desplazar los contenidos del documento.";
+        Text[ catalan ] = "$(ERR) en copiar o moure el contingut del document";
         Text[ finnish ] = "$(ERR) kopioitaessa tai siirrett�ess� asiakirjan sis�lt��";
+        Text[ thai ] = "$(ERR) กำลังคัดลอกหรือย้ายเนื้อหาเอกสาร";
     };
     String ERRCTX_SFX_DOCMANAGER
     {
@@ -292,24 +300,25 @@ Resource RID_ERRCTX
         Text [ italian ] = "$(ERR) nell'avvio del Docmanager" ;
         Text [ spanish ] = "$(ERR) al inicializar el administrador de documentos" ;
         Text [ french ] = "$(ERR) lors du d�marrage du gestionnaire de documents" ;
-        Text [ dutch ] = "$(ERR) bij het starten van het documentbeheer" ;
-        Text [ swedish ] = "$(ERR) vid start av dokumentmanagern" ;
+        Text [ dutch ] = "$(ERR) bij starten van documentbeheer" ;
+        Text [ swedish ] = "$(ERR) vid start av dokumenthanteraren" ;
         Text [ danish ] = "$(ERR) ved start af dokumentmanageren" ;
         Text [ portuguese ] = "$(ERR) ao iniciar o Gestor de Documentos" ;
         Text [ portuguese_brazilian ] = "$(ERR) beim Starten des Docmanagers" ;
         Text[ chinese_simplified ] = "启动文档管理程序时发生 $(ERR)";
-        Text[ russian ] = "$(ERR) ��� ������� ���������� ���������";
+        Text[ russian ] = "$(ERR) ��� ������� ���������� �����������";
         Text[ polish ] = "$(ERR) przy w��czaniu mened�era dokument�w";
-        Text[ japanese ] = "$(ERR)ﾄﾞｷｭﾒﾝﾄ ﾏﾈｰｼﾞｬの開始の際";
+        Text[ japanese ] = "$(ERR)ドキュメントマネージャーを開始する際";
         Text[ chinese_traditional ] = "啟動文件總管時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ��� ���� �������";
-        Text[ dutch ] = "$(ERR) bij het starten van het documentbeheer";
+        Text[ dutch ] = "$(ERR) bij starten van documentbeheer";
         Text[ chinese_simplified ] = "启动文档管理程序时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� ��� �������� ��� ����������� ��� ��������";
-        Text[ korean ] = "문서관리자를 시작하던 중 $(ERR)";
+        Text[ korean ] = "문서 관리자를 시작하는 중에 $(ERR)";
         Text[ turkish ] = "Belge y�neticisi ba�lat�l�rken $(ERR)";
-        Text[ catalan ] = "$(ERR) al inicializar el administrador de documentos";
+        Text[ catalan ] = "$(ERR) en inicialitzar l'administrador de documents";
         Text[ finnish ] = "$(ERR) aloitettaessa asiakirjan hallintaa";
+        Text[ thai ] = "$(ERR) กำลังเริ่มตัวจัดการเอกสาร";
     };
     String ERRCTX_SFX_OPENDOC
     {
@@ -327,17 +336,18 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "装入文档 $(ARG1) 时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� �������� ��������� $(ARG1)";
         Text[ polish ] = "$(ERR) przy �adowaniu dokumentu $(ARG1)";
-        Text[ japanese ] = "ﾄﾞｷｭﾒﾝﾄ $(ARG1) を読み込む際の $(ERR)";
+        Text[ japanese ] = "ドキュメント $(ARG1) を読み込む際の $(ERR)";
         Text[ chinese_traditional ] = "載入文件 $(ARG1) 時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ����� ������� $(ARG1)";
         Text[ dutch ] = "$(ERR) bij openen van document $(ARG1)";
         Text[ chinese_simplified ] = "装入文档 $(ARG1) 时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� �� ������� ��� �������� $(ARG1)";
-        Text[ korean ] = "문서$(ARG1)을(를) 로드하던 중 $(ERR)";
+        Text[ korean ] = "문서$(ARG1)을(를) 로드하는 중에 $(ERR)";
         Text[ turkish ] = "$(ARG1) belgesi y�klenirken $(ERR)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al cargar el documento $(ARG1)";
+        Text[ catalan ] = "$(ERR) en carregar el document $(ARG1)";
         Text[ finnish ] = "$(ERR) ladattaessa asiakirjaa $(ARG1)";
+        Text[ thai ] = "$(ERR) กำลังโหลดเอกสาร $(ARG1)";
     };
     String ERRCTX_SFX_NEWDOCDIRECT
     {
@@ -345,7 +355,7 @@ Resource RID_ERRCTX
         Text [ ENGLISH ] = "$(ERR) creating a new document" ;
         Text [ english_us ] = "$(ERR) creating a new document" ;
         Text [ italian ] = "$(ERR) nella creazione di un nuovo documento" ;
-        Text [ spanish ] = "$(ERR) al crear un nuevo documento" ;
+        Text [ spanish ] = "$(ERR) al crear un documento nuevo" ;
         Text [ french ] = "$(ERR) lors de la cr�ation d'un nouveau document" ;
         Text [ dutch ] = "$(ERR) bij maken van nieuw document" ;
         Text [ swedish ] = "$(ERR) n�r ett nytt dokument skapades" ;
@@ -355,17 +365,18 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "新建文档时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� �������� ������ ���������";
         Text[ polish ] = "$(ERR) przy tworzeniu nowego dokumentu";
-        Text[ japanese ] = "$(ERR)ﾄﾞｷｭﾒﾝﾄの新規作成の際";
+        Text[ japanese ] = "$(ERR)ドキュメントの新規作成の際";
         Text[ chinese_traditional ] = "建立一個新文件時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ����� ����� ����";
         Text[ dutch ] = "$(ERR) bij maken van nieuw document";
         Text[ chinese_simplified ] = "新建文档时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� �� ���������� ���� ���� ��������";
-        Text[ korean ] = "새 문서를 작성하던 중 $(ERR)";
+        Text[ korean ] = "새 문서를 만드는 중 $(ERR)";
         Text[ turkish ] = "Yeni belge olu�turulurken $(ERR)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al crear un nuevo documento";
+        Text[ catalan ] = "$(ERR) en crear un document nou";
         Text[ finnish ] = "$(ERR) luotaessa uutta asiakirjaa";
+        Text[ thai ] = "$(ERR) กำลังสร้างเอกสารใหม่";
     };
     String ERRCTX_SFX_NEWDOC
     {
@@ -374,7 +385,7 @@ Resource RID_ERRCTX
         Text [ dutch ] = "$(ERR) bij maken van nieuw document" ;
         Text [ english_us ] = "$(ERR) creating a new document" ;
         Text [ italian ] = "$(ERR) nella creazione di un nuovo documento" ;
-        Text [ spanish ] = "$(ERR) al crear un nuevo documento" ;
+        Text [ spanish ] = "$(ERR) al crear un documento nuevo" ;
         Text [ french ] = "$(ERR) lors de la cr�ation d'un nouveau document" ;
         Text [ swedish ] = "$(ERR) n�r ett nytt dokument skapades" ;
         Text [ danish ] = "$(ERR) under oprettelsen af et nyt dokument" ;
@@ -383,17 +394,18 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "新建文档时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� �������� ������ ���������";
         Text[ polish ] = "$(ERR) przy tworzeniu nowego dokumentu";
-        Text[ japanese ] = "$(ERR)ﾄﾞｷｭﾒﾝﾄの新規作成の際";
+        Text[ japanese ] = "$(ERR)ドキュメントの新規作成の際";
         Text[ chinese_traditional ] = "建立一個新文件時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ����� ����� ����";
         Text[ dutch ] = "$(ERR) bij maken van nieuw document";
         Text[ chinese_simplified ] = "新建文档时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� �� ���������� ���� ���� ��������";
-        Text[ korean ] = "새 문서를 작성하던 중 $(ERR)";
+        Text[ korean ] = "새 문서를 만드는 중 $(ERR)";
         Text[ turkish ] = "Yeni belge olu�turulurken $(ERR)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al crear un nuevo documento";
+        Text[ catalan ] = "$(ERR) en crear un document nou";
         Text[ finnish ] = "$(ERR) luotaessa uutta asiakirjaa";
+        Text[ thai ] = "$(ERR) กำลังสร้างเอกสารใหม่";
     };
     String ERRCTX_SFX_CREATEOBJSH
     {
@@ -409,18 +421,19 @@ Resource RID_ERRCTX
         Text [ portuguese ] = "$(ERR) ao abrir rubrica" ;
         Text [ portuguese_brazilian ] = "$(ERR) beim Aufklappen einer Rubrik" ;
         Text[ chinese_simplified ] = "扩展分类条目时发生 $(ERR)";
-        Text[ russian ] = "$(ERR) ��� ����������� �������";
+        Text[ russian ] = "$(ERR) ��� ��������� �������";
         Text[ polish ] = "$(ERR) przy otwieraniu rubryki";
-        Text[ japanese ] = "$(ERR)ﾂﾘｰ表示を開く際";
+        Text[ japanese ] = "$(ERR)ツリー表示を開く際";
         Text[ chinese_traditional ] = "擴展顯示一個分欄時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ��� ��� �������";
         Text[ dutch ] = "$(ERR) bij openen van een rubriek";
         Text[ chinese_simplified ] = "扩展分类条目时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� �� ������� ���� ����������";
-        Text[ korean ] = "표제를 열기하던 중 $(ERR)";
+        Text[ korean ] = "항목 확장 중 $(ERR)";
         Text[ turkish ] = "Giri�i a�arken $(ERR)";
-        Text[ catalan ] = "$(ERR) al abrir una r�brica";
+        Text[ catalan ] = "$(ERR) en expandir una r�brica";
         Text[ finnish ] = "$(ERR) laajennettaessa merkint��";
+        Text[ thai ] = "$(ERR) กำลังขยายรายการ";
     };
     String ERRCTX_SFX_LOADBASIC
     {
@@ -438,16 +451,17 @@ Resource RID_ERRCTX
         Text[ chinese_simplified ] = "装入文档 $(ARG1) BASIC 时发生 $(ERR)";
         Text[ russian ] = "$(ERR) ��� �������� BASIC ��������� $(ARG1)";
         Text[ polish ] = "$(ERR) przy �adowaniu dokumentu BASIC $(ARG1)";
-        Text[ japanese ] = "ﾄﾞｷｭﾒﾝﾄ $(ARG1) の BASIC を読み込む際の $(ERR)";
+        Text[ japanese ] = "ドキュメント $(ARG1) の BASIC を読み込む際の $(ERR)";
         Text[ chinese_traditional ] = "載入文件 $(ARG1)  BASIC 時發生 $(ERR)";
         Text[ arabic ] = "$(ERR) ����� ����� BASIC ������� $(ARG1)";
         Text[ dutch ] = "$(ERR) bij laden van BASIC van document $(ARG1)";
         Text[ chinese_simplified ] = "装入文档 $(ARG1) BASIC 时发生 $(ERR)";
         Text[ greek ] = "$(ERR) ���� �� ������� ��� BASIC ��� �������� $(ARG1)";
-        Text[ korean ] = "문서$(ARG1)의 BASIC을 로드하던 중 $(ERR)";
+        Text[ korean ] = "문서 $(ARG1)의 BASIC을 로드하던 중 $(ERR)";
         Text[ turkish ] = "$(ARG1) belgesi ile ilgili BASIC y�klenirken $(ERR)";
-        Text[ catalan ] = "$(ERR) al cargar el BASIC del documento $(ARG1)";
+        Text[ catalan ] = "$(ERR) en carregar el BASIC del document $(ARG1)";
         Text[ finnish ] = "$(ERR) ladattaessa asiakirjan $(ARG1) BASIC-tietoja";
+        Text[ thai ] = "$(ERR) กำลังโหลด BASIC ของเอกสาร $(ARG1)";
     };
     String ERRCTX_SFX_SEARCHADDRESS
     {
@@ -457,7 +471,7 @@ Resource RID_ERRCTX
         Text[ portuguese ] = "$(ERR) ao procurar o endere�o";
         Text[ russian ] = "$(ERR) ��� ������ ������";
         Text[ greek ] = "$(ERR) ���� ��� ��������� ����������";
-        Text[ dutch ] = "$(ERR) bij zoeken naar een adres";
+        Text[ dutch ] = "$(ERR) bij zoeken naar adres";
         Text[ french ] = "$(ERR) lors de la recherche d'adresse";
         Text[ spanish ] = "$(ERR) al buscar una direcci�n";
         Text[ italian ] = "$(ERR) nella ricerca d'indirizzo";
@@ -465,14 +479,15 @@ Resource RID_ERRCTX
         Text[ swedish ] = "$(ERR) vid adress�kning";
         Text[ polish ] = "$(ERR) w trakcie wyszukiwania adresu";
         Text[ portuguese_brazilian ] = "$(ERR) searching for an address";
-        Text[ japanese ] = "$(ERR) ｱﾄﾞﾚｽ検索中に発生しました";
+        Text[ japanese ] = "$(ERR) アドレス検索中に発生しました";
         Text[ korean ] = "주소 검색시에 $(ERR)";
         Text[ chinese_simplified ] = "在搜寻地址时出现$(ERR)";
         Text[ chinese_traditional ] = "在搜尋地址時出現 $(ERR)";
         Text[ turkish ] = "$(ERR) searching for an address";
         Text[ arabic ] = "$(ERR) ����� ����� �� �������";
-        Text[ catalan ] = "$(ERR) al buscar una direcci�n";
+        Text[ catalan ] = "$(ERR) en cercar una direcci�";
         Text[ finnish ] = "$(ERR) osoitetta etsitt�ess�";
+        Text[ thai ] = "$(ERR) กำลังค้นหาที่อยู่";
     };
 };
 Resource RID_ERRHDL
@@ -498,7 +513,7 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "不存在的对象";
         Text[ russian ] = "�������������� ������";
         Text[ polish ] = "Nieistniej�cy obiekt";
-        Text[ japanese ] = "存在しないｵﾌﾞｼﾞｪｸﾄ";
+        Text[ japanese ] = "存在しないオブジェクト";
         Text[ chinese_traditional ] = "不存在的物件";
         Text[ arabic ] = "���� ��� �����";
         Text[ dutch ] = "Object bestaat niet";
@@ -506,8 +521,9 @@ Resource RID_ERRHDL
         Text[ greek ] = "�� ������� �����������";
         Text[ korean ] = "없는 개체입니다";
         Text[ turkish ] = "Mevcut olmayan nesne";
-        Text[ catalan ] = "Objeto no existente";
-        Text[ finnish ] = "Objektia ei ole";
+        Text[ catalan ] = "Objecte no existent";
+        Text[ finnish ] = "Objektia ei ole.";
+        Text[ thai ] = "ไม่มีวัตถุอยู่";
     };
     String ERRCODE_CLASS_ALREADYEXISTS
     {
@@ -525,16 +541,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "对象已经存在";
         Text[ russian ] = "������ ��� ����������";
         Text[ polish ] = "Obiekt ju� istnieje";
-        Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄはすでにあります";
+        Text[ japanese ] = "オブジェクトはすでにあります";
         Text[ chinese_traditional ] = "物件已經存在";
         Text[ arabic ] = "������ ����� ������";
         Text[ dutch ] = "Object bestaat reeds";
         Text[ chinese_simplified ] = "对象已经存在";
         Text[ greek ] = "�� ����������� ������� ���";
-        Text[ korean ] = "개체가 이미 존재함";
+        Text[ korean ] = "개체가 이미 있습니다.";
         Text[ turkish ] = "Nesne mevcut";
-        Text[ catalan ] = "El objeto ya existe";
-        Text[ finnish ] = "Objekti on jo olemassa";
+        Text[ catalan ] = "L'objecte ja existeix";
+        Text[ finnish ] = "Objekti on jo olemassa.";
+        Text[ thai ] = "มีวัตถุอยู่";
     };
     String ERRCODE_CLASS_ACCESS
     {
@@ -550,25 +567,26 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Objecto inacess�vel" ;
         Text [ portuguese_brazilian ] = "Kein Zugriff auf Objekt" ;
         Text[ chinese_simplified ] = "不能够读取对象";
-        Text[ russian ] = "������ �� ��������";
+        Text[ russian ] = "������ ����������";
         Text[ polish ] = "Obiekt niedost�pny";
-        Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄにｱｸｾｽできません";
+        Text[ japanese ] = "オブジェクトにアクセスできません";
         Text[ chinese_traditional ] = "無法存取物件";
         Text[ arabic ] = "�� ���� ������ ��� ������";
         Text[ dutch ] = "Geen toegang tot object";
         Text[ chinese_simplified ] = "不能够读取对象";
         Text[ greek ] = "��� ����� ������� �� ����� �������� ��� �����������.";
-        Text[ korean ] = "개체에 접근 못함";
+        Text[ korean ] = "개체를 액세스할 수 없습니다.";
         Text[ turkish ] = "Nesneye eri�im sa�lanam�yor";
-        Text[ catalan ] = "No hay acceso al objeto";
-        Text[ finnish ] = "Objektin ei ole k�ytett�viss�";
+        Text[ catalan ] = "No hi ha acc�s a l'objecte";
+        Text[ finnish ] = "Objekti ei ole k�ytett�viss�.";
+        Text[ thai ] = "ไม่สามารถเข้าถึงวัตถุ";
     };
     String ERRCODE_CLASS_PATH
     {
         Text = "Unzul�ssiger Pfad" ;
         Text [ ENGLISH ] = "Invalid path" ;
-        Text [ dutch ] = "Ongeoorloofd pad" ;
-        Text [ english_us ] = "Inadmissable path" ;
+        Text [ dutch ] = "Ongeldig pad" ;
+        Text [ english_us ] = "Inadmissible path" ;
         Text [ italian ] = "Percorso incorretto" ;
         Text [ spanish ] = "Ruta no autorizada" ;
         Text [ french ] = "Chemin incorrect" ;
@@ -579,22 +597,23 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "路径无效";
         Text[ russian ] = "������������ ����";
         Text[ polish ] = "Niedopuszczalna �cie�ka";
-        Text[ japanese ] = "不許可のﾊﾟｽ";
+        Text[ japanese ] = "不許可のパス";
         Text[ chinese_traditional ] = "路徑無效";
         Text[ arabic ] = "���� �����";
-        Text[ dutch ] = "Ongeoorloofd pad";
+        Text[ dutch ] = "Ongeldig pad";
         Text[ chinese_simplified ] = "路径无效";
         Text[ greek ] = "�� ������ ��������";
         Text[ korean ] = "허용되지 않는 경로";
         Text[ turkish ] = "Ge�ersiz veri yolu";
-        Text[ catalan ] = "Ruta no autorizada";
-        Text[ finnish ] = "Polun k�ytt�minen ei onnistu";
+        Text[ catalan ] = "Cam� no autortizat";
+        Text[ finnish ] = "Polun k�ytt�minen ei onnistu.";
+        Text[ thai ] = "เส้นทางที่ไม่อนุญาต";
     };
     String ERRCODE_CLASS_LOCKING
     {
         Text = "Lockingproblem" ;
         Text [ ENGLISH ] = "Sharing conflict" ;
-        Text [ dutch ] = "Locking-probleem" ;
+        Text [ dutch ] = "Vergrendelingsprobleem" ;
         Text [ english_us ] = "Locking problem" ;
         Text [ italian ] = "Problema di locking" ;
         Text [ spanish ] = "Problema de bloqueo" ;
@@ -604,19 +623,20 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Problema de bloqueio" ;
         Text [ portuguese_brazilian ] = "Lockingproblem" ;
         Text[ chinese_simplified ] = "锁定冲突";
-        Text[ russian ] = "�������� ����� � �������";
+        Text[ russian ] = "�������� ����������";
         Text[ polish ] = "Problem blokady";
         Text[ japanese ] = "共有衝突";
         Text[ language_user1 ] = " ";
         Text[ chinese_traditional ] = "檔案鎖定衝突";
         Text[ arabic ] = "����� �� �������";
-        Text[ dutch ] = "Locking-probleem";
+        Text[ dutch ] = "Vergrendelingsprobleem";
         Text[ chinese_simplified ] = "锁定冲突";
         Text[ greek ] = "�������� �����������";
         Text[ korean ] = "잠금 문제";
         Text[ turkish ] = "Kenetlenme sorunu";
-        Text[ catalan ] = "Problema de bloqueo";
+        Text[ catalan ] = "Problema de blocatge";
         Text[ finnish ] = "Lukitusongelma";
+        Text[ thai ] = "ปัญหาการล็อค";
     };
     String ERRCODE_CLASS_PARAMETER
     {
@@ -626,7 +646,7 @@ Resource RID_ERRHDL
         Text [ italian ] = "Parametro errato" ;
         Text [ spanish ] = "Par�metro falso" ;
         Text [ french ] = "Erreur de param�tre" ;
-        Text [ dutch ] = "Verkeerde parameter" ;
+        Text [ dutch ] = "Foutieve parameter" ;
         Text [ swedish ] = "Felaktig parameter" ;
         Text [ danish ] = "Forkert parameter" ;
         Text [ portuguese ] = "Par�metro incorrecto" ;
@@ -634,16 +654,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "无效的参数";
         Text[ russian ] = "������������ ��������";
         Text[ polish ] = "Nieprawid�owy parametr";
-        Text[ japanese ] = "正しくないﾊﾟﾗﾒｰﾀ";
+        Text[ japanese ] = "正しくないパラメータ";
         Text[ chinese_traditional ] = "助變量無效";
         Text[ arabic ] = "����� �����";
-        Text[ dutch ] = "Verkeerde parameter";
+        Text[ dutch ] = "Foutieve parameter";
         Text[ chinese_simplified ] = "无效的参数";
         Text[ greek ] = "����� ����������";
-        Text[ korean ] = "틀린 파라미터";
+        Text[ korean ] = "잘못된 매개 변수";
         Text[ turkish ] = "Yanl�� parametre";
-        Text[ catalan ] = "Par�metro falso";
+        Text[ catalan ] = "Par�metre fals";
         Text[ finnish ] = "V��r� parametri";
+        Text[ thai ] = "พารามิเตอร์ผิด";
     };
     String ERRCODE_CLASS_SPACE
     {
@@ -661,16 +682,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "资源已经用完";
         Text[ russian ] = "������� ���������";
         Text[ polish ] = "Wyczerpany zas�b";
-        Text[ japanese ] = "ﾘｿｰｽが使い尽くされています";
+        Text[ japanese ] = "リソースが使い尽くされています";
         Text[ chinese_traditional ] = "資源已經用盡";
         Text[ arabic ] = "�� ������� ������ ���";
         Text[ dutch ] = "Resource uitgeput";
         Text[ chinese_simplified ] = "资源已经用完";
         Text[ greek ] = "�� ����� ������������";
-        Text[ korean ] = "리소스 고갈";
+        Text[ korean ] = "자원 고갈";
         Text[ turkish ] = "Kaynak t�kendi";
-        Text[ catalan ] = "No hay recursos diponibles";
-        Text[ finnish ] = "Resurssi k�ytetty loppuun";
+        Text[ catalan ] = "Els recursos s'han exhaurit";
+        Text[ finnish ] = "Resurssi k�ytetty loppuun.";
+        Text[ thai ] = "ทรัพยากรหมด";
     };
     String ERRCODE_CLASS_NOTSUPPORTED
     {
@@ -679,8 +701,8 @@ Resource RID_ERRHDL
         Text [ dutch ] = "Activiteit wordt niet ondersteund" ;
         Text [ english_us ] = "Action not supported" ;
         Text [ italian ] = "Operazione non supportata" ;
-        Text [ spanish ] = "Acci�n no apoyada" ;
-        Text [ french ] = "Action non soutenue" ;
+        Text [ spanish ] = "Acci�n no admitida" ;
+        Text [ french ] = "Action non support�e" ;
         Text [ swedish ] = "�tg�rd inte underst�dd" ;
         Text [ danish ] = "Handlingen underst�ttes ikke" ;
         Text [ portuguese ] = "Ac��o sem suporte" ;
@@ -688,16 +710,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "操作不受支持";
         Text[ russian ] = "�������� �� ��������������";
         Text[ polish ] = "Akcja nie jest obs�ugiwana";
-        Text[ japanese ] = "ｱｸｼｮﾝは支援されません";
+        Text[ japanese ] = "アクションは支援されません";
         Text[ chinese_traditional ] = "動作不受支援";
         Text[ arabic ] = "��� ������� �� �����";
         Text[ dutch ] = "Activiteit wordt niet ondersteund";
         Text[ chinese_simplified ] = "操作不受支持";
         Text[ greek ] = "� �������� ��� �������������";
-        Text[ korean ] = "작업을 지원하지 않음";
+        Text[ korean ] = "작동을 지원하지 않음";
         Text[ turkish ] = "��lem desteklenmiyor";
-        Text[ catalan ] = "Acci�n no apoyada";
-        Text[ finnish ] = "Toimintoa ei tueta";
+        Text[ catalan ] = "L'operaci� no se suporta";
+        Text[ finnish ] = "Toimintoa ei tueta.";
+        Text[ thai ] = "ไม่สนับสนุนการกระทำ";
     };
     String ERRCODE_CLASS_READ
     {
@@ -713,9 +736,9 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Erro de leitura" ;
         Text [ portuguese_brazilian ] = "Leseproblem" ;
         Text[ chinese_simplified ] = "读取错误";
-        Text[ russian ] = "�������� ����������";
+        Text[ russian ] = "������ ����������";
         Text[ polish ] = "B��d odczytu";
-        Text[ japanese ] = "読み取りｴﾗｰ";
+        Text[ japanese ] = "読み取りエラー";
         Text[ chinese_traditional ] = "讀取錯誤";
         Text[ arabic ] = "��� �� �������";
         Text[ dutch ] = "Probleem bij lezen";
@@ -725,6 +748,7 @@ Resource RID_ERRHDL
         Text[ turkish ] = "Okuma hatas�";
         Text[ catalan ] = "Error de lectura";
         Text[ finnish ] = "Lukuvirhe";
+        Text[ thai ] = "อ่านผิดพลาด";
     };
     String ERRCODE_CLASS_WRITE
     {
@@ -740,9 +764,9 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Erro de escrita" ;
         Text [ portuguese_brazilian ] = "Schreibproblem" ;
         Text[ chinese_simplified ] = "写入错误";
-        Text[ russian ] = "�������� ������";
+        Text[ russian ] = "������ ������";
         Text[ polish ] = "B��d zapisu";
-        Text[ japanese ] = "書き込みｴﾗｰ";
+        Text[ japanese ] = "書き込みエラー";
         Text[ chinese_traditional ] = "寫入錯誤";
         Text[ arabic ] = "��� �� �������";
         Text[ dutch ] = "Probleem bij schrijven";
@@ -750,8 +774,9 @@ Resource RID_ERRHDL
         Text[ greek ] = "������ ��������";
         Text[ korean ] = "쓰기 오류";
         Text[ turkish ] = "Yazma hatas�";
-        Text[ catalan ] = "Error de escritura";
+        Text[ catalan ] = "Error d'escriptura";
         Text[ finnish ] = "Kirjoitusvirhe";
+        Text[ thai ] = "เขียนผิดพลาด";
     };
     String ERRCODE_CLASS_UNKNOWN
     {
@@ -767,7 +792,7 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Desconhecido" ;
         Text [ portuguese_brazilian ] = "Unbekannt" ;
         Text[ chinese_simplified ] = "不明的";
-        Text[ russian ] = "����������";
+        Text[ russian ] = "����������";
         Text[ polish ] = "Nieznany";
         Text[ japanese ] = "不明";
         Text[ chinese_traditional ] = "不明的";
@@ -775,10 +800,11 @@ Resource RID_ERRHDL
         Text[ dutch ] = "Onbekend";
         Text[ chinese_simplified ] = "不明的";
         Text[ greek ] = "�������";
-        Text[ korean ] = "알려져 있지 않음";
+        Text[ korean ] = "알 수 없음";
         Text[ turkish ] = "Bilinmiyor";
-        Text[ catalan ] = "Desconocido";
+        Text[ catalan ] = "desconegut";
         Text[ finnish ] = "tuntematon";
+        Text[ thai ] = "ไม่รู้จัก";
     };
     String ERRCODE_CLASS_VERSION
     {
@@ -796,16 +822,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "版本冲突";
         Text[ russian ] = "��������������� ������";
         Text[ polish ] = "Niezgodna wersja";
-        Text[ japanese ] = "ﾊﾞｰｼﾞｮﾝ違反";
+        Text[ japanese ] = "バージョン違反";
         Text[ chinese_traditional ] = "版本衝突";
         Text[ arabic ] = "������� ��� �������";
         Text[ dutch ] = "Incompatibele versie";
         Text[ chinese_simplified ] = "版本冲突";
         Text[ greek ] = "������� �������";
-        Text[ korean ] = "호환되지 않는 버전";
+        Text[ korean ] = "버전 충돌";
         Text[ turkish ] = "S�r�m uyumsuzlu�u";
-        Text[ catalan ] = "Versiones incompatibles";
+        Text[ catalan ] = "Incompatibilitat de versions";
         Text[ finnish ] = "Versioiden yhteensopimattomuus";
+        Text[ thai ] = "เวอร์ชั่นไม่สามารถเข้ากันได้";
     };
     String ERRCODE_CLASS_GENERAL
     {
@@ -823,7 +850,7 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "一般错误";
         Text[ russian ] = "����� ������";
         Text[ polish ] = "B��d og�lny";
-        Text[ japanese ] = "一般的なｴﾗｰ";
+        Text[ japanese ] = "一般的なエラー";
         Text[ chinese_traditional ] = "一般錯誤";
         Text[ arabic ] = "��� ���";
         Text[ dutch ] = "Algemene fout";
@@ -834,12 +861,13 @@ Resource RID_ERRHDL
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Error general";
         Text[ finnish ] = "Yleinen virhe";
+        Text[ thai ] = "ข้อผิดพลาดทั่วไป";
     };
     String ERRCODE_CLASS_FORMAT
     {
         Text = "Falsches Format" ;
         Text [ ENGLISH ] = "Wrong format" ;
-        Text [ dutch ] = "Foutief formaat" ;
+        Text [ dutch ] = "Foutieve indeling" ;
         Text [ english_us ] = "Incorrect format" ;
         Text [ italian ] = "Formato errato" ;
         Text [ spanish ] = "Formato incorrecto" ;
@@ -854,13 +882,14 @@ Resource RID_ERRHDL
         Text[ japanese ] = "正しくない書式";
         Text[ chinese_traditional ] = "格式無效";
         Text[ arabic ] = "����� ����";
-        Text[ dutch ] = "Foutief formaat";
+        Text[ dutch ] = "Foutieve indeling";
         Text[ chinese_simplified ] = "错误的格式";
         Text[ greek ] = "�� �������� �����";
-        Text[ korean ] = "틀린 서식";
+        Text[ korean ] = "잘못된 서식";
         Text[ turkish ] = "Yanl�� format";
-        Text[ catalan ] = "Formato incorrecto";
+        Text[ catalan ] = "Format incorrecte";
         Text[ finnish ] = "V��r� muoto";
+        Text[ thai ] = "รูปแบบไม่ถูกต้อง";
     };
     String ERRCODE_CLASS_CREATE
     {
@@ -869,31 +898,32 @@ Resource RID_ERRHDL
         Text [ dutch ] = "Fout bij maken van object" ;
         Text [ english_us ] = "Error creating object" ;
         Text [ italian ] = "Errore durante la creazione" ;
-        Text [ spanish ] = "Error al crear" ;
+        Text [ spanish ] = "Error durante la creaci�n del objeto" ;
         Text [ french ] = "Erreur lors de la cr�ation" ;
         Text [ swedish ] = "Fel vid uppl�ggning" ;
         Text [ danish ] = "Fejl under oprettelsen" ;
         Text [ portuguese ] = "Erro ao criar" ;
         Text [ portuguese_brazilian ] = "Fehler beim Anlegen" ;
         Text[ chinese_simplified ] = "建立对象时发生错误";
-        Text[ russian ] = "������ ��� ��������";
+        Text[ russian ] = "������ �������� �������";
         Text[ polish ] = "B��d przy tworzeniu obiektu";
-        Text[ japanese ] = "作成の際のｴﾗｰ";
+        Text[ japanese ] = "作成の際のエラー";
         Text[ chinese_traditional ] = "發生錯誤在建立";
         Text[ arabic ] = "��� ����� �������";
         Text[ dutch ] = "Fout bij maken van object";
         Text[ chinese_simplified ] = "建立对象时发生错误";
         Text[ greek ] = "������ ���� ��� ����������";
-        Text[ korean ] = "개체 작성시 오류";
+        Text[ korean ] = "개체 만드는 중 오류";
         Text[ turkish ] = "Olu�turma hatas�";
         Text[ catalan ] = "Error al crear";
         Text[ finnish ] = "Virhe objektia luotaessa";
+        Text[ thai ] = "การสร้างวัตถุผิดพลาด";
     };
     String ERRCODE_CLASS_SBX
     {
         Text = "Unzul�ssiger Wert oder Datentyp" ;
         Text [ ENGLISH ] = "Invalid value or data type" ;
-        Text [ english_us ] = "Inadmissable value or data type" ;
+        Text [ english_us ] = "Inadmissible value or data type" ;
         Text [ italian ] = "Valore o tipo di dati non permesso" ;
         Text [ spanish ] = "Valor o tipo de datos inadmisible" ;
         Text [ french ] = "Valeur ou type de donn�es incorrect(e)" ;
@@ -903,9 +933,9 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Valor ou tipo de dados n�o autorizados" ;
         Text [ portuguese_brazilian ] = "Unzul?ssiger Wert oder Datentyp" ;
         Text[ chinese_simplified ] = "无效的数值或数据类型";
-        Text[ russian ] = "�������� ��� ��� ������ �� ���������";
+        Text[ russian ] = "������������ �������� ��� ��� ������";
         Text[ polish ] = "Niedopuszczalna warto�� lub typ pliku";
-        Text[ japanese ] = "不許可の値またはﾃﾞｰﾀﾀｲﾌﾟ";
+        Text[ japanese ] = "不許可の値またはデータタイプ";
         Text[ chinese_traditional ] = "數值或資料類型無效";
         Text[ arabic ] = "���� �����ɡ �� ��� ������ �����";
         Text[ dutch ] = "Niet toegestane waarde of gegevenstype";
@@ -913,8 +943,9 @@ Resource RID_ERRHDL
         Text[ greek ] = "�� �������� ���� � ����� ���������";
         Text[ korean ] = "허용되지 않는 값 또는 데이터 유형";
         Text[ turkish ] = "Ge�ersiz de�er ya da veri tipi";
-        Text[ catalan ] = "Valor o tipo de datos inadmisible";
-        Text[ finnish ] = "Arvon tai tietotyypin k�ytt�minen ei onnistu";
+        Text[ catalan ] = "Valor o tipus de dades inadmissible";
+        Text[ finnish ] = "Arvon tai tietotyypin k�ytt�minen ei onnistu.";
+        Text[ thai ] = "ชนิดของค่าหรือข้อมูลที่ไม่อนุญาต";
     };
     String ERRCODE_CLASS_RUNTIME
     {
@@ -930,9 +961,9 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Erro de rotina BASIC" ;
         Text [ portuguese_brazilian ] = "Basic-Laufzeitfehler" ;
         Text[ chinese_simplified ] = "BASIC 运行时间错误";
-        Text[ russian ] = "������ ��� ���������� BASIC";
+        Text[ russian ] = "������ ������� ���������� BASIC";
         Text[ polish ] = "B��d czasu przebiegu BASIC";
-        Text[ japanese ] = "BASICのﾗﾝﾀｲﾑ ｴﾗｰ";
+        Text[ japanese ] = "BASIC ランタイムエラー";
         Text[ chinese_traditional ] = "BASIC 運行時間錯誤";
         Text[ arabic ] = "��� �� ��� ����� BASIC";
         Text[ dutch ] = "BASIC runtime error";
@@ -940,8 +971,9 @@ Resource RID_ERRHDL
         Text[ greek ] = "������ ������ ��������� BASIC";
         Text[ korean ] = "BASIC 실행시간 오류";
         Text[ turkish ] = "BASIC y�r�t�m s�resi hatas�";
-        Text[ catalan ] = "Error de ejecuci�n de BASIC";
+        Text[ catalan ] = "Error d'execusi� de BASIC";
         Text[ finnish ] = "BASIC-suoritusvirhe";
+        Text[ thai ] = "การใช้งาน BASIC ผิดพลาด";
     };
     String ERRCODE_CLASS_COMPILER
     {
@@ -955,20 +987,21 @@ Resource RID_ERRHDL
         Text [ italian ] = "Errore di sintassi BASIC" ;
         Text [ spanish ] = "Error de sintaxis de BASIC" ;
         Text [ french ] = "Syntax error BASIC" ;
-        Text [ dutch ] = "BASIC syntax error" ;
+        Text [ dutch ] = "BASIC-syntaxisfout" ;
         Text[ chinese_simplified ] = "BASIC 语法错误";
         Text[ russian ] = "�������������� ������ BASIC";
         Text[ polish ] = "B��d sk�adni BASIC";
-        Text[ japanese ] = "BASICのｼﾝﾀｯｸｽｴﾗｰ";
+        Text[ japanese ] = "BASICのシンタックスエラー";
         Text[ chinese_traditional ] = "BASIC 語法錯誤";
         Text[ arabic ] = "��� �� ���� ���� BASIC";
-        Text[ dutch ] = "BASIC syntax error";
+        Text[ dutch ] = "BASIC-syntaxisfout";
         Text[ chinese_simplified ] = "BASIC 语法错误";
         Text[ greek ] = "������ �������� BASIC";
         Text[ korean ] = "BASIC 구문 오류";
         Text[ turkish ] = "BASIC s�z dizimi hatas�";
-        Text[ catalan ] = "Error de sintaxis de BASIC";
+        Text[ catalan ] = "Error de sintaxi del BASIC";
         Text[ finnish ] = "BASIC-syntaksivirhe";
+        Text[ thai ] = "ไวยกรณ์ BASIC ผิดพลาด";
     };
     String 1
     {
@@ -986,7 +1019,7 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "一般错误";
         Text[ russian ] = "����� ������";
         Text[ polish ] = "B��d og�lny";
-        Text[ japanese ] = "一般的なｴﾗｰ";
+        Text[ japanese ] = "一般的なエラー";
         Text[ chinese_traditional ] = "一般的錯誤";
         Text[ arabic ] = "��� ���";
         Text[ dutch ] = "Algemene fout";
@@ -997,12 +1030,13 @@ Resource RID_ERRHDL
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Error general";
         Text[ finnish ] = "Yleinen virhe";
+        Text[ thai ] = "ข้อผิดพลาดทั่วไป";
     };
     String ERRCODE_IO_GENERAL
     {
         Text = "Allgemeiner Ein-/Ausgabefehler" ;
         Text [ ENGLISH ] = "General input/output error" ;
-        Text [ dutch ] = "Algemene input/output error" ;
+        Text [ dutch ] = "Algemene input/output-error" ;
         Text [ english_us ] = "General input/output error" ;
         Text [ italian ] = "Errore generale di I/O" ;
         Text [ spanish ] = "Error general de entrada/salida" ;
@@ -1014,16 +1048,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "一般的输入与输出错误";
         Text[ russian ] = "����� ������ �����-������";
         Text[ polish ] = "Og�lny b��d wej�cia/wyj�cia";
-        Text[ japanese ] = "一般的な I/O ｴﾗｰ";
+        Text[ japanese ] = "一般的な I/O エラー";
         Text[ chinese_traditional ] = "一般的輸入/輸出錯誤";
         Text[ arabic ] = "��� ��� �����/����� ���";
-        Text[ dutch ] = "Algemene input/output error";
+        Text[ dutch ] = "Algemene input/output-error";
         Text[ chinese_simplified ] = "一般的输入与输出错误";
         Text[ greek ] = "������ ������ ���������/��������";
-        Text[ korean ] = "일반적 입력/출력 오류";
+        Text[ korean ] = "일반 입력/출력 오류";
         Text[ turkish ] = "Genel girdi/��kt� hatas�";
-        Text[ catalan ] = "Error general de entrada/salida";
-        Text[ finnish ] = "Yleinen sy�tt�-/tulostevirhe";
+        Text[ catalan ] = "Error general d'entrada/sortida";
+        Text[ finnish ] = "Yleinen I/O-virhe";
+        Text[ thai ] = "การป้อนข้อมูลและผลลัพธ์ทั่วไปผิดพลาด";
     };
     String ERRCODE_IO_MISPLACEDCHAR
     {
@@ -1041,17 +1076,18 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "无效的文件名";
         Text[ russian ] = "������������ ��� �����";
         Text[ polish ] = "Nazwa pliku jest nieprawid�owa";
-        Text[ japanese ] = "ﾌｧｲﾙ名は無効です";
+        Text[ japanese ] = "ファイル名は無効です";
         Text[ chinese_traditional ] = "檔案名無效";
         Text[ arabic ] = "��� ����� ��� ����";
         Text[ dutch ] = "Ongeldige bestandsnaam";
         Text[ chinese_simplified ] = "无效的文件名";
         Text[ greek ] = "�� ����� ��� ������� ��� ����� ������";
-        Text[ korean ] = "파일 이름이 유효하지 않음";
+        Text[ korean ] = "파일 이름이 잘못되었습니다";
         Text[ turkish ] = "Dosyan�n ad� ge�erli de�il";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "El nombre del archivo no es v�lido.";
-        Text[ finnish ] = "Virheellinen tiedostonimi";
+        Text[ catalan ] = "El nom del fitxer no �s v�lid.";
+        Text[ finnish ] = "Virheellinen tiedoston nimi";
+        Text[ thai ] = "ชื่อแฟ้มไม่ถูกต้อง";
     };
     String ERRCODE_IO_NOTEXISTS
     {
@@ -1067,18 +1103,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O ficheiro n�o existe." ;
         Text [ portuguese_brazilian ] = "Die Datei existiert nicht" ;
         Text[ chinese_simplified ] = "文件不存在";
-        Text[ russian ] = "���� ���� �� ����������";
+        Text[ russian ] = "���� �� ����������";
         Text[ polish ] = "Plik nie istnieje";
-        Text[ japanese ] = "ﾌｧｲﾙはありません";
+        Text[ japanese ] = "ファイルはありません";
         Text[ chinese_traditional ] = "檔案不存在";
         Text[ arabic ] = "����� ��� �����";
         Text[ dutch ] = "Bestand bestaat niet";
         Text[ chinese_simplified ] = "文件不存在";
         Text[ greek ] = "�� ������ ��� �������";
-        Text[ korean ] = "파일이 없음";
+        Text[ korean ] = "파일이 없습니다.";
         Text[ turkish ] = "Dosya mevcut de�il";
-        Text[ catalan ] = "El archivo no existe";
-        Text[ finnish ] = "Tiedostoa ei ole";
+        Text[ catalan ] = "Fitxer inexistent";
+        Text[ finnish ] = "Tiedostoa ei ole.";
+        Text[ thai ] = "ไม่มีแฟ้มอยู่";
     };
     String ERRCODE_IO_ALREADYEXISTS
     {
@@ -1094,9 +1131,9 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O ficheiro j� existe." ;
         Text [ portuguese_brazilian ] = "Die Datei existiert bereits" ;
         Text[ chinese_simplified ] = "这个文件已经存在";
-        Text[ russian ] = "����� ���� ��� ����������";
+        Text[ russian ] = "���� ��� ����������";
         Text[ polish ] = "Plik ju� istnieje";
-        Text[ japanese ] = "ﾌｧｲﾙはすでにあります";
+        Text[ japanese ] = "ファイルはすでにあります";
         Text[ chinese_traditional ] = "這個檔案已經存在";
         Text[ arabic ] = "����� ����� ������";
         Text[ dutch ] = "Bestand bestaat reeds";
@@ -1105,8 +1142,9 @@ Resource RID_ERRHDL
         Text[ korean ] = "파일이 이미 있음";
         Text[ turkish ] = "Dosya mevcut";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "El archivo ya existe";
-        Text[ finnish ] = "Tiedosto on jo olemassa";
+        Text[ catalan ] = "El fitxer ja existeix";
+        Text[ finnish ] = "Tiedosto on jo olemassa.";
+        Text[ thai ] = "มีแฟ้มอยู่";
     };
     String ERRCODE_IO_NOTADIRECTORY
     {
@@ -1122,18 +1160,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O objecto n�o � um direct�rio." ;
         Text [ portuguese_brazilian ] = "Bei dem Objekt handelt es sich nicht um ein Verzeichnis" ;
         Text[ chinese_simplified ] = "对象不是一个目录";
-        Text[ russian ] = "���� ������ �� �������� ���������";
+        Text[ russian ] = "������ �� �������� ���������";
         Text[ polish ] = "Ten obiekt nie jest katalogiem";
-        Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄはﾃﾞｨﾚｸﾄﾘではありません";
+        Text[ japanese ] = "オブジェクトはディレクトリではありません";
         Text[ chinese_traditional ] = "物件不是一個目錄";
         Text[ arabic ] = "��� ������ ��� ������";
         Text[ dutch ] = "Object is geen directory";
         Text[ chinese_simplified ] = "对象不是一个目录";
         Text[ greek ] = "�� ����������� ��� ����� ���������";
-        Text[ korean ] = "개체는 디렉토리가 아님";
+        Text[ korean ] = "개체는 디렉토리가 아닙니다.";
         Text[ turkish ] = "Nesne, dizin de�il";
-        Text[ catalan ] = "El objeto no es un directorio.";
-        Text[ finnish ] = "Objekti ei ole hakemisto";
+        Text[ catalan ] = "L'objecte no �s un directori.";
+        Text[ finnish ] = "Objekti ei ole hakemisto.";
+        Text[ thai ] = "วัตถุไม่เป็นสารบบ";
     };
     String ERRCODE_IO_NOTAFILE
     {
@@ -1149,24 +1188,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O objecto n�o � um ficheiro." ;
         Text [ portuguese_brazilian ] = "Bei dem Objekt handelt es sich nicht um eine Datei" ;
         Text[ chinese_simplified ] = "对象不是一个文件";
-        Text[ russian ] = "���� ������ �� �������� ������";
+        Text[ russian ] = "������ �� �������� ������";
         Text[ polish ] = "Ten obiekt nie jest plikiem";
-        Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄはﾌｧｲﾙではありません";
+        Text[ japanese ] = "オブジェクトはファイルではありません";
         Text[ chinese_traditional ] = "物件不是一個檔案";
         Text[ arabic ] = "��� ������ ��� �����";
         Text[ dutch ] = "Object is geen bestand";
         Text[ chinese_simplified ] = "对象不是一个文件";
         Text[ greek ] = "�� ���������� ����������� ��� ����� ������";
-        Text[ korean ] = "개체는 파일이 아님";
+        Text[ korean ] = "개체는 파일이 아닙니다.";
         Text[ turkish ] = "Nesne, dosya de�il";
-        Text[ catalan ] = "El objeto no es ning�n archivo.";
-        Text[ finnish ] = "Objekti ei ole tiedosto";
+        Text[ catalan ] = "L'objecte no �s cap fitxer.";
+        Text[ finnish ] = "Objekti ei ole tiedosto.";
+        Text[ thai ] = "วัตถุไม่เป็นแฟ้ม";
     };
     String ERRCODE_IO_INVALIDDEVICE
     {
         Text = "Das angegebene Ger�t ist ung�ltig" ;
         Text [ ENGLISH ] = "The device is invalid" ;
-        Text [ dutch ] = "Het aangegeven apparaat bestaat niet." ;
+        Text [ dutch ] = "Het opgegeven apparaat bestaat niet." ;
         Text [ english_us ] = "The specified device is invalid" ;
         Text [ italian ] = "L'apparecchiatura indicata non � valida" ;
         Text [ spanish ] = "El dispositivo especificado no es v�lido." ;
@@ -1176,24 +1216,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O perif�rico indicado n�o � v�lido." ;
         Text [ portuguese_brazilian ] = "Das angebene Ger?t ist ung?tig" ;
         Text[ chinese_simplified ] = "指定的设备无效";
-        Text[ russian ] = "�������� ���������� �� ��������";
+        Text[ russian ] = "��������� ���������� ����������";
         Text[ polish ] = "Podane urz�dzenie jest nieprawid�owe";
-        Text[ japanese ] = "指定したﾃﾞｨﾊﾞｲｽは無効です";
+        Text[ japanese ] = "指定したデバイスは無効です";
         Text[ chinese_traditional ] = "指定的設備無效";
         Text[ arabic ] = "������ ������ ��� ����";
-        Text[ dutch ] = "Het aangegeven apparaat bestaat niet.";
+        Text[ dutch ] = "Het opgegeven apparaat bestaat niet.";
         Text[ chinese_simplified ] = "指定的设备无效";
         Text[ greek ] = "� ����������� ������� ��� ����� ������";
-        Text[ korean ] = "지정된 장치는 유효하지 않습니다.";
+        Text[ korean ] = "지정된 장치는 잘못되었습니다.";
         Text[ turkish ] = "Belirtilen cihaz ge�erli de�il";
-        Text[ catalan ] = "El dispositivo especificado no es v�lido.";
-        Text[ finnish ] = "M��ritetty laite ei ole kelvollinen";
+        Text[ catalan ] = "El dispositiu especificat no �s v�lid.";
+        Text[ finnish ] = "M��ritetty laite ei ole kelvollinen.";
+        Text[ thai ] = "อุปกรณ์ที่ระบุไม่ถูกต้อง";
     };
     String ERRCODE_IO_ACCESSDENIED
     {
         Text = "Aufgrund fehlender Rechte kann auf das Objekt\nnicht zugegriffen werden" ;
         Text [ ENGLISH ] = "The device cannot be accessed because\nof insufficient user rights" ;
-        Text [ dutch ] = "Er bestaat geen recht op toegang\n tot object." ;
+        Text [ dutch ] = "U hebt geen toegangsrecht\n tot object." ;
         Text [ english_us ] = "The object cannot be accessed\ndue to insufficient user rights" ;
         Text [ italian ] = "A causa di diritti mancanti non � possibile\naccedere all'oggetto" ;
         Text [ spanish ] = "No es posible acceder al objeto\npor falta de derechos." ;
@@ -1203,18 +1244,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Imposs�vel o acesso ao objecto\npor falta de direitos." ;
         Text [ portuguese_brazilian ] = "Aufgrund fehlender Rechte kann auf das Objekt\nnicht zugegriffen werden" ;
         Text[ chinese_simplified ] = "缺少读取权利，\n无法读取这个对象";
-        Text[ russian ] = "��-�� ������������� ���� ������ � �������\n�� ��������";
+        Text[ russian ] = "�� �������� ������ � �������\n��-�� ����������� ���� ������������";
         Text[ polish ] = "Brak dost�pu do obiektu \n z powodu brakuj�cych praw dost�pu";
-        Text[ japanese ] = "権利がないので\nｵﾌﾞｼﾞｪｸﾄにｱｸｾｽできません";
+        Text[ japanese ] = "権利がないので\nオブジェクトにアクセスできません";
         Text[ chinese_traditional ] = "缺少相關權利﹐\n無法存取這個物件";
         Text[ arabic ] = "�� ���� ������ ��� ������\n���� ���� ������ �������";
-        Text[ dutch ] = "Er bestaat geen recht op toegang\n tot object.";
+        Text[ dutch ] = "U hebt geen toegangsrecht\n tot object.";
         Text[ chinese_simplified ] = "缺少读取权利，\n无法读取这个对象";
         Text[ greek ] = "� �������� ��� ����������� ��� ����� ������\n���� �������� �����������";
-        Text[ korean ] = "사용자 권한이 없어 개체에\n접근할 수 없습니다";
+        Text[ korean ] = "사용자 권한이 없어 개체에\n액세스할 수 없습니다";
         Text[ turkish ] = "Gerekli eri�im haklar�n�n olmamas� nedeniyle \nnesneye eri�im sa�lanam�yor";
-        Text[ catalan ] = "No es posible acceder al objeto\npor falta de derechos.";
-        Text[ finnish ] = "Objektin k�ytt�minen ei onnistu,\nkoska k�ytt�j�oikeudet eiv�t riit�";
+        Text[ catalan ] = "No es pot accedir a l'objecte\nper falta de drets.";
+        Text[ finnish ] = "Objektin k�ytt�minen ei onnistu,\nkoska k�ytt�j�oikeudet eiv�t riit�.";
+        Text[ thai ] = "ไม่สามารถเข้าถึงวัตถุได้\nเนื่องจากสิทธิของผู้ใช้ไม่เหมาะสม";
     };
     String ERRCODE_IO_LOCKVIOLATION
     {
@@ -1230,18 +1272,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Erro ao tentar acesso partilhado ao objecto." ;
         Text [ portuguese_brazilian ] = "Fehler beim gemeinsamen Zugriff auf das Objekt" ;
         Text[ chinese_simplified ] = "在同时读取这个对象时发生错误";
-        Text[ russian ] = "������ ��� ������������ ������� � �������";
+        Text[ russian ] = "������ ������ ������� � �������";
         Text[ polish ] = "Nast�pi�o naruszenie zasad wsp�u�ytkowania podczas dost�pu do obiektu";
-        Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄへの共有ｱｸｾｽの際のｴﾗｰ。";
+        Text[ japanese ] = "オブジェクトへの共有アクセスの際のエラー。";
         Text[ chinese_traditional ] = "在同時存取這個物件時發生錯誤";
         Text[ arabic ] = "��� ��� ����� ������ ������ ������� ��� ������";
         Text[ dutch ] = "Fout bij gelijktijdige toegang tot object";
         Text[ chinese_simplified ] = "在同时读取这个对象时发生错误";
         Text[ greek ] = "������ ���� ��� ����� �������� ��� �����������";
-        Text[ korean ] = "개체에 공동 접근시에 오류";
+        Text[ korean ] = "개체에 공동 액세스시에 오류";
         Text[ turkish ] = "Nesneye eri�imde bir payla��m hatas� olu�tu";
-        Text[ catalan ] = "Error al acceder conjuntamente al objeto.";
+        Text[ catalan ] = "S'ha produ�t un error en accedir conjuntament a l'objecte.";
         Text[ finnish ] = "Objektin yhteisk�ytt�virhe";
+        Text[ thai ] = "การร่วมฝ่าฝืนขณะเข้าถึงวัตถุ";
     };
     String ERRCODE_IO_OUTOFSPACE
     {
@@ -1257,9 +1300,9 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "N�o h� mais espa�o no perif�rico." ;
         Text [ portuguese_brazilian ] = "Auf dem Ger?t ist kein Platz mehr verf?bar" ;
         Text[ chinese_simplified ] = "设备上的可用空间已经用完";
-        Text[ russian ] = "�� ���� ���������� ���������� ����� ������ ���";
+        Text[ russian ] = "�� ���� ���������� ��� ������ ���������� �����";
         Text[ polish ] = "Nie ma wi�cej miejsca na tym urz�dzeniu";
-        Text[ japanese ] = "ﾃﾞｨﾊﾞｲｽ上に空き容量がありません";
+        Text[ japanese ] = "デバイス上に空き容量がありません";
         Text[ chinese_traditional ] = "設備的可用空間已經用盡";
         Text[ arabic ] = "�� ��� ���� ���� �� ������";
         Text[ dutch ] = "Onvoldoende opslagruimte";
@@ -1267,8 +1310,9 @@ Resource RID_ERRHDL
         Text[ greek ] = "��� ����� ���������� ������������ ����� ��� �������";
         Text[ korean ] = "장치에 더 이상 공간이 없음";
         Text[ turkish ] = "Cihazda yeterli alan kalmad�";
-        Text[ catalan ] = "No hay espacio disponible en el dispositivo.";
-        Text[ finnish ] = "Laitteen tila ei riit�";
+        Text[ catalan ] = "Ja no hi ha espai en el dispositiu";
+        Text[ finnish ] = "Laitteen tila ei riit�.";
+        Text[ thai ] = "ไม่มีที่ว่างบนอุปกรณ์มากกว่านี้";
     };
     String ERRCODE_IO_ISWILDCARD
     {
@@ -1284,18 +1328,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "A opera��o n�o pode ser executada em\nficheiros que contenham caracteres universais." ;
         Text [ portuguese_brazilian ] = "Die Operation kann nicht auf Dateien, welche\nWildcards enthalten, ausgef?rt werden" ;
         Text[ chinese_simplified ] = "无法在含有通配符的\n文件中执行这个操作";
-        Text[ russian ] = "��������� �������� � �������, \n����������� �������������� �����, ����������";
+        Text[ russian ] = "���������� ��������� �������� � �������, \n����������� ������� �������";
         Text[ polish ] = "Operacja nie mo�e by� wykonana na plikach, kt�re \nzawieraj� symbole wieloznaczne (Wildcarts)";
-        Text[ japanese ] = "ﾜｲﾙﾄﾞｶｰﾄﾞを含むﾌｧｲﾙで\n操作は実行できません";
-        Text[ chinese_traditional ] = "這些檔案含有通配符﹐\n而無法執行過程";
+        Text[ japanese ] = "ワイルドカードを含むファイルで\n操作は実行できません";
+        Text[ chinese_traditional ] = "這些檔案含有萬用字元﹐\n而無法執行過程";
         Text[ arabic ] = "�� ���� ����� ��� ������� ��� �����\n����� ��� ���� ���.";
         Text[ dutch ] = "Deze opdracht kan niet worden uitgevoerd bij bestanden \ndie wildcards bevatten";
         Text[ chinese_simplified ] = "无法在含有通配符的\n文件中执行这个操作";
         Text[ greek ] = "���� � ���������� ��� ����� ������� �� ���������� �� ������ �� ����� \n ��������� ���������� ���������";
-        Text[ korean ] = "이 작업은 와일드 카드가 포함된 파일\n 에서 실행될 수 없습니다.";
+        Text[ korean ] = "이 작업은 패턴 일치(와일드카드)가 포함된\\파일에서 실행할 수 없습니다.";
         Text[ turkish ] = "��lem, genel arama karakterleri\n i�eren dosyalar �zerinde ger�ekle�tirilemiyor";
-        Text[ catalan ] = "La operaci�n no se puede ejecutar en\narchivos que contengan Wildcards.";
-        Text[ finnish ] = "T�t� toimintoa ei voi suorittaa,\njos tiedostot sis�lt�v�t yleismerkkej�";
+        Text[ catalan ] = "L'operaci� no es pot executar en\nfitxers que tinguin Wildcards.";
+        Text[ finnish ] = "T�t� toimintoa ei voi suorittaa,\njos tiedostot sis�lt�v�t yleismerkkej�.";
+        Text[ thai ] = "ไม่สามารถรันการปฏิบัติการนี้บน\nแฟ้มที่มีสัญลักษณ์ตัวแทน";
     };
     String ERRCODE_IO_NOTSUPPORTED
     {
@@ -1303,7 +1348,7 @@ Resource RID_ERRHDL
         Text [ ENGLISH ] = "This operation is not supported on this operating system" ;
         Text [ english_us ] = "This operation is not supported on this operating system" ;
         Text [ italian ] = "L'operazione non viene supportata sul sistema operativo presente" ;
-        Text [ spanish ] = "La operaci�n no es apoyada por este sistema operativo." ;
+        Text [ spanish ] = "Este sistema operativo no admite esta operaci�n." ;
         Text [ french ] = "Cette op�ration n'est pas support�e sur ce syst�me d'exploitation." ;
         Text [ dutch ] = "Deze opdracht wordt niet ondersteund door het bestaande besturingssysteem" ;
         Text [ swedish ] = "Operationen st�ds inte av detta operativsystem" ;
@@ -1311,18 +1356,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "A opera��o n�o tem suporte neste sistema operativo." ;
         Text [ portuguese_brazilian ] = "Die Operation wird auf dem vorliegenden Betriebssystem nicht unterst?zt" ;
         Text[ chinese_simplified ] = "当前的操作平台不支持这个操作";
-        Text[ russian ] = "��� �������� �� �������������� ������ ������������ ��������";
+        Text[ russian ] = "�������� �� �������������� ������������ ��������";
         Text[ polish ] = "Ta operacja nie jest obs�ugiwana w tym systemie operacyjnym.";
-        Text[ japanese ] = "この操作はこのｵﾍﾟﾚｰｼｮﾝ ｼｽﾃﾑでは支援されません";
-        Text[ chinese_traditional ] = "當前使用的操作系統不支援這個動作";
+        Text[ japanese ] = "この操作はこのオペレーティングシステムでは支援されません";
+        Text[ chinese_traditional ] = "目前使用的作業系統不支援這個動作";
         Text[ arabic ] = "���� ������� ��� �� ���� ��� �������";
         Text[ dutch ] = "Deze opdracht wordt niet ondersteund door het bestaande besturingssysteem";
         Text[ chinese_simplified ] = "当前的操作平台不支持这个操作";
         Text[ greek ] = "� ���������� ���� ��� ������������� �� ���� �� ����������� �������";
-        Text[ korean ] = "작업이 이 운영체제에서 지원되지 않습니다.";
+        Text[ korean ] = "이 운영체제에서 이 작업을 지원하지 않습니다.";
         Text[ turkish ] = "Bu i�lem, i�letim sistemi taraf�ndan desteklenmiyor";
-        Text[ catalan ] = "La operaci�n no es apoyada por este sistema operativo.";
-        Text[ finnish ] = "K�ytt�j�rjestelm� ei tue toimintoa";
+        Text[ catalan ] = "Aquesta operaci� no �s suportada per aquest sistema operatiu.";
+        Text[ finnish ] = "K�ytt�j�rjestelm� ei tue toimintoa.";
+        Text[ thai ] = "ไม่สนับสนุนปฏิบัติการนี้บนระบบปฏิบัติการ";
     };
     String ERRCODE_IO_TOOMANYOPENFILES
     {
@@ -1340,22 +1386,23 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "已经打开的文件太多";
         Text[ russian ] = "������� ������� ����� ������";
         Text[ polish ] = "Jest otworzonych za du�o plik�w";
-        Text[ japanese ] = "すでにﾌｧｲﾙをたくさん開きすぎています";
+        Text[ japanese ] = "すでにファイルをたくさん開きすぎています";
         Text[ chinese_traditional ] = "開啟了太多檔案";
         Text[ arabic ] = "��� ��������� �������� ���� ����";
         Text[ dutch ] = "Te veel bestanden geopend";
         Text[ chinese_simplified ] = "已经打开的文件太多";
         Text[ greek ] = "����� ��� ����� ������ �������";
-        Text[ korean ] = "너무 많은 파일이 열려있습니다.";
+        Text[ korean ] = "너무 많은 파일이 열려 있습니다.";
         Text[ turkish ] = "�ok fazla dosya a��k";
-        Text[ catalan ] = "Hay demasiados archivos abiertos.";
-        Text[ finnish ] = "Avonaisia tiedostoja on liikaa";
+        Text[ catalan ] = "Hi ha massa fitxers oberts";
+        Text[ finnish ] = "Avonaisia tiedostoja on liikaa.";
+        Text[ thai ] = "มีแฟ้มที่เปิดอยู่มากเกินไป";
     };
     String ERRCODE_IO_CANTREAD
     {
         Text = "Von der Datei konnte nicht gelesen werden" ;
         Text [ ENGLISH ] = "The file could not be read" ;
-        Text [ dutch ] = "Bestand kon niet worden gelezen" ;
+        Text [ dutch ] = "Bestand kan niet worden gelezen" ;
         Text [ english_us ] = "Data could not be read from the file" ;
         Text [ italian ] = "Non � stato possibile leggere dal file" ;
         Text [ spanish ] = "No se pudo leer del archivo." ;
@@ -1365,18 +1412,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel ler o ficheiro." ;
         Text [ portuguese_brazilian ] = "Von der Datei konnte nicht gelesen werden" ;
         Text[ chinese_simplified ] = "无法读取这个文件";
-        Text[ russian ] = "��������� ���� ����������";
+        Text[ russian ] = "���������� ������� ����";
         Text[ polish ] = "Ten plik nie mog� zosta� odczytany";
-        Text[ japanese ] = "ﾌｧｲﾙから読み取れませんでした";
+        Text[ japanese ] = "ファイルから読み取れませんでした";
         Text[ chinese_traditional ] = "無法讀取這個檔案";
         Text[ arabic ] = "����� ����� �����";
-        Text[ dutch ] = "Bestand kon niet worden gelezen";
+        Text[ dutch ] = "Bestand kan niet worden gelezen";
         Text[ chinese_simplified ] = "无法读取这个文件";
         Text[ greek ] = "��� ���� ������� �� ����� �������� ��� �������";
-        Text[ korean ] = "파일에서 읽을 수 없습니다.";
+        Text[ korean ] = "파일을 읽을 수 없습니다.";
         Text[ turkish ] = "Dosyadan veri okunamad�";
-        Text[ catalan ] = "No se pudo leer del archivo.";
-        Text[ finnish ] = "Tietojen lukeminen tiedostosta ei onnistu";
+        Text[ catalan ] = "No s'han pogut llegir les dades des del fitxer";
+        Text[ finnish ] = "Tietojen lukeminen tiedostosta ei onnistu.";
+        Text[ thai ] = "ไม่สามารถอ่านข้อมูลจากแฟ้มได้";
     };
     String ERRCODE_IO_CANTWRITE
     {
@@ -1386,25 +1434,26 @@ Resource RID_ERRHDL
         Text [ italian ] = "Non � stato possibile scrivere il file" ;
         Text [ spanish ] = "No se pudo guardar el archivo" ;
         Text [ french ] = "Impossible d'�crire le fichier" ;
-        Text [ dutch ] = "Bestand kon niet worden opgeslagen" ;
+        Text [ dutch ] = "Bestand kan niet worden opgeslagen" ;
         Text [ swedish ] = "Det gick inte att skriva filen" ;
         Text [ danish ] = "Det var ikke muligt at skrive filen" ;
         Text [ portuguese ] = "Foi imposs�vel escrever o ficheiro." ;
         Text [ portuguese_brazilian ] = "Auf die Datei konnte nicht gespeicherwerden" ;
         Text[ chinese_simplified ] = "无法写入这个文件";
-        Text[ russian ] = "������ ����� �� �������";
+        Text[ russian ] = "���������� �������� ����";
         Text[ polish ] = "Pliku nie mo�na by�o zapisa�";
-        Text[ japanese ] = "ﾌｧｲﾙを書き込みできませんでした";
+        Text[ japanese ] = "ファイルを書き込みできませんでした";
         Text[ chinese_traditional ] = "無法寫入這個檔案";
         Text[ arabic ] = "����� ����� �����";
-        Text[ dutch ] = "Bestand kon niet worden opgeslagen";
+        Text[ dutch ] = "Bestand kan niet worden opgeslagen";
         Text[ chinese_simplified ] = "无法写入这个文件";
         Text[ greek ] = "��� ���� ������ � ������� ��� �������";
         Text[ korean ] = "파일에 쓸 수 없습니다.";
         Text[ turkish ] = "Dosya yaz�lamad�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No se pudo guardar el archivo";
+        Text[ catalan ] = "No s'ha pogut escriure el fitxer";
         Text[ finnish ] = "Tiedoston kirjoittaminen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถเขียนแฟ้มได้";
     };
     String ERRCODE_IO_OUTOFMEMORY
     {
@@ -1414,30 +1463,31 @@ Resource RID_ERRHDL
         Text [ italian ] = "A causa di insufficienza di memoria non � stato possibile completare l'operazione" ;
         Text [ spanish ] = "La operaci�n no se pudo ejecutar por falta de memoria." ;
         Text [ french ] = "Impossible d'ex�cuter cette action, m�moire insuffisante !" ;
-        Text [ dutch ] = "De opdracht kon niet worden uitgevoerd bij gebrek aan vrij geheugen." ;
+        Text [ dutch ] = "De opdracht kan niet worden uitgevoerd bij gebrek aan vrij geheugen." ;
         Text [ swedish ] = "Operationen kunde inte utf�ras p� grund av f�r lite minne." ;
         Text [ danish ] = "Det var ikke muligt at udf�re operationen, fordi der ikke er tilstr�kkelig hukommelse" ;
         Text [ portuguese ] = "Foi imposs�vel executar a opera��o por n�o existir mem�ria suficiente." ;
         Text [ portuguese_brazilian ] = "Die Operation konnte wegen Speichermangels nicht ausgef?rt werden" ;
         Text[ chinese_simplified ] = "因为内存不足而无法执行这个操作";
-        Text[ russian ] = "��-�� ���������� ������ ��������� �������� ����������";
+        Text[ russian ] = "���������� ��������� �������� ��-�� �������� ������";
         Text[ polish ] = "Operacja nie mog�a zosta� wykonana z powodu braku pami�ci";
-        Text[ japanese ] = "この操作はﾒﾓﾘ不足のため実行できません";
+        Text[ japanese ] = "この操作はディスク空き容量が足りないため実行できません";
         Text[ chinese_traditional ] = "因為記憶體不足而無法執行這個動作";
         Text[ arabic ] = "���� ����� ������ɡ ���� ��� �������";
-        Text[ dutch ] = "De opdracht kon niet worden uitgevoerd bij gebrek aan vrij geheugen.";
+        Text[ dutch ] = "De opdracht kan niet worden uitgevoerd bij gebrek aan vrij geheugen.";
         Text[ chinese_simplified ] = "因为内存不足而无法执行这个操作";
         Text[ greek ] = "��� ���� ������� �� ���������� � ���������� ���� �������� ������";
-        Text[ korean ] = "메모리 부족으로 인해, 작업을 실행하지 못했습니다.";
+        Text[ korean ] = "메모리가 부족하여 작업을 실행하지 못했습니다.";
         Text[ turkish ] = "��lem, bellek yetersizli�i nedeniyle y�r�t�lemedi";
-        Text[ catalan ] = "La operaci�n no se pudo ejecutar por falta de memoria.";
+        Text[ catalan ] = "L'operaci� no s'ha pogut executar per falta de mem�ria.";
         Text[ finnish ] = "Toiminnon suorittaminen ei onnistunut muistin loppumisen takia.";
+        Text[ thai ] = "ไม่สามารถรันปฏิบัติการได้เนื่องจากหน่วยความจำไม่เพียงพอ";
     };
     String ERRCODE_IO_CANTSEEK
     {
         Text = "Die Seekoperation konnte nicht ausgef�hrt werden" ;
         Text [ ENGLISH ] = "The seek operation could not be completed" ;
-        Text [ dutch ] = "De zoekopdracht kon niet worden uitgevoerd" ;
+        Text [ dutch ] = "Zoekopdracht kan niet worden uitgevoerd" ;
         Text [ english_us ] = "The seek operation could not be run" ;
         Text [ italian ] = "Non � stato possibile eseguire l'operazione di seek" ;
         Text [ spanish ] = "No se pudo ejecutar la operaci�n Seek." ;
@@ -1447,18 +1497,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel executar a opera��o de localiza��o." ;
         Text [ portuguese_brazilian ] = "Die Seekoperation konnte nicht ausgef?rt werden" ;
         Text[ chinese_simplified ] = "无法执行搜寻操作";
-        Text[ russian ] = "��������� �������� seek �� �������";
+        Text[ russian ] = "���������� ��������� �������� seek";
         Text[ polish ] = "Nie mo�na by�o wykona� operacji pliku (Seek)";
         Text[ japanese ] = "Seek操作が実行できません";
         Text[ chinese_traditional ] = "無法執行搜尋指令";
         Text[ arabic ] = "���� ����� ������� \"Seek\"";
-        Text[ dutch ] = "De zoekopdracht kon niet worden uitgevoerd";
+        Text[ dutch ] = "Zoekopdracht kan niet worden uitgevoerd";
         Text[ chinese_simplified ] = "无法执行搜寻操作";
         Text[ greek ] = "��� ���� ������� �� ���������� � ���������� ����������";
         Text[ korean ] = "자리 찾기 작업을 실행하지 못했습니다.";
         Text[ turkish ] = "Arama i�lemi y�r�t�lemedi";
-        Text[ catalan ] = "No se pudo ejecutar la operaci�n Seek.";
-        Text[ finnish ] = "Hakutoimintoa ei voitu suorittaa";
+        Text[ catalan ] = "No s'ha pogut executar l'operaci� Seek.";
+        Text[ finnish ] = "Hakutoimintoa ei voitu suorittaa.";
+        Text[ thai ] = "ไม่สามารถใช้งานปฏิบัติการค้นหาได้";
     };
     String ERRCODE_IO_CANTTELL
     {
@@ -1468,30 +1519,31 @@ Resource RID_ERRHDL
         Text [ italian ] = "Non � stato possibile eseguire l'operazione tell" ;
         Text [ spanish ] = "No se pudo ejecutar la operaci�n Tell" ;
         Text [ french ] = "Impossible d'ex�cuter l'op�ration tell" ;
-        Text [ dutch ] = "De bestandsopdracht TELL kon niet worden uitgevoerd" ;
+        Text [ dutch ] = "Bestandsopdracht TELL kan niet worden uitgevoerd" ;
         Text [ swedish ] = "Telloperationen kunde inte utf�ras" ;
         Text [ danish ] = "Det var ikke muligt at udf�re tell-operationen" ;
         Text [ portuguese ] = "Foi imposs�vel executar a opera��o Tell" ;
         Text [ portuguese_brazilian ] = "Die Telloperation konnte nicht ausgef?rt werden" ;
         Text[ chinese_simplified ] = "无法执行 tell 命令";
-        Text[ russian ] = "��������� �������� tell ����������";
+        Text[ russian ] = "���������� ��������� �������� tell";
         Text[ polish ] = "Nie mo�na by�o wykona� operacji pliku (Tell)";
         Text[ japanese ] = "Tell操作が実行できません";
         Text[ chinese_traditional ] = "無法執行 Tell 指令";
         Text[ arabic ] = "���� ����� ������� \"Tell\"";
-        Text[ dutch ] = "De bestandsopdracht TELL kon niet worden uitgevoerd";
+        Text[ dutch ] = "Bestandsopdracht TELL kan niet worden uitgevoerd";
         Text[ chinese_simplified ] = "无法执行 tell 命令";
         Text[ greek ] = "��� ���� ������� �� ���������� � ���������� \"Tell\"";
         Text[ korean ] = "Tell 작업을 실행하지 못했습니다";
         Text[ turkish ] = "Tell i�lemi y�r�t�lemedi";
-        Text[ catalan ] = "No se pudo ejecutar la operaci�n Tell";
-        Text[ finnish ] = "Vastaustoimintoa ei voitu suorittaa";
+        Text[ catalan ] = "No s'ha pogut executar l'operaci� Tell";
+        Text[ finnish ] = "Vastaustoimintoa ei voitu suorittaa.";
+        Text[ thai ] = "ไม่สามารถใช้งานปฏิบัติการบอกได้";
     };
     String ERRCODE_IO_WRONGVERSION
     {
         Text = "Die Datei liegt in einer falschen Version vor" ;
         Text [ ENGLISH ] = "The file has a wrong version" ;
-        Text [ dutch ] = "Bestand heeft verkeerde versie" ;
+        Text [ dutch ] = "Bestand heeft foutieve versie" ;
         Text [ english_us ] = "Incorrect file version" ;
         Text [ italian ] = "Il file � presente in una versione errata" ;
         Text [ spanish ] = "Versi�n incorrecta de archivo." ;
@@ -1501,24 +1553,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Vers�o incorrecta do ficheiro." ;
         Text [ portuguese_brazilian ] = "Die Datei liegt in einer falschen Version vor" ;
         Text[ chinese_simplified ] = "文件的版本无效";
-        Text[ russian ] = "���� ����������� � ������������ ������";
+        Text[ russian ] = "������������ ������ �����";
         Text[ polish ] = "Wersja pliku jest nieprawid�owa";
-        Text[ japanese ] = "ﾌｧｲﾙのﾊﾞｰｼﾞｮﾝが正しくありません";
+        Text[ japanese ] = "ファイルのバージョンが正しくありません";
         Text[ chinese_traditional ] = "檔案版本無效";
         Text[ arabic ] = "����� ����� ��� ����";
-        Text[ dutch ] = "Bestand heeft verkeerde versie";
+        Text[ dutch ] = "Bestand heeft foutieve versie";
         Text[ chinese_simplified ] = "文件的版本无效";
         Text[ greek ] = "����� ������ ��� �������";
-        Text[ korean ] = "틀린 파일 버전";
+        Text[ korean ] = "파일 버전이 올바르지 않습니다.";
         Text[ turkish ] = "Yanl�� dosya s�r�m�";
-        Text[ catalan ] = "Versi�n incorrecta de archivo.";
+        Text[ catalan ] = "Versi� incorrecta del fitxer.";
         Text[ finnish ] = "V��r� tiedostoversio";
+        Text[ thai ] = "เวอร์ชั่นแฟ้มไม่ถูกต้อง";
     };
     String ERRCODE_IO_WRONGFORMAT
     {
         Text = "Die Datei liegt in einem falschen Format vor" ;
         Text [ ENGLISH ] = "The file has a wrong format" ;
-        Text [ dutch ] = "Bestand heeft verkeerd formaat" ;
+        Text [ dutch ] = "Bestand heeft foutieve indeling" ;
         Text [ english_us ] = "Incorrect file format" ;
         Text [ italian ] = "Il file ha un formato errato" ;
         Text [ spanish ] = "Formato de archivo incorrecto" ;
@@ -1528,24 +1581,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Formato de ficheiro incorrecto." ;
         Text [ portuguese_brazilian ] = "Die Datei liegt in einem falschen Format vor" ;
         Text[ chinese_simplified ] = "文件的格式错误";
-        Text[ russian ] = "���� ����������� � ������������ �������";
+        Text[ russian ] = "������������ ������ �����";
         Text[ polish ] = "Format pliku jest nieprawid�owy";
-        Text[ japanese ] = "ﾌｧｲﾙの書式が正しくありません";
+        Text[ japanese ] = "ファイルの書式が正しくありません";
         Text[ chinese_traditional ] = "檔案格式錯誤";
         Text[ arabic ] = "����� ����� ��� ����";
-        Text[ dutch ] = "Bestand heeft verkeerd formaat";
+        Text[ dutch ] = "Bestand heeft foutieve indeling";
         Text[ chinese_simplified ] = "文件的格式错误";
         Text[ greek ] = "�� ������ ����� �������";
-        Text[ korean ] = "잘못된 파일 서식";
+        Text[ korean ] = "파일 서식이 잘못되었습니다.";
         Text[ turkish ] = "Yanl�� dosya s�r�m�";
-        Text[ catalan ] = "Formato de archivo incorrecto";
+        Text[ catalan ] = "Format del fitxer incorrecte";
         Text[ finnish ] = "V��r� tiedostomuoto";
+        Text[ thai ] = "รูปแบบแฟ้มไม่ถูกต้อง";
     };
     String ERRCODE_IO_INVALIDCHAR
     {
         Text = "Der Dateiname enth�lt unzul�ssige Zeichen" ;
         Text [ ENGLISH ] = "The filename contains invalid characters" ;
-        Text [ dutch ] = "De bestandsnaam bevat ongeoorloofde tekens" ;
+        Text [ dutch ] = "De bestandsnaam bevat ongeldige tekens" ;
         Text [ english_us ] = "The file name contains invalid characters" ;
         Text [ italian ] = "Il nome del file contiene caratteri non permessi" ;
         Text [ spanish ] = "El nombre del archivo contiene caracteres inadmisibles." ;
@@ -1557,16 +1611,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "文件名中含有无效的字符";
         Text[ russian ] = "��� ����� �������� ������������ �������";
         Text[ polish ] = "Nazwa pliku zawiera nieprawid�owe znaki";
-        Text[ japanese ] = "ﾌｧｲﾙ名に不適切な文字が含まれています";
+        Text[ japanese ] = "ファイル名に不適切な文字が含まれています";
         Text[ chinese_traditional ] = "檔案名含有無效的字元";
         Text[ arabic ] = "����� ��� ����� ��� ���� ��� ����� ���";
-        Text[ dutch ] = "De bestandsnaam bevat ongeoorloofde tekens";
+        Text[ dutch ] = "De bestandsnaam bevat ongeldige tekens";
         Text[ chinese_simplified ] = "文件名中含有无效的字符";
         Text[ greek ] = "�� ����� ��� ������� �������� �� �������� ����������";
-        Text[ korean ] = "파일이름에 허용되지 않은 문자가 포함되어 있습니다.";
+        Text[ korean ] = "파일 이름에 잘못된 문자가 포함되어 있습니다.";
         Text[ turkish ] = "Dosya ad� ge�ersiz karakterler i�eriyor";
-        Text[ catalan ] = "El nombre del archivo contiene caracteres inadmisibles.";
-        Text[ finnish ] = "Tiedoston nimess� on virheellisi� merkkej�";
+        Text[ catalan ] = "El nom del fitxer cont� par�metres no permesos.";
+        Text[ finnish ] = "Tiedoston nimess� on virheellisi� merkkej�.";
+        Text[ thai ] = "ชื่อแฟ้มมีตัวอักขระที่ไม่ถูกต้อง";
     };
     String ERRCODE_IO_UNKNOWN
     {
@@ -1576,24 +1631,25 @@ Resource RID_ERRHDL
         Text [ italian ] = "Si � verificato un errore di I/O sconosciuto" ;
         Text [ spanish ] = "Ha ocurrido un error desconocido de entrada/salida." ;
         Text [ french ] = "Erreur d'entr�e/sortie inconnue" ;
-        Text [ dutch ] = "Onbekende I/O fout" ;
+        Text [ dutch ] = "Onbekende I/O-fout" ;
         Text [ swedish ] = "Ett ok�nt input-/outputfel uppstod" ;
         Text [ danish ] = "Der opstod en ukendt input-/outputfejl" ;
         Text [ portuguese ] = "Surgiu um erro de entrada/sa�da desconhecido." ;
         Text [ portuguese_brazilian ] = "Es trat ein unbekannter Ein-/Ausgabefehler auf" ;
         Text[ chinese_simplified ] = "出现一个不明的输入/输出错误";
-        Text[ russian ] = "��������� ����������� ������ �����-������";
+        Text[ russian ] = "����������� ������ �����-������";
         Text[ polish ] = "Wyst�pi� nieznany b��d wej�cia/wyj�cia";
-        Text[ japanese ] = "不明なI/O ｴﾗｰが発生";
+        Text[ japanese ] = "不明なI/O エラーが発生";
         Text[ chinese_traditional ] = "出現一個不明的輸入/輸出錯誤";
         Text[ arabic ] = "��� ��� �����/����� ��� �����";
-        Text[ dutch ] = "Onbekende I/O fout";
+        Text[ dutch ] = "Onbekende I/O-fout";
         Text[ chinese_simplified ] = "出现一个不明的输入/输出错误";
         Text[ greek ] = "������������� ������� ������ ���������/��������";
-        Text[ korean ] = "알수없는 입/출력 오류 발생";
+        Text[ korean ] = "알 수 없는 입력/출력 오류가 발생했습니다";
         Text[ turkish ] = "Bilinmeyen bir girdi/��kt� hatas� olu�tu";
-        Text[ catalan ] = "Ha ocurrido un error desconocido de entrada/salida.";
-        Text[ finnish ] = "On ilmennyt tuntematon keskeytysvirhe";
+        Text[ catalan ] = "S'ha produ�t un error desconegut d'entrada/sortida.";
+        Text[ finnish ] = "On ilmennyt tuntematon I/O-virhe.";
+        Text[ thai ] = "เกิดข้อผิดพลาด I/O ที่ไม่รู้จัก";
     };
     String ERRCODE_IO_INVALIDACCESS
     {
@@ -1609,24 +1665,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Tentativa incorrecta de acesso ao ficheiro." ;
         Text [ portuguese_brazilian ] = "Es wurde versucht, in ung?tiger Weise auf die Datei zuzugreifen" ;
         Text[ chinese_simplified ] = "读取文件的方式无效";
-        Text[ russian ] = "���� ��������� ������� ���������� ����� �������� ������ � �����";
+        Text[ russian ] = "������������ ������� ��������� ������� � �����";
         Text[ polish ] = "Nast�pi�a pr�ba uzyskania nieprawid�owego dost�pu do pliku";
-        Text[ japanese ] = "無効なやり方でのﾌｧｲﾙへのｱｸｾｽが試みられました";
+        Text[ japanese ] = "無効なやり方でのファイルへのアクセスが試みられました";
         Text[ chinese_traditional ] = "存取檔案的方式無效";
         Text[ arabic ] = "��� ������ ������ ��� ����� ���� ��� ����";
         Text[ dutch ] = "Ongeldige poging tot openen van bestand";
         Text[ chinese_simplified ] = "读取文件的方式无效";
         Text[ greek ] = "����� �� ������ ���������� ��������� ��� ������";
-        Text[ korean ] = "유효하지 않은 파일 접근 시도가 있었습니다.";
+        Text[ korean ] = "잘못된 파일 액세스 시도를 했습니다.";
         Text[ turkish ] = "Dosyaya yetkisiz eri�im denendi";
-        Text[ catalan ] = "Se ha tratado de acceder al archivo de manera no v�lida.";
-        Text[ finnish ] = "Tiedostoja yritettiin k�ytt�� virheellisesti";
+        Text[ catalan ] = "S'ha provat d'accedir al fitxer de manera incorrecta.";
+        Text[ finnish ] = "Tiedostoja yritettiin k�ytt�� virheellisesti.";
+        Text[ thai ] = "ความพยายามเข้าถึงแฟ้มไม่ถูกต้อง";
     };
     String ERRCODE_IO_CANTCREATE
     {
         Text = "Die Datei konnte nicht angelegt werden" ;
         Text [ ENGLISH ] = "The file could not be created" ;
-        Text [ dutch ] = "Bestand kon niet worden gemaakt" ;
+        Text [ dutch ] = "Bestand kan niet worden gemaakt" ;
         Text [ english_us ] = "The file could not be created" ;
         Text [ italian ] = "Non � stato possibile creare il file" ;
         Text [ spanish ] = "No se pudo crear el archivo." ;
@@ -1636,18 +1693,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel criar o ficheiro." ;
         Text [ portuguese_brazilian ] = "Die Datei konnte nicht angelegt werden" ;
         Text[ chinese_simplified ] = "无法建立这个文件";
-        Text[ russian ] = "������� ���� ����������";
+        Text[ russian ] = "���������� ������� ����";
         Text[ polish ] = "Plik nie m�g� zosta� utworzony";
-        Text[ japanese ] = "ﾌｧｲﾙは格納できませんでした";
+        Text[ japanese ] = "ファイルは格納できませんでした";
         Text[ chinese_traditional ] = "無法建立這個檔案";
         Text[ arabic ] = "���� ����� �����";
-        Text[ dutch ] = "Bestand kon niet worden gemaakt";
+        Text[ dutch ] = "Bestand kan niet worden gemaakt";
         Text[ chinese_simplified ] = "无法建立这个文件";
         Text[ greek ] = "�� ������ ��� ���� ������� �� ������������";
         Text[ korean ] = "파일을 만들지 못했습니다.";
         Text[ turkish ] = "Dosya olu�turulamad�";
-        Text[ catalan ] = "No se pudo crear el archivo.";
+        Text[ catalan ] = "No s'ha pogut crear el fitxer";
         Text[ finnish ] = "Tiedoston luominen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถสร้างแฟ้มได้";
     };
     String ERRCODE_IO_INVALIDPARAMETER
     {
@@ -1663,24 +1721,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "A opera��o foi iniciada com um par�metro incorrecto." ;
         Text [ portuguese_brazilian ] = "Die Operation wurde mit einem ung?tigen Parameter gestartet" ;
         Text[ chinese_simplified ] = "使用一个无效的参数启动了这个操作";
-        Text[ russian ] = "�������� �������� ��� ������ ������������� ���������";
+        Text[ russian ] = "�������� �������� � �������������� ������������� ���������";
         Text[ polish ] = "Przy rozpocz�ciu operacji u�yto nieprawid�owego parametru";
-        Text[ japanese ] = "この操作は無効なﾊﾟﾗﾒｰﾀで開始しました";
+        Text[ japanese ] = "この操作は無効なパラメータで開始しました";
         Text[ chinese_traditional ] = "使用一個無效的參數來執行這個過程。";
         Text[ arabic ] = "�� ��� ������� ������ ��� �����";
         Text[ dutch ] = "Activiteit uitgevoerd met ongeldige parameter.";
         Text[ chinese_simplified ] = "使用一个无效的参数启动了这个操作";
         Text[ greek ] = "� ���������� �������� �� �� ������ ���������";
-        Text[ korean ] = "유효하지 않은 파라미터로 작동이 시작되었습니다.";
+        Text[ korean ] = "잘못된 매개 변수로 작동을 시작했습니다";
         Text[ turkish ] = "��lem ge�ersiz bir parametre ile ba�lat�ld�.";
-        Text[ catalan ] = "La operaci�n se inici� con un par�metro no v�lido.";
-        Text[ finnish ] = "Toiminto aloitettiin v��r�ll� parametrill�";
+        Text[ catalan ] = "L'operaci� s'ha iniciat amb un par�metre no v�lid.";
+        Text[ finnish ] = "Toiminto aloitettiin v��r�ll� parametrill�.";
+        Text[ thai ] = "เริ่มปฏิบัติการภายใต้พารามิเตอร์ที่ไม่ถูกต้อง";
     };
     String ERRCODE_IO_ABORT
     {
         Text = "Die Operation auf der Datei wurde abgebrochen" ;
         Text [ ENGLISH ] = "The operation on the file was aborted" ;
-        Text [ dutch ] = "Activiteit werd gestopt" ;
+        Text [ dutch ] = "Activiteit is geannuleerd" ;
         Text [ english_us ] = "The operation on the file was aborted" ;
         Text [ italian ] = "L'operazione sul file � stata interrotta" ;
         Text [ spanish ] = "Se ha interrumpido la operaci�n en el archivo." ;
@@ -1692,16 +1751,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "这个文件的操作已经中断";
         Text[ russian ] = "�������� � ������ ��������";
         Text[ polish ] = "Operacja na pliku zosta�a przerwana";
-        Text[ japanese ] = "ﾌｧｲﾙ上の操作は中止されました";
+        Text[ japanese ] = "ファイル上の操作は中止されました";
         Text[ chinese_traditional ] = "這個檔案的執行過程已經中斷";
         Text[ arabic ] = "�� ��� ������� �� �����";
-        Text[ dutch ] = "Activiteit werd gestopt";
+        Text[ dutch ] = "Activiteit is geannuleerd";
         Text[ chinese_simplified ] = "这个文件的操作已经中断";
         Text[ greek ] = "������� ��� ����������� ���� ��� ������";
-        Text[ korean ] = "파일 상에서 작동이 중지 되었습니다.";
+        Text[ korean ] = "파일 상에서 작동이 중단되었습니다.";
         Text[ turkish ] = "Dosya ile ilgili i�lem iptal edildi";
-        Text[ catalan ] = "Se ha interrumpido la operaci�n en el archivo.";
-        Text[ finnish ] = "Tiedoston toiminto keskeytettiin";
+        Text[ catalan ] = "S'ha interromput la operaci� en el fitxer.";
+        Text[ finnish ] = "Tiedoston toiminto keskeytettiin.";
+        Text[ thai ] = "ปฏิบัติการบนแฟ้มถูกเลิก";
     };
     String ERRCODE_IO_NOTEXISTSPATH
     {
@@ -1719,16 +1779,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "指向文件的路径不存在";
         Text[ russian ] = "���� � ����� �� ����������";
         Text[ polish ] = "�cie�ka do pliku nie istnieje";
-        Text[ japanese ] = "ﾌｧｲﾙへのﾊﾟｽはありません";
+        Text[ japanese ] = "ファイルへのパスはありません";
         Text[ chinese_traditional ] = "指向檔案的路徑不存在";
         Text[ arabic ] = "������ ������ ��� ����� ��� �����";
         Text[ dutch ] = "Pad naar bestand niet gevonden";
         Text[ chinese_simplified ] = "指向文件的路径不存在";
         Text[ greek ] = "� �������� ���� �� ������ ��� �������";
-        Text[ korean ] = "파일에대한 경로가 존재하지 않습니다.";
+        Text[ korean ] = "파일에 대한 경로가 존재하지 않습니다.";
         Text[ turkish ] = "Dosya veri yolu mevcut de�il";
-        Text[ catalan ] = "No existe la ruta de acceso al archivo.";
-        Text[ finnish ] = "Tiedostopolkua ei ole";
+        Text[ catalan ] = "No existeix el cam� d'acc�s al fitxer.";
+        Text[ finnish ] = "Tiedostopolkua ei ole.";
+        Text[ thai ] = "ไม่มีเส้นทางไปยังแฟ้มอยู่";
     };
     String ERRCODE_IO_RECURSIVE
     {
@@ -1744,9 +1805,9 @@ Resource RID_ERRHDL
         Text [ french ] = "Copie impossible : la cible est identique � la source." ;
         Text [ dutch ] = "Een object kan niet worden gekopieerd naar zichzelf." ;
         Text[ chinese_simplified ] = "对象无法被复制到自身内。";
-        Text[ russian ] = "����������� ������ ��� � ���� ����������.";
+        Text[ russian ] = "���������� ����������� ������ � ����.";
         Text[ polish ] = "Obiekt nie mo�e zosta� skopiowany sam w sobie.";
-        Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄはそのもの自体にｺﾋﾟｰできません。";
+        Text[ japanese ] = "オブジェクトはそのもの自体にコピーできません。";
         Text[ chinese_traditional ] = "物件無法被複製到自身。";
         Text[ arabic ] = "�� ���� ��� ���� ��� ����.";
         Text[ dutch ] = "Een object kan niet worden gekopieerd naar zichzelf.";
@@ -1754,14 +1815,15 @@ Resource RID_ERRHDL
         Text[ greek ] = "��� ����� ������� �� ���������� ��� ����������� ���� ����� ���.";
         Text[ korean ] = "개체를 그 자체에 복사할 수 없습니다.";
         Text[ turkish ] = "Nesne kendi i�ine kopyalanamaz.";
-        Text[ catalan ] = "No es posible copiar un objeto en s� mismo.";
+        Text[ catalan ] = "No es pot copiar un objecte en ell mateix.";
         Text[ finnish ] = "Objektia ei voi kopioida itseens�.";
+        Text[ thai ] = "ไม่สามารถคัดลอกวัตถุในตัวมันเองได้";
     };
     String ERRCODE_SFX_NOSTDTEMPLATE
     {
         Text = "Die Standardvorlage konnte nicht ge�ffnet werden" ;
         Text [ ENGLISH ] = "The standard template could not be found" ;
-        Text [ dutch ] = "Standaardsjabloon kon niet worden geopend" ;
+        Text [ dutch ] = "Standaardsjabloon kan niet worden geopend" ;
         Text [ english_us ] = "The default template could not be opened" ;
         Text [ italian ] = "Non � stato possibile aprire il modello standard" ;
         Text [ spanish ] = "No se pudo abrir la plantilla predeterminada." ;
@@ -1771,24 +1833,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel abrir o modelo padr�o." ;
         Text [ portuguese_brazilian ] = "Die Standardvorlage konnte nicht ge?fnet werden" ;
         Text[ chinese_simplified ] = "无法打开标准样式";
-        Text[ russian ] = "�� ������� ������� ����������� ������";
+        Text[ russian ] = "���������� ������� ����������� ������";
         Text[ polish ] = "Nie mo�na otworzy� standardowego szablonu";
-        Text[ japanese ] = "標準ｽﾀｲﾙは開くことができませんでした";
+        Text[ japanese ] = "標準スタイルは開くことができませんでした";
         Text[ chinese_traditional ] = "無法開啟標準樣式";
         Text[ arabic ] = "���� ��� ������ ���������";
-        Text[ dutch ] = "Standaardsjabloon kon niet worden geopend";
+        Text[ dutch ] = "Standaardsjabloon kan niet worden geopend";
         Text[ chinese_simplified ] = "无法打开标准样式";
         Text[ greek ] = "��� ���� ������� �� �������� �� ������� �����������.";
-        Text[ korean ] = "기본 템플릿을  열지 못했습니다.";
+        Text[ korean ] = "기본 서식 파일을 열지 못했습니다.";
         Text[ turkish ] = "Standart �ablon a��lamad�";
-        Text[ catalan ] = "No se pudo abrir la plantilla est�ndar.";
-        Text[ finnish ] = "Oletusmallipohjan avaaminen ei onnistunut.";
+        Text[ catalan ] = "No s'ha pogut obrir la plantilla per defecte";
+        Text[ finnish ] = "Oletusmallin avaaminen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถเปิดแม่แบบเริ่มต้นได้";
     };
     String ERRCODE_SFX_TEMPLATENOTFOUND
     {
         Text = "Die angegebene Vorlage wurde nicht gefunden" ;
         Text [ ENGLISH ] = "The template cannot be found" ;
-        Text [ dutch ] = "Aangegeven sjabloon niet te vinden" ;
+        Text [ dutch ] = "Opgegeven sjabloon niet gevonden" ;
         Text [ english_us ] = "The specified template could not be found" ;
         Text [ italian ] = "Il modello dato non � stato trovato" ;
         Text [ spanish ] = "No se encontr� la plantilla especificada" ;
@@ -1800,16 +1863,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "没有找到指定的样式";
         Text[ russian ] = "�������� ������ �� ������";
         Text[ polish ] = "Podanego szablonu nie znaleziono";
-        Text[ japanese ] = "指定したﾃﾝﾌﾟﾚｰﾄは見つかりませんでした";
+        Text[ japanese ] = "指定したテンプレートは見つかりませんでした";
         Text[ chinese_traditional ] = "沒有找到指定的樣式";
         Text[ arabic ] = "���� ������ ��� ������ �������";
-        Text[ dutch ] = "Aangegeven sjabloon niet te vinden";
+        Text[ dutch ] = "Opgegeven sjabloon niet gevonden";
         Text[ chinese_simplified ] = "没有找到指定的样式";
         Text[ greek ] = "��� ������� �� ���������� �������";
-        Text[ korean ] = "정의된 템플릿을 찾지 못했습니다.";
+        Text[ korean ] = "지정된 서식 파일을 찾지 못했습니다.";
         Text[ turkish ] = "Belirtilen �ablon bulunamad�";
-        Text[ catalan ] = "No se encontr� la plantilla especificada";
-        Text[ finnish ] = "M��ritetty� mallipohjaa ei l�ytynyt.";
+        Text[ catalan ] = "No s'ha pogut trobar la plantilla especificada";
+        Text[ finnish ] = "M��ritetty� mallia ei l�ytynyt.";
+        Text[ thai ] = "ไม่สามารถหาแม่แบบที่ระบุได้";
     };
     String ERRCODE_SFX_NOTATEMPLATE
     {
@@ -1825,24 +1889,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Imposs�vel utilizar o ficheiro como modelo." ;
         Text [ portuguese_brazilian ] = "Die Datei kann nicht als Vorlage verwendet werden" ;
         Text[ chinese_simplified ] = "这个文件无法当作样式使用";
-        Text[ russian ] = "������������ ���� � �������� ������� ����������";
+        Text[ russian ] = "���������� ������������ ���� � �������� �������";
         Text[ polish ] = "Pliku nie mo�na u�y� jako szablonu";
-        Text[ japanese ] = "このﾌｧｲﾙはﾃﾝﾌﾟﾚｰﾄとして使用できません";
+        Text[ japanese ] = "このファイルはテンプレートとして使用できません";
         Text[ chinese_traditional ] = "這個檔案無法被當作樣式使用";
         Text[ arabic ] = "�� ���� ������� ����� �����";
         Text[ dutch ] = "Bestand kan niet worden gebruikt als sjabloon";
         Text[ chinese_simplified ] = "这个文件无法当作样式使用";
         Text[ greek ] = "��� ����� ������� �� �������������� �� ������ �� �������";
-        Text[ korean ] = "파일은 템플릿으로 사용할 수 없습니다.";
+        Text[ korean ] = "이 파일을 서식 파일로 사용할 수 없습니다.";
         Text[ turkish ] = "Dosya, �ablon olarak kullan�lam�yor";
-        Text[ catalan ] = "No se puede usar el archivo como plantilla";
-        Text[ finnish ] = "Tiedostoa ei voi k�ytt�� mallipohjana";
+        Text[ catalan ] = "No es pot usar el fitxer com a plantilla";
+        Text[ finnish ] = "Tiedostoa ei voi k�ytt�� mallina.";
+        Text[ thai ] = "ไม่สามารถใช้แฟ้มเป็นแม่แบบได้";
     };
     String ERRCODE_SFX_CANTREADDOCINFO
     {
         Text = "Die Dokumentinformation konnte nicht aus der Datei\ngelesen werden, da das Dokumentinformationsformat\nunbekannt ist oder da keine Dokumentinformation vorhanden\nist" ;
         Text [ ENGLISH ] = "The document info could not be read because\nthe document does not contain document info\nor because the document info ist not known" ;
-        Text [ dutch ] = "Lezen van documentinfo niet mogelijk.\nDocumentformaat onbekend of geen documentinfo\nvoorhanden" ;
+        Text [ dutch ] = "Lezen van documentinfo niet mogelijk.\nDocumentindeling onbekend of geen documentinfo\nbeschikbaar" ;
         Text [ english_us ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist" ;
         Text [ italian ] = "Non � stato possibile leggere l'informazione sul documento dal file\npoich� il formato del file � sconosciuto o perch� non c'� un'informazione sul\ndocumento" ;
         Text [ spanish ] = "La informaci�n del documento no se pudo leer del\narchivo ya que su formato es desconocido o no\nexiste ninguna informaci�n acerca del documento." ;
@@ -1852,18 +1917,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Imposs�vel ler as informa��es sobre o documento no ficheiro\n por terem um formato desconhecido ou \npor n�o existirem." ;
         Text [ portuguese_brazilian ] = "Die Dokumentinformation konnte nicht aus der Datei\ngelesen werden, da das Dokumentinformationsformat\nunbekannt ist oder da keine Dokumentinformation vorhanden\nist" ;
         Text[ chinese_simplified ] = "无法读出这个文件的文档信息，\n因为这个文档信息的格式不明或文档信息不存在\n";
-        Text[ russian ] = "��������� ���������� ��������� �� �����\n����������, �.�. ������ ���������\n���������� ��� ���������� � ���������\n�� �������";
+        Text[ russian ] = "���������� �������� ���������� � ��������� �� �����\n, ��� ��� ������ ���������\n���������� ��� ���������� � ���������\n�� ����������";
         Text[ polish ] = "Informacji o dokumencie nie mo�na by�o odczyta� z pliku\n, poniewa� format informacji o dokumencie \njest nieznany lub nie istniej� informacje o dokumencie\n.";
-        Text[ japanese ] = "ﾄﾞｷｭﾒﾝﾄ情報の書式が不明か\nﾄﾞｷｭﾒﾝﾄ情報がないかで\nﾌｧｲﾙからﾄﾞｷｭﾒﾝﾄ情報は読み取れませんでした";
+        Text[ japanese ] = "ドキュメント情報の書式が不明か\nドキュメント情報がないかで\nファイルからドキュメント情報は読み取れませんでした";
         Text[ chinese_traditional ] = "無法讀出這個檔案的文件資訊﹐\n因為這個文件資訊不明或文件資訊不存在\n";
         Text[ arabic ] = "���� ����� ������� ������� �� ����ݡ\n��� ����� ������� �������\n��� ����ݡ �� ��� ������� ������� \n��� ������";
-        Text[ dutch ] = "Lezen van documentinfo niet mogelijk.\nDocumentformaat onbekend of geen documentinfo\nvoorhanden";
+        Text[ dutch ] = "Lezen van documentinfo niet mogelijk.\nDocumentindeling onbekend of geen documentinfo\nbeschikbaar";
         Text[ chinese_simplified ] = "无法读出这个文件的文档信息，\n因为这个文档信息的格式不明或文档信息不存在\n";
-        Text[ greek ] = "��� ���� ������� �� ����� �������� ��� ����������� ��� �������� ��� �� ������\n���� ������ ����� ������� � ����� ��� �������� �����������\n ";
-        Text[ korean ] = "알려져 있지 않은 문서 정보 서식이거나\n또는 문서 정보가 없으므로 파일에서 문서 정보를\n읽을 수 없었습니다.";
+        Text[ greek ] = "��� ���� ������� �� ����� �������� ��� ����������� ��� �������� ��� �� ������\n���� ������ ����� ������� � ����� ��� �������� �����������\n";
+        Text[ korean ] = "알 수 없는 문서 정보 서식이거나\n문서 정보가 없는 이유로 파일에서 문서 정보를\n읽을 수 없습니다";
         Text[ turkish ] = "Belge bilgileri format�, bilinmedi�i ya da belge\nbilgisi mevcut olmad��� i�in\ndosyadan okunamad�\n";
-        Text[ catalan ] = "La informaci�n del documento no se pudo leer del\narchivo ya que su formato es desconocido o no\nexiste ninguna informaci�n acerca del documento.";
-        Text[ finnish ] = "Tiedoston asiakirjatietojen lukeminen ei onnistunut,\nkoska asiakirjan muoto on tuntematon tai koska asiakirjan tietoja ei\nole";
+        Text[ catalan ] = "La informaci� del document no s'ha pogut llegir del\nfitxer ja que el seu format �s desconegut o b� no\nexisteix cap informaci� sobre el document.";
+        Text[ finnish ] = "Tiedoston asiakirjatietojen lukeminen ei onnistunut,\nkoska asiakirjan muoto on tuntematon\ntai koska asiakirjan tietoja ei ole.";
+        Text[ thai ] = "ไม่สามารถอ่านข้อมูลเอกสารได้จากแฟ้มเนื่องจาก\nไม่รู้จักรูปแบบข้อมูลเอกสารหรือเนื่องจากไม่มีข้อมูลเอกสารอยู่\n";
     };
     String ERRCODE_SFX_ALREADYOPEN
     {
@@ -1879,28 +1945,29 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O documento j� se encontra aberto para edi��o." ;
         Text [ portuguese_brazilian ] = "Das Dokument ist bereits zur Bearbeitung ge?fnet" ;
         Text[ chinese_simplified ] = "这个文档已经处于编辑状态";
-        Text[ russian ] = "���� �������� ��� ������ ��� ��������������";
+        Text[ russian ] = "�������� ��� ������ ��� ��������������";
         Text[ polish ] = "Dokument jest otwarty do edycji";
-        Text[ japanese ] = "ﾄﾞｷｭﾒﾝﾄはすでに編集用に開かれています";
-        Text[ chinese_traditional ] = "這個文件已經處于編輯狀態";
+        Text[ japanese ] = "ドキュメントはすでに編集用に開かれています";
+        Text[ chinese_traditional ] = "這個文件已經處於編輯狀態";
         Text[ arabic ] = "������� ����� ���� ���� �������.";
         Text[ dutch ] = "Document reeds geopend";
         Text[ chinese_simplified ] = "这个文档已经处于编辑状态";
         Text[ greek ] = "�� ������� ����� ��� ������� ��� �����������";
-        Text[ korean ] = "문서는 이미 열려있습니다.";
+        Text[ korean ] = "문서가 이미 열려 있습니다.";
         Text[ turkish ] = "Belge zaten d�zenlenmek �zere a��ld�";
-        Text[ catalan ] = "El documento ya se ha abierto para editarlo.";
-        Text[ finnish ] = "Asiakirja on jo muokattavana";
+        Text[ catalan ] = "Aquest document ja ha estat obert per editar";
+        Text[ finnish ] = "Asiakirja on jo muokattavana.";
+        Text[ thai ] = "เอกสารนี้ได้ถูกเปิดเพื่อแก้ไขแล้ว";
     };
     String ERRCODE_SFX_WRONGPASSWORD
     {
-        Text = "Es wurde ein falsches Passwort gesetzt" ;
+        Text = "Es wurde ein falsches Kennwort gesetzt" ;
         Text [ English ] = "A wrong password was specified" ;
         Text [ dutch ] = "Foutief wachtwoord" ;
-        Text [ english_us ] = "The wrong password has been entered" ;
+        Text [ english_us ] = "The wrong password has been entered." ;
         Text [ italian ] = "� stata impostata una password errata" ;
-        Text [ spanish ] = "Se emple� una contrase�a falsa" ;
-        Text [ french ] = "Le mot de passe sp�cifi� est incorrect" ;
+        Text [ spanish ] = "Se emple� una contrase�a err�nea." ;
+        Text [ french ] = "Le mot de passe sp�cifi� n'est pas correct." ;
         Text [ swedish ] = "Ett felaktigt l�senord har definierats" ;
         Text [ danish ] = "Der blev angivet en forkert adgangskode" ;
         Text [ portuguese ] = "A senha especificada est� errada." ;
@@ -1908,17 +1975,18 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "输入了一个错误的密码";
         Text[ russian ] = "������ ������������ ������";
         Text[ polish ] = "Zosta�o u�yte nieprawid�owe has�o";
-        Text[ japanese ] = "正しくないﾊﾟｽﾜｰﾄﾞが入力されました";
+        Text[ japanese ] = "入力したパスワードは間違っています。";
         Text[ chinese_traditional ] = "輸入了一個錯誤的密碼";
         Text[ arabic ] = "�� ����� ���� �� ��� �����";
         Text[ dutch ] = "Foutief wachtwoord";
         Text[ chinese_simplified ] = "输入了一个错误的密码";
         Text[ greek ] = "�������� ���������� ������� ���������";
-        Text[ korean ] = "틀린 패스워드가 입력되었습니다.";
+        Text[ korean ] = "옳지 않은 암호가 입력되었습니다.";
         Text[ turkish ] = "Girilen �ifre yanl��";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Se emple� una contrase�a falsa";
-        Text[ finnish ] = "V��r� salasana annettiin";
+        Text[ catalan ] = "La contrasenya no �s correcta";
+        Text[ finnish ] = "V��r� salasana annettiin.";
+        Text[ thai ] = "ใส่รหัสผ่านไม่ถูกต้อง";
     };
     String ERRCODE_SFX_DOLOADFAILED
     {
@@ -1927,31 +1995,32 @@ Resource RID_ERRHDL
         TEXT [ norwegian ] = "Feil ved lesing av fil " ;
         TEXT [ italian ] = "Errore durante la lettura del file " ;
         TEXT [ portuguese_brazilian ] = "Erro na leitura de arquivo" ;
-        TEXT [ portuguese ] = "Erro na leitura do ficheiro " ;
+        TEXT [ portuguese ] = "Erro na leitura do ficheiro" ;
         TEXT [ finnish ] = "Virhe luettaessa tiedostoa " ;
-        TEXT [ danish ] = "Fejl under l�sning af filen " ;
+        TEXT [ danish ] = "Fejl ved l�sning af filen " ;
         TEXT [ french ] = "Erreur de lecture du fichier " ;
-        TEXT [ swedish ] = "Fel vid l�sning av fil " ;
-        TEXT [ dutch ] = "Fout bij lezen van bestand  " ;
+        TEXT [ swedish ] = "Fel vid l�sning av fil" ;
+        TEXT [ dutch ] = "Fout bij lezen van bestand" ;
         TEXT [ spanish ] = "Error al leer el archivo " ;
         TEXT [ english_us ] = "Error reading file " ;
         TEXT[ chinese_simplified ] = "在读文件时发生错误 ";
-        TEXT[ russian ] = "������ ��� ������ �����";
+        TEXT[ russian ] = "������ ������ �����";
         TEXT[ polish ] = "B��d w odczytywaniu pliku ";
-        TEXT[ japanese ] = "ﾌｧｲﾙ読み取りの際のｴﾗｰ";
+        TEXT[ japanese ] = "ファイルを読み取る際のエラー ";
         TEXT[ chinese_traditional ] = "存取檔案時發生錯誤 ";
-        TEXT[ arabic ] = "��� ��� ����� ����� ����� ";
-        TEXT[ greek ] = "������ ���� ��� �������� ��� ������� ";
+        TEXT[ arabic ] = "��� ��� ����� ����� �����";
+        TEXT[ greek ] = "������ ���� ��� �������� ��� �������";
         TEXT[ korean ] = "파일 읽기 오류";
-        TEXT[ turkish ] = "Dosya okuma hatas� ";
+        TEXT[ turkish ] = "Dosya okuma hatas�";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "Error al leer el archivo ";
+        TEXT[ catalan ] = "S'ha produ�t un error en llegir el fitxer";
+        TEXT[ thai ] = "เกิดความผิดพลาดระหว่างอ่านแฟ้มข้อมูล ";
     };
     String ERRCODE_SFX_DOCUMENTREADONLY
     {
         Text = "Das Dokument wurde zum Lesen ge�ffnet" ;
         Text [ English ] = "The document was opened readonly" ;
-        Text [ dutch ] = "Document geopend als alleen lezen" ;
+        Text [ dutch ] = "Document geopend als alleen-lezen" ;
         Text [ english_us ] = "The document was opened as read-only" ;
         Text [ italian ] = "Il documento � stato aperto per la lettura" ;
         Text [ spanish ] = "Se ha abierto el documento para lectura." ;
@@ -1961,18 +2030,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O documento foi aberto para leitura." ;
         Text [ portuguese_brazilian ] = "Das Dokument wurde zum Lesen ge?fnet" ;
         Text[ chinese_simplified ] = "这个打开的文档是防改写的。";
-        Text[ russian ] = "�������� ������ ��� ������";
+        Text[ russian ] = "�������� ������ ������ ��� ������";
         Text[ polish ] = "Dokument zosta� otwarty tylko do odczytu";
-        Text[ japanese ] = "ﾄﾞｷｭﾒﾝﾄは読み取り用に開かれました";
+        Text[ japanese ] = "ドキュメントは読み取り用に開かれました";
         Text[ chinese_traditional ] = "已經打開讀取這個文件";
         Text[ arabic ] = "�� ��� ����� ������� ���";
-        Text[ dutch ] = "Document geopend als alleen lezen";
+        Text[ dutch ] = "Document geopend als alleen-lezen";
         Text[ chinese_simplified ] = "这个打开的文档是防改写的。";
         Text[ greek ] = "�� ������� ��������� ���� ��� ��������";
-        Text[ korean ] = "문서는 읽기 전용으로 열려졌습니다.";
+        Text[ korean ] = "문서기 읽기 전용으로 열려 있습니다.";
         Text[ turkish ] = "Belge, salt okunur olarak a��ld�";
-        Text[ catalan ] = "Se ha abierto el documento para lectura.";
-        Text[ finnish ] = "Asiakirja avattiin vain luku -tilassa";
+        Text[ catalan ] = "S'ha obert el document en mode de lectura.";
+        Text[ finnish ] = "Asiakirja avattiin vain luku -tilassa.";
+        Text[ thai ] = "เปิดเอกสารเป็นแบบอ่านอย่างเดียว";
     };
     String ERRCODE_SFX_OLEGENERAL
     {
@@ -1981,8 +2051,8 @@ Resource RID_ERRHDL
         Text [ english_us ] = "General OLE Error" ;
         Text [ italian ] = "Errore generale OLE" ;
         Text [ spanish ] = "Error OLE general" ;
-        Text [ french ] = "Erreur OLE d'ordre g�n�ral" ;
-        Text [ dutch ] = "Algemene OLE fout" ;
+        Text [ french ] = "Erreur g�n�rale OLE" ;
+        Text [ dutch ] = "Algemene OLE-fout" ;
         Text [ swedish ] = "Allm�nt OLE-fel" ;
         Text [ danish ] = "Generel OLE-fejl" ;
         Text [ portuguese ] = "Erro OLE geral" ;
@@ -1990,23 +2060,24 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "一般的 OLE 错误";
         Text[ russian ] = "����� ������ OLE";
         Text[ polish ] = "B��d og�lny OLE";
-        Text[ japanese ] = "一般的な OLE ｴﾗｰ";
+        Text[ japanese ] = "一般的な OLE エラー";
         Text[ chinese_traditional ] = "一般 OLE 錯誤";
         Text[ arabic ] = "��� OLE ���";
-        Text[ dutch ] = "Algemene OLE fout";
+        Text[ dutch ] = "Algemene OLE-fout";
         Text[ chinese_simplified ] = "一般的 OLE 错误";
         Text[ greek ] = "������ ������ ��� OLE";
-        Text[ korean ] = "일반OLE 오류";
+        Text[ korean ] = "일반 OLE 오류";
         Text[ turkish ] = "Genel OLE hatas�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Error OLE general";
+        Text[ catalan ] = "Error general d'OLE";
         Text[ finnish ] = "Yleinen OLE-virhe";
+        Text[ thai ] = "ข้อผิดพลาด OLE ทั่วไป";
     };
     String ERRCODE_INET_NAME_RESOLVE
     {
         Text = "Der Rechnername $(ARG1) konnte nicht aufgel�st werden" ;
         Text [ ENGLISH ] = "Could not resolve hostname $(ARG1)" ;
-        Text [ dutch ] = "Computernaam $(ARG1) kon niet worden herleid" ;
+        Text [ dutch ] = "Computernaam $(ARG1) kan niet worden herleid" ;
         Text [ english_us ] = "The host name $(ARG1) could not be resolved" ;
         Text [ italian ] = "Non � stato possibile risolvere il nome dell'host $(ARG1)" ;
         Text [ spanish ] = "No se pudo resolver el nombre del ordenador $(ARG1)" ;
@@ -2016,24 +2087,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Imposs�vel resolver o nome do computador $(ARG1)" ;
         Text [ portuguese_brazilian ] = "Der Rechnername $(ARG1) konnte nicht aufgel?t werden" ;
         Text[ chinese_simplified ] = "无法找到计算机地址 $(ARG1)";
-        Text[ russian ] = "�� ������� ���������� ��� �������� ���������� $(ARG1)";
+        Text[ russian ] = "���������� ���������� ��� ���������� $(ARG1)";
         Text[ polish ] = "Nazwa komputera $(ARG1) nie mog�a zosta� przetworzona";
-        Text[ japanese ] = "ﾎｽﾄ名$(ARG1)は見つかりませんでした";
+        Text[ japanese ] = "ホスト名$(ARG1)は見つかりませんでした";
         Text[ chinese_traditional ] = "無法找到主機地址 $(ARG1)";
         Text[ arabic ] = "���� �� ��� ������ $(ARG1)";
-        Text[ dutch ] = "Computernaam $(ARG1) kon niet worden herleid";
+        Text[ dutch ] = "Computernaam $(ARG1) kan niet worden herleid";
         Text[ chinese_simplified ] = "无法找到计算机地址 $(ARG1)";
         Text[ greek ] = "��� ���� ������� ����� ������� ��� �������� ��� ���������� $(ARG1)";
         Text[ korean ] = "호스트 이름 $(ARG1)을 취소하지 못했습니다.";
         Text[ turkish ] = "$(ARG1) sunucu ad� ��z�lemedi";
-        Text[ catalan ] = "No se pudo resolver el nombre del ordenador $(ARG1)";
-        Text[ finnish ] = "P��koneen $(ARG1) nimen selvitt�minen ei onnistunut";
+        Text[ catalan ] = "No s'ha pogut determinar el nom del servidor $(ARG1)";
+        Text[ finnish ] = "P��koneen $(ARG1) nimen selvitt�minen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถแก้ชื่อโฮสต์ $(ARG1) ได้";
     };
     String ERRCODE_INET_CONNECT
     {
         Text = "Die Internetverbindung zu $(ARG1) konnte nicht hergestellt werden" ;
         Text [ ENGLISH ] = "The Internetconnection to $(ARG1) could not be established" ;
-        Text [ dutch ] = "Er kon geen Internet-verbinding met $(ARG1) tot stand worden gebracht." ;
+        Text [ dutch ] = "Er kan geen internetverbinding met $(ARG1) tot stand worden gebracht." ;
         Text [ english_us ] = "Could not establish Internet connection to $(ARG1)" ;
         Text [ italian ] = "Non � stato possibile stabilire la connessione a Internet a $(ARG1)" ;
         Text [ spanish ] = "No se pudo establecer la conexi�n de Internet a $(ARG1)" ;
@@ -2043,18 +2115,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel estabelecer a liga��o � Internet com $(ARG1)." ;
         Text [ portuguese_brazilian ] = "Die Internetverbindung zu $(ARG1) konnte nicht hergestellt werden" ;
         Text[ chinese_simplified ] = "无法和 $(ARG1) 建立国际互联网连接";
-        Text[ russian ] = "�� ������� �������� ����� ��������� � $(ARG1)";
+        Text[ russian ] = "���������� ���������� ��������-���������� � $(ARG1)";
         Text[ polish ] = "Ustanowienie po��czenia internetowego z $(ARG1) by�o niemo�liwe";
-        Text[ japanese ] = "$(ARG1)へのｲﾝﾀｰﾈｯﾄ接続ができませんでした。";
+        Text[ japanese ] = "$(ARG1)へのインターネット接続ができませんでした。";
         Text[ chinese_traditional ] = "無法連線到 $(ARG1)";
         Text[ arabic ] = "���� ��� ����� ������ �� $(ARG1)";
-        Text[ dutch ] = "Er kon geen Internet-verbinding met $(ARG1) tot stand worden gebracht.";
+        Text[ dutch ] = "Er kan geen internetverbinding met $(ARG1) tot stand worden gebracht.";
         Text[ chinese_simplified ] = "无法和 $(ARG1) 建立国际互联网连接";
         Text[ greek ] = "��� ���� ������� �� ��������������� � ������� Internet �� �� $(ARG1).";
-        Text[ korean ] = "$(ARG1)에 인터넷 연결을 구축하지 못했습니다";
+        Text[ korean ] = "$(ARG1)으로 인터넷 접속을 하지 못했습니다.";
         Text[ turkish ] = "$(ARG1) Internet ba�lant�s� olu�turulamad�";
-        Text[ catalan ] = "No se pudo establecer la conexi�n de Internet a $(ARG1)";
-        Text[ finnish ] = "Internet-yhteyden muodostaminen kohteeseen $(ARG1) ei onnistunut";
+        Text[ catalan ] = "No s'ha pogut establir la connexi� a Internet a $(ARG1)";
+        Text[ finnish ] = "Internet-yhteyden muodostaminen kohteeseen $(ARG1) ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถสร้างการเชื่อมต่ออินเตอร์เน็ตไปยัง $(ARG1) ได้";
     };
     String ERRCODE_INET_READ
     {
@@ -2064,25 +2137,26 @@ Resource RID_ERRHDL
         Text [ italian ] = "Non � stato possibile leggere i dati da Internet.\nMessaggio di errore del server: $(ARG1)" ;
         Text [ spanish ] = "Los datos no se pudieron leer a trav�s de Internet.\nMensaje de error del servidor: $(ARG1)" ;
         Text [ french ] = "Erreur de lecture des donn�es � partir de l'Internet.\nMessage d'erreur du serveur : $(ARG1)" ;
-        Text [ dutch ] = "Fout bij lezen van gegevens uit internet\n.Foutmelding van server: $(ARG1)" ;
+        Text [ dutch ] = "Fout bij lezen van gegevens op het internet\n.Foutmelding server: $(ARG1)" ;
         Text [ swedish ] = "Det gick inte att l�sa data via Internet.\nServerfelmeddelande: $(ARG1)" ;
         Text [ danish ] = "Det var ikke muligt at l�ses dataene over Internettet\nServerfejlmelding: $(ARG1)" ;
         Text [ portuguese ] = "Foi imposs�vel ler os dados via Internet.\nMensagem de erro do servidor: $(ARG1)" ;
         Text [ portuguese_brazilian ] = "Daten konnten nicht ?er das Internet gelesen werden.\nServerfehlermeldung: $(ARG1)" ;
         Text[ chinese_simplified ] = "无法通过国际互联网读取数据。\n服务器报告错误：$(ARG1)";
-        Text[ russian ] = "��������� ������ ����� �������� ����������.\n��������� ������ �������: $(ARG1)";
+        Text[ russian ] = "���������� ��������� ��������-������.\n��������� ������ �������: $(ARG1)";
         Text[ polish ] = "B��d odczytu plik�w z Internetu.\nKomunikat o b��dzie serwera: $(ARG1)";
-        Text[ japanese ] = "ﾃﾞｰﾀはｲﾝﾀｰﾈｯﾄで読み取れませんでした。\nｻｰﾊﾞｰ ｴﾗｰ ﾒｯｾｰｼﾞ: $(ARG1)";
+        Text[ japanese ] = "データはインターネットで読み取れませんでした。\nサーバー エラー メッセージ: $(ARG1)";
         Text[ chinese_traditional ] = "無法透過 Internet 讀取資料。\n伺服器報告：$(ARG1)";
         Text[ arabic ] = "���� ����� �������� ��� ��������.\n����� ��� �� �������: $(ARG1)";
-        Text[ dutch ] = "Fout bij lezen van gegevens uit internet\n.Foutmelding van server: $(ARG1)";
+        Text[ dutch ] = "Fout bij lezen van gegevens op het internet\n.Foutmelding server: $(ARG1)";
         Text[ chinese_simplified ] = "无法通过国际互联网读取数据。\n服务器报告错误：$(ARG1)";
         Text[ greek ] = "������ ���� ��� �������� ��������� ��� �� Internet.\n������ ��������� ��� ����������: $(ARG1)";
         Text[ korean ] = "데이터를 인터넷에서 읽지 못했습니다.\n서버 오류 메시지: $(ARG1)";
         Text[ turkish ] = "Internet �zerinden veri okunamad�.\nSunucu hata iletisi: $(ARG1)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Los datos no se pudieron leer a trav�s de Internet.\nMensaje de error del servidor: $(ARG1)";
+        Text[ catalan ] = "Error en llegir les dades d'Internet\n.Missatge d'error del servidor: $(ARG1)";
         Text[ finnish ] = "On ilmennyt virhe luettaessa tietoja Internetist�.\nPalvelimen virhesanoma: $(ARG1)";
+        Text[ thai ] = "การอ่านข้อมูลผิดพลาดจากอินเตอร์เน็ต\n.เซิร์ฟเวอร์มีข้อความผิดพลาด: $(ARG1)";
     };
     String ERRCODE_INET_WRITE
     {
@@ -2091,32 +2165,33 @@ Resource RID_ERRHDL
         Text [ english_us ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)" ;
         Text [ italian ] = "Non � stato possibile trasferire i dati in Internet.\nMessaggio di errore del server: $(ARG1)" ;
         Text [ spanish ] = "No se pudieron transferir los datos a Internet.\nMensaje de error del servidor: $(ARG1)" ;
-        Text [ french ] = "Erreur de transfert de donn�es sur l'Internet.\nMessage d'erreur du serveur : $(ARG1)" ;
-        Text [ dutch ] = "Fout bij gegevenstransfer naar Internet.\nFoutmelding server: $(ARG1)" ;
+        Text [ french ] = "Erreur de transfert des donn�es sur Internet.\nMessage d'erreur du serveur : $(ARG1)" ;
+        Text [ dutch ] = "Fout bij gegevensoverdracht naar het internet.\nFoutmelding server: $(ARG1)" ;
         Text [ swedish ] = "Det gick inte att �verf�ra data till Internet.\nServerfelmeddelande: $(ARG1)" ;
         Text [ danish ] = "Det var ikke muligt at overf�re dataene til Internettet.\nServerfejlmelding: $(ARG1)" ;
         Text [ portuguese ] = "Foi imposs�vel transferir dados para a Internet.\nMensagem de erro do servidor: $(ARG1)" ;
         Text [ portuguese_brazilian ] = "Daten konnten nicht ins Internet ?ertragen werden.\nServerfehlermeldung: $(ARG1)" ;
         Text[ chinese_simplified ] = "无法向国际互联网传递数据。\n服务器报告错误：$(ARG1)";
-        Text[ russian ] = "�������� ������ � �������� ����������.\n��������� ������ �������: $(ARG1)";
+        Text[ russian ] = "���������� �������� ��������-������.\n��������� ������ �������: $(ARG1)";
         Text[ polish ] = "Danych nie mo�na przenie�� do sieci Internetu.\nKomunikat o b��dzie z serwera: $(ARG1)";
-        Text[ japanese ] = "ﾃﾞｰﾀはｲﾝﾀｰﾈｯﾄに転送できませんでした。\nｻｰﾊﾞｰ ｴﾗｰ ﾒｯｾｰｼﾞ: $(ARG1)";
+        Text[ japanese ] = "データはインターネットに転送できませんでした。\nサーバー エラー メッセージ: $(ARG1)";
         Text[ chinese_traditional ] = "無法向 Internet 發送資料。\n伺服器報告：$(ARG1)";
         Text[ arabic ] = "���� ��� �������� ��� ��������.\n����� ��� �� �������: $(ARG1)";
-        Text[ dutch ] = "Fout bij gegevenstransfer naar Internet.\nFoutmelding server: $(ARG1)";
+        Text[ dutch ] = "Fout bij gegevensoverdracht naar het internet.\nFoutmelding server: $(ARG1)";
         Text[ chinese_simplified ] = "无法向国际互联网传递数据。\n服务器报告错误：$(ARG1)";
         Text[ greek ] = "������ ���� ��� �������� ��������� ���� ��� Internet.\n������ ��������� ��� ����������: $(ARG1)";
         Text[ korean ] = "데이터를 인터넷으로 보내지 못했습니다.\n서버 오류 메시지: $(ARG1)";
         Text[ turkish ] = "Internet �zerinden veri aktar�lamad�.\nSunucu hata iletisi: $(ARG1)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No se pudieron transferir los datos a Internet.\nMensaje de error del servidor: $(ARG1)";
+        Text[ catalan ] = "Error en transferir les dades a Internet.\nMissatge d'error del servidor: $(ARG1)";
         Text[ finnish ] = "On ilmennyt virhe siirrett�ess� tietoja Internetiin.\nPalvelimen virhesanoma: $(ARG1)";
+        Text[ thai ] = "ถ่ายโอนข้อมูลจากอินเตอร์เน็ตผิดพลาด\nเซิร์ฟเวอร์มีข้อความผิดพลาด: $(ARG1)";
     };
     String ERRCODE_INET_GENERAL
     {
         Text = "Ein allgemeiner Fehler im Internetbereich trat auf" ;
         Text [ ENGLISH ] = "Gereral Internet Error" ;
-        Text [ dutch ] = "Algemene Internet fout" ;
+        Text [ dutch ] = "Algemene internetfout" ;
         Text [ english_us ] = "Gereral Internet error has occurred" ;
         Text [ italian ] = "Si � verificato un errore generale nell'area Internet" ;
         Text [ spanish ] = "Error general en Internet" ;
@@ -2126,18 +2201,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Erro geral na Internet" ;
         Text [ portuguese_brazilian ] = "Ein allgemeiner Fehler im Internetbereich trat auf" ;
         Text[ chinese_simplified ] = "在国际互联网内发生了一个一般错误";
-        Text[ russian ] = "��������� ����� ������ � ������� ���������";
+        Text[ russian ] = "����� ������ ���������";
         Text[ polish ] = "Wyst�pi� og�lny b��d w Internecie";
-        Text[ japanese ] = "ｲﾝﾀｰﾈｯﾄ領域に一般的なｴﾗｰが発生";
+        Text[ japanese ] = "インターネット領域に一般的なエラーが発生";
         Text[ chinese_traditional ] = "Internet 內發生一個一般錯誤";
         Text[ arabic ] = "��� ��� ��� �� ���� ��������";
-        Text[ dutch ] = "Algemene Internet fout";
+        Text[ dutch ] = "Algemene internetfout";
         Text[ chinese_simplified ] = "在国际互联网内发生了一个一般错误";
         Text[ greek ] = "������������� ������ ������ ��� Internet";
-        Text[ korean ] = "인터넷 영역에 일반적인 오류 발생";
+        Text[ korean ] = "인터넷 영역에 일반 오류가 발생했습니다.";
         Text[ turkish ] = "Genel Internet hatas�";
-        Text[ catalan ] = "Error general en Internet";
-        Text[ finnish ] = "On ilmennyt yleinen Internet-virhe";
+        Text[ catalan ] = "Error general d'Internet";
+        Text[ finnish ] = "On ilmennyt yleinen Internet-virhe.";
+        Text[ thai ] = "เกิดข้อผิดพลาดของอินเตอร์เน็ตทั่วไป";
     };
     String ERRCODE_INET_OFFLINE
     {
@@ -2149,22 +2225,23 @@ Resource RID_ERRHDL
         Text [ swedish ] = "De beg�rda Internetdata ligger inte i cachen och kan d�rf�r inte �verf�ras eftersom onlinel�get inte �r aktivt" ;
         Text [ danish ] = "De anmodede Internetdata er ikke tilg�ngelige i cachen og kan ikke overf�res, fordi onlinetilstanden ikke er aktiveret" ;
         Text [ italian ] = "I dati di Internet richiesti non si trovano nella cache e non possono essere trasmessi poich� il modo online non � attivo" ;
-        Text [ spanish ] = "Los datos de Internet solicitados no se encuentran en el cach� y no pueden ser transmitidos ya que el modo en l�nea no est� activo." ;
+        Text [ spanish ] = "Los datos de Internet solicitados no se encuentran en la antememoria y no se pueden transmitir porque el modo en l�nea no est� activado." ;
         Text [ french ] = "Impossible de transmettre les donn�es provenant d'Internet : vous n'�tes pas en mode en ligne et les donn�es ne se trouvent pas dans le cache." ;
-        Text [ dutch ] = "De opgevraagde Internetgegevens zijn niet voorhanden in het cachegeheugen en kunnen niet worden getransfereerd daar de Onlinemodus niet actief is" ;
+        Text [ dutch ] = "De opgevraagde internetgegevens zijn niet beschikbaar in het cachegeheugen en kunnen niet worden overgedragen omdat de onlinemodus niet actief is" ;
         Text[ chinese_simplified ] = "因为您的计算机和还没有和国际互联网连接，而且计算机缓冲区也没有您请求的国际互联网的资料，因此无法传递任何数据。";
-        Text[ russian ] = "������������� ������ ��������� �� ��������� � ��� � �������� �� ����������, �.�. ����� Online �� �������������.";
+        Text[ russian ] = "��������� ��������-������ �� ��������� � ��� � �������� �� ����������, ��� ��� �� ����������� ����� ������.";
         Text[ polish ] = "Wymaganych danych z sieci Internet nie ma w pami�ci podr�cznej i nie mo�na ich za�adowa�, poniewa� tryb online nie jest uaktywniony.";
-        Text[ japanese ] = "指定したｲﾝﾀｰﾈｯﾄのﾃﾞｰﾀはｷｬｯｼｭになくて、ｵﾝﾗｲﾝ ﾓｰﾄﾞがｱｸﾃｨﾌﾞではないために転送できません";
+        Text[ japanese ] = "指定したインターネットのデータはキャッシュになくて、オンライン モードがアクティブではないために転送できません";
         Text[ chinese_traditional ] = "還沒有連線到 Internet ﹐而且緩衝區也沒有暫存請求的 Internet 資料而無法傳遞資料";
         Text[ arabic ] = "������� �������� �������� ��� ������ �� ���� ������� ������ɡ ��� ���� ����ǡ �� �� ��� ������� ��� ���";
-        Text[ dutch ] = "De opgevraagde Internetgegevens zijn niet voorhanden in het cachegeheugen en kunnen niet worden getransfereerd daar de Onlinemodus niet actief is";
+        Text[ dutch ] = "De opgevraagde internetgegevens zijn niet beschikbaar in het cachegeheugen en kunnen niet worden overgedragen omdat de onlinemodus niet actief is";
         Text[ chinese_simplified ] = "因为您的计算机和还没有和国际互联网连接，而且计算机缓冲区也没有您请求的国际互联网的资料，因此无法传递任何数据。";
         Text[ greek ] = "�� ��������� �������� ��� Internet ��� ���������� ���� ����� ����� ��� ��� ����� ������� �� ����������, ������ ��������� �� ��������� '����� �� ";
-        Text[ korean ] = "요청된 인터넷 데이터가 캐시에 없으며 온라인 모드가 활성화되어 있지 않아 데이터를 보낼 수 없음";
+        Text[ korean ] = "요청된 인터넷 데이터가 캐시에 없으며 온라인 모드가 활성화되어 있지 않아 데이터를 보낼 수 없습니다.";
         Text[ turkish ] = "�stenen Internet verileri �nbellekte bulunmuyor ve �evrimi�i kipi etkin olmad��� i�in aktar�lam�yor";
-        Text[ catalan ] = "Los datos de Internet solicitados no se encuentran en el cach� y no pueden ser transmitidos ya que el modo en l�nea no est� activo.";
-        Text[ finnish ] = "Pyydettyj� Internet-tietoja ei ole k�ytett�viss� v�limuistissa eik� niit� voi siirt��, koska online-tila ei ole k�yt�ss�";
+        Text[ catalan ] = "Les dades d'Internet que heu demanat no es troben a la mem�ria cau i no poden ser transmeses ja que el mode en l�nia est� desactivat.";
+        Text[ finnish ] = "Pyydettyj� Internet-tietoja ei ole k�ytett�viss� v�limuistissa eik� niit� voi siirt��, koska online-tila ei ole k�yt�ss�.";
+        Text[ thai ] = "ข้อมูลอินเตอร์เน็ตที่ต้องการใช้ไม่ได้ในแคชและไม่สามารถถูกถ่ายทอดเป็นโหมดแบบออนไลน์ที่ไม่ถูกใช้งาน";
     };
     String ERRCODE_SFXMSG_STYLEREPLACE
     {
@@ -2183,17 +2260,18 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "要替换样式 $(ARG1) ？";
         Text[ russian ] = "�������� ����� $(ARG1)?";
         Text[ polish ] = "Zamieni� styl $(ARG1)?";
-        Text[ japanese ] = "ｽﾀｲﾙ $(ARG1) を置換しますか";
+        Text[ japanese ] = "スタイル $(ARG1) を置換しますか";
         Text[ chinese_traditional ] = "要更替這個樣式 $(ARG1)？";
         Text[ arabic ] = "�� ���� ������� ����� $(ARG1)�";
         Text[ dutch ] = "Opmaakprofiel $(ARG1) vervangen?";
         Text[ chinese_simplified ] = "要替换样式 $(ARG1) ？";
         Text[ greek ] = "�� �������������� �� ���� $(ARG1);";
-        Text[ korean ] = "스타일$(ARG1)을(를) 대체하시겠습니까?";
+        Text[ korean ] = "스타일 $(ARG1)을(를) 바꾸시겠습니까?";
         Text[ turkish ] = "$(ARG1) bi�imi de�i�tirilsin mi?";
         Text[ language_user1 ] = "\"Vorlagen\" Styles are always capitalized no matter where they show up. EM15.5.00 - - - -";
-        Text[ catalan ] = "�Desea sustituir el estilo $(ARG1)?";
+        Text[ catalan ] = "S'ha de substituir l'estil de $(ARG1)?";
         Text[ finnish ] = "Korvataanko tyyli $(ARG1)?";
+        Text[ thai ] = "ต้องการแทนที่ลักษณะ $(ARG1) หรือไม่?";
     };
     String ERRCODE_SFX_NOFILTER
     {
@@ -2211,7 +2289,7 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "没有找到转换器";
         Text[ russian ] = "������ �� ������";
         Text[ polish ] = "Filtru nie znaleziono";
-        Text[ japanese ] = "ﾌｨﾙﾀは見つかりません";
+        Text[ japanese ] = "フィルタは見つかりません";
         Text[ chinese_traditional ] = "沒有找到轉換器";
         Text[ arabic ] = "���� ������ ��� ����";
         Text[ dutch ] = "Geen filter gevonden";
@@ -2220,8 +2298,9 @@ Resource RID_ERRHDL
         Text[ korean ] = "필터를 찾지 못했습니다.";
         Text[ turkish ] = "Bir filtre bulunamad�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No se ha encontrado un filtro";
-        Text[ finnish ] = "Suodatinta ei l�ytynyt";
+        Text[ catalan ] = "No s'ha trobat un filtre";
+        Text[ finnish ] = "Suodatinta ei l�ytynyt.";
+        Text[ thai ] = "ไม่พบตัวกรอง";
     };
     String ERRCODE_SFX_NODOCRELOAD
     {
@@ -2231,7 +2310,7 @@ Resource RID_ERRHDL
     {
         Text = "Das Original konnte nicht bestimmt werden" ;
         Text [ English ] = "The original could not be detected" ;
-        Text [ dutch ] = "Het origineel kon niet als zodanig worden herkend." ;
+        Text [ dutch ] = "Het origineel kan niet als zodanig worden herkend." ;
         Text [ english_us ] = "The original could not be determined." ;
         Text [ swedish ] = "Det gick inte att best�mma originalet." ;
         Text [ danish ] = "Det var ikke muligt at bestemme originalen" ;
@@ -2241,24 +2320,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel determinar o original." ;
         Text [ portuguese_brazilian ] = "Das Original konnte nicht bestimmt werden" ;
         Text[ chinese_simplified ] = "无法确定原件";
-        Text[ russian ] = "���������� �������� ����������";
+        Text[ russian ] = "���������� ���������� ��������.";
         Text[ polish ] = "Orygina�u nie mo�na by�o okre�li�.";
-        Text[ japanese ] = "ｵﾘｼﾞﾅﾙは決定できませんでした";
+        Text[ japanese ] = "オリジナルは決定できませんでした";
         Text[ chinese_traditional ] = "無法確定原件";
         Text[ arabic ] = "���� ����� �����";
-        Text[ dutch ] = "Het origineel kon niet als zodanig worden herkend.";
+        Text[ dutch ] = "Het origineel kan niet als zodanig worden herkend.";
         Text[ chinese_simplified ] = "无法确定原件";
         Text[ greek ] = "��� ���� ������� �� ������� �� ������.";
-        Text[ korean ] = "원본이 결정되지 않았습니다.";
+        Text[ korean ] = "원본이 지정되지 않았습니다.";
         Text[ turkish ] = "As�l belirlenemedi";
-        Text[ catalan ] = "No se pudo determinar el original.";
+        Text[ catalan ] = "No s'ha pogut determinar l'original.";
         Text[ finnish ] = "Alkuper�n selvitt�minen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถกำหนดต้นฉบับได้";
     };
     String ERRCODE_SFX_CANTCREATECONTENT
     {
         Text = "Der Inhalt konnte nicht erzeugt werden" ;
         Text [ English ] = "The content could not be created" ;
-        Text [ dutch ] = "Er kon geen inhoud worden gecre�erd." ;
+        Text [ dutch ] = "Er kan geen inhoud worden gemaakt." ;
         Text [ english_us ] = "The contents could not be created." ;
         Text [ swedish ] = "Det gick inte att skapa inneh�llet" ;
         Text [ danish ] = "Det var ikke muligt at oprette indholdet" ;
@@ -2268,24 +2348,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel criar o conte�do." ;
         Text [ portuguese_brazilian ] = "Der Inhalt konnte nicht erzeugt werden" ;
         Text[ chinese_simplified ] = "无法生成内容";
-        Text[ russian ] = "������� ���������� ����������";
+        Text[ russian ] = "���������� ������� ����������.";
         Text[ polish ] = "Zawarto�� nie mog�a zosta� utworzona";
         Text[ japanese ] = "内容は作成できませんでした";
         Text[ chinese_traditional ] = "無法產生這個內容";
         Text[ arabic ] = "���� ����� �������";
-        Text[ dutch ] = "Er kon geen inhoud worden gecre�erd.";
+        Text[ dutch ] = "Er kan geen inhoud worden gemaakt.";
         Text[ chinese_simplified ] = "无法生成内容";
         Text[ greek ] = "��� ���� ������� �� ������������ �� �����������.";
         Text[ korean ] = "내용이 만들어지지 않았습니다.";
         Text[ turkish ] = "��erik olu�turulamad�";
-        Text[ catalan ] = "No se pudo crear el contenido.";
+        Text[ catalan ] = "No s'ha pogut crear el contingut.";
         Text[ finnish ] = "Sis�ll�n luominen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถสร้างเนื้อหาได้";
     };
     String ERRCODE_SFX_CANTCREATELINK
     {
         Text = "Die Verkn�pfung konnte nicht erzeugt werden" ;
         Text [ English ] = "The link could not be created" ;
-        Text [ dutch ] = "Er kon geen link worden gecre�erd." ;
+        Text [ dutch ] = "Er kan geen koppeling worden gemaakt." ;
         Text [ english_us ] = "The link could not be created." ;
         Text [ swedish ] = "Det gick inte att skapa l�nken" ;
         Text [ danish ] = "Det var ikke muligt at oprette k�den" ;
@@ -2295,24 +2376,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel criar a liga��o." ;
         Text [ portuguese_brazilian ] = "Die Verkn?fung konnte nicht erzeugt werden" ;
         Text[ chinese_simplified ] = "无法生成链接";
-        Text[ russian ] = "������� ������ ����������";
+        Text[ russian ] = "���������� ������� ������.";
         Text[ polish ] = "��cze nie mog�o zosta� utworzone";
-        Text[ japanese ] = "ﾘﾝｸは作成できませんでした";
+        Text[ japanese ] = "リンクは作成できませんでした";
         Text[ chinese_traditional ] = "無法建立捷徑";
         Text[ arabic ] = "���� ����� ��������";
-        Text[ dutch ] = "Er kon geen link worden gecre�erd.";
+        Text[ dutch ] = "Er kan geen koppeling worden gemaakt.";
         Text[ chinese_simplified ] = "无法生成链接";
         Text[ greek ] = "��� ���� ������� �� ������������ � �������";
         Text[ korean ] = "링크를 만들지 못했습니다.";
         Text[ turkish ] = "Ba�lant� olu�turulamad�";
-        Text[ catalan ] = "No se pudo crear el v�nculo.";
+        Text[ catalan ] = "No s'ha pogut crear l'enlla�.";
         Text[ finnish ] = "Linkin luominen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถสร้างการเชื่อมโยงได้";
     };
     String ERRCODE_SFX_WRONGBMKFORMAT
     {
         Text = "Das Format der Verkn�pfung ist ung�ltig" ;
         Text [ English ] = "The format of the link ist invalid" ;
-        Text [ dutch ] = "Ongeldig link-formaat" ;
+        Text [ dutch ] = "Ongeldige koppelingsindeling" ;
         Text [ english_us ] = "The link format is invalid." ;
         Text [ swedish ] = "L�nkens format �r ogiltigt" ;
         Text [ danish ] = "K�deformatet er ugyldigt" ;
@@ -2322,18 +2404,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "O formato da liga��o n�o � v�lido." ;
         Text [ portuguese_brazilian ] = "Das Format der Verkn?fung ist ung?tig" ;
         Text[ chinese_simplified ] = "无效的链接格式";
-        Text[ russian ] = "������������ ������ ������";
+        Text[ russian ] = "������������ ������ ������.";
         Text[ polish ] = "Format ��cza jest nieprawid�owy";
-        Text[ japanese ] = "ﾘﾝｸの書式は無効です";
+        Text[ japanese ] = "リンクの書式は無効です";
         Text[ chinese_traditional ] = "捷徑格式無效";
         Text[ arabic ] = "����� �������� ��� ����";
-        Text[ dutch ] = "Ongeldig link-formaat";
+        Text[ dutch ] = "Ongeldige koppelingsindeling";
         Text[ chinese_simplified ] = "无效的链接格式";
         Text[ greek ] = "� ����� ��� �������� ��� ����� ������.";
-        Text[ korean ] = "링크의 포맷이 유효하지 않습니다.";
+        Text[ korean ] = "링크의 형식이 잘못되었습니다.";
         Text[ turkish ] = "Ba�lant�n�n format� ge�erli de�il";
-        Text[ catalan ] = "El formato del v�nculo no es v�lido";
+        Text[ catalan ] = "El format de l'enlla� no �s v�lid";
         Text[ finnish ] = "Linkkimuoto on virheellinen.";
+        Text[ thai ] = "รูปแบบการเชื่อมโยงไม่ถูกต้อง";
     };
     String ERRCODE_SFX_WRONGICONFILE
     {
@@ -2349,24 +2432,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "A configura��o do painel de �cones n�o � v�lida." ;
         Text [ portuguese_brazilian ] = "Die Konfiguration der Symbolanzeige ist ung?tig" ;
         Text[ chinese_simplified ] = "图标显示的配置文件无效";
-        Text[ russian ] = "������������ ������������ ������ ��������";
+        Text[ russian ] = "������������ ������������ ������ ������.";
         Text[ polish ] = "Konfiguracja wy�wietlania symboli jest nieprawid�owa.";
-        Text[ japanese ] = "ｼﾝﾎﾞﾙ表示の設定が無効です";
+        Text[ japanese ] = "シンボル表示の設定が無効です";
         Text[ chinese_traditional ] = "用於圖示顯示的配置檔案無效";
         Text[ arabic ] = "����� ��� ������ ��� ����";
         Text[ dutch ] = "Ongeldige configuratie van pictogramweergave";
         Text[ chinese_simplified ] = "图标显示的配置文件无效";
         Text[ greek ] = "� ���������� ��� ��������� ��� �������� ��� ����� ������";
-        Text[ korean ] = "아이콘 보기 구성이 유효하지 않습니다.";
+        Text[ korean ] = "아이콘 보기 설정이 잘못되었습니다.";
         Text[ turkish ] = "Simge g�r�nt�leme konfig�rasyonu ge�erli de�il";
-        Text[ catalan ] = "La configuraci�n del panel de s�mbolos no es v�lida";
+        Text[ catalan ] = "La configuraci� del quadre de s�mbols no �s v�lida";
         Text[ finnish ] = "Kuvaken�yt�n kokoonpano on virheellinen.";
+        Text[ thai ] = "การแสดงผลโครงแบบไอคอนไม่ถูกต้อง";
     };
     String ERRCODE_SFX_CANTWRITEICONFILE
     {
         Text = "Die Konfiguration der Symbolanzeige kann nicht gespeichert werden" ;
         Text [ English ] = "The configuration of the symbolview could not be written" ;
-        Text [ dutch ] = "Configuration van pictogram kan niet worden opgeslagen" ;
+        Text [ dutch ] = "De configuratie van het pictogram kan niet worden opgeslagen" ;
         Text [ english_us ] = "The configuration of the icon display can not be saved." ;
         Text [ swedish ] = "Konfigurationen f�r symbolvisningen kan inte sparas." ;
         Text [ danish ] = "Det er ikke muligt at gemme ikonvisningens konfiguration" ;
@@ -2376,51 +2460,53 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "� imposs�vel guardar a configura��o do painel de �cones." ;
         Text [ portuguese_brazilian ] = "Die Konfiguration der Symbolanzeige kann nicht gespeichert werden" ;
         Text[ chinese_simplified ] = "无法存盘图标显示的配置文件";
-        Text[ russian ] = "��������� ������������ ������ ������� ����������";
+        Text[ russian ] = "���������� ��������� ������������ ������ ������.";
         Text[ polish ] = "Konfiguracji wy�wietlania symboli nie mo�na by�o zapisa�.";
-        Text[ japanese ] = "ｼﾝﾎﾞﾙ表示の設定は保存できません";
+        Text[ japanese ] = "シンボル表示の設定は保存できません";
         Text[ chinese_traditional ] = "無法儲存圖示顯示的配置檔案";
         Text[ arabic ] = "������� ����� ��� ������";
-        Text[ dutch ] = "Configuration van pictogram kan niet worden opgeslagen";
+        Text[ dutch ] = "De configuratie van het pictogram kan niet worden opgeslagen";
         Text[ chinese_simplified ] = "无法存盘图标显示的配置文件";
         Text[ greek ] = "��� ���� ������� �� ����������� � ���������� ��� ��������� ��� ��������";
-        Text[ korean ] = "아이콘 보기 컨피규레이션을 저장할 수 없습니다.";
+        Text[ korean ] = "아이콘 보기 설정을 저장할 수 없습니다.";
         Text[ turkish ] = "Simge g�r�nt�leme konfig�rasyonu kaydedilemiyor";
-        Text[ catalan ] = "No se puede guardar la configuraci�n del panel de s�mbolos";
+        Text[ catalan ] = "No es pot desar la configuraci� del quadre de s�mbols.";
         Text[ finnish ] = "Kuvaken�yt�n kokoonpanon tallentaminen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถบันทึกการแสดงผลโครงแบบไอคอนได้";
     };
     String ERRCODE_SFX_CANTDELICONFILE
     {
         Text = "Die Konfiguration der Symbolanzeige konnte nicht gel�scht werden" ;
         Text [ English ] = "The configuration of the symbolview could not be removed" ;
-        Text [ dutch ] = "Configuratie van pictogram kon niet worden gewist." ;
+        Text [ dutch ] = "Configuratie van pictogram kan niet worden gewist." ;
         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 [ spanish ] = "No se pudo eliminar la configuraci�n del panel de s�mbolos." ;
+        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." ;
         Text [ portuguese_brazilian ] = "Die Konfiguration der Symbolanzeige konnte nicht gel?cht werden" ;
         Text[ chinese_simplified ] = "无法删除图标显示的配置文件";
-        Text[ russian ] = "������� ������������ ������ ������� ����������";
+        Text[ russian ] = "���������� ������� ������������ ������ ������.";
         Text[ polish ] = "Konfiguracja wy�wietlania symboli nie mo�e zosta� usuni�ta.";
-        Text[ japanese ] = "ｼﾝﾎﾞﾙ表示の設定は削除できませんでした";
+        Text[ japanese ] = "シンボル表示の設定は削除できませんでした";
         Text[ chinese_traditional ] = "無法刪除圖示顯示的配置檔案";
         Text[ arabic ] = "���� ��� ����� ��� ������.";
-        Text[ dutch ] = "Configuratie van pictogram kon niet worden gewist.";
+        Text[ dutch ] = "Configuratie van pictogram kan niet worden gewist.";
         Text[ chinese_simplified ] = "无法删除图标显示的配置文件";
         Text[ greek ] = "��� ���� ������� �� ��������� � ���������� ��� ��������� ��� ��������";
-        Text[ korean ] = "아이콘 보기 컨피규레이션을 삭제하지 못했습니다.";
+        Text[ korean ] = "아이콘 보기 설정을 삭제하지 못했습니다.";
         Text[ turkish ] = "Simge g�r�nt�leme konfig�rasyonu silinemedi.";
-        Text[ catalan ] = "No se pudo eliminar la configuraci�n del panel de s�mbolos.";
+        Text[ catalan ] = "No es pot eliminar la configuraci� del qaudre de s�mbols.";
         Text[ finnish ] = "Kuvaken�yt�n kokoonpanon poistaminen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถลบการแสดงผลโครงแบบไอคอนได้";
     };
     String ERRCODE_SFX_CANTRENAMECONTENT
     {
         Text = "Der Inhalt konnte nicht umbenannt werden" ;
         Text [ English ] = "The content could not be renamed" ;
-        Text [ dutch ] = "De naam van de inhoud kon niet worden gewijzigd." ;
+        Text [ dutch ] = "De naam van de inhoud kan niet worden gewijzigd." ;
         Text [ english_us ] = "Contents cannot be renamed" ;
         Text [ swedish ] = "Inneh�llet kunde inte d�pas om" ;
         Text [ danish ] = "Det var ikke muligt at omd�be indholdet" ;
@@ -2430,24 +2516,25 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Foi imposs�vel mudar o nome do conte�do." ;
         Text [ portuguese_brazilian ] = "Der Inhalt konnte nicht umbenannt werden" ;
         Text[ chinese_simplified ] = "无法重命名内容";
-        Text[ russian ] = "������������� ���������� ����������";
+        Text[ russian ] = "���������� ������������� ����������";
         Text[ polish ] = "Nazwa zawarto�ci nie mog�a zosta� zmieniona.";
         Text[ japanese ] = "内容の名前の変更はできませんでした";
         Text[ chinese_traditional ] = "無法重新命名內容";
         Text[ arabic ] = "����� ����� ����� ����� ���������";
-        Text[ dutch ] = "De naam van de inhoud kon niet worden gewijzigd.";
+        Text[ dutch ] = "De naam van de inhoud kan niet worden gewijzigd.";
         Text[ chinese_simplified ] = "无法重命名内容";
         Text[ greek ] = "�� ����������� ��� ���� ������� �� ������������.";
-        Text[ korean ] = "내용 이름을　변경하지　못했습니다.";
+        Text[ korean ] = "내용 이름을 변경하지 못했습니다.";
         Text[ turkish ] = "��erik yeniden adland�r�lamad�";
-        Text[ catalan ] = "No se puede cambiar el nombre al contenido.";
-        Text[ finnish ] = "Sis�lt�� ei voida nimet� uudelleen";
+        Text[ catalan ] = "No es pot reanomenar el contingut";
+        Text[ finnish ] = "Sis�lt�� ei voi nimet� uudelleen.";
+        Text[ thai ] = "ไม่สามารถเปลี่ยนชื่อเนื้อหาได้";
     };
     String ERRCODE_SFX_INVALIDBMKPATH
     {
         Text = "Der Bookmarkordner ist ung�ltig" ;
         Text [ English ] = "The bookmarkfolder is invalid" ;
-        Text [ dutch ] = "De bookmark-ordner is ongeldig" ;
+        Text [ dutch ] = "De Bookmark-map is ongeldig" ;
         Text [ english_us ] = "The bookmark folder is invalid." ;
         Text [ swedish ] = "Bokm�rkesmappen �r ogiltig" ;
         Text [ danish ] = "Bogm�rkemappen er ugyldig" ;
@@ -2459,22 +2546,23 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "书签文件夹无效";
         Text[ russian ] = "������������ ����� ��������";
         Text[ polish ] = "Folder z zak�adkami jest nieprawid�owy";
-        Text[ japanese ] = "ﾌﾞｯｸﾏｰｸﾌｫﾙﾀﾞは無効です";
+        Text[ japanese ] = "ブックマークフォルダは無効です";
         Text[ chinese_traditional ] = "書籤資料夾無效";
         Text[ arabic ] = "���� �������� �������� ��� ����";
-        Text[ dutch ] = "De bookmark-ordner is ongeldig";
+        Text[ dutch ] = "De Bookmark-map is ongeldig";
         Text[ chinese_simplified ] = "书签文件夹无效";
         Text[ greek ] = "� ������� ������������� ��� ����� �������";
-        Text[ korean ] = "책갈피 폴더가 유효하지 않습니다.";
+        Text[ korean ] = "책갈피 폴더가 잘못되었습니다.";
         Text[ turkish ] = "Yer i�areti klas�r� ge�ersizdir";
-        Text[ catalan ] = "Carpeta de marcadores no v�lida";
+        Text[ catalan ] = "La carpeta de marcadors no �s v�lida.";
         Text[ finnish ] = "Kirjanmerkkikansio on virheellinen.";
+        Text[ thai ] = "โฟลเดอร์ที่คั่นไม่ถูกต้อง";
     };
     String ERRCODE_SFX_CANTWRITEURLCFGFILE
     {
         Text = "Die Konfiguration der lokal zu speichernden URLs konnte nicht gespeichert werden" ;
         Text [ English ] = "The configuration of the URLs to save local could not be saved" ;
-        Text [ dutch ] = "De configuratie van de URLs kon niet lokaal worden opgeslagen" ;
+        Text [ dutch ] = "De configuratie van de URL's kan niet lokaal worden opgeslagen" ;
         Text [ english_us ] = "The configuration of the URLs to be saved locally could not be saved" ;
         Text [ swedish ] = "Konfigurationen f�r de URL som skall sparas lokalt kunde inte sparas" ;
         Text [ danish ] = "Det var ikke muligt at gemme konfigurationen p� de URLs, som skulle gemmes lokalt" ;
@@ -2483,25 +2571,26 @@ Resource RID_ERRHDL
         Text [ french ] = "Impossible d'enregistrer la configuration des URL � enregistrer localement !" ;
         Text [ portuguese ] = "Foi imposs�vel guardar a configura��o dos URLs a serem guardados localmente." ;
         Text [ portuguese_brazilian ] = "Die Konfiguration der lokal zu speichernden URLs konnte nicht gespeichert werden" ;
-        Text[ chinese_simplified ] = "无法存盘要局部储存 URL 地址的配置文件";
-        Text[ russian ] = "��������� ������������ �������� ������������ URL ����������";
+        Text[ chinese_simplified ] = "无法存盘这个本机储存 URL 地址的配置文件";
+        Text[ russian ] = "���������� ��������� ������������ �������� ������������ URL";
         Text[ polish ] = "Nie mo�na by�o zapisa� konfiguracji adresu URL, kt�ry mia� zosta� lokalnie zapisany.";
-        Text[ japanese ] = "ﾛｰｶﾙで保存するURLの設定は保存できませんでした";
-        Text[ chinese_traditional ] = "無法保存局部儲存的 URL 配置檔案";
+        Text[ japanese ] = "ローカルで保存するURLの設定は保存できませんでした";
+        Text[ chinese_traditional ] = "無法保存本機儲存的 URL 配置檔案";
         Text[ arabic ] = "���� ��� ����� �������� (URLs) ������ ����� ������";
-        Text[ dutch ] = "De configuratie van de URLs kon niet lokaal worden opgeslagen";
-        Text[ chinese_simplified ] = "无法存盘要局部储存 URL 地址的配置文件";
+        Text[ dutch ] = "De configuratie van de URL's kan niet lokaal worden opgeslagen";
+        Text[ chinese_simplified ] = "无法存盘这个本机储存 URL 地址的配置文件";
         Text[ greek ] = "��� ���� ������� �� ����������� � ���������� ��� URL ��� ��������� �� ������������ ������";
-        Text[ korean ] = "로컬로 저장할 URL 컨피규레이션을 저장하지 못했습니다.";
+        Text[ korean ] = "로컬로 저장할 URL 설정을 저장하지 못했습니다.";
         Text[ turkish ] = "Yerel olarak kaydedilecek URL'Lerin konfig�rasyonu kaydedilemedi";
-        Text[ catalan ] = "No se pudo guardar la configuraci�n de las URLs a guardar localmente.";
-        Text[ finnish ] = "Paikallisiksi tallennettavien URL-osoitteiden kokoonpanon tallentaminen ei onnistunut";
+        Text[ catalan ] = "No es pot desar la configuraci� de les URLs que es volen desar localment.";
+        Text[ finnish ] = "Paikallisiksi tallennettavien URL-osoitteiden kokoonpanon tallentaminen ei onnistunut.";
+        Text[ thai ] = "บันทึกโครงแบบ URL  ไม่สามารถบันทึกเฉพาะแห่งได้";
     };
     String ERRCODE_SFX_WRONGURLCFGFORMAT
     {
         Text = "Das Format der Konfiguration der lokal zu speichernden URLs ist ung�ltig" ;
         Text [ English ] = "The format of the configuration of the URLs to save local is invalid" ;
-        Text [ dutch ] = "De configuratie van de URLs kon niet lokaal worden opgeslagen daar het formaat ongeldig is." ;
+        Text [ dutch ] = "De configuratie van de URL's kan niet lokaal worden opgeslagen omdat de indeling ongeldig is." ;
         Text [ english_us ] = "The configuration format of the URLs to be saved locally is invalid" ;
         Text [ swedish ] = "Formatet f�r konfigurationen f�r de URL som skall sparas lokalt �r ogiltigt" ;
         Text [ danish ] = "Konfigurationsformatet p� de URLs, som skulle gemmes lokalt, er ugyldigt" ;
@@ -2510,19 +2599,20 @@ Resource RID_ERRHDL
         Text [ french ] = "Le format de la configuration des URL � enregistrer localement est incorrect." ;
         Text [ portuguese ] = "O formato da configura��o dos URLs a serem guardados localmente n�o � v�lido." ;
         Text [ portuguese_brazilian ] = "Das Format der Konfiguration der lokal zu speichernden URLs ist ung?tig" ;
-        Text[ chinese_simplified ] = "局部储存 URL 地址的配置文件格式无效";
+        Text[ chinese_simplified ] = "本机储存 URL 地址的配置文件格式无效";
         Text[ russian ] = "������������ ������ ������������ �������� ������������ URL";
         Text[ polish ] = "Format konfiguracji adresu URL, kt�ry ma zosta� lokalnie zapisany, jest nieprawid�owy.";
-        Text[ japanese ] = "ﾛｰｶﾙで保存するURLを設定する書式が無効です";
-        Text[ chinese_traditional ] = "局部儲存 URL 配置檔案格式無效";
+        Text[ japanese ] = "ローカルで保存するURLを設定する書式が無効です";
+        Text[ chinese_traditional ] = "本機儲存 URL 配置檔案格式無效";
         Text[ arabic ] = "����� ����� �������� (URLs) ������� ����� ������ ��� ����";
-        Text[ dutch ] = "De configuratie van de URLs kon niet lokaal worden opgeslagen daar het formaat ongeldig is.";
-        Text[ chinese_simplified ] = "局部储存 URL 地址的配置文件格式无效";
+        Text[ dutch ] = "De configuratie van de URL's kan niet lokaal worden opgeslagen omdat de indeling ongeldig is.";
+        Text[ chinese_simplified ] = "本机储存 URL 地址的配置文件格式无效";
         Text[ greek ] = "� ����� ��� ��������� ��� URL, �� ����� ��������� �� ����������� ������, ��� ����� ������.";
-        Text[ korean ] = "로컬로 저장할 URL 컨피규레이션의 서식이 유효하지 않습니다.";
+        Text[ korean ] = "로컬로 저장할 URL 설정 형식이 잘못되었습니다.";
         Text[ turkish ] = "Yerel olarak kaydedilecek URL'lerin konfig�rasyon format� ge�erli de�il";
-        Text[ catalan ] = "No es v�lido el formato de la configuraci�n de las URLs a guardar localmente.";
-        Text[ finnish ] = "Paikallisiksi tallennettavien URL-osoitteiden kokoonpanomuoto on virheellinen";
+        Text[ catalan ] = "El format de la configuraci� de les URLs que es volen desar localment no �s v�lid.";
+        Text[ finnish ] = "Paikallisiksi tallennettavien URL-osoitteiden kokoonpanomuoto on virheellinen.";
+        Text[ thai ] = "บันทึกรูปแบบการกำหนดค่า URL เฉพาะแห่งไม่ถูกต้อง";
     };
     String ERRCODE_SFX_NODOCUMENT
     {
@@ -2538,19 +2628,20 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "N�o existe nenhum documento ao qual possa ser aplicada a ac��o." ;
         Text [ portuguese_brazilian ] = "Es existiert kein Dokument, auf das die Aktion angewendet werden kann" ;
         Text[ chinese_simplified ] = "执行操作所需的文档不存在";
-        Text[ russian ] = "��������, � �������� ������ ���� ��������� ��� ��������, �� ����������";
+        Text[ russian ] = "�� ���������� ���������, � �������� ������ ���� ��������� ��� ��������";
         Text[ polish ] = "Nie istnieje �aden dokument, do kt�rego mo�na by zastosowa� t� akcj�.";
-        Text[ japanese ] = "ｱｸｼｮﾝの適用できるﾄﾞｷｭﾒﾝﾄはありません";
+        Text[ japanese ] = "アクションの適用できるドキュメントはありません";
         Text[ chinese_traditional ] = "用於執行的文件不存在";
         Text[ arabic ] = "�� ���� ����� ���� ����� ������� ����";
         Text[ dutch ] = "Er bestaat geen document waarop deze activiteit kan worden toegepast.";
         Text[ chinese_simplified ] = "执行操作所需的文档不存在";
         Text[ greek ] = "��� ������� ������� ��� ����� �� ���������� � ��������";
-        Text[ korean ] = "이 작업을 적용할 수 있는 문서가 없음";
+        Text[ korean ] = "이 작동을 적용할 문서가 없음";
         Text[ turkish ] = "��lemin uygulanabilece�i bir belge mevcut de�il";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No existe ning�n documento al que se le pueda aplicar la acci�n";
-        Text[ finnish ] = "T�t� toimintoa ei voi suorittaa asiakirjalle, jota ei ole olemassa";
+        Text[ catalan ] = "No existeix cap document al qual es pugui aplicar l'acci�.";
+        Text[ finnish ] = "T�t� toimintoa ei voi suorittaa asiakirjalle, jota ei ole olemassa.";
+        Text[ thai ] = "ไม่สามารถประยุกต์การกระทำนี้กับเอกสารที่ไม่มีอยู่";
     };
     String ERRCODE_SFX_INVALIDLINK
     {
@@ -2566,18 +2657,19 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "A liga��o remete a um destino n�o v�lido." ;
         Text [ portuguese_brazilian ] = "Die Verkn?fung verweist auf ein ung?tiges Ziel" ;
         Text[ chinese_simplified ] = "链接指向一个无效的目标";
-        Text[ russian ] = "������ ��������� �� ������������ ����";
+        Text[ russian ] = "������ ��������� ������������ ����";
         Text[ polish ] = "��cze odnosi si� do nieprawid�owego celu.";
-        Text[ japanese ] = "ﾘﾝｸは無効なﾀｰｹﾞｯﾄを参照しています";
+        Text[ japanese ] = "リンクは無効なターゲットを参照しています";
         Text[ chinese_traditional ] = "捷徑指向一個無效的目標";
         Text[ arabic ] = "���� �������� ��� ��� ��� ����";
         Text[ dutch ] = "De koppeling verwijst naar een ongeldig doel";
         Text[ chinese_simplified ] = "链接指向一个无效的目标";
         Text[ greek ] = "� ������� ���������� �� ���� �� ������ ���������";
-        Text[ korean ] = "연결이 유효하지 않은 타겟을 지정하고 있음";
+        Text[ korean ] = "링크에서 잘못된 대상을 지정하고 있습니다.";
         Text[ turkish ] = "Ba�lant� ge�ersiz bir hedef g�steriyor";
-        Text[ catalan ] = "El v�nculo se refiere a un destino no v�lido";
-        Text[ finnish ] = "Linkki viittaa virheelliseen kohteeseen";
+        Text[ catalan ] = "L'enlla� es refereix a un dest� no v�lid";
+        Text[ finnish ] = "Linkki viittaa virheelliseen kohteeseen.";
+        Text[ thai ] = "การเชื่อมโยงอ้างถึงเป้าหมายที่ไม่ถูกต้อง";
     };
     String ERRCODE_SFX_INVALIDTRASHPATH
     {
@@ -2593,18 +2685,19 @@ Resource RID_ERRHDL
         Text [ french ] = "Le chemin sp�cifi� pour la corbeille est incorrect" ;
         Text [ dutch ] = "Het pad naar de prullenbak is ongeldig" ;
         Text[ chinese_simplified ] = "回收站路径无效";
-        Text[ russian ] = "������������ ���� ��� �������";
+        Text[ russian ] = "������������ ���� ��� �������";
         Text[ polish ] = "�cie�ka dla kosza jest nieprawid�owa.";
-        Text[ japanese ] = "ごみ箱のﾊﾟｽが無効です";
+        Text[ japanese ] = "ごみ箱のパスが無効です";
         Text[ chinese_traditional ] = "資源回收筒的路徑無效";
         Text[ arabic ] = "���� ��� ��������� ��� ����";
         Text[ dutch ] = "Het pad naar de prullenbak is ongeldig";
         Text[ chinese_simplified ] = "回收站路径无效";
         Text[ greek ] = "� �������� ��� ����� ����������� ��� ����� ������";
-        Text[ korean ] = "휴지통 경로가 유효하지 않음";
+        Text[ korean ] = "휴지통 경로가 잘못되었습니다.";
         Text[ turkish ] = "��p kutusu veri yolu ge�erli de�il";
-        Text[ catalan ] = "La ruta para la papelera no es v�lida.";
-        Text[ finnish ] = "Roskakorin polku on virheellinen";
+        Text[ catalan ] = "El cam� cap a la paperera no �s v�lid.";
+        Text[ finnish ] = "Roskakorin polku on virheellinen.";
+        Text[ thai ] = "เส้นทางถังขยะรีไซเคิลไม่ถูกต้อง";
     };
     String ERRCODE_SFX_NOTRESTORABLE
     {
@@ -2618,20 +2711,21 @@ Resource RID_ERRHDL
         Text [ italian ] = "Non � stato possibile ripristinare la voce" ;
         Text [ spanish ] = "No se pudo restaurar la entrada." ;
         Text [ french ] = "Impossible de restaurer l'entr�e" ;
-        Text [ dutch ] = "Het item kon niet worden hersteld" ;
+        Text [ dutch ] = "Item kan niet worden hersteld" ;
         Text[ chinese_simplified ] = "无法修复这个条目";
-        Text[ russian ] = "������������ ������ ����������";
+        Text[ russian ] = "������������ ������� ����������";
         Text[ polish ] = "Wpis nie m�g� zosta� przywr�cony";
         Text[ japanese ] = "項目は復元できませんでした";
         Text[ chinese_traditional ] = "無法修復這個條目";
         Text[ arabic ] = "����� ����� ������� �������";
-        Text[ dutch ] = "Het item kon niet worden hersteld";
+        Text[ dutch ] = "Item kan niet worden hersteld";
         Text[ chinese_simplified ] = "无法修复这个条目";
         Text[ greek ] = "��� ���� ������� �� ����� � ��������� ��� �����������";
         Text[ korean ] = "입력을 복구하지 못했습니다";
         Text[ turkish ] = "Giri� geri y�klenemedi";
-        Text[ catalan ] = "No se pudo restaurar la entrada.";
-        Text[ finnish ] = "Merkinn�n palauttaminen ei onnistunut";
+        Text[ catalan ] = "No s'ha pogut restaurar l'entrada";
+        Text[ finnish ] = "Merkinn�n palauttaminen ei onnistunut.";
+        Text[ thai ] = "ไม่สามารถคืนสภาพรายการได้";
     };
     String ERRCODE_IO_NAMETOOLONG
     {
@@ -2645,20 +2739,21 @@ Resource RID_ERRHDL
         Text [ italian ] = "Il nome del file � troppo lungo per il file system di destinazione." ;
         Text [ spanish ] = "El nombre del archivo es demasiado largo para el sistema de archivos destino." ;
         Text [ french ] = "Le nom de fichier est trop long pour le syst�me de fichiers cible." ;
-        Text [ dutch ] = "Bestandsnaam te lang voor het doel-bestandssysteem." ;
+        Text [ dutch ] = "Bestandsnaam te lang voor het doelbestandssysteem." ;
         Text[ chinese_simplified ] = "这个文件名的长度不适于目标文件系统。";
-        Text[ russian ] = "������� ������� ��� ����� ��� ������� ������� �����.";
+        Text[ russian ] = "������� ������� ��� ����� ��� �������� ������� ����������.";
         Text[ polish ] = "Nazwa pliku jest za d�uga dla docelowego systemu plik�w.";
-        Text[ japanese ] = "ﾀｰｹﾞｯﾄのﾌｧｲﾙ ｼｽﾃﾑのﾌｧｲﾙ名が長すぎます";
+        Text[ japanese ] = "ターゲットのファイル システムのファイル名が長すぎます";
         Text[ chinese_traditional ] = "這個檔案名的長度不適用於目標檔案系統。";
         Text[ arabic ] = "��� ����� ���� ���� ������� ����� ������� �����.";
-        Text[ dutch ] = "Bestandsnaam te lang voor het doel-bestandssysteem.";
+        Text[ dutch ] = "Bestandsnaam te lang voor het doelbestandssysteem.";
         Text[ chinese_simplified ] = "这个文件名的长度不适于目标文件系统。";
         Text[ greek ] = "�� ����� ����� ���������� ������ ��� �� ������� ���������� �������.";
         Text[ korean ] = "파일 이름이 대상 파일 시스템에 대해 너무 깁니다.";
         Text[ turkish ] = "Dosya ad�, hedef dosya sistemi i�in fazla uzun.";
-        Text[ catalan ] = "El nombre del archivo es demasiado largo para el sistema de archivos destino.";
-        Text[ finnish ] = "Tiedostonimi on liian pitk� kohdej�rjestelm�n tiedostoj�rjestelm�lle.";
+        Text[ catalan ] = "El nom del fitxer �s massa llarg pel sistema de fitxers de destinaci�.";
+        Text[ finnish ] = "Tiedoston nimi on liian pitk� kohdej�rjestelm�n tiedostoj�rjestelm�lle.";
+        Text[ thai ] = "ชื่อแฟ้มยาวเกินไปสำหรับระบบแฟ้มเป้าหมาย";
     };
     String ERRCODE_SFX_CONSULTUSER
     {
@@ -2672,20 +2767,21 @@ Resource RID_ERRHDL
         Text [ italian ] = "I dati sono insufficienti per l'esecuzione della funzione." ;
         Text [ spanish ] = "La funci�n no se puede ejecutar por falta de argumentos." ;
         Text [ french ] = "Les donn�es indiqu�es pour l'ex�cution de la fonction sont incompl�tes." ;
-        Text [ dutch ] = "De gegevens voor het uitvoeren van de functie zijn niet compleet.." ;
+        Text [ dutch ] = "De gegevens voor het uitvoeren van de functie zijn niet compleet." ;
         Text[ chinese_simplified ] = "执行功能的命令不完整。";
-        Text[ russian ] = "������ ��� ���������� ���� ������� �������� ���������.";
+        Text[ russian ] = "�������� ������ ��� ���������� ���� �������.";
         Text[ polish ] = "Dane do wykonania funkcji s� nie kompletne.";
         Text[ japanese ] = "機能を実行させるための指示が未完了です。";
         Text[ chinese_traditional ] = "指定執行功能的指令不完整。";
         Text[ arabic ] = "�������� ������� ������ ������ ��� ������.";
-        Text[ dutch ] = "De gegevens voor het uitvoeren van de functie zijn niet compleet..";
+        Text[ dutch ] = "De gegevens voor het uitvoeren van de functie zijn niet compleet.";
         Text[ chinese_simplified ] = "执行功能的命令不完整。";
         Text[ greek ] = "�� �������� ��� ��� �������� ��� ����������� ��� ����� ������������.";
-        Text[ korean ] = "기능 실행을 위한 지정사항이 불완전합니다.";
+        Text[ korean ] = "기능 실행을 위한 지정 사항이 불완전합니다.";
         Text[ turkish ] = "��lemin y�r�t�lmesi i�in gereken bilgiler tam de�il.";
-        Text[ catalan ] = "La funci�n no se puede ejecutar por falta de argumentos.";
+        Text[ catalan ] = "No es pot executar la funci� per falta d'arguments.";
         Text[ finnish ] = "Tiedot eiv�t riit� toiminnon toteuttamiseen.";
+        Text[ thai ] = "รายละเอียดสำหรับการรันฟังก์ชั่นไม่สมบูรณ์";
     };
     String ERRCODE_SFX_INVALIDSYNTAX
     {
@@ -2701,18 +2797,19 @@ Resource RID_ERRHDL
         Text [ french ] = "La syntaxe de la saisie est incorrecte." ;
         Text [ dutch ] = "Onjuiste schrijfwijze." ;
         Text[ chinese_simplified ] = "输入的语法无效。";
-        Text[ russian ] = "������������ ��������� �����";
+        Text[ russian ] = "������������ ��������� �����.";
         Text[ polish ] = "Sk�adnia wpisu jest niepoprawna.";
-        Text[ japanese ] = "この入力のｼﾝﾀｯｸｽは無効です。";
+        Text[ japanese ] = "この入力のシンタックスは無効です。";
         Text[ chinese_traditional ] = "輸入內容語法無效。";
         Text[ arabic ] = "���� ���� ������� ��� ����.";
         Text[ dutch ] = "Onjuiste schrijfwijze.";
         Text[ chinese_simplified ] = "输入的语法无效。";
         Text[ greek ] = "���������� ������� ���������.";
-        Text[ korean ] = "입력 구문이 유효하지 않습니다.";
+        Text[ korean ] = "입력 구문이 잘못되었습니다.";
         Text[ turkish ] = "Giri� s�z dizimi ge�erli de�il.";
-        Text[ catalan ] = "La sintaxis de la entrada no es v�lida";
+        Text[ catalan ] = "La sintaxi de l'entrada no �s v�lida";
         Text[ finnish ] = "Sy�tt�syntaksi on virheellinen.";
+        Text[ thai ] = "ไวยกรณ์ที่ป้อนเข้าไม่ถูกต้อง";
     };
     String ERRCODE_SFX_CANTCREATEFOLDER
     {
@@ -2730,16 +2827,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "输入的语法错误。";
         Text[ russian ] = "������������ ��������� �����.";
         Text[ polish ] = "Sk�adnia wpisu jest niepoprawna.";
-        Text[ japanese ] = "項目のｼﾝﾀｯｸｽが正しくありません。";
+        Text[ japanese ] = "項目のシンタックスが正しくありません。";
         Text[ chinese_traditional ] = "輸入內容語法錯誤。";
         Text[ arabic ] = "���� ���� ������� ��� ����.";
         Text[ dutch ] = "Onjuiste schrijfwijze.";
         Text[ chinese_simplified ] = "输入的语法错误。";
         Text[ greek ] = "���������� ������� ���������.";
-        Text[ korean ] = "입력 구문이 틀립니다.";
+        Text[ korean ] = "입력 구문이 잘못되었습니다.";
         Text[ turkish ] = "Giri� s�z dizimi yanl��.";
-        Text[ catalan ] = "La sintaxis de la entrada es incorrecta.";
+        Text[ catalan ] = "La sintaxi de l'entrada �s incorrecta.";
         Text[ finnish ] = "Sy�tt�syntaksi on virheellinen.";
+        Text[ thai ] = "ไวยกรณ์ที่ป้อนเข้าไม่ถูกต้อง";
     };
     String ERRCODE_SFX_CANTRENAMEFOLDER
     {
@@ -2757,17 +2855,18 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "输入的语法错误。";
         Text[ russian ] = "������������ ��������� �����.";
         Text[ polish ] = "Sk�adnia wpisu jest niepoprawna.";
-        Text[ japanese ] = "項目のｼﾝﾀｯｸｽが正しくありません。";
+        Text[ japanese ] = "項目のシンタックスが正しくありません。";
         Text[ chinese_traditional ] = "輸入的語法錯誤。";
         Text[ arabic ] = "���� ���� ������� ��� ����.";
         Text[ dutch ] = "Onjuiste schrijfwijze.";
         Text[ chinese_simplified ] = "输入的语法错误。";
         Text[ greek ] = "���������� ������� ���������.";
-        Text[ korean ] = "입력 구문이 틀립니다.";
+        Text[ korean ] = "입력 구문이 잘못되었습니다.";
         Text[ turkish ] = "Giri� s�z dizimi yanl��.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "La sintaxis de entrada es incorrecta.";
+        Text[ catalan ] = "La sintaxi d'entrada �s incorrecta.";
         Text[ finnish ] = "Sy�tt�syntaksi on virheellinen.";
+        Text[ thai ] = "ไวยกรณ์ที่ป้อนเข้าไม่ถูกต้อง";
     };
     String ERRCODE_SFX_WRONG_CDF_FORMAT
     {
@@ -2781,20 +2880,21 @@ Resource RID_ERRHDL
         Text [ italian ] = "Il documento di canale non ha un formato valido." ;
         Text [ spanish ] = "El formato del documento del canal no es v�lido." ;
         Text [ french ] = "Le format du document Channel est incorrect." ;
-        Text [ dutch ] = "Het channel-document heeft een ongeldig formaat." ;
+        Text [ dutch ] = "Het channel-document heeft een foutieve indeling." ;
         Text[ chinese_simplified ] = "频道文档的格式无效。";
         Text[ russian ] = "������������ ������ ��������� ������.";
         Text[ polish ] = "Dokument kana�u nie posiada prawid�owego formatu.";
-        Text[ japanese ] = "ﾁｬﾝﾈﾙ ﾄﾞｷｭﾒﾝﾄの書式は無効です。";
+        Text[ japanese ] = "チャンネル ドキュメントの書式は無効です。";
         Text[ chinese_traditional ] = "頻道文件格式無效";
         Text[ arabic ] = "����� ����� ������ ��� ����.";
-        Text[ dutch ] = "Het channel-document heeft een ongeldig formaat.";
+        Text[ dutch ] = "Het channel-document heeft een foutieve indeling.";
         Text[ chinese_simplified ] = "频道文档的格式无效。";
         Text[ greek ] = "� ����� ��� �������� �������� ��� ����� ������.";
-        Text[ korean ] = "채널 문서의 서식이 유효하지 않습니다.";
+        Text[ korean ] = "채널 문서의 서식이 잘못되었습니다.";
         Text[ turkish ] = "Kanal belgesinin format� ge�ersiz.";
-        Text[ catalan ] = "El formato del documento del canal no es v�lido.";
+        Text[ catalan ] = "El format del document del canal no �s v�lid.";
         Text[ finnish ] = "Kanava-asiakirjan muoto on virheellinen.";
+        Text[ thai ] = "ช่องเอกสารมีรูปแบบไม่ถูกต้อง";
     };
     String ERRCODE_SFX_EMPTY_SERVER
     {
@@ -2812,16 +2912,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "服务器不可以空缺";
         Text[ russian ] = "������ �� ������ ���� ������";
         Text[ polish ] = "Serwer nie mo�e by� pusty";
-        Text[ japanese ] = "ｻｰﾊﾞｰは空白ではいけません";
+        Text[ japanese ] = "サーバーは空白ではいけません";
         Text[ chinese_traditional ] = "伺服器不可以空缺";
         Text[ arabic ] = "��� ��� ���� ������� ������";
         Text[ dutch ] = "De server mag niet leeg zijn.";
         Text[ chinese_simplified ] = "服务器不可以空缺";
         Text[ greek ] = "� ����������� ��� ����������� �� ����� �����";
-        Text[ korean ] = "서버가 비어 있어서는 안됨";
+        Text[ korean ] = "서버가 비어 있으면 안됩니다.";
         Text[ turkish ] = "Sunucu bo� olmamal�d�r";
-        Text[ catalan ] = "El servidor no debe estar vac�o.";
-        Text[ finnish ] = "Palvelin ei saa olla tyhj�";
+        Text[ catalan ] = "El servidor no ha d'estar buit";
+        Text[ finnish ] = "Palvelin ei saa olla tyhj�.";
+        Text[ thai ] = "เซิร์ฟเวอร์ต้องไม่ว่าง";
     };
     String ERRCODE_SFX_NO_ABOBOX
     {
@@ -2832,22 +2933,37 @@ Resource RID_ERRHDL
         Text [ portuguese ] = "Para poder instalar um Channel, necessita de uma pasta para subscri��es.";
         Text [ danish ] = "Du har brug for en abonnement-mappe, hvis du vil installere en channel.";
         Text [ french ] = "Vous avez besoin d'un dossier d'abonnements pour installer un Channel.";
-        Text [ swedish ] = "Du beh�ver en prenumerationsmapp om Du vill installera en channel.";
-        Text [ dutch ] = "Om een channel te installeren heeft u een abonnementenmap nodig.";
+        Text [ swedish ] = "Du beh�ver en prenumerationsmapp om du vill installera en channel.";
+        Text [ dutch ] = "Om een channel te installeren, heeft u een abonnementenmap nodig.";
         Text [ spanish ] = "Para instalar un canal necesita una carpeta de suscripciones.";
     Text[ chinese_simplified ] = "如果要安装频道，您就需要先创建一个订阅文件夹。";
-        Text[ russian ] = "��� ����������� Channel ���������� ����� ��������.";
+        Text[ russian ] = "��� ��������� ������� ��������� ����� ��������.";
         Text[ polish ] = "Instalacja kana�u wymaga utworzenia folderu subkrypcji.";
-        Text[ japanese ] = "ﾁｬﾝﾈﾙをｲﾝｽﾄｰﾙするには購読ﾌｫﾙﾀﾞが必要です。";
+        Text[ japanese ] = "チャンネルをインストールするには購読フォルダが必要です。";
         Text[ chinese_traditional ] = "如果要安裝頻道﹐您就需要建立一個訂閱資料夾";
         Text[ arabic ] = "��� ����� �� ����� ���� ��� ����� ��� ���� ��������.";
-        Text[ dutch ] = "Om een channel te installeren heeft u een abonnementenmap nodig.";
+        Text[ dutch ] = "Om een channel te installeren, heeft u een abonnementenmap nodig.";
         Text[ chinese_simplified ] = "如果要安装频道，您就需要先创建一个订阅文件夹。";
         Text[ greek ] = "��� �� ����� � ����������� ������� �������� ���������� ���� ������� ���������.";
-        Text[ korean ] = "채널을 설치하려면 알림신청 폴더가 필요합니다.";
+        Text[ korean ] = "채널을 설치하려면 알림 요청 폴더가 필요합니다.";
         Text[ turkish ] = "Kanal kurmak i�in bir �yelik klas�r�n�z olmal�.";
-        Text[ catalan ] = "Para instalar un canal necesita una carpeta de suscripciones.";
+        Text[ catalan ] = "Per instal.lar un canal es necessita una carpeta de subscripcions.";
         Text[ finnish ] = "Kanavan asentaminen edellytt�� tilauskansiota.";
+        Text[ thai ] = "ต้องการโฟลเดอร์การสมัครสมาชิกเพื่อติดตั้งช่อง";
+    };
+    String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT
+    {
+        Text = "Dieses Dokument enth�lt Attribute die nicht im gew�hlten Format gespeichert werden k�nnen.\nBitte speichern Sie das Dokument in einem %PRODUCTNAME 6.0 Dateiformat.";
+        Text [ english ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ english_us ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ french ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ spanish ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ italian ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ swedish ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ japanese ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ korean ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ chinese_simplified ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
+        Text[ chinese_traditional ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME 6.0 file format.";
     };
 #ifdef ERRCODE_IO_INVALIDLENGTH
     String ERRCODE_IO_INVALIDLENGTH
@@ -2866,16 +2982,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "无效的数据长度。";
         Text[ russian ] = "������������ ����� ������.";
         Text[ polish ] = "Nieprawid�owa d�ugo�� danych.";
-        Text[ japanese ] = "無効なﾃﾞｰﾀの長さ。";
+        Text[ japanese ] = "無効なデータの長さ。";
         Text[ chinese_traditional ] = "資料長度無效。";
         Text[ arabic ] = "��� �������� ��� ����.";
         Text[ dutch ] = "Onjuiste gegevenslengte";
         Text[ chinese_simplified ] = "无效的数据长度。";
         Text[ greek ] = "�� ������ ����� ���������.";
-        Text[ korean ] = "데이터 길이가 유효하지 않습니다.";
+        Text[ korean ] = "데이터 길이가 잘못되었습니다.";
         Text[ turkish ] = "Ge�ersiz veri uzunlu�u.";
-        Text[ catalan ] = "Longitud de datos no v�lida.";
-        Text[ finnish ] = "Virheellinen tietojen pituus.";
+        Text[ catalan ] = "La llargada de les dades no �s v�lida.";
+        Text[ finnish ] = "Virheellinen tietojen pituus";
+        Text[ thai ] = "ความยาวข้อมูลไม่ถูกต้อง";
     };
     String ERRCODE_IO_CURRENTDIR
     {
@@ -2889,20 +3006,21 @@ Resource RID_ERRHDL
         Text [ italian ] = "Funzione impossibile: il percorso contiene la cartella corrente" ;
         Text [ spanish ] = "Funci�n imposible: La ruta contiene el directorio actual." ;
         Text [ french ] = "Impossible d'ex�cuter la fonction : le chemin indiqu� inclut le r�pertoire actif" ;
-        Text [ dutch ] = "Functie niet mogelijk. Pad bevat actuele directory" ;
+        Text [ dutch ] = "Functie niet mogelijk. Pad bevat huidige directory" ;
         Text[ chinese_simplified ] = "无法执行功能：路径含有当前的目录";
         Text[ russian ] = "����������� �������: ���� �������� ������� �������";
         Text[ polish ] = "Funkcja niemo�liwa:�cie�ka zawiera aktualny katalog";
-        Text[ japanese ] = "機能不可能：ﾊﾟｽが現在のﾃﾞｨﾚｸﾄﾘを含んでいます";
-        Text[ chinese_traditional ] = "無法執行功能：路徑含有當前的目錄";
+        Text[ japanese ] = "機能不可能：パスが現在のディレクトリを含んでいます";
+        Text[ chinese_traditional ] = "無法執行功能：路徑含有目前的目錄";
         Text[ arabic ] = "��� ������ ��� �����: ����� ������ ��� ������ ������.";
-        Text[ dutch ] = "Functie niet mogelijk. Pad bevat actuele directory";
+        Text[ dutch ] = "Functie niet mogelijk. Pad bevat huidige directory";
         Text[ chinese_simplified ] = "无法执行功能：路径含有当前的目录";
         Text[ greek ] = "��� ����� ������� �� ���������� � ����������: � �������� �������� ��� ������ ��������";
-        Text[ korean ] = "기능 불가능: 경로에 현재 디렉토리가 포함되어 있음";
+        Text[ korean ] = "기능 사용 불가능: 경로에 현재 디렉토리가 포함되어 있습니다.";
         Text[ turkish ] = "��lev olanakl� de�il: Veri yolu y�r�rl�kteki dizini i�eriyor";
-        Text[ catalan ] = "Funci�n imposible: La ruta contiene el directorio actual.";
-        Text[ finnish ] = "Toimintoa ei voi toteuttaa: polku sis�lt�� nykyisen hakemiston.";
+        Text[ catalan ] = "Funci� impossible: El cam� cont� el directori actual.";
+        Text[ finnish ] = "Toiminnon toteutus ei ole mahdollista: polku sis�lt�� nykyisen hakemiston.";
+        Text[ thai ] = "ฟังก์ชั่นที่เป็นไปไม่ได้: เส้นทางมีสารบบปัจจุบัน";
     };
     String ERRCODE_IO_NOTSAMEDEVICE
     {
@@ -2920,16 +3038,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "无法执行功能：不是同一个设备(驱动盘)。";
         Text[ russian ] = "����������� �������: ������ ���������� (����).";
         Text[ polish ] = "Funkcja niemo�liwa: nie to samo urz�dzenie (nap�d).";
-        Text[ japanese ] = "機能不可能：同じﾃﾞｨﾊﾞｲｽ(ﾄﾞﾗｲﾌﾞ)ではありません｡";
+        Text[ japanese ] = "機能不可能：同じデバイス(ドライブ)ではありません｡";
         Text[ chinese_traditional ] = "無法執行功能：不是同一個設備(驅動盤)。";
         Text[ arabic ] = "��� ������ ��� �����: ������ (���� �������( ��� �����.";
         Text[ dutch ] = "Functie niet mogelijk: niet hetzelfde apparaat (station).";
         Text[ chinese_simplified ] = "无法执行功能：不是同一个设备(驱动盘)。";
         Text[ greek ] = "��� ����� ������� �� ���������� � ����������: � ������� ��� ����� � ���� (������).";
-        Text[ korean ] = "기능 불가능: 장치(드라이브)가 동일하지 않음.";
+        Text[ korean ] = "기능 사용 불가능: 장치(드라이브)가 동일하지 않음.";
         Text[ turkish ] = "��lev olanakl� de�il: Chiza (s�r�c�) ayn� de�il.";
-        Text[ catalan ] = "Funci�n imposible: No es el mismo dispositivo (unidad).";
-        Text[ finnish ] = "Toimintoa ei voi toteuttaa: laite (asema) ei ole identtinen.";
+        Text[ catalan ] = "Funci� impossible: No �s el mateix dispositiu (unitat).";
+        Text[ finnish ] = "Toiminnon toteutus ei ole mahdollista: laite (asema) ei ole identtinen.";
+        Text[ thai ] = "ฟังก์ชั่นเป็นไปไม่ได้: อุปกรณ์ (ไดร้ฟ์) ไม่เหมือนกัน";
     };
     String ERRCODE_IO_DEVICENOTREADY
     {
@@ -2947,16 +3066,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "设备(驱动盘)还没有准备就绪。";
         Text[ russian ] = "���������� (����) �� ������.";
         Text[ polish ] = "Urz�dzenie (nap�d) nie gotowe.";
-        Text[ japanese ] = "ﾃﾞｨﾊﾞｲｽ(ﾄﾞﾗｲﾌﾞ)の準備ができていません。";
+        Text[ japanese ] = "デバイス(ドライブ)の準備ができていません。";
         Text[ chinese_traditional ] = "設備(驅動盤)還沒有準備就緒";
         Text[ arabic ] = "������ (���� �������) ��� ����.";
         Text[ dutch ] = "Apparaat (station) niet gereed.";
         Text[ chinese_simplified ] = "设备(驱动盘)还没有准备就绪。";
         Text[ greek ] = "� ������� (������ ������) ��� ����� ������.";
-        Text[ korean ] = "장치(드라이브)가 준비되어 있지 않음.";
+        Text[ korean ] = "장치(드라이브)가 준비되어 있지 않습니다.";
         Text[ turkish ] = "Cihaz (s�r�c�) haz�r de�il.";
-        Text[ catalan ] = "Dispositivo (unidad) no listo.";
+        Text[ catalan ] = "El dispositiu (unitat) no est� disponible.";
         Text[ finnish ] = "Laite (asema) ei ole valmis.";
+        Text[ thai ] = "อุปกรณ์ (ไดร้ฟ์) ไม่พร้อม";
     };
     String ERRCODE_IO_BADCRC
     {
@@ -2974,16 +3094,17 @@ Resource RID_ERRHDL
         Text[ chinese_simplified ] = "错误的检查数目。";
         Text[ russian ] = "������������ ����������� �����.";
         Text[ polish ] = "Nieprawid�owa suma kontrolna.";
-        Text[ japanese ] = "正しくないﾁｪｯｸｻﾑ｡";
+        Text[ japanese ] = "正しくないチェックサム｡";
         Text[ chinese_traditional ] = "檢查數目有誤";
         Text[ arabic ] = "����� ������� ����";
         Text[ dutch ] = "Controlegetal niet juist.";
         Text[ chinese_simplified ] = "错误的检查数目。";
         Text[ greek ] = "����� ������ �������";
-        Text[ korean ] = "체크 합계가 틀립니다.";
+        Text[ korean ] = "틀린 검사 합계";
         Text[ turkish ] = "Yanl�� sa�lama toplam�.";
-        Text[ catalan ] = "Suma err�nea de revisi�n.";
-        Text[ finnish ] = "V��r� tarkistussumma.";
+        Text[ catalan ] = "Suma de revisi� incorrecta.";
+        Text[ finnish ] = "V��r� tarkistussumma";
+        Text[ thai ] = "ตรวจสอบจำนวนผิด";
     };
     String ERRCODE_IO_WRITEPROTECTED
     {
@@ -2996,21 +3117,22 @@ Resource RID_ERRHDL
         Text [ danish ] = "Funktion ikke mulig: skrivebeskyttet" ;
         Text [ italian ] = "Funzione impossibile: solo lettura." ;
         Text [ spanish ] = "Funci�n imposible: Solo lectura." ;
-        Text [ french ] = "Impossible d'ex�cuter la fonction : en lecture-seule" ;
-        Text [ dutch ] = "Functie niet mogelijk: schrijfbeveiligd." ;
+        Text [ french ] = "Impossible d'ex�cuter la fonction : en lecture seule" ;
+        Text [ dutch ] = "Functie niet mogelijk: alleen-lezen." ;
         Text[ chinese_simplified ] = "无法执行功能：防改写";
-        Text[ russian ] = "����������� �������: ����������� ������ �� ������.";
+        Text[ russian ] = "���������� ��������� ��������: ������ �� ������.";
         Text[ polish ] = "Wykonanie funkcji niemo�liwe: Tylko do odczytu.";
         Text[ japanese ] = "機能不可能：書き込み保護。";
         Text[ chinese_traditional ] = "無法執行功能：唯讀";
         Text[ arabic ] = "��� ������ ��� �����: ���� �� �������.";
-        Text[ dutch ] = "Functie niet mogelijk: schrijfbeveiligd.";
+        Text[ dutch ] = "Functie niet mogelijk: alleen-lezen.";
         Text[ chinese_simplified ] = "无法执行功能：防改写";
         Text[ greek ] = "��� ����� ������� �� ���������� � ����������: ���� ��� ��������";
-        Text[ korean ] = "기능 불가능: 쓰기 보호됨.";
+        Text[ korean ] = "기능 사용 불가능: 쓰기 보호됨";
         Text[ turkish ] = "��lev olanakl� de�il: Yazma korumal�.";
-        Text[ catalan ] = "Funci�n imposible: Solo lectura.";
+        Text[ catalan ] = "Funci� impossible: Nom�s lectura.";
         Text[ finnish ] = "Toiminnon toteutus ei ole mahdollista: objekti on kirjoitussuojattu.";
+        Text[ thai ] = "ฟังก์ชั่นเป็นไปไม่ได้: เขียนป้องกัน";
     };
 #endif
 };
@@ -3034,3 +3156,12 @@ Resource RID_ERRHDL
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src
index 53ac4080507e..6649b44cf045 100644
--- a/svtools/source/misc/helpagent.src
+++ b/svtools/source/misc/helpagent.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helpagent.src,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-07 15:19:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,13 +73,3 @@ Bitmap BMP_HELP_AGENT_CLOSER
     File = "closer.bmp";
 };
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/05/07 13:43:24  fs
- *  initial checkin - resources for the help agent
- *
- *
- *  Revision 1.0 04.05.01 07:12:39  fs
- ************************************************************************/
-
diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx
index 0e4a8056cfdc..26e037556c5d 100644
--- a/svtools/source/misc/helpagentwindow.cxx
+++ b/svtools/source/misc/helpagentwindow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helpagentwindow.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: pb $ $Date: 2001-10-24 09:09:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -232,28 +232,3 @@ namespace svt
 }   // namespace svt
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2001/07/03 08:02:10  pb
- *  fix: #88808# closer button always clickable
- *
- *  Revision 1.4  2001/06/21 10:20:38  hjs
- *  no project prefix
- *
- *  Revision 1.3  2001/06/18 15:36:47  mba
- *  #87300#: always enable input for help agent window
- *
- *  Revision 1.2  2001/05/11 09:07:24  rt
- *  #65293# fix for gcc (needs temporary variable for Point() )
- *
- *  Revision 1.1  2001/05/07 15:18:58  fs
- *  initial checkin - window for the new help agent
- *
- *  Revision 1.1  2001/05/07 13:42:30  fs
- *  initial checkin - help agent window
- *
- *
- *  Revision 1.0 03.05.01 11:51:40  fs
- ************************************************************************/
-
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 6179a72ec40a..5d34131c61dd 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imagemgr.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: pb $ $Date: 2002-11-05 07:35:41 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,6 +114,9 @@
 #ifndef _UCBHELPER_CONTENT_HXX
 #include <ucbhelper/content.hxx>
 #endif
+#ifndef _TOOLS_RCID_H
+#include <tools/rcid.h>
+#endif
 
 #include "svtools.hrc"
 #include "imagemgr.hrc"
@@ -560,6 +563,77 @@ USHORT GetFolderDescriptionId_Impl( const String& rURL )
     return nRet;
 }
 
+ResMgr* GetIsoResMgr_Impl()
+{
+    static ResMgr* pIsoResMgr = NULL;
+
+    if ( !pIsoResMgr )
+    {
+        ByteString aResMgrName( "iso" );
+        aResMgrName += ByteString::CreateFromInt32( SOLARUPD );
+        pIsoResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILanguage() );
+    }
+
+    return pIsoResMgr;
+}
+
+ImageList* CreateImageList_Impl( USHORT nResId )
+{
+    ImageList* pList = NULL;
+    ResMgr* pResMgr = GetIsoResMgr_Impl();
+    DBG_ASSERT( pResMgr, "SvFileInformationManager::CreateImageList_Impl(): no resmgr" );
+    ResId aResId( nResId, pResMgr );
+    aResId.SetRT( RSC_IMAGELIST );
+    if ( pResMgr->IsAvailable( aResId ) )
+        pList = new ImageList( aResId );
+    else
+        pList = new ImageList();
+    return pList;
+}
+
+Image GetOfficeImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHighContrast )
+{
+    ImageList* pList = NULL;
+
+    static ImageList* _pSmallOfficeImgList = NULL;
+    static ImageList* _pBigOfficeImgList = NULL;
+    static ImageList* _pSmallHCOfficeImgList = NULL;
+    static ImageList* _pBigHCOfficeImgList = NULL;
+
+    if ( bBig )
+    {
+        if ( bHighContrast )
+        {
+            if ( !_pBigHCOfficeImgList )
+                _pBigHCOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST );
+            pList = _pBigHCOfficeImgList;
+        }
+        else
+        {
+            if ( !_pBigOfficeImgList )
+                _pBigOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_BIG );
+            pList = _pBigOfficeImgList;
+        }
+    }
+    else
+    {
+        if ( bHighContrast )
+        {
+            if ( !_pSmallHCOfficeImgList )
+                _pSmallHCOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST );
+            pList = _pSmallHCOfficeImgList;
+        }
+        else
+        {
+            if ( !_pSmallOfficeImgList )
+                _pSmallOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_SMALL );
+            pList = _pSmallOfficeImgList;
+        }
+    }
+
+    return pList->GetImage( nImageId );
+}
+
 Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHighContrast )
 {
     if ( !bBig && IMG_FOLDER == nImageId && !bHighContrast )
@@ -604,7 +678,10 @@ Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHighContrast )
         }
     }
 
-    return pList->GetImage( nImageId );
+    if ( pList->GetImagePos( nImageId ) != IMAGELIST_IMAGE_NOTFOUND )
+        return pList->GetImage( nImageId );
+    else
+        return GetOfficeImageFromList_Impl( nImageId, bBig, bHighContrast );
 }
 
 //****************************************************************************
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 7e95f4b5bb7e..12bc33710aa4 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imagemgr.src,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: rt $ $Date: 2002-12-09 11:42:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,14 +66,9 @@
  // images ********************************************************************
 
 #define X_IMAGE_LIST \
-        IMG_IMPRESS ; \
         IMG_WORKPLACE ; \
         IMG_BITMAP ; \
-        IMG_CALC ; \
-        IMG_CALCTEMPLATE ; \
-        IMG_CHART ; \
         IMG_DATABASE ; \
-        IMG_IMPRESSTEMPLATE ; \
         IMG_EXCEL ; \
         IMG_EXCELTEMPLATE ; \
         IMG_FTPSERVER ; \
@@ -81,11 +76,9 @@
         IMG_GALLERYTHEME ; \
         IMG_GIF ; \
         IMG_HELP ; \
-        IMG_HTML ; \
         IMG_JPG ; \
         IMG_LINK ; \
         IMG_LOTUS ; \
-        IMG_MATH ; \
         IMG_MATHTEMPLATE ; \
         IMG_FILE ; \
         IMG_APP ; \
@@ -99,8 +92,6 @@
         IMG_URL ; \
         IMG_WMF ; \
         IMG_WORD ; \
-        IMG_WRITER ; \
-        IMG_WRITERTEMPLATE ; \
         IMG_FIXEDDEV ; \
         IMG_REMOVEABLEDEV ; \
         IMG_CDROMDEV ; \
@@ -119,21 +110,16 @@
         IMG_REPORT ; \
         IMG_REPORTFOLDER ; \
         IMG_OTHERS ; \
-        IMG_MACROLIB ; \
         IMG_DXF ; \
         IMG_MET ; \
         IMG_PNG ; \
         IMG_SGF ; \
         IMG_SGV ; \
         IMG_SVM ; \
-        IMG_GLOBAL_DOC ; \
-        IMG_DRAW ; \
-        IMG_DRAWTEMPLATE ; \
         IMG_TASK ; \
         IMG_APPOINTMENT ; \
         IMG_RELATION ; \
         IMG_IMPRESSPACKED ; \
-        IMG_NEWFROMTEMPLATE ; \
         IMG_POWERPOINT ; \
         IMG_POWERPOINTTEMPLATE ;
 
@@ -147,7 +133,7 @@ ImageList RID_SVTOOLS_IMAGELIST_BIG
     };
     IdCount =
     {
-        70 ;
+        56 ;
     };
 };
 
@@ -161,7 +147,7 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
     };
     IdCount =
     {
-        70;
+        56;
     };
 };
 
@@ -175,7 +161,7 @@ ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
     };
     IdCount =
     {
-        70 ;
+        56 ;
     };
 };
 
@@ -189,9 +175,10 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
     };
     IdCount =
     {
-        70;
+        56;
     };
 };
+
 // description strings
 
 String STR_DESCRIPTION_SOURCEFILE
@@ -216,7 +203,7 @@ String STR_DESCRIPTION_SOURCEFILE
     Text[ dutch ] = "Broncode";
     Text[ chinese_simplified ] = "源文本";
     Text[ greek ] = "������� ����������";
-    Text[ korean ] = "소스 코드";
+    Text[ korean ] = "원본 코드";
     Text[ turkish ] = "Kaynak kod";
     Text[ finnish ] = "L�hdekoodi";
     Text[ catalan ] = "Codi font";
@@ -272,7 +259,7 @@ String STR_DESCRIPTION_GRAPHIC_DOC
     Text[ dutch ] = "Afbeelding";
     Text[ chinese_simplified ] = "图形";
     Text[ greek ] = "�������";
-    Text[ korean ] = "그래픽";
+    Text[ korean ] = "그림";
     Text[ turkish ] = "Grafik";
     Text[ finnish ] = "Grafiikka";
     Text[ catalan ] = "Gr�fic";
@@ -448,12 +435,12 @@ String STR_DESCRIPTION_HELP_DOC
 };
 String STR_DESCRIPTION_HTMLFILE
 {
-    Text = "Internet Dokument" ;
-    Text [ English ] = "Internet Document" ;
+    Text = "HTML-Dokument" ;
+    Text [ English ] = "HTML document" ;
     Text [ dutch ] = "Internetdocument" ;
-    Text [ english_us ] = "Internet document" ;
+    Text [ english_us ] = "HTML document" ;
     Text [ italian ] = "Documento Internet" ;
-    Text [ spanish ] = "Documento Internet" ;
+    Text [ spanish ] = "Documento de Internet" ;
     Text [ french ] = "Document Internet" ;
     Text [ swedish ] = "Internetdokument" ;
     Text [ danish ] = "Internet-dokument" ;
@@ -496,7 +483,7 @@ String STR_DESCRIPTION_ARCHIVFILE
     Text[ dutch ] = "Archiefbestand";
     Text[ chinese_simplified ] = "档案文件";
     Text[ greek ] = "A����� ���� ������";
-    Text[ korean ] = "저장 파일";
+    Text[ korean ] = "보관 파일";
     Text[ turkish ] = "Ar�iv dosyas�";
     Text[ finnish ] = "Arkistotiedosto";
     Text[ catalan ] = "Fitxer d'arxiu";
@@ -540,7 +527,7 @@ String STR_DESCRIPTION_SMATH_DOC
     Text [ swedish ] = "%PRODUCTNAME-formel" ;
     Text [ danish ] = "%PRODUCTNAME-formel" ;
     Text [ italian ] = "Formula %PRODUCTNAME" ;
-    Text [ spanish ] = "%PRODUCTNAME F�rmula" ;
+    Text [ spanish ] = "%PRODUCTNAME - F�rmula" ;
     Text [ french ] = "Formule %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME formule" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 公式";
@@ -568,7 +555,7 @@ String STR_DESCRIPTION_SCHART_DOC
     Text [ swedish ] = "%PRODUCTNAME-diagram" ;
     Text [ danish ] = "%PRODUCTNAME-diagram" ;
     Text [ italian ] = "Diagramma %PRODUCTNAME" ;
-    Text [ spanish ] = "%PRODUCTNAME Diagrama" ;
+    Text [ spanish ] = "%PRODUCTNAME - Diagrama" ;
     Text [ french ] = "Diagramme %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME diagram" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 图表";
@@ -596,7 +583,7 @@ String STR_DESCRIPTION_SDRAW_DOC
     Text [ swedish ] = "%PRODUCTNAME-teckning" ;
     Text [ danish ] = "%PRODUCTNAME-tegning" ;
     Text [ italian ] = "~Disegno %PRODUCTNAME " ;
-    Text [ spanish ] = "%PRODUCTNAME Dibujo" ;
+    Text [ spanish ] = "%PRODUCTNAME - Dibujo" ;
     Text [ french ] = "Dessin %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME tekening" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 绘图";
@@ -624,7 +611,7 @@ String STR_DESCRIPTION_SCALC_DOC
     Text [ swedish ] = "%PRODUCTNAME-tabell" ;
     Text [ danish ] = "%PRODUCTNAME-tabel" ;
     Text [ italian ] = "Tabella %PRODUCTNAME" ;
-    Text [ spanish ] = "%PRODUCTNAME Hoja de c�lculo" ;
+    Text [ spanish ] = "%PRODUCTNAME - Hoja de c�lculo" ;
     Text [ french ] = "Classeur %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME werkblad" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 工作表";
@@ -652,7 +639,7 @@ String STR_DESCRIPTION_SIMPRESS_DOC
     Text [ swedish ] = "%PRODUCTNAME-presentation" ;
     Text [ danish ] = "%PRODUCTNAME-pr�sentation" ;
     Text [ italian ] = "Presentazione %PRODUCTNAME" ;
-    Text [ spanish ] = "%PRODUCTNAME Presentaci�n" ;
+    Text [ spanish ] = "%PRODUCTNAME - Presentaci�n" ;
     Text [ french ] = "Pr�sentation %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME presentatie" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 演示文稿";
@@ -680,7 +667,7 @@ String STR_DESCRIPTION_SWRITER_DOC
     Text [ swedish ] = "%PRODUCTNAME-text" ;
     Text [ danish ] = "%PRODUCTNAME-tekst" ;
     Text [ italian ] = "Testo %PRODUCTNAME" ;
-    Text [ spanish ] = "%PRODUCTNAME Texto" ;
+    Text [ spanish ] = "%PRODUCTNAME - Texto" ;
     Text [ french ] = "Texte %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME tekst" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 文本";
@@ -708,7 +695,7 @@ String STR_DESCRIPTION_GLOBALDOC
     Text [ swedish ] = "%PRODUCTNAME-text samlingsdokument" ;
     Text [ danish ] = "%PRODUCTNAME-teksthoveddokument" ;
     Text [ italian ] = "Documento master di testo di %PRODUCTNAME" ;
-    Text [ spanish ] = "%PRODUCTNAME Documento maestro de texto" ;
+    Text [ spanish ] = "%PRODUCTNAME - Documento maestro de texto" ;
     Text [ french ] = "Document texte ma�tre %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME Tekst Masterdocument" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 文本 主控文档";
@@ -736,7 +723,7 @@ String STR_DESCRIPTION_SIMAGE_DOC
     Text [ swedish ] = "%PRODUCTNAME-bild" ;
     Text [ danish ] = "%PRODUCTNAME-billede" ;
     Text [ italian ] = "Immagine %PRODUCTNAME" ;
-    Text [ spanish ] = "%PRODUCTNAME Imagen" ;
+    Text [ spanish ] = "%PRODUCTNAME - Imagen" ;
     Text [ french ] = "Image %PRODUCTNAME" ;
     Text [ dutch ] = "%PRODUCTNAME afbeelding" ;
     Text [ chinese_simplified ] = "%PRODUCTNAME 图像";
@@ -832,7 +819,7 @@ String STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC
     Text[ dutch ] = "%PRODUCTNAME sjabloon";
     Text[ chinese_simplified ] = "%PRODUCTNAME 样式";
     Text[ greek ] = "%PRODUCTNAME - �������";
-    Text[ korean ] = "%PRODUCTNAME 템플릿";
+    Text[ korean ] = "%PRODUCTNAME 서식 파일";
     Text[ turkish ] = "%PRODUCTNAME �ablonu";
     Text[ finnish ] = "%PRODUCTNAME-malli";
     Text[ catalan ] = "%PRODUCTNAME Plantilla";
@@ -876,7 +863,7 @@ String STR_DESCRIPTION_EXCEL_TEMPLATE_DOC
     Text [ swedish ] = "MS Excel-dokumentmall" ;
     Text [ danish ] = "MS Excel-skabelon" ;
     Text [ italian ] = "MS Excel Modello" ;
-    Text [ spanish ] = "MS Excel - Plantilla" ;
+    Text [ spanish ] = "Plantilla de MS Excel" ;
     Text [ french ] = "Mod�le MS Excel" ;
     Text [ dutch ] = "MS Excel-sjabloon" ;
     Text [ chinese_simplified ] = "MS Excel 模板";
@@ -1021,7 +1008,7 @@ String STR_DESCRIPTION_FACTORY_CALC
     Text[ polish ] = "Arkusz kalkulacyjny";
     Text[ portuguese_brazilian ] = "Spreadsheet";
     Text[ japanese ] = "表計算ドキュメント";
-    Text[ korean ] = "스프레드시트 문서";
+    Text[ korean ] = "스프레드시트";
     Text[ chinese_simplified ] = "工作表文档";
     Text[ chinese_traditional ] = "工作表文件";
     Text[ turkish ] = "Hesap tablosu";
@@ -1088,7 +1075,7 @@ String STR_DESCRIPTION_FACTORY_WRITERWEB
     Text [ ENGLISH ] = "HTML Document" ;
     Text[ english_us ] = "HTML document";
     Text[ portuguese ] = "Documento HTML";
-    Text[ russian ] = "HTML-��������";
+    Text[ russian ] = "���-��������";
     Text[ greek ] = "������� HTML";
     Text[ dutch ] = "HTML-document";
     Text[ french ] = "Document HTML";
@@ -1163,100 +1150,100 @@ String STR_DESCRIPTION_CALC_TEMPLATE
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Tabellendokument Vorlage" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
-    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modelo de folha de c�lculo";
-    Text[ russian ] = "������ ����������� ������� %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION";
-    Text[ greek ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Tabledocument Template";
+    Text[ portuguese ] = "%PRODUCTNAME 6.0 Modelo de folha de c�lculo";
+    Text[ russian ] = "������ ����������� ������� %PRODUCTNAME 6.0";
+    Text[ greek ] = "%PRODUCTNAME 6.0 Tabledocument Template";
     Text[ dutch ] = "%productname% 6.0 Werkbladsjabloon";
     Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Mod�le de classeur";
-    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de hoja de c�lculo";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Plantilla de hoja de c�lculo";
     Text[ finnish ] = "%PRODUCTNAME 6.0 -laskentataulukkomalli";
     Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modello di foglio elettronico";
-    Text[ danish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-regnearksskabelon";
-    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION tabelldokument mall";
-    Text[ polish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Szablon arkusza kalkulacyjnego";
+    Text[ danish ] = "%PRODUCTNAME 6.0-regnearksskabelon";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-tabelldokumentsmall";
+    Text[ polish ] = "%PRODUCTNAME 6.0 - Szablon arkusza kalkulacyjnego";
     Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Tabledocument Template";
-    Text[ japanese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 表計算ドキュメント テンプレート";
-    Text[ korean ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 스프레드시트 템플릿";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 表計算ドキュメントテンプレート";
+    Text[ korean ] = "%PRODUCTNAME 6.0 스프레드시트 서식 파일";
     Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 工作表文档样式";
     Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 工作表文件樣式";
-    Text[ turkish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Tabledocument Template";
-    Text[ arabic ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Tabledocument Template";
-    Text[ catalan ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de full de c�lcul";
+    Text[ turkish ] = "%PRODUCTNAME 6.0 Tabledocument Template";
+    Text[ arabic ] = "%PRODUCTNAME 6.0 Tabledocument Template";
+    Text[ catalan ] = "%PRODUCTNAME 6.0 Plantilla de full de c�lcul";
     Text[ thai ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template";
 };
 String STR_DESCRIPTION_DRAW_TEMPLATE
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Zeichnungsvorlage" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
-    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modelo de desenho";
-    Text[ russian ] = "������ ������� %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION";
-    Text[ greek ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template";
+    Text[ portuguese ] = "%PRODUCTNAME 6.0 Modelo de desenho";
+    Text[ russian ] = "������ ������� %PRODUCTNAME 6.0";
+    Text[ greek ] = "%PRODUCTNAME 6.0 Drawing Template";
     Text[ dutch ] = "%PRODUCTNAME 6.0 Tekeningsjabloon";
     Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Mod�le de dessin";
-    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de dibujo";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION  - Plantilla de dibujo";
     Text[ finnish ] = "%PRODUCTNAME 6.0 - Piirrosmalli";
     Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modelli di disegno";
-    Text[ danish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-tegningsskabelon";
-    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION teckningsmall";
-    Text[ polish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Szablon rysunku";
+    Text[ danish ] = "%PRODUCTNAME 6.0-tegningsskabelon";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-teckningsmall";
+    Text[ polish ] = "%PRODUCTNAME 6.0 - Szablon rysunku";
     Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template";
-    Text[ japanese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 図形描画テンプレート";
-    Text[ korean ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 그리기 템플릿";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 図形描画テンプレート";
+    Text[ korean ] = "%PRODUCTNAME 6.0 그리기 서식 파일";
     Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 绘图样式";
     Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 繪圖樣式";
-    Text[ turkish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template";
-    Text[ arabic ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template";
-    Text[ catalan ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de dibuix";
+    Text[ turkish ] = "%PRODUCTNAME 6.0 Drawing Template";
+    Text[ arabic ] = "%PRODUCTNAME 6.0 Drawing Template";
+    Text[ catalan ] = "%PRODUCTNAME 6.0 Plantilla de dibuix";
     Text[ thai ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template";
 };
 String STR_DESCRIPTION_IMPRESS_TEMPLATE
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Pr�sentationsvorlage" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
-    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modelo de apresenta��o";
-    Text[ russian ] = "������ ����������� %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION";
-    Text[ greek ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template";
+    Text[ portuguese ] = "%PRODUCTNAME 6.0 Modelo de apresenta��o";
+    Text[ russian ] = "������ ����������� %PRODUCTNAME 6.0";
+    Text[ greek ] = "%PRODUCTNAME 6.0 Presentation Template";
     Text[ dutch ] = "%PRODUCTNAME 6.0 Presentatiesjabloon";
     Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Mod�le de pr�sentation";
-    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de presentaci�n";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION  - Plantilla de presentaci�n";
     Text[ finnish ] = "%PRODUCTNAME 6.0 - Esitysmalli";
     Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modello di presentazione";
-    Text[ danish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-pr�sentationsskabelon";
-    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION presentationsmall";
-    Text[ polish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Szablon prezentacji";
+    Text[ danish ] = "%PRODUCTNAME 6.0-pr�sentationsskabelon";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-presentationsmall";
+    Text[ polish ] = "%PRODUCTNAME 6.0 - Szablon prezentacji";
     Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template";
-    Text[ japanese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION プレゼンテーション テンプレート";
-    Text[ korean ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 프레젠테이션 템플릿";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 プレゼンテーションテンプレート";
+    Text[ korean ] = "%PRODUCTNAME 6.0 프레젠테이션 서식 파일";
     Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 演示文稿样式";
     Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 簡報樣式";
-    Text[ turkish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template";
-    Text[ arabic ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template";
-    Text[ catalan ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de presentaci�";
+    Text[ turkish ] = "%PRODUCTNAME 6.0 Presentation Template";
+    Text[ arabic ] = "%PRODUCTNAME 6.0 Presentation Template";
+    Text[ catalan ] = "%PRODUCTNAME 6.0 Plantilla de presentaci�";
     Text[ thai ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template";
 };
 String STR_DESCRIPTION_WRITER_TEMPLATE
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Textdokument Vorlage" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
-    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modelo de texto";
-    Text[ russian ] = "������ ������ %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION";
-    Text[ greek ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Textdocument Template";
+    Text[ portuguese ] = "%PRODUCTNAME 6.0 Modelo de texto";
+    Text[ russian ] = "������ ������ %PRODUCTNAME 6.0";
+    Text[ greek ] = "%PRODUCTNAME 6.0 Textdocument Template";
     Text[ dutch ] = "%productname% 6.0 Tekstdocumentsjabloon";
     Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Mod�le de texte";
-    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de documento de texto";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Plantilla de documento de texto";
     Text[ finnish ] = "%PRODUCTNAME 6.0 -tekstiasiakirjan malli";
     Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Modello di documento di testo";
-    Text[ danish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-tekstdokumentskabelon";
-    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION textdokument mall";
-    Text[ polish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Szablon dokumentu tekstowego";
+    Text[ danish ] = "%PRODUCTNAME 6.0-tekstdokumentskabelon";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-textdokumentsmall";
+    Text[ polish ] = "%PRODUCTNAME 6.0 - Szablon dokumentu tekstowego";
     Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Textdocument Template";
-    Text[ japanese ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 文書ドキュメント テンプレート";
-    Text[ korean ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 텍스트 문서 템플릿";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 文書ドキュメントテンプレート";
+    Text[ korean ] = "%PRODUCTNAME 6.0 텍스트 문서 서식 파일";
     Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 文本文档样式";
     Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 文字文件樣式";
-    Text[ turkish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Textdocument Template";
-    Text[ arabic ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Textdocument Template";
-    Text[ catalan ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Plantilla de document de text";
+    Text[ turkish ] = "%PRODUCTNAME 6.0 Textdocument Template";
+    Text[ arabic ] = "%PRODUCTNAME 6.0 Textdocument Template";
+    Text[ catalan ] = "%PRODUCTNAME 6.0 Plantilla de document de text";
     Text[ thai ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template";
 };
 String STR_DESCRIPTION_LOCALE_VOLUME
@@ -1301,7 +1288,7 @@ String STR_DESCRIPTION_FLOPPY_VOLUME
     Text[ polish ] = "Floppy disk";
     Text[ portuguese_brazilian ] = "Floppy disk";
     Text[ japanese ] = "フロッピーディスク";
-    Text[ korean ] = "플로피 디스크";
+    Text[ korean ] = "디스크 드라이브";
     Text[ chinese_simplified ] = "软盘";
     Text[ chinese_traditional ] = "軟碟機";
     Text[ turkish ] = "Floppy disk";
@@ -1369,7 +1356,7 @@ String STR_DESCRIPTION_POWERPOINT
     Text[ greek ] = "MS PowerPoint Document";
     Text[ dutch ] = "MS PowerPoint-document";
     Text[ french ] = "Document MS PowerPoint";
-    Text[ spanish ] = "Documento MS PowerPoint ";
+    Text[ spanish ] = "Documento de MS PowerPoint ";
     Text[ finnish ] = "MS PowerPoint -asiakirja";
     Text[ italian ] = "Documento MS PowerPoint";
     Text[ danish ] = "MS PowerPoint-dokument";
@@ -1444,14 +1431,14 @@ String STR_DESCRIPTION_SXMATH_DOC
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formel" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
-    Text[ french ] = "%PRODUCTNAME 6.0 Formula";
-    Text[ spanish ] = "%PRODUCTNAME 6.0 Formula";
-    Text[ italian ] = "%PRODUCTNAME 6.0 Formula";
-    Text[ swedish ] = "%PRODUCTNAME 6.0 Formula";
-    Text[ japanese ] = "%PRODUCTNAME 6.0 Formula";
-    Text[ korean ] = "%PRODUCTNAME 6.0 Formula";
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 Formula";
-    Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 Formula";
+    Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formule";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - F�rmula";
+    Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-formel";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 数式";
+    Text[ korean ] = "%PRODUCTNAME 6.0 수식";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 公式";
+    Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 公式";
     Text[ portuguese ] = "%PRODUCTNAME 6.0 Formula";
     Text[ russian ] = "%PRODUCTNAME 6.0 Formula";
     Text[ greek ] = "%PRODUCTNAME 6.0 Formula";
@@ -1470,14 +1457,14 @@ String STR_DESCRIPTION_SXCHART_DOC
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Diagramm" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
-    Text[ french ] = "%PRODUCTNAME 6.0 Chart";
-    Text[ spanish ] = "%PRODUCTNAME 6.0 Chart";
-    Text[ italian ] = "%PRODUCTNAME 6.0 Chart";
-    Text[ swedish ] = "%PRODUCTNAME 6.0 Chart";
-    Text[ japanese ] = "%PRODUCTNAME 6.0 Chart";
-    Text[ korean ] = "%PRODUCTNAME 6.0 Chart";
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 Chart";
-    Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 Chart";
+    Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Diagramme";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Diagrama";
+    Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Diagramma";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-diagram";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 グラフ";
+    Text[ korean ] = "%PRODUCTNAME 6.0 차트";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 图表";
+    Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 圖表";
     Text[ portuguese ] = "%PRODUCTNAME 6.0 Chart";
     Text[ russian ] = "%PRODUCTNAME 6.0 Chart";
     Text[ greek ] = "%PRODUCTNAME 6.0 Chart";
@@ -1496,14 +1483,14 @@ String STR_DESCRIPTION_SXDRAW_DOC
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Zeichnung" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
-    Text[ french ] = "%PRODUCTNAME 6.0 Drawing";
-    Text[ spanish ] = "%PRODUCTNAME 6.0 Drawing";
-    Text[ italian ] = "%PRODUCTNAME 6.0 Drawing";
-    Text[ swedish ] = "%PRODUCTNAME 6.0 Drawing";
-    Text[ japanese ] = "%PRODUCTNAME 6.0 Drawing";
-    Text[ korean ] = "%PRODUCTNAME 6.0 Drawing";
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 Drawing";
-    Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 Drawing";
+    Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Dessin";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Dibujo";
+    Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Disegno";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-teckning";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 図形描画";
+    Text[ korean ] = "%PRODUCTNAME 6.0 그리기";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 绘图";
+    Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 繪圖";
     Text[ portuguese ] = "%PRODUCTNAME 6.0 Drawing";
     Text[ russian ] = "%PRODUCTNAME 6.0 Drawing";
     Text[ greek ] = "%PRODUCTNAME 6.0 Drawing";
@@ -1522,14 +1509,14 @@ String STR_DESCRIPTION_SXCALC_DOC
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Tabellendokument" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
-    Text[ french ] = "%PRODUCTNAME 6.0 Spreadsheet";
-    Text[ spanish ] = "%PRODUCTNAME 6.0 Spreadsheet";
-    Text[ italian ] = "%PRODUCTNAME 6.0 Spreadsheet";
-    Text[ swedish ] = "%PRODUCTNAME 6.0 Spreadsheet";
-    Text[ japanese ] = "%PRODUCTNAME 6.0 Spreadsheet";
-    Text[ korean ] = "%PRODUCTNAME 6.0 Spreadsheet";
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 Spreadsheet";
-    Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 Spreadsheet";
+    Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Classeur";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Hoja de c�lculo";
+    Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Foglio elettronico";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-tabelldokument";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 表計算";
+    Text[ korean ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 스프레드시트";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 工作表";
+    Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 工作表";
     Text[ portuguese ] = "%PRODUCTNAME 6.0 Spreadsheet";
     Text[ russian ] = "%PRODUCTNAME 6.0 Spreadsheet";
     Text[ greek ] = "%PRODUCTNAME 6.0 Spreadsheet";
@@ -1548,14 +1535,14 @@ String STR_DESCRIPTION_SXIMPRESS_DOC
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Pr�sentation" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
-    Text[ french ] = "%PRODUCTNAME 6.0 Presentation";
-    Text[ spanish ] = "%PRODUCTNAME 6.0 Presentation";
-    Text[ italian ] = "%PRODUCTNAME 6.0 Presentation";
-    Text[ swedish ] = "%PRODUCTNAME 6.0 Presentation";
-    Text[ japanese ] = "%PRODUCTNAME 6.0 Presentation";
-    Text[ korean ] = "%PRODUCTNAME 6.0 Presentation";
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 Presentation";
-    Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 Presentation";
+    Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Pr�sentation";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Presentaci�n";
+    Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentazione";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-presentation";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 プレゼンテーション";
+    Text[ korean ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 프레젠테이션";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 演示文稿";
+    Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 簡報";
     Text[ portuguese ] = "%PRODUCTNAME 6.0 Presentation";
     Text[ russian ] = "%PRODUCTNAME 6.0 Presentation";
     Text[ greek ] = "%PRODUCTNAME 6.0 Presentation";
@@ -1574,14 +1561,14 @@ String STR_DESCRIPTION_SXWRITER_DOC
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Textdokument" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
-    Text[ french ] = "%PRODUCTNAME 6.0 Text Document";
-    Text[ spanish ] = "%PRODUCTNAME 6.0 Text Document";
-    Text[ italian ] = "%PRODUCTNAME 6.0 Text Document";
-    Text[ swedish ] = "%PRODUCTNAME 6.0 Text Document";
-    Text[ japanese ] = "%PRODUCTNAME 6.0 Text Document";
-    Text[ korean ] = "%PRODUCTNAME 6.0 Text Document";
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 Text Document";
-    Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 Text Document";
+    Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Texte";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Documento de texto";
+    Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Documento di testo";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-textdokument";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 文書ドキュメント";
+    Text[ korean ] = "%PRODUCTNAME 6.0 텍스트 문서";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 文本文档";
+    Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 文字文件";
     Text[ portuguese ] = "%PRODUCTNAME 6.0 Text Document";
     Text[ russian ] = "%PRODUCTNAME 6.0 Text Document";
     Text[ greek ] = "%PRODUCTNAME 6.0 Text Document";
@@ -1600,14 +1587,14 @@ String STR_DESCRIPTION_SXGLOBAL_DOC
 {
     Text = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Globaldokument" ;
     Text [ english_us ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
-    Text[ french ] = "%PRODUCTNAME 6.0 Master Document";
-    Text[ spanish ] = "%PRODUCTNAME 6.0 Master Document";
-    Text[ italian ] = "%PRODUCTNAME 6.0 Master Document";
-    Text[ swedish ] = "%PRODUCTNAME 6.0 Master Document";
-    Text[ japanese ] = "%PRODUCTNAME 6.0 Master Document";
-    Text[ korean ] = "%PRODUCTNAME 6.0 Master Document";
-    Text[ chinese_simplified ] = "%PRODUCTNAME 6.0 Master Document";
-    Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 Master Document";
+    Text[ french ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Document ma�tre";
+    Text[ spanish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION - Documento maestro";
+    Text[ italian ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Documento master";
+    Text[ swedish ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION-samlingsdokument";
+    Text[ japanese ] = "%PRODUCTNAME 6.0 マスタードキュメント";
+    Text[ korean ] = "%PRODUCTNAME 6.0 마스터 문서";
+    Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 主控文档";
+    Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 主控文件";
     Text[ portuguese ] = "%PRODUCTNAME 6.0 Master Document";
     Text[ russian ] = "%PRODUCTNAME 6.0 Master Document";
     Text[ greek ] = "%PRODUCTNAME 6.0 Master Document";
@@ -1626,14 +1613,14 @@ String STR_DESCRIPTION_MATHML_DOC
 {
     Text = "MathML Dokument" ;
     Text [ english_us ] = "MathML Document" ;
-    Text[ french ] = "MathML Document";
-    Text[ spanish ] = "MathML Document";
-    Text[ italian ] = "MathML Document";
-    Text[ swedish ] = "MathML Document";
-    Text[ japanese ] = "MathML Document";
-    Text[ korean ] = "MathML Document";
-    Text[ chinese_simplified ] = "MathML Document";
-    Text[ chinese_traditional ] = "MathML Document";
+    Text[ french ] = "Document MathML";
+    Text[ spanish ] = "Documento MathML";
+    Text[ italian ] = "MathML Documento";
+    Text[ swedish ] = "MathML-dokument";
+    Text[ japanese ] = "MathML ドキュメント";
+    Text[ korean ] = "MathML 문서";
+    Text[ chinese_simplified ] = "MathML 文档";
+    Text[ chinese_traditional ] = "MathML 文件";
     Text[ portuguese ] = "MathML Document";
     Text[ russian ] = "MathML Document";
     Text[ greek ] = "MathML Document";
@@ -1648,3 +1635,8 @@ String STR_DESCRIPTION_MATHML_DOC
     Text[ thai ] = "MathML Document";
 };
 
+
+
+
+
+
diff --git a/svtools/source/misc/iniman.src b/svtools/source/misc/iniman.src
index c2a515d3f521..1a6e3b8683a5 100644
--- a/svtools/source/misc/iniman.src
+++ b/svtools/source/misc/iniman.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: iniman.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:13:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,23 +70,24 @@ ErrorBox ERRBOX_CHECK_PLZ
     Message[ portuguese_brazilian ] = "Die eingegebene Postleitzahl ist ung?tig.\nSie mu? mit einer Ziffer oder einem Buchstabe anfangen und\ndarf nur Ziffern, Buchstaben, Leerzeichen und Trennstriche enthalten.";
     Message[ portuguese ] = "O c�digo postal especificado est� incorrecto.\nEste tem que come�ar por um algarismo ou uma letra e s� pode conter algarismos, letras, espa�os em branco e h�fens.";
     Message[ danish ] = "Det angivne postnummer er ugyldigt.\nDet skal begynde med et tal eller bogstav og\nm� kun indeholde tal, bogstaver, mellemrum og bindestreger.";
-    Message[ french ] = "Le code postal indiqu� est incorrect.\nIl doit commencer par un chiffre ou une lettre et\ncontenir uniquement des chiffres, lettres, espaces ou traits d'union.";
+    Message[ french ] = "Le code postal indiqu� est incorrect.\nIl doit commencer par un chiffre ou une lettre et\ncontenir uniquement des chiffres, lettres, espaces ou tirets.";
     Message[ swedish ] = "Det angivna postnumret �r ogiltigt.\nDet m�ste b�rja med en siffra eller en bokstav och\nf�r bara inneh�lla siffror, bokst�ver, mellanslag och bindestreck.";
-    Message[ dutch ] = "Deze postcode is ongeldig.\nMoet beginnen met een cijfer of een letter en\nmag alleen cijfers, letters, spaties en verbindingsstreepjes bevatten.";
-    Message[ spanish ] = "El c�digo postal indicado no es v�lido.\nDebe comenzar con un n�mero o una letra y\nsolo puede contener n�meros, letras, espacios y guiones.";
+    Message[ dutch ] = "Deze postcode is ongeldig.\nDe code moet beginnen met een cijfer of een letter en\nmag alleen cijfers, letters, spaties en verbindingsstreepjes bevatten.";
+    Message[ spanish ] = "El c�digo postal indicado no es v�lido.\nDebe comenzar con un n�mero o una letra y\ns�lo puede contener n�meros, letras, espacios o guiones.";
     Message[ english_us ] = "The ZIP code specified is invalid.\nA ZIP code should begin with a number (or in some cases a letter) and\ncan only contain numbers, letters, spaces and dashes.";
     Message[ chinese_simplified ] = "您输入的邮政编码无效。\n邮政编码必须由一个数字或一个字母开头，\n且只能够包含数字，字母，空格符和连字符。";
-    Message[ russian ] = "��������� �������� ������ ����������.\n�� ������ ���������� � ����� ��� ����� �\n����� ��������� ������ �����, �����, ������� � �������������� ������.";
+    Message[ russian ] = "������ ������������ �������� ������.\n�� ������ ���������� � ����� (� � ��������� ������� � �����)\n� ����� ��������� ������ �����, �����, ������� � ������.";
     Message[ polish ] = "Wpisany kod pocztowy jest nieprawid�owy.\nMusi si� on zaczyna� cyfr� lub liter� i \nmo�e zawiera� tylko cyfry, litery, spacje i kreski.";
-    Message[ japanese ] = "入力した郵便番号は不適切です。\n数字または文字で始めなければなりません\n数字と文字とｽﾍﾟｰｽおよびﾀﾞｯｼｭのみ使用できます。";
+    Message[ japanese ] = "入力した郵便番号は不適切です。\n数字または文字で始めなければなりません\n数字と文字とスペースおよびダッシュのみ使用できます。";
     Message[ arabic ] = "����� ������� ����� ��� ������� ��� ����.\n��� �� ���� ���� �� ���ݡ\n���� �� ����� ��� ��� ����� ���ݡ ���� ����ɡ ���� �����.";
     Message[ chinese_traditional ] = "您輸入的郵遞區號無效。\n郵遞區號必須由一個數字或一個字母開始，\n而且只能是數字，字母，空格和連字符。";
     Message[ greek ] = "� ������������ ������� ��� �������� ��� ����� �������.\n������ �� ������ �� ��� ����� � �� ��� ������ ���\n������ �� �������� ���� �����, ���? ";
-    Message[ korean ] = "입력한 우편번호는 유효하지 않습니다.\n우편번호는 숫자나 문자로 시작해야 하며 \n숫자, 문자, 공백 그리고  대시로만 이루어져야 합니다.";
+    Message[ korean ] = "입력한 우편번호는 잘못되었습니다.\n우편번호는 숫자나 문자로 시작해야 하며 \n숫자, 문자, 공백과 대시로만 입력해야 합니다.";
     Message[ turkish ] = "Girilen posta kodu ge�erli de�il.\nPosta kodu bir rakam ya da harf ile ba�lamal� ve yaln�zca\nrakam, harf, bo�luk ve ay�rma �izgileri i�ermeli.";
     Message[ language_user1 ] = " ";
-    Message[ catalan ] = "El c�digo postal indicado no es v�lido.\nDebe comenzar con un n�mero o una letra y\nsolo puede contener n�meros, letras, espacios y guiones.";
-    Message[ finnish ] = "M��ritetty postinumero on virheellinen.\nPostinumeron ensimm�inen merkki voi olla vain numero tai kirjain ja\npostinumero voi sis�lt�� vain numeroita, kirjaimia, v�lily�ntej� ja v�liviivoja.";
+    Message[ catalan ] = "El codi postal indicat no �s v�lid.\nHa de comen�ar amb un n�mero o una lletra i\nnom�s pot contenir n�meros, lletres, espais i guions.";
+    Message[ finnish ] = "M��ritetty postinumero on virheellinen.\nPostinumeron ensimm�inen merkki voi olla vain numero tai kirjain ja\npostinumero voi sis�lt�� vain numeroita, kirjaimia, v�lily�ntej� ja viivoja.";
+    Message[ thai ] = "ระบุรหัสไปรษณีย์ไม่ถูกต้อง\nรหัสไปรษณีย์ควรเริ่มต้นด้วยตัวเลข (หรือบางกรณีตัวอักษร) และ\nสามารถมีตัวเลข ตัวอักษร ระยะห่างและเส้นประยาวเท่านั้น";
 };
 
 
@@ -100,3 +101,7 @@ ErrorBox ERRBOX_CHECK_PLZ
 
 
 
+
+
+
+
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
index afde6104dd5f..76452ee65754 100644
--- a/svtools/source/misc/makefile.mk
+++ b/svtools/source/misc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.22 $
+#   $Revision: 1.23 $
 #
-#   last change: $Author: jbu $ $Date: 2002-10-01 12:55:24 $
+#   last change: $Author: hr $ $Date: 2003-03-27 14:39:16 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -150,22 +150,6 @@ EXCEPTIONSFILES=\
     $(SLO)$/stringtransfer.obj		\
     $(SLO)$/imagemgr.obj
 
-UNOTYPES=\
-    com.sun.star.io.XInputStream						\
-    com.sun.star.io.XOutputStream						\
-    com.sun.star.io.XSeekable							\
-    com.sun.star.uno.TypeClass							\
-    com.sun.star.uno.XWeak								\
-    com.sun.star.lang.XMultiServiceFactory				\
-    com.sun.star.lang.XSingleServiceFactory				\
-    com.sun.star.registry.MergeConflictException		\
-    com.sun.star.registry.XSimpleRegistry				\
-    com.sun.star.frame.XConfigManager					\
-    com.sun.star.datatransfer.XTransferable				\
-    com.sun.star.datatransfer.DataFlavor				\
-    com.sun.star.datatransfer.clipboard.XClipboard		\
-    com.sun.star.datatransfer.clipboard.XClipboardOwner
-
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 3ada0a53cfad..f0e4af2faa56 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templatefoldercache.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: kz $ $Date: 2002-01-03 10:37:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -887,22 +887,3 @@ namespace svt
 }   // namespace sfx2
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.4  2001/12/06 12:33:22  fs
- *  #93949# some more options when using this class
- *
- *  Revision 1.3  2001/11/14 15:15:51  vg
- *  #65293# use temporary variables for gcc
- *
- *  Revision 1.2  2001/11/08 15:42:14  obo
- *  #65293# compile err solaris
- *
- *  Revision 1.1  2001/11/07 14:28:21  fs
- *  initial checkin - helper class for caching the state of OOo's template folders
- *
- *
- *  Revision 1.0 07.11.01 12:40:25  fs
- ************************************************************************/
-
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 96d6c461ea76..386c6d8ad5ab 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: transfer.cxx,v $
  *
- *  $Revision: 1.62 $
+ *  $Revision: 1.63 $
  *
- *  last change: $Author: dvo $ $Date: 2002-12-02 11:30:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -370,6 +370,9 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
 {
     const ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
+
+
+
     try
     {
         if( !mpFormats->size() )
@@ -555,7 +558,9 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor )
     sal_Bool                        bAdd = sal_True;
 
     while( aIter != aEnd )
+
     {
+
         if( TransferableDataHelper::IsEqual( *aIter, rFlavor ) )
         {
             aIter = aEnd;
@@ -1008,6 +1013,7 @@ void TransferableHelper::CopyToSelection( Window *pWindow ) const
 
 void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions,
                                     sal_Int32 nDnDPointer, sal_Int32 nDnDImage )
+
 {
     DBG_ASSERT( pWindow, "Window pointer is NULL" );
     Reference< XDragSource > xDragSource( pWindow->GetDragSource() );
@@ -1081,6 +1087,7 @@ const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId()
         rtl_createUuid( reinterpret_cast< sal_uInt8* >( aSeq.getArray() ), 0, sal_True );
     }
 
+
     return aSeq;
 }
 
@@ -1128,6 +1135,7 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C
 void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& Source ) throw (RuntimeException)
 {
     mpListener = NULL;
+
 }
 
 // --------------------------
@@ -1145,6 +1153,7 @@ TransferableDataHelper::TransferableDataHelper() :
 TransferableDataHelper::TransferableDataHelper( const Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) :
     mxTransfer( rxTransferable ),
     mpFormats( new DataFlavorExVector ),
+
     mpClipboardListener( NULL )
 {
     InitFormats();
@@ -1214,6 +1223,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
             }
             catch( const ::com::sun::star::uno::Exception& )
             {
+
             }
 
             aFlavorEx.MimeType = rFlavor.MimeType;
@@ -1257,6 +1267,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
                         xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "utf-16" ) ) )
                     {
                         rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING;
+
                     }
                 }
             }
@@ -1265,9 +1276,14 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF;
             }
             else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "text/html" ) ) )
+
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML;
             }
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "text/uri-list" ) ) )
+            {
+                rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST;
+            }
         }
     }
     catch( const ::com::sun::star::uno::Exception& )
@@ -1332,6 +1348,7 @@ sal_uInt32 TransferableDataHelper::GetFormatCount() const
 
 // -----------------------------------------------------------------------------
 
+
 SotFormatStringId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const
 {
     DBG_ASSERT( nFormat < mpFormats->size(), "TransferableDataHelper::GetFormat: invalid format index" );
@@ -1390,6 +1407,7 @@ Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const
     return aReturn;
 }
 
+
 // -----------------------------------------------------------------------------
 
 Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const
@@ -1480,6 +1498,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OU
         }
         else if( aAny >>= aSeq )
         {
+
             const sal_Char* pChars = reinterpret_cast< const sal_Char* >( aSeq.getConstArray() );
             sal_Int32       nLen = aSeq.getLength();
 
@@ -1861,10 +1880,31 @@ sal_Bool TransferableDataHelper::GetFileList(
             FileList& rFileList )
 {
     SotStorageStreamRef xStm;
-    sal_Bool            bRet = GetSotStorageStream( rFlavor, xStm );
+    sal_Bool            bRet = sal_False;
 
-    if( bRet )
-        bRet = ERRCODE_NONE == ( *xStm >> rFileList ).GetError();
+    for( sal_uInt32 i = 0, nFormatCount = GetFormatCount(); ( i < nFormatCount ) && !bRet; ++i )
+    {
+        if( SOT_FORMAT_FILE_LIST == GetFormat( i ) )
+        {
+            const DataFlavor aFlavor( GetFormatDataFlavor( i ) );
+
+            if( GetSotStorageStream( aFlavor, xStm ) )
+            {
+                if( aFlavor.MimeType.indexOf( ::rtl::OUString::createFromAscii( "text/uri-list" ) ) > -1 )
+                {
+                    ByteString aByteString;
+
+                    while( xStm->ReadLine( aByteString ) )
+                        if( aByteString.Len() && aByteString.GetChar( 0 ) != '#' )
+                            rFileList.AppendFile( String( aByteString, RTL_TEXTENCODING_UTF8 ) );
+
+                    bRet = sal_True;
+                 }
+                 else
+                    bRet = ( ( *xStm >> rFileList ).GetError() == ERRCODE_NONE );
+            }
+        }
+    }
 
     return bRet;
 }
@@ -1901,6 +1941,7 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor,
     sal_Bool                bRet = GetSequence( rFlavor, aSeq );
 
     if( bRet )
+
     {
         rxStream = new SotStorageStream( String() );
         rxStream->Write( aSeq.getConstArray(), aSeq.getLength() );
@@ -1912,6 +1953,7 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor,
 
 // -----------------------------------------------------------------------------
 
+
 sal_Bool TransferableDataHelper::GetInterface( SotFormatStringId nFormat, Reference< XInterface >& rIf )
 {
     DataFlavor aFlavor;
@@ -1980,6 +2022,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window
     if( xClipboard.is() )
        {
            try
+
         {
             Reference< XTransferable > xTransferable( xClipboard->getContents() );
 
diff --git a/svtools/source/misc/urihelper.cxx b/svtools/source/misc/urihelper.cxx
index 6b332cf7daa6..1115e7dc4b4f 100644
--- a/svtools/source/misc/urihelper.cxx
+++ b/svtools/source/misc/urihelper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: urihelper.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: sb $ $Date: 2002-11-27 11:14:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,9 +69,6 @@
 #ifndef _COM_SUN_STAR_UCB_FILESYSTEMNOTATION_HPP_
 #include <com/sun/star/ucb/FileSystemNotation.hpp>
 #endif
-#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP_
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
 #ifndef _COM_SUN_STAR_UCB_XCONTENTPROVIDERMANAGER_HPP_
 #include <com/sun/star/ucb/XContentProviderManager.hpp>
 #endif
@@ -81,9 +78,6 @@
 #ifndef TOOLS_INETMIME_HXX
 #include <tools/inetmime.hxx>
 #endif
-#ifndef _UCBHELPER_CONTENT_HXX
-#include <ucbhelper/content.hxx>
-#endif
 #ifndef _UCBHELPER_CONTENTBROKER_HXX
 #include <ucbhelper/contentbroker.hxx>
 #endif
@@ -168,32 +162,7 @@ inline UniString SmartRel2Abs_Impl(INetURLObject const & rTheBaseURIRef,
                     bMaybeFile = rMaybeFileHdl.Call(&aFilePath) != 0;
                 }
                 if (!bMaybeFile)
-                {
-                    //TODO! there is no property "Exists," is there?
-                    sal_Bool bExists = false;
-                    try
-                    {
-                        ::ucb::Content(aAbsURIRef.
-                                           GetMainURL(
-                                               INetURLObject::NO_DECODE),
-                                       0).
-                                getPropertyValue(
-                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                                      "Exists")))
-                            >>= bExists;
-                    }
-                    catch (com::sun::star::ucb::ContentCreationException const
-                               &)
-                    {
-                        DBG_ERROR("URIHelper::SmartRel2Abs(): UCB Exception");
-                    }
-                    catch (uno::Exception const &)
-                    {
-                        DBG_ERROR("URIHelper::SmartRel2Abs(): UCB Exception");
-                    }
-                    if (!bExists)
-                        aAbsURIRef = aNonFileURIRef;
-                }
+                    aAbsURIRef = aNonFileURIRef;
             }
         }
     }
diff --git a/svtools/source/notify/isethint.cxx b/svtools/source/notify/isethint.cxx
index 9f02a2889664..122e5af85750 100644
--- a/svtools/source/notify/isethint.cxx
+++ b/svtools/source/notify/isethint.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: isethint.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2002-03-05 16:08:52 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,7 +61,6 @@
 
 #pragma hdrstop
 
-#include <stdarg.h>
 #include "isethint.hxx"
 #include "itemset.hxx"
 
diff --git a/svtools/source/numbers/numhead.cxx b/svtools/source/numbers/numhead.cxx
index 5f8b99bb3a2c..0797c6f7eb6f 100644
--- a/svtools/source/numbers/numhead.cxx
+++ b/svtools/source/numbers/numhead.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numhead.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: er $ $Date: 2002-07-01 10:55:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -281,46 +281,3 @@ void ImpSvNumMultipleWriteHeader::StartEntry()
     nEntryStart = nPos;
 }
 
-
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 16:59:03  hr
-    initial import
-
-    Revision 1.9  2000/09/18 14:13:40  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.8  2000/08/31 13:41:32  willem.vandorp
-    Header and footer replaced
-
-    Revision 1.7  1999/04/06 15:24:24  ER
-    #64244# add: static ImpSvNumMultipleReadHeader Skip
-
-
-      Rev 1.6   06 Apr 1999 17:24:24   ER
-   #64244# add: static ImpSvNumMultipleReadHeader Skip
-
-      Rev 1.5   17 Oct 1997 14:31:08   ER
-   new: Keyword NNN, ,- ; Datumformate System/DIN, #.##0,-- ; Comments
-
-      Rev 1.4   30 Jul 1997 12:54:20   ER
-   onSave: StoreSYSTEM, onLoad: ConvertSystem; Header aufgeraeumt
-
-      Rev 1.3   22 Feb 1996 11:36:26   STE
-   imp imp imp
-
-      Rev 1.2   26 Jul 1995 19:35:14   STE
-   International
-
-      Rev 1.1   05 Jul 1995 17:04:42   STE
-   die ersten beiden Klassen auskommentiert
-
-      Rev 1.0   05 Jul 1995 16:28:20   STE
-   Initial revision.
-
-
-------------------------------------------------------------------------*/
-
-
-
diff --git a/svtools/source/numbers/zforfind.cxx b/svtools/source/numbers/zforfind.cxx
index b494a89b041b..344fca91b63b 100644
--- a/svtools/source/numbers/zforfind.cxx
+++ b/svtools/source/numbers/zforfind.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: zforfind.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: er $ $Date: 2002-09-30 12:51:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,8 +75,8 @@
 #ifndef _DEBUG_HXX //autogen
 #include <tools/debug.hxx>
 #endif
-#ifndef _TOOLS_SOLMATH_HXX
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
 #endif
 #ifndef _SYSTEM_HXX //autogen
 #include <vcl/system.hxx>
@@ -256,7 +256,7 @@ double ImpSvNumberInputScan::StringToDouble( const String& rStr, BOOL bForceFrac
         nPos++;
     }
     if ( fFrac )
-        return fNum + SolarMath::Pow10Exp( fFrac, nExp );
+        return fNum + ::rtl::math::pow10Exp( fFrac, nExp );
     return fNum;
 }
 
@@ -1297,7 +1297,7 @@ input for the following reasons:
         if ( res && pCal->isValid() )
         {
             double fDiff = DateTime(*pNullDate) - pCal->getEpochStart();
-            fDays = floor( pCal->getLocalDateTime() );
+            fDays = ::rtl::math::approxFloor( pCal->getLocalDateTime() );
             fDays -= fDiff;
             nTryOrder = nFormatOrder;   // break for
         }
@@ -2508,10 +2508,10 @@ BOOL ImpSvNumberInputScan::IsNumberFormat(
                     if ( nESign == -1 )
                         sResString += '-';
                     sResString += sStrArray[nNums[nAnzNums-1]];
-                    int nErrno = 0;
-                    fOutNumber = SolarMath::StringToDouble(
-                        sResString.GetBuffer(), ',', '.', nErrno );
-                    if ( nErrno == ERANGE )
+                    rtl_math_ConversionStatus eStatus;
+                    fOutNumber = ::rtl::math::stringToDouble(
+                        sResString, '.', ',', &eStatus, NULL );
+                    if ( eStatus == rtl_math_ConversionStatus_OutOfRange )
                     {
                         F_Type = NUMBERFORMAT_TEXT;         // overflow/underflow -> Text
                         if (nESign == -1)
diff --git a/svtools/source/numbers/zformat.cxx b/svtools/source/numbers/zformat.cxx
index 55a7cf602248..cc42326d8f81 100644
--- a/svtools/source/numbers/zformat.cxx
+++ b/svtools/source/numbers/zformat.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: zformat.cxx,v $
  *
- *  $Revision: 1.49 $
+ *  $Revision: 1.50 $
  *
- *  last change: $Author: er $ $Date: 2002-12-06 18:05:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,8 +74,8 @@
 #ifndef _DEBUG_HXX //autogen
 #include <tools/debug.hxx>
 #endif
-#ifndef _SOLMATH_HXX //autogen wg. SolarMath
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
 #endif
 #ifndef _UNOTOOLS_CHARCLASS_HXX
 #include <unotools/charclass.hxx>
@@ -115,13 +115,8 @@ const double _D_MAX_LONG_   = (double) 0x7fffffff;      // 2147483647.0
 const USHORT _MAX_FRACTION_PREC = 3;
 const double D_EPS = 1.0E-2;
 
-#ifdef S390
-const double _D_MAX_D_BY_100  = 7.2E73;
-const double _D_MIN_M_BY_1000 = 5.4E-76;
-#else
 const double _D_MAX_D_BY_100  = 1.7E306;
 const double _D_MIN_M_BY_1000 = 2.3E-305;
-#endif
 
 static BYTE cCharWidths[ 128-32 ] = {
     1,1,1,2,2,3,2,1,1,1,1,2,1,1,1,1,
@@ -1776,15 +1771,41 @@ void SvNumberformat::Build50Formatstring( String& rStr ) const
 
 void SvNumberformat::ImpGetOutputStandard(double& fNumber, String& OutString)
 {
-    OutString.Erase();
     USHORT nStandardPrec = rScan.GetStandardPrec();
     if ( fabs(fNumber) > 1.0E15 )       // #58531# war E16
-        SolarMath::DoubleToString(OutString, fNumber, 'E', nStandardPrec /*2*/,
-                       GetFormatter().GetNumDecimalSep().GetChar(0));
+        OutString = ::rtl::math::doubleToUString( fNumber,
+                rtl_math_StringFormat_E, nStandardPrec /*2*/,
+                GetFormatter().GetNumDecimalSep().GetChar(0));
     else
     {
-        SolarMath::DoubleToString( OutString, fNumber, 'F', nStandardPrec /*2*/,
-                       GetFormatter().GetNumDecimalSep().GetChar(0), TRUE );
+#if 0
+{
+        // debugger test case for ANSI standard correctness
+        ::rtl::OUString aTest;
+        // expect 0.00123   OK
+        aTest = ::rtl::math::doubleToUString( 0.001234567,
+                rtl_math_StringFormat_G, 3, '.', sal_True );
+        // expect 123       OK
+        aTest = ::rtl::math::doubleToUString( 123.4567,
+                rtl_math_StringFormat_G, 3, '.', sal_True );
+        // expect 123.5     OK
+        aTest = ::rtl::math::doubleToUString( 123.4567,
+                rtl_math_StringFormat_G, 4, '.', sal_True );
+        // expect 1e+03 (as 999.6 rounded to 3 significant digits results in
+        // 1000 with an exponent equal to significant digits)
+        // Currently (24-Jan-2003) we do fail in this case and output 1000
+        // instead, negligible.
+        aTest = ::rtl::math::doubleToUString( 999.6,
+                rtl_math_StringFormat_G, 3, '.', sal_True );
+        // expect what? result is 1.2e+004
+        aTest = ::rtl::math::doubleToUString( 12345.6789,
+                rtl_math_StringFormat_G, -3, '.', sal_True );
+}
+#endif
+
+        OutString = ::rtl::math::doubleToUString( fNumber,
+                rtl_math_StringFormat_F, nStandardPrec /*2*/,
+                GetFormatter().GetNumDecimalSep().GetChar(0), sal_True );
         if (OutString.GetChar(0) == '-' &&
             OutString.GetTokenCount('0') == OutString.Len())
             OutString.EraseLeadingChars('-');            // nicht -0
@@ -1812,8 +1833,9 @@ void SvNumberformat::ImpGetOutputInputLine(double fNumber, String& OutString)
         return;
     }
 
-    SolarMath::DoubleToString( OutString, fNumber, 'A', INT_MAX,
-                    GetFormatter().GetNumDecimalSep().GetChar(0), TRUE );
+    OutString = ::rtl::math::doubleToUString( fNumber,
+            rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+            GetFormatter().GetNumDecimalSep().GetChar(0), sal_True );
 
     if ( eType & NUMBERFORMAT_PERCENT && bModified)
         OutString += '%';
@@ -2320,9 +2342,9 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
                         bSign = TRUE;                   // Formaten
                     fNumber = -fNumber;
                 }
-                String sStr;
-                SolarMath::DoubleToString(sStr, fNumber, 'E',
-                    rInfo.nCntPre + rInfo.nCntPost - 1, '.' );
+                String sStr( ::rtl::math::doubleToUString( fNumber,
+                            rtl_math_StringFormat_E,
+                            rInfo.nCntPre + rInfo.nCntPost - 1, '.' ));
 
                 String ExpStr;
                 short nExpSign = 1;
@@ -2444,7 +2466,7 @@ BOOL SvNumberformat::ImpGetTimeOutput(double fNumber,
     if (bSign && !rInfo.bThousand)     // kein []-Format
         fNumber = 1.0 - fNumber;        // "Kehrwert"
     double fTime = fNumber * 86400.0;
-    fTime = SolarMath::Round( fTime, int(nCntPost) );
+    fTime = ::rtl::math::round( fTime, int(nCntPost) );
     if (bSign && fTime == 0.0)
         bSign = FALSE;                      // nicht -00:00:00
 
@@ -2455,8 +2477,8 @@ BOOL SvNumberformat::ImpGetTimeOutput(double fNumber,
     }
     ULONG nSeconds = (ULONG)floor( fTime );
 
-    String sSecStr;
-    SolarMath::DoubleToString(sSecStr, fTime-nSeconds, 'F', int(nCntPost));
+    String sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds,
+                rtl_math_StringFormat_F, int(nCntPost), '.'));
     sSecStr.EraseLeadingChars('0');
     sSecStr.EraseLeadingChars('.');
     if ( bInputLine )
@@ -2964,11 +2986,11 @@ BOOL SvNumberformat::ImpGetDateTimeOutput(double fNumber,
         nCntPost = xub_StrLen(rInfo.nCntPost);
     }
     double fTime = (fNumber - floor( fNumber )) * 86400.0;
-    fTime = SolarMath::Round( fTime, int(nCntPost) );
+    fTime = ::rtl::math::round( fTime, int(nCntPost) );
     ULONG nSeconds = (ULONG)floor( fTime );
 
-    String sSecStr;
-    SolarMath::DoubleToString(sSecStr, fTime-nSeconds, 'F', int(nCntPost));
+    String sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds,
+                rtl_math_StringFormat_F, int(nCntPost), '.'));
     sSecStr.EraseLeadingChars('0');
     sSecStr.EraseLeadingChars('.');
     if ( bInputLine )
@@ -3256,7 +3278,7 @@ BOOL SvNumberformat::ImpGetNumberOutput(double fNumber,
     else
     {
         bSign = FALSE;
-        if ( SolarMath::IsSignBitSet( fNumber ) )
+        if ( ::rtl::math::isSignBitSet( fNumber ) )
             fNumber = -fNumber;     // yes, -0.0 is possible, eliminate '-'
     }
     const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
@@ -3293,12 +3315,14 @@ BOOL SvNumberformat::ImpGetNumberOutput(double fNumber,
         {
             if (rInfo.nCntPost + nPrecExp > 15 && nPrecExp < 15)
             {
-                SolarMath::DoubleToString( sStr, fNumber, 'F', 15-nPrecExp );
+                sStr = ::rtl::math::doubleToUString( fNumber,
+                        rtl_math_StringFormat_F, 15-nPrecExp, '.');
                 for (long l = 15-nPrecExp; l < (long) rInfo.nCntPost; l++)
                     sStr += '0';
             }
             else
-                SolarMath::DoubleToString( sStr, fNumber, 'F', rInfo.nCntPost );
+                sStr = ::rtl::math::doubleToUString( fNumber,
+                        rtl_math_StringFormat_F, rInfo.nCntPost, '.' );
             sStr.EraseLeadingChars('0');        // fuehrende Nullen weg
         }
         else if (fNumber == 0.0)            // Null
@@ -3308,7 +3332,8 @@ BOOL SvNumberformat::ImpGetNumberOutput(double fNumber,
         }
         else                                // Integer
         {
-            SolarMath::DoubleToString(sStr, fNumber, 'F', 0);
+            sStr = ::rtl::math::doubleToUString( fNumber,
+                    rtl_math_StringFormat_F, 0, '.');
             sStr.EraseLeadingChars('0');        // fuehrende Nullen weg
         }
         xub_StrLen nPoint = sStr.Search( '.' );
@@ -3893,7 +3918,9 @@ void lcl_SvNumberformat_AddLimitStringImpl( String& rStr,
                 rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[>=" ) );
             break;
         }
-        SolarMath::DoubleToString( rStr, fLimit, 'A', INT_MAX, rDecSep.GetChar(0), TRUE );
+        rStr += String( ::rtl::math::doubleToUString( fLimit,
+                rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                rDecSep.GetChar(0), sal_True));
         rStr += ']';
     }
 }
diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src
index ec9e6715ce36..c322b3248595 100644
--- a/svtools/source/plugapp/testtool.src
+++ b/svtools/source/plugapp/testtool.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testtool.src,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: kz $ $Date: 2002-09-05 14:52:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -202,8 +202,6 @@ WorkWindow TT_INLINE_TRANSLATION {
             TabStop = TRUE;
             Text = "~Next";
     };
-    Text[ danish ] = "Indbygget overs�ttelse";
-    Text[ turkish ] = "Inplace Translation";
 };
 
 MessBox TT_DISCARD_CHANGED_DATA {
diff --git a/svtools/source/svdde/makefile.mk b/svtools/source/svdde/makefile.mk
index 2b294f880a3f..34e11406e1cc 100644
--- a/svtools/source/svdde/makefile.mk
+++ b/svtools/source/svdde/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: hjs $ $Date: 2002-03-07 15:08:08 $
+#   last change: $Author: hr $ $Date: 2003-03-27 14:39:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -84,12 +84,11 @@ SLOFILES=	$(SLO)$/ddecli.obj	\
 
 # --- Targets -------------------------------------------------------
 
+.INCLUDE :  target.mk
+
 .ELSE
 dummy:
     @echo GUI == "$(GUI)"  -  nothing to do
 
 .ENDIF
 
-.INCLUDE :  target.mk
-
-
diff --git a/svtools/source/svhtml/htmlkey2.cxx b/svtools/source/svhtml/htmlkey2.cxx
index 2eb5e5726606..ff180c40d1f8 100644
--- a/svtools/source/svhtml/htmlkey2.cxx
+++ b/svtools/source/svhtml/htmlkey2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlkey2.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mib $ $Date: 2002-08-01 13:26:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,8 @@
 
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_doctype32,
     "HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\"" );
+sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_doctype40,
+    "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" );
 
 
 // diese werden nur eingeschaltet
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 77bbb363ec17..51f46e798a62 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parrtf.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: cmc $ $Date: 2002-09-19 17:08:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
 #include <stdio.h>                      // for EOF
 
 #ifndef _RTL_TENCINFO_H
@@ -74,6 +76,7 @@
 #include "rtfkeywd.hxx"
 #include "parrtf.hxx"
 
+const int MAX_STRING_LEN = 1024;
 const int MAX_TOKEN_LEN = 128;
 
 #define RTF_ISDIGIT( c ) (c >= '0' && c <= '9')
@@ -88,7 +91,7 @@ SvRTFParser::SvRTFParser( SvStream& rIn, BYTE nStackSize )
 {
     // default ist ANSI-CodeSet
     SetSrcEncoding( RTL_TEXTENCODING_MS_1252 );
-    bRTF_InTextRead = FALSE;
+    bRTF_InTextRead = false;
 }
 
 SvRTFParser::~SvRTFParser()
@@ -99,7 +102,7 @@ int SvRTFParser::_GetNextToken()
 {
     int nRet = 0;
     do {
-        int bNextCh = TRUE;
+        int bNextCh = true;
         switch( nNextCh )
         {
         case '\\':
@@ -164,10 +167,10 @@ int SvRTFParser::_GetNextToken()
                         }
 
                         // Minus fuer numerischen Parameter
-                        int bNegValue = FALSE;
+                        int bNegValue = false;
                         if( '-' == nNextCh )
                         {
-                            bNegValue = TRUE;
+                            bNegValue = true;
                             nNextCh = GetNextChar();
                         }
 
@@ -197,7 +200,7 @@ int SvRTFParser::_GetNextToken()
                             nRet = RTF_UNKNOWNCONTROL;
 
                         // bug 76812 - unicode token handled as normal text
-                        bNextCh = FALSE;
+                        bNextCh = false;
                         switch( nRet )
                         {
                         case RTF_UC:
@@ -263,7 +266,7 @@ int SvRTFParser::_GetNextToken()
                     {
                         // Bug 34631 - "\ " ueberlesen - Blank als Zeichen
                         // eState = SVPAR_ERROR;
-                        bNextCh = FALSE;
+                        bNextCh = false;
                     }
                     break;
                 }
@@ -355,10 +358,10 @@ sal_Unicode SvRTFParser::GetHexValue()
 void SvRTFParser::ScanText( const sal_Unicode cBreak )
 {
     String aStrBuffer;
-    int bWeiter = TRUE;
+    int bWeiter = true;
     while( bWeiter && IsParserWorking() )
     {
-        int bNextCh = TRUE;
+        int bNextCh = true;
         switch( nNextCh )
         {
         case '\\':
@@ -403,7 +406,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                             }
                         }
 
-                        bNextCh = FALSE;
+                        bNextCh = false;
 
                         if (aByteString.Len())
                             aStrBuffer.Append(String(aByteString, GetSrcEncoding()));
@@ -433,7 +436,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
 
                         if( '-' == nNextCh || RTF_ISDIGIT( nNextCh ) )
                         {
-                            bRTF_InTextRead = TRUE;
+                            bRTF_InTextRead = true;
 
                             String sSave( aToken );
                             nNextCh = '\\';
@@ -458,14 +461,14 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                                     cAnsi = GetHexValue();
                                 nNextCh = GetNextChar();
                             }
-                            bNextCh = FALSE;
+                            bNextCh = false;
                             aToken = sSave;
-                            bRTF_InTextRead = FALSE;
+                            bRTF_InTextRead = false;
                         }
                         else
                         {
                             nNextCh = '\\';
-                            bWeiter = FALSE;        // Abbrechen, String zusammen
+                            bWeiter = false;        // Abbrechen, String zusammen
                         }
                     }
                     break;
@@ -473,7 +476,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                 default:
                     rInput.SeekRel( -1 );
                     nNextCh = '\\';
-                    bWeiter = FALSE;        // Abbrechen, String zusammen
+                    bWeiter = false;        // Abbrechen, String zusammen
                     break;
                 }
             }
@@ -484,7 +487,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                 // weiter
         case '{':
         case '}':
-            bWeiter = FALSE;
+            bWeiter = false;
             break;
 
         case 0x0a:
@@ -492,8 +495,8 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
             break;
 
         default:
-            if( nNextCh == cBreak || aToken.Len() >= STRING_MAXLEN)
-                bWeiter = FALSE;
+            if( nNextCh == cBreak || aToken.Len() >= MAX_STRING_LEN)
+                bWeiter = false;
             else
             {
                 do {
@@ -507,7 +510,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                         return;
                     }
                 } while( RTF_ISALPHA( nNextCh ) || RTF_ISDIGIT( nNextCh ) );
-                bNextCh = FALSE;
+                bNextCh = false;
             }
         }
 
@@ -558,6 +561,7 @@ void SvRTFParser::ReadOLEData()     { SkipGroup(); }
 SvParserState SvRTFParser::CallParser()
 {
     sal_Char cFirstCh;
+    nNextChPos = rInput.Tell();
     rInput >> cFirstCh; nNextCh = cFirstCh;
     eState = SVPAR_WORKING;
     nOpenBrakets = 0;
@@ -691,4 +695,4 @@ void SvRTFParser::RestoreState()
 }
 #endif
 
-
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
index e8bf8b33f138..e22aff113e03 100644
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ b/svtools/source/svrtf/rtfkey2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtfkey2.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cmc $ $Date: 2002-09-26 14:13:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,9 @@
  *
  ************************************************************************/
 
-#include "rtfkeywd.hxx"
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
+#include "rtfkeywd.hxx"
 
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_HEXCHAR, "\\'" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_IGNORE, "\\*" );
@@ -246,6 +247,7 @@ sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LANG, "\\lang" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LDBLQUOTE, "\\ldblquote" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LEVEL, "\\level" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LI, "\\li" );
+sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LIN, "\\lin" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LINE, "\\line" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LINEBETCOL, "\\linebetcol" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_LINECONT, "\\linecont" );
@@ -349,6 +351,7 @@ sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_REVISIONS, "\\revisions" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_REVPROP, "\\revprop" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_REVTIM, "\\revtim" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_RI, "\\ri" );
+sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_RIN, "\\rin" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_ROW, "\\row" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_RQUOTE, "\\rquote" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_RTF, "\\rtf" );
@@ -1152,5 +1155,4 @@ sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_PGBRK, "\\pgbrk" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCNO, "\\pgdscno" );
 sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" );
 
-
-
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index ac994bac2f0c..5deec0f562e8 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtfkeywd.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: cmc $ $Date: 2002-09-26 14:13:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -255,7 +257,9 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {sRTF_QC,            RTF_QC},
 {sRTF_FI,            RTF_FI},
 {sRTF_LI,            RTF_LI},
+{sRTF_LIN,           RTF_LIN},
 {sRTF_RI,            RTF_RI},
+{sRTF_RIN,           RTF_RIN},
 {sRTF_SB,            RTF_SB},
 {sRTF_SA,            RTF_SA},
 {sRTF_SL,            RTF_SL},
@@ -1238,4 +1242,4 @@ int GetRTFToken( const String& rSearch )
     return nRet;
 }
 
-
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svtools/source/svrtf/rtfkeywd.hxx b/svtools/source/svrtf/rtfkeywd.hxx
index f88f48a56f56..20b8bf4b3248 100644
--- a/svtools/source/svrtf/rtfkeywd.hxx
+++ b/svtools/source/svrtf/rtfkeywd.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtfkeywd.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cmc $ $Date: 2002-09-26 14:13:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -257,6 +257,7 @@ extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LANG, "\\lang" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LDBLQUOTE, "\\ldblquote" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LEVEL, "\\level" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LI, "\\li" );
+extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LIN, "\\lin" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LINE, "\\line" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LINEBETCOL, "\\linebetcol" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_LINECONT, "\\linecont" );
@@ -360,6 +361,7 @@ extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_REVISIONS, "\\revisions
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_REVPROP, "\\revprop" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_REVTIM, "\\revtim" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_RI, "\\ri" );
+extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_RIN, "\\rin" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_ROW, "\\row" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_RQUOTE, "\\rquote" );
 extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_RTF, "\\rtf" );
@@ -1173,89 +1175,7 @@ extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sRTF_SOUTLVL, "\\soutlvl" );
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/svtools/source/svrtf/rtfkeywd.hxx,v 1.7 2002-09-26 14:13:26 cmc Exp $
-
-      Source Code Control System - Update
-
-      $Log: not supported by cvs2svn $
-      Revision 1.6  2002/01/25 16:21:07  jp
-      Task #96678# new tokens for flyframe directions
-
-      Revision 1.5  2001/05/03 11:47:16  jp
-      new: token for fontalignment/scriptspace/forbiddenrule/hangingpuctuation
-
-      Revision 1.4  2001/02/16 09:27:42  jp
-      new token: horzvert
-
-      Revision 1.3  2000/11/16 17:54:11  jp
-      new tokens for twoline/underline color
-
-      Revision 1.2  2000/11/10 11:23:04  jp
-      new Tokens for the CJK-Version
-
-      Revision 1.1.1.1  2000/09/18 16:59:05  hr
-      initial import
-
-      Revision 1.19  2000/09/18 14:13:46  willem.vandorp
-      OpenOffice header added.
-
-      Revision 1.18  2000/08/31 13:51:38  willem.vandorp
-      Header and footer replaced
-
-      Revision 1.17  2000/03/28 11:47:53  jp
-      changes for Unicode
-
-      Revision 1.16  2000/01/07 10:46:14  jp
-      Task #71411#: new SW token
-
-      Revision 1.15  1999/11/01 11:27:39  jp
-      neue tokens
-
-      Revision 1.14  1999/10/25 14:36:55  jp
-      Bug #69464#: new tabstop token tql
-
-      Revision 1.13  1999/07/22 17:44:51  jp
-      new RTF-Tokens for Header/Footer height
-
-      Revision 1.12  1999/02/16 11:01:16  JP
-      Task #61633#: neue Unter-/Durchstreichungs Werte
-
-
-      Rev 1.11   16 Feb 1999 12:01:16   JP
-   Task #61633#: neue Unter-/Durchstreichungs Werte
-
-      Rev 1.10   27 May 1998 21:22:34   JP
-   Bug #50585#: fehlendes Token lfolevel zugefuegt
-
-      Rev 1.9   03 Apr 1998 18:55:20   JP
-   RTF-Parser um neue Tokens erweitert, nTokenValue wurde ein long
-
-      Rev 1.8   20 Nov 1997 22:28:02   JP
-   HeaderFile Umstellung
-
-      Rev 1.7   08 Oct 1996 13:51:18   JP
-   neue RTF-Token zugefuegt
-
-      Rev 1.6   16 Oct 1995 17:01:16   JP
-   neue Tokens
-
-      Rev 1.5   29 Sep 1995 20:03:30   JP
-   neues Token: kerning
-
-      Rev 1.4   10 Aug 1995 21:02:26   JP
-   neue Token fuer Fonts; Segmentierung
-
-      Rev 1.3   29 Jul 1995 22:40:04   JP
-   neue Token lesen/auswerten: expand/-tw
-
-      Rev 1.2   05 Jul 1995 13:58:22   JP
-   neue Tokens COLSX/COLNO/COLSR
-
-      Rev 1.1   04 Jan 1995 16:20:32   JP
-   TokenName und Token korrigiert
-
-      Rev 1.0   22 Dec 1994 17:19:52   JP
-   Initial revision.
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/svtools/source/svrtf/rtfkeywd.hxx,v 1.8 2003-03-27 14:39:42 hr Exp $
 
 *************************************************************************/
 
diff --git a/svtools/source/svrtf/rtftoken.h b/svtools/source/svrtf/rtftoken.h
index 0b8315ce067f..646022bd98e3 100644
--- a/svtools/source/svrtf/rtftoken.h
+++ b/svtools/source/svrtf/rtftoken.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtftoken.h,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cmc $ $Date: 2002-09-26 14:13:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
 #ifndef _RTFTOKEN_H
 #define _RTFTOKEN_H
 
@@ -586,7 +588,9 @@ enum RTF_TOKEN_IDS {
     RTF_QC,
     RTF_FI,
     RTF_LI,
+    RTF_LIN,
     RTF_RI,
+    RTF_RIN,
     RTF_SB,
     RTF_SA,
     RTF_SL,
@@ -1267,101 +1271,6 @@ enum RTF_TOKEN_IDS {
 
 };
 
+#endif // _RTFTOKEN_H
 
-
-/*************************************************************************
-
-      Source Code Control System - Header
-
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/svtools/source/svrtf/rtftoken.h,v 1.7 2002-09-26 14:13:26 cmc Exp $
-
-      Source Code Control System - Update
-
-      $Log: not supported by cvs2svn $
-      Revision 1.6  2002/01/25 16:21:07  jp
-      Task #96678# new tokens for flyframe directions
-
-      Revision 1.5  2001/05/03 11:47:16  jp
-      new: token for fontalignment/scriptspace/forbiddenrule/hangingpuctuation
-
-      Revision 1.4  2001/02/16 09:27:42  jp
-      new token: horzvert
-
-      Revision 1.3  2000/11/16 17:54:11  jp
-      new tokens for twoline/underline color
-
-      Revision 1.2  2000/11/10 11:23:04  jp
-      new Tokens for the CJK-Version
-
-      Revision 1.1.1.1  2000/09/18 16:59:05  hr
-      initial import
-
-      Revision 1.20  2000/09/18 14:13:47  willem.vandorp
-      OpenOffice header added.
-
-      Revision 1.19  2000/08/31 13:51:38  willem.vandorp
-      Header and footer replaced
-
-      Revision 1.18  2000/03/28 11:47:56  jp
-      changes for Unicode
-
-      Revision 1.17  2000/01/07 10:46:18  jp
-      Task #71411#: new SW token
-
-      Revision 1.16  1999/11/01 11:27:43  jp
-      neue tokens
-
-      Revision 1.15  1999/10/25 14:36:59  jp
-      Bug #69464#: new tabstop token tql
-
-      Revision 1.14  1999/07/22 17:44:52  jp
-      new RTF-Tokens for Header/Footer height
-
-      Revision 1.13  1999/02/16 11:01:18  JP
-      Task #61633#: neue Unter-/Durchstreichungs Werte
-
-
-      Rev 1.12   16 Feb 1999 12:01:18   JP
-   Task #61633#: neue Unter-/Durchstreichungs Werte
-
-      Rev 1.11   27 May 1998 22:15:48   JP
-   vertikales Alignment in Zellen ist ein Tabellen- und kein Absatztoken
-
-      Rev 1.10   27 May 1998 21:22:32   JP
-   Bug #50585#: fehlendes Token lfolevel zugefuegt
-
-      Rev 1.9   03 Apr 1998 18:55:22   JP
-   RTF-Parser um neue Tokens erweitert, nTokenValue wurde ein long
-
-      Rev 1.8   08 Oct 1996 13:51:20   JP
-   neue RTF-Token zugefuegt
-
-      Rev 1.7   16 Oct 1995 17:01:16   JP
-   neue Tokens
-
-      Rev 1.6   29 Sep 1995 20:03:40   JP
-   neues Token: kerning
-
-      Rev 1.5   10 Aug 1995 21:02:28   JP
-   neue Token fuer Fonts; Segmentierung
-
-      Rev 1.4   29 Jul 1995 22:40:06   JP
-   neue Token lesen/auswerten: expand/-tw
-
-      Rev 1.3   05 Jul 1995 13:41:18   JP
-   neue Tokens COLSX/COLNO/COLSR
-
-      Rev 1.2   04 Jan 1995 16:19:46   JP
-   Tokengruppierung fuer Tabellen
-
-      Rev 1.1   23 Dec 1994 15:01:52   JP
-   jetzt auch mit BrushItem
-
-      Rev 1.0   22 Dec 1994 17:19:52   JP
-   Initial revision.
-
-*************************************************************************/
-
-
-#endif
-    // _RTFTOKEN_H
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index c15071281713..6a7194e54374 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svparser.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mib $ $Date: 2002-10-15 17:20:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,7 @@
  *
  ************************************************************************/
 
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
 #include <stdio.h>
 #include "svparser.hxx"
@@ -85,29 +86,6 @@
 #define SVPAR_CSM_UCS2L     0x0008U
 #define SVPAR_CSM_SWITCH    0x8000U
 
-#ifdef ASYNCHRON_TEST
-//HACK
-#include "svgen.hxx"
-#include "toolerr.hxx"
-class _SvLockBytes_Impl
-{
-    AutoTimer aTimer;
-    SvStream& rIn;
-
-    ULONG nDataRead;
-    Link aCallDataRead;
-
-    DECL_STATIC_LINK( _SvLockBytes_Impl, DataRead, Timer* );
-
-public:
-    _SvLockBytes_Impl( SvStream& rInput, const Link& rCallBack );
-    ~_SvLockBytes_Impl();
-
-    ErrCode ReadAt( ULONG nPos, void* pArr, ULONG nCount, ULONG* pReadCnt );
-};
-//HACK
-#endif
-
 // Struktur, um sich die akt. Daten zumerken
 struct SvParser_Impl
 {
@@ -124,11 +102,6 @@ struct SvParser_Impl
     rtl_TextToUnicodeConverter hConv;
     rtl_TextToUnicodeContext   hContext;
 
-#ifdef ASYNCHRON_TEST
-// HACK
-_SvLockBytes_Impl* pLB;
-//HACK
-#endif
 #ifndef PRODUCT
     SvFileStream aOut;
 #endif
@@ -149,7 +122,6 @@ SvParser::SvParser( SvStream& rIn, BYTE nStackSize )
     nTokenStackSize( nStackSize ), nTokenStackPos( 0 ),
     nTokenValue( 0 ),
     pImplData( 0 ),
-//  bWaitForData( FALSE )
     bDownloadingFile( FALSE ),
     eSrcEnc( RTL_TEXTENCODING_DONTKNOW )
 {
@@ -160,14 +132,6 @@ SvParser::SvParser( SvStream& rIn, BYTE nStackSize )
     pTokenStack = new TokenStackType[ nTokenStackSize ];
     pTokenStackPos = pTokenStack;
 
-
-#ifdef ASYNCHRON_TEST
-//HACK
-    pImplData = new SvParser_Impl;
-    pImplData->pLB = new _SvLockBytes_Impl( rInput,
-                            STATIC_LINK( this, SvParser, NewDataRead ) );
-//HACK
-#endif
 #ifndef PRODUCT
 
     // wenn die Datei schon existiert, dann Anhaengen:
@@ -187,11 +151,6 @@ SvParser::SvParser( SvStream& rIn, BYTE nStackSize )
 
 SvParser::~SvParser()
 {
-//HACK
-#ifdef ASYNCHRON_TEST
-delete pImplData->pLB;
-#endif
-//HACK
 #ifndef PRODUCT
     if( pImplData->aOut.IsOpen() )
         pImplData->aOut << "\n\n >>>>>>>>>>>>>>> Dump Ende <<<<<<<<<<<<<<<\n";
@@ -261,45 +220,16 @@ void SvParser::SetSrcEncoding( rtl_TextEncoding eEnc )
     }
 }
 
+void SvParser::RereadLookahead()
+{
+    rInput.Seek(nNextChPos);
+    nNextCh = GetNextChar();
+}
+
 sal_Unicode SvParser::GetNextChar()
 {
     sal_Unicode c = 0U;
 
-#ifdef ASYNCHRON_TEST
-//HACK
-    ULONG nRead;
-    sal_Char cAsync;
-    ULONG nErr = pImplData->pLB->ReadAt( rInput.Tell(), &cAsync, 1, &nRead );
-    if( ERRCODE_IO_PENDING == nErr )
-    {
-/*      if( bWaitForData )
-        {
-            eState = SVPAR_WAITFORDATA;
-            while( SVPAR_WAITFORDATA == eState )
-                Application::Reschedule();
-            pImplData->pLB->ReadAt( rInput.Tell(), &c, 1, &nRead );
-        }
-        else
-*/      {
-            eState = SVPAR_PENDING;
-            return cAsync;
-        }
-    }
-
-    // Fehlerfall?
-    if( !nRead )
-    {
-        eState = rInput.IsEof() ? SVPAR_ACCEPTED : SVPAR_ERROR;
-        return cAsync;
-    }
-
-    if( rInput.IsEof() )
-        return EOF;
-
-    c = cAsnyc
-//HACK
-#else
-
     // When reading muliple bytes, we don't have to care about the file
     // position when we run inti the pending state. The file position is
     // maintained by SaveState/RestoreState.
@@ -338,6 +268,8 @@ sal_Unicode SvParser::GetNextChar()
         bSwitchToUCS2 = FALSE;
     }
 
+    nNextChPos = rInput.Tell();
+
     if( RTL_TEXTENCODING_UCS2 == eSrcEnc )
     {
         sal_Unicode cUC = USHRT_MAX;
@@ -515,8 +447,6 @@ sal_Unicode SvParser::GetNextChar()
             return sal_Unicode(EOF);
     }
 
-#endif
-
 #ifndef PRODUCT
     if( pImplData->aOut.IsOpen() )
         pImplData->aOut << ByteString::ConvertFromUnicode( c,
@@ -758,54 +688,4 @@ IMPL_STATIC_LINK( SvParser, NewDataRead, void*, EMPTYARG )
     return 0;
 }
 
-
-/**/
-#ifdef ASYNCHRON_TEST
-
-_SvLockBytes_Impl::_SvLockBytes_Impl( SvStream& rInput, const Link& rCallback )
-    : rIn( rInput ), aCallDataRead( rCallback )
-{
-    nDataRead = 50;
-
-    aTimer.SetTimeout( 1000 );      // jede Sekunde 100 Zeichen lesen
-    aTimer.SetTimeoutHdl( STATIC_LINK( this, _SvLockBytes_Impl, DataRead ));
-    aTimer.Start();
-}
-
-_SvLockBytes_Impl::~_SvLockBytes_Impl()
-{
-    aTimer.Stop();
-}
-
-ErrCode _SvLockBytes_Impl::ReadAt( ULONG nPos, void* pArr, ULONG nCount,
-                                ULONG* pReadCnt )
-{
-    ErrCode nRet = 0;
-    if( nPos + nCount > nDataRead )
-    {
-        nCount = nDataRead - nPos;
-        nRet = ERRCODE_IO_PENDING;
-    }
-
-    if( nCount )
-    {
-        rIn.Seek( nPos );
-        *pReadCnt = rIn.Read( pArr, nCount );
-    }
-    else
-        *pReadCnt = 0;
-    return rIn.GetError() ? rIn.GetError()
-                          : ( rIn.IsEof() ? 0 : nRet );
-}
-
-IMPL_STATIC_LINK( _SvLockBytes_Impl, DataRead, Timer*, pTimer )
-{
-    pThis->nDataRead += 100;
-    pThis->aCallDataRead.Call( pThis );
-
-    return 0;
-}
-
-#endif
-
-
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svtools/source/undo/undo.cxx b/svtools/source/undo/undo.cxx
index be6553355082..52da190113ae 100644
--- a/svtools/source/undo/undo.cxx
+++ b/svtools/source/undo/undo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: undo.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mh $ $Date: 2001-10-17 17:19:21 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -264,23 +264,41 @@ SfxUndoManager::~SfxUndoManager()
 
 void SfxUndoManager::SetMaxUndoActionCount( USHORT nMaxUndoActionCount )
 {
-    // Redo-Actions loeschen
-    for ( USHORT nPos = pActUndoArray->aUndoActions.Count();
-          nPos > pActUndoArray->nCurUndoAction &&
-              !pActUndoArray->aUndoActions[nPos - 1 ]->IsLinked();
-          --nPos )
-    {
-        delete pActUndoArray->aUndoActions[nPos-1];
-        pActUndoArray->aUndoActions.Remove(
-            nPos - 1 );
-    }
+    // Remove entries from the pActUndoArray when we have to reduce
+    // the number of entries due to a lower nMaxUndoActionCount.
+    // Both redo and undo action entries will be removed until we reached the
+    // new nMaxUndoActionCount.
 
-    while ( nMaxUndoActionCount < pActUndoArray->aUndoActions.Count() &&
-            !pActUndoArray->aUndoActions[0]->IsLinked())
+    long nNumToDelete = pActUndoArray->aUndoActions.Count() - nMaxUndoActionCount;
+    if ( nNumToDelete > 0 )
     {
-        delete pActUndoArray->aUndoActions[0];
-        pActUndoArray->aUndoActions.Remove(0);
-        --pActUndoArray->nCurUndoAction;
+        while ( nNumToDelete > 0 )
+        {
+            USHORT nPos = pActUndoArray->aUndoActions.Count();
+            if ( nPos > pActUndoArray->nCurUndoAction )
+            {
+                if ( !pActUndoArray->aUndoActions[nPos-1]->IsLinked() )
+                {
+                    delete pActUndoArray->aUndoActions[nPos-1];
+                    pActUndoArray->aUndoActions.Remove( nPos-1 );
+                    --nNumToDelete;
+                }
+            }
+
+            if ( nNumToDelete > 0 && pActUndoArray->nCurUndoAction > 0 )
+            {
+                if ( !pActUndoArray->aUndoActions[0]->IsLinked() )
+                {
+                    delete pActUndoArray->aUndoActions[0];
+                    pActUndoArray->aUndoActions.Remove(0);
+                    --pActUndoArray->nCurUndoAction;
+                    --nNumToDelete;
+                }
+            }
+
+            if ( nPos == pActUndoArray->aUndoActions.Count() )
+                break; // Cannot delete more entries
+        }
     }
 
     pActUndoArray->nMaxUndoActions = nMaxUndoActionCount;
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 4330039fd0eb..fecd37b713fc 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: genericunodialog.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-17 09:04:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -368,31 +368,3 @@ void OGenericUnoDialog::destroyDialog()
 }   // namespace svt
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/03/22 15:51:13  jl
- *  replaced OSL_ENSHURE by OSL_ENSURE
- *
- *  Revision 1.1  2000/11/24 12:34:35  fs
- *  initial checkin - frame for dialogs usuable as UNO service
- *
- *  Revision 1.4  2000/11/01 16:34:16  fs
- *  migrated from awt::XDialog to ui::XExecutableDialog / removed the star* namespace shortcuts
- *
- *  Revision 1.3  2000/10/31 08:08:38  fs
- *  split up initialize - now using implInitialize, thus enabling derived classes to handle single parameters only
- *
- *  Revision 1.2  2000/10/27 08:08:47  fs
- *  don't include stringconstants.hrc directly anymore
- *
- *  Revision 1.1  2000/10/25 12:56:19  fs
- *  moved herein from ..\dlg
- *
- *  Revision 1.1  2000/10/05 10:06:09  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 21.09.00 09:10:05  fs
- ************************************************************************/
-
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
index c518f5393a0e..1bfa55e6d4fd 100644
--- a/svtools/source/uno/makefile.mk
+++ b/svtools/source/uno/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: jbu $ $Date: 2002-10-01 12:54:26 $
+#   last change: $Author: hr $ $Date: 2003-03-27 14:39:47 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,155 +76,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .IF "$(header)" == ""
 
-#not all needed...
-
-UNOTYPES= \
-    com.sun.star.awt.CharSet \
-    com.sun.star.awt.DeviceCapability \
-    com.sun.star.awt.FontDescriptor \
-    com.sun.star.awt.FontPitch \
-    com.sun.star.awt.FontSlant \
-    com.sun.star.awt.FontStrikeout \
-    com.sun.star.awt.FontStrikeout \
-    com.sun.star.awt.FontType \
-    com.sun.star.awt.FontUnderline \
-    com.sun.star.awt.FontWeight \
-    com.sun.star.awt.FontWidth \
-    com.sun.star.awt.KeyModifier \
-    com.sun.star.awt.MenuItemStyle \
-    com.sun.star.awt.MessageBoxCommand \
-    com.sun.star.awt.MouseButton \
-    com.sun.star.awt.PopupMenuDirection \
-    com.sun.star.awt.ScrollBarOrientation \
-    com.sun.star.awt.Style \
-    com.sun.star.awt.TextAlign \
-    com.sun.star.awt.VclWindowPeerAttribute \
-    com.sun.star.awt.WindowAttribute \
-    com.sun.star.awt.XActionListener \
-    com.sun.star.awt.XAdjustmentListener \
-    com.sun.star.awt.XBitmap \
-    com.sun.star.awt.XButton \
-    com.sun.star.awt.XCheckBox \
-    com.sun.star.awt.XComboBox \
-    com.sun.star.awt.XControl \
-    com.sun.star.awt.XControlContainer \
-    com.sun.star.awt.XControlModel \
-    com.sun.star.awt.XCurrencyField \
-    com.sun.star.awt.XDateField \
-    com.sun.star.awt.XDevice \
-    com.sun.star.awt.XDialog \
-    com.sun.star.awt.XFileDialog \
-    com.sun.star.awt.XFixedText \
-    com.sun.star.awt.XFocusListener \
-    com.sun.star.awt.XFont \
-    com.sun.star.awt.XGraphics \
-    com.sun.star.awt.XImageButton \
-    com.sun.star.awt.XImageConsumer \
-    com.sun.star.awt.XImageProducer \
-    com.sun.star.awt.ImageStatus \
-    com.sun.star.awt.XInfoPrinter \
-    com.sun.star.awt.XItemListener \
-    com.sun.star.awt.XKeyListener \
-    com.sun.star.awt.XLayoutConstrains \
-    com.sun.star.awt.XListBox \
-    com.sun.star.awt.XMenuListener \
-    com.sun.star.awt.XMessageBox \
-    com.sun.star.awt.XMouseListener \
-    com.sun.star.awt.XMouseMotionListener \
-    com.sun.star.awt.XNumericField \
-    com.sun.star.util.XNumberFormatsSupplier \
-    com.sun.star.awt.XPaintListener \
-    com.sun.star.awt.XPatternField \
-    com.sun.star.awt.XPointer \
-    com.sun.star.awt.XPrinter \
-    com.sun.star.awt.XPrinterPropertySet \
-    com.sun.star.awt.XPrinterServer \
-    com.sun.star.awt.XProgressBar \
-    com.sun.star.awt.XProgressMonitor \
-    com.sun.star.awt.XRadioButton \
-    com.sun.star.awt.XRegion \
-    com.sun.star.awt.XScrollBar \
-    com.sun.star.awt.XSpinField \
-    com.sun.star.awt.XSpinListener \
-    com.sun.star.awt.XSystemDependentWindowPeer \
-    com.sun.star.awt.XTabController \
-    com.sun.star.awt.XTabControllerModel \
-    com.sun.star.awt.XTextArea \
-    com.sun.star.awt.XTextComponent \
-    com.sun.star.awt.XTextEditField \
-    com.sun.star.awt.XTextLayoutConstrains \
-    com.sun.star.awt.XTextListener \
-    com.sun.star.awt.XTimeField \
-    com.sun.star.awt.XToolkit \
-    com.sun.star.awt.XTopWindow \
-    com.sun.star.awt.XTopWindowListener \
-    com.sun.star.awt.XUnoControlContainer \
-    com.sun.star.awt.XVclContainer \
-    com.sun.star.awt.XVclContainerListener \
-    com.sun.star.awt.XVclContainerPeer \
-    com.sun.star.awt.XVclWindowPeer \
-    com.sun.star.awt.XWindow \
-    com.sun.star.awt.XWindowListener \
-    com.sun.star.beans.PropertyAttribute \
-    com.sun.star.beans.PropertyChangeEvent \
-    com.sun.star.beans.PropertyState \
-    com.sun.star.beans.PropertyStateChangeEvent \
-    com.sun.star.beans.PropertyValue \
-    com.sun.star.beans.PropertyValues \
-    com.sun.star.beans.XFastPropertySet \
-    com.sun.star.beans.XMultiPropertySet \
-    com.sun.star.beans.XPropertiesChangeListener \
-    com.sun.star.beans.XPropertyAccess \
-    com.sun.star.beans.XPropertyChangeListener \
-    com.sun.star.beans.XPropertyContainer \
-    com.sun.star.beans.XPropertySet \
-    com.sun.star.beans.XPropertySetInfo \
-    com.sun.star.beans.XPropertyState \
-    com.sun.star.beans.XVetoableChangeListener \
-    com.sun.star.container.XContainer \
-    com.sun.star.container.XContainerListener \
-    com.sun.star.container.XNameContainer \
-    com.sun.star.frame.XModel \
-    com.sun.star.frame.XFrameLoader \
-    com.sun.star.frame.XLoadEventListener \
-    com.sun.star.frame.XController \
-    com.sun.star.frame.XDispatch \
-    com.sun.star.frame.XDispatchProvider \
-    com.sun.star.frame.XStorable \
-    com.sun.star.frame.XFrame \
-    com.sun.star.frame.FeatureStateEvent \
-    com.sun.star.frame.DispatchDescriptor \
-    com.sun.star.io.XInputStream \
-    com.sun.star.io.XMarkableStream \
-    com.sun.star.io.XObjectInputStream \
-    com.sun.star.io.XConnectable \
-    com.sun.star.io.XActiveDataControl \
-    com.sun.star.io.XActiveDataSink \
-    com.sun.star.io.XActiveDataSource \
-    com.sun.star.lang.IllegalArgumentException \
-    com.sun.star.lang.SystemDependent \
-    com.sun.star.lang.XEventListener \
-    com.sun.star.lang.XMultiServiceFactory \
-    com.sun.star.lang.XServiceInfo \
-    com.sun.star.lang.XServiceName \
-    com.sun.star.lang.XSingleServiceFactory \
-    com.sun.star.lang.XTypeProvider \
-    com.sun.star.lang.XUnoTunnel \
-    com.sun.star.registry.XRegistryKey \
-    com.sun.star.uno.TypeClass \
-    com.sun.star.util.XSearchable \
-    com.sun.star.util.XSearchDescriptor \
-    com.sun.star.util.XURLTransformer \
-    com.sun.star.view.XScreenCursor \
-    com.sun.star.text.XTextCursor \
-    com.sun.star.text.XText \
-    com.sun.star.text.XTextRange \
-    com.sun.star.text.XTextViewCursor \
-    com.sun.star.text.XTextViewCursorSupplier \
-    com.sun.star.uno.XAggregation \
-    com.sun.star.uno.XWeak
-
-
 .IF "$(GUI)"!="DOS"
 SRS1NAME=	uno
 SRC1FILES=  unoifac2.src
diff --git a/svtools/source/uno/unoifac2.src b/svtools/source/uno/unoifac2.src
index f564347dbcbf..30b5a8ed4a03 100644
--- a/svtools/source/uno/unoifac2.src
+++ b/svtools/source/uno/unoifac2.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoifac2.src,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: kz $ $Date: 2001-08-24 13:16:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:39:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,7 +81,7 @@ Menu RID_CONTEXTMENU
             Text[ portuguese ] = "~Abrir";
             Text[ danish ] = "�~bn";
             Text[ french ] = "Ouvrir";
-            Text[ swedish ] = "~�ppna";
+            Text[ swedish ] = "�pp~na";
             Text[ dutch ] = "Ope~nen";
             Text[ spanish ] = "~Abrir";
             Text[ english_us ] = "~Open";
@@ -97,8 +97,9 @@ Menu RID_CONTEXTMENU
             Text[ korean ] = "열기(~O)";
             Text[ turkish ] = "A�";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "~Abrir";
+            Text[ catalan ] = "~Obre";
             Text[ finnish ] = "~Avaa";
+            Text[ thai ] = "เ~ปิด";
         };
         MenuItem
         {
@@ -111,14 +112,14 @@ Menu RID_CONTEXTMENU
             Text[ portuguese ] = "Abrir em ~nova janela";
             Text[ danish ] = "�bn i nyt vindue";
             Text[ french ] = "Ouvrir dans une nouvelle ~fen�tre";
-            Text[ swedish ] = "~�ppna i ett nytt f�nster";
+            Text[ swedish ] = "�ppna i ett nytt ~f�nster";
             Text[ dutch ] = "Openen in nieuw ~venster";
             Text[ spanish ] = "Abrir en ~ventana nueva";
             Text[ english_us ] = "Open in New ~Window";
             Text[ chinese_simplified ] = "使用一个新视窗打开(~W)";
             Text[ russian ] = "������� � ����� ����";
             Text[ polish ] = "Otw�rz w nowym oknie";
-            Text[ japanese ] = "新しいｳｨﾝﾄﾞｳを開く(~W)";
+            Text[ japanese ] = "新しいウィンドウを開く(~W)";
             Text[ chinese_traditional ] = "用一個新視窗開啟(~W)";
             Text[ arabic ] = "��� �� ����� �����";
             Text[ dutch ] = "Openen in nieuw ~venster";
@@ -127,8 +128,9 @@ Menu RID_CONTEXTMENU
             Text[ korean ] = "새 창에서 열기(~W)";
             Text[ turkish ] = "Yeni bir pencerede a�";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Abrir en ~ventana nueva";
-            Text[ finnish ] = "~Avaa uudessa ikkunassa";
+            Text[ catalan ] = "Obre en una ~finestra nova";
+            Text[ finnish ] = "Avaa uudessa ~ikkunassa";
+            Text[ thai ] = "เปิดใน~หน้าต่างใหม่";
         };
         MenuItem
         {
@@ -146,9 +148,9 @@ Menu RID_CONTEXTMENU
             Text[ spanish ] = "~Descargar...";
             Text[ english_us ] = "~Download...";
             Text[ chinese_simplified ] = "下载(~D)...";
-            Text[ russian ] = "��������...";
+            Text[ russian ] = "���������...";
             Text[ polish ] = "Pobieranie...";
-            Text[ japanese ] = "ﾀﾞｳﾝﾛｰﾄﾞ(~D)...";
+            Text[ japanese ] = "ダウンロード(~D)...";
             Text[ chinese_traditional ] = "下載(~D)...";
             Text[ arabic ] = "�����...";
             Text[ dutch ] = "~Downloaden...";
@@ -157,8 +159,9 @@ Menu RID_CONTEXTMENU
             Text[ korean ] = "다운로드(~D)...";
             Text[ turkish ] = "�ndir...";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "~Descargar...";
-            Text[ finnish ] = "~Nouda";
+            Text[ catalan ] = "~Descarregar...";
+            Text[ finnish ] = "~Lataa...";
+            Text[ thai ] = "~ดาวน์โหลด...";
         };
         MenuItem
         {
@@ -182,17 +185,18 @@ Menu RID_CONTEXTMENU
             Text[ chinese_simplified ] = "新增链接(~L)";
             Text[ russian ] = "�������� ������";
             Text[ polish ] = "Dodaj ��cze";
-            Text[ japanese ] = "ﾘﾝｸの追加(~L)";
+            Text[ japanese ] = "リンクの追加(~L)";
             Text[ chinese_traditional ] = "加入捷徑(~L)";
             Text[ arabic ] = "����� ������";
             Text[ dutch ] = "Koppeling ~toevoegen";
             Text[ chinese_simplified ] = "新增链接(~L)";
             Text[ greek ] = "�������~� ��������";
-            Text[ korean ] = "연결  추가(~L)";
+            Text[ korean ] = "링크 추가(~L)";
             Text[ turkish ] = "Ba�lant�y� ekle";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "~A�adir v�nculo";
-            Text[ finnish ] = "~Lis�� linkki";
+            Text[ catalan ] = "~Afegeix un enlla�";
+            Text[ finnish ] = "Lis�� ~linkki";
+            Text[ thai ] = "เพิ่มการเ~ชื่อมโยง";
         };
         MenuItem
         {
@@ -212,21 +216,22 @@ Menu RID_CONTEXTMENU
             Text[ italian ] = "Copia ~link" ;
             Text[ spanish ] = "Copiar ~v�nculo" ;
             Text[ french ] = "Copier le ~lien" ;
-            Text[ dutch ] = "~Link kopi�ren" ;
+            Text[ dutch ] = "Kopel~ling kopi�ren" ;
             Text[ chinese_simplified ] = "复制链接(~Y)";
             Text[ russian ] = "���������� ������";
             Text[ polish ] = "Kopiuj ��cze";
-            Text[ japanese ] = "ﾘﾝｸのｺﾋﾟｰ(~Y)";
+            Text[ japanese ] = "リンクのコピー(~Y)";
             Text[ chinese_traditional ] = "複製捷徑(~Y)";
             Text[ arabic ] = "��� ��������";
-            Text[ dutch ] = "~Link kopi�ren";
+            Text[ dutch ] = "Kopel~ling kopi�ren";
             Text[ chinese_simplified ] = "复制链接(~Y)";
             Text[ greek ] = "��������� ~��������";
             Text[ korean ] = "링크 복사(~Y)";
             Text[ turkish ] = "Ba�lant�y� kopyala";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Copiar ~v�nculo";
+            Text[ catalan ] = "Copia l'~enlla�";
             Text[ finnish ] = "~Kopioi linkki";
+            Text[ thai ] = "คัดลอ~กการเชื่อมโยง";
         };
     };
 };
@@ -237,3 +242,10 @@ Menu RID_CONTEXTMENU
 
 
 
+
+
+
+
+
+
+
diff --git a/svtools/util/defs/wntmsci7 b/svtools/util/defs/wntmsci7
index 2467768fc916..2c3878264316 100644
--- a/svtools/util/defs/wntmsci7
+++ b/svtools/util/defs/wntmsci7
@@ -14392,29 +14392,3 @@ WriteJPEG
 ?s_pType@?$Sequence@UContentInfo@ucb@star@sun@com@@@uno@star@sun@com@@2PAU_typelib_TypeDescriptionReference@@A

 ?s_pType_com_sun_star_ucb_ContentInfo@?1??getCppuType@@YAABVType@uno@star@sun@com@@PBUContentInfo@ucb@456@@Z@4PAU_typelib_TypeDescriptionReference@@A

 ?s_pType_com_sun_star_ucb_XContentCreator@?1??getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXContentCreator@ucb@star@sun@com@@@3456@@Z@4PAU_typelib_TypeDescriptionReference@@A

-??RFilterTitleMatch@?%O:\SRC641\src\svtools\source\filepicker\filepicker.cxx820724129@@QAE_NABUFilterEntry@@@Z

-?GetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx201815744@@YA?AVString@@ABV2@@Z

-?IsFileURL@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx201815744@@YAEABVString@@@Z

-?SetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx201815744@@YAXAAVString@@ABV2@@Z

-?lcl_MoveControl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx201815744@@YAXPAVControl@@JJAAJ@Z

-?lcl_getHomeDirectory@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx201815744@@YAEABVString@@AAV2@@Z

-?InsertBlanks@SvNumberformat@@SAGAAVString@@GG@Z

-??RFilterTitleMatch@?%O:\SRC641\src\svtools\source\filepicker\filepicker.cxx276514578@@QAE_NABUFilterEntry@@@Z

-?GetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx3058631074@@YA?AVString@@ABV2@@Z

-?IsFileURL@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx3058631074@@YAEABVString@@@Z

-?SetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx3058631074@@YAXAAVString@@ABV2@@Z

-?lcl_MoveControl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx3058631074@@YAXPAVControl@@JJAAJ@Z

-?lcl_getHomeDirectory@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx3058631074@@YAEABVString@@AAV2@@Z

-?ImplDrawBitmap@WinMtfOutput@@AAEXABVPoint@@ABVSize@@VBitmapEx@@@Z

-??RFilterTitleMatch@?%O:\SRC641\src\svtools\source\filepicker\filepicker.cxx2531628567@@QAE_NABUFilterEntry@@@Z

-?GetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx1650127727@@YA?AVString@@ABV2@@Z

-?IsFileURL@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx1650127727@@YAEABVString@@@Z

-?SetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx1650127727@@YAXAAVString@@ABV2@@Z

-?lcl_MoveControl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx1650127727@@YAXPAVControl@@JJAAJ@Z

-?lcl_getHomeDirectory@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx1650127727@@YAEABVString@@AAV2@@Z

-??RFilterTitleMatch@?%O:\SRC641\src\svtools\source\filepicker\filepicker.cxx23435953@@QAE_NABUFilterEntry@@@Z

-?GetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx2618731321@@YA?AVString@@ABV2@@Z

-?IsFileURL@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx2618731321@@YAEABVString@@@Z

-?SetFsysExtension_Impl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx2618731321@@YAXAAVString@@ABV2@@Z

-?lcl_MoveControl@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx2618731321@@YAXPAVControl@@JJAAJ@Z

-?lcl_getHomeDirectory@?%O:\SRC641\src\svtools\source\filepicker\iodlg.cxx2618731321@@YAEABVString@@AAV2@@Z

diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
index 52838b9ccfb1..51550a0dc0f3 100644
--- a/svtools/util/makefile.mk
+++ b/svtools/util/makefile.mk
@@ -2,9 +2,9 @@
 #*
 #*  $RCSfile: makefile.mk,v $
 #*
-#*  $Revision: 1.41 $
+#*  $Revision: 1.42 $
 #*
-#*  last change: $Author: hro $ $Date: 2002-09-30 08:52:05 $
+#*  last change: $Author: hr $ $Date: 2003-03-27 14:39:53 $
 #*
 #*  The Contents of this file are made available subject to the terms of
 #*  either of the following licenses
@@ -68,6 +68,7 @@ RESTARGET=svt
 RESTARGETSIMPLE=svs
 VERSION=$(UPD)
 GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
 ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
@@ -125,7 +126,8 @@ LIB7FILES=	\
         $(SLB)$/svcontnr.lib	\
         $(SLB)$/syslocale.lib   \
         $(SLB)$/svhtml2.lib     \
-        $(SLB)$/filepicker.lib
+        $(SLB)$/filepicker.lib  \
+        $(SLB)$/heavyconfig.lib
 
 
 .IF "$(GUI)" == "OS2"
@@ -308,24 +310,11 @@ ALL: $(SLB)$/svl.lib \
     $(MISC)$/$(SHL2TARGET).def \
     $(MISC)$/$(SHL1TARGET).def \
     $(SVTTARGETS) \
-    $(SRS)$/hidother.hid \
     ALLTAR
 .ENDIF          # "$(L10N-framework)"==""
 
 .INCLUDE :	target.mk
 
-$(MISC)$/$(PRJNAME).hid : $(SRS)$/hidother.hid
-
-$(SRS)$/hidother.hid: hidother.src
-.IF "$(GUI)$(CPU)"=="WNTI"
-.IF "$(BUILD_SOSL)"==""
-    @+echo no hids
-    @+-mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE)
-.ENDIF
-.ELSE
-    @echo nix
-.ENDIF
-
 # --- Svtools-Control-Filter-Datei ---
 
 $(MISC)$/$(SHL1TARGET).flt: makefile.mk
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 8fdca9e60b62..48c4431ecaca 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: loadlib.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:59:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 14:40:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,58 +64,57 @@
 #include <stdlib.h>
 
 #include <tools/string.hxx>
-#include <libcall.hxx>
+#include <osl/module.h>
+#include <rtl/ustring.hxx>
 
+using namespace rtl;
 
 extern "C" {
-
 struct VersionInfo
 {
-    char    aTime[20];
-    char    aDate[20];
-    char    aUpd[5];
-    char    aMinor;
-    char    aBuild[5];
-#if SUPD>564
-    char    aInpath[20];
-#endif
-};
-
-#ifdef WNT
-__declspec(dllexport)
-#endif
-    VersionInfo *GetVersionInfo();
+        const char*     pTime;
+        const char*     pDate;
+        const char*     pUpd;
+        const char*     pMinor;
+        const char*     pBuild;
+        const char*     pInpath;
 };
 
-typedef VersionInfo*(__LOADONCALLAPI *PFUNC)(void);
+typedef VersionInfo*(__LOADONCALLAPI *GetVersionInfo)(void);
+}
 
 int __LOADONCALLAPI main( int argc, char **argv )
 {
-    VersionInfo *pInfo = 0L;
-    PFUNC pFunc;
+    VersionInfo *pInfo = NULL;
 
     if ( argc != 2 )
     {
         fprintf( stderr, "USAGE: %s DllName \n", argv[0] );
         exit(0);
     }
-    SvLibrary aLibrary(argv[1]);
-    pFunc = (PFUNC) aLibrary.GetFunction( "GetVersionInfo" );
-    if ( pFunc )
-        pInfo = (*pFunc)();
+    OUString aLib = OUString::createFromAscii(argv[1]);
+    oslModule aLibrary = osl_loadModule( aLib.pData, SAL_LOADMODULE_DEFAULT );
+    if ( aLibrary )
+    {
+        void* pFunc = osl_getSymbol( aLibrary, OUString::createFromAscii( "GetVersionInfo" ).pData );
+        if ( pFunc )
+            pInfo = (*(GetVersionInfo)pFunc)();
+    }
     if ( pInfo )
     {
-        fprintf( stdout, "Date : %s\n", pInfo->aDate );
-        fprintf( stdout, "Time : %s\n", pInfo->aTime );
-        fprintf( stdout, "UPD : %s\n", pInfo->aUpd );
-        fprintf( stdout, "Minor : %c\n", pInfo->aMinor );
-        fprintf( stdout, "Build : %s\n", pInfo->aBuild );
-#if SUPD>564
-        fprintf( stdout, "Inpath : %s\n", pInfo->aInpath );
-#endif
+        fprintf( stdout, "Date : %s\n", pInfo->pDate );
+        fprintf( stdout, "Time : %s\n", pInfo->pTime );
+        fprintf( stdout, "UPD : %s\n", pInfo->pUpd );
+        fprintf( stdout, "Minor : %s\n", pInfo->pMinor );
+        fprintf( stdout, "Build : %s\n", pInfo->pBuild );
+        fprintf( stdout, "Inpath : %s\n", pInfo->pInpath );
     }
     else
         fprintf( stderr, "VersionInfo not Found !\n" );
+
+    if ( aLibrary )
+        osl_unloadModule( aLibrary );
+
     return 0;
 }