MWS_SRX644: migrate branch mws_srx644 -> HEAD

176 files changed, 3257 insertions, 4940 deletions

diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 136e0718ff1c..8e741b73caf3 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BookmarkSet.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2001-11-29 16:35:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -252,43 +252,3 @@ void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParamet
     }
 }
 
-
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.8  2001/10/30 14:22:10  oj
-    #93939# add late ctor
-
-    Revision 1.7  2001/09/20 12:59:25  oj
-    #92232# fixes for BIGINT type and new property HELPTEXT
-
-    Revision 1.6  2001/07/24 13:25:26  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.5  2001/05/03 07:15:56  oj
-    #86526# fetch decimal and numeric as string
-
-    Revision 1.4  2000/11/14 13:28:20  oj
-    change for rowset when getRow returns 0
-
-    Revision 1.3  2000/10/11 11:18:10  fs
-    replace unotools with comphelper
-
-    Revision 1.2  2000/09/29 15:20:51  oj
-    rowset impl
-
-    Revision 1.1.1.1  2000/09/19 00:15:37  hr
-    initial import
-
-    Revision 1.3  2000/09/18 14:52:45  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.2  2000/09/05 13:23:34  rt
-    typo
-
-    Revision 1.1  2000/09/01 15:20:46  oj
-    rowset addons
-
-    Revision 1.0 01.08.2000 09:54:37  oj
-------------------------------------------------------------------------*/
-
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 9101b9ad4c3b..5a5f26856198 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BookmarkSet.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-30 14:22:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,33 +106,4 @@ namespace dbaccess
     };
 }
 #endif // DBACCESS_CORE_API_BOOKMARKSET_HXX
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.6  2001/07/24 13:25:26  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.5  2000/11/14 13:28:20  oj
-    change for rowset when getRow returns 0
-
-    Revision 1.4  2000/11/03 14:40:45  oj
-    some problems with refcount resolved
-
-    Revision 1.3  2000/10/17 10:19:03  oj
-    some changes for the rowset
-
-    Revision 1.2  2000/10/11 11:18:10  fs
-    replace unotools with comphelper
-
-    Revision 1.1.1.1  2000/09/19 00:15:37  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:45  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:20:52  oj
-    rowset addons
-
-    Revision 1.0 01.08.2000 08:55:50  oj
-------------------------------------------------------------------------*/
 
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index b621564b81ac..a9a5753061d4 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CacheSet.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-15 09:00:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -485,11 +485,13 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
     m_bDeleted = xPrep->executeUpdate() > 0;
 }
 // -------------------------------------------------------------------------
-void OCacheSet::setParameter(sal_Int32 nPos,Reference< XParameters > _xParameter,const ORowSetValue& _rValue) throw(SQLException, RuntimeException)
+void OCacheSet::setParameter(sal_Int32 nPos,Reference< XParameters > _xParameter,const ORowSetValue& _rValue,sal_Int32 _nType)
 {
+    sal_Int32 nType = ( _nType != DataType::OTHER ) ? _nType : _rValue.getTypeKind();
     if(!_rValue.isNull())
     {
-        switch(_rValue.getTypeKind())
+
+        switch(nType)
         {
             case DataType::CHAR:
             case DataType::VARCHAR:
@@ -551,7 +553,7 @@ void OCacheSet::setParameter(sal_Int32 nPos,Reference< XParameters > _xParameter
         }
     }
     else
-        _xParameter->setNull(nPos,_rValue.getTypeKind());
+        _xParameter->setNull(nPos,nType);
 }
 // -------------------------------------------------------------------------
 void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 1f2d1689cedb..8c0fc775e559 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CacheSet.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-30 14:22:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -117,7 +117,7 @@ namespace dbaccess
         {
         }
 
-        void setParameter(sal_Int32 nPos,::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > _xParameter,const connectivity::ORowSetValue& _rValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        void setParameter(sal_Int32 nPos,::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > _xParameter,const connectivity::ORowSetValue& _rValue,sal_Int32 _nType = ::com::sun::star::sdbc::DataType::OTHER);
         void fillTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     public:
         virtual ~OCacheSet();
@@ -184,42 +184,4 @@ namespace dbaccess
     };
 }
 #endif //DBACCESS_CORE_API_CACHESET_HXX
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.9  2001/10/26 07:50:50  oj
-    #93524# insert/delete corrected
-
-    Revision 1.8  2001/07/24 13:25:25  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.7  2001/01/22 07:38:23  oj
-    #82632# change member
-
-    Revision 1.6  2000/12/12 12:15:41  oj
-    use paramter instead of member and set member to ull
-
-    Revision 1.5  2000/11/14 13:28:20  oj
-    change for rowset when getRow returns 0
-
-    Revision 1.4  2000/11/03 14:32:31  oj
-    some problems with refcount resolved
-
-    Revision 1.3  2000/10/17 10:18:12  oj
-    some changes for the rowset
-
-    Revision 1.2  2000/10/11 11:18:10  fs
-    replace unotools with comphelper
-
-    Revision 1.1.1.1  2000/09/19 00:15:38  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:46  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:24:14  oj
-    rowset addon
-
-    Revision 1.0 26.07.2000 14:45:35  oj
-------------------------------------------------------------------------*/
 
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 5ee3da2f2fd8..b8957d06b123 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: KeySet.cxx,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-15 09:00:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -473,20 +473,20 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
     for(;aIter != m_pColumnNames->end();++aIter)
     {
         if((*_rInsertRow)[aIter->second.first].isModified())
-            setParameter(i++,xParameter,(*_rInsertRow)[aIter->second.first]);
+            setParameter(i++,xParameter,(*_rInsertRow)[aIter->second.first],aIter->second.second);
     }
     // and then the values of the where condition
     aIter = (*m_pKeyColumnNames).begin();
     for(;aIter != (*m_pKeyColumnNames).end();++aIter,++i)
     {
-        setParameter(i,xParameter,(*_rOrginalRow)[aIter->second.first]);
+        setParameter(i,xParameter,(*_rOrginalRow)[aIter->second.first],aIter->second.second);
     }
 
     // now we have to set the index values
     ::std::vector<sal_Int32>::iterator aIdxColIter = aIndexColumnPositions.begin();
     for(;aIdxColIter != aIndexColumnPositions.end();++aIdxColIter,++i)
     {
-        setParameter(i,xParameter,(*_rOrginalRow)[*aIdxColIter]);
+        setParameter(i,xParameter,(*_rOrginalRow)[*aIdxColIter],aIter->second.second);
     }
 
      m_bUpdated = xPrep->executeUpdate() > 0;
@@ -545,7 +545,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
             if((*_rInsertRow)[aPosIter->second.first].isNull())
                 xParameter->setNull(i++,(*_rInsertRow)[aPosIter->second.first].getTypeKind());
             else
-                setParameter(i++,xParameter,(*_rInsertRow)[aPosIter->second.first]);
+                setParameter(i++,xParameter,(*_rInsertRow)[aPosIter->second.first],aPosIter->second.second);
         }
     }
 
@@ -719,7 +719,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
     aIter = (*m_pKeyColumnNames).begin();
     for(sal_Int32 i = 1;aIter != (*m_pKeyColumnNames).end();++aIter,++i)
     {
-        setParameter(i,xParameter,(*_rDeleteRow)[aIter->second.first]);
+        setParameter(i,xParameter,(*_rDeleteRow)[aIter->second.first],aIter->second.second);
     }
 
     m_bDeleted = xPrep->executeUpdate() > 0;
@@ -1392,69 +1392,5 @@ namespace dbaccess
         }
     }
 }
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.39  2002/10/11 07:23:16  oj
-    #i6529# use real table name instead of alias for update,delete and insert statements
-
-    Revision 1.38  2002/10/08 12:46:28  oj
-    #i3289# correct table name quoting so that in every situation the correct schema, catalog is used
-
-    Revision 1.37  2002/10/01 09:03:59  oj
-    #97524# remember column type for reuse
-
-    Revision 1.36  2002/08/30 08:59:39  oj
-    #100839# clear variables before use them again
-
-    Revision 1.35  2002/08/26 12:35:31  oj
-    #98671# change type for sequence to VARBINARY
-
-    Revision 1.34  2002/08/22 10:07:04  oj
-    #102394# insert even into key row if no auto increment exists
-
-    Revision 1.33  2002/07/25 06:38:47  oj
-    #95146# ask for generated values after insert new row
-
-    Revision 1.32  2002/03/18 13:59:43  oj
-    #97987# append index columns only when not null
-
-    Revision 1.31  2001/12/17 12:51:16  oj
-    #96052# quote tablename
-
-    Revision 1.30  2001/12/11 09:09:42  oj
-    #95779# use of alias tablename
-
-    Revision 1.29  2001/12/05 14:56:24  oj
-    #95610# fetch autoincrement values after insert with max
-
-    Revision 1.28  2001/11/29 16:35:26  oj
-    #95225# changes for bookmarkable resultset
-
-    Revision 1.27  2001/10/30 14:22:10  oj
-    #93939# add late ctor
-
-    Revision 1.26  2001/09/20 12:56:18  oj
-    #92232# fixes for BIGINT type and new property HELPTEXT
-
-    Revision 1.25  2001/09/13 10:38:45  hr
-    #92075#: can't take address from temporary
-
-    Revision 1.24  2001/08/14 11:51:34  oj
-    #91006# check index values as well
-
-    Revision 1.23  2001/07/24 13:25:25  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.22  2001/07/19 09:29:22  oj
-    #86186# check parsetree for joins
-
-    Revision 1.21  2001/07/09 07:00:18  oj
-    #89364# provide the parameter row to the keyset
-
-    Revision 1.20  2001/07/05 11:58:54  oj
-    #87744# check non casesensitive for table privs
-
-------------------------------------------------------------------------*/
 
 
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 97af8591654a..a88a9a73344a 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: KeySet.hxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-11 07:23:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -219,57 +219,4 @@ namespace dbaccess
     };
 }
 #endif // DBACCESS_CORE_API_KEYSET_HXX
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.14  2002/10/01 09:03:59  oj
-    #97524# remember column type for reuse
-
-    Revision 1.13  2001/12/05 14:56:24  oj
-    #95610# fetch autoincrement values after insert with max
-
-    Revision 1.12  2001/10/30 14:22:10  oj
-    #93939# add late ctor
-
-    Revision 1.11  2001/07/24 13:25:25  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.10  2001/07/19 09:29:22  oj
-    #86186# check parsetree for joins
-
-    Revision 1.9  2001/07/09 07:00:18  oj
-    #89364# provide the parameter row to the keyset
-
-    Revision 1.8  2001/06/22 13:07:17  oj
-    #88012# change rowdeleted
-
-    Revision 1.7  2001/02/01 14:23:57  oj
-    change for insert , delete and update rows
-
-    Revision 1.6  2001/01/30 14:27:47  oj
-    new member which holds the column names
-
-    Revision 1.5  2001/01/24 09:50:49  oj
-    #82628# rowset modifications
-
-    Revision 1.4  2001/01/22 07:38:23  oj
-    #82632# change member
-
-    Revision 1.3  2000/10/17 10:18:12  oj
-    some changes for the rowset
-
-    Revision 1.2  2000/10/11 11:18:10  fs
-    replace unotools with comphelper
-
-    Revision 1.1.1.1  2000/09/19 00:15:38  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:46  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:19:40  oj
-    rowset addons
-
-    Revision 1.0 01.08.2000 09:07:41  oj
-------------------------------------------------------------------------*/
 
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index b6332a08c2f2..ea71317781d3 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSet.cxx,v $
  *
- *  $Revision: 1.117 $
+ *  $Revision: 1.118 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 15:49:46 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -682,7 +682,8 @@ void ORowSet::freeResources()
         m_bNew          = sal_False;
         m_bModified     = sal_False;
         m_nRowCount     = 0;
-        m_aOldRow       = NULL;
+        if ( m_aOldRow.isValid() )
+            m_aOldRow->clearRow();
     }
 }
 
@@ -1051,7 +1052,7 @@ void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException)
             m_pCache->updateRow(m_aCurrentRow.operator ->());
             m_aBookmark     = m_pCache->getBookmark();
             m_aCurrentRow   = m_pCache->m_aMatrixIter;
-            m_aOldRow       = (*m_aCurrentRow);
+            m_aOldRow->setRow(*m_aCurrentRow);
 
             // notification order
             // - column values
@@ -1450,15 +1451,11 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl
 
     ResettableMutexGuard aGuard( m_aMutex );
 
-    // create and fill a composer
-    Reference<XSQLQueryComposer>  xComposer = getCurrentSettingsComposer(this, m_xServiceManager);
-
-    // we have to set this here again because getCurrentSettingsComposer can force a setpropertyvalue
-
-    // OJ: why? When the ActiveConnection is set again, m_bOwnConnection should be true
-    //  m_bOwnConnection = sal_True;
     try
     {
+        // create and fill a composer
+        Reference<XSQLQueryComposer>  xComposer = getCurrentSettingsComposer(this, m_xServiceManager);
+
         freeResources();
 
         // calc the connection to be used
@@ -1594,6 +1591,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     m_pCache = new ORowSetCache(xRs,m_xComposer,m_xServiceManager,m_aParameterRow,aComposedTableName,m_bModified,m_bNew);
                     m_pCache->setMaxRowSize(m_nFetchSize);
                     m_aCurrentRow   = m_pCache->createIterator();
+                    m_aOldRow = m_pCache->registerOldRow();
                     // now we can clear the parameter row
                     m_aParameterRow.clear();
 
@@ -1896,7 +1894,7 @@ Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows
                 notifyClonesRowDeleted(*pBegin);
                 if(compareBookmarks( m_aBookmark,*pBegin) == 0)
                 {
-                    m_aOldRow       = NULL;
+                    m_aOldRow->clearRow();
                     m_aCurrentRow   = m_pCache->getEnd();
                     m_aBookmark     = Any();
                     m_aCurrentRow.setBookmark(m_aBookmark);
@@ -2415,6 +2413,8 @@ ORowSetClone::ORowSetClone(ORowSet& rParent,::osl::Mutex* _pMutex)
     m_aCurrentRow           = m_pCache->createIterator();
     m_xNumberFormatTypes    = rParent.m_xNumberFormatTypes;
 
+    m_aOldRow = m_pCache->registerOldRow();
+
     ::vos::ORef< ::connectivity::OSQLColumns> aColumns = new ::connectivity::OSQLColumns();
     ::std::vector< ::rtl::OUString> aNames;
 
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 47d1df9ef92a..fb2f774c6d2d 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSet.hxx,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-05 14:10:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -471,111 +471,4 @@ namespace dbaccess
 
 }
 #endif // DBACCESS_CORE_API_ROWSET_HXX
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.32  2002/12/05 09:53:00  fs
-    #105390# #i8481# defined order of notifications for operations on a RowSet
-
-    Revision 1.31  2002/08/13 11:13:00  oj
-    #98095# clear mutex before calling our listeners
-
-    Revision 1.30  2002/07/11 07:02:26  oj
-    #100984# cancel insert after refreshRow
-
-    Revision 1.29  2001/11/15 10:42:42  oj
-    #94384# change &m_rMutex in m_pMutex to avoid illegal member access
-
-    Revision 1.28  2001/11/01 15:27:20  hr
-    #92924#: gcc-3.0.1 needs lvalue, exception specifications
-
-    Revision 1.27  2001/08/24 06:25:57  oj
-    #90015# code corrcetions for some speedup's
-
-    Revision 1.26  2001/08/06 11:01:19  fs
-    #87960# moved the listers from the base class herein / call the listers in :disposing()
-
-    Revision 1.25  2001/07/30 08:53:02  oj
-    #90015# use ORowSetValue as const ref
-
-    Revision 1.24  2001/07/24 13:25:25  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.23  2001/06/26 10:12:40  oj
-    #87808# setObject corrected and some more
-
-    Revision 1.22  2001/05/07 11:11:15  oj
-    #86483# set columns only null
-
-    Revision 1.21  2001/04/12 09:32:26  fs
-    #84852# make ActiveConnection a bound property
-
-    Revision 1.20  2001/04/06 11:23:52  oj
-    #85809# getStatement now returns null
-
-    Revision 1.19  2001/04/06 10:19:13  oj
-    no correct handling of approve listener
-
-    Revision 1.18  2001/04/05 07:51:27  oj
-    #85735# insert more exceptions when using in wrong order
-
-    Revision 1.17  2001/02/23 15:22:32  oj
-    import export changes
-
-    Revision 1.16  2001/01/26 15:00:05  oj
-    dispose connection when it's our
-
-    Revision 1.15  2001/01/24 09:50:49  oj
-    #82628# rowset modifications
-
-    Revision 1.14  2001/01/22 07:38:23  oj
-    #82632# change member
-
-    Revision 1.13  2001/01/09 12:29:09  oj
-    two new properties
-
-    Revision 1.12  2000/12/06 09:52:12  oj
-    #80219# correted deleterow(s) and remeber position
-
-    Revision 1.11  2000/12/01 14:16:46  oj
-    #81017# use of xinteractionhandler
-
-    Revision 1.10  2000/11/22 14:56:33  oj
-    #80276# resolve some trouble with positioning
-
-    Revision 1.9  2000/11/15 15:57:40  oj
-    change for rowset
-
-    Revision 1.8  2000/11/03 14:40:45  oj
-    some problems with refcount resolved
-
-    Revision 1.7  2000/10/31 15:21:51  fs
-    added XCompletedExecution interface & implementation
-
-    Revision 1.6  2000/10/30 09:24:02  oj
-    use tablecontainer if no tablesupplier is supported
-
-    Revision 1.5  2000/10/17 12:24:43  oj
-    remove some header
-
-    Revision 1.4  2000/10/17 10:18:12  oj
-    some changes for the rowset
-
-    Revision 1.3  2000/10/11 11:18:11  fs
-    replace unotools with comphelper
-
-    Revision 1.2  2000/09/29 15:20:51  oj
-    rowset impl
-
-    Revision 1.1.1.1  2000/09/19 00:15:38  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:46  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:19:29  oj
-    rowset addons
-
-    Revision 1.0 25.07.2000 13:24:59  oj
-------------------------------------------------------------------------*/
 
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 5beef1257b77..4f191cd7f4ac 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetBase.cxx,v $
  *
- *  $Revision: 1.65 $
+ *  $Revision: 1.66 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 13:03:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -228,12 +228,14 @@ void SAL_CALL ORowSetBase::disposing(void)
 {
     MutexGuard aGuard(*m_pMutex);
 
-    if(m_pColumns)
+    if ( m_pColumns )
     {
         TDataColumns().swap(m_aDataColumns);
         m_pColumns->disposing();
     }
-    m_pCache            = NULL;
+    if ( m_pCache )
+        m_pCache->deregisterOldRow(m_aOldRow);
+    m_pCache = NULL;
 }
 // -------------------------------------------------------------------------
 // comphelper::OPropertyArrayUsageHelper
@@ -263,7 +265,7 @@ const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
-    OSL_ENSURE(!(m_bBeforeFirst || m_bAfterLast),"Illegal call here!");
+    OSL_ENSURE(!(m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
 
     if ( m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid() )
     {
@@ -462,9 +464,7 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         bRet = m_pCache->moveToBookmark(bookmark);
         if(bRet)
@@ -505,9 +505,7 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         bRet = m_pCache->moveRelativeToBookmark(bookmark,rows);
         if(bRet)
@@ -609,15 +607,13 @@ sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException)
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         if ( m_aBookmark.hasValue() ) // #104474# OJ
             positionCache();
         bRet = m_pCache->next();
 
-        if(bRet || (!m_bBeforeFirst && !m_bAfterLast))
+        if ( bRet )
         {
             // notification order
             // - column values
@@ -716,9 +712,7 @@ void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException)
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         if(!m_bBeforeFirst)
         {
@@ -741,7 +735,7 @@ void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException)
         aNotifier.fire();
 
         // to be done _after_ the notifications!
-        m_aOldRow       = NULL;
+        m_aOldRow->clearRow();
     }
 }
 // -------------------------------------------------------------------------
@@ -762,9 +756,7 @@ void SAL_CALL ORowSetBase::afterLast(  ) throw(SQLException, RuntimeException)
 
         if(!m_bAfterLast)
         {
-            ORowSetRow aOldValues;
-            if(!bWasNew && m_aOldRow.isValid())
-                aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+            ORowSetRow aOldValues = getOldRow(bWasNew);
 
             m_pCache->afterLast();
 
@@ -799,9 +791,7 @@ sal_Bool SAL_CALL ORowSetBase::move(    ::std::mem_fun_t<sal_Bool,ORowSetBase>&
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         sal_Bool bMoved = ( bWasNew || !_aCheckFunctor(this) );
 
@@ -891,9 +881,7 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         bRet = m_pCache->absolute(row);
 
@@ -941,9 +929,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         if ( m_aBookmark.hasValue() ) // #104474# OJ
             positionCache();
@@ -988,9 +974,7 @@ sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException
         ORowSetNotifier aNotifier( this );
             // this will call cancelRowModification on the cache if necessary
 
-        ORowSetRow aOldValues;
-        if(!bWasNew && m_aOldRow.isValid())
-            aOldValues = new ORowSetValueVector( m_aOldRow.getBody());   // remember the old values
+        ORowSetRow aOldValues = getOldRow(bWasNew);
 
         if ( m_aBookmark.hasValue() ) // #104474# OJ
             positionCache();
@@ -1038,7 +1022,7 @@ void ORowSetBase::setCurrentRow(sal_Bool _bMoved,const ORowSetRow& _rOldValues,:
     }
     else
     {
-        m_aOldRow       = NULL;
+        m_aOldRow->clearRow();
         m_aCurrentRow   = m_pCache->getEnd();
         m_aBookmark     = Any();
         m_aCurrentRow.setBookmark(m_aBookmark);
@@ -1062,7 +1046,7 @@ void ORowSetBase::setCurrentRow(sal_Bool _bMoved,const ORowSetRow& _rOldValues,:
 
     // TODO: can this be done before the notifications?
     if(!(m_bBeforeFirst || m_bAfterLast) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd())
-        m_aOldRow       = (*m_aCurrentRow);
+        m_aOldRow->setRow(*m_aCurrentRow);
 
     if ( _bMoved )
         // - cursorMoved
@@ -1196,7 +1180,7 @@ void ORowSetBase::checkCache()
 // -----------------------------------------------------------------------------
 void ORowSetBase::movementFailed()
 {
-    m_aOldRow       = NULL;
+    m_aOldRow->clearRow();
     m_aCurrentRow   = m_pCache->getEnd();
     m_bBeforeFirst  = m_pCache->isBeforeFirst();
     m_bAfterLast    = m_pCache->isAfterLast();
@@ -1205,7 +1189,14 @@ void ORowSetBase::movementFailed()
     OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!");
 }
 // -----------------------------------------------------------------------------
-
+ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
+{
+    OSL_ENSURE(m_aOldRow.isValid(),"RowSetRowHElper isn't valid!");
+    ORowSetRow aOldValues;
+    if ( !_bWasNew && m_aOldRow->getRow().isValid() )
+        aOldValues = new ORowSetValueVector( m_aOldRow->getRow().getBody());     // remember the old values
+    return aOldValues;
+}
 // =============================================================================
 // -----------------------------------------------------------------------------
 ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 75e6c1d1b701..353d1b08a22e 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetBase.hxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-05 14:10:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -163,7 +163,7 @@ namespace dbaccess
 
         ::com::sun::star::uno::Any              m_aBookmark;
         ORowSetCacheIterator                    m_aCurrentRow;      // contains the actual fetched row
-        ORowSetRow                              m_aOldRow;
+        TORowSetOldRowHelperRef                 m_aOldRow;
         TDataColumns                            m_aDataColumns;     // holds the columns as m_pColumns but know the implementation class
         connectivity::ORowSetValue              m_aEmptyValue;      // only for error case
 
@@ -229,6 +229,7 @@ namespace dbaccess
         // m_aOldRow to NULL
         void movementFailed();
 
+        ORowSetRow getOldRow(sal_Bool _bWasNew);
         /** move the cache the postion defined by the member functor
             @param  _aCheckFunctor
                 Return <TRUE/> when we already stand on the row we want to.
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 0c6b5deb9538..e4ded4a2e22b 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetCache.cxx,v $
  *
- *  $Revision: 1.62 $
+ *  $Revision: 1.63 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-11 14:14:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -142,7 +142,7 @@ using namespace ::osl;
 ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
                            const Reference< XSQLQueryComposer >& _xComposer,
                            const Reference< XMultiServiceFactory >& _xServiceFactory,
-                           const connectivity::ORowVector< ORowSetValue >&  _rParameterRow,
+                           const ORowSetValueVector&    _rParameterRow,
                            const ::rtl::OUString& _rUpdateTableName,
                            sal_Bool&    _bModified,
                            sal_Bool&    _bNew)
@@ -350,7 +350,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
             catch(const SQLException&)
             {
                 // we couldn't create a keyset here so we have to create a static cache
-                if(m_pCacheSet)
+                if ( m_pCacheSet )
                     delete m_pCacheSet;
                 m_pCacheSet = new OStaticSet();
                 m_pCacheSet->construct(_xRs);
@@ -876,7 +876,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
         if(bCheck)
         {
             if(!aIter->isValid())
-                *aIter = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
+                *aIter = new ORowSetValueVector(m_xMetaData->getColumnCount());
             m_pCacheSet->fillValueRow(*aIter,i);
         }
         else
@@ -902,7 +902,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
                     if(bCheck)
                     {
                         if(!aIter->isValid())
-                            *aIter = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
+                            *aIter = new ORowSetValueVector(m_xMetaData->getColumnCount());
                         m_pCacheSet->fillValueRow(*aIter,nPos++);
                     }
                     bCheck = m_pCacheSet->next();
@@ -941,12 +941,12 @@ sal_Bool ORowSetCache::moveWindow()
     //  sal_Int32 nNewEndPos    = (m_nPosition+m_nFetchSize*0.5);
     sal_Int32 nNewEndPos    = nNewStartPos + m_nFetchSize;
 
-    if(m_nPosition <= m_nStartPos)
+    if ( m_nPosition <= m_nStartPos )
     {   // the window is behind the new start pos
         if(!m_nStartPos)
             return sal_False;
         // the new position should be the nPos - nFetchSize/2
-        if(nNewEndPos > m_nStartPos)
+        if ( nNewEndPos > m_nStartPos )
         {   // but the two regions are overlapping
             // fill the rows behind the new end
 
@@ -954,7 +954,7 @@ sal_Bool ORowSetCache::moveWindow()
             ORowSetMatrix::iterator aIter; // the iterator we fill with new values
 
             sal_Bool bCheck = sal_True;
-            if(nNewStartPos < 1)
+            if ( nNewStartPos < 1 )
             {
                 bCheck = m_pCacheSet->first();
                 //  aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5);
@@ -972,17 +972,11 @@ sal_Bool ORowSetCache::moveWindow()
                 m_nStartPos = nNewStartPos -1;
             }
 
-            if(bCheck)
+            if ( bCheck )
             {
-                sal_Int32 nPos = m_nStartPos+1;
-                for(; aIter != m_pMatrix->end() && bCheck;)
-                {
-                    if(!aIter->isValid())
-                        *aIter = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
-                    m_pCacheSet->fillValueRow(*aIter++,nPos++);
-                    bCheck = m_pCacheSet->next();
+                sal_Int32 nPos = m_nStartPos;
+                bCheck = fill(aIter,m_pMatrix->end(),nPos,bCheck);
 
-                }
                 ::std::rotate(m_pMatrix->begin(),aEnd,m_pMatrix->end());
                 // now correct the iterator in our iterator vector
                 //  rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment
@@ -1036,7 +1030,7 @@ sal_Bool ORowSetCache::moveWindow()
                     if(bCheck = m_pCacheSet->next())
                     {
                         if(!aIter->isValid())
-                            *aIter = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
+                            *aIter = new ORowSetValueVector(m_xMetaData->getColumnCount());
                         m_pCacheSet->fillValueRow(*aIter,i+1);
                     }
                     else
@@ -1045,12 +1039,7 @@ sal_Bool ORowSetCache::moveWindow()
                 }
             }
             else
-            {
-                sal_Int32 nNewSt = nNewStartPos;
-                bRet = fillMatrix(nNewSt,nNewEndPos);
-                m_nStartPos = nNewSt - 1;
-                rotateCacheIterator(m_nFetchSize+1); // forces that every iterator will be set to null
-            }
+                bRet = reFillMatrix(nNewStartPos,nNewEndPos);
         }
     }
     else if(m_nPosition > m_nStartPos)
@@ -1065,7 +1054,7 @@ sal_Bool ORowSetCache::moveWindow()
                 sal_Bool bOk;
                 if(bOk = m_pCacheSet->absolute(m_nPosition))
                 {
-                    *m_aMatrixIter = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
+                    *m_aMatrixIter = new ORowSetValueVector(m_xMetaData->getColumnCount());
                     m_pCacheSet->fillValueRow(*m_aMatrixIter,m_nPosition);
                     // we have to read one row forward to enshure that we know when we are on last row
                     // but only when we don't know it already
@@ -1090,17 +1079,11 @@ sal_Bool ORowSetCache::moveWindow()
             ORowSetMatrix::iterator aIter = m_pMatrix->begin();
             OSL_ENSURE((nNewStartPos - m_nStartPos - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
             ORowSetMatrix::iterator aEnd  = m_pMatrix->begin() + nNewStartPos - m_nStartPos - 1;
-            sal_Bool bCheck = m_pCacheSet->absolute(m_nStartPos+m_nFetchSize);
-            sal_Int32 nPos = m_nStartPos+m_nFetchSize;
-            for(; bCheck && aIter != aEnd;)
-            {
-                if(bCheck = m_pCacheSet->next()) // resultset stands on right position
-                {
-                    if(!aIter->isValid())
-                        *aIter = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
-                    m_pCacheSet->fillValueRow(*aIter++,++nPos);
-                }
-            }
+
+            sal_Int32 nPos = m_nStartPos + m_nFetchSize + 1;
+            sal_Bool bCheck = m_pCacheSet->absolute(nPos);
+            bCheck = fill(aIter,m_pMatrix->end(),nPos,bCheck);
+
             // we know that this is the current maximal rowcount here
             if(!m_bRowCountFinal)
                 m_nRowCount = std::max(nPos,m_nRowCount);
@@ -1156,19 +1139,14 @@ sal_Bool ORowSetCache::moveWindow()
                 {
                     if(bCheck = m_pCacheSet->next()) // resultset stands on right position
                     {
-                        *aIter = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
+                        *aIter = new ORowSetValueVector(m_xMetaData->getColumnCount());
                         m_pCacheSet->fillValueRow(*aIter,++nPos);
                     }
                 }
             }
         }
         else // no rows can be reused so fill again
-        {
-            sal_Int32 nNewSt = nNewStartPos;
-            bRet = fillMatrix(nNewSt,nNewEndPos);
-            m_nStartPos = nNewSt - 1;
-            rotateCacheIterator(m_nFetchSize+1); // forces that every iterator will be set to null
-        }
+            bRet = reFillMatrix(nNewStartPos,nNewEndPos);
     }
 
     if(!m_bRowCountFinal)
@@ -1547,10 +1525,10 @@ void ORowSetCache::moveToInsertRow(  )
 
     m_aInsertRow = m_pInsertMatrix->begin();
     if(!m_aInsertRow->isValid())
-        *m_aInsertRow = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
+        *m_aInsertRow = new ORowSetValueVector(m_xMetaData->getColumnCount());
 
     // we don't unbound the bookmark column
-    connectivity::ORowVector< ORowSetValue >::iterator aIter = (*m_aInsertRow)->begin()+1;
+    ORowSetValueVector::iterator aIter = (*m_aInsertRow)->begin()+1;
     for(;aIter != (*m_aInsertRow)->end();++aIter)
     {
         aIter->setBound(sal_False);
@@ -1658,11 +1636,11 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo
 {
     m_aInsertRow = m_pInsertMatrix->begin();
     if(!m_aInsertRow->isValid())
-        *m_aInsertRow = new connectivity::ORowVector< ORowSetValue >(m_xMetaData->getColumnCount());
+        *m_aInsertRow = new ORowSetValueVector(m_xMetaData->getColumnCount());
 
     (*(*m_aInsertRow)) = (*(*_rOriginalRow));
     // we don't unbound the bookmark column
-    connectivity::ORowVector< ORowSetValue >::iterator aIter = (*m_aInsertRow)->begin();
+    ORowSetValueVector::iterator aIter = (*m_aInsertRow)->begin();
     for(;aIter != (*m_aInsertRow)->end();++aIter)
         aIter->setModified(sal_False);
 }
@@ -1744,7 +1722,7 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection,
 void ORowSetCache::clearInsertRow()
 {
     // we don't unbound the bookmark column
-    connectivity::ORowVector< ORowSetValue >::iterator aIter = (*m_aInsertRow)->begin()+1;
+    ORowSetValueVector::iterator aIter = (*m_aInsertRow)->begin()+1;
     for(;aIter != (*m_aInsertRow)->end();++aIter)
     {
         aIter->setBound(sal_False);
@@ -1760,3 +1738,59 @@ ORowSetMatrix::iterator ORowSetCache::calcPosition() const
     return (nValue < 0) ? m_pMatrix->end() : (m_pMatrix->begin() + nValue);
 }
 // -----------------------------------------------------------------------------
+
+TORowSetOldRowHelperRef ORowSetCache::registerOldRow()
+{
+    TORowSetOldRowHelperRef pRef = new ORowSetOldRowHelper(ORowSetRow());
+    m_aOldRows.push_back(pRef);
+    return pRef;
+}
+// -----------------------------------------------------------------------------
+void ORowSetCache::deregisterOldRow(const TORowSetOldRowHelperRef& _rRow)
+{
+    for (TOldRowSetRows::iterator aOldRowIter = m_aOldRows.begin(); aOldRowIter != m_aOldRows.end(); ++aOldRowIter)
+    {
+        if ( aOldRowIter->getBodyPtr() == _rRow.getBodyPtr() )
+        {
+            m_aOldRows.erase(aOldRowIter);
+            break;
+        }
+
+    }
+}
+// -----------------------------------------------------------------------------
+sal_Bool ORowSetCache::reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos)
+{
+    for (TOldRowSetRows::iterator aOldRowIter = m_aOldRows.begin(); aOldRowIter != m_aOldRows.end(); ++aOldRowIter)
+    {
+        if ( aOldRowIter->isValid() && aOldRowIter->getBody().getRow().isValid() )
+            aOldRowIter->getBody().setRow(new ORowSetValueVector(aOldRowIter->getBody().getRow().getBody()) );
+    }
+    sal_Int32 nNewSt = _nNewStartPos;
+    sal_Bool bRet = fillMatrix(nNewSt,_nNewEndPos);
+    m_nStartPos = nNewSt - 1;
+    rotateCacheIterator(m_nFetchSize+1); // forces that every iterator will be set to null
+    return bRet;
+}
+// -----------------------------------------------------------------------------
+sal_Bool ORowSetCache::fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix::iterator& _aEnd,sal_Int32& _nPos,sal_Bool _bCheck)
+{
+    sal_Int32 nColumnCount = m_xMetaData->getColumnCount();
+    for(; _bCheck && _aIter != _aEnd;)
+    {
+        if ( !_aIter->isValid() )
+            *_aIter = new ORowSetValueVector(nColumnCount);
+        else
+        {
+            for (TOldRowSetRows::iterator aOldRowIter = m_aOldRows.begin(); aOldRowIter != m_aOldRows.end(); ++aOldRowIter)
+            {
+                if ( aOldRowIter->getBody().getRow().isEqualBody(*_aIter) )
+                    *_aIter = new ORowSetValueVector(nColumnCount);
+            }
+        }
+        m_pCacheSet->fillValueRow(*_aIter++,++_nPos);
+        _bCheck = m_pCacheSet->next();
+    }
+    return _bCheck;
+}
+// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index f5ae01e5c14c..f7a3fd9cfbca 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetCache.hxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 12:50:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,6 +153,8 @@ namespace dbaccess
         friend class ORowSetClone;
         friend class ORowSetCacheIterator;
 
+        typedef ::std::vector< TORowSetOldRowHelperRef >    TOldRowSetRows;
+
         ::osl::Mutex            m_aRowCountMutex, // mutex for rowcount changes
                                 // we need a extra mutex for columns to prevend deadlock when setting new values
                                 // for a row
@@ -168,6 +170,7 @@ namespace dbaccess
         ORowSetMatrix::iterator         m_aMatrixIter;          // represent a row of the table
         ORowSetMatrix::iterator         m_aMatrixEnd;           // present the row behind the last row of the table
         ORowSetCacheMap                 m_aCacheIterators;
+        TOldRowSetRows                  m_aOldRows;
 
         ORowSetMatrix*                  m_pInsertMatrix;        // represent the rows which should be inserted normally this is only one
         ORowSetMatrix::iterator         m_aInsertRow;           // represent a insert row
@@ -194,6 +197,8 @@ namespace dbaccess
         sal_Bool&                   m_bModified ;           // points to the rowset member m_bModified
         sal_Bool&                   m_bNew ;                // points to the rowset member m_bNew
 
+        sal_Bool fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix::iterator& _aEnd,sal_Int32& _nPos,sal_Bool _bCheck);
+        sal_Bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos);
         sal_Bool fillMatrix(sal_Int32 &_nNewStartPos,sal_Int32 _nNewEndPos);
         sal_Bool moveWindow();
 
@@ -212,6 +217,7 @@ namespace dbaccess
         // clears the insert row
         void                    clearInsertRow();
         ORowSetMatrix::iterator calcPosition() const;
+
     protected:
         ORowSetMatrix::iterator& getIterator() { return m_aMatrixIter;}
         ORowSetMatrix::iterator& getEnd() { return m_aMatrixEnd;}
@@ -234,6 +240,10 @@ namespace dbaccess
         // sets the size of the matrix
         void setMaxRowSize(sal_Int32 _nSize);
 
+        TORowSetOldRowHelperRef registerOldRow();
+        void deregisterOldRow(const TORowSetOldRowHelperRef& _rRow);
+
+
     // OComponentHelper
         void disposing(void);
 
@@ -331,66 +341,4 @@ namespace dbaccess
     };
 }
 #endif
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.18  2002/12/05 14:10:10  oj
-    #106008# copy row content instead of remember ref
-
-    Revision 1.17  2002/12/05 09:54:54  fs
-    #105390# #i8481# cancelInsert renamed to cancelRowModification
-
-    Revision 1.16  2001/11/29 16:35:26  oj
-    #95225# changes for bookmarkable resultset
-
-    Revision 1.15  2001/08/24 06:25:57  oj
-    #90015# code corrcetions for some speedup's
-
-    Revision 1.14  2001/08/09 13:12:51  oj
-    #90801# clear insertrow after insert
-
-    Revision 1.13  2001/07/24 13:25:25  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.12  2001/07/19 09:29:22  oj
-    #86186# check parsetree for joins
-
-    Revision 1.11  2001/07/12 07:56:32  oj
-    #89437# positioning cache when standing on a row outside the cache
-
-    Revision 1.9  2001/06/26 10:30:55  oj
-    #87808# setObject corrected and some more
-
-    Revision 1.8  2001/06/26 09:32:05  fs
-    #88392# added columnModified for diagnostics
-
-    Revision 1.7  2001/02/01 14:23:57  oj
-    change for insert , delete and update rows
-
-    Revision 1.6  2001/01/22 07:38:24  oj
-    #82632# change member
-
-    Revision 1.5  2000/10/17 10:18:12  oj
-    some changes for the rowset
-
-    Revision 1.4  2000/10/11 11:18:11  fs
-    replace unotools with comphelper
-
-    Revision 1.3  2000/10/05 09:33:39  fs
-    using comphelper::OPropertyContainer instead of connectivity::OSimplePropertyContainer
-
-    Revision 1.2  2000/09/29 15:20:51  oj
-    rowset impl
-
-    Revision 1.1.1.1  2000/09/19 00:15:38  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:47  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:20:59  oj
-    rowset addons
-
-    Revision 1.0 25.07.2000 16:37:44  oj
-------------------------------------------------------------------------*/
 
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index f0d0a2f18876..746071e97285 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetRow.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-05 14:10:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,40 @@ namespace dbaccess
     typedef ::vos::ORef< ORowSetValueVector >                       ORowSetRow;
     typedef ::std::vector< ORowSetRow >                             ORowSetMatrix;
 
+    class ORowSetOldRowHelper
+    {
+        oslInterlockedCount         m_refCount;
+        ORowSetRow                  m_aRow;
+
+        ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH);
+        ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh);
+    public:
+        ORowSetOldRowHelper() : m_refCount(0){}
+        ORowSetOldRowHelper(const ORowSetRow& _rRow)
+            : m_refCount(0)
+            , m_aRow(_rRow)
+        {}
+//      ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh)
+//          : m_refCount(0)
+//          , m_aRow(_rRh.m_aRow)
+//      {}
+
+        void acquire()
+        {
+            osl_incrementInterlockedCount( &m_refCount );
+        }
+        void release()
+        {
+            if (! osl_decrementInterlockedCount( &m_refCount ))
+                delete this;
+        }
+        inline ORowSetRow getRow() const { return m_aRow; }
+        inline void clearRow() { m_aRow = NULL; }
+        inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
+    };
+
+    typedef ::vos::ORef< ORowSetOldRowHelper >  TORowSetOldRowHelperRef;
+
     class ORowSetValueCompare
     {
         const ::com::sun::star::uno::Any& m_rAny;
@@ -106,27 +140,4 @@ namespace dbaccess
     };
 }
 #endif // DBACCESS_CORE_API_ROWSETROW_HXX
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2001/07/24 13:25:25  oj
-    #89430# move ORowSetValue into dbtools
-
-    Revision 1.3  2001/05/18 11:48:25  oj
-    #86528# size changes
-
-    Revision 1.2  2000/10/11 11:18:11  fs
-    replace unotools with comphelper
-
-    Revision 1.1.1.1  2000/09/19 00:15:38  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:47  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:24:38  oj
-    rowset addon
-
-    Revision 1.0 27.07.2000 13:23:15  oj
-------------------------------------------------------------------------*/
 
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 98ca1f94ed10..5b6f9ff1e9ea 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: StaticSet.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-24 13:25:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -383,45 +383,3 @@ void SAL_CALL OStaticSet::moveToCurrentRow(  ) throw(SQLException, RuntimeExcept
 }
 // -------------------------------------------------------------------------
 
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.10  2001/05/21 11:24:49  oj
-    #87082# check if type need literals
-
-    Revision 1.9  2001/05/18 12:02:50  oj
-    #86528# size changes
-
-    Revision 1.8  2001/01/24 09:50:49  oj
-    #82628# rowset modifications
-
-    Revision 1.7  2001/01/22 07:38:24  oj
-    #82632# change member
-
-    Revision 1.6  2000/11/29 10:23:32  oj
-    #80219# wrong use of keys
-
-    Revision 1.5  2000/11/15 15:57:40  oj
-    change for rowset
-
-    Revision 1.4  2000/11/14 13:28:20  oj
-    change for rowset when getRow returns 0
-
-    Revision 1.3  2000/10/25 07:30:24  oj
-    make strings unique for lib's
-
-    Revision 1.2  2000/10/11 11:18:11  fs
-    replace unotools with comphelper
-
-    Revision 1.1.1.1  2000/09/19 00:15:38  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:47  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:24:08  oj
-    rowset addon
-
-    Revision 1.0 01.08.2000 09:05:11  oj
-------------------------------------------------------------------------*/
-
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 96ea3c644671..c00da3a2d26f 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: StaticSet.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-30 14:22:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:51:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,30 +124,4 @@ namespace dbaccess
     };
 }
 #endif //DBACCESS_CORE_API_STATICSET_HXX
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2001/01/24 09:50:49  oj
-    #82628# rowset modifications
-
-    Revision 1.4  2000/11/14 13:28:20  oj
-    change for rowset when getRow returns 0
-
-    Revision 1.3  2000/10/17 10:19:03  oj
-    some changes for the rowset
-
-    Revision 1.2  2000/10/11 11:18:11  fs
-    replace unotools with comphelper
-
-    Revision 1.1.1.1  2000/09/19 00:15:38  hr
-    initial import
-
-    Revision 1.2  2000/09/18 14:52:47  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.1  2000/09/01 15:24:02  oj
-    rowset addon
-
-    Revision 1.0 01.08.2000 08:58:17  oj
-------------------------------------------------------------------------*/
 
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index 3ff7a0dc0179..8966b1fbecea 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: datasettings.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: fs $ $Date: 2002-03-04 11:53:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,6 +68,9 @@
 #ifndef DBACCESS_SHARED_DBASTRINGS_HRC
 #include "dbastrings.hrc"
 #endif
+#ifndef _DBA_CORE_PROPERTYHELPER_HXX_
+#include "propertyhelper.hxx"
+#endif
 #ifndef _UNOTOOLS_CONFIGNODE_HXX_
 #include <unotools/confignode.hxx>
 #endif
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 16feba48133d..58588bcf8cb6 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: commanddefinition.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: fs $ $Date: 2001-12-06 08:40:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -178,32 +178,6 @@ OCommandDefinition::OCommandDefinition(const Reference< XInterface >& _rxContain
 }
 
 //--------------------------------------------------------------------------
-Sequence< Type > SAL_CALL OCommandDefinition::getTypes() throw (RuntimeException)
-{
-    return concatSequences(
-        OCommandDefinition_Base::getTypes(),
-        OPropertyContainer::getTypes(),
-        OConfigurationFlushable::getTypes()
-    );
-}
-
-//--------------------------------------------------------------------------
-Sequence< sal_Int8 > SAL_CALL OCommandDefinition::getImplementationId() throw (RuntimeException)
-{
-    static ::cppu::OImplementationId* pId = 0;
-    if ( !pId )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if ( !pId )
-        {
-            static ::cppu::OImplementationId aId;
-            pId = &aId;
-        }
-    }
-    return pId->getImplementationId();
-}
-
-//--------------------------------------------------------------------------
 Any SAL_CALL OCommandDefinition::queryInterface( const Type& _rType ) throw(RuntimeException)
 {
     Any aReturn = OCommandDefinition_Base::queryInterface(_rType);
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index 2d525ee38139..055dcb410b35 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: commanddefinition.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: fs $ $Date: 2001-12-06 08:40:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,10 +110,11 @@ namespace dbaccess
 //= OCommandDefinition - a database "document" which describes a query
 //=========================================================================
 
-typedef ::cppu::WeakImplHelper3 <   ::com::sun::star::lang::XUnoTunnel
-                                ,   ::com::sun::star::lang::XServiceInfo
-                                ,   ::com::sun::star::sdbcx::XRename
-                                >   OCommandDefinition_Base;
+typedef ::cppu::WeakImplHelper3<
+                    ::com::sun::star::lang::XUnoTunnel,
+                    ::com::sun::star::lang::XServiceInfo,
+                    ::com::sun::star::sdbcx::XRename
+                    > OCommandDefinition_Base;
 
 class OCommandDefinition    :public OCommandDefinition_Base
                             ,public OCommandBase
@@ -151,10 +152,6 @@ public:
             const ::utl::OConfigurationTreeRoot& _rConfigRoot
         );
 
-// com::sun::star::lang::XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
 // ::com::sun::star::uno::XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire(  ) throw() { OCommandDefinition_Base::acquire(); }
diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx
index c544b99323ef..f8dc6b6aeaf1 100644
--- a/dbaccess/source/core/inc/RefreshListener.hxx
+++ b/dbaccess/source/core/inc/RefreshListener.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RefreshListener.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-21 10:32:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,8 +91,3 @@ namespace dbaccess
 
 #endif // DBA_CORE_REFRESHLISTENER_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- ************************************************************************/
-
diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx
index 35a200f20748..8dfb7b87680a 100644
--- a/dbaccess/source/core/inc/sdbcoretools.hxx
+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdbcoretools.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-30 07:55:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,10 +88,3 @@ namespace dbaccess
 
 #endif // DBACORE_SDBCORETOOLS_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 29.08.01 16:40:32  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/core/inc/warnings.hxx b/dbaccess/source/core/inc/warnings.hxx
index abad5095b6e8..066ba23fdcf3 100644
--- a/dbaccess/source/core/inc/warnings.hxx
+++ b/dbaccess/source/core/inc/warnings.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: warnings.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-28 16:26:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,10 +89,3 @@ namespace dbaccess
 
 #endif // DBA_CORE_WARNINGS_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 24.08.01 14:15:27  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/core/misc/makefile.mk b/dbaccess/source/core/misc/makefile.mk
index b24da05e4357..8e228b54bd9b 100644
--- a/dbaccess/source/core/misc/makefile.mk
+++ b/dbaccess/source/core/misc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: fs $ $Date: 2002-03-04 11:53:41 $
+#   last change: $Author: hr $ $Date: 2003-03-19 17:52:07 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -77,6 +77,7 @@ SLOFILES=	\
         $(SLO)$/sdbcoretools.obj				\
         $(SLO)$/commandbase.obj				\
         $(SLO)$/configurationflushable.obj	\
+        $(SLO)$/propertyhelper.obj			\
         $(SLO)$/services.obj				\
         $(SLO)$/userinformation.obj
 
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 853d5e54b162..ffb7875fddec 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdbcoretools.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-30 08:02:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,10 +123,3 @@ namespace dbaccess
 }   // namespace dbaccess
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 29.08.01 16:59:09  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 3e2421dc8c11..0922e0bb01b7 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: services.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-30 08:01:47 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,7 @@
 
 /********************************************************************************************/
 
+using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src
index e75e52394cf9..180ee17fd56c 100644
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: strings.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: kz $ $Date: 2002-09-05 18:51:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,20 +71,21 @@ String RID_STR_TRIED_OPEN_TABLE
     Text[ greek ] = "������������ �� ������� ��� ������ $name$.";
     Text[ dutch ] = "Er is getracht tabel $name$ te openen.";
     Text[ french ] = "Une tentative d'ouverture de la table $name$ a eu lieu.";
-    Text[ spanish ] = "Se intent� abrir la tabla $name$";
+    Text[ spanish ] = "Intento de apertura de la tabla $name$";
     Text[ italian ] = "Tentativo di aprire la tabella $name$";
     Text[ danish ] = "Det blev fors�gt at �bne tabellen $name$.";
     Text[ swedish ] = "F�rs�k gjordes att �ppna tabellen $name$";
     Text[ polish ] = "Pr�bowano otworzy� tabel� $name$.";
     Text[ portuguese_brazilian ] = "Tried to open the table $name$";
     Text[ japanese ] = "$name$ テーブルを開こうとしました。";
-    Text[ korean ] = "$name$ 시트를 열려고 합니다.";
+    Text[ korean ] = "$name$ 테이블을 열려고 시도했습니다.";
     Text[ chinese_simplified ] = "已经尝试过打开表格 $name$ 。";
     Text[ chinese_traditional ] = "已經嘗試過開啟表格 $name$ 。";
     Text[ turkish ] = "Tried to open the table $name$";
     Text[ arabic ] = "�� ������ ��� ������ $name$.";
-    Text[ finnish ] = "Yritettiin avata taulukkoa $name$.";
+    Text[ finnish ] = "Yritettiin avata taulua $name$.";
     Text[ catalan ] = "S'ha intentat obrir la taula $name$.";
+    Text[ thai ] = "พยายามเปิดตาราง $name$";
 };
 String RID_STR_CONNECTION_INVALID
 {
@@ -92,24 +93,25 @@ String RID_STR_CONNECTION_INVALID
     Text [ english ] = "The connection could not be established.";
     Text [ english_us ] = "No connection could be established.";
     Text[ portuguese ] = "Imposs�vel estabelecer liga��o.";
-    Text[ russian ] = "������� ����� �� �������!";
+    Text[ russian ] = "�� ������� ���������� �����.";
     Text[ greek ] = "��� ����� ������� �� ����� � �������!";
     Text[ dutch ] = "Er kan geen verbinding tot stand worden gebracht!";
     Text[ french ] = "Impossible d'�tablir une connexion !";
-    Text[ spanish ] = "�No se pudo crear una conexi�n!";
+    Text[ spanish ] = "No se pudo crear ninguna conexi�n.";
     Text[ italian ] = "Impossibile creare il collegamento!";
     Text[ danish ] = "Det var ikke muligt at oprette forbindelse.";
     Text[ swedish ] = "Det gick inte att skapa en f�rbindelse.";
     Text[ polish ] = "Brak po��czenia!";
     Text[ portuguese_brazilian ] = "Not possible to create a connection!";
     Text[ japanese ] = "接続できませんでした。";
-    Text[ korean ] = "연결도 되지 않았습니다.";
+    Text[ korean ] = "연결하지 못했습니다.";
     Text[ chinese_simplified ] = "无法建立连接！";
     Text[ chinese_traditional ] = "無法建立連線!";
     Text[ turkish ] = "Not possible to create a connection!";
     Text[ arabic ] = "Not possible to create a connection!";
     Text[ finnish ] = "Yhteyden muodostaminen ei onnistunut.";
     Text[ catalan ] = "No s'ha pogut establir una connexi�";
+    Text[ thai ] = "ไม่สามารถสร้างการเชื่อมต่อได้";
 };
 
 String RID_STR_TABLE_IS_FILTERED
@@ -118,24 +120,25 @@ String RID_STR_TABLE_IS_FILTERED
     Text [ english ] = "The table $name$ already exists, but hidden because it's filtered out.";
     Text [ english_us ] = "The table $name$ already exists. It is not visible because it has been filtered out.";
     Text[ portuguese ] = "A tabela $name$ j� existe. Como foi filtrada, n�o se encontra vis�vel.";
-    Text[ russian ] = "������� $name$ ��� ����������. ��� �� ����� ��-�� ����������.";
+    Text[ russian ] = "������� $name$ ��� ����������. ��� �� �����, ��� ��� �������������.";
     Text[ greek ] = "� ������� $name$ ������� ���. ���� ������������!";
     Text[ dutch ] = "Tabel $name$ bestaat reeds. Hij is alleen niet zichtbaar omdat hij is uitgefilterd!";
     Text[ french ] = "La table $name$ existe d�j� ; comme elle a �t� filtr�e, elle n'est pas visible.";
-    Text[ spanish ] = "La tabla $name$ ya existe. �No se puede ver porque ha sido filtrada!";
+    Text[ spanish ] = "La tabla $name$ ya existe. Sin embargo no es visible por haber sido filtrada.";
     Text[ italian ] = "Il nome della tabella $name$ esiste gi�; non � visibile in quanto � stato filtrato.";
     Text[ danish ] = "Tabellen $name$ findes allerede. Den er ikke synlig, da den er filtreret fra.";
     Text[ swedish ] = "Tabellen $name$ finns redan. Den �r inte synlig eftersom den har filtrerats bort.";
     Text[ polish ] = "Tabela $name$ ju� istenieje. Nie jest widoczna, poniewa� zosta�a przefiltrowana!";
     Text[ portuguese_brazilian ] = "the table $name$ already exists. She is only filtered!";
     Text[ japanese ] = "テーブル $name$ はすでにあります。フィルタされているため、表示されません。";
-    Text[ korean ] = " $name$ 시트가 이미 존재합니다. 이 시트는 필터로 제거되어 보이지 않습니다.!";
+    Text[ korean ] = "$name$ 테이블은 이미 있습니다. 이 테이블은 필터링이 되어 보이지 않습니다.";
     Text[ chinese_simplified ] = "表格 $name$ 已经存在。因为已经筛选出这个表格，所以无法显示它。";
     Text[ chinese_traditional ] = "這個表格 $name$ 已經存在。因爲已經篩選它而無法顯示。";
     Text[ turkish ] = "the table $name$ already exists. She is only filtered!";
     Text[ arabic ] = "the table $name$ already exists. She is only filtered!";
-    Text[ finnish ] = "Taulukko $name$ on jo olemassa. Se on suodatettu.";
+    Text[ finnish ] = "Taulu $name$ on jo olemassa. Se ei n�y, koska se on suodatettu pois n�kyvist�.";
     Text[ catalan ] = "La taula $name$ ja existeix i ha estat filtrada.";
+    Text[ thai ] = "มีตาราง $name$ อยู่แล้ว มันได้ถูกกรองแล้ว";
 };
 
 String RID_STR_NEED_CONFIG_WRITE_ACCESS
@@ -144,11 +147,11 @@ String RID_STR_NEED_CONFIG_WRITE_ACCESS
     Text [ english ] = "You have no write access to the configuration data the object is based on.";
     Text [ english_us ] = "You have no write access to the configuration data the object is based on.";
     Text[ portuguese ] = "N�o possui direitos de escrita sobre os dados de configura��o do objecto.";
-    Text[ russian ] = "�� �� ��������� ������� ������ � ���������������� ������ ����� �������.";
+    Text[ russian ] = "�� �� ��������� ������� �� ��������� ������������ ������� �������.";
     Text[ greek ] = "��� ����� ���������� �������� ��� �������� ����������� ��� ������������.";
     Text[ dutch ] = "U heeft geen schrijfrechten op de configuratiegegevens van het object.";
     Text[ french ] = "Vous n'avez pas d'acc�s en �criture sur les donn�es de configuration de l'objet.";
-    Text[ spanish ] = "No es posible el acceso a los datos de configuraci�n para escribir.";
+    Text[ spanish ] = "No posee derecho de escritura sobre los datos de configuraci�n del objeto.";
     Text[ finnish ] = "Kirjoitusoikeudet objektin perustana oleviin kokoonpanotietoihin puuttuvat.";
     Text[ italian ] = "Non avete accesso ai dati di configurazione dell'oggetto.";
     Text[ danish ] = "Du har ikke skriveadgang til objektets konfigurationsdata.";
@@ -156,12 +159,13 @@ String RID_STR_NEED_CONFIG_WRITE_ACCESS
     Text[ polish ] = "Brak praw na zapisywanie danych konfiguracjynych obiektu.";
     Text[ portuguese_brazilian ] = "You have no write access to the configuration data the object is based on.";
     Text[ japanese ] = "オブジェクトの設定データへの書き込み権はありません。";
-    Text[ korean ] = "개체의 구성 데이터에 대한 쓰기 권한이 없습니다";
+    Text[ korean ] = "개체 설정 데이터에 대한 쓰기 권한이 없습니다.";
     Text[ chinese_simplified ] = "您没有权限读取这个对象的配置数据。";
     Text[ chinese_traditional ] = "您沒有權限存取這個物件的配置資料。";
     Text[ turkish ] = "You have no write access to the configuration data the object is based on.";
     Text[ arabic ] = "You have no write access to the configuration data the object is based on.";
     Text[ catalan ] = "No teniu acc�s d'escriptura a les dades de configuraci� en qu� est� basat l'objecte.";
+    Text[ thai ] = "คุณไม่ได้เข้าถึงการเขียนโครงแบบข้อมูลบนพื้นฐานวัตถุ";
 };
 
 
@@ -171,24 +175,25 @@ String RID_STR_COULDNOTCONNECT_UNSPECIFIED
     Text [ english ] = "The connection to the external data source could not be established. An unknown error occured. Most probably, the SDBC driver is defect.";
     Text [ english_us ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective.";
     Text[ portuguese ] = "Foi imposs�vel estabelecer a liga��o � fonte de dados externa. Ocorreu um erro desconhecido. Provavelmente o controlador est� com defeito.";
-    Text[ russian ] = "�������������� � ������� �������� ������ ����������. ��������� ���������� ������. �������� ��������� � ���������.";
+    Text[ russian ] = "���������� ������������ � �������� ��������� ������. ����������� ������. �������� ��������� � ���������.";
     Text[ greek ] = "The connection to the external data source could not be established. An unknown error occured. Most probably, the SDBC driver is defect.";
     Text[ dutch ] = "Door een onbekende fout (waarschijnlijk is de driver niet in orde) kan de verbinding met de externe gegevensbron niet tot stand worden gebracht.";
     Text[ french ] = "Impossible d'�tablir une connexion � la source de donn�es externe : erreur inconnue. Le pilote fait probablement d�faut.";
-    Text[ spanish ] = "No se pudo realizar la conexi�n a la fuente de datos externa. Ha ocurrido un error desconocido. Es posible que el controlador est� defectuoso.";
-    Text[ finnish ] = "The connection to the external data source could not be established. An unknown error occured. Most probably, the SDBC driver is defect.";
+    Text[ spanish ] = "La conexi�n a la fuente de datos externa no se pudo realizar. Se ha producido un error desconocido. Es posible que el controlador est� defectuoso.";
+    Text[ finnish ] = "Yhteytt� ulkoiseen tietol�hteeseen ei voitu muodostaa. Ilmeni tuntematon virhe. Ohjain on ehk� viallinen.";
     Text[ italian ] = "Impossibile creare il collegamento alla sorgente dati esterna a causa di un errore non classificato. Probabile difetto al driver.";
     Text[ danish ] = "Der kunne ikke oprettes forbindelse til den eksterne datakilde. Der opstod en ukendt fejl. Driveren er sandsynligvis beskadiget.";
     Text[ swedish ] = "Det gick inte att skapa f�rbindelsen till den externa datak�llan. Ett ok�nt fel uppstod. Det �r antagligen fel p� drivrutinen.";
     Text[ polish ] = "Brak po��czenia z zewn�trznym �r�d�em danych. Wyst�pni� nieznany b��d. Prawdopodobie nie dzia�a sterownik.";
     Text[ portuguese_brazilian ] = "The connection to the external data source could not be established. An unknown error occured. Most probably, the SDBC driver is defect.";
     Text[ japanese ] = "外部データソースへ接続できませんでした。不明なエラーが発生しました。ドライバにトラブルがある可能性があります。";
-    Text[ korean ] = "외부 데이터 소스와의 연결을 설정하지 못했습니다. SDBC 드라이버에 결함이 있을 가능성이 높습니다.";
+    Text[ korean ] = "외부 데이터 원본으로 연결하지 못했습니다. 알 수 없는 오류가 발생했습니다. SDBC 드라이버에 오류가 있을 수 있습니다.";
     Text[ chinese_simplified ] = "无法与外部数据源建立连接。出现了一个不明的错误。可能是驱动程序已经损坏。";
     Text[ chinese_traditional ] = "無法與外部的資料源連線。出現一個不明的錯誤。原因可能是驅動程式已經損壞。";
     Text[ turkish ] = "The connection to the external data source could not be established. An unknown error occured. Most probably, the SDBC driver is defect.";
     Text[ arabic ] = "The connection to the external data source could not be established. An unknown error occured. Most probably, the SDBC driver is defect.";
-    Text[ catalan ] = "The connection to the external data source could not be established. An unknown error occured. Most probably, the SDBC driver is defect.";
+    Text[ catalan ] = "No s'ha pogut establir la connexi� a la base de dades externa. El m�s probable �s que sigui un defecte del controlador SDBC.";
+    Text[ thai ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective.";
 };
 
 String RID_STR_COULDNOTCONNECT_NODRIVER
@@ -197,24 +202,25 @@ String RID_STR_COULDNOTCONNECT_NODRIVER
     Text [ english ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
     Text [ english_us ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
     Text[ portuguese ] = "Foi imposs�vel estabelecer a liga��o � fonte de dados externa. O controlador SDBC para o URL indicado n�o foi encontrado.";
-    Text[ russian ] = "�������������� � ������� �������� ������ �� �������. ��� ��������� URL �� ������ ������� SDBC.";
+    Text[ russian ] = "���������� ������������ � �������� ��������� ������. ��� ��������� URL �� ������ ������� SDBC.";
     Text[ greek ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
     Text[ dutch ] = "De verbinding met de externe gegevensbron kan niet tot stand worden gebracht omdat er geen SDBC-driver voor de opgegeven URL is gevonden.";
     Text[ french ] = "Impossible d'�tablir une connexion � la source de donn�es externe : le pilote SDBC n'a pas pu �tre d�tect� pour l'URL sp�cifi�.";
     Text[ spanish ] = "No se pudo realizar la conexi�n a la fuente de datos externa porque no se encontr� ning�n controlador SDBC para la URL indicada.";
-    Text[ finnish ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
+    Text[ finnish ] = "Yhteytt� ulkoiseen tietol�hteeseen ei voitu muodostaa. Annetulle URL-osoitteelle ei l�ytynyt SDBC-ohjainta.";
     Text[ italian ] = "Impossibile stabilire il collegamento alla sorgente dati esterna in quanto non � stato trovato il driver SDBC per l'indirizzo URL stabilito.";
     Text[ danish ] = "Der kunne ikke oprettes forbindelse til den eksterne datakilde. Der blev ikke fundet nogen SDBC-driver til den angivne URL.";
     Text[ swedish ] = "Det gick inte att skapa f�rbindelsen till den externa datak�llan. Det gick inte att hitta n�gon SDBC-drivrutin f�r den angivna URL:en.";
     Text[ polish ] = "Brak po��czenia z zewn�trznym �r�d�em danych. Nie znaleziono sterownika SDCB do podanego adresu URL.";
     Text[ portuguese_brazilian ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
     Text[ japanese ] = "外部データソースへ接続できませんでした。指定した URL アドレスの SDBC ドライバは見つかりませんでした。";
-    Text[ korean ] = "외부 데이터 소스와의 연결을 설정하지 못했습니다. 지정된 URL에 대한 SDBC 드라이버를 찾지 못했습니다.";
+    Text[ korean ] = "외부 데이터 원본으로 연결하지 못했습니다. 지정된 URL에 대한 SDBC 드라이버를 찾지 못했습니다.";
     Text[ chinese_simplified ] = "无法与外部数据源建立连接。无法在指定的 URL 处找到 SDBC 驱动程序。";
     Text[ chinese_traditional ] = "無法與外部的資料源連線。無法在指定的 URL 位置找到 SDBC 驅動程式。";
     Text[ turkish ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
     Text[ arabic ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
-    Text[ catalan ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
+    Text[ catalan ] = "No s'ha pogut establir la connexi� a la base de dades externa. No s'ha trobat el controlador SDBC per aquesta URL.";
+    Text[ thai ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
 };
 
 String RID_STR_COULDNOTLOAD_MANAGER
@@ -223,24 +229,25 @@ String RID_STR_COULDNOTLOAD_MANAGER
     Text [ english ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
     Text [ english_us ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
     Text[ portuguese ] = "Foi imposs�vel estabelecer a liga��o � base de dados externa. N�o foi poss�vel carregar o gestor de controladores SDBC.";
-    Text[ russian ] = "������������ � ������� �������� ������ ����������. �� ������� ��������� ���������� �������� SDBC.";
+    Text[ russian ] = "���������� ������������ � �������� ��������� ������. ��������� �������� SDBC �� �����������.";
     Text[ greek ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
     Text[ dutch ] = "De verbinding met de externe gegevensbron kan niet tot stand worden gebracht omdat het SDBC-driverbeheer niet kan worden geladen. ";
     Text[ french ] = "Impossible d'�tablir une connexion � la source de donn�es externe : le gestionnaire de pilotes SDBC n'a pas pu �tre charg�.";
     Text[ spanish ] = "No se pudo realizar la conexi�n a la fuente de datos externa porque no se pudo cargar el gestor de controladores SDBC.";
-    Text[ finnish ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
+    Text[ finnish ] = "Yhteytt� ulkoiseen tietol�hteeseen ei voitu muodostaa. SDBC-ohjaimen hallintaa ei voitu ladata.";
     Text[ italian ] = "Impossibile stabilire il collegamento alla sorgente dati esterna in quanto non � stato caricato il gestore del driver SDBC.";
     Text[ danish ] = "Der kunne ikke oprettes forbindelse til den eksterne datakilde. SDBC-drivermanageren kunne ikke indl�ses.";
     Text[ swedish ] = "Det gick inte att skapa f�rbindelsen till den externa datak�llan. Det gick inte att ladda managern f�r SDBC-drivrutinen.";
     Text[ polish ] = "Brak po��czenia z zewn�trznym �r�d�em danych. Za�adowanie mened�era sterownika SDCB nie powiod�o si�.";
     Text[ portuguese_brazilian ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
     Text[ japanese ] = "外部データソースへ接続できませんでした。SDBC ドライバのマネージャーは読み込みできませんでした。";
-    Text[ korean ] = "외부 데이터 소스와의 연결을 설정하지 못했습니다. SDBC 드라이버 관리자가 로드되지 못했습니다.";
+    Text[ korean ] = "외부 데이터 원본으로 연결하지 못했습니다. SDBC 드라이버 매니저를 로드하지 못했습니다.";
     Text[ chinese_simplified ] = "无法与外部数据源建立连接。无法装入 SDBC 驱动程序管理器。";
     Text[ chinese_traditional ] = "無法與外部的資料源連線。無法載入 SDBC 驅動程式管理員。";
     Text[ turkish ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
     Text[ arabic ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
-    Text[ catalan ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
+    Text[ catalan ] = "No s'ha pogut establir la connexi� a la base de dades externa. No s'ha pogut carregar el controlador SDBC.";
+    Text[ thai ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
 };
 
 
@@ -251,3 +258,8 @@ String RID_STR_COULDNOTLOAD_MANAGER
 
 
 
+
+
+
+
+
diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx
index b03e2f5e34aa..4168537c5685 100644
--- a/dbaccess/source/inc/dbu_reghelper.hxx
+++ b/dbaccess/source/inc/dbu_reghelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_reghelper.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-12-19 16:35:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,13 +92,3 @@ namespace dbaui
 
 #endif // _DBU_REGHELPER_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2000/12/15 15:23:07  fs
- *  initial checkin - library-dependent wrapper for the registration helper classes
- *
- *
- *  Revision 1.0 15.12.00 15:54:22  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx
index 6a704857d5dc..48487ead15a0 100644
--- a/dbaccess/source/shared/dbu_reghelper.cxx
+++ b/dbaccess/source/shared/dbu_reghelper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_reghelper.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2000-12-15 15:24:33 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,10 +77,3 @@ namespace dbaui
 
 }
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 15.12.00 16:00:45  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src
index 74ab4abd578a..ebeac3de53a3 100644
--- a/dbaccess/source/ui/browser/bcommon.src
+++ b/dbaccess/source/ui/browser/bcommon.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bcommon.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: rt $ $Date: 2001-08-24 10:55:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,17 +79,18 @@ String RID_STR_QRY_TITLE
     Text[ chinese_simplified ] = "查询 #";
     Text[ russian ] = "������ #";
     Text[ polish ] = "Kwerenda #";
-    Text[ japanese ] = "ｸｴﾘｰ #";
+    Text[ japanese ] = "クエリー #";
     Text[ dutch ] = "Query #";
     Text[ chinese_simplified ] = "查询 #";
     Text[ greek ] = "������� #";
-    Text[ korean ] = "질의 #";
+    Text[ korean ] = "쿼리 #";
     Text[ chinese_traditional ] = "查詢 #";
     Text[ arabic ] = "��������� #";
     Text[ turkish ] = "Sorgu #";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Consulta #";
-    Text[ finnish ] = "Kysely ";
+    Text[ finnish ] = "Kysely #";
+    Text[ thai ] = "แบบสอบถาม  #";
 };
 String RID_STR_TBL_TITLE
 {
@@ -107,17 +108,18 @@ String RID_STR_TBL_TITLE
     Text[ chinese_simplified ] = "表格 #";
     Text[ russian ] = "������� #";
     Text[ polish ] = "Tabela #";
-    Text[ japanese ] = "ﾃｰﾌﾞﾙ #";
+    Text[ japanese ] = "テーブル #";
     Text[ dutch ] = "Tabel #";
     Text[ chinese_simplified ] = "表格 #";
     Text[ greek ] = "������� #";
-    Text[ korean ] = "표 #";
+    Text[ korean ] = "테이블 #";
     Text[ chinese_traditional ] = "表格 #";
     Text[ arabic ] = "������ #";
     Text[ turkish ] = "Tablo #";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tabla #";
-    Text[ finnish ] = "Taulukko ";
+    Text[ catalan ] = "Taula #";
+    Text[ finnish ] = "Taulu #";
+    Text[ thai ] = "ตาราง #";
 };
 
 
@@ -126,3 +128,12 @@ String RID_STR_TBL_TITLE
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index d53324beb8f2..a23a305d96bf 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwctrlr.cxx,v $
  *
- *  $Revision: 1.73 $
+ *  $Revision: 1.74 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-22 12:47:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1115,9 +1115,6 @@ void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::containe
 // -----------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::suspend(sal_Bool bSuspend) throw( RuntimeException )
 {
-    if ( rBHelper.bDisposed )
-        throw DisposedException( ::rtl::OUString(), *this );
-
 //  m_bSuspending = sal_True;
 //
     // have a pending open operation ?
diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx
index 0bf9399ce95c..4baaeac9669f 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtreemodel.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-29 08:44:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:57:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,22 +116,4 @@ namespace dbaui
 
 };
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.10  2001/08/16 14:22:02  hr
- *  #65293#: syntax
- *
- *  Revision 1.9  2001/08/15 13:14:59  oj
- *  #88644# correct getImplementationId and insert some DBG's
- *
- *  Revision 1.8  2001/05/14 11:58:35  oj
- *  #86744# some changes for entries and views
- *
- *  Revision 1.7  2001/04/26 11:37:51  fs
- *  file is alive, again - added support for data source associated bookmarks
- *
- *
- *  Revision 1.0 25.04.01 14:00:45  fs
- ************************************************************************/
 
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index b1f2065180c1..237f7036435d 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsbrowserDnD.cxx,v $
  *
- *  $Revision: 1.59 $
+ *  $Revision: 1.60 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 09:35:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -326,8 +326,11 @@ namespace dbaui
                 for(sal_Int32 i = 1;aPosIter != _rvColumns.end();++aPosIter)
                 {
                     sal_Int32 nPos = aPosIter->second;
-                    if(nPos == CONTAINER_ENTRY_NOTFOUND)
+                    if ( nPos == CONTAINER_ENTRY_NOTFOUND )
+                    {
+                        ++i; // otherwise we don't get the correct value when only the 2nd source column was selected
                         continue;
+                    }
                     if ( bIsAutoIncrement && bInsertAutoIncrement )
                     {
                         xParameter->setInt(1,nRowCount);
@@ -743,6 +746,8 @@ namespace dbaui
                                              xDestConnection,
                                              getNumberFormatter(),
                                              getORB());
+                    aWizard.fillTypeInfo();
+                    aWizard.loadData();
                     OCopyTable*         pPage1 = new OCopyTable(&aWizard,COPY, bIsView,OCopyTableWizard::WIZARD_DEF_DATA);
                     OWizNameMatching*   pPage2 = new OWizNameMatching(&aWizard);
                     OWizColumnSelect*   pPage3 = new OWizColumnSelect(&aWizard);
@@ -1425,174 +1430,3 @@ namespace dbaui
 }   // namespace dbaui
 // .........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.58  2002/11/14 07:57:50  oj
- *  #105110# some reorg and code movements
- *
- *  Revision 1.57  2002/11/05 08:33:33  oj
- *  #104698# use new ctor and check if entry is container
- *
- *  Revision 1.56  2002/10/31 12:48:33  oj
- *  #104392# insert waitobject before inserting data
- *
- *  Revision 1.55  2002/10/08 06:46:22  oj
- *  #104025# check if name is empty
- *
- *  Revision 1.54  2002/10/07 13:06:32  oj
- *  #i3289# correct table name quoting so that in every situation the correct schema, catalog is used
- *
- *  Revision 1.53  2002/08/19 07:32:51  oj
- *  #99473# change string resource files
- *
- *  Revision 1.52  2002/07/11 06:53:41  oj
- *  #95978# check if name for table is valid
- *
- *  Revision 1.51  2002/07/09 12:46:11  oj
- *  #99921# check if datasource allows to check names
- *
- *  Revision 1.50  2002/07/08 09:47:23  oj
- *  #98087# check d&d entries
- *
- *  Revision 1.49  2002/07/08 08:11:22  oj
- *  #97156# saveData and d&d source corrected
- *
- *  Revision 1.48  2002/06/11 12:28:27  fs
- *  #65293# correct an error which came in in the merge ->1.43
- *
- *  Revision 1.47  2002/05/29 11:36:54  oj
- *  #96792# new methods for pasting tables
- *
- *  Revision 1.46  2002/05/29 11:11:26  oj
- *  #96792# new methods for pasting tables
- *
- *  Revision 1.45  2002/05/29 11:07:40  hr
- *  #65293#: fixed typo
- *
- *  Revision 1.44  2002/05/29 10:32:21  oj
- *  #96792# new methods for pasting tables
- *
- *  Revision 1.43  2002/05/28 08:30:06  oj
- *  #96792# new methods for pasting tables
- *
- *  Revision 1.42  2002/05/23 12:32:39  fs
- *  use the (member) view clipboard instead of an explicitly created one - during #99030#
- *
- *  Revision 1.41  2002/05/23 11:00:10  oj
- *  #99407# check columns to set
- *
- *  Revision 1.40  2002/05/10 10:06:53  oj
- *  #95472# showError mesg when table isn't any longer in container
- *
- *  Revision 1.39  2002/04/16 17:01:04  hr
- *  #65293#: syntax
- *
- *  Revision 1.38  2002/04/02 06:45:52  oj
- *  #98146# mapping of columns corrected
- *
- *  Revision 1.34  2001/12/07 13:13:04  oj
- *  #95728# insert try catch
- *
- *  Revision 1.33  2001/11/23 14:51:40  oj
- *  #95142# check eState of parser
- *
- *  Revision 1.32  2001/11/15 15:15:05  oj
- *  #94820# check type of dest database and adjust if possible
- *
- *  Revision 1.31  2001/11/12 10:34:55  oj
- *  #94391# exclude tablefilter and enable schema name again
- *
- *  Revision 1.30  2001/10/08 07:26:29  oj
- *  #92786# refcount implemented for connectiondata and sqlexception catched
- *
- *  Revision 1.29  2001/09/25 13:24:38  oj
- *  #91719# implementing the XRename handling
- *
- *  Revision 1.28  2001/09/20 12:56:17  oj
- *  #92232# fixes for BIGINT type and new property HELPTEXT
- *
- *  Revision 1.27  2001/08/27 06:57:24  oj
- *  #90015# some speedup's
- *
- *  Revision 1.26  2001/08/24 06:31:34  oj
- *  #90015# code corrcetions for some speedup's
- *
- *  Revision 1.25  2001/07/30 06:20:24  oj
- *  #90291# check if table should be appended
- *
- *  Revision 1.24  2001/07/26 14:12:01  oj
- *  #90291# check if table should be appended
- *
- *  Revision 1.23  2001/07/19 09:27:12  oj
- *  #86186# check parsetree for joins
- *
- *  Revision 1.22  2001/07/18 11:33:57  oj
- *  #85664# enable copy/cut/paste/delete keys
- *
- *  Revision 1.21  2001/07/17 10:31:48  oj
- *  #89128# look if connection is readonly
- *
- *  Revision 1.20  2001/07/16 13:40:03  oj
- *  #89650# check if table was created for html/rtf format
- *
- *  Revision 1.19  2001/07/05 12:46:52  oj
- *  #87744# use HTML_SIMPLE
- *
- *  Revision 1.18  2001/07/05 12:19:25  oj
- *  #87744# check for right HTML_TYPE
- *
- *  Revision 1.17  2001/07/02 13:22:11  oj
- *  #88476# save name of object before recursive call
- *
- *  Revision 1.16  2001/06/22 10:53:59  oj
- *  #88455# serveral fixes for parameters
- *
- *  Revision 1.15  2001/06/12 13:19:24  fs
- *  #65293# linux ambiguity
- *
- *  Revision 1.14  2001/06/07 12:53:46  fs
- *  #87905# don't DnD bookmarks
- *
- *  Revision 1.13  2001/06/01 11:23:45  oj
- *  #86520# insert of tabledata corrected
- *
- *  Revision 1.12  2001/05/14 11:58:35  oj
- *  #86744# some changes for entries and views
- *
- *  Revision 1.11  2001/05/10 12:24:47  fs
- *  the clipboard changes are SUPD-dependent
- *
- *  Revision 1.10  2001/05/07 14:09:00  fs
- *  MUST changes regarding the system clipboard access
- *
- *  Revision 1.9  2001/04/26 11:36:16  fs
- *  added support for data source associated bookmarks
- *
- *  Revision 1.8  2001/04/11 12:58:38  fs
- *  use the ODataAccessDescriptor instead of the dbatools functions
- *
- *  Revision 1.7  2001/04/06 13:48:34  oj
- *  #85664# match copy/cut/paste with the right window
- *
- *  Revision 1.6  2001/04/03 14:15:53  fs
- *  corrected some wrong OSL_ASSERTs
- *
- *  Revision 1.5  2001/03/30 13:42:02  oj
- *  remove <:
- *
- *  Revision 1.4  2001/03/30 08:47:18  oj
- *  correct the creation of views
- *
- *  Revision 1.3  2001/03/28 15:44:58  fs
- *  changed the ctor of ODataClipboard
- *
- *  Revision 1.2  2001/03/27 07:09:19  oj
- *  use of new initialize
- *
- *  Revision 1.1  2001/03/23 10:59:09  fs
- *  initial checkin - DnD related implementations for the data source browser controller
- *
- *
- *  Revision 1.0 23.03.01 09:03:17  fs
- ************************************************************************/
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index af2835ec1ee9..984552361f80 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: genericcontroller.cxx,v $
  *
- *  $Revision: 1.48 $
+ *  $Revision: 1.49 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-19 09:28:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1163,4 +1163,22 @@ void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId)
     }
 }
 // -----------------------------------------------------------------------------
+Reference< ::com::sun::star::awt::XWindow> OGenericUnoController::getTopMostContainerWindow() const
+{
+    Reference< ::com::sun::star::awt::XWindow> xWindow;
+    // get the top most window
+    if ( m_xCurrentFrame.is() )
+    {
+        xWindow = m_xCurrentFrame->getContainerWindow();
+        Reference<XFrame> xFrame = m_xCurrentFrame;
+        while ( xFrame.is() && !xFrame->isTop() )
+        {
+            xFrame = Reference<XFrame>(xFrame->getCreator(),UNO_QUERY);
+        }
+        if ( xFrame.is() )
+            xWindow = xFrame->getContainerWindow();
+    }
+    return xWindow;
+}
+// -----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index e217146bf191..0b3405dcae22 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbabrw.src,v $
  *
- *  $Revision: 1.86 $
+ *  $Revision: 1.87 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:32:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -397,7 +397,7 @@ QueryBox QUERY_BRW_SAVEMODIFIED
     Message[ dutch ] = "De huidige record is gewijzigd.\nWilt u de wijzigingen opslaan?";
     Message[ chinese_simplified ] = "数据条目已经被更改。\n您要存盘更改后的数据记录吗？";
     Message[ greek ] = "� �������� ������� �������������.\n�� ������������ �� �������;";
-    Message[ korean ] = "현재의  데이터 레코드가 변경되었습니다.\n 변경 사항을 저장하겠습니까?";
+    Message[ korean ] = "현재 데이터 레코드가 변경되었습니다.\n 변경 내용을 저장하시겠습니까?";
     Message[ turkish ] = "G�ncel veri k�mesi de�i�tirildi.\nDe�i�iklikler saklans�n m�?";
     Message[ language_user1 ] = " ";
     Message[ finnish ] = "Nykyist� tietuetta on muutettu.\nHaluatko tallentaa muutokset?";
@@ -417,7 +417,7 @@ QueryBox QUERY_BRW_DELETE_ROWS
     Message [ swedish ] = "Skall de markerade data raderas?" ;
     Message [ danish ] = "Skal de markerede data slettes?" ;
     Message [ italian ] = "Eliminare i dati selezionati?" ;
-    Message [ spanish ] = "�Desea eliminar los datos seleccionados?" ;
+    Message [ spanish ] = "�Desea borrar los datos seleccionados?" ;
     Message [ french ] = "Voulez-vous supprimer les donn�es s�lectionn�es ?" ;
     Message [ dutch ] = "Wilt u de geselecteerde gegevens verwijderen?" ;
     Message[ chinese_simplified ] = "您要删除选中的数据吗？";
@@ -427,7 +427,7 @@ QueryBox QUERY_BRW_DELETE_ROWS
     Message[ chinese_traditional ] = "您要刪除選中的資料﹖";
     Message[ arabic ] = "�� ���� ��� �������� ������ɿ";
     Message[ greek ] = "������ �� ���������� �� ���������� ��������;";
-    Message[ korean ] = "선택된 데이터를 삭제하겠습니까?";
+    Message[ korean ] = "선택한 데이터를 삭제하시겠습니까?";
     Message[ turkish ] = "Se�ilen veriler silinsin mi?";
     Message[ language_user1 ] = " ";
     Message[ finnish ] = "Haluatko poistaa valitut tiedot?";
@@ -482,7 +482,7 @@ String SBA_BROWSER_SETTING_ORDER
     Text[ polish ] = "B��d podczas osadzania kryteri�w sortowania";
     Text[ portuguese_brazilian ] = "error setting the sort criteria";
     Text[ japanese ] = "並べ替え条件の設定時のエラー";
-    Text[ korean ] = "정렬 기준 설정시에 오류";
+    Text[ korean ] = "정렬 기준 설정 중 오류";
     Text[ chinese_simplified ] = "在设定排序条件时发生错误";
     Text[ chinese_traditional ] = "設定編排條件時發生一個錯誤";
     Text[ arabic ] = "��� ��� ����� ����� ������ �����";
@@ -508,7 +508,7 @@ String SBA_BROWSER_SETTING_FILTER
     Text[ polish ] = "B��d podczas osadzania kryteri�w filtra";
     Text[ portuguese_brazilian ] = "error setting the filter criteria";
     Text[ japanese ] = "フィルタ条件の設定時のエラー";
-    Text[ korean ] = "필터 기준 설정시에 오류";
+    Text[ korean ] = "필터 기준 설정 중 오류";
     Text[ chinese_simplified ] = "在设定筛选条件时发生错误";
     Text[ chinese_traditional ] = "設定篩選條件時發生一個錯誤";
     Text[ arabic ] = "��� ��� ����� ����� ������ �������";
@@ -610,7 +610,7 @@ String RID_STR_QUERIES_CONTAINER
     Text[ polish ] = "Kwerendy";
     Text[ portuguese_brazilian ] = "Queries";
     Text[ japanese ] = "クエリー";
-    Text[ korean ] = "질의";
+    Text[ korean ] = "쿼리";
     Text[ chinese_simplified ] = "查询";
     Text[ chinese_traditional ] = "查詢";
     Text[ turkish ] = "Queries";
@@ -637,7 +637,7 @@ String RID_STR_TABLES_CONTAINER
     Text[ polish ] = "Tabele";
     Text[ portuguese_brazilian ] = "Tables";
     Text[ japanese ] = "テーブル";
-    Text[ korean ] = "표";
+    Text[ korean ] = "테이블";
     Text[ chinese_simplified ] = "表格";
     Text[ chinese_traditional ] = "表格";
     Text[ turkish ] = "Tables";
@@ -692,7 +692,7 @@ String RID_STR_BOOKMARKS_CONTAINER
     Text[ polish ] = "~Administracja �r�de� danych..."; \
     Text[ portuguese_brazilian ] = "administrate ~data sources ...";    \
     Text[ japanese ] = "データソースの管理(~D)...";    \
-    Text[ korean ] = "데이터 소스 관리(~D)...";  \
+    Text[ korean ] = "데이터 원본 관리(~D)...";  \
     Text[ chinese_simplified ] = "管理数据源(~D)...";  \
     Text[ chinese_traditional ] = "管理資料源(~D)..."; \
     Text[ turkish ] = "administrate ~data sources ..."; \
@@ -740,14 +740,14 @@ String RID_STR_BOOKMARKS_CONTAINER
     Text[ greek ] = "�������� �������~�";   \
     Text[ dutch ] = "~Verbinding verbreken";    \
     Text[ french ] = "D�~connecter";    \
-    Text[ spanish ] = "Cerrar cone~xi�n";   \
+    Text[ spanish ] = "D~esconectar";   \
     Text[ italian ] = "C~hiudi collegamento";   \
     Text[ danish ] = "A~fbryd forbindelse"; \
     Text[ swedish ] = "St�n~g f�rbindelse"; \
     Text[ polish ] = "~Roz��cz";    \
     Text[ portuguese_brazilian ] = "~close connection"; \
     Text[ japanese ] = "接続を切断する(~N)"; \
-    Text[ korean ] = "연결 종료(~N)";   \
+    Text[ korean ] = "연결 끊기(~N)";   \
     Text[ chinese_simplified ] = "结束连接(~N)";    \
     Text[ chinese_traditional ] = "結束連線(~N)";   \
     Text[ turkish ] = "~close connection";  \
@@ -775,7 +775,7 @@ String RID_STR_BOOKMARKS_CONTAINER
     Text[ polish ] = "~Odtw�rz po��czenie"; \
     Text[ portuguese_brazilian ] = "~refresh connection";   \
     Text[ japanese ] = "接続を更新(~R)";   \
-    Text[ korean ] = "새로 연결(~R)";   \
+    Text[ korean ] = "연결 새로 고침(~R)";    \
     Text[ chinese_simplified ] = "重新连接(~R)";    \
     Text[ chinese_traditional ] = "重新連線(~R)";   \
     Text[ turkish ] = "~refresh connection";    \
@@ -921,7 +921,7 @@ Menu MENU_BROWSER_TABLECONTEXT
             Text [ english ] = "relatio~n design" ;
             Text [ english_us ] = "Rel~ation Design" ;
             Text[ portuguese ] = "Es~bo�ar rela��o";
-            Text[ russian ] = "������ ������";
+            Text[ russian ] = "�������������� ������";
             Text[ greek ] = "�������~��� ������";
             Text[ dutch ] = "Relatie-~ontwerp";
             Text[ french ] = "�bauche de relatio~n";
@@ -932,7 +932,7 @@ Menu MENU_BROWSER_TABLECONTEXT
             Text[ polish ] = "~Projekt relacji";
             Text[ portuguese_brazilian ] = "relatio~n design";
             Text[ japanese ] = "リレーションデザイン(~A)";
-            Text[ korean ] = "디자인 관계(~A)";
+            Text[ korean ] = "관계 디자인(~A)";
             Text[ chinese_simplified ] = "关联设计(~A)";
             Text[ chinese_traditional ] = "關聯設計(~A)";
             Text[ turkish ] = "relatio~n design";
@@ -985,7 +985,7 @@ Menu MENU_BROWSER_VIEWCONTEXT
             Text [ english ] = "relatio~n design" ;
             Text [ english_us ] = "Rel~ation Design" ;
             Text[ portuguese ] = "Es~bo�ar rela��o";
-            Text[ russian ] = "������ ������";
+            Text[ russian ] = "�������������� ������";
             Text[ greek ] = "�������~��� ������";
             Text[ dutch ] = "~Relatie-ontwerp";
             Text[ french ] = "�bauche de relatio~n";
@@ -996,7 +996,7 @@ Menu MENU_BROWSER_VIEWCONTEXT
             Text[ polish ] = "~Projekt relacji";
             Text[ portuguese_brazilian ] = "relatio~n design";
             Text[ japanese ] = "リレーションデザイン(~A)";
-            Text[ korean ] = "디자인 관계 생성(~A)";
+            Text[ korean ] = "관계 디자인(~A)";
             Text[ chinese_simplified ] = "关联设计(~A)";
             Text[ chinese_traditional ] = "關聯設計(~A)";
             Text[ turkish ] = "relatio~n design";
@@ -1041,7 +1041,7 @@ String STR_TITLE_CONFIRM_DELETION
     Text[ greek ] = "����������� ���������";
     Text[ dutch ] = "Wissen bevestigen";
     Text[ french ] = "Confirmation de suppression";
-    Text[ spanish ] = "Confirmar eliminaci�n";
+    Text[ spanish ] = "Confirma 'borrar'";
     Text[ italian ] = "Conferma 'Elimina'";
     Text[ danish ] = "Bekr�ft sletning";
     Text[ swedish ] = "Bekr�fta radering";
@@ -1068,14 +1068,14 @@ String STR_QUERY_DELETE_QUERY
     Text[ greek ] = "������ �� ��������� �� ������� '$name$';";
     Text[ dutch ] = "Wilt u query '$naam$' wissen?";
     Text[ french ] = "Voulez-vous supprimer la requ�te '$name$' ?";
-    Text[ spanish ] = "�Desea eliminar la consulta '$name$'?";
+    Text[ spanish ] = "�Desea borrar la consulta '$name$'?";
     Text[ italian ] = "Volete eliminare la ricerca '$name$'?";
     Text[ danish ] = "Skal foresp�rgslen '$name$' slettes?";
     Text[ swedish ] = "Ska s�kningen '$name$' raderas?";
     Text[ polish ] = "Usun�� kwerend�'$name$'?";
     Text[ portuguese_brazilian ] = "Do you want to delete the query '%1'?";
     Text[ japanese ] = "クエリー '%1' を削除しますか。";
-    Text[ korean ] = "질의 '$name$'을(를) 삭제하겠습니까?";
+    Text[ korean ] = "쿼리 '$name$'을(를) 삭제하시겠습니까?";
     Text[ chinese_simplified ] = "要删除这个查询 '$name$' ?";
     Text[ chinese_traditional ] = "要刪除這個查詢<$name$>?";
     Text[ turkish ] = "Do you want to delete the query '%1'?";
@@ -1095,14 +1095,14 @@ String STR_QUERY_DELETE_TABLE
     Text[ greek ] = "������ �� ��������� � ������� '%1';";
     Text[ dutch ] = "Wilt u tabel '%1' wissen?";
     Text[ french ] = "Voulez-vous supprimer la table '%1' ?";
-    Text[ spanish ] = "�Desea eliminar la tabla '%1'?";
+    Text[ spanish ] = "�Desea borrar la tabla '%1'?";
     Text[ italian ] = "Volete eliminare la tabella '%1'?";
     Text[ danish ] = "Skal tabellen '%1' slettes?";
     Text[ swedish ] = "Ska tabellen '%1' raderas?";
     Text[ polish ] = "Usun�� tabel�'%1'?";
     Text[ portuguese_brazilian ] = "Do you want to delete the table '%1'?";
     Text[ japanese ] = "テーブル '%1' を削除しますか。";
-    Text[ korean ] = "시트 '%1'을(를) 삭제하겠습니까?";
+    Text[ korean ] = "테이블 '%1'을(를) 삭제하시겠습니까?";
     Text[ chinese_simplified ] = "要删除这个表格 '%1'?";
     Text[ chinese_traditional ] = "要刪除表格<%1>?";
     Text[ turkish ] = "Do you want to delete the table '%1'?";
@@ -1123,14 +1123,14 @@ QueryBox QUERY_BRW_DELETE_QUERY_CONFIRM
     Message[ greek ] = "�� ������� ������� ���. ������ �� ���������;";
     Message[ dutch ] = "De query bestaat reeds. Wilt u deze wissen?";
     Message[ french ] = "La requ�te existe d�j�. Voulez-vous la supprimer ?";
-    Message[ spanish ] = "Ya existe la consulta. �Desea eliminarla?";
+    Message[ spanish ] = "La consulta ya existe. �Desea borrarla?";
     Message[ italian ] = "La ricerca esiste gi�. Volete eliminarla?";
     Message[ danish ] = "Foresp�rgslen findes allerede. Skal den slettes?";
     Message[ swedish ] = "S�kningen finns redan. Ska den raderas?";
     Message[ polish ] = "Kwerenda ju� istnieje. Usun�� j�?";
     Message[ portuguese_brazilian ] = "The query already exists. Do you want to delete the query?";
     Message[ japanese ] = "クエリーはすでにあります。クエリーを削除しますか。";
-    Message[ korean ] = "이 질의가 이미 존재합니다. 삭제하겠습니까?";
+    Message[ korean ] = "이 쿼리는 이미 있습니다. 삭제하시겠습니까?";
     Message[ chinese_simplified ] = "这个查询已经存在。要删除它？";
     Message[ chinese_traditional ] = "這個查詢已經存在。要刪除它？";
     Message[ turkish ] = "The query already exists. Do you want to delete the query?";
@@ -1151,14 +1151,14 @@ QueryBox QUERY_CONNECTION_LOST
     Message[ greek ] = "� ������� �� �� ���� ��������� ������. ������ �� ���������������;";
     Message[ dutch ] = "De verbinding naar de database is opgeheven! Wilt u deze weer tot stand brengen?";
     Message[ french ] = "La connexion � la base de donn�es a �t� annul�e ! R�tablir la connexion ?";
-    Message[ spanish ] = "�Se elimin� la conexi�n a la base de datos! �Desea restablecerla?";
+    Message[ spanish ] = "�Se suspendi� la conexi�n a la base de datos! �Desea restablecerla?";
     Message[ italian ] = "Il collegamento al database � stato terminato. Volete ristabilirlo?";
     Message[ danish ] = "Forbindelsen til databasen blev slettet! Skal den genoprettes?";
     Message[ swedish ] = "F�rbindelsen till databasen har raderats! Ska den uppr�ttas igen?";
     Message[ polish ] = "Po��czenie z baz� danych zosta�o przerwane! Czy po��czy� ponownie?";
     Message[ portuguese_brazilian ] = "The connection to the database was lost! Reconnect";
     Message[ japanese ] = "データベースへの接続は削除されました。接続しなおしますか。";
-    Message[ korean ] = "데이터베이스와의 연결이 끊어졌습니다! 다시 연결하겠습니까?";
+    Message[ korean ] = "데이터베이스와의 연결이 끊어졌습니다. 다시 연결하시겠습니까?";
     Message[ chinese_simplified ] = "和数据库的连接已经中断。要重新连接数据库？";
     Message[ chinese_traditional ] = "和資料庫的連線已經關閉。要重新連線？";
     Message[ turkish ] = "The connection to the database was lost! Reconnect";
@@ -1212,7 +1212,7 @@ String STR_OPENTABLES_WARNINGS_DETAILS
     Text[ polish ] = "W trakcie ustalania tabel, po��czenie z baz� danych wysy�a�o ostrze�enia.";
     Text[ portuguese_brazilian ] = "While retrieving the tables, warnings were provided by the connection.";
     Text[ japanese ] = "テーブルの転送中に、データベースの接続から警告がありました。";
-    Text[ korean ] = "시트를 검색하는 동안 데이터 연결에서 경고 메시지를 표시되었습니다.";
+    Text[ korean ] = "테이블을 검색 중 데이터 연결에서 경고를 했습니다.";
     Text[ chinese_simplified ] = "读取表格时发出一个数据库连接的警告。";
     Text[ chinese_traditional ] = "在存取表格時發出資料庫連線的警告。";
     Text[ turkish ] = "While retrieving the tables, warnings were provided by the connection.";
@@ -1239,7 +1239,7 @@ String STR_CONNECTING_DATASOURCE
     Text[ polish ] = "Trwa ��czenie z \"$name$\" ...";
     Text[ portuguese_brazilian ] = "connecting to \"$name$\" ...";
     Text[ japanese ] = "\"$name$\" に接続中...";
-    Text[ korean ] = "\"$name$\"에 연결하는 중 ...";
+    Text[ korean ] = "\"$name$\"에 연결하는 중...";
     Text[ chinese_simplified ] = "连接到 \"$name$\" ...";
     Text[ chinese_traditional ] = "連線到<$name$>...";
     Text[ turkish ] = "connecting to \"$name$\" ...";
@@ -1266,7 +1266,7 @@ String STR_LOADING_QUERY
     Text[ polish ] = "Trwa �adowanie kwerendy $name$ ...";
     Text[ portuguese_brazilian ] = "loading query $name$ ...";
     Text[ japanese ] = "クエリー $name$ の読み込み中...";
-    Text[ korean ] = "질의 $name$을(를) 로드하는 중 ...";
+    Text[ korean ] = "쿼리 $name$을(를) 로드 중...";
     Text[ chinese_simplified ] = "正在载入查询 $name$ ...";
     Text[ chinese_traditional ] = "載入查詢 $name$ ...";
     Text[ turkish ] = "loading query $name$ ...";
@@ -1293,7 +1293,7 @@ String STR_LOADING_TABLE
     Text[ polish ] = "Trwa �adowanie tabeli $name$ ...";
     Text[ portuguese_brazilian ] = "loading table $name$ ...";
     Text[ japanese ] = "テーブル $name$ の読み込み中...";
-    Text[ korean ] = "시트 $name$을(를) 로드하는 중 ...";
+    Text[ korean ] = "테이블 $name$을(를) 로드 중 ...";
     Text[ chinese_simplified ] = "正在载入表格 $name$ ...";
     Text[ chinese_traditional ] = "載入表格 $name$ ...";
     Text[ turkish ] = "loading table $name$ ...";
@@ -1321,7 +1321,7 @@ String STR_DSBROWSER_TITLE
         Text[ polish ] = "Widok �r�de� danych";
         Text[ portuguese_brazilian ] = "Data source browser";
         Text[ japanese ] = "データソースの表示";
-        Text[ korean ] = "데이터 소스 보기";
+        Text[ korean ] = "데이터 원본 보기";
         Text[ chinese_simplified ] = "数据源检视";
         Text[ chinese_traditional ] = "資料源檢視";
         Text[ turkish ] = "Data source browser";
@@ -1348,7 +1348,7 @@ String STR_NO_TABLE_FORMAT_INSIDE
         Text[ polish ] = "Nie znaleziono �adnego formatu tabeli.";
         Text[ portuguese_brazilian ] = "No table format found.";
         Text[ japanese ] = "テーブル書式は見つかりませんでした。";
-        Text[ korean ] = "시트 서식을 찾지 못했습니다.";
+        Text[ korean ] = "테이블 서식을 찾지 못했습니다.";
         Text[ chinese_simplified ] = "无法找到表格格式。";
         Text[ chinese_traditional ] = "無法找到表格格式。";
         Text[ turkish ] = "No table format found.";
@@ -1375,7 +1375,7 @@ String STR_COULDNOTCONNECT_DATASOURCE
         Text[ polish ] = "Brak po��czenia ze �r�d�em danych \"$name$\".";
         Text[ portuguese_brazilian ] = "The connection to the data source \"$name$\" could not be established.";
         Text[ japanese ] = "データソース \"$name$\" へ接続できませんでした。";
-        Text[ korean ] = "데이터 소스 \"$name$\"와의 연결을 설정하지 못했습니다.";
+        Text[ korean ] = "데이터 원본 \"$name$\"(으)로 연결하지 못했습니다.";
         Text[ chinese_simplified ] = "无法与数据源 \"$name$\" 建立连接。";
         Text[ chinese_traditional ] = "無法連線到資料源 \"$name$\" 。";
         Text[ turkish ] = "The connection to the data source \"$name$\" could not be established.";
@@ -1413,7 +1413,7 @@ Menu RID_MENU_REFRESH_DATA
                 Text[ polish ] = "Od�wie�";
                 Text[ portuguese_brazilian ] = "reconstruct";
                 Text[ japanese ] = "最新の情報に更新";
-                Text[ korean ] = "재생성";
+                Text[ korean ] = "최신 정보로 업데이트";
                 Text[ chinese_simplified ] = "重建";
                 Text[ chinese_traditional ] = "重建";
                 Text[ turkish ] = "reconstruct";
@@ -1433,3 +1433,9 @@ Menu RID_MENU_REFRESH_DATA
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 48c111177122..5586291bec3e 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbagrid.cxx,v $
  *
- *  $Revision: 1.63 $
+ *  $Revision: 1.64 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-18 15:48:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -514,7 +514,7 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
 
 //  if (0 == m_nPeerCreationLevel)
     {
-        Reference< ::com::sun::star::frame::XDispatch >  xDisp(mxPeer, UNO_QUERY);
+        Reference< ::com::sun::star::frame::XDispatch >  xDisp(getPeer(), UNO_QUERY);
         for (   StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin();
                 aIter != m_aStatusMultiplexer.end();
                 ++aIter)
@@ -528,7 +528,7 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
 //---------------------------------------------------------------------------------------
 void SAL_CALL SbaXGridControl::dispatch(const ::com::sun::star::util::URL& aURL, const Sequence< PropertyValue >& aArgs) throw( RuntimeException )
 {
-    Reference< ::com::sun::star::frame::XDispatch >  xDisp(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::frame::XDispatch >  xDisp(getPeer(), UNO_QUERY);
     if (xDisp.is())
         xDisp->dispatch(aURL, aArgs);
 }
@@ -546,11 +546,11 @@ void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListen
         }
 
         pMultiplexer->addInterface( _rxListener );
-        if ( mxPeer.is() )
+        if ( getPeer().is() )
         {
             if ( 1 == pMultiplexer->getLength() )
             {   // the first external listener for this URL
-                Reference< XDispatch >  xDisp( mxPeer, UNO_QUERY );
+                Reference< XDispatch >  xDisp( getPeer(), UNO_QUERY );
                 xDisp->addStatusListener( pMultiplexer, _rURL );
             }
             else
@@ -573,9 +573,9 @@ void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< ::com::sun:
         pMultiplexer->acquire();
     }
 
-    if (mxPeer.is() && pMultiplexer->getLength() == 1)
+    if (getPeer().is() && pMultiplexer->getLength() == 1)
     {
-        Reference< ::com::sun::star::frame::XDispatch >  xDisp(mxPeer, UNO_QUERY);
+        Reference< ::com::sun::star::frame::XDispatch >  xDisp(getPeer(), UNO_QUERY);
         xDisp->removeStatusListener(pMultiplexer, _rURL);
     }
     pMultiplexer->removeInterface( _rxListener );
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index a48ace8793fb..4f70e9cde2ff 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbagrid.src,v $
  *
- *  $Revision: 1.44 $
+ *  $Revision: 1.45 $
  *
- *  last change: $Author: kz $ $Date: 2002-09-05 10:52:52 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,7 +89,7 @@ Menu RID_SBA_GRID_COLCTXMENU
             Text [ italian ] = "Formattazione ~colonna..." ;
             Text [ portuguese_brazilian ] = "Formatar coluna..." ;
             Text [ portuguese ] = "~Formatar colunas..." ;
-            Text [ finnish ] = "Sarake~muoto" ;
+            Text [ finnish ] = "Sarake~muoto..." ;
             Text [ danish ] = "Kolonne~formatering..." ;
             Text [ french ] = "Formatage de colonne..." ;
             Text [ swedish ] = "Kolumn~formatering..." ;
@@ -97,13 +97,13 @@ Menu RID_SBA_GRID_COLCTXMENU
             Text [ spanish ] = "Formateado de ~columnas..." ;
             Text [ english_us ] = "Column ~Format..." ;
             Text[ chinese_simplified ] = "列格式(~F)...";
-            Text[ russian ] = "������ �������...";
+            Text[ russian ] = "������ �������...";
             Text[ polish ] = "Formatowanie kolumn...";
             Text[ japanese ] = "列の書式(~F)...";
             Text[ chinese_traditional ] = "欄格式(~F)...";
             Text[ arabic ] = "����� �������...";
             Text[ greek ] = "���~�������� ������...";
-            Text[ korean ] = "열 형식 지정(~F)...";
+            Text[ korean ] = "열 서식(~F)...";
             Text[ turkish ] = "S�tun format�...";
             Text[ catalan ] = "~Format de la columna...";
             Text[ thai ] = "~รูปแบบคอลัมน์...";
@@ -121,7 +121,7 @@ Menu RID_SBA_GRID_COLCTXMENU
             Text [ ENGLISH ] = "Copy column d~escription" ;
             Text[ english_us ] = "Copy Column D~escription";
             Text[ portuguese ] = "Copiar ~descri��o da coluna";
-            Text[ russian ] = "���������� �������� �������";
+            Text[ russian ] = "���������� �������� �������";
             Text[ greek ] = "��������� ��� �~��������� ��� ������";
             Text[ dutch ] = "~Kolomopschrift kopi�ren";
             Text[ french ] = "Copier la d~escription de la colonne";
@@ -164,16 +164,16 @@ Menu RID_SBA_GRID_ROWCTXMENU
             Text [ portuguese_brazilian ] = "Tabellenformatierung..." ;
             Text [ portuguese ] = "Formatar tabela..." ;
             Text[ chinese_simplified ] = "表格格式...";
-            Text[ russian ] = "������ �������...";
+            Text[ russian ] = "�����...";
             Text[ polish ] = "Formatowanie tabeli...";
             Text[ japanese ] = "テーブルの書式...";
             Text[ chinese_traditional ] = "工作表格式...";
             Text[ arabic ] = "����� ������...";
             Text[ greek ] = "����������� ������...";
-            Text[ korean ] = "시트 서식 지정...";
+            Text[ korean ] = "테이블 서식...";
             Text[ turkish ] = "Tablo format�...";
             Text[ catalan ] = "Format de la taula...";
-            Text[ finnish ] = "~Taulukon muotoilu";
+            Text[ finnish ] = "Taulun muotoilu...";
             Text[ thai ] = "รูปแบบตาราง...";
         };
         MenuItem
@@ -186,7 +186,7 @@ Menu RID_SBA_GRID_ROWCTXMENU
             Text [ italian ] = "Altezza riga..." ;
             Text [ portuguese_brazilian ] = "Altura da fileira..." ;
             Text [ portuguese ] = "Altura da linha..." ;
-            Text [ finnish ] = "Rivikorkeus" ;
+            Text [ finnish ] = "Rivikorkeus..." ;
             Text [ danish ] = "R�kkeh�jde..." ;
             Text [ french ] = "Hauteur de ligne..." ;
             Text [ swedish ] = "Radh�jd..." ;
@@ -216,7 +216,7 @@ String RID_STR_UNDO_MODIFY_RECORD
     Text[ portuguese ] = "Anular: entrada de dados";
     Text[ russian ] = "��������: ���� ������";
     Text[ greek ] = "��������: �������� ���������";
-    Text[ dutch ] = "Ongedaan maken: gegevens invoeren";
+    Text[ dutch ] = "Ongedaan maken: gegevensinvoer";
     Text[ french ] = "Annuler : saisie des donn�es";
     Text[ spanish ] = "Deshacer: Entrada de datos";
     Text[ italian ] = "Annulla: Immissione dati";
@@ -231,7 +231,7 @@ String RID_STR_UNDO_MODIFY_RECORD
     Text[ arabic ] = "�����: ����� ������";
     Text[ turkish ] = "Geri al: Veri giri�i";
     Text[ catalan ] = "Desf�s: entrada de dades";
-    Text[ finnish ] = "Peruuta: tietojen sy�tt�";
+    Text[ finnish ] = "Kumoa: Tietojen sy�tt�";
     Text[ thai ] = "เลิกทำ: ป้อนข้อมูล";
 };
 
@@ -242,7 +242,7 @@ String RID_STR_SAVE_CURRENT_RECORD
     Text[ english_us ] = "Save current record";
     Text[ portuguese ] = "Guardar registo de dados activo";
     Text[ russian ] = "��������� ������� ������";
-    Text[ dutch ] = "Actuele record opslaan";
+    Text[ dutch ] = "Huidige record opslaan";
     Text[ french ] = "Enregistrer l'enregistrement actif";
     Text[ spanish ] = "Guardar registro actual";
     Text[ italian ] = "Salva record di dati attuale";
@@ -254,10 +254,10 @@ String RID_STR_SAVE_CURRENT_RECORD
     Text[ chinese_simplified ] = "存盘当前的数据条目";
     Text[ chinese_traditional ] = "儲存目前的資料條目";
     Text[ arabic ] = "��� ����� ������";
-    Text[ dutch ] = "Actuele record opslaan";
+    Text[ dutch ] = "Huidige record opslaan";
     Text[ chinese_simplified ] = "存盘当前的数据条目";
     Text[ greek ] = "���������� ��������� ��������";
-    Text[ korean ] = "현재의 레코드 저장";
+    Text[ korean ] = "현재 레코드 저장";
     Text[ turkish ] = "Y�r�rl�kteki verileri kaydet";
     Text[ catalan ] = "Desa el registre actual";
     Text[ finnish ] = "Tallenna nykyinen tietue";
@@ -284,7 +284,7 @@ String STR_QRY_TITLE
     Text[ dutch ] = "Query #";
     Text[ chinese_simplified ] = "查询 #";
     Text[ greek ] = "������� #";
-    Text[ korean ] = "질의 #";
+    Text[ korean ] = "쿼리 #";
     Text[ chinese_traditional ] = "查詢 #";
     Text[ arabic ] = "��������� #";
     Text[ turkish ] = "Sorgu #";
@@ -313,13 +313,13 @@ String STR_TBL_TITLE
     Text[ dutch ] = "Tabel #";
     Text[ chinese_simplified ] = "表格 #";
     Text[ greek ] = "������� #";
-    Text[ korean ] = "시트 #";
+    Text[ korean ] = "테이블 #";
     Text[ chinese_traditional ] = "表格 #";
     Text[ arabic ] = "������ #";
     Text[ turkish ] = "Tablo #";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Taula #";
-    Text[ finnish ] = "Taulukko #";
+    Text[ finnish ] = "Taulu #";
     Text[ thai ] = "ตาราง #";
 };
 String STR_VIEW_TITLE
@@ -328,7 +328,7 @@ String STR_VIEW_TITLE
     Text [ ENGLISH ] = "View #" ;
     Text [ english_us ] = "View #" ;
     Text[ portuguese ] = "Vista #";
-    Text[ russian ] = "��� #";
+    Text[ russian ] = "������������� #";
     Text[ greek ] = "������� #";
     Text[ dutch ] = "Beeld #";
     Text[ french ] = "Vue #";
@@ -339,7 +339,7 @@ String STR_VIEW_TITLE
     Text[ polish ] = "Widok #";
     Text[ portuguese_brazilian ] = "View #";
     Text[ japanese ] = "ビュー #";
-    Text[ korean ] = "전면 #";
+    Text[ korean ] = "보기 #";
     Text[ chinese_simplified ] = "视图 #";
     Text[ chinese_traditional ] = "檢視 #";
     Text[ turkish ] = "View #";
@@ -360,14 +360,14 @@ String STR_OBJECT_ALREADY_EXISTS
     Text[ dutch ] = "De naam # bestaat reeds.";
     Text[ french ] = "Le nom # existe d�j�.";
     Text[ spanish ] = "El nombre \"#\" ya existe.";
-    Text[ finnish ] = "The name # already exists.";
+    Text[ finnish ] = "Nimi # on jo olemassa.";
     Text[ italian ] = "Il nome \"#\" esiste gi�.";
     Text[ danish ] = "Navnet # findes allerede.";
     Text[ swedish ] = "Namnet # finns redan.";
     Text[ polish ] = "Nazwa # ju� istnieje.";
     Text[ portuguese_brazilian ] = "The name # already exists.";
     Text[ japanese ] = "名前 # はすでにあります。";
-    Text[ korean ] = "이름 #가(이) 이미 있습니다.";
+    Text[ korean ] = "이름 \"#\"가(이) 이미 있습니다.";
     Text[ chinese_simplified ] = "名称 # 已经存在。";
     Text[ chinese_traditional ] = "名稱 # 已經存在。";
     Text[ turkish ] = "The name # already exists.";
@@ -382,12 +382,12 @@ String STR_NO_COLUMNNAME_MATCHING
     Text [ ENGLISH ] = "No matching column names found." ;
     Text[ english_us ] = "No matching column names were found.";
     Text[ portuguese ] = "Foi imposs�vel encontrar nomes de colunas correspondentes!";
-    Text[ russian ] = "����� ���������� ����� �������� �� �������.";
+    Text[ russian ] = "�� ������� ��������������� ���� ��������.";
     Text[ greek ] = "No matching column names found.";
     Text[ dutch ] = "Geen overeenstemmende kolomnamen gevonden!";
     Text[ french ] = "Impossible de d�tecter les noms de colonnes correspondants !";
     Text[ spanish ] = "No se encontraron nombres de columna id�nticos.";
-    Text[ finnish ] = "No matching column names found.";
+    Text[ finnish ] = "Vastaavia sarakkeiden nimi� ei l�ytynyt.";
     Text[ italian ] = "Non � stato trovato alcun nome di colonna corrispondente.";
     Text[ danish ] = "Der kunne ikke findes noget passende kolonnenavn!";
     Text[ swedish ] = "Det gick inte att hitta n�gra kolumnnamn som st�mmer �verens.";
@@ -408,19 +408,19 @@ String STR_ERROR_OCCURED_WHILE_COPYING
     Text [ ENGLISH ] = "A error occured. Would you like to continue the copying?" ;
     Text[ english_us ] = "An error occurred. Do you want to continue copying?";
     Text[ portuguese ] = "Ocorreu um erro. Continuar o processo de c�pia?";
-    Text[ russian ] = "��������� ������. ���������� ������� ����������� �������� �� ���?";
+    Text[ russian ] = "������. ���������� �����������?";
     Text[ greek ] = "A error occured. Would you like to continue the copying?";
     Text[ dutch ] = "Er is een fout opgetreden. Wilt u doorgaan met kopi�ren?";
     Text[ french ] = "Une erreur est survenue ! Continuer le processus de copie ?";
     Text[ spanish ] = "�Ha ocurrido un error! �Desea continuar el proceso de copia?";
-    Text[ finnish ] = "A error occured. Would you like to continue the copying?";
+    Text[ finnish ] = "On tapahtunut virhe. Haluatko jatkaa kopiointia?";
     Text[ italian ] = "Si � verificato un errore. Volete proseguire il processo di copia?";
     Text[ danish ] = "Der er opst�et en fejl ! Vil du forts�tte kopieringen?";
     Text[ swedish ] = "Det har uppst�tt ett fel. Vill du forts�tta att kopiera?";
     Text[ polish ] = "Wyst�pi� b��d! Kontynuowa� proces kopiowania?";
     Text[ portuguese_brazilian ] = "A error occured. Would you like to continue the copying?";
     Text[ japanese ] = "エラーが発生しました。コピー処理を続行しますか。";
-    Text[ korean ] = "오류 발생! 복사를 계속 진행하시겠습니다?";
+    Text[ korean ] = "오류가 발생했습니다. 복사를 계속 진행하시겠습니다?";
     Text[ chinese_simplified ] = "出现一个错误！还是要继续复制？";
     Text[ chinese_traditional ] = "已經發生一個錯誤。要繼續複製？";
     Text[ turkish ] = "A error occured. Would you like to continue the copying?";
@@ -438,14 +438,14 @@ String STR_DATASOURCE_GRIDCONTROL_NAME
     Text[ greek ] = "Datasource tableview";
     Text[ dutch ] = "Datasource tableview";
     Text[ french ] = "Vue de table de la source de donn�es";
-    Text[ spanish ] = "Vista tabla de la fuente de datos";
+    Text[ spanish ] = "Vista de tabla de la fuente de datos";
     Text[ finnish ] = "Datasource tableview";
     Text[ italian ] = "Vista tabella della sorgente dati";
     Text[ danish ] = "Datasource tableview";
     Text[ swedish ] = "Datak�llans tabellvisning";
     Text[ polish ] = "Datasource tableview";
     Text[ japanese ] = "データソースのテーブルビュー";
-    Text[ korean ] = "데이터소스의 테이블 보기";
+    Text[ korean ] = "데이터 원본의 테이블 보기";
     Text[ chinese_simplified ] = "数据源的表格视图";
     Text[ chinese_traditional ] = "資料源的表格檢視";
     Text[ turkish ] = "Datasource tableview";
@@ -484,3 +484,9 @@ String STR_DATASOURCE_GRIDCONTROL_DESC
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 1db1cd563c66..4b12a0d28119 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodatbr.cxx,v $
  *
- *  $Revision: 1.147 $
+ *  $Revision: 1.148 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-26 11:57:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3245,10 +3245,16 @@ void SbaTableQueryBrowser::implAdministrate( SvLBoxEntry* _pApplyTo )
     {
         // the parameters:
         Sequence< Any > aArgs(2);
+
+        Reference< ::com::sun::star::awt::XWindow> xWindow = getTopMostContainerWindow();
+        if ( !xWindow.is() )
+            xWindow = VCLUnoHelper::GetInterface(m_pTreeView->getListBox()->Window::GetParent());
         // the parent window
-        aArgs[0] <<= PropertyValue(
-            ::rtl::OUString::createFromAscii("ParentWindow"), 0,
-            makeAny(VCLUnoHelper::GetInterface(m_pTreeView->getListBox()->Window::GetParent())), PropertyState_DIRECT_VALUE);
+        aArgs[0] <<= PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")),
+                                    0,
+                                    makeAny(xWindow),
+                                    PropertyState_DIRECT_VALUE);
+
         // the initial selection
         SvLBoxEntry* pTopLevelSelected = _pApplyTo;
         while (pTopLevelSelected && m_pTreeView->getListBox()->GetParent(pTopLevelSelected))
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 1c4cc2aa1885..1097138be720 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescControl.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-04 08:16:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -170,6 +170,9 @@
 #ifndef _DBHELPER_DBCONVERSION_HXX_
 #include <connectivity/dbconversion.hxx>
 #endif
+#ifndef _TRANSFER_HXX
+#include <svtools/transfer.hxx>
+#endif
 
 using namespace dbaui;
 using namespace dbtools;
@@ -862,7 +865,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
     if(pListBox == m_pType)
     {
         pListBox->SaveValue();
-        const OTypeInfo* pTypeInfo = getTypeInfo(m_pType->GetSelectEntryPos());
+        TOTypeInfoSP pTypeInfo = getTypeInfo(m_pType->GetSelectEntryPos());
         pActFieldDescr->SetType(pTypeInfo);
 
         DisplayData(pActFieldDescr);
@@ -1484,7 +1487,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
         DeactivateAggregate( tpColumnName );
         DeactivateAggregate( tpType );
         DeactivateAggregate( tpAutoIncrementValue );
-        m_pPreviousType = NULL;
+        m_pPreviousType = TOTypeInfoSP();
         //////////////////////////////////////////////////////////////////////
         // Zeiger des gespeicherten Focus zuruecksetzen
         pLastFocusWindow = NULL;
@@ -1494,14 +1497,14 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
 
     ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::AddWindow));
 
-    const OTypeInfo* pFieldType = NULL;
+    TOTypeInfoSP pFieldType;
     if( pFieldDescr )
         pFieldType = pFieldDescr->getTypeInfo();
 
     ActivateAggregate( tpColumnName );
     ActivateAggregate( tpType );
 
-    OSL_ENSURE(pFieldType,"We need a type information here!");
+    OSL_ENSURE(pFieldType.get(),"We need a type information here!");
     //////////////////////////////////////////////////////////////////////
     // Wenn sich der Typ geaendert hat, Controls austauschen
     if( m_pPreviousType != pFieldType )
@@ -1545,7 +1548,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
         if (pFieldType->nPrecision)
         {
             ActivateAggregate( tpLength );
-            pLength->SetMax(pFieldType->nPrecision);
+            pLength->SetMax(::std::max<sal_Int32>(pFieldType->nPrecision,pFieldDescr->GetPrecision()));
             pLength->SetSpecialReadOnly(pFieldType->aCreateParams.getLength()==0);
         }
         else
@@ -1554,7 +1557,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
         if (pFieldType->nMaximumScale)
         {
             ActivateAggregate( tpScale );
-            pScale->SetMax(pFieldType->nMaximumScale);
+            pScale->SetMax(::std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale()));
             pScale->SetMin(pFieldType->nMinimumScale);
             pScale->SetSpecialReadOnly(pFieldType->aCreateParams.getLength()==0);
         }
@@ -1575,7 +1578,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
                 if (pFieldType->nPrecision)
                 {
                     ActivateAggregate( tpTextLen );
-                    pTextLen->SetMax(pFieldType->nPrecision);
+                    pTextLen->SetMax(::std::max<sal_Int32>(pFieldType->nPrecision,pFieldDescr->GetPrecision()));
                     pTextLen->SetSpecialReadOnly(pFieldType->aCreateParams.getLength()==0);
                 }
                 else
@@ -1647,9 +1650,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
         {
             DeactivateAggregate( tpRequired );
         }
-        else if(!pAutoIncrement && pFieldType)
+        else if ( !pAutoIncrement && pFieldType.get() )
         {
-            if(pFieldType->bNullable)
+            if ( pFieldType->bNullable )
                 ActivateAggregate( tpRequired );
             else
                 DeactivateAggregate( tpRequired );
@@ -1691,12 +1694,12 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
         String sDef = BoolStringUI(::comphelper::getString(pFieldDescr->GetControlDefault()));
 
         // sicher stellen das <<keiner>> nur vorhanden ist, wenn das Feld NULL sein darf
-        if(pFieldType && !pFieldType->bNullable || !pFieldDescr->IsNullable() )
+        if ( pFieldType.get() && !pFieldType->bNullable || !pFieldDescr->IsNullable() )
         {
             pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); // der Typ sagt das
 
             pBoolDefault->RemoveEntry(String(ModuleRes(STR_VALUE_NONE)));
-            if (!sDef.Equals(aYes) && !sDef.Equals(aNo))
+            if ( !sDef.Equals(aYes) && !sDef.Equals(aNo) )
                 pBoolDefault->SelectEntryPos(1);  // nein als Default
             else
                 pBoolDefault->SelectEntry(sDef);
@@ -1934,10 +1937,8 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
     else
         pFieldDescr->SetIsNullable( ColumnValue::NULLABLE );
 
-    if(pAutoIncrement && pAutoIncrement->GetSelectEntryPos() == 0 )
-        pFieldDescr->SetAutoIncrement( sal_True );
-    else
-        pFieldDescr->SetAutoIncrement( sal_False );
+    if ( pAutoIncrement )
+        pFieldDescr->SetAutoIncrement( pAutoIncrement->GetSelectEntryPos() == 0 );
 
     if( pTextLen )
         pFieldDescr->SetPrecision( pTextLen->GetValue() );
@@ -2028,6 +2029,21 @@ sal_Bool OFieldDescControl::isCutAllowed()
     return bAllowed;
 }
 // -----------------------------------------------------------------------------
+sal_Bool OFieldDescControl::isPasteAllowed()
+{
+    sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
+                        (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample    ||
+                        m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength           ||
+                        m_pActFocusWindow == pScale  || m_pActFocusWindow == m_pColumnName      ||
+                        m_pActFocusWindow == m_pAutoIncrementValue);
+    if ( bAllowed )
+    {
+        TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
+        bAllowed = aTransferData.HasFormat(SOT_FORMAT_STRING);
+    }
+    return bAllowed;
+}
+// -----------------------------------------------------------------------------
 void OFieldDescControl::cut()
 {
     if(isCutAllowed())
@@ -2036,7 +2052,7 @@ void OFieldDescControl::cut()
 // -----------------------------------------------------------------------------
 void OFieldDescControl::copy()
 {
-    if(isCutAllowed()) // this only checks if the focus window is valid
+    if(isCopyAllowed()) // this only checks if the focus window is valid
         reinterpret_cast<Edit*>(m_pActFocusWindow)->Copy();
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src
index 58a832e85463..4c43936a321e 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.src
+++ b/dbaccess/source/ui/control/TableGrantCtrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableGrantCtrl.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:07:55 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,7 @@ String STR_TABLE_PRIV_NAME
     Text[ russian ] = "��� �������";
     Text[ greek ] = "����� ������";
     Text[ dutch ] = "Tabelnaam";
-    Text[ french ] = "Nom de table";
+    Text[ french ] = "Nom de la table";
     Text[ spanish ] = "Nombre de tabla";
     Text[ italian ] = "Nome tabella";
     Text[ danish ] = "Tabelnavn";
@@ -80,7 +80,7 @@ String STR_TABLE_PRIV_NAME
     Text[ polish ] = "Nazwa tabeli";
     Text[ portuguese_brazilian ] = "Tablename";
     Text[ japanese ] = "テーブル名";
-    Text[ korean ] = "시트 이름";
+    Text[ korean ] = "테이블 이름";
     Text[ chinese_simplified ] = "表格名称";
     Text[ chinese_traditional ] = "表格名稱";
     Text[ arabic ] = "��� ������";
@@ -127,7 +127,7 @@ String STR_TABLE_PRIV_DELETE
     Text[ greek ] = "��������";
     Text[ dutch ] = "Gegevens wissen";
     Text[ french ] = "Supprimer les donn�es";
-    Text[ spanish ] = "Eliminar datos";
+    Text[ spanish ] = "Borrar datos";
     Text[ finnish ] = "Poista tietoja";
     Text[ italian ] = "Elimina dati";
     Text[ danish ] = "Slet data";
@@ -162,7 +162,7 @@ String STR_TABLE_PRIV_UPDATE
     Text[ polish ] = "Modyfikuj dane";
     Text[ portuguese_brazilian ] = "Update";
     Text[ japanese ] = "データの変更";
-    Text[ korean ] = "데이터 수정";
+    Text[ korean ] = "데이터 변경";
     Text[ chinese_simplified ] = "更改数据";
     Text[ chinese_traditional ] = "變更資料";
     Text[ turkish ] = "De�i�tir";
@@ -261,7 +261,7 @@ String STR_TABLE_PRIV_DROP
     Text[ greek ] = "Droping";
     Text[ dutch ] = "Structuur wissen";
     Text[ french ] = "Supprimer la structure";
-    Text[ spanish ] = "Eliminar estructura";
+    Text[ spanish ] = "Borrar la estructura";
     Text[ finnish ] = "Pudota rakenne";
     Text[ italian ] = "Elimina struttura";
     Text[ danish ] = "Slet struktur";
@@ -282,3 +282,9 @@ String STR_TABLE_PRIV_DROP
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 3d8e8e38767c..dc87b71463d2 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: curledit.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: fs $ $Date: 2001-09-28 14:53:55 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -188,25 +188,3 @@ String OConnectionURLEdit::GetText() const
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2001/08/16 13:35:33  hr
- *  #65293#: syntax
- *
- *  Revision 1.4  2001/08/15 13:17:57  oj
- *  #88644# insert some DBG's
- *
- *  Revision 1.3  2000/10/24 12:08:19  fs
- *  S/GetTextNoPrefix
- *
- *  Revision 1.2  2000/10/18 16:00:47  fs
- *  use the system's DialogColor as background for the fixed text - looks much better
- *
- *  Revision 1.1  2000/10/05 09:59:38  fs
- *  edit control for connection urls
- *
- *
- *  Revision 1.0 28.09.00 13:12:21  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 763b4e02adc9..165807bed705 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: listviewitems.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-30 08:29:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,10 +115,3 @@ namespace dbaui
 }   // namespace dbaui
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 29.01.01 10:26:53  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 977ab814d860..302b4e0f9fc1 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: marktree.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:41:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -355,34 +355,3 @@ SvLBoxEntry* OMarkableTreeListBox::GetEntryPosByName(const String& aName,SvLBoxE
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.8  2002/07/22 07:37:42  oj
- *  #101514# remove resource entries for PLUS and MINUS
- *
- *  Revision 1.7  2002/05/24 09:54:45  gt
- *  #99251# use of default images from SvLBoxButtonData
- *
- *  Revision 1.6  2002/04/29 08:49:26  oj
- *  #98772# hi contrast changes
- *
- *  Revision 1.5  2001/06/20 09:53:46  fs
- *  #88485# corrected implDetermineState for a special case
- *
- *  Revision 1.4  2001/04/27 08:10:27  fs
- *  +implDeterminedState - needed to correctly implement CheckButtons
- *
- *  Revision 1.3  2001/01/30 08:30:11  fs
- *  +checkedButton_noBroadcast
- *
- *  Revision 1.2  2000/10/09 12:34:33  fs
- *  use a different font when painting a disabled control
- *
- *  Revision 1.1  2000/10/05 10:00:43  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 28.09.00 13:22:30  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 45f2704faade..e516c965411f 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabletree.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-07 13:06:33 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -638,73 +638,3 @@ void OTableTreeListBox::removedTable( const Reference< XConnection >& _rxConn, c
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.21  2002/08/19 07:41:26  oj
- *  #99473# change string resource files
- *
- *  Revision 1.20  2002/04/29 08:49:26  oj
- *  #98772# hi contrast changes
- *
- *  Revision 1.19  2001/08/28 08:21:51  fs
- *  #91573# UpdateTableList returns the driver used for connecting
- *
- *  Revision 1.18  2001/08/14 14:13:33  fs
- *  #86945# removed the tables container parameter from UpdateTableList
- *
- *  Revision 1.17  2001/08/14 12:13:53  fs
- *  preparations for #86945#
- *
- *  Revision 1.16  2001/07/16 15:43:24  fs
- *  #89709# special emphasizing handling for the 'all objects' entry
- *
- *  Revision 1.15  2001/06/25 09:05:56  fs
- *  #88417# insert the 'all object' entry even if there currently are no objects
- *
- *  Revision 1.14  2001/06/05 12:39:45  fs
- *  #87680# implEmphasize corrected / #87771# UpdateTableList: ask for VIEW, TABLE and
- *
- *  Revision 1.13  2001/05/22 06:31:30  oj
- *  #87081# show all tabletypes
- *
- *  Revision 1.12  2001/05/15 11:25:48  fs
- *  #86996# use the connection pool instead of the driver manager
- *
- *  Revision 1.11  2001/03/29 08:06:35  oj
- *  only assign array when length != 0
- *
- *  Revision 1.10  2001/03/29 07:09:53  oj
- *  show views the correct way
- *
- *  Revision 1.9  2001/02/23 15:16:28  oj
- *  use namespace
- *
- *  Revision 1.8  2001/02/05 14:44:53  oj
- *  new member for hiding first entry
- *
- *  Revision 1.7  2001/01/30 08:29:43  fs
- *  'wildcard checking'
- *
- *  Revision 1.6  2001/01/15 10:55:43  oj
- *  wrong image for table used
- *
- *  Revision 1.5  2000/10/30 15:37:48  fs
- *  #79816# no need for a XDataDefinitionSupplier anymore - collect table/view names from the meta data
- *
- *  Revision 1.4  2000/10/26 14:55:04  oj
- *  local strings for dll
- *
- *  Revision 1.3  2000/10/13 16:02:21  fs
- *  typo in error message
- *
- *  Revision 1.2  2000/10/09 12:36:50  fs
- *  reinserted the code for connecting in UpdateTableList
- *
- *  Revision 1.1  2000/10/05 10:00:59  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 28.09.00 13:32:32  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src
index 593e4d7e0914..a397f1a89e2f 100644
--- a/dbaccess/source/ui/control/tabletree.src
+++ b/dbaccess/source/ui/control/tabletree.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabletree.src,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:31:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -182,7 +182,7 @@ String STR_COULDNOTCREATE_DRIVERMANAGER
     Text[ polish ] = "Brak po��czenia z mened�erem sterownika SDCB (#servicename#).";
     Text[ portuguese_brazilian ] = "The connection to the SDBC driver manager (#servicename#) could not be established.";
     Text[ japanese ] = "SDBC ドライバマネジャー(#servicename#)へ接続できませんでした。";
-    Text[ korean ] = "SDBC 드라이버 관리자 (#servicename#)에 대한 연결을) 구축하지 못했습니다.";
+    Text[ korean ] = "SDBC 드라이버 관리자(#servicename#)로 연결하지 못했습니다.";
     Text[ chinese_simplified ] = "无法和 SDBC 驱动程式管理器(#servicename#)建立连接。";
     Text[ chinese_traditional ] = "無法連線到 SDBC 驅動程式管理(#servicename#) 。";
     Text[ turkish ] = "The connection to the SDBC driver manager (#servicename#) could not be established.";
@@ -209,7 +209,7 @@ String STR_NOREGISTEREDDRIVER
     Text[ polish ] = "Brak zarejestrowanego sterownika dla URL #connurl# !";
     Text[ portuguese_brazilian ] = "There is no registered driver for the URL #connurl#";
     Text[ japanese ] = "URL #connurl# のドライバが登録されていません。";
-    Text[ korean ] = "URL #connurl#에 대해 등록된 드라이버가 없습니다!";
+    Text[ korean ] = "URL #connurl#에 대해 등록된 드라이버가 없습니다.";
     Text[ chinese_simplified ] = "没有为 URL #connurl# 登记驱动程序。";
     Text[ chinese_traditional ] = "不存在任何登記的 URL #connurl# 驅動程序。";
     Text[ turkish ] = "There is no registered driver for the URL #connurl#";
@@ -236,7 +236,7 @@ String STR_COULDNOTCONNECT
     Text[ polish ] = "Brak po��czenia z URL #connurl#.";
     Text[ portuguese_brazilian ] = "A connection could not be established for URL #connurl#.";
     Text[ japanese ] = "URL #connurl# へ接続できませんでした。";
-    Text[ korean ] = "URL #connurl#에 연결하지 못했습니다 .";
+    Text[ korean ] = "URL #connurl#에 연결하지 못했습니다.";
     Text[ chinese_simplified ] = "无法和 URL #connurl# 建立连接。";
     Text[ chinese_traditional ] = "無法連線到 URL #connurl# 。";
     Text[ turkish ] = "A connection could not be established for URL #connurl#.";
@@ -262,7 +262,7 @@ String STR_COULDNOTCONNECT_PLEASECHECK
     Text[ polish ] = "Sprawd� bie��ce konfiguracje, np. nazw� u�ytkownika i has�o.";
     Text[ portuguese_brazilian ] = "Please check the current settings, e.g. with respect to user name and password.";
     Text[ japanese ] = "ユーザー名やパスワードなど、現在設定されている内容をもう一度チェックしてください。";
-    Text[ korean ] = "사용자 이름과 암호 등에 관한 현재 설정을 점검하십시오.";
+    Text[ korean ] = "사용자 이름과 암호 등에 관한 현재 설정을 확인해 보십시오.";
     Text[ chinese_simplified ] = "请您检查当前的设定，如使用名和密码。";
     Text[ chinese_traditional ] = "請您檢查目前的設定，如使用者和密碼。";
     Text[ turkish ] = "Please check the current settings, e.g. with respect to user name and password.";
@@ -288,7 +288,7 @@ String STR_NOTABLEINFO
     Text[ polish ] = "Po��czenie zosta�o pomy�lnie ustanowione, ale nadal brak informacji o tabelach w bazie danych.";
     Text[ portuguese_brazilian ] = "A connection was established sucessfully, but no informations about tables and/or views could be gathered.";
     Text[ japanese ] = "正常に接続できましたが、データベースのテーブルに関する情報がありません。";
-    Text[ korean ] = "연결은 성공적으로 구축되었지만, 시트 및 보기에 대한 정보를 수집하지 못했습니다.";
+    Text[ korean ] = "성공적으로 연결이 되었지만 데이터베이스 테이블에 관한 정보는 없습니다.";
     Text[ chinese_simplified ] = "连接已经成功，但是无法获得相关的数据库表格数据。";
     Text[ chinese_traditional ] = "已經成功連線，但是沒有找到資料庫的表格內容。";
     Text[ turkish ] = "A connection was established sucessfully, but no informations about tables and/or views could be gathered.";
@@ -314,7 +314,7 @@ String STR_ALL_TABLES
     Text[ polish ] = "Wszystkie tabele";
     Text[ portuguese_brazilian ] = "All tables";
     Text[ japanese ] = "すべてのテーブル";
-    Text[ korean ] = "모든 시트";
+    Text[ korean ] = "모든 테이블";
     Text[ chinese_simplified ] = "全部的表格";
     Text[ chinese_traditional ] = "全部的表格";
     Text[ turkish ] = "All tables";
@@ -340,7 +340,7 @@ String STR_ALL_VIEWS
     Text[ polish ] = "Wszystkie widoki tabeli";
     Text[ portuguese_brazilian ] = "All views";
     Text[ japanese ] = "すべてのテーブルビュー";
-    Text[ korean ] = "모든 시트 보기";
+    Text[ korean ] = "모두 보기";
     Text[ chinese_simplified ] = "全部的表格视图";
     Text[ chinese_traditional ] = "所有的表格檢視";
     Text[ turkish ] = "All views";
@@ -366,7 +366,7 @@ String STR_ALL_TABLES_AND_VIEWS
     Text[ polish ] = "Wszystkie tabele i widoki tabeli";
     Text[ portuguese_brazilian ] = "All tables and views";
     Text[ japanese ] = "すべてのテーブルとテーブルビュー";
-    Text[ korean ] = "모든 시트와 시트 보기";
+    Text[ korean ] = "모든 테이블 및 테이블 보기";
     Text[ chinese_simplified ] = "全部的表格和表格视图";
     Text[ chinese_traditional ] = "所有的表格和表格檢視";
     Text[ turkish ] = "All tables and views";
@@ -379,6 +379,26 @@ String STR_ALL_TABLES_AND_VIEWS
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.32.2.3  2003/02/23 12:00:54  nf
+ *  trasnlation 6.1 Beta / OOo 1.1 Beta / final wave
+ *
+ *  Revision 1.32.2.2  2003/02/23 11:00:44  nf
+ *  6.1 Beta 1/OOo 1.1 Beta translation, second wave
+ *
+ *  Revision 1.32.2.1  2003/02/22 15:45:16  hr
+ *  INTEGRATION: CWS mergep (1.32.20); FILE MERGED
+ *  2003/02/22 10:44:23 nf 1.32.20.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 12:51:05 hjs 1.32.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.32.20.2  2003/02/22 10:44:23  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.32.20.1  2003/01/31 12:51:05  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.32  2002/12/05 10:31:18  kz
+ *  Merge SRX644: 05.12.02 - 11:27:18
+ *
  *  Revision 1.31  2002/11/25 15:12:07  kz
  *  Merge SRX644: 25.11.02 - 16:08:58
  *
@@ -485,3 +505,9 @@ String STR_ALL_TABLES_AND_VIEWS
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src
index c4ffdad21f9b..35aaf4548c02 100644
--- a/dbaccess/source/ui/control/undosqledit.src
+++ b/dbaccess/source/ui/control/undosqledit.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: undosqledit.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: rt $ $Date: 2002-09-05 10:52:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@ String STR_QUERY_UNDO_MODIFYSQLEDIT
     Text = "SQL modifizieren" ;
     Text [ ENGLISH ] = "Modify SQL" ;
     Text [ english_us ] = "Modify SQL statement(s)" ;
-    Text [ portuguese_brazilian ] = "SQL modifizieren" ;
+    Text [ portuguese_brazilian ] = "Modificar as instru��es SQL" ;
     Text [ swedish ] = "Modifiera SQL" ;
     Text [ danish ] = "Modificer SQL" ;
     Text [ italian ] = "Modifica SQL" ;
@@ -77,19 +77,19 @@ String STR_QUERY_UNDO_MODIFYSQLEDIT
     Text [ dutch ] = "SQL modificeren" ;
     Text [ portuguese ] = "Modificar SQL" ;
     Text[ chinese_simplified ] = "修改 SQL";
-    Text[ russian ] = "�������� SQL";
+    Text[ russian ] = "�������� ���������� SQL";
     Text[ polish ] = "Modyfikuj SQL";
     Text[ japanese ] = "SQL の変更";
     Text[ chinese_traditional ] = "修改 SQL";
     Text[ dutch ] = "SQL modificeren";
     Text[ chinese_simplified ] = "修改 SQL";
     Text[ greek ] = "����������� ��� SQL";
-    Text[ korean ] = "SQL 수정";
+    Text[ korean ] = "SQL 변경";
     Text[ arabic ] = "SQL �����";
     Text[ turkish ] = "SQL deyimini de�i�tir";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Modifica les expressions SQL";
-    Text[ finnish ] = "Muokkaa SQL-lauseketta tai -lausekkeita ";
+    Text[ finnish ] = "Muuta SQL-lausetta tai -lauseita";
     Text[ thai ] = "ดัดแปลงแก้ไขประโยค SQL ";
 };
 
@@ -101,3 +101,9 @@ String STR_QUERY_UNDO_MODIFYSQLEDIT
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index 74972a7d4932..230271247d5e 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.src
+++ b/dbaccess/source/ui/dlg/AdabasStat.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AdabasStat.src,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:31:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -266,7 +266,7 @@ ModalDialog DLG_ADABASSTAT
         Text[ polish ] = "��czna wielko�� (MB):";
         Text[ portuguese_brazilian ] = "S~ize (MB):";
         Text[ japanese ] = "全体のサイズ(MB)(~I):";
-        Text[ korean ] = "총 크기(~I)";
+        Text[ korean ] = "총 용량(MB)(~I):";
         Text[ chinese_simplified ] = "总计大小(MB)(~I)：";
         Text[ chinese_traditional ] = "大小(MB)(~I)：";
         Text[ arabic ] = "����� �������� (�����������):";
@@ -304,7 +304,7 @@ ModalDialog DLG_ADABASSTAT
         Text[ polish ] = "~Wolna pami�� (MB):";
         Text[ portuguese_brazilian ] = "~Unused space (MB):";
         Text[ japanese ] = "空き容量(MB)(~F):";
-        Text[ korean ] = "남은 저장 공간(~F)";
+        Text[ korean ] = "사용 가능 저장 공간(MB)(~F):";
         Text[ chinese_simplified ] = "可用空间(MB)(~F)：";
         Text[ chinese_traditional ] = "可用空間(MB)(~F)：";
         Text[ arabic ] = "������� ����� (�����������):";
@@ -334,7 +334,7 @@ ModalDialog DLG_ADABASSTAT
         Text[ russian ] = "~������ ������ (� %):";
         Text[ greek ] = "�������� ������ (�� %):";
         Text[ dutch ] = "~Gebruikt geheugen (in %):";
-        Text[ french ] = "M�moire ~utilis�e (en %):";
+        Text[ french ] = "M�moire ~utilis�e (en %) :";
         Text[ spanish ] = "~Memoria utilizada (en %):";
         Text[ italian ] = "Memoria utilizzata (in %):";
         Text[ danish ] = "H~ukommelsesbrug (i %):";
@@ -342,7 +342,7 @@ ModalDialog DLG_ADABASSTAT
         Text[ polish ] = "~Wykorzystana pami�� (w %):";
         Text[ portuguese_brazilian ] = "~Memory using (in %):";
         Text[ japanese ] = "ディスク使用量(%)(~M):";
-        Text[ korean ] = "메모리 사용량 (%)(~M)";
+        Text[ korean ] = "메모리 사용량 (%로)(~M):";
         Text[ chinese_simplified ] = "内存使用率(%)(~M)：";
         Text[ chinese_traditional ] = "主記憶體占用(%)(~M)：";
         Text[ arabic ] = "������� ��������� (������ �������):";
@@ -411,7 +411,7 @@ String STR_ADABAS_HELP_SYSDEVSPACE
     Text[ polish ] = "Zawiera tabele systemu";
     Text[ portuguese_brazilian ] = "Contains the system tables";
     Text[ japanese ] = "システムテーブルを含む";
-    Text[ korean ] = "시스템 테이블 포함";
+    Text[ korean ] = "시스템 테이블을 포함합니다.";
     Text[ chinese_simplified ] = "含有系统表格";
     Text[ chinese_traditional ] = "含有系統表格";
     Text[ turkish ] = "Contains the system tables";
@@ -438,7 +438,7 @@ String STR_ADABAS_HELP_TRANSACT
     Text[ polish ] = "Zawiera informacje o transakcji";
     Text[ portuguese_brazilian ] = "Contains information about transactions";
     Text[ japanese ] = "トランザクションの情報を含む";
-    Text[ korean ] = "트랜잭션에 대한 정보 포함";
+    Text[ korean ] = "트랜잭션에 관한 정보를 포함합니다.";
     Text[ chinese_simplified ] = "含有有关传递的信息";
     Text[ chinese_traditional ] = "含有傳遞的資訊";
     Text[ turkish ] = "Contains information about transactions";
@@ -465,7 +465,7 @@ String STR_ADABAS_HELP_DATADEVSPACES
     Text[ polish ] = "Zawiera wszystkie pliki danych";
     Text[ portuguese_brazilian ] = "Contains all data files";
     Text[ japanese ] = "データファイルを含む";
-    Text[ korean ] = "모든 데이터 파일 포함";
+    Text[ korean ] = "모든 데이터 파일을 포함합니다.";
     Text[ chinese_simplified ] = "含有全部的数据文件";
     Text[ chinese_traditional ] = "含有全部的資料檔案";
     Text[ turkish ] = "Contains all data files";
@@ -492,7 +492,7 @@ String STR_ADABAS_HELP_SIZE
     Text[ polish ] = "��czna wielko�� plik�w bazy danych";
     Text[ portuguese_brazilian ] = "Overall Size of the database files";
     Text[ japanese ] = "データベースファイル全体のサイズ";
-    Text[ korean ] = "데이터베이스 파일의 전체 크기";
+    Text[ korean ] = "데이터베이스 파일의 전체 용량";
     Text[ chinese_simplified ] = "数据库文件的总计大小";
     Text[ chinese_traditional ] = "資料庫檔案的總大小";
     Text[ turkish ] = "Overall Size of the database files";
@@ -519,7 +519,7 @@ String STR_ADABAS_HELP_FREESIZE
     Text[ polish ] = "Zas�b dost�pnej pami�ci przed utworzeniem pliku datadev.";
     Text[ portuguese_brazilian ] = "Currently free avaliable space bevor a new datadev must be created.";
     Text[ japanese ] = "新しい datadev ファイルを作成する前の、使用可能なディスク空き容量。";
-    Text[ korean ] = "새 datadev 파일이 만들어지기 전에 사용할 수 있는 여유 공간.";
+    Text[ korean ] = "새 datadev 파일이 만들어지기 전에 사용할 수 있는 공간";
     Text[ chinese_simplified ] = "在新建一个 datadev 文件之前的可用空间。";
     Text[ chinese_traditional ] = "在新增一個 datadev 檔案之前的可用空間。";
     Text[ turkish ] = "Currently free avaliable space bevor a new datadev must be created.";
@@ -546,7 +546,7 @@ String STR_ADABAS_HELP_MEMORYUSING
     Text[ polish ] = "Aktualnie zaj�ta pami��";
     Text[ portuguese_brazilian ] = "Currently used memory";
     Text[ japanese ] = "現在のディスク使用量";
-    Text[ korean ] = "현재 사용된 메모리";
+    Text[ korean ] = "현재 사용되고 있는 메모리";
     Text[ chinese_simplified ] = "当前占用的内存";
     Text[ chinese_traditional ] = "目前占用的記憶體";
     Text[ turkish ] = "Currently used memory";
@@ -590,3 +590,9 @@ String STR_ADABAS_ERROR_SYSTEMTABLES
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index b8bb479001c2..f65d08cbafe8 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -1,6 +1,6 @@
  //--------------------------------------------------------------------------
  //
- // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.30 2002-12-05 10:36:43 kz Exp $
+ // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.31 2003-03-19 17:52:19 hr Exp $
  //
  // (c) Copyright 1997 by Star Division GmbH, Hamburg.
  //
@@ -8,7 +8,7 @@
  //  AWO
  //
  // Letzte Aenderung:
- //  $Author: kz $ $Date: 2002-12-05 10:36:43 $ $Revision: 1.30 $
+ //  $Author: hr $ $Date: 2003-03-19 17:52:19 $ $Revision: 1.31 $
  //
  //--------------------------------------------------------------------------
 #ifndef DBAUI_RELATIONDIALOG_HRC
@@ -174,7 +174,7 @@ ModalDialog DLG_REL_PROPERTIES
         Text[ chinese_traditional ] = "無動作(~N)";
         Text[ arabic ] = "���� �����";
         Text[ greek ] = "~����� ��������";
-        Text[ korean ] = "실행 없음(~N)";
+        Text[ korean ] = "작동 없음(~N)";
         Text[ turkish ] = "��lem yok";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Cap acci�";
@@ -234,7 +234,7 @@ ModalDialog DLG_REL_PROPERTIES
         Text[ chinese_traditional ] = "設定零(~S)";
         Text[ arabic ] = "����� ���� �����";
         Text[ greek ] = "������� ����~�";
-        Text[ korean ] = "널 설정(~S)";
+        Text[ korean ] = "0 값 설정(~S)";
         Text[ turkish ] = "S�f�r belirle";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Defineix com a nul";
@@ -283,7 +283,7 @@ ModalDialog DLG_REL_PROPERTIES
         Text [ swedish ] = "Raderingsalternativ" ;
         Text [ danish ] = "Sletningsindstillinger" ;
         Text [ italian ] = "Opzioni di eliminazione" ;
-        Text [ spanish ] = "Opciones de eliminaci�n" ;
+        Text [ spanish ] = "Opciones para borrar" ;
         Text [ french ] = "Options de suppression" ;
         Text [ dutch ] = "Wisopties" ;
         Text [ portuguese ] = "Op��es de elimina��o" ;
@@ -294,7 +294,7 @@ ModalDialog DLG_REL_PROPERTIES
         Text[ chinese_traditional ] = "刪除的選項";
         Text[ arabic ] = "������ �����";
         Text[ greek ] = "�������� ���������";
-        Text[ korean ] = "삭제 옵션";
+        Text[ korean ] = "옵션 삭제";
         Text[ turkish ] = "Silme se�enekleri";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Opcions d'eliminaci�";
@@ -325,7 +325,7 @@ ModalDialog DLG_REL_PROPERTIES
         Text[ chinese_traditional ] = "無動作(~N)";
         Text[ arabic ] = "���� �����";
         Text[ greek ] = "����� ~��������";
-        Text[ korean ] = "실행 없음(~N)";
+        Text[ korean ] = "작동 없음(~N)";
         Text[ turkish ] = "��lem yok";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Cap acci�";
@@ -345,7 +345,7 @@ ModalDialog DLG_REL_PROPERTIES
         Text [ swedish ] = "Radera ka~skad" ;
         Text [ danish ] = "Opdater kaskade" ;
         Text [ italian ] = "Elimina ca~scata" ;
-        Text [ spanish ] = "Eliminar c~ascada" ;
+        Text [ spanish ] = "Borrar c~ascada" ;
         Text [ french ] = "~Supprimer la cascade" ;
         Text [ dutch ] = "~Casc. wissen" ;
         Text[ chinese_simplified ] = "删除层叠(~C)";
@@ -385,7 +385,7 @@ ModalDialog DLG_REL_PROPERTIES
         Text[ chinese_traditional ] = "設定零(~S)";
         Text[ arabic ] = "����� ���� �����";
         Text[ greek ] = "������� �����";
-        Text[ korean ] = "널 설정(~S)";
+        Text[ korean ] = "0 값 설정(~S)";
         Text[ turkish ] = "S�f�r belirle";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Defineix com a nul";
@@ -477,3 +477,9 @@ ModalDialog DLG_REL_PROPERTIES
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index c2bde81e0625..fa8c57e88e41 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UserAdmin.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-05 07:05:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -204,7 +204,7 @@ IMPL_LINK( OPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
 // -----------------------------------------------------------------------------
 IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit )
 {
-    aOKBtn.Enable(pEdit->GetText().Len());
+    aOKBtn.Enable(pEdit->GetText().Len() != 0);
     return 0;
 }
 
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 4c59cd4049e2..5b6a1fabbdf5 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UserAdmin.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:58:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -173,7 +173,7 @@ TabPage TAB_PAGE_USERADMIN
         Text[ polish ] = "Dodaj u�ytkownika...";
         Text[ portuguese_brazilian ] = "~New user...";
         Text[ japanese ] = "ユーザーの追加(~A)...";
-        Text[ korean ] = "새 사용자(~A)...";
+        Text[ korean ] = "사용자 추가(~A)...";
         Text[ chinese_simplified ] = "新增使用者(~A)...";
         Text[ chinese_traditional ] = "新增使用者(~A)...";
         Text[ turkish ] = "Yeni kullan�c�...";
@@ -204,7 +204,7 @@ TabPage TAB_PAGE_USERADMIN
         Text[ polish ] = "Zmie� has�o...";
         Text[ portuguese_brazilian ] = "Change ~password...";
         Text[ japanese ] = "パスワードの変更(~P)...";
-        Text[ korean ] = "패스워드 변경(~P)...";
+        Text[ korean ] = "암호 변경(~P)...";
         Text[ chinese_simplified ] = "更改密码(~P)...";
         Text[ chinese_traditional ] = "變更密碼(~P)...";
         Text[ arabic ] = "����� ���� ����...";
@@ -229,7 +229,7 @@ TabPage TAB_PAGE_USERADMIN
         Text[ greek ] = "�������� ������...";
         Text[ dutch ] = "~Gebruiker wissen...";
         Text[ french ] = "Supprimer l'utilisateur...";
-        Text[ spanish ] = "~Eliminar usuario...";
+        Text[ spanish ] = "~Borrar usuario...";
         Text[ italian ] = "Cancella utente...";
         Text[ danish ] = "Slet br~uger...";
         Text[ swedish ] = "Ra~dera anv�ndare...";
@@ -296,7 +296,7 @@ QueryBox QUERY_USERADMIN_DELETE_USER
     Message[ greek ] = "Do you really want to delete the select user?";
     Message[ dutch ] = "Wilt u deze gebruikersnaam werkelijk wissen?";
     Message[ french ] = "Voulez-vous vraiment supprimer l'utilisateur ?";
-    Message[ spanish ] = "�Desea realmente eliminar el usuario?";
+    Message[ spanish ] = "�Desea realmente borrar el usuario?";
     Message[ finnish ] = "Haluatko varmasti poistaa k�ytt�j�n?";
     Message[ italian ] = "Volete davvero eliminare l'utente selezionato?";
     Message[ danish ] = "Skal brugeren virkelig slettes?";
@@ -304,7 +304,7 @@ QueryBox QUERY_USERADMIN_DELETE_USER
     Message[ polish ] = "Na pewno usun�� u�ytkownika?";
     Message[ portuguese_brazilian ] = "Do you really want to delete the select user?";
     Message[ japanese ] = "本当にユーザーを削除しますか。";
-    Message[ korean ] = "선택한 사용자를 정말 삭제하겠습니까?";
+    Message[ korean ] = "사용자를 정말로 삭제하시겠습니까?";
     Message[ chinese_simplified ] = "您真的要删除这个使用者？";
     Message[ chinese_traditional ] = "真的要刪除這個使用者?";
     Message[ turkish ] = "Do you really want to delete the select user?";
@@ -336,25 +336,25 @@ ModalDialog DLG_PASSWORD
         Text = "Benutzer \"$name$:  $\"" ;
         Text [ English ] = "User \"$name$:  $\"" ;
         Text[ english_us ] = "User \"$name$:  $\"";
-        Text[ portuguese ] = "Utilizador \"$name$:  $\"";
+        Text[ portuguese ] = "Utilizador \"$Name: not supported by cvs2svn $\"";
         Text[ russian ] = "������������ \"$Name: not supported by cvs2svn $\"";
-        Text[ greek ] = "User \"$name$:  $\"";
+        Text[ greek ] = "User \"$Name: not supported by cvs2svn $\"";
         Text[ dutch ] = "Gebruiker \"$Name: not supported by cvs2svn $\"";
-        Text[ french ] = "Utilisateur \"$name$:  $\"";
-        Text[ spanish ] = "Usuario \"$name$:  $\"";
+        Text[ french ] = "Utilisateur \"$name:  $\"";
+        Text[ spanish ] = "Usuario \"$name:  $\"";
         Text[ finnish ] = "K�ytt�j� \"$Name: not supported by cvs2svn $\"";
-        Text[ italian ] = "Utente \"$name$:  $\"";
-        Text[ danish ] = "Bruger \"$name$:  $\"";
+        Text[ italian ] = "Utente \"$name: $\"";
+        Text[ danish ] = "Bruger \"$Name: not supported by cvs2svn $\"";
         Text[ swedish ] = "Anv�ndare \"$name$:  $\"";
-        Text[ polish ] = "U�ytkownik \"$name$:  $\"";
+        Text[ polish ] = "U�ytkownik \"$Name: not supported by cvs2svn $\"";
         Text[ portuguese_brazilian ] = "User \"$name$:  $\"";
-        Text[ japanese ] = "ユーザー \"$name$:  $\"";
+        Text[ japanese ] = "ユーザー \"$Name: not supported by cvs2svn $\"";
         Text[ korean ] = "사용자 \"$name$:  $\"";
-        Text[ chinese_simplified ] = "使用者 \"$name$:  $\"";
-        Text[ chinese_traditional ] = "使用者<$name$:  $>";
-        Text[ turkish ] = "User \"$name$:  $\"";
-        Text[ arabic ] = "User \"$name$:  $\"";
-        Text[ catalan ] = "Usuari \"$name$:  $\"";
+        Text[ chinese_simplified ] = "使用者 \"$Name: not supported by cvs2svn $\"";
+        Text[ chinese_traditional ] = "使用者 \"$name$:  $\"";
+        Text[ turkish ] = "User \"$Name: not supported by cvs2svn $\"";
+        Text[ arabic ] = "User \"$Name: not supported by cvs2svn $\"";
+        Text[ catalan ] = "Usuari \"$Name: not supported by cvs2svn $\"";
         Text[ thai ] = "ผู้ใช้ \"$ชื่อ: OpenOffice641C $\"";
     };
 
@@ -378,7 +378,7 @@ ModalDialog DLG_PASSWORD
         Text[ polish ] = "Stare has�o";
         Text[ portuguese_brazilian ] = "old p~assword";
         Text[ japanese ] = "旧パスワード(~A)";
-        Text[ korean ] = "이전 패스워드(~A)";
+        Text[ korean ] = "이전 암호(~A)";
         Text[ chinese_simplified ] = "旧密码(~A)";
         Text[ chinese_traditional ] = "舊密碼(~A)";
         Text[ turkish ] = "old p~assword";
@@ -414,7 +414,7 @@ ModalDialog DLG_PASSWORD
         Text[ polish ] = "Has�o";
         Text[ portuguese_brazilian ] = " password";
         Text[ japanese ] = "パスワード(~P)";
-        Text[ korean ] = "패스워드(~P)";
+        Text[ korean ] = "암호(~P)";
         Text[ chinese_simplified ] = "密码(~P)";
         Text[ chinese_traditional ] = "密碼(~P)";
         Text[ turkish ] = " password";
@@ -449,7 +449,7 @@ ModalDialog DLG_PASSWORD
         Text[ polish ] = "Potwierd� has�o";
         Text[ portuguese_brazilian ] = "~Confirm  password";
         Text[ japanese ] = "パスワードの確認(~C)";
-        Text[ korean ] = "패스워드 확인(~C)";
+        Text[ korean ] = "암호 확인(~C)";
         Text[ chinese_simplified ] = "确认密码(~C)";
         Text[ chinese_traditional ] = "確認密碼(~C)";
         Text[ turkish ] = "~Confirm  password";
@@ -487,7 +487,7 @@ ModalDialog DLG_PASSWORD
     Text[ greek ] = "Change password";
     Text[ dutch ] = "Wachtwoord wijzigen";
     Text[ french ] = "Modification du mot de passe";
-    Text[ spanish ] = "Modificar contrase�a";
+    Text[ spanish ] = "Cambiar contrase�a";
     Text[ finnish ] = "Muuta salasana";
     Text[ italian ] = "Cambia password";
     Text[ danish ] = "Skift adgangskode";
@@ -495,7 +495,7 @@ ModalDialog DLG_PASSWORD
     Text[ polish ] = "Zmie� has�o";
     Text[ portuguese_brazilian ] = "Change password";
     Text[ japanese ] = "パスワードの変更";
-    Text[ korean ] = "패스워드 변경";
+    Text[ korean ] = "암호 변경";
     Text[ chinese_simplified ] = "更改密码";
     Text[ chinese_traditional ] = "變更密碼";
     Text[ turkish ] = "Change password";
@@ -510,7 +510,7 @@ String STR_ERROR_PASSWORDS_NOT_IDENTICAL
     Text [ English ] = "Passwords are different, please enter again!" ;
     Text[ english_us ] = "The passwords do not match. Please enter the password again.";
     Text[ portuguese ] = "As senhas n�o s�o iguais. Indique-as novamente.";
-    Text[ russian ] = "������ �� ���������. ��������� ���� ������";
+    Text[ russian ] = "������ �� ���������. ��������� ���� ������.";
     Text[ greek ] = "Passwords are different, please enter again";
     Text[ dutch ] = "De beide wachtwoorden komen niet overeen. Voer het wachtwoord nogmaals in!";
     Text[ french ] = "Les deux mots de passe sont diff�rents. R�p�tez la saisie  !";
@@ -522,7 +522,7 @@ String STR_ERROR_PASSWORDS_NOT_IDENTICAL
     Text[ polish ] = "Podane has�a nie zgadzaj� si�! Nale�y wpisa� je ponownie.";
     Text[ portuguese_brazilian ] = "Passwords are different, please enter again";
     Text[ japanese ] = "入力した２つのパスワードは一致しません。もう一度入力しなおしてください。";
-    Text[ korean ] = "패스워드가 다릅니다. 다시 입력하십시오";
+    Text[ korean ] = "암호가 일치하지 않습니다. 다시 입력해주십시오.";
     Text[ chinese_simplified ] = "这两个密码不一致，请重新输入密码！";
     Text[ chinese_traditional ] = "這兩個密碼不一致，請重新輸入！";
     Text[ turkish ] = "Passwords are different, please enter again";
@@ -534,3 +534,9 @@ String STR_ERROR_PASSWORDS_NOT_IDENTICAL
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 8b086a4d635a..0d4025e7414e 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adminpages.cxx,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 15:22:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,8 +109,8 @@
 #ifndef _DBAUI_ODBC_CONFIG_HXX_
 #include "odbcconfig.hxx"
 #endif
-#ifndef _SVTOOLS_LOCALRESACCESS_HXX_
-#include <svtools/localresaccess.hxx>
+#ifndef _DBAUI_LOCALRESACCESS_HXX_
+#include "localresaccess.hxx"
 #endif
 
 
@@ -318,8 +318,7 @@ namespace dbaui
         if (!aEnumeration.isLoaded())
         {
             // show an error message
-            ModuleRes aModuleRes(PAGE_GENERAL);
-            OLocalResourceAccess aLocRes(aModuleRes, RSC_TABPAGE);
+            OLocalResourceAccess aLocRes( PAGE_GENERAL, RSC_TABPAGE );
             String sError(ResId(STR_COULDNOTLOAD_ODBCLIB));
             sError.SearchAndReplaceAscii("#lib#", aEnumeration.getLibraryName());
             ErrorBox aDialog(this, WB_OK, sError);
@@ -342,48 +341,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.32  2002/08/19 07:43:44  oj
- *  #99473# change string resource files
- *
- *  Revision 1.31  2001/08/15 08:49:16  fs
- *  #89822# added functionality to accelerate toolbox functions with key codes
- *
- *  Revision 1.30  2001/05/23 13:47:00  fs
- *  #86444# +prepareConnectionAction
- *
- *  Revision 1.29  2001/05/10 13:34:28  fs
- *  #86223# +OPageSettings/createViewSettings/filleViewSettings/restoreViewSettings
- *
- *  Revision 1.28  2001/01/26 16:12:12  fs
- *  split up the file
- *
- *  Revision 1.27  2001/01/26 06:59:12  fs
- *  some basics for the query administration page - not enabled yet
- *
- *  Revision 1.26  2001/01/25 12:14:03  fs
- *  #83192# initialization of m_sDsn corrected
- *
- *  Revision 1.25  2001/01/04 11:21:45  fs
- *  #81485# +OAdoDetailsPage
- *
- *  Revision 1.24  2001/01/04 09:43:26  fs
- *  #81615# auto completion for the extension checkbox is case sensitive
- *
- *  Revision 1.23  2000/12/11 16:33:15  fs
- *  reversed the semantics of the SuppressVersionColumns checkbox
- *
- *  Revision 1.22  2000/12/07 15:04:40  fs
- *  #81490# reset the password when changing the user
- *
- *  Revision 1.21  2000/12/07 14:27:53  fs
- *  #80939# clear the tables list when cancelling the password dialog
- *
- *  Revision 1.20  2000/12/07 14:15:42  oj
- *  #81131# check installed adabas dbs
- *
- *  Revision 1.0 26.09.00 11:47:18  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 4655d75ebadd..a388f4eed6c9 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adminpages.hxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 15:22:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -258,33 +258,4 @@ namespace dbaui
 
 #endif // _DBAUI_ADMINPAGES_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.23  2001/08/15 08:49:16  fs
- *  #89822# added functionality to accelerate toolbox functions with key codes
- *
- *  Revision 1.22  2001/05/29 10:17:26  fs
- *  #86082# +OToolboxedPageViewSettings
- *
- *  Revision 1.21  2001/05/23 13:47:00  fs
- *  #86444# +prepareConnectionAction
- *
- *  Revision 1.20  2001/05/10 13:34:29  fs
- *  #86223# +OPageSettings/createViewSettings/filleViewSettings/restoreViewSettings
- *
- *  Revision 1.19  2001/01/26 16:12:12  fs
- *  split up the file
- *
- *  Revision 1.18  2001/01/26 06:59:12  fs
- *  some basics for the query administration page - not enabled yet
- *
- *  Revision 1.17  2001/01/04 11:21:45  fs
- *  #81485# +OAdoDetailsPage
- *
- *  Revision 1.16  2000/12/07 14:15:42  oj
- *  #81131# check installed adabas dbs
- *
- *  Revision 1.0 26.09.00 11:46:15  fs
- ************************************************************************/
 
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index 5498ec1afef2..4b18c8895eba 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adtabdlg.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:03:47 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,7 +118,7 @@ ModelessDialog DLG_JOIN_TABADD
         Text[ dutch ] = "~Tabelnaam";
         Text[ chinese_simplified ] = "表格名称(~T)";
         Text[ greek ] = "����� ������";
-        Text[ korean ] = "시트 이름(~T)";
+        Text[ korean ] = "테이블 이름(~T)";
         Text[ turkish ] = "Tablo ad�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Nom de la ~taula";
@@ -233,7 +233,7 @@ ModelessDialog DLG_JOIN_TABADD
         Text[ dutch ] = "Tabel";
         Text[ chinese_simplified ] = "表格";
         Text[ greek ] = "�������";
-        Text[ korean ] = "시트";
+        Text[ korean ] = "테이블";
         Text[ turkish ] = "Tablo";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Taula";
@@ -263,7 +263,7 @@ ModelessDialog DLG_JOIN_TABADD
         Text[ dutch ] = "<Standaard>";
         Text[ chinese_simplified ] = "<默认>";
         Text[ greek ] = "<����������>";
-        Text[ korean ] = "<기본>";
+        Text[ korean ] = "<기본값>";
         Text[ turkish ] = "<Standart>";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "<per defecte>";
@@ -278,7 +278,7 @@ ModelessDialog DLG_JOIN_TABADD
     Text[ dutch ] = "Tabellen toevoegen";
     Text[ chinese_simplified ] = "新增表格";
     Text[ greek ] = "�������� ������";
-    Text[ korean ] = "시트 추가";
+    Text[ korean ] = "테이블 추가";
     Text[ turkish ] = "Tablo ekle";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Afegeix taules";
@@ -294,3 +294,9 @@ ModelessDialog DLG_JOIN_TABADD
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 3864e25b3774..1f4a29fa032d 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.cxx,v $
  *
- *  $Revision: 1.83 $
+ *  $Revision: 1.84 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 15:23:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -164,6 +164,10 @@
 #ifndef DBAUI_USERADMIN_HXX
 #include "UserAdmin.hxx"
 #endif
+#ifndef _UNOTOOLS_CONFIGNODE_HXX_
+#include <unotools/confignode.hxx>
+#endif
+
 
 #include <algorithm>
 #include <functional>
@@ -461,6 +465,16 @@ IMPL_LINK( ODbAdminDialog, OnAsyncSelectDetailsPage, void*, NOTINTERESTEDIN )
         case DST_ADDRESSBOOK: nDetailPageId = PAGE_LDAP; /* juest a guess */ break;
         case DST_MYSQL_ODBC :
         case DST_MYSQL_JDBC : nDetailPageId = PAGE_MYSQL; break;
+        case DST_USERDEFINE1:   /// first user defined driver
+        case DST_USERDEFINE2:
+        case DST_USERDEFINE3:
+        case DST_USERDEFINE4:
+        case DST_USERDEFINE5:
+        case DST_USERDEFINE6:
+        case DST_USERDEFINE7:
+        case DST_USERDEFINE8:
+        case DST_USERDEFINE9:
+        case DST_USERDEFINE10:nDetailPageId = PAGE_USERDRIVER; break;
     }
     if (nDetailPageId)
     {
@@ -667,6 +681,17 @@ void ODbAdminDialog::PageCreated(USHORT _nId, SfxTabPage& _rPage)
             static_cast<OUserAdmin&>(_rPage).setServiceFactory(m_xORB);
             static_cast<OUserAdmin&>(_rPage).SetAdminDialog(this);
             break;
+        case PAGE_DBASE:
+        case PAGE_JDBC:
+        case PAGE_ODBC:
+        case PAGE_TEXT:
+        case PAGE_ADABAS:
+        case PAGE_ADO:
+        case PAGE_MYSQL:
+        case PAGE_USERDRIVER:
+            static_cast<OCommonBehaviourTabPage&>(_rPage).setServiceFactory(m_xORB);
+            break;
+
     }
 
     AdjustLayout();
@@ -999,7 +1024,40 @@ IMPL_LINK(ODbAdminDialog, OnTypeSelected, OGeneralPage*, _pTabPage)
             }
             _pTabPage->disableConnectionURL();
         }
-        break;
+            break;
+        case DST_USERDEFINE1:   /// first user defined driver
+        case DST_USERDEFINE2:
+        case DST_USERDEFINE3:
+        case DST_USERDEFINE4:
+        case DST_USERDEFINE5:
+        case DST_USERDEFINE6:
+        case DST_USERDEFINE7:
+        case DST_USERDEFINE8:
+        case DST_USERDEFINE9:
+        case DST_USERDEFINE10:
+            {
+                ::utl::OConfigurationTreeRoot aUserDefinedDriverRoot = ::utl::OConfigurationTreeRoot::createWithServiceFactory(
+                    m_xORB, ::dbaui::getUserDefinedDriverNodeName(), -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
+
+                ::rtl::OUString sTitle;
+                if ( aUserDefinedDriverRoot.isValid() )
+                {
+                    Sequence< ::rtl::OUString > aDriverKeys = aUserDefinedDriverRoot.getNodeNames();
+                    const ::rtl::OUString* pDriverKeys = aDriverKeys.getConstArray();
+                    const ::rtl::OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength();
+                    for (sal_Int32 i=DST_USERDEFINE1;pDriverKeys != pDriverKeysEnd && i <= _pTabPage->GetSelectedType(); ++pDriverKeys,++i)
+                        ;
+                    if ( pDriverKeys != pDriverKeysEnd )
+                    {
+                        ::utl::OConfigurationNode aThisDriverSettings = aUserDefinedDriverRoot.openNode(*pDriverKeys);
+
+                        aThisDriverSettings.getNodeValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DriverPageDisplayName"))) >>= sTitle;
+                    }
+                }
+                AddTabPage(PAGE_USERDRIVER, sTitle, OUserDriverDetailsPage::Create, 0, sal_False, 1);
+                m_aCurrentDetailPages.push(PAGE_USERDRIVER);
+            }
+            break;
     }
 
     if (bResetPasswordRequired)
@@ -1559,6 +1617,18 @@ const sal_Int32* ODbAdminDialog::getRelevantItems(const SfxItemSet& _rSet) const
                 pRelevantItems = nRelevantIds;
             }
             break;
+        case DST_USERDEFINE1:   /// first user defined driver
+        case DST_USERDEFINE2:
+        case DST_USERDEFINE3:
+        case DST_USERDEFINE4:
+        case DST_USERDEFINE5:
+        case DST_USERDEFINE6:
+        case DST_USERDEFINE7:
+        case DST_USERDEFINE8:
+        case DST_USERDEFINE9:
+        case DST_USERDEFINE10:
+            pRelevantItems = OUserDriverDetailsPage::getDetailIds();
+            break;
     }
     return pRelevantItems;
 }
@@ -2158,135 +2228,3 @@ IMPL_LINK(ODbAdminDialog, OnApplyChanges, PushButton*, EMPTYARG)
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.82  2002/11/15 12:29:30  oj
- *  #105175# check size of poolitems
- *
- *  Revision 1.81  2002/08/19 07:40:36  oj
- *  #99473# change string resource files
- *
- *  Revision 1.80  2002/07/25 07:01:22  oj
- *  #95146# new SfxItems for autoinc
- *
- *  Revision 1.79  2002/07/09 12:43:20  oj
- *  #99921# check if datasource allows to check names
- *
- *  Revision 1.78  2002/01/30 14:15:30  fs
- *  #97122# when selecting a data source, make sure it is no no-op causing unnecessary things
- *
- *  Revision 1.77  2001/10/26 16:36:25  hr
- *  #92924#: includes
- *
- *  Revision 1.76  2001/10/24 10:31:05  fs
- *  #93684# in implTranslateProperty, check for the correct SfxItem types (in case a data source has invalid indirect property types)
- *
- *  Revision 1.75  2001/09/18 15:07:35  fs
- *  #65293# syntax for SOLS
- *
- *  Revision 1.74  2001/09/11 15:08:33  fs
- *  #91304# disableUI before applying the changes in OK
- *
- *  Revision 1.73  2001/08/30 16:12:08  fs
- *  #88427# +OnValidateName
- *
- *  Revision 1.72  2001/08/27 06:57:23  oj
- *  #90015# some speedup's
- *
- *  Revision 1.71  2001/08/23 14:48:13  fs
- *  #88637# corrected error message
- *
- *  Revision 1.70  2001/08/14 14:11:33  fs
- *  #86945# +getCurrentDataSource
- *
- *  Revision 1.69  2001/08/01 08:32:04  fs
- *  #88530# if the address book type is initially selected, default the sub-type to something meaningfull
- *
- *  Revision 1.68  2001/07/31 16:01:33  fs
- *  #88530# changes to operate the dialog in a mode where no type change is possible
- *
- *  Revision 1.67  2001/07/30 11:31:52  fs
- *  #88530# changes to allow operating the dialog in a 'edit one single data source only' mode
- *
- *  Revision 1.66  2001/07/25 14:05:44  oj
- *  #90201# check ldap name
- *
- *  Revision 1.65  2001/07/17 07:30:50  oj
- *  #89533# GetMainURL changed
- *
- *  Revision 1.64  2001/07/11 10:10:30  oj
- *  #87257# change GetUILanguage
- *
- *  Revision 1.63  2001/07/06 11:33:29  oj
- *  #89359# now dialog saves password temp
- *
- *  Revision 1.62  2001/06/25 16:04:40  fs
- *  #88004# outsourced ODataSourceMap and ODataSourceSelector / adjusted fillDatasourceInfo so that settings without and UI are do not survive the method
- *
- *  Revision 1.61  2001/06/25 08:27:18  oj
- *  #88699# new control for ldap rowcount
- *
- *  Revision 1.60  2001/06/20 13:43:42  fs
- *  #88447# corrected order of detail pages
- *
- *  Revision 1.59  2001/06/20 07:08:33  oj
- *  #88434# new page for user admin
- *
- *  Revision 1.58  2001/06/14 14:18:10  fs
- *  #88242# corrected adding/removing detail pages
- *
- *  Revision 1.57  2001/06/07 15:12:36  fs
- *  #87934# removed a wrong assertion
- *
- *  Revision 1.56  2001/06/01 08:41:31  oj
- *  #87149# changed order for tabpages
- *
- *  Revision 1.55  2001/05/31 11:37:57  oj
- *  #87149# correct ldap protocol
- *
- *  Revision 1.54  2001/05/31 11:09:07  oj
- *  #87149# change subprotocol and Propertynames
- *
- *  Revision 1.53  2001/05/29 13:33:12  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.52  2001/05/29 10:18:26  fs
- *  #86082# set the service factory on the general page
- *
- *  Revision 1.51  2001/05/23 14:16:42  oj
- *  #87149# new helpids
- *
- *  Revision 1.50  2001/05/15 15:07:06  fs
- *  #86991# save the current (modified) settings when inserting a new data source
- *
- *  Revision 1.49  2001/05/15 11:25:35  fs
- *  #86996# use the connection pool instead of the driver manager
- *
- *  Revision 1.48  2001/05/10 13:37:04  fs
- *  #86223# restore view settings after applying (no matter if syncronously or asynchronously / +successfullyConnected to make the password persistent
- *
- *  Revision 1.47  2001/04/27 15:47:03  fs
- *  resetPages: do a ShowPage(GENERAL) before removing pages
- *
- *  Revision 1.46  2001/04/26 11:40:21  fs
- *  file is alive, again - added support for data source associated bookmarks
- *
- *  Revision 1.45  2001/04/20 13:38:06  oj
- *  #85736# new checkbox for odbc
- *
- *  Revision 1.44  2001/04/04 10:38:43  oj
- *  reading uninitialized memory
- *
- *  Revision 1.43  2001/03/30 11:54:34  fs
- *  #65293# missing include
- *
- *  Revision 1.42  2001/03/29 07:44:43  fs
- *  #84826# +clearPassword
- *
- *  Revision 1.41  2001/03/29 07:34:00  oj
- *  dispose connection in dtor and type casts
- *
- *  Revision 1.0 20.09.00 10:55:58  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 85c8e3b8c3cd..6af7f35221b3 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.src,v $
  *
- *  $Revision: 1.119 $
+ *  $Revision: 1.120 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-09 09:52:41 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -308,7 +308,7 @@ ImageList IMG_DOCUMENTLINKS_LCH
         Text[ polish ] = "Re~trieve generated values";\
         Text[ portuguese_brazilian ] = "Re~trieve generated values";\
         Text[ japanese ] = "生成値を回復する";\
-        Text[ korean ] = "생성된 값 회복";\
+        Text[ korean ] = "생성값을 회복";\
         Text[ chinese_simplified ] = "顾及生成的数值";\
         Text[ chinese_traditional ] = "顧及生成的數值";\
         Text[ turkish ] = "Re~trieve generated values";\
@@ -328,7 +328,7 @@ ImageList IMG_DOCUMENTLINKS_LCH
         Text[ russian ] = "~Auto-increment statement";\
         Text[ greek ] = "~Auto-increment statement";\
         Text[ dutch ] = "~Auto-increment statement";\
-        Text[ french ] = "Expression auto-incr�ment";\
+        Text[ french ] = "Expression d'auto-incr�ment";\
         Text[ spanish ] = "~Expresi�n incremento autom�tico";\
         Text[ finnish ] = "~Auto-increment statement";\
         Text[ italian ] = "Espressione incremento automatico";\
@@ -337,7 +337,7 @@ ImageList IMG_DOCUMENTLINKS_LCH
         Text[ polish ] = "~Auto-increment statement";\
         Text[ portuguese_brazilian ] = "~Auto-increment statement";\
         Text[ japanese ] = "オートインクリメント命令文";\
-        Text[ korean ] = "자동 증가량 명령문";\
+        Text[ korean ] = "자동 증분 명령문";\
         Text[ chinese_simplified ] = "自动递增陈述";\
         Text[ chinese_traditional ] = "自動遞增陳述";\
         Text[ turkish ] = "~Auto-increment statement";\
@@ -434,7 +434,7 @@ TabDialog DLG_DATABASE_ADMINISTRATION
             Text [ polish ] = "Nowe �r�d�o danych";
             Text [ portuguese_brazilian ] = "New data source";
             Text [ japanese ] = "新しいデータソース";
-            Text [ korean ] = "새로운 데이터 소스";
+            Text [ korean ] = "새 데이터 원본 ";
             Text [ chinese_simplified ] = "新数据源";
             Text [ chinese_traditional ] = "新資料源";
             Text [ turkish ] = "New data source";
@@ -666,8 +666,8 @@ TabDialog DLG_DATABASE_ADMINISTRATION
         Text [ russian ] = "��������� Adabas D";
         Text [ greek ] = "���������� ��� Adabas D";
         Text [ dutch ] = "Adabas D Statistiek";
-        Text [ french ] = "Statistique Adabas D";
-        Text [ spanish ] = "Estad�stica Adabas D";
+        Text [ french ] = "Statistiques Adabas D";
+        Text [ spanish ] = "Estad�sticas de Adabas D";
         Text [ italian ] = "Statistica Adabas D";
         Text [ danish ] = "Adabas D Statistic";
         Text [ swedish ] = "Statistik Adabas D";
@@ -760,7 +760,7 @@ TabDialog DLG_DATABASE_ADMINISTRATION
         Text [ polish ] = "Tabele";
         Text [ portuguese_brazilian ] = "Tabellen";
         Text [ japanese ] = "テーブル";
-        Text [ korean ] = "시트";
+        Text [ korean ] = "테이블";
         Text [ chinese_simplified ] = "表格";
         Text [ chinese_traditional ] = "表格";
         Text [ turkish ] = "Tablolar";
@@ -833,7 +833,7 @@ TabDialog DLG_DATABASE_ADMINISTRATION
     Text [ polish ] = "Administracja �r�de� danych";
     Text [ portuguese_brazilian ] = "Datasource administration";
     Text [ japanese ] = "データソースの管理";
-    Text [ korean ] = "데이터 소스 관리";
+    Text [ korean ] = "데이터 원본 관리";
     Text [ chinese_simplified ] = "管理数据源";
     Text [ chinese_traditional ] = "管理資料源";
     Text [ turkish ] = "Datasource administration";
@@ -912,7 +912,7 @@ TabPage PAGE_GENERAL
         Text [ polish ] = "~Nazwa";
         Text [ portuguese_brazilian ] = "~Name:";
         Text [ japanese ] = "名前(~N)";
-        Text [ korean ] = "이름(~N):";
+        Text [ korean ] = "이름(~N)";
         Text [ chinese_simplified ] = "名称(~N)";
         Text [ chinese_traditional ] = "名稱(~N)";
         Text [ turkish ] = "Ad:";
@@ -1007,7 +1007,7 @@ TabPage PAGE_GENERAL
         Text [ english ] = "~Data source URL" ;
         Text [ english_us ] = "~Data source URL" ;
         Text [ portuguese ] = "~Fonte de dados URL";
-        Text [ russian ] = "URL ~��������� ������ ";
+        Text [ russian ] = "URL ����~����� ������ ";
         Text [ greek ] = "URL ��� ���������� ���������:";
         Text [ dutch ] = "~Gegevensbronnen URL";
         Text [ french ] = "URL de la source de donn�es" ;
@@ -1018,7 +1018,7 @@ TabPage PAGE_GENERAL
         Text [ polish ] = "URL �r�d�a danych";
         Text [ portuguese_brazilian ] = "~Data source URL:";
         Text [ japanese ] = "データソース URL(~D)";
-        Text [ korean ] = "데이터 소스 URL(~D):";
+        Text [ korean ] = "데이터 원본 URL(~D):";
         Text [ chinese_simplified ] = "数据源 URL(~D)";
         Text [ chinese_traditional ] = "資料源 URL(~D)";
         Text [ turkish ] = "~Data source URL:";
@@ -1083,7 +1083,7 @@ TabPage PAGE_GENERAL
         Text [ polish ] = "Chwilowa przerwa:";
         Text [ portuguese_brazilian ] = "Timeout:";
         Text [ japanese ] = "タイムアウト:";
-        Text [ korean ] = "시간 초과:";
+        Text [ korean ] = "제한 시간 초과:";
         Text [ chinese_simplified ] = "超过时限：";
         Text [ chinese_traditional ] = "超過時限：";
         Text [ turkish ] = "Timeout:";
@@ -1154,7 +1154,7 @@ TabPage PAGE_GENERAL
                 "globally unique, you have to choose another one.";
         Text [ english_us ] = "Another data source already has this name. As data sources have to have globally unique names, please choose another one.";
         Text [ portuguese ] = "J� existe uma fonte de dados com este nome. Os nomes das fontes de dados devem ser �nicos, por esta raz�o � recomend�vel seleccionar outro nome.";
-        Text [ russian ] = "�������� ������ � ����� ������ ��� ����������. ���������� ��������� ������ ���, ��� ��� ����� ��������� ������ ������ ���� �����������.";
+        Text [ russian ] = "�������� ������ � ����� ������ ��� ����������. ���������� ��������� ������ ���, ��� ��� ����� ���������� ������ ������ ���� �����������.";
         Text [ greek ] = "������� ��� ��� ��������� ��������� �� ���� �� �����. ���� ����� ��� ����������� ��� ��������� ����������� �� ������� ���� ��� ����. ������ ";
         Text [ dutch ] = "Er bestaat reeds een andere gegevensbron met deze naam. Kies een andere naam.";
         Text [ french ] = "Ce nom a d�j� �t� attribu� � une autre source de donn�es. �tant donn� que les sources de donn�es doivent avoir des noms globalement uniques, vous devez en choisir un autre.";
@@ -1165,7 +1165,7 @@ TabPage PAGE_GENERAL
         Text [ polish ] = "Istnieje inne �r�d�o danych o tej samej nazwie. Poniewa� nazwy �rode� danych musz� by� globalnie jednoznaczne, nale�y wybra� inn� nazw�.";
         Text [ portuguese_brazilian ] = "There already is another data source with this name. Since data source names have to be globally unique, you have to choose another one.";
         Text [ japanese ] = "この名前の付いた別のデータソースがすでにあります。データソース名をはっきりと区別するためには、ほかの名前を選択する必要があります。";
-        Text [ korean ] = "이미 이 이름의 다른 데이터 소스가 존재합니다. 데이터 소스 이름은 전체에서 유일해야 하므로 다른 이름을 선택하십시오.";
+        Text [ korean ] = "이미 같은 이름의 데이터 원본이 있습니다. 데이터 원본의 이름은 항상 고유해야 합니다. 다른 이름을 선택해주십시오.";
         Text [ chinese_simplified ] = "已经存在一个同名的数据源。因为数据源名称必须是一个通用的有效名称，建议您采用另一个名称。";
         Text [ chinese_traditional ] = "已經存在一個同名的資料源。因為一個資料源的名稱必須通用明確，請您採用另外一個有效的名稱。";
         Text [ turkish ] = "There already is another data source with this name. Since data source names have to be globally unique, you have to choose another one.";
@@ -1184,14 +1184,14 @@ TabPage PAGE_GENERAL
         Text [ greek ] = "���� � ��������� ��������� ���� ���������.";
         Text [ dutch ] = "U heeft deze gegevensbron gewist.";
         Text [ french ] = "Vous avez supprim� cette source de donn�es.";
-        Text [ spanish ] = "Ha eliminado esta fuente de datos.";
+        Text [ spanish ] = "Ha borrado esta fuente de datos.";
         Text [ italian ] = "La sorgente dati � stata cancellata.";
         Text [ danish ] = "Denne datakilde er blevet slettet.";
         Text [ swedish ] = "Du har raderat den h�r datak�llan.";
         Text [ polish ] = "To �r�d�o danych zosta�o usuni�te.";
         Text [ portuguese_brazilian ] = "This data source is scheduled to be deleted.";
         Text [ japanese ] = "このデータソースはユーザーによって削除されました。";
-        Text [ korean ] = "이 데이터 소스를 삭제했습니다.";
+        Text [ korean ] = "이 데이터 원본은 삭제하셨습니다.";
         Text [ chinese_simplified ] = "您已经删除了这个数据源。";
         Text [ chinese_traditional ] = "您已經刪除了這個資料源。";
         Text [ turkish ] = "This data source is scheduled to be deleted.";
@@ -1217,7 +1217,7 @@ TabPage PAGE_GENERAL
         Text [ polish ] = "Za�adowanie biblioteki programu #lib# nie by�o mo�liwe. Jest ona by� mo�e uszkodzona. Wyb�r �r�d�a danych ODBC nie jest mo�liwy.";
         Text [ portuguese_brazilian ] = "The program library #lib# could not be loaded or is corrupted. The ODBC data source selection is not available.";
         Text [ japanese ] = "#lib# プログラムライブラリを読み込めなかったか、またはそれ自体にトラブルがあります。 ODBC データソースは選択できません。";
-        Text [ korean ] = "프로그램 라이브러리 #lib#을(를) 로드하지 못했거나 라이브러리에 오류가 있습니다. ODBC 데이터 소스를 선택할 수 없습니다.";
+        Text [ korean ] = "프로그램 라이브러리 #lib#을(를) 로드하지 못했거나 라이브러리에 오류가 있습니다. ODBC 데이터 원본 선택을 사용할 수 없습니다.";
         Text [ chinese_simplified ] = "无法装入程序库 #lib# 或已经损坏。无法选择 ODBC 数据源。";
         Text [ chinese_traditional ] = "無法載入程式庫 #lib# 或已經已經損坏。無法選擇 ODBC 資料源。";
         Text [ turkish ] = "The program library #lib# could not be loaded or is corrupted. The ODBC data source selection is not available.";
@@ -1243,7 +1243,7 @@ TabPage PAGE_GENERAL
         Text [ polish ] = "W systemie komputera u�ytkownika nie znaleziono �r�de� danych Adabas.";
         Text [ portuguese_brazilian ] = "No Adabas data sources have been found on your system.";
         Text [ japanese ] = "お使いのシステム上に Adabas データソースは見つかりません。";
-        Text [ korean ] = "사용자의 시스템에서 Adabas 데이터 소스를 찾지 못했습니다.";
+        Text [ korean ] = "사용자의 시스템에서 Adabas 데이터 원본을 찾지 못했습니다.";
         Text [ chinese_simplified ] = "在您的系统上没有安装 Adabas 数据库。";
         Text [ chinese_traditional ] = "在您的系統上沒有安裝 Adabas 資料源。";
         Text [ turkish ] = "No Adabas data sources have been found on your system.";
@@ -1258,11 +1258,11 @@ TabPage PAGE_GENERAL
         Text [ english ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably won't be able to connect to the database.";
         Text [ english_us ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably will not be able to connect to the database.";
         Text[ portuguese ] = "Esta plataforma n�o tem suporte para este tipo de fonte de dados.\nPoder� modificar as defini��es, contudo a liga��o � base de dados � improv�vel.";
-        Text[ russian ] = "��� ���� ���������� ������ �� ���� ��������� �� ��������������.\n�� ������ �������� ���������, ��, ��������, ����������� � ���� ����� ������ ����� ����������.";
+        Text[ russian ] = "������ ��� ���������� ������ �� ���� ��������� �� ��������������.\n�� ������ �������� ���������, ��, ��������, ����������� � ���� ����� ������ ����� ����������.";
         Text[ greek ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably won't be able to connect to the database.";
         Text[ dutch ] = "Dit type gegevensbron wordt op dit platform niet ondersteund.\nU kunt wel de instellingen wijzigen, maar vermoedelijk geen verbinding met de database tot stand brengen.";
         Text[ french ] = "Ce type de source de donn�es n'est pas support� par la plateforme en question.\nM�me si les param�tres sont modifiables, une connexion � la BD n'est pas garantie.";
-        Text[ spanish ] = "Esta plataforma no apoya este tipo de fuente de datos.\nPuede modificar los datos, pero seguramente no podr� establecer una conexi�n con la base de datos.";
+        Text[ spanish ] = "Esta plataforma no admite este tipo de fuente de datos.\nPuede modificar los datos, pero seguramente no podr� establecer una conexi�n con la base de datos.";
         Text[ finnish ] = "T�m� k�ytt�ymp�rist� ei tue t�t� tietol�hdett�.\nVoit muuttaa asetuksia, mutta et todenn�k�isesti pysty muodostamaan yhteytt� tietokantaan.";
         Text[ italian ] = "Questo tipo di sorgente dati non � supportata dal presente sistema.\nPotete modificare le impostazioni ma � probabile che non riusciate ad effettuare un collegamento con il database.";
         Text[ danish ] = "Denne datakildetype underst�ttes ikke p� denne platform.\nDu kan �ndre indstillingerne, men kan sandsynligvis ikke oprette forbindelse til databasen.";
@@ -1270,7 +1270,7 @@ TabPage PAGE_GENERAL
         Text[ polish ] = "Platforma ta nie obs�uguje niniejszego typu �r�d�a danych.\nMo�na zmodyfiowa� ustawienia, ale w�wczas po��czanie z baz� danych nie b�dzie mo�liwe.";
         Text[ portuguese_brazilian ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably won't be able to connect to the database.";
         Text[ japanese ] = "このデータソースの種類はこのデータソースでは支援されません。\n設定を変更してもかまいませんが、データベースへは接続できないかもしれません。";
-        Text[ korean ] = "이러한 종류의 데이터 소스는 이 플랫폼에서 지원되지 않습니다.\n설정을 변경할 수는 있지만 아마도 데이터베이스에 연결하지 못할 것입니다.";
+        Text[ korean ] = "이러한 유형의 데이터 원본은 이 플랫폼에서 지원되지 않습니다.\n설정을 변경할 수는 있지만 데이터베이스로 연결하지 못할 수도 있습니다.";
         Text[ chinese_simplified ] = "这个操作系统不支持这个数据库类型。\n您可以更改设定，但是不太可能和一个数据库建立连接。";
         Text[ chinese_traditional ] = "這個操作系統不支援這個類型的資料庫類型。\n您可以變更這些設定，但不太可能連線到一個資料庫。";
         Text[ turkish ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably won't be able to connect to the database.";
@@ -1284,23 +1284,23 @@ TabPage PAGE_GENERAL
         Text [ english ] = "To adjust the settings, go to the MySQL tab page." ;
         Text[ portuguese ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ russian ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ spanish ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ italian ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ swedish ] = "To adjust the settings, go to the MySQL tab page.";
+        Text[ spanish ] = "Vaya a la ficha MySQL para realizar la configuraci�n.";
+        Text[ italian ] = "Per corregere le impostazioni andate alla scheda MySQL.";
+        Text[ swedish ] = "G� till MySQL-fliken f�r att g�ra inst�llningarna.";
         Text[ polish ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ portuguese_brazilian ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ japanese ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ korean ] = "To adjust the settings, go to the MySQL tab page.";
+        Text[ japanese ] = "設定を調整するには、MySQL タブページを参照してください。";
+        Text[ korean ] = "설정하기 위해 MySQL 탭 페이지로 이동하십시오.";
         Text[ turkish ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ thai ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ english_us ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ greek ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ dutch ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ french ] = "To adjust the settings, go to the MySQL tab page.";
+        Text[ french ] = "Passez � l'onglet MySQL afin de proc�der au param�trage.";
         Text[ finnish ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ danish ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ chinese_simplified ] = "To adjust the settings, go to the MySQL tab page.";
-        Text[ chinese_traditional ] = "To adjust the settings, go to the MySQL tab page.";
+        Text[ chinese_simplified ] = "要调整设定，请转到 MySQL 选项页。";
+        Text[ chinese_traditional ] = "如果要調整設定，轉到 MySQL 標籤頁。";
         Text[ arabic ] = "To adjust the settings, go to the MySQL tab page.";
         Text[ catalan ] = "To adjust the settings, go to the MySQL tab page.";
     };
@@ -1354,7 +1354,7 @@ TabPage PAGE_DBASE
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 7 , 31 ) ;
-        Size = MAP_APPFONT ( 105 , 60 ) ;
+        Size = MAP_APPFONT ( 130 , 60 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
@@ -1441,7 +1441,7 @@ TabPage PAGE_DBASE
         Text[ swedish ] = "Anv�nd SQL92-namnbegr�nsningar";
         Text[ polish ] = "Use SQL92 naming convention";
         Text[ japanese ] = "SQL92 で許された型の名前を使用する";
-        Text[ korean ] = "SQL92 이름 부여 협정 사용";
+        Text[ korean ] = "SQL92 이름 제약 조건 사용";
         Text[ chinese_simplified ] = "使用 SQL92 命名规则";
         Text[ chinese_traditional ] = "使用 SQL92 命名規則";
         Text[ turkish ] = "Use SQL92 naming convention";
@@ -1458,7 +1458,7 @@ TabPage PAGE_DBASE
         Text [ chinese_traditional ] = "標誌...";
         Text [ arabic ] = "�����...";
         Text [ greek ] = "�������~��...";
-        Text [ korean ] = "색인";
+        Text [ korean ] = "색인...";
         Text [ turkish ] = "Dizinler...";
         Text [ language_user1 ] = " ";
         Text [ italian ] = "I~ndici...";
@@ -1591,7 +1591,7 @@ TabPage PAGE_ADO
         Text [ polish ] = "Podaj has�o";
         Text [ portuguese_brazilian ] = "beim ?ffnen ~fragen";
         Text [ japanese ] = "パスワードが必要";
-        Text [ korean ] = "암호가 필요";
+        Text [ korean ] = "암호 필요";
         Text [ chinese_simplified ] = "必须输入密码";
         Text [ chinese_traditional ] = "必須輸入密碼";
         Text [ turkish ] = "A�arken sor";
@@ -1651,7 +1651,7 @@ TabPage PAGE_ADO
         Text[ swedish ] = "Anv�nd SQL92-namnbegr�nsningar";
         Text[ polish ] = "Use SQL92 naming convention";
         Text[ japanese ] = "SQL92 で許された型の名前を使用する";
-        Text[ korean ] = "SQL92 이름 부여 협정 사용 ";
+        Text[ korean ] = "SQL92 이름 제약 조건 사용 ";
         Text[ chinese_simplified ] = "使用 SQL92 命名规则";
         Text[ chinese_traditional ] = "使用 SQL92 命名規則";
         Text[ turkish ] = "Use SQL92 naming convention";
@@ -1802,7 +1802,7 @@ TabPage PAGE_JDBC
         Text [ polish ] = "Podaj has�o";
         Text [ portuguese_brazilian ] = "beim ?ffnen ~fragen";
         Text [ japanese ] = "パスワードが必要";
-        Text [ korean ] = "암호가 필요";
+        Text [ korean ] = "암호 필요";
         Text [ chinese_simplified ] = "必须输入密码";
         Text [ chinese_traditional ] = "必須輸入密碼";
         Text [ turkish ] = "A�arken sor";
@@ -1863,7 +1863,7 @@ TabPage PAGE_JDBC
         Text[ swedish ] = "Anv�nd SQL92-namnbegr�nsningar";
         Text[ polish ] = "Use SQL92 naming convention";
         Text[ japanese ] = "SQL92 で許された型の名前を使用する";
-        Text[ korean ] = "SQL92 이름 부여 협정 사용";
+        Text[ korean ] = "SQL92 이름 제약 조건 사용";
         Text[ chinese_simplified ] = "使用 SQL92 命名规则";
         Text[ chinese_traditional ] = "使用 SQL92 命名規則";
         Text[ turkish ] = "Use SQL92 naming convention";
@@ -1914,7 +1914,7 @@ TabPage PAGE_ODBC
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 90 , 6 ) ;
-        Size = MAP_APPFONT ( 105 , 12 ) ;
+        Size = MAP_APPFONT ( 130 , 12 ) ;
         TabStop = TRUE ;
         HelpId = HID_DSADMIN_USER_ODBC;
     };
@@ -1938,7 +1938,7 @@ TabPage PAGE_ODBC
         Text [ polish ] = "Podaj has�o";
         Text [ portuguese_brazilian ] = "Password required";
         Text [ japanese ] = "パスワードが必要";
-        Text [ korean ] = "암호가 필요";
+        Text [ korean ] = "암호 필요";
         Text [ chinese_simplified ] = "必须输入密码";
         Text [ chinese_traditional ] = "必須輸入密碼";
         Text [ turkish ] = "Password required";
@@ -1986,7 +1986,7 @@ TabPage PAGE_ODBC
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 37 ) ;
-        Size = MAP_APPFONT ( 105 , 12 ) ;
+        Size = MAP_APPFONT ( 130 , 12 ) ;
         TabStop = TRUE ;
         HelpId = HID_DSADMIN_ODBC_OPTIONS;
     };
@@ -2024,7 +2024,7 @@ TabPage PAGE_ODBC
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 52 ) ;
-        Size = MAP_APPFONT ( 105 , 60 ) ;
+        Size = MAP_APPFONT ( 130 , 60 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
@@ -2083,7 +2083,7 @@ TabPage PAGE_ODBC
         Text[ swedish ] = "Anv�nd SQL92-namnbegr�nsningar";
         Text[ polish ] = "Use SQL92 naming convention";
         Text[ japanese ] = "SQL92 で許された型の名前を使用する";
-        Text[ korean ] = "SQL92 이름 부여 협정 사용";
+        Text[ korean ] = "SQL92 이름 제약 조건 사용";
         Text[ chinese_simplified ] = "使用 SQL92 命名规则";
         Text[ chinese_traditional ] = "使用 SQL92 命名規則";
         Text[ turkish ] = "Use SQL92 naming convention";
@@ -2097,7 +2097,7 @@ TabPage PAGE_ODBC
         Size    = MAP_APPFONT ( 200 , CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
         HelpId = HID_DSADMIN_USECATALOG;
-        Text = "Catalog verwenden bei dateibasierten Datenbanken";
+        Text = "Katalog verwenden bei dateibasierten Datenbanken";
         Text [ english ] = "Use catalog on filebased databases";
         Text[ english_us ] = "Use catalog for file-based databases";
         Text[ portuguese ] = "Utilizar cat�logo em bases de dados baseadas em ficheiros";
@@ -2143,23 +2143,23 @@ TabPage PAGE_MYSQL
         Text [ english ] = "Type of connection";
         Text[ portuguese ] = "Type of connection";
         Text[ russian ] = "Type of connection";
-        Text[ spanish ] = "Type of connection";
-        Text[ italian ] = "Type of connection";
-        Text[ swedish ] = "Type of connection";
+        Text[ spanish ] = "Tipo de conexi�n";
+        Text[ italian ] = "Tipo di collegamento";
+        Text[ swedish ] = "Typ av f�rbindelse";
         Text[ polish ] = "Type of connection";
         Text[ portuguese_brazilian ] = "Type of connection";
-        Text[ japanese ] = "Type of connection";
-        Text[ korean ] = "Type of connection";
+        Text[ japanese ] = "接続タイプ";
+        Text[ korean ] = "연결 유형";
         Text[ turkish ] = "Type of connection";
         Text[ thai ] = "Type of connection";
         Text[ english_us ] = "Type of connection";
         Text[ greek ] = "Type of connection";
         Text[ dutch ] = "Type of connection";
-        Text[ french ] = "Type of connection";
+        Text[ french ] = "Type de connexion";
         Text[ finnish ] = "Type of connection";
         Text[ danish ] = "Type of connection";
-        Text[ chinese_simplified ] = "Type of connection";
-        Text[ chinese_traditional ] = "Type of connection";
+        Text[ chinese_simplified ] = "连接的类型";
+        Text[ chinese_traditional ] = "連線類型";
         Text[ arabic ] = "Type of connection";
         Text[ catalan ] = "Type of connection";
     };
@@ -2172,23 +2172,23 @@ TabPage PAGE_MYSQL
         Text [ english ]    = "Use existing My~ODBC data source";
         Text[ portuguese ] = "Use existing My~ODBC data source";
         Text[ russian ] = "Use existing My~ODBC data source";
-        Text[ spanish ] = "Use existing My~ODBC data source";
-        Text[ italian ] = "Use existing My~ODBC data source";
-        Text[ swedish ] = "Use existing My~ODBC data source";
+        Text[ spanish ] = "Utilizar la fuente de datos My~ODBC existente";
+        Text[ italian ] = "Usa la sorgente dati My~ODBC presente";
+        Text[ swedish ] = "Anv�nd existerande My~ODBC-datak�lla";
         Text[ polish ] = "Use existing My~ODBC data source";
         Text[ portuguese_brazilian ] = "Use existing My~ODBC data source";
-        Text[ japanese ] = "Use existing My~ODBC data source";
-        Text[ korean ] = "Use existing My~ODBC data source";
+        Text[ japanese ] = "既存の MyODBC データソースを使用(~O)";
+        Text[ korean ] = "현재 My~ODBC 데이터 원본 사용";
         Text[ turkish ] = "Use existing My~ODBC data source";
         Text[ thai ] = "Use existing My~ODBC data source";
         Text[ english_us ] = "Use existing My~ODBC data source";
         Text[ greek ] = "Use existing My~ODBC data source";
         Text[ dutch ] = "Use existing My~ODBC data source";
-        Text[ french ] = "Use existing My~ODBC data source";
+        Text[ french ] = "Utiliser la source de donn�es My~ODBC existante";
         Text[ finnish ] = "Use existing My~ODBC data source";
         Text[ danish ] = "Use existing My~ODBC data source";
-        Text[ chinese_simplified ] = "Use existing My~ODBC data source";
-        Text[ chinese_traditional ] = "Use existing My~ODBC data source";
+        Text[ chinese_simplified ] = "使用现有的 My~ODBC 数据源";
+        Text[ chinese_traditional ] = "使用現有的 MyODBC 資料源(~O)";
         Text[ arabic ] = "Use existing My~ODBC data source";
         Text[ catalan ] = "Use existing My~ODBC data source";
     };
@@ -2202,23 +2202,23 @@ TabPage PAGE_MYSQL
         Text[ language_user1 ] = "EM Dec 2002: Connector/J3 is the JDBC driver from MySQL. Do not translate or change �Connector/J3�-- it is a product name.";
         Text[ portuguese ] = "Use Connector/~J3";
         Text[ russian ] = "Use Connector/~J3";
-        Text[ spanish ] = "Use Connector/~J3";
-        Text[ italian ] = "Use Connector/~J3";
-        Text[ swedish ] = "Use Connector/~J3";
+        Text[ spanish ] = "Utilizar Connector/~J3";
+        Text[ italian ] = "Usa Connector/~J3";
+        Text[ swedish ] = "Anv�nd Connector/~J3";
         Text[ polish ] = "Use Connector/~J3";
         Text[ portuguese_brazilian ] = "Use Connector/~J3";
-        Text[ japanese ] = "Use Connector/~J3";
-        Text[ korean ] = "Use Connector/~J3";
+        Text[ japanese ] = "コネクター/J3を使用(~J)";
+        Text[ korean ] = "Connector/~J3 사용";
         Text[ turkish ] = "Use Connector/~J3";
         Text[ thai ] = "Use Connector/~J3";
         Text[ english_us ] = "Use Connector/~J3";
         Text[ greek ] = "Use Connector/~J3";
         Text[ dutch ] = "Use Connector/~J3";
-        Text[ french ] = "Use Connector/~J3";
+        Text[ french ] = "Utiliser Connector/~J3";
         Text[ finnish ] = "Use Connector/~J3";
         Text[ danish ] = "Use Connector/~J3";
-        Text[ chinese_simplified ] = "Use Connector/~J3";
-        Text[ chinese_traditional ] = "Use Connector/~J3";
+        Text[ chinese_simplified ] = "使用 Connector/~J3";
+        Text[ chinese_traditional ] = "使用連結器/J3(~J)";
         Text[ arabic ] = "Use Connector/~J3";
         Text[ catalan ] = "Use Connector/~J3";
     };
@@ -2231,23 +2231,23 @@ TabPage PAGE_MYSQL
         Text [ english ] = "MySQL JDBC d~river class";
         Text[ portuguese ] = "MySQL JDBC d~river class";
         Text[ russian ] = "MySQL JDBC d~river class";
-        Text[ spanish ] = "MySQL JDBC d~river class";
-        Text[ italian ] = "MySQL JDBC d~river class";
-        Text[ swedish ] = "MySQL JDBC d~river class";
+        Text[ spanish ] = "Clase de ~controlador MySQL JDBC";
+        Text[ italian ] = "Classe driver JDBC per MySQL";
+        Text[ swedish ] = "D~rivrutinsklass MySQL JDBC";
         Text[ polish ] = "MySQL JDBC d~river class";
         Text[ portuguese_brazilian ] = "MySQL JDBC d~river class";
-        Text[ japanese ] = "MySQL JDBC d~river class";
-        Text[ korean ] = "MySQL JDBC d~river class";
+        Text[ japanese ] = "MySQL JDBC ドライバクラス(~R)";
+        Text[ korean ] = "MySQL JDBC 드라이버 클래스";
         Text[ turkish ] = "MySQL JDBC d~river class";
         Text[ thai ] = "MySQL JDBC d~river class";
         Text[ english_us ] = "MySQL JDBC d~river class";
         Text[ greek ] = "MySQL JDBC d~river class";
         Text[ dutch ] = "MySQL JDBC d~river class";
-        Text[ french ] = "MySQL JDBC d~river class";
+        Text[ french ] = "Classe de pilote JDBC pour MySQL";
         Text[ finnish ] = "MySQL JDBC d~river class";
         Text[ danish ] = "MySQL JDBC d~river class";
-        Text[ chinese_simplified ] = "MySQL JDBC d~river class";
-        Text[ chinese_traditional ] = "MySQL JDBC d~river class";
+        Text[ chinese_simplified ] = "MySQL JDBC 驱动程序类";
+        Text[ chinese_traditional ] = "MySQL JDBC 驅動程式類(~R)";
         Text[ arabic ] = "MySQL JDBC d~river class";
         Text[ catalan ] = "MySQL JDBC d~river class";
     };
@@ -2269,21 +2269,21 @@ TabPage PAGE_MYSQL
         Text[ russian ] = "General";
         Text[ spanish ] = "General";
         Text[ italian ] = "General";
-        Text[ swedish ] = "General";
+        Text[ swedish ] = "Allm�nt";
         Text[ polish ] = "General";
         Text[ portuguese_brazilian ] = "General";
-        Text[ japanese ] = "General";
-        Text[ korean ] = "General";
+        Text[ japanese ] = "全般";
+        Text[ korean ] = "일반";
         Text[ turkish ] = "General";
         Text[ thai ] = "General";
         Text[ english_us ] = "General";
         Text[ greek ] = "General";
         Text[ dutch ] = "General";
-        Text[ french ] = "General";
+        Text[ french ] = "G�n�ral";
         Text[ finnish ] = "General";
         Text[ danish ] = "General";
-        Text[ chinese_simplified ] = "General";
-        Text[ chinese_traditional ] = "General";
+        Text[ chinese_simplified ] = "一般";
+        Text[ chinese_traditional ] = "一般";
         Text[ arabic ] = "General";
         Text[ catalan ] = "General";
     };
@@ -2297,23 +2297,23 @@ TabPage PAGE_MYSQL
         Text [ english ] = "~Data source URL";
         Text[ portuguese ] = "~Data source URL";
         Text[ russian ] = "~Data source URL";
-        Text[ spanish ] = "~Data source URL";
-        Text[ italian ] = "~Data source URL";
-        Text[ swedish ] = "~Data source URL";
+        Text[ spanish ] = "~URL de la fuente de datos";
+        Text[ italian ] = "~Sorgente dati URL";
+        Text[ swedish ] = "~URL f�r datak�lla";
         Text[ polish ] = "~Data source URL";
         Text[ portuguese_brazilian ] = "~Data source URL";
-        Text[ japanese ] = "~Data source URL";
-        Text[ korean ] = "~Data source URL";
+        Text[ japanese ] = "データソース URL(~D)";
+        Text[ korean ] = "데이터 원본 URL(~D):";
         Text[ turkish ] = "~Data source URL";
         Text[ thai ] = "~Data source URL";
         Text[ english_us ] = "~Data source URL";
         Text[ greek ] = "~Data source URL";
         Text[ dutch ] = "~Data source URL";
-        Text[ french ] = "~Data source URL";
+        Text[ french ] = "URL de la source de donn�es";
         Text[ finnish ] = "~Data source URL";
         Text[ danish ] = "~Data source URL";
-        Text[ chinese_simplified ] = "~Data source URL";
-        Text[ chinese_traditional ] = "~Data source URL";
+        Text[ chinese_simplified ] = "数据源 URL(~D)";
+        Text[ chinese_traditional ] = "資料源 URL(~D)";
         Text[ arabic ] = "~Data source URL";
         Text[ catalan ] = "~Data source URL";
     };
@@ -2342,23 +2342,23 @@ TabPage PAGE_MYSQL
         Text [ english ] = "~User name";
         Text[ portuguese ] = "~User name";
         Text[ russian ] = "~User name";
-        Text[ spanish ] = "~User name";
-        Text[ italian ] = "~User name";
-        Text[ swedish ] = "~User name";
+        Text[ spanish ] = "~Nombre de usuario";
+        Text[ italian ] = "Nome ~utente";
+        Text[ swedish ] = "A~nv�ndarnamn";
         Text[ polish ] = "~User name";
         Text[ portuguese_brazilian ] = "~User name";
-        Text[ japanese ] = "~User name";
-        Text[ korean ] = "~User name";
+        Text[ japanese ] = "ユーザー名(~U)";
+        Text[ korean ] = "사용자 이름(~U)";
         Text[ turkish ] = "~User name";
         Text[ thai ] = "~User name";
         Text[ english_us ] = "~User name";
         Text[ greek ] = "~User name";
         Text[ dutch ] = "~User name";
-        Text[ french ] = "~User name";
+        Text[ french ] = "Nom d'utilisateur";
         Text[ finnish ] = "~User name";
         Text[ danish ] = "~User name";
-        Text[ chinese_simplified ] = "~User name";
-        Text[ chinese_traditional ] = "~User name";
+        Text[ chinese_simplified ] = "使用名(~U)";
+        Text[ chinese_traditional ] = "使用者名稱(~U)";
         Text[ arabic ] = "~User name";
         Text[ catalan ] = "~User name";
     };
@@ -2378,23 +2378,23 @@ TabPage PAGE_MYSQL
         Text [ english ] = "Password r~equired";
         Text[ portuguese ] = "Password r~equired";
         Text[ russian ] = "Password r~equired";
-        Text[ spanish ] = "Password r~equired";
-        Text[ italian ] = "Password r~equired";
-        Text[ swedish ] = "Password r~equired";
+        Text[ spanish ] = "Se requiere ~contrase�a";
+        Text[ italian ] = "Password necessaria";
+        Text[ swedish ] = "L�senord k~r�vs";
         Text[ polish ] = "Password r~equired";
         Text[ portuguese_brazilian ] = "Password r~equired";
-        Text[ japanese ] = "Password r~equired";
-        Text[ korean ] = "Password r~equired";
+        Text[ japanese ] = "必須パスワード(~E)";
+        Text[ korean ] = "암호 필요";
         Text[ turkish ] = "Password r~equired";
         Text[ thai ] = "Password r~equired";
         Text[ english_us ] = "Password r~equired";
         Text[ greek ] = "Password r~equired";
         Text[ dutch ] = "Password r~equired";
-        Text[ french ] = "Password r~equired";
+        Text[ french ] = "Mot de passe requis";
         Text[ finnish ] = "Password r~equired";
         Text[ danish ] = "Password r~equired";
-        Text[ chinese_simplified ] = "Password r~equired";
-        Text[ chinese_traditional ] = "Password r~equired";
+        Text[ chinese_simplified ] = "需要输入密码(~E)";
+        Text[ chinese_traditional ] = "需要密碼(~E)";
         Text[ arabic ] = "Password r~equired";
         Text[ catalan ] = "Password r~equired";
     };
@@ -2406,23 +2406,23 @@ TabPage PAGE_MYSQL
         Text [ english ] = "~Character set";
         Text[ portuguese ] = "~Character set";
         Text[ russian ] = "~Character set";
-        Text[ spanish ] = "~Character set";
-        Text[ italian ] = "~Character set";
-        Text[ swedish ] = "~Character set";
+        Text[ spanish ] = "J~uego de caracteres";
+        Text[ italian ] = "~Tipo di carattere";
+        Text[ swedish ] = "Te~ckenupps�ttning";
         Text[ polish ] = "~Character set";
         Text[ portuguese_brazilian ] = "~Character set";
-        Text[ japanese ] = "~Character set";
-        Text[ korean ] = "~Character set";
+        Text[ japanese ] = "文字セット(~C)";
+        Text[ korean ] = "문자집합(~C)";
         Text[ turkish ] = "~Character set";
         Text[ thai ] = "~Character set";
         Text[ english_us ] = "~Character set";
         Text[ greek ] = "~Character set";
         Text[ dutch ] = "~Character set";
-        Text[ french ] = "~Character set";
+        Text[ french ] = "Jeu de caract�res";
         Text[ finnish ] = "~Character set";
         Text[ danish ] = "~Character set";
-        Text[ chinese_simplified ] = "~Character set";
-        Text[ chinese_traditional ] = "~Character set";
+        Text[ chinese_simplified ] = "字符集(~C)";
+        Text[ chinese_traditional ] = "字元集(~C)";
         Text[ arabic ] = "~Character set";
         Text[ catalan ] = "~Character set";
     };
@@ -2443,23 +2443,23 @@ TabPage PAGE_MYSQL
         Text [ english ] = "<host>:<3306>/<DBNAME>";
         Text[ portuguese ] = "<host>:<3306>/<DBNAME>";
         Text[ russian ] = "<host>:<3306>/<DBNAME>";
-        Text[ spanish ] = "<host>:<3306>/<DBNAME>";
+        Text[ spanish ] = "<ordenador>:<3306>/<DBNAME>";
         Text[ italian ] = "<host>:<3306>/<DBNAME>";
-        Text[ swedish ] = "<host>:<3306>/<DBNAME>";
+        Text[ swedish ] = "<v�rddator>:<3306>/<DBNAME>";
         Text[ polish ] = "<host>:<3306>/<DBNAME>";
         Text[ portuguese_brazilian ] = "<host>:<3306>/<DBNAME>";
         Text[ japanese ] = "<host>:<3306>/<DBNAME>";
-        Text[ korean ] = "<host>:<3306>/<DBNAME>";
+        Text[ korean ] = "<호스트>:<3306>/<DBNAME>";
         Text[ turkish ] = "<host>:<3306>/<DBNAME>";
         Text[ thai ] = "<host>:<3306>/<DBNAME>";
         Text[ english_us ] = "<host>:<3306>/<DBNAME>";
         Text[ greek ] = "<host>:<3306>/<DBNAME>";
         Text[ dutch ] = "<host>:<3306>/<DBNAME>";
-        Text[ french ] = "<host>:<3306>/<DBNAME>";
+        Text[ french ] = "<ordinateur>:<3306>/<DBNAME>";
         Text[ finnish ] = "<host>:<3306>/<DBNAME>";
         Text[ danish ] = "<host>:<3306>/<DBNAME>";
-        Text[ chinese_simplified ] = "<host>:<3306>/<DBNAME>";
-        Text[ chinese_traditional ] = "<host>:<3306>/<DBNAME>";
+        Text[ chinese_simplified ] = "<主机>:<3306>/<数据库名称>";
+        Text[ chinese_traditional ] = "<主機>:<3306>/<DBNAME>";
         Text[ arabic ] = "<host>:<3306>/<DBNAME>";
         Text[ catalan ] = "<host>:<3306>/<DBNAME>";
     };
@@ -2612,7 +2612,7 @@ TabPage PAGE_LDAP
         Text[ polish ] = "~Rekordy (maks.)";
         Text[ portuguese_brazilian ] = "~Rows (max.)";
         Text[ japanese ] = "最大レコード数(~R)";
-        Text[ korean ] = "데이터 레코드(최대)(~R)";
+        Text[ korean ] = "레코드(최대)(~R)";
         Text[ chinese_simplified ] = "数据条目(最多)(~R)";
         Text[ chinese_traditional ] = "資料條目(最多)(~R)";
         Text[ turkish ] = "~Rows (max.)";
@@ -2693,7 +2693,7 @@ TabPage PAGE_TEXT
         Text [ chinese_traditional ] = "內文含有頁首(~T)";
         Text [ arabic ] = "����� ���� ��� ��� ������";
         Text [ greek ] = "�� ������� �������� ��������";
-        Text [ korean ] = "머리글이 포함되어 있는 텍스트(~T)";
+        Text [ korean ] = "문서가 머리글을 포함(~T)";
         Text [ turkish ] = "Metin �stbilgi i�eriyor";
         Text [ language_user1 ] = " ";
         Text[ catalan ] = "El ~text cont� encap�alament";
@@ -2802,7 +2802,7 @@ TabPage PAGE_TEXT
         Text [ chinese_traditional ] = "小數點符號";
         Text [ arabic ] = "���� ����";
         Text [ greek ] = "~������������ ���������";
-        Text [ korean ] = "소수점 구분 기호";
+        Text [ korean ] = "소수 구분 기호";
         Text [ turkish ] = "Ondal�k ay�r�c�s�";
         Text[ catalan ] = "Separador decimal";
         Text[ thai ] = "ตัวแยกทศนิยม";
@@ -2976,7 +2976,7 @@ TabPage PAGE_TEXT
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 125 , 131 ) ;
-        Size = MAP_APPFONT ( 61 , 60 ) ;
+        Size = MAP_APPFONT ( 130 , 60 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
@@ -2990,19 +2990,19 @@ TabPage PAGE_TEXT
         Text [ NORWEGIAN ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ;
         Text [ DANISH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{tom}\t32" ;
         Text [ english_US ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ;
-        Text [ SPANISH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{vac�o}\t32" ;
+        Text [ SPANISH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{espacio}\t32" ;
         Text [ FINNISH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{empty}\t32" ;
-        Text [ FRENCH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Leer}\t32" ;
+        Text [ FRENCH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Espace}\t32" ;
         Text [ ITALIAN ] = ";\t59\t,\t44\t:\t58\t{tab}\t9\t{spazio}\t32" ;
         Text [ DUTCH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{leeg}\t32" ;
         Text [ PORTUGUESE_BRAZILIAN ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ;
-        Text [ SWEDISH ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{tom}\t32" ;
+        Text [ SWEDISH ] = ";\t59\t,\t44\t:\t58\t{Tabb}\t9\t{Mellanslag}\t32" ;
         Text [ PORTUGUESE ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{vazio}\t32" ;
-        Text [ chinese_simplified ] = ";\t59\t,\t44\t:\t58\t{制表键}\t9\t{空缺}\t32";
+        Text [ chinese_simplified ] = ";\t59\t,\t44\t:\t58\t{制表键}\t9\t{空格}\t32";
         Text [ russian ] = ";\t59\t,\t44\t:\t58\t{Ta�}\t9\t{�����}\t32";
         Text [ polish ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Pusty}\t32";
         Text [ japanese ] = ";\t59\t,\t44\t:\t58\t{タブ}\t9\t{空白}\t32";
-        Text [ chinese_traditional ] = ";\t59\t,\t44\t:\t58\t{定位鍵}\t9\t{空缺}\t32";
+        Text [ chinese_traditional ] = ";\t59\t,\t44\t:\t58\t{定位鍵}\t9\t{空格}\t32";
         Text [ arabic ] = ";\t59\t,\t44\t:\t58\t{����� �����}\t9\t{����\t32";
         Text [ greek ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{����}\t32";
         Text [ korean ] = ";\t59\t,\t44\t:\t58\t{탭}\t9\t{공백}\t32";
@@ -3022,14 +3022,14 @@ TabPage PAGE_TEXT
         Text = "{Keiner}" ;
         Text [ english ] = "{None}" ;
         Text[ english_us ] = "{None}";
-        Text[ french ] = "{None}";
-        Text[ spanish ] = "{None}";
-        Text[ italian ] = "{None}";
-        Text[ swedish ] = "{None}";
-        Text[ japanese ] = "{None}";
-        Text[ korean ] = "{None}";
-        Text[ chinese_simplified ] = "{None}";
-        Text[ chinese_traditional ] = "{None}";
+        Text[ french ] = "{Aucun}";
+        Text[ spanish ] = "{Ninguno}";
+        Text[ italian ] = "{Nessuno}";
+        Text[ swedish ] = "{Ingen}";
+        Text[ japanese ] = "{なし}";
+        Text[ korean ] = "{없음}";
+        Text[ chinese_simplified ] = "{无}";
+        Text[ chinese_traditional ] = "{無}";
         Text[ portuguese ] = "{None}";
         Text[ russian ] = "{None}";
         Text[ greek ] = "{None}";
@@ -3091,7 +3091,7 @@ TabPage PAGE_TEXT
         Text [ chinese_traditional ] = "#1 和 #2 必須不相同。";
         Text [ arabic ] = "��� �� ���� #1 � #2 �������.";
         Text [ greek ] = "#1 ��� #2 ������ �� ���������.";
-        Text [ korean ] = "#1과 #2는 반드시 서로 달라야 합니다.";
+        Text [ korean ] = "#1과 #2는 구분되어야 합니다.";
         Text [ turkish ] = "#1 ve #2 farkl� olmal�.";
         Text [ language_user1 ] = " ";
         Text[ finnish ] = "Arvot #1 ja #2 eiv�t saa olla identtiset.";
@@ -3118,7 +3118,7 @@ TabPage PAGE_TEXT
         Text [ chinese_traditional ] = "#1 不能夠含有萬用字元<*,?>。";
         Text [ arabic ] = "�� ����� ����� ����� ��� *,?� �� #1.";
         Text [ greek ] = "��� ������������ �� ������� �������� ����� ���� (?,*) ��� #1.";
-        Text [ korean ] = "#1 에서 ? 및 *와 같은 와일드카드 문자 사용할 수 없습니다.";
+        Text [ korean ] = "#1 에서는 ? 및 *와 같은 패턴 일치(와일드카드)를 사용할 수 없습니다.";
         Text [ turkish ] = "*,? gibi de�i�kenler #1 i�in kullan�lamaz.";
         Text [ language_user1 ] = " ";
         Text[ finnish ] = "Yleismerkkej�, esimerkiksi ? ja *, ei sallita kohteessa #1.";
@@ -3176,7 +3176,7 @@ TabPage PAGE_TEXT
         Text[ swedish ] = "Anv�nd SQL92-namnbegr�nsningar";
         Text[ polish ] = "Use SQL92 naming convention";
         Text[ japanese ] = "SQL92 で許された型の名前を使用する";
-        Text[ korean ] = "SQL92 이름 부여 협정 사용";
+        Text[ korean ] = "SQL92 이름 제약 조건 사용";
         Text[ chinese_simplified ] = "使用 SQL92 命名规则";
         Text[ chinese_traditional ] = "使用 SQL92 命名規則";
         Text[ turkish ] = "Use SQL92 naming convention";
@@ -3212,7 +3212,7 @@ TabPage PAGE_TABLESUBSCRIPTION
         Text[ polish ] = "Tabele i filtry tabel";
         Text[ portuguese_brazilian ] = "Tables and Table filter";
         Text[ japanese ] = "テーブルとテーブルフィルタ";
-        Text[ korean ] = "시트와 시트 필터";
+        Text[ korean ] = "테이블 및 필터";
         Text[ chinese_simplified ] = "表格和表格筛选";
         Text[ chinese_traditional ] = "表格及表格篩選";
         Text[ turkish ] = "Tables and Table filter";
@@ -3276,7 +3276,7 @@ TabPage PAGE_TABLESUBSCRIPTION
         Text[ polish ] = "Na powy�szej li�cie nale�y zaznaczy� krzy�ykiem tabele, kt�re maj� by� widoczne w aplikacjach.";
         Text[ portuguese_brazilian ] = "In the list above, please check the tables which should be visible for the applications.";
         Text[ japanese ] = "上記のリストの中から、アプリケーションで表示させるテーブルを選択してください。";
-        Text[ korean ] = "위의 목록에서 응용 프로그램용으로 표시되어야 하는 시트를 선택하십시오.";
+        Text[ korean ] = "위의 목록에서 응용 프로그램용으로 표시되어야 하는 테이블을 선택하십시오.";
         Text[ chinese_simplified ] = "请在以上的列单之中挑选要显示给应用程序的表格。";
         Text[ chinese_traditional ] = "請在以上的清單之中挑選要顯示給應用程式的表格。";
         Text[ turkish ] = "In the list above, please check the tables which should be visible for the applications.";
@@ -3304,7 +3304,7 @@ TabPage PAGE_TABLESUBSCRIPTION
         Text[ polish ] = "Kolumny";
         Text[ portuguese_brazilian ] = "Columns";
         Text[ japanese ] = "列";
-        Text[ korean ] = "단";
+        Text[ korean ] = "열";
         Text[ chinese_simplified ] = "列";
         Text[ chinese_traditional ] = "欄";
         Text[ turkish ] = "Columns";
@@ -3334,7 +3334,7 @@ TabPage PAGE_TABLESUBSCRIPTION
         Text [ polish ] = "Poka� wersje kolumn (je�li s� dost�pne)";
         Text [ portuguese_brazilian ] = "Suppress version columns";
         Text [ japanese ] = "バージョン欄の表示(ある場合)";
-        Text [ korean ] = "버전 열 표시 (가능할 경우)";
+        Text [ korean ] = "버전 열 표시 (있는 경우)";
         Text [ chinese_simplified ] = "显示隐入版本栏位(如果存在)";
         Text [ chinese_traditional ] = "隱入版本欄位(如果存在)";
         Text [ turkish ] = "Suppress version columns";
@@ -3373,7 +3373,7 @@ TabPage PAGE_QUERYADMINISTRATION
         Text [ polish ] = "Kwerendy";
         Text [ portuguese_brazilian ] = "Queries";
         Text [ japanese ] = "クエリー";
-        Text [ korean ] = "질의";
+        Text [ korean ] = "쿼리";
         Text [ chinese_simplified ] = "查询";
         Text [ chinese_traditional ] = "查詢";
         Text [ turkish ] = "Queries";
@@ -3541,7 +3541,7 @@ WarningBox ERR_NOREGISTEREDDATASOURCES
     Message[ polish ] = "Brak na razie zarejestrowanych �r�de� danych.";
     Message[ portuguese_brazilian ] = "Currently, there are no registered data sources.";
     Message[ japanese ] = "現時点ではデータソースは登録されていません。";
-    Message[ korean ] = "현재 등록된 데이터 소스가 없습니다.";
+    Message[ korean ] = "현재 등록된 데이터 원본이 없습니다.";
     Message[ chinese_simplified ] = "当前没有登记任何数据源。";
     Message[ chinese_traditional ] = "現在不存在任何登記的資料源。";
     Message[ turkish ] = "Currently, there are no registered data sources.";
@@ -3560,14 +3560,14 @@ ErrorBox ERR_COULDNOTRESTOREDS
     Message[ greek ] = "�� ����� ��� ���������� ��������� ��� ����������, ������ ��� �� ��� ���� ��������� ���������! �� ������ �� ������������ ��� ��������� ����? ";
     Message[ dutch ] = "De naam van de gewiste gegevensbron heeft u reeds gebruikt voor een andere bron! Wilt u de gewiste gegevensbron weer herstellen, dan moet u eerst de naam van de andere bron wijzigen.";
     Message[ french ] = "Le nom de la source de donn�es supprim�e a d�j� �t� attribu� � une autre source que vous devez commencer par renommer afin de pouvoir restaurer l'ancienne.";
-    Message[ spanish ] = "El nombre de la fuente de datos eliminada se ha asignado ya a otra fuente. Deber� cambiarle el nombre para poder restaurar la antigua fuente de datos.";
+    Message[ spanish ] = "El nombre de la fuente de datos borrada se ha asignado ya a otra fuente. Deber� cambiarle el nombre para poder restaurar la antigua fuente de datos.";
     Message[ italian ] = "Il nome della sorgente dati eliiminata � gi� stato attribuito a un'altra. Prima di procedere, � necessario cambiare nome alla seconda sorgente dati prima di poter ripristinare quella eliminata.";
     Message[ danish ] = "Du har allerede givet en anden datakilde den slettede datakildes navn! Du skal omd�be den f�rste datakilde for at kunne gendanne den aktuelle.";
     Message[ swedish ] = "Du har redan gett namnet p� den raderade datak�llan till en annan datak�lla! Du m�ste byta namn p� den andra datak�llan f�r att kunna �terst�lla den aktuella datak�llan.";
     Message[ polish ] = "Nazwa usuni�tego �r�d�a danych przypisana zosta�a innemu plikowi! Nale�y zmieni� jego nazw�, aby m�c odtworzy� aktualne �r�d�o danych.";
     Message[ portuguese_brazilian ] = "You already gave another data source the name of the deleted one. You have to rename the first to restore the current one.";
     Message[ japanese ] = "すでに削除したデータの名前が別のデータソースに入力されました。現在のものを復元するには、まず旧データの名前を変更する必要があります。";
-    Message[ korean ] = "사용자가 삭제된 데이터 소스의 이름을 이미 다른 데이터 소스에 부여하였습니다. 이 데이터 소스 이름을 변경해야만 삭제된 데이터 소스를 복구할 수 있습니다.";
+    Message[ korean ] = "삭제된 데이터 원본의 이름을 이미 다른 데이터 원본의 이름으로 지정하셨습니다. 삭제된 데이터 원본을 복구하기 전에 이 데이터 원본의 이름을 바꾸어야만 합니다.";
     Message[ chinese_simplified ] = "您已经用一个被删除的数据源名称命名了一个其他的数据源！您必须重命名那一个数据源，然后才能恢复当前的数据源。";
     Message[ chinese_traditional ] = "您已經為另一個資料源設定了這個名稱！您必須先執行重新命名，然后才能夠還原現在的資料源。";
     Message[ turkish ] = "You already gave another data source the name of the deleted one. You have to rename the first to restore the current one.";
@@ -3594,7 +3594,7 @@ String STR_ENTER_CONNECTION_PASSWORD
     Text [ polish ] = "Po��czenie ze �r�d�em danych \"$name$\" wymaga wprowadzenia has�a.";
     Text [ portuguese_brazilian ] = "Connecting to data source \"$name$\" requires you to enter a password.";
     Text [ japanese ] = "\"$name$\" データソースへの接続にはパスワードの入力が必要です。";
-    Text [ korean ] = "데이터 소스 \"$name$\" 에 연결하려면 패스워드를 입력해야 합니다.";
+    Text [ korean ] = "데이터 원본 \"$name$\"(으)로 연결하려면 암호를 입력해야 합니다.";
     Text [ chinese_simplified ] = "读取数据源 \"$name$\" 要求您输入密码。";
     Text [ chinese_traditional ] = "連線到資料源<$name$>必須輸入一個密碼。";
     Text [ turkish ] = "Connecting to data source \"$name$\" requires you to enter a password.";
@@ -3620,7 +3620,7 @@ String STR_DATASOURCE_DEFAULTNAME
     Text [ polish ] = "�r�d�o danych";
     Text [ portuguese_brazilian ] = "datas source";
     Text [ japanese ] = "データソース";
-    Text [ korean ] = "데이터 소스";
+    Text [ korean ] = "데이터 원본";
     Text [ chinese_simplified ] = "数据源";
     Text [ chinese_traditional ] = "資料源";
     Text [ turkish ] = "datas source";
@@ -3646,7 +3646,7 @@ String STR_ERR_EMPTY_DSN_NAME
     Text [ polish ] = "Nazwa �r�d�a danych nie mo�e by� pusta!";
     Text [ portuguese_brazilian ] = "The data source name must not be empty!";
     Text [ japanese ] = "データソース名が空白ではいけません。";
-    Text [ korean ] = "데이터 소스 이름을 지정해야 합니다.!";
+    Text [ korean ] = "데이터 원본 이름을 지정하셔야 합니다.";
     Text [ chinese_simplified ] = "数据源名称不可以空缺！";
     Text [ chinese_traditional ] = "資料源名稱不可以空缺！";
     Text [ turkish ] = "The data source name must not be empty!";
@@ -3672,14 +3672,14 @@ Menu MENU_DATASOURCELIST_POPUP
             Text [ greek ] = "���������� ���������� ���������";
             Text [ dutch ] = "nieuwe gegevensbron";
             Text [ french ] = "Nouvelle source de donn�es";
-            Text [ spanish ] = "nueva fuente de datos";
+            Text [ spanish ] = "Nueva fuente de datos";
             Text [ italian ] = "Nuova sorgente dati";
             Text [ danish ] = "Ny datakilde";
             Text [ swedish ] = "Ny datak�lla";
             Text [ polish ] = "nowe �r�d�o danych";
             Text [ portuguese_brazilian ] = "new data source";
             Text [ japanese ] = "新しいデータソース";
-            Text [ korean ] = "새 데이터 소스";
+            Text [ korean ] = "새 데이터 원본";
             Text [ chinese_simplified ] = "新的数据源";
             Text [ chinese_traditional ] = "新資料源";
             Text [ turkish ] = "new data source";
@@ -3700,14 +3700,14 @@ Menu MENU_DATASOURCELIST_POPUP
             Text [ greek ] = "�������� ���������� ���������";
             Text [ dutch ] = "Gegevensbron wissen";
             Text [ french ] = "Source de donn�es supprim�e";
-            Text [ spanish ] = "Eliminar la fuente de datos";
+            Text [ spanish ] = "Borrar la fuente de datos";
             Text [ italian ] = "Elimina sorgente dati";
             Text [ danish ] = "Slet datakilde";
             Text [ swedish ] = "Radera datak�lla";
             Text [ polish ] = "Usu� �r�d�o danych";
             Text [ portuguese_brazilian ] = "delete data source";
             Text [ japanese ] = "データソースの削除";
-            Text [ korean ] = "데이터 소스 삭제";
+            Text [ korean ] = "데이터 원본 삭제";
             Text [ chinese_simplified ] = "删除数据源";
             Text [ chinese_traditional ] = "刪除資料源";
             Text [ turkish ] = "delete data source";
@@ -3735,7 +3735,7 @@ Menu MENU_DATASOURCELIST_POPUP
             Text [ polish ] = "Odtw�rz �r�d�o danych";
             Text [ portuguese_brazilian ] = "restore data source";
             Text [ japanese ] = "データソースの復元";
-            Text [ korean ] = "데이터 소스 복구";
+            Text [ korean ] = "데이터 원본 복구";
             Text [ chinese_simplified ] = "恢复数据源";
             Text [ chinese_traditional ] = "還原資料源";
             Text [ turkish ] = "restore data source";
@@ -3867,7 +3867,7 @@ Menu RID_NEW_FORM
             Text[ polish ] = "Na podstawie ~szablonu...";
             Text[ portuguese_brazilian ] = "From Templ~ate";
             Text[ japanese ] = "テンプレートから(~A)";
-            Text[ korean ] = "템플릿에서(~A)";
+            Text[ korean ] = "서식 파일로부터(~A)...";
             Text[ chinese_simplified ] = "采用样式(~A)...";
             Text[ chinese_traditional ] = "採用樣式(~A)...";
             Text[ turkish ] = "From Templ~ate";
@@ -3909,7 +3909,7 @@ WarningBox WARN_SAVEFORQUERIES
     Message[ turkish ] = "To administrate the queries of a data source, it must be saved.\nShould all changes made in this dialog now be saved?";
     Message[ arabic ] = "������ ��������� ���� �����ʡ ��� ��� ��� ������.\n�� ���� ��� ���� ��������� ���� ��� ��� ���� �� ���� ������ ��ǿ";
     Message[ catalan ] = "Per poder administrar les consultes d'una font de dades, aquesta s'ha de desar.\nVoleu desar totes les modificacions realitzades fins ara en aquest di�leg?";
-    Message[ korean ] = "데이터 소스의 $개체$를 관리하려면 반드시 저장해야 합니다.\n지금까지 이 대화상자에서 실시한 모든 변경 사항을 지금 저장하겠습니까?";
+    Message[ korean ] = "데이터 원본의 $objects$를 관리하려면 꼭 저장해야만 합니다.\n지금까지 이 대화 상자에서 실행한 모든 변경 내용을 저장하시겠습니까?";
     Message[ thai ] = "การจัดการ $objects$ ของแหล่งข้อมูลนั้น  จะต้องบันทึกแหล่งข้อมูล\nต้องการบันทึกการเปลี่ยนแปลงทั้งหมดที่ทำในไดอะล็อกนี้ขณะนี้หรือไม่?";
 };
 
@@ -3925,7 +3925,7 @@ ErrorBox ERR_CANTADMINQUERIES
 
     Message[ language_user1 ] = "For ; For ; For $objects$, there will be used one of the strings STR_QUERY_OBJECTS and STR_DOCUMENT_OBJECTS.";
     Message[ portuguese ] = "� necess�rio guardar a fonte de dados para poder gerir os respectivos $objects$.\nNo entanto, os par�metros actuais n�o permitem guardar as modifica��es (h� conflito de nomes).\n\nN�o � poss�vel gerir $objects$ enquanto estes conflitos n�o forem resolvidos e as modifica��es guardadas.";
-    Message[ russian ] = "���������� ��������� �������� ������ ��� ���������� $objects$.\n������, ������� ��������� �� ��������� ��������� ��������� (�������� ����).\n\n���������� ���������� $objects$, ���� ���� �������� �� ��������, � ��������� �� ���������.";
+    Message[ russian ] = "���������� ��������� �������� ������ ��� ���������� $objects$.\n������ ������� ��������� �� ��������� ��������� ��������� (�������� ����).\n\n���������� $objects$ ����������, ���� ���� �������� �� ��������, � ��������� �� ���������.";
     Message[ greek ] = "��� �� ����� ������ � ���������� ��� ���������� ���� ���������� ���������, ���� �� ������ ����� �� �����������.\n�� ��������� ��������� ��� ���������� ���� ��� ���������� ��� ������� ������ �������� ��������� ��������.\n\n� ���������� ��� ���������� ��� ����� ������ ��� ���������� �� �������� ����� �� ��������� ��� ��� ������� �� ������������ �� �������.";
     Message[ dutch ] = "Om de $objects$ van een gegevensbron te beheren, moet deze opgeslagen zijn.\nMaar met de huidige instellingen is het opslaan van wijzigingen niet mogelijk (problemen met naamgeving).\n\nU kunt de $objects$ niet beheren zolang deze problemen niet zijn opgelost en de wijzigingen niet zijn opgeslagen.";
     Message[ french ] = "Vous devez enregistrer la source de donn�es afin de pouvoir en g�rer les $objects$.\nLes param�tres actifs ne permettent cependant pas d'enregistrer les modifications car il y a des conflits de noms.\n\nTant que ces conflits persisteront et que les modifications n'auront pas �t� enregistr�es, la gestion des $objects$ sera impossible.";
@@ -3936,7 +3936,7 @@ ErrorBox ERR_CANTADMINQUERIES
     Message[ polish ] = "Administracja $objects$ okre�lonego �r�d�a danych wymaga jego uprzedniego zapisania.\nAktualne wpisy nie pozwalaj� jednak zapisa� �r�d�a danych (wyst�pi� konflikt nazw).\n\nAdministracja $objects$ mo�liwa b�dzie dopiero po rozwi�zaniu konfliktu i zapisaniu zmian.";
     Message[ portuguese_brazilian ] = "To administrate the queries of a data source, it must be saved.\nBut, the current settings do not allow to save the changes (there are name conflicts).\n\nYou won't be able to administrate the queries until these conflicts are resolved and the changes are saved.";
     Message[ japanese ] = "データソースの $objects$ を管理するために、これを保存する必要があります。\nところが、名前の共有違反が起こったため、現在の入力では変更の保存はできません。\n\nこの共有違反が削除されて変更が保存されないうちは、$objects$ の管理はできません。";
-    Message[ korean ] = "데이터 소스의 $개체$를 관리하려면 반드시 저장해야 합니다\n그러나 현재 설정에서는 이름 충돌로 인해 변경 사항을 저장할 수 없습니다.\n\n이 충돌을 제거하고 변경 사항을 저장하지 않는 한 사용자는 $개체$를 관리할 수 없습니다.";
+    Message[ korean ] = "데이터 원본의 $objects$을(를) 관리하려면 반드시 저장해야 합니다\n그러나 현재 설정에서는 이름 충돌로 인해 변경 사항을 저장할 수 없습니다.\n\n이 충돌을 제거하고 변경 내용을 저장하지 않는 한 $objects$을(를) 관리할 수 없습니다.";
     Message[ chinese_simplified ] = "要管理一个资料源的 $objects$ ，必须先储存它。\n但是现在您不可以存盘更改的内容，因为存在一个名称冲突的错误。\n\n在排除错误之前您无法存盘更改 $objects$ 。";
     Message[ chinese_traditional ] = "要管理一個資料源的 $objects$ ，必須先儲存它。\n但是現在您不可以儲存變更內容，因為存在名稱沖突錯誤。\n\n在排除錯誤之前您無法存儲變更 $objects$ 。";
     Message[ turkish ] = "To administrate the queries of a data source, it must be saved.\nBut, the current settings do not allow to save the changes (there are name conflicts).\n\nYou won't be able to administrate the queries until these conflicts are resolved and the changes are saved.";
@@ -3956,7 +3956,7 @@ ErrorBox ERR_CANTDOTABLEACTION
         "As long as these conflicts aren't resolved, you won't be able to do the requested operation.";
     Message [ english_us ] = "For this operation, the changes to the data source must be saved.\nHowever, they cannot be saved due to conflicting names of different data sources.\n\nYou must resolve this conflict in order to perform the operation.";
     Message[ portuguese ] = "Para poder executar esta opera��o ter� que guardar as modifica��es na fonte de dados.\nContudo, as actuais indica��es n�o o permitem, uma vez que existe conflito de nomes entre v�rias fontes de dados.\n\nTer� que solucionar primeiro estes conflitos para poder executar a opera��o.";
-    Message[ russian ] = "��� ���������� ������ �������� ���������� ��������� ��������� � ���������� ������.\n������, ������� ��������� �� ��������� ����� (�������� ���� ��������� ���������� ������).\n\n���������� ��������� ��� ��������, ���� ��� ��������� �� ���������.";
+    Message[ russian ] = "��� ���������� ������ �������� ���������� ��������� ��������� � ���������� ������.\n������ ������� ��������� �� ��������� ����� (�������� ���� ��������� ���������� ������).\n\n���������� ��������� ��� ��������, ���� ��� ��������� �� ���������.";
     Message[ greek ] = "For this operation, the data source must be saved.\nHowever, the current settings do not allow this, due to conflicting names of different data sources.\n\nAs long as these conflicts aren't resolved, you won't be able to do the requested operation.";
     Message[ dutch ] = "Om dit commando te kunnen uitvoeren, moet de gegevensbron opgeslagen worden.\nMet de bestaande gegevens is dit niet mogelijk omdat er problemen zijn met de namen van de verschillende gegevensbronnen.\n\nU moet deze problemen eerst oplossen voordat u dit commando kunt uitvoeren.";
     Message[ french ] = "Vous devez enregistrer les modifications apport�es � la source de donn�es afin de pouvoir ex�cuter cette op�ration.\nLes param�tres actifs ne permettent cependant pas de le faire car il y a des conflits de noms entre plusieurs sources de donn�es.\n\nTant que ces conflits persisteront, l'ex�cution de cette op�ration sera impossible.";
@@ -3968,7 +3968,7 @@ ErrorBox ERR_CANTDOTABLEACTION
     Message[ polish ] = "Operacja ta wymaga zapisania zmian dokonanych w �r�dle danych.\nNiestety, bie��ce dane uniemo�liwiaj� zapisania zmian, poniewa� mi�dzy r�nymi �r�d�ami danych powsta�y konflikty nazw.\n\nWykonanie operacji mo�liwe b�dzie dopiero po rozwi�zaniu wymienionych konflikt�w.";
     Message[ portuguese_brazilian ] = "For this operation, the data source must be saved.\nHowever, the current settings do not allow this, due to conflicting names of different data sources.\n\nAs long as these conflicts aren't resolved, you won't be able to do the requested operation.";
     Message[ japanese ] = "このアクションにはデータソースの変更を保存しておく必要があります。\nところが、異なったデータソース間で名前のコンフリクトが起こっているため、現在の入力のままでは無理です。\n\nこのコンフリクトが削除されないまでは、アクションの実行は不可能です。";
-    Message[ korean ] = "이 작업을 위해 데이터 소스에 대한 변경 사항을 저장해야 합니다.\n그러나 현재 설정에서는 서로 다른 데이터 소스 이름들이 충돌하기 때문에 데이터 소스를 저장할 수 없습니다.\n\n충돌이 해결되지 않으면 이 작업을 실행할 수 없습니다.";
+    Message[ korean ] = "이 작동을 위해 데이터 원본의 변경 내용을 저장해야 합니다.\n그러나 현재 설정 내에서는 다른 데이터 원본 이름끼리 서로 충돌하기 때문에 데이터 원본을 저장할 수 없습니다.\n\n충돌을 해결하지 않으면 이 작동을 실행할 수 없습니다.";
     Message[ chinese_simplified ] = "要执行这个命令必须先存盘数据源的更改内容。\n但是，当前的输入资料不允许执行这个命令，因为在各个数据源之间存在一个名称冲突的错误。\n\n在排除这个错误之前是无法执行这个命令的。";
     Message[ chinese_traditional ] = "要執行這個動作必須先儲存資料源的變更內容。\n但是，目前的輸入資料不允許執行這個動作，因為在各個資料源之間存在一個名稱沖突的錯誤。\n\n在排除這個錯誤之前是無法執行這個動作的。";
     Message[ turkish ] = "For this operation, the data source must be saved.\nHowever, the current settings do not allow this, due to conflicting names of different data sources.\n\nAs long as these conflicts aren't resolved, you won't be able to do the requested operation.";
@@ -3997,7 +3997,7 @@ String STR_QUERY_OBJECTS
     Text[ polish ] = "Kwerendy";
     Text[ portuguese_brazilian ] = "queries";
     Text[ japanese ] = "クエリー";
-    Text[ korean ] = "질의";
+    Text[ korean ] = "쿼리";
     Text[ chinese_simplified ] = "查询";
     Text[ chinese_traditional ] = "查詢";
     Text[ turkish ] = "queries";
@@ -4045,7 +4045,7 @@ String STR_QUERY_DROP_ALL
     Text[ greek ] = "Do you want to delete all selected?";
     Text[ dutch ] = "Wilt u alle geselecteerde items wissen?";
     Text[ french ] = "Supprimer la totalit� de la s�lection ?";
-    Text[ spanish ] = "�Desea eliminar toda la selecci�n?";
+    Text[ spanish ] = "�Desea borrar toda la selecci�n?";
     Text[ finnish ] = "Haluatko poistaa kaikki valitut kohteet?";
     Text[ italian ] = "Volete eliminare tutta la selezione?";
     Text[ danish ] = "Vil du slette alle de markerede?";
@@ -4074,7 +4074,7 @@ String STR_QUERY_DROP_DOCUMENT_LINK
     Text[ greek ] = "Do you want to delete the document link \"$name$\"?\n\nNote: Only the assigment of the document to the data source will be dropped, not the document itself.";
     Text[ dutch ] = "Wilt u de documentenkoppeling \"$name$\" wissen?\n\nLet op: alleen de koppeling van dit document met de gegevensbron wordt gewist.";
     Text[ french ] = "Voulez-vous supprimer le lien \"$name$\" (document) ?\n\nRemarque : la suppression ne concernera que l'assignation de ce document � la base de donn�es et pas le document en soi.";
-    Text[ spanish ] = "�Desea eliminar el v�nculo del documento \"$name$\"?\n\nNota: S�lo se eliminar� la asignaci�n de este documento a la fuente de datos, no el documento en s�.";
+    Text[ spanish ] = "�Desea borrar el v�nculo del documento \"$name$\"?\n\nNota: S�lo se borrar� la asignaci�n de este documento a la fuente de datos, no el documento en s�.";
     Text[ finnish ] = "Haluatko poistaa asiakirjalinkin $name$?\n\nHuomautus: Vain asiakirjassa oleva liitos l�hdetietoihin poistetaan. Itse asiakirjaa ei poisteta.";
     Text[ italian ] = "Volete eliminare il collegamento al documento \"$name$\"?\n\nNota: l'operazione annulla solo l'assegnazione del documento alla sorgente, non il documento stesso.";
     Text[ danish ] = "Vil du slette dokumentgenvejen \"$name$\"?\n\nBem�rk! Kun k�den mellem dokumentet og datakilden slettes, ikke selve dokumentet.";
@@ -4082,7 +4082,7 @@ String STR_QUERY_DROP_DOCUMENT_LINK
     Text[ polish ] = "Usun�� ��cze do dokumentu \"$name$\"?\n\nUwaga: Usuni�te zostanie tylko ��cze, a nie dokument.";
     Text[ portuguese_brazilian ] = "Do you want to delete the document link \"$name$\"?\n\nNote: Only the assigment of the document to the data source will be dropped, not the document itself.";
     Text[ japanese ] = "ドキュメントのリンク \"$name$\" を削除しますか。\n\n指示: このドキュメントのデータソースへの割り当てが削除されるだけで、ドキュメントそのものは削除されません。";
-    Text[ korean ] = "문서 링크 \"$name$\"을(를) 삭제하겠습니까?\n\n참고: 문서 자체가 아닌 데이터 소스에 대한 문서 맞춤만 삭제됩니다";
+    Text[ korean ] = "문서 링크 \"$name$\"을(를) 삭제하시겠습니까?\n\n참고: 문서 전체가 아니라 데이터 원본에 대한 문서의 지정 내용만 삭제됩니다.";
     Text[ chinese_simplified ] = "要删除文档链接 \"$name$\"?\n\n注意：这仅仅会移除文档的链接，而不是文档本身。";
     Text[ chinese_traditional ] = "要刪除文件捷徑<$name$>？\n\n注意：這個動作僅僅會移除文件的捷徑，而不是文件本身。";
     Text[ turkish ] = "Do you want to delete the document link \"$name$\"?\n\nNote: Only the assigment of the document to the data source will be dropped, not the document itself.";
@@ -4109,7 +4109,7 @@ String STR_ASK_FOR_DIRECTORY_CREATION
     Text[ polish ] = "Katalog\n\n$path$\n\nnie istnieje. Utworzy� go?";
     Text[ portuguese_brazilian ] = "The directory\n\n$path$\n\ndoes not exist. Do you wish to create it?";
     Text[ japanese ] = "ディレクトリ \n\n$path$\n\n はありません。作成しますか。";
-    Text[ korean ] = "디렉토리\n\n$경로$\n\n이(가) 없습니다. 새로 만드시겠습니까?";
+    Text[ korean ] = "디렉토리\n\n$path$\n\n이(가) 없습니다. 새로 만드시겠습니까?";
     Text[ chinese_simplified ] = "这个目录\n\n$path$\n\n不存在。要新建这个目录？";
     Text[ chinese_traditional ] = "這個目錄\n\n$path$\n\n不存在。要新增這個目錄？";
     Text[ turkish ] = "The directory\n\n$path$\n\ndoes not exist. Do you wish to create it?";
@@ -4136,7 +4136,7 @@ String STR_COULD_NOT_CREATE_DIRECTORY
     Text[ polish ] = "Utworzenie katalogu $name$ nie powiod�o si�.";
     Text[ portuguese_brazilian ] = "The directory $name$ could not be created.";
     Text[ japanese ] = "ディレクトリ $name$ は格納できませんでした。";
-    Text[ korean ] = "디렉토리 $name$을(를) 만들 수 없습니다";
+    Text[ korean ] = "디렉토리 $name$을(를) 만들 수 없습니다.";
     Text[ chinese_simplified ] = "无法创建目录 $name$ 。";
     Text[ chinese_traditional ] = "無法新增這個目錄 $name$ 。";
     Text[ turkish ] = "The directory $name$ could not be created.";
@@ -4166,7 +4166,7 @@ QueryBox QUERY_NEED_TO_SAVE_FILTER
     Message[ polish ] = "W celu wykonania operacji nale�y zapisa� zmiany dokonane w danym oknie dialogowym.\nKontynuowa�?";
     Message[ portuguese_brazilian ] = "For this operation, the changes made in this dialog must be saved.\nDo you want to proceed?";
     Message[ japanese ] = "このアクションを実行するには、このダイアログで行った変更を保存する必要があります。\n次へ進みますか。";
-    Message[ korean ] = "이 작업을 실행하려면 이 대화 상자 안에서 지금까지 변경된 내용을 저장해야 합니다. 작업을 계속 진행하겠습니까?";
+    Message[ korean ] = "이 작동을 실행하려면 이 대화 상자 안에서 지금까지 변경한 내용을 저장해야 합니다. 계속 진행하시겠습니까?";
     Message[ chinese_simplified ] = "在执行这个操作之前必须存盘已经设定的更改内容。\n要继续？";
     Message[ chinese_traditional ] = "在執行這個動作之前必須儲存已經設定的變更。\n您要繼續？";
     Message[ turkish ] = "For this operation, the changes made in this dialog must be saved.\nDo you want to proceed?";
@@ -4296,7 +4296,7 @@ String STR_CALCDOC_DOESNOTEXIST
     Text[ polish ] = "Plik \"$file$\" nie istnieje.";
     Text[ portuguese_brazilian ] = "The file \"$file$\" does not exist.";
     Text[ japanese ] = "ファイル \"$file$\" はありません。";
-    Text[ korean ] = "파일 \"$file$\"이(가) 존재하지 않습니다.";
+    Text[ korean ] = "파일 \"$file$\"이(가) 없습니다.";
     Text[ chinese_simplified ] = "文件 \"$file$\" 不存在。";
     Text[ chinese_traditional ] = "檔案<$file$>不存在。";
     Text[ turkish ] = "The file \"$file$\" does not exist.";
@@ -4342,7 +4342,7 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
     Text[ greek ] = "(not supported by this connection)";
     Text[ dutch ] = "(niet ondersteund door deze verbinding)";
     Text[ french ] = "(Non support� par cette connexion)";
-    Text[ spanish ] = "(no apoyado por esta conexi�n)";
+    Text[ spanish ] = "(no admitido por esta conexi�n)";
     Text[ finnish ] = "(T�m� yhteys ei tue t�t� toimintoa)";
     Text[ italian ] = "(non supportato dal presente collegamento)";
     Text[ danish ] = "(underst�ttes ikke af denne forbindelse)";
@@ -4359,180 +4359,3 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
     Text[ thai ] = "(Not supported by this connection)";
 };
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.118  2002/12/05 10:35:01  kz
- *  Merge SRX644: 12/05/02 - 11:31:03
- *
- *  Revision 1.117  2002/11/26 07:52:34  oj
- *  #105424# change string
- *
- *  Revision 1.116  2002/11/25 15:16:13  kz
- *  Merge SRX644: 25.11.02 - 16:12:20
- *
- *  Revision 1.115  2002/11/22 07:52:17  oj
- *  #105213# insert english strings
- *
- *  Revision 1.114  2002/11/21 15:23:00  oj
- *  #105213# impl new feature of rown mysql driver page
- *
- *  Revision 1.113  2002/11/15 12:28:31  oj
- *  #105175# insert none for empty string
- *
- *  Revision 1.112  2002/11/04 18:07:16  rt
- *  Merge SRX644: 04.11.02 - 19:03:18
- *
- *  Revision 1.111  2002/09/25 09:19:24  gh
- *  #103161#changes to fix confusion of the HID-generation
- *
- *  Revision 1.110  2002/09/13 14:37:58  kz
- *  Merge SRX643: 13.09.02 - 16:34:30
- *
- *  Revision 1.109  2002/09/05 13:48:59  kz
- *  Merge SRX643: 05.09.02 - 15:45:41
- *
- *  Revision 1.108  2002/08/29 12:07:36  gt
- *  #99281# new mask color magenta
- *
- *  Revision 1.107  2002/08/19 07:47:20  oj
- *  #99473# change string resource files
- *
- *  Revision 1.106  2002/08/15 20:10:05  kz
- *  Merge SRX643: 15.08.02 - 22:06:52
- *
- *  Revision 1.105  2002/08/05 20:53:20  kz
- *  Merge SRX643: 05.08.02 - 22:49:45
- *
- *  Revision 1.104  2002/08/01 20:43:18  kz
- *  Merge SRX643: 01.08.02 - 22:40:24
- *
- *  Revision 1.103  2002/07/26 09:33:28  oj
- *  #95146# new controls inserted for auto retrieving
- *
- *  Revision 1.102  2002/07/15 10:44:13  oj
- *  #99921# check if datasource allows to check names
- *
- *  Revision 1.101  2002/07/09 12:39:03  oj
- *  #99921# check if datasource allows to check names
- *
- *  Revision 1.100  2002/06/13 12:47:08  kz
- *  Merge SRX642: 13.06.02 - 14:46:36
- *
- *  Revision 1.99  2002/05/28 13:30:01  oj
- *  #99603# set maskcolor to magenta
- *
- *  Revision 1.98  2002/05/21 09:13:24  kz
- *  Merge SRX642: 21.05.02 - 11:12:54
- *
- *  Revision 1.97  2002/05/07 20:06:47  kz
- *  Merge SRX642: 07.05.02 - 22:06:14
- *
- *  Revision 1.96  2002/04/30 15:38:27  fs
- *  #97118# remove user/password - not used at the moment
- *
- *  Revision 1.95  2002/04/29 08:33:13  oj
- *  #98772# new resources
- *
- *  Revision 1.94  2002/02/26 14:16:22  kz
- *  Merge SRC641: 26.02.02 - 15:15:57
- *
- *  Revision 1.93  2002/02/22 21:06:32  vg
- *  Merge SRC641: 22.02.02 - 22:05:53
- *
- *  Revision 1.92  2002/02/20 11:54:18  kz
- *  Merge SRC641: 02/20/02 - 12:53:54
- *
- *  Revision 1.91  2002/02/19 21:06:45  kz
- *  Merge SRC641: 19.02.02 - 22:06:19
- *
- *  Revision 1.90  2002/02/08 21:08:26  kz
- *  Merge SRC641: 08.02.02 - 22:07:54
- *
- *  Revision 1.89  2002/02/06 21:06:53  kz
- *  Merge SRC641: 06.02.02 - 22:06:22
- *
- *  Revision 1.88  2002/02/05 21:08:26  kz
- *  Merge SRC641: 02/05/02 - 22:07:58
- *
- *  Revision 1.87  2002/02/04 10:33:48  kz
- *  Merge SRC641: 04.02.02 - 11:33:12
- *
- *  Revision 1.86  2002/01/25 21:09:14  kz
- *  Merge SRC641: 25.01.02 - 22:07:21
- *
- *  Revision 1.85  2002/01/10 13:08:03  fs
- *  #96387# changed the widths of some fixed texts (were too small for french texts)
- *
- *  Revision 1.84  2002/01/09 21:12:47  kz
- *  Merge SRC641: 09.01.02 - 22:08:38
- *
- *  Revision 1.83  2001/12/14 16:50:53  kz
- *  Merge SRC641: 14.12.01 - 17:51:09
- *
- *  Revision 1.82  2001/12/04 18:41:04  kz
- *  Merge SRC641: 04.12.01 - 18:38:44
- *
- *  Revision 1.81  2001/11/22 23:24:07  obo
- *  Merge SRC641: 22.11.01 - 23:24:16
- *
- *  Revision 1.80  2001/11/13 23:23:22  rt
- *  Merge SRC641: 13.11.01 - 23:24:02
- *
- *  Revision 1.79  2001/11/02 21:11:11  kz
- *  Merge SRC641: 02.11.01 - 22:11:16
- *
- *  Revision 1.78  2001/10/31 22:22:21  kz
- *  Merge SRC641: 31.10.01 - 23:21:57
- *
- *  Revision 1.77  2001/10/25 20:30:04  vg
- *  Merge SRC641: 25.10.01 - 22:30:11
- *
- *  Revision 1.76  2001/10/19 22:07:41  kz
- *  Merge SRC641: 20.10.01 - 00:06:18
- *
- *  Revision 1.75  2001/10/05 06:57:19  oj
- *  #84000# impl multiselction for queries and link docs
- *
- *  Revision 1.74  2001/10/02 21:00:57  kz
- *  Merge SRC641: 02.10.01 - 23:00:14
- *
- *  Revision 1.73  2001/09/27 20:40:25  kz
- *  Merge SRC641: 27.09.01 - 22:39:41
- *
- *  Revision 1.72  2001/09/25 13:24:37  oj
- *  #91719# implementing the XRename handling
- *
- *  Revision 1.71  2001/09/06 20:22:00  kz
- *  Merge SRC640: 06.09.01 - 22:22:04 (NoBranch)
- *
- *  Revision 1.70  2001/08/28 08:21:37  fs
- *  #91573# STR_HINT_READONLY_CONNECTION / STR_HINT_CONNECTION_NOT_CAPABL
- *
- *  Revision 1.69  2001/08/27 09:01:19  fs
- *  #91538# minor spelling issues
- *
- *  Revision 1.0 20.09.00 10:58:47  fs
- ************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 743176b9de7b..03ccd2762b51 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfindex.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:40:36 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -602,46 +602,3 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.12  2002/04/29 14:27:24  oj
- *  #98772# new images
- *
- *  Revision 1.11  2001/07/17 07:30:50  oj
- *  #89533# GetMainURL changed
- *
- *  Revision 1.10  2001/06/21 15:07:11  fme
- *  Fix #86988#: Redesign of dialogs
- *
- *  Revision 1.9  2001/06/12 15:42:44  fs
- *  #88079# catch the property exceptions
- *
- *  Revision 1.8  2001/05/29 06:44:52  fs
- *  #87037# Init: don't cut the extension from the index URLs
- *
- *  Revision 1.7  2001/05/16 10:02:38  fs
- *  #87037# Config requires system notation / correct loop ranges / Init: RemoveFreeIndex after doing the complete loop
- *
- *  Revision 1.6  2001/05/14 13:25:31  fs
- *  #86942# +checkButtons / OnListEntrySelected
- *
- *  Revision 1.5  2001/04/04 10:38:43  oj
- *  reading uninitialized memory
- *
- *  Revision 1.4  2001/03/07 16:44:40  fs
- *  added a parameter to implRemoveIndex controlling the assertion / correct collecting the indexes in Init
- *
- *  Revision 1.3  2000/12/14 15:43:32  oj
- *  use ucb instead of DirEntry
- *
- *  Revision 1.2  2000/11/09 12:55:31  fs
- *  no usage of the SfxIniManager anymore - MUST change
- *
- *  Revision 1.1  2000/10/05 10:05:22  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 26.09.00 15:54:26  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index de9b302cdbb2..0e87d18feef4 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfindex.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -198,25 +198,3 @@ public:
 
 #endif // _DBAUI_DBFINDEX_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2001/05/14 13:25:15  fs
- *  #86942# +checkButtons / OnListEntrySelected
- *
- *  Revision 1.4  2001/03/07 16:44:40  fs
- *  added a parameter to implRemoveIndex controlling the assertion / correct collecting the indexes in Init
- *
- *  Revision 1.3  2000/11/23 01:59:15  svesik
- *  Remove stl/ from #include statement
- *
- *  Revision 1.2  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.1  2000/10/05 10:05:38  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 26.09.00 15:49:08  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index 434d248dea3f..0420cd9a17de 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfindex.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:00:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -178,7 +178,7 @@ ModalDialog DLG_DBASE_INDEXES
         Text[ polish ] = "Tabela";
         Text[ portuguese_brazilian ] = "Tabelle:";
         Text[ japanese ] = "テーブル(~T)";
-        Text[ korean ] = "시트(~T):";
+        Text[ korean ] = "테이블(~T):";
         Text[ chinese_simplified ] = "表格(~T)";
         Text[ chinese_traditional ] = "表格(~T)";
         Text[ turkish ] = "Tablo:";
@@ -243,7 +243,7 @@ ModalDialog DLG_DBASE_INDEXES
         Text[ polish ] = "Indeksy tabeli";
         Text[ portuguese_brazilian ] = "Tabellenindizes:";
         Text[ japanese ] = "テーブルのインデックス(~A)";
-        Text[ korean ] = "시트 색인(~A):";
+        Text[ korean ] = "테이블 색인(~A):";
         Text[ chinese_simplified ] = "表格标志(~A)";
         Text[ chinese_traditional ] = "表格標誌(~A)";
         Text[ turkish ] = "Tablo dizinleri:";
@@ -279,7 +279,7 @@ ModalDialog DLG_DBASE_INDEXES
         Text[ polish ] = "Wolne indeksy";
         Text[ portuguese_brazilian ] = "Freie Indizes";
         Text[ japanese ] = "フリーインデックス(~F)";
-        Text[ korean ] = "모든 색인(~F)";
+        Text[ korean ] = "자유형 색인(~F)";
         Text[ chinese_simplified ] = "自由的标志(~F)";
         Text[ chinese_traditional ] = "自由標誌(~F)";
         Text[ turkish ] = "Bo� dizinler:";
@@ -392,6 +392,26 @@ ModalDialog DLG_DBASE_INDEXES
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.25.2.3  2003/02/23 12:00:59  nf
+ *  trasnlation 6.1 Beta / OOo 1.1 Beta / final wave
+ *
+ *  Revision 1.25.2.2  2003/02/23 11:00:49  nf
+ *  6.1 Beta 1/OOo 1.1 Beta translation, second wave
+ *
+ *  Revision 1.25.2.1  2003/02/22 15:47:07  hr
+ *  INTEGRATION: CWS mergep (1.25.20); FILE MERGED
+ *  2003/02/22 10:44:27 nf 1.25.20.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 12:51:11 hjs 1.25.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.25.20.2  2003/02/22 10:44:27  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.25.20.1  2003/01/31 12:51:11  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.25  2002/11/27 17:00:16  kz
+ *  Merge SRX644: 27.11.02 - 17:56:23
+ *
  *  Revision 1.24  2002/09/05 14:00:02  kz
  *  Merge SRX643: 05.09.02 - 15:56:45
  *
@@ -478,3 +498,9 @@ ModalDialog DLG_DBASE_INDEXES
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 541310fe68fa..e85b8b70c3a6 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: detailpages.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-09 09:11:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -168,15 +168,10 @@ namespace dbaui
             m_pCharset->SetSelectHdl(getControlModifiedLink());
             m_pCharset->SetDropDownLineCount( 14 );
 
-            sal_Bool bCJKEnabled = SvtCJKOptions().IsAnyEnabled();
-
             OCharsetDisplay::const_iterator aLoop = m_aCharsets.begin();
             while (aLoop != m_aCharsets.end())
             {
-                if  (   ( RTL_TEXTENCODING_BIG5_HKSCS != (*aLoop).getEncoding() )   // not the asian encoding
-                    ||  ( bCJKEnabled )                                             // or asian enabled
-                    )
-                    m_pCharset->InsertEntry((*aLoop).getDisplayName());
+                m_pCharset->InsertEntry((*aLoop).getDisplayName());
                 ++aLoop;
             }
         }
@@ -242,8 +237,7 @@ namespace dbaui
     // -----------------------------------------------------------------------
     namespace
     {
-        sal_Bool implAdjust( const SfxItemSet& _rSet, const rtl_TextEncoding _eEncoding,
-            const OCharsetDisplay& _rMap, ListBox* _pCharsets, sal_Bool _bAllowInGeneral = sal_True )
+        void adjustCharSets( const SfxItemSet& _rSet, const OCharsetDisplay& _rCharSets, ListBox* _pCharsets )
         {
             // determine the type of the current URL
             DATASOURCE_TYPE eDSType = DST_UNKNOWN;
@@ -254,41 +248,47 @@ namespace dbaui
             if (pTypeCollection && pConnectUrl && pConnectUrl->GetValue().Len())
                 eDSType = pTypeCollection->getType(pConnectUrl->GetValue());
 
-            // is the given encoding allowed?
-            const sal_Bool bAllowIt = _bAllowInGeneral && (DST_DBASE != eDSType) && (DST_TEXT != eDSType);
-
-            // get the display name for UTF8 to check if we currently include it in the list
-            OCharsetDisplay::const_iterator aEncodingPos = _rMap.find( _eEncoding );
-            DBG_ASSERT( _rMap.end() != aEncodingPos, "OCommonBehaviourTabPage::implAdjust: invalid charset map!" );
-            if ( _rMap.end() != aEncodingPos )
+            // the only types we're interested in is TEXT and DBASE
+            if ( ( DST_DBASE == eDSType ) || ( DST_TEXT == eDSType ) )
             {
-                String sDisplayName = (*aEncodingPos).getDisplayName();
-                const sal_Bool bHaveIt = LISTBOX_ENTRY_NOTFOUND != _pCharsets->GetEntryPos( sDisplayName );
-                if ( bAllowIt != bHaveIt )
-                {   // really need to adjust the list
-                    if ( !bAllowIt )
-                        _pCharsets->RemoveEntry( sDisplayName );
+                // for these types, we need to exclude all encodings which do not have a fixed character
+                // length (such as UTF-8)
+                rtl_TextEncodingInfo aEncodingInfo; aEncodingInfo.StructSize = sizeof( rtl_TextEncodingInfo );
+
+                OCharsetDisplay::const_iterator aLoop = _rCharSets.begin();
+                OCharsetDisplay::const_iterator aLoopEnd = _rCharSets.end();
+                while ( aLoop != aLoopEnd )
+                {
+                    rtl_TextEncoding eEncoding = (*aLoop).getEncoding();
+                    sal_Bool bAllowIt = sal_False;
+                    if ( RTL_TEXTENCODING_DONTKNOW == eEncoding )
+                        bAllowIt = sal_True;
                     else
-                        _pCharsets->InsertEntry( sDisplayName );
+                    {
+                        // check if we should include the current encoding in the list
+                        OSL_VERIFY( rtl_getTextEncodingInfo( eEncoding, &aEncodingInfo ) );
+                        bAllowIt = aEncodingInfo.MinimumCharSize == aEncodingInfo.MaximumCharSize;
+                    }
+
+                    // get the display name for the encoding to check if we currently include it in the list
+                    String sDisplayName = (*aLoop).getDisplayName();
+                    const sal_Bool bHaveIt = LISTBOX_ENTRY_NOTFOUND != _pCharsets->GetEntryPos( sDisplayName );
+                    if ( bAllowIt != bHaveIt )
+                    {   // we need to adjust the list
+                        if ( !bAllowIt )
+                            _pCharsets->RemoveEntry( sDisplayName );
+                        else
+                            _pCharsets->InsertEntry( sDisplayName );
+                    }
+
+                    // next
+                    ++aLoop;
                 }
             }
-            return bAllowIt;
         }
     }
 
     // -----------------------------------------------------------------------
-    sal_Bool OCommonBehaviourTabPage::adjustBig5( const SfxItemSet& _rSet )
-    {
-        return implAdjust( _rSet, RTL_TEXTENCODING_BIG5_HKSCS, m_aCharsets, m_pCharset, SvtCJKOptions().IsAnyEnabled() );
-    }
-
-    // -----------------------------------------------------------------------
-    sal_Bool OCommonBehaviourTabPage::adjustUTF8( const SfxItemSet& _rSet )
-    {
-        return implAdjust( _rSet, RTL_TEXTENCODING_UTF8, m_aCharsets, m_pCharset );
-    }
-
-    // -----------------------------------------------------------------------
     void OCommonBehaviourTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
     {
         // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
@@ -364,8 +364,8 @@ namespace dbaui
 
             if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
             {
-                sal_Bool bAllowUTF8 = adjustUTF8(_rSet);
-                sal_Bool bAllowBig5 = adjustBig5(_rSet);
+                // adjust the list of available character sets according to the data source type
+                adjustCharSets( _rSet, m_aCharsets, m_pCharset );
 
                 OCharsetDisplay::const_iterator aFind = m_aCharsets.find(pCharsetItem->GetValue(), OCharsetDisplay::IANA());
                 if (aFind == m_aCharsets.end())
@@ -375,21 +375,25 @@ namespace dbaui
                     // fallback: system language
                 }
 
-                if  (   (   !bAllowUTF8
-                        &&  ( RTL_TEXTENCODING_UTF8 == (*aFind).getEncoding() )
-                        )
-                    ||  (   !bAllowBig5
-                        &&  ( RTL_TEXTENCODING_BIG5_HKSCS == (*aFind).getEncoding() )
-                        )
-                    )
-                {   // the current char set is UTF-8 or Big5, but it's not allowed for the current URL
-                    aFind = m_aCharsets.find(RTL_TEXTENCODING_DONTKNOW);
-                }
 
                 if (aFind == m_aCharsets.end())
-                    m_pCharset->SelectEntry(String());
+                {
+                    m_pCharset->SelectEntry( String() );
+                }
                 else
-                    m_pCharset->SelectEntry((*aFind).getDisplayName());
+                {
+                    String sDisplayName = (*aFind).getDisplayName();
+                    if ( LISTBOX_ENTRY_NOTFOUND == m_pCharset->GetEntryPos( sDisplayName ) )
+                    {
+                        // in our settings, there was an encoding selected which is not valid for the current
+                        // data source type
+                        // This is worth at least an assertion.
+                        DBG_ERROR( "OCommonBehaviourTabPage::implInitControls: invalid character set!" );
+                        sDisplayName = String();
+                    }
+
+                    m_pCharset->SelectEntry( sDisplayName );
+                }
 
                 if (_bSaveValue)
                     m_pCharset->SaveValue();
@@ -883,6 +887,71 @@ namespace dbaui
             m_aUseCatalog.Disable();
     }
     //========================================================================
+    //= OOdbcDetailsPage
+    //========================================================================
+    OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+        :OCommonBehaviourTabPage(pParent, PAGE_USERDRIVER, _rCoreAttrs, CBTP_USE_UIDPWD | CBTP_USE_CHARSET | CBTP_USE_OPTIONS | CBTP_USE_SQL92CHECK| CBTP_USE_AUTOINCREMENT)
+        ,m_aSeparator1  (this, ResId(FL_SEPARATOR2))
+        ,m_aUseCatalog  (this, ResId(CB_USECATALOG))
+    {
+        m_aUseCatalog.SetToggleHdl(getControlModifiedLink());
+        FreeResource();
+    }
+
+    // -----------------------------------------------------------------------
+    SfxTabPage* OUserDriverDetailsPage::Create( Window* pParent, const SfxItemSet& _rAttrSet )
+    {
+        return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) );
+    }
+
+    // -----------------------------------------------------------------------
+    sal_Int32* OUserDriverDetailsPage::getDetailIds()
+    {
+        static sal_Int32* pRelevantIds = NULL;
+        if (!pRelevantIds)
+        {
+            static sal_Int32 nRelevantIds[] =
+            {
+                DSID_ADDITIONALOPTIONS,
+                DSID_CHARSET,
+                DSID_USECATALOG,
+                DSID_SQL92CHECK,
+                DSID_AUTOINCREMENTVALUE,
+                DSID_AUTORETRIEVEVALUE,
+                DSID_AUTORETRIEVEENABLED,
+                0
+            };
+            pRelevantIds = nRelevantIds;
+        }
+        return pRelevantIds;
+    }
+    // -----------------------------------------------------------------------
+    sal_Bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    {
+        sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
+        _rSet.Put(SfxBoolItem(DSID_USECATALOG, m_aUseCatalog.IsChecked()));
+        return bChangedSomething;
+    }
+    // -----------------------------------------------------------------------
+    void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
+    {
+        OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
+
+        // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
+        sal_Bool bValid, bReadonly;
+        getFlags(_rSet, bValid, bReadonly);
+
+        SFX_ITEMSET_GET(_rSet, pUseCatalogItem, SfxBoolItem, DSID_USECATALOG, sal_True);
+
+        m_aUseCatalog.Check(pUseCatalogItem->GetValue());
+
+        if (_bSaveValue)
+            m_aUseCatalog.SaveValue();
+
+        if (bReadonly)
+            m_aUseCatalog.Disable();
+    }
+    //========================================================================
     //= OMySQLDetailsPage
     //========================================================================
     OMySQLDetailsPage::OMySQLDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
@@ -899,7 +968,6 @@ namespace dbaui
         ,m_sJDBCDefaultUrl      (ResId(STR_JDBC_DEFAULT_URL))
     {
         m_aUseODBC.SetToggleHdl(LINK(this, OMySQLDetailsPage,OnToggle));
-
         m_aUrl.SetModifyHdl(getControlModifiedLink());
         m_aEDDriverClass.SetModifyHdl(getControlModifiedLink());
         m_aBrowseConnection.SetClickHdl(LINK(this, OMySQLDetailsPage, OnBrowseConnections));
@@ -968,10 +1036,11 @@ namespace dbaui
         SFX_ITEMSET_GET(_rSet, pUrlItem, SfxStringItem, DSID_CONNECTURL, sal_True);
 
         sal_Bool bODBC = pUrlItem->GetValue().EqualsIgnoreCaseAscii("sdbc:mysql:odbc:",0,16);
+        m_aBrowseConnection.Enable( bODBC );
+
         m_aUseODBC.Check(bODBC);
         m_aUseJDBC.Check(!bODBC);
 
-        m_aBrowseConnection.Enable( bODBC );
         m_aFTDriverClass.Enable( !bODBC );
         m_aEDDriverClass.Enable( !bODBC );
 
@@ -998,6 +1067,7 @@ namespace dbaui
             m_aUseJDBC.SaveValue();
             m_aUrl.SaveValue();
             m_aUrl.SaveValueNoPrefix();
+            m_aEDDriverClass.SaveValue();
         }
 
         if ( bReadonly )
@@ -1006,12 +1076,16 @@ namespace dbaui
             m_aUseJDBC.Disable();
             m_aUrlLabel.Disable();
             m_aUrl.Disable();
+            m_aEDDriverClass.Disable();
         }
     }
     //------------------------------------------------------------------------
     IMPL_LINK( OMySQLDetailsPage, OnToggle, RadioButton*, pRadioButton )
     {
         sal_Bool bODBC = &m_aUseODBC == pRadioButton && pRadioButton->IsChecked();
+        if ( m_aBrowseConnection.IsEnabled() && bODBC )
+            return 0;
+
         m_aBrowseConnection.Enable(  bODBC );
         m_aFTDriverClass.Enable(    !bODBC );
         m_aEDDriverClass.Enable(    !bODBC );
@@ -1047,6 +1121,7 @@ namespace dbaui
         {
             m_aUrl.SetTextNoPrefix(sDataSource);
             callModifiedHdl();
+            return 0L;
         }
         else
             return 1L;
@@ -1164,12 +1239,12 @@ namespace dbaui
 
         FILL_STRING_ITEM(m_aETHostname,_rSet,DSID_CONN_LDAP_HOSTNAME,bChangedSomething)
         FILL_STRING_ITEM(m_aETBaseDN,_rSet,DSID_CONN_LDAP_BASEDN,bChangedSomething)
-        if (m_aNFPortNumber.GetValue() != m_aNFPortNumber.GetSavedValue())
+        if ( m_aNFPortNumber.GetValue() != m_aNFPortNumber.GetSavedValue() )
         {
             _rSet.Put(SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, m_aNFPortNumber.GetValue()));
             bChangedSomething = sal_True;
         }
-        if (m_aNFRowCount.GetValue() != m_aNFRowCount.GetSavedValue())
+        if ( m_aNFRowCount.GetValue() != m_aNFRowCount.GetSavedValue() )
         {
             _rSet.Put(SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, m_aNFRowCount.GetValue()));
             bChangedSomething = sal_True;
@@ -1527,74 +1602,3 @@ namespace dbaui
 //.........................................................................
 }   // namespace dbaui
 //.........................................................................
-
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.21  2002/11/21 15:23:00  oj
- *  #105213# impl new feature of rown mysql driver page
- *
- *  Revision 1.20  2002/11/15 12:28:32  oj
- *  #105175# insert none for empty string
- *
- *  Revision 1.19  2002/10/15 09:52:21  oj
- *  #98982# disable thousand seperator
- *
- *  Revision 1.18  2002/08/30 06:05:15  oj
- *  #102756# move checkbox inside invalid class
- *
- *  Revision 1.17  2002/08/26 08:53:54  oj
- *  #102576# move chweckbox to fixedline
- *
- *  Revision 1.16  2002/08/19 07:40:35  oj
- *  #99473# change string resource files
- *
- *  Revision 1.15  2002/07/26 09:33:29  oj
- *  #95146# new controls inserted for auto retrieving
- *
- *  Revision 1.14  2002/07/09 12:39:05  oj
- *  #99921# check if datasource allows to check names
- *
- *  Revision 1.13  2002/04/30 15:47:28  fs
- *  #97118# remove user/password - not used at the moment
- *
- *  Revision 1.12  2002/03/22 09:05:42  oj
- *  #98142# remove charset for jdbc drivers
- *
- *  Revision 1.11  2002/03/14 15:14:36  fs
- *  #97788# Big5-HKSCS only when asian languages are enabled
- *
- *  Revision 1.10  2002/03/14 10:22:18  fs
- *  #97788# allow Big5-HKSCS only if asian functionallity is enabled
- *
- *  Revision 1.9  2001/08/30 15:14:33  fs
- *  #91731# adjustUTF : InsertEntry instead of RemoveEntry
- *
- *  Revision 1.8  2001/06/25 08:28:43  oj
- *  #88699# new control for ldap rowcount
- *
- *  Revision 1.7  2001/05/31 11:37:57  oj
- *  #87149# correct ldap protocol
- *
- *  Revision 1.6  2001/05/29 13:11:52  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.5  2001/05/23 14:16:42  oj
- *  #87149# new helpids
- *
- *  Revision 1.4  2001/04/27 08:07:31  fs
- *  #86370# disallow UTF-8 for dBase and text data sources
- *
- *  Revision 1.3  2001/04/20 13:38:06  oj
- *  #85736# new checkbox for odbc
- *
- *  Revision 1.2  2001/02/05 15:42:07  fs
- *  enlargen the tab pages -> some redesigns
- *
- *  Revision 1.1  2001/01/26 16:14:12  fs
- *  initial checkin - administration tab pages used for special DSN types
- *
- *
- *  Revision 1.0 26.01.01 10:41:45  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 7e0fe598a154..873aedf78a8d 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: detailpages.hxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-09 09:11:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,6 +97,8 @@ namespace dbaui
     class OCommonBehaviourTabPage : public OGenericAdministrationPage
     {
     protected:
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
+
         FixedText*          m_pUserNameLabel;
         Edit*               m_pUserName;
         FixedText*          m_pPasswordLabel;
@@ -127,15 +129,15 @@ namespace dbaui
         virtual BOOL        FillItemSet (SfxItemSet& _rCoreAttrs);
         virtual void        implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
 
+        virtual void setServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
+        {
+            m_xORB = _rxORB;
+        }
+
     protected:
         OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs, USHORT nControlFlags);
             // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
         virtual ~OCommonBehaviourTabPage();
-
-        sal_Bool adjustUTF8(const SfxItemSet& _rSet);
-            // returns sal_True if with the settings in _rSet, a charset UTF-8 is allowed
-        sal_Bool adjustBig5(const SfxItemSet& _rSet);
-            // returns sal_True if with the settings in _rSet, a charset Big5-HKSCS is allowed
     };
 
     //========================================================================
@@ -178,6 +180,12 @@ namespace dbaui
         static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
         virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
+        virtual void setServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
+        {
+            OCommonBehaviourTabPage::setServiceFactory(_rxORB);
+            m_aJdbcUrl.initializeTypeCollection(_rxORB);
+        }
+
         /// get the SfxPoolItem ids used by this tab page
         static sal_Int32* getDetailIds();
 
@@ -203,6 +211,12 @@ namespace dbaui
         static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
         virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
+        virtual void setServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
+        {
+            OCommonBehaviourTabPage::setServiceFactory(_rxORB);
+            m_aAdoUrl.initializeTypeCollection(_rxORB);
+        }
+
         /// get the SfxPoolItem ids used by this tab page
         static sal_Int32* getDetailIds();
 
@@ -239,6 +253,28 @@ namespace dbaui
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
     };
 
+
+    //========================================================================
+    //= OUserDriverDetailsPage
+    //========================================================================
+    class OUserDriverDetailsPage : public OCommonBehaviourTabPage
+    {
+    public:
+        static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
+        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+
+        /// get the SfxPoolItem ids used by this tab page
+        static sal_Int32* getDetailIds();
+
+    private:
+        FixedLine           m_aSeparator1;
+        CheckBox            m_aUseCatalog;
+
+        OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+
+        virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+    };
+
     //========================================================================
     //= OMySQLDetailsPage
     //========================================================================
@@ -248,6 +284,12 @@ namespace dbaui
         static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
         virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
+        virtual void setServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
+        {
+            OCommonBehaviourTabPage::setServiceFactory(_rxORB);
+            m_aUrl.initializeTypeCollection(_rxORB);
+        }
+
         /// get the SfxPoolItem ids used by this tab page
         static sal_Int32* getDetailIds();
 
@@ -366,53 +408,3 @@ namespace dbaui
 //.........................................................................
 
 #endif // _DBAUI_DETAILPAGES_HXX_
-
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.14  2002/11/21 15:23:01  oj
- *  #105213# impl new feature of rown mysql driver page
- *
- *  Revision 1.13  2002/11/15 12:28:32  oj
- *  #105175# insert none for empty string
- *
- *  Revision 1.12  2002/07/26 09:33:29  oj
- *  #95146# new controls inserted for auto retrieving
- *
- *  Revision 1.11  2002/07/09 12:39:07  oj
- *  #99921# check if datasource allows to check names
- *
- *  Revision 1.10  2002/04/30 15:55:26  fs
- *  #97118# remove user/password - not used at the moment
- *
- *  Revision 1.9  2002/03/22 09:05:42  oj
- *  #98142# remove charset for jdbc drivers
- *
- *  Revision 1.8  2002/03/14 15:14:36  fs
- *  #97788# Big5-HKSCS only when asian languages are enabled
- *
- *  Revision 1.7  2001/06/25 08:28:43  oj
- *  #88699# new control for ldap rowcount
- *
- *  Revision 1.6  2001/05/29 13:11:52  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.5  2001/05/23 14:16:42  oj
- *  #87149# new helpids
- *
- *  Revision 1.4  2001/04/27 08:07:01  fs
- *  #86370# +adjustUTF8
- *
- *  Revision 1.3  2001/04/20 13:38:06  oj
- *  #85736# new checkbox for odbc
- *
- *  Revision 1.2  2001/02/05 15:42:07  fs
- *  enlargen the tab pages -> some redesigns
- *
- *  Revision 1.1  2001/01/26 16:14:21  fs
- *  initial checkin - administration tab pages used for special DSN types
- *
- *
- *  Revision 1.0 26.01.01 10:38:51  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 9837424d5a6d..b391fa2d4854 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: directsql.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:40:35 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -408,13 +408,3 @@ namespace dbaui
 }   // namespace dbaui
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/06/19 10:54:06  fs
- *  initial checkin - dialog for executing SQL statements
- *
- *
- *  Revision 1.0 18.06.01 17:00:59  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index a8d6d3af6f36..d9fbf8d3c3a6 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: directsql.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:35:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,7 +92,7 @@ ModalDialog DLG_DIRECTSQL
         Text[ greek ] = "SQL command";
         Text[ dutch ] = "SQL-commando";
         Text[ french ] = "Instruction SQL";
-        Text[ spanish ] = "Comando SQL";
+        Text[ spanish ] = "Orden SQL";
         Text[ finnish ] = "SQL-lause";
         Text[ italian ] = "SQL command";
         Text[ danish ] = "SQL-kommando";
@@ -120,7 +120,7 @@ ModalDialog DLG_DIRECTSQL
         Text[ greek ] = "Command to execute";
         Text[ dutch ] = "uit te voeren commando";
         Text[ french ] = "Instruction � ex�cuter";
-        Text[ spanish ] = "Comando que ejecutar";
+        Text[ spanish ] = "Orden que ejecutar";
         Text[ finnish ] = "Suoritettava lause";
         Text[ italian ] = "Comando da eseguire";
         Text[ danish ] = "Kommando, der skal eksekveres";
@@ -186,7 +186,7 @@ ModalDialog DLG_DIRECTSQL
         Text[ greek ] = "Previous commands";
         Text[ dutch ] = "Vorige commando's";
         Text[ french ] = "Instructions pr�c�dentes";
-        Text[ spanish ] = "Comandos anteriores";
+        Text[ spanish ] = "�rdenes anteriores";
         Text[ finnish ] = "Edelliset lauseet";
         Text[ italian ] = "Comando precedente";
         Text[ danish ] = "Forrige kommandoer";
@@ -294,7 +294,7 @@ ModalDialog DLG_DIRECTSQL
     Text[ greek ] = "Excecute SQL statement";
     Text[ dutch ] = "SQL-instructie uitvoeren";
     Text[ french ] = "Ex�cuter l'instruction SQL";
-    Text[ spanish ] = "Ejecutar comando SQL";
+    Text[ spanish ] = "Ejecutar orden SQL";
     Text[ finnish ] = "Suorita SQL-lause";
     Text[ italian ] = "Esegui il comando SQL";
     Text[ danish ] = "Udf�r SQL-s�tning";
@@ -302,7 +302,7 @@ ModalDialog DLG_DIRECTSQL
     Text[ polish ] = "Wykonaj polecenie SQL";
     Text[ portuguese_brazilian ] = "Excecute SQL statement";
     Text[ japanese ] = "SQL ステートメントの実行";
-    Text[ korean ] = "SQL 문 실행";
+    Text[ korean ] = "SQL문 실행";
     Text[ chinese_simplified ] = "直接执行 SQL 命令";
     Text[ chinese_traditional ] = "直接執行 SQL 指令";
     Text[ turkish ] = "Excecute SQL statement";
@@ -321,7 +321,7 @@ String STR_COMMAND_EXECUTED_SUCCESSFULLY
     Text [ swedish ] = "Kommando utf�rt." ;
     Text [ danish ] = "Kommando gennemf�rt." ;
     Text [ italian ] = "Comando eseguito con successo." ;
-    Text [ spanish ] = "Comando ejecutado satisfactoriamente." ;
+    Text [ spanish ] = "Orden ejecutada satisfactoriamente." ;
     Text [ french ] = "Commande ex�cut�e avec succ�s" ;
     Text [ dutch ] = "Opdracht is uitgevoerd." ;
     Text[ chinese_simplified ] = "执行命令已经成功。";
@@ -331,7 +331,7 @@ String STR_COMMAND_EXECUTED_SUCCESSFULLY
     Text[ chinese_traditional ] = "執行指令已經成功。";
     Text[ arabic ] = "�� ����� ����� �����.";
     Text[ greek ] = "� ������ ����������� ��������.";
-    Text[ korean ] = "명령을 성공적으로 실행하였습니다.";
+    Text[ korean ] = "명령을 성공적으로 실행했습니다.";
     Text[ finnish ] = "K�skyn suoritus onnistui.";
     Text[ turkish ] = "Command successfully executed.";
     Text[ catalan ] = "Comanda executada amb �xit.";
@@ -356,7 +356,7 @@ String STR_DIRECTSQL_CONNECTIONLOST
     Text[ polish ] = "Po��czenie z baz� danych przerwano. Okno dialogowe zostanie zamkni�te.";
     Text[ portuguese_brazilian ] = "The connection to the database has been lost. This dialog will be closed.";
     Text[ japanese ] = "データベースへの接続は削除されています。このダイアログを閉じます。";
-    Text[ korean ] = "데이터베이스와의 연결이 해제되었습니다. 이 대화상자가 닫힐 것입니다.";
+    Text[ korean ] = "데이터베이스와의 연결이 해제되었습니다. 이 대화 상자가 닫힙니다.";
     Text[ chinese_simplified ] = "已经结束和数据库的连接。现在关闭这个对话框。";
     Text[ chinese_traditional ] = "已經結束與資料庫的連線。現在關閉這個對話方塊。";
     Text[ turkish ] = "The connection to the database has been lost. This dialog will be closed.";
@@ -368,6 +368,26 @@ String STR_DIRECTSQL_CONNECTIONLOST
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.15.2.3  2003/02/23 12:00:59  nf
+ *  trasnlation 6.1 Beta / OOo 1.1 Beta / final wave
+ *
+ *  Revision 1.15.2.2  2003/02/23 11:00:50  nf
+ *  6.1 Beta 1/OOo 1.1 Beta translation, second wave
+ *
+ *  Revision 1.15.2.1  2003/02/22 15:47:19  hr
+ *  INTEGRATION: CWS mergep (1.15.20); FILE MERGED
+ *  2003/02/22 10:44:28 nf 1.15.20.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 12:51:11 hjs 1.15.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.15.20.2  2003/02/22 10:44:28  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.15.20.1  2003/01/31 12:51:11  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.15  2002/12/05 10:35:58  kz
+ *  Merge SRX644: 12/05/02 - 11:32:03
+ *
  *  Revision 1.14  2002/11/25 15:17:52  kz
  *  Merge SRX644: 25.11.02 - 16:14:03
  *
@@ -424,3 +444,9 @@ String STR_DIRECTSQL_CONNECTIONLOST
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src
index 7bf56a547546..209d39ead4c2 100644
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ b/dbaccess/source/ui/dlg/dlgattr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgattr.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:02:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,7 +135,7 @@ TabDialog DLG_ATTR
         Text[ chinese_traditional ] = "返回(~K)";
         Text[ arabic ] = "������";
         Text[ greek ] = "����";
-        Text[ korean ] = "이전(~K)";
+        Text[ korean ] = "뒤로(~K)";
         Text[ turkish ] = "Geri";
         Text[ catalan ] = "Enre~re";
         Text[ thai ] = "~กลับไป";
@@ -217,7 +217,7 @@ TabDialog DLG_ATTR
         Text[ chinese_traditional ] = "對齊";
         Text[ arabic ] = "������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "배열";
+        Text[ korean ] = "맞춤";
         Text[ turkish ] = "Hizalama";
         Text[ catalan ] = "Alineament";
         Text[ thai ] = "การจัดตำแหน่ง";
@@ -242,7 +242,7 @@ TabDialog DLG_ATTR
         Text[ chinese_traditional ] = "表格格式";
         Text[ arabic ] = "����� ������";
         Text[ greek ] = "����������� ������";
-        Text[ korean ] = "시트 서식";
+        Text[ korean ] = "테이블 서식";
         Text[ turkish ] = "Tablo format�";
         Text[ catalan ] = "Format de la taula";
         Text[ finnish ] = "Taulun muotoilu";
@@ -269,3 +269,9 @@ TabDialog DLG_ATTR
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index a9e39db13ef8..1a72cc59f61c 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsave.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-04 13:00:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -329,7 +329,7 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton)
             aText.SearchAndReplace(String::CreateFromAscii("$#$"),m_aName);
             OSQLMessageBox aDlg(this, String(ModuleRes(STR_OBJECT_ALREADY_EXSISTS)), aText, bOverwrite ? WB_YES_NO : WB_OK, OSQLMessageBox::Query);
 
-            if(aDlg.Execute() == RET_YES)
+            if ( aDlg.Execute() == RET_YES && bOverwrite )
                 EndDialog(RET_OK);
         }
         else
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index 319ec704a037..bd1ae5f028c1 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsave.src,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 14:05:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -240,7 +240,7 @@ ModalDialog DLG_SAVE_AS
         Text[ chinese_traditional ] = "表格名稱(~T)";
         Text[ arabic ] = "��� ������";
         Text[ greek ] = "���~�� ������";
-        Text[ korean ] = "시트 이름(~T)";
+        Text[ korean ] = "테이블 이름(~T)";
         Text[ turkish ] = "Tablo ad�";
         Text[ catalan ] = "Nom de la ~taula";
         Text[ finnish ] = "Ta~ulukon nimi";
@@ -266,7 +266,7 @@ ModalDialog DLG_SAVE_AS
         Text[ chinese_traditional ] = "表格檢視名稱(~N)";
         Text[ arabic ] = "��� ��� ������";
         Text[ greek ] = "���~�� �������� ������";
-        Text[ korean ] = "시트 보기 이름(~N)";
+        Text[ korean ] = "테이블 보기 이름(~N)";
         Text[ turkish ] = "Tablo g�r�n�m� ad�";
         Text[ catalan ] = "~Nom de la vista de la taula";
         Text[ finnish ] = "Taulu~n�kym�n nimi";
@@ -292,7 +292,7 @@ ModalDialog DLG_SAVE_AS
         Text[ chinese_traditional ] = "查詢名稱(~Q)";
         Text[ arabic ] = "��� ���������";
         Text[ greek ] = "���~�� ����������";
-        Text[ korean ] = "질의 이름(~Q)";
+        Text[ korean ] = "쿼리 이름(~Q)";
         Text[ turkish ] = "Sorgu ad�";
         Text[ catalan ] = "Nom de la ~consulta";
         Text[ finnish ] = "K~yselyn nimi";
@@ -312,7 +312,7 @@ ModalDialog DLG_SAVE_AS
         Text [ french ] = "~Nom du formulaire" ;
         Text [ dutch ] = "~Naam formulier" ;
         Text[ chinese_simplified ] = "表单名称(~O)";
-        Text[ russian ] = "��� ���������";
+        Text[ russian ] = "��� �����";
         Text[ polish ] = "Nazwa formularza";
         Text[ japanese ] = "フォーム名(~O)";
         Text[ chinese_traditional ] = "表單名稱(~O)";
@@ -356,26 +356,26 @@ ModalDialog DLG_SAVE_AS
         Text [ ENGLISH ] = "The name '$#$' does already exist.\nPlease enter a new name." ;
         Text [ english_us ] = "The name '$#$' already exists.\nPlease enter another name." ;
         Text[ language_user1 ] = " ";
-        Text[ portuguese ] = "O nome '$#$' j� existe.\nIndique outro.";
+        Text[ portuguese ] = "O nome '$Name: not supported by cvs2svn $' j� existe.\nIndique outro.";
         Text[ russian ] = "��� '$Name: not supported by cvs2svn $' ��� ����������.\n������� ������ ���.";
-        Text[ greek ] = "�� ����� '$#$' ������� ���.\n�������� �������� ��� ��� �����.";
+        Text[ greek ] = "�� ����� '$Name: not supported by cvs2svn $' ������� ���.\n�������� �������� ��� ��� �����.";
         Text[ dutch ] = "De naam '$Name: not supported by cvs2svn $' bestaat reeds.\nTyp een nieuwe naam.";
-        Text[ french ] = "Le nom '$#$' existe d�j�.\nIndiquez-en un autre !";
-        Text[ spanish ] = "Ya existe el nombre '$#$'.\nIntroduzca otro.";
-        Text[ italian ] = "Il nome '$#$' esiste gi�.\nSceglietene un altro.";
-        Text[ danish ] = "Navnet '$#$' findes allerede.\nAngiv et andet navn.";
+        Text[ french ] = "Le nom '$#$' existe d�j�.\nSp�cifiez-en un autre !";
+        Text[ spanish ] = "El nombre '$#$' ya existe.\nIntroduzca otro.";
+        Text[ italian ] = "Il nome '$Name: not supported by cvs2svn $' esiste gi�.\nSceglietene un altro.";
+        Text[ danish ] = "Navnet '$Name: not supported by cvs2svn $' findes allerede.\nAngiv et andet navn.";
         Text[ swedish ] = "Namnet '$#$' finns redan.\nAnge ett annat namn.";
-        Text[ polish ] = "Nazwa '$#$' ju� istnieje.\nWpisz inn� nazw�.";
+        Text[ polish ] = "Nazwa '$Name: not supported by cvs2svn $' ju� istnieje.\nWpisz inn� nazw�.";
         Text[ portuguese_brazilian ] = "The name '$#$' already exists.\nPlease enter a new name.";
-        Text[ japanese ] = "'$#$' の名前はすでにあります。\n新しい名前を入力してください。";
-        Text[ korean ] = "'$#$'이름은 이미 존재합니다.\n다른 이름을 입력하십시오.";
-        Text[ chinese_simplified ] = "这个名称 '$#$' 已经存在。\n请输入一个有效的名称。";
-        Text[ chinese_traditional ] = "這個名稱<$#$>已經存在。請您輸入一個有效名稱。";
-        Text[ turkish ] = "The name '$#$' already exists.\nPlease enter a new name.";
-        Text[ arabic ] = "�����'$#$' ����� ������.\n������ ����� ��� ����.";
-        Text[ catalan ] = "El nom '$#$' ja existeix.\nIntrodu�u-ne un altre.";
+        Text[ japanese ] = "'$Name: not supported by cvs2svn $' の名前はすでにあります。\n新しい名前を入力してください。";
+        Text[ korean ] = "'$#$' 이름이 이미 있습니다.\n다른 이름을 입력해주십시오.";
+        Text[ chinese_simplified ] = "这个名称 '$Name: not supported by cvs2svn $' 已经存在。\n请输入一个有效的名称。";
+        Text[ chinese_traditional ] = "名稱 '$#$' 已經存在。\n請輸入另一個名稱。";
+        Text[ turkish ] = "The name '$Name: not supported by cvs2svn $' already exists.\nPlease enter a new name.";
+        Text[ arabic ] = "�����'$Name: not supported by cvs2svn $' ����� ������.\n������ ����� ��� ����.";
+        Text[ catalan ] = "El nom '$Name: not supported by cvs2svn $' ja existeix.\nIntrodu�u-ne un altre.";
         Text[ finnish ] = "Nimi '$Name: not supported by cvs2svn $' on jo olemassa.\nAnna toinen nimi.";
-        Text[ thai ] = "มีชื่อ '$#$' อยู่แล้ว\nกรุณาใส่ชื่ออื่น";
+        Text[ thai ] = "มีชื่อ '$Name: not supported by cvs2svn $' อยู่แล้ว\nกรุณาใส่ชื่ออื่น";
     };
     String STR_OBJECT_EXISTS_ALREADY_OVERWRITE
     {
@@ -383,26 +383,26 @@ ModalDialog DLG_SAVE_AS
         Text [ ENGLISH ] = "The name '$#$' does already exist.\nDo you want to overwrite it?" ;
         Text [ english_us ] = "The name '$#$' already exists.\nDo you want to overwrite it?" ;
         Text[ language_user1 ] = " ";
-        Text[ portuguese ] = "O nome '$#$' j� existe.\nSubstituir?";
+        Text[ portuguese ] = "O nome '$Name: not supported by cvs2svn $' j� existe.\nSubstituir?";
         Text[ russian ] = "��� '$Name: not supported by cvs2svn $' ��� ����������.\n��������?";
-        Text[ greek ] = "�� ����� '$#$' ������� ���.\n������ �� ��������������;";
+        Text[ greek ] = "�� ����� '$Name: not supported by cvs2svn $' ������� ���.\n������ �� ��������������;";
         Text[ dutch ] = "De naam '$Name: not supported by cvs2svn $' bestaat reeds.\nWilt u deze overschrijven?";
         Text[ french ] = "Le nom '$#$' existe d�j�.\nVoulez-vous l'�craser ?";
-        Text[ spanish ] = "El nombre '$#$' existe ya.\n�Desea sobrescribirlo?";
-        Text[ italian ] = "Il nome '$#$' esiste gi�.\nVolete soprascriverlo?";
-        Text[ danish ] = "Navnet '$#$' findes allerede.\nVil du overskrive det?";
+        Text[ spanish ] = "El nombre '$#$' ya existe.\n�Desea sobrescribirlo?";
+        Text[ italian ] = "Il nome '$Name: not supported by cvs2svn $' esiste gi�.\nVolete soprascriverlo?";
+        Text[ danish ] = "Navnet '$Name: not supported by cvs2svn $' findes allerede.\nVil du overskrive det?";
         Text[ swedish ] = "Namnet '$#$' finns redan.\nVill du skriva �ver det?";
-        Text[ polish ] = "Nazwa '$#$' ju� istnieje.\nSkasowa� j� przez zapisanie?";
+        Text[ polish ] = "Nazwa '$Name: not supported by cvs2svn $' ju� istnieje.\nSkasowa� j� przez zapisanie?";
         Text[ portuguese_brazilian ] = "The name '$#$' already exists.\nDo you want to overwrite it?";
-        Text[ japanese ] = "'$#$' の名前はすでにあります。\n上書きしますか。";
-        Text[ korean ] = "이름 '$#$'이(가) 이미 존재합니다.\n덮어쓰겠습니까?";
-        Text[ chinese_simplified ] = "这个名称 '$#$' 已经存在。\n要改写？";
-        Text[ chinese_traditional ] = "這個名稱<$#$>已經存在。\n要覆寫？";
-        Text[ turkish ] = "The name '$#$' already exists.\nDo you want to overwrite it?";
-        Text[ arabic ] = "����� '$#$' ����� ������.\n�� ���� ������� ����";
-        Text[ catalan ] = "El nom '$#$' ja existeix.\nVoleu sobreescriure'l?";
+        Text[ japanese ] = "'$Name: not supported by cvs2svn $' の名前はすでにあります。\n上書きしますか。";
+        Text[ korean ] = "이름 '$#$'이(가) 이미 있습니다.\n덮어쓰시겠습니까?";
+        Text[ chinese_simplified ] = "这个名称 '$Name: not supported by cvs2svn $' 已经存在。\n要改写？";
+        Text[ chinese_traditional ] = "名稱 '$#$' 已經存在。\n要覆寫？";
+        Text[ turkish ] = "The name '$Name: not supported by cvs2svn $' already exists.\nDo you want to overwrite it?";
+        Text[ arabic ] = "����� '$Name: not supported by cvs2svn $' ����� ������.\n�� ���� ������� ����";
+        Text[ catalan ] = "El nom '$Name: not supported by cvs2svn $' ja existeix.\nVoleu sobreescriure'l?";
         Text[ finnish ] = "Nimi '$Name: not supported by cvs2svn $' on jo olemassa.\nHaluatko korvata sen?";
-        Text[ thai ] = "The name '$#$' already exists.\nDo you want to overwrite it?";
+        Text[ thai ] = "The name '$Name: not supported by cvs2svn $' already exists.\nDo you want to overwrite it?";
     };
     String STR_TITLE_PASTE_AS
     {
@@ -456,3 +456,9 @@ ModalDialog DLG_SAVE_AS
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index 69e342ecc367..1d5ae4bfff3b 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsize.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:08:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,7 @@
  // JN
  //
  // Letzte Aenderung:
- // $Author: kz $ $Date: 2002-11-27 17:08:09 $ $Revision: 1.21 $
+ // $Author: hr $ $Date: 2003-03-19 17:52:23 $ $Revision: 1.22 $
  //
  //---------------------------------------------------------------------------
 
@@ -331,3 +331,9 @@ ModalDialog DLG_COLWIDTH
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/dsitems.hxx b/dbaccess/source/ui/dlg/dsitems.hxx
index 30337688c578..5ed7c24eb3fe 100644
--- a/dbaccess/source/ui/dlg/dsitems.hxx
+++ b/dbaccess/source/ui/dlg/dsitems.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsitems.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 15:23:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,46 +114,3 @@
 
 #endif // _DBAUI_DATASOURCEITEMS_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.12  2002/07/25 07:00:13  oj
- *  #95146# new defines for auto fields
- *
- *  Revision 1.11  2002/07/09 12:39:11  oj
- *  #99921# check if datasource allows to check names
- *
- *  Revision 1.10  2001/06/25 08:27:36  oj
- *  #88699# new control for ldap rowcount
- *
- *  Revision 1.9  2001/05/29 13:11:52  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.8  2001/04/20 13:38:06  oj
- *  #85736# new checkbox for odbc
- *
- *  Revision 1.7  2001/03/27 07:34:29  oj
- *  impl new page for adabas
- *
- *  Revision 1.6  2001/02/05 13:57:41  fs
- *  #83430# +DSID_DATASOURCE_UNO
- *
- *  Revision 1.5  2000/10/20 09:53:17  fs
- *  handling for the SuppresVersionColumns property of a data source
- *
- *  Revision 1.4  2000/10/12 16:20:42  fs
- *  new implementations ... still under construction
- *
- *  Revision 1.3  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.2  2000/10/09 12:39:29  fs
- *  some (a lot of) new imlpementations - still under development
- *
- *  Revision 1.1  2000/10/05 10:05:55  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 22.09.00 08:10:45  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index abdcc92495bd..e9fef4e7fa5c 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsselect.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 15:23:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,22 +213,3 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.4  2002/08/19 07:40:34  oj
- *  #99473# change string resource files
- *
- *  Revision 1.3  2001/10/18 06:50:39  oj
- *  #93260# reload odbc datasources
- *
- *  Revision 1.2  2000/10/26 13:11:36  obo
- *  #65293# cant compile for linux
- *
- *  Revision 1.1  2000/10/24 12:13:30  fs
- *  initial checkin - dialog for selecting system datasources
- *
- *
- *  Revision 1.0 24.10.00 09:25:01  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index d658e4ef52c3..7faba091ae08 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsselect.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-18 06:50:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,16 +123,3 @@ protected:
 
 #endif // _DBAUI_DSSELECT_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/06/20 13:44:02  fs
- *  #88447# +Select
- *
- *  Revision 1.1  2000/10/24 12:13:53  fs
- *  initial checkin - dialog for selecting system datasources
- *
- *
- *  Revision 1.0 24.10.00 09:21:20  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 5a998af78f00..fdfed2c6174a 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsselect.src,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:56:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,7 +94,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
     Text[ chinese_traditional ] = "資料源";
     Text[ arabic ] = "���� ��������";
     Text[ greek ] = "��������� ���������";
-    Text[ korean ] = "데이터 소스";
+    Text[ korean ] = "데이터 원본";
     Text[ turkish ] = "Veri kayna��";
     Text[ language_user1 ] = " ";
 
@@ -117,7 +117,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
         Text[ polish ] = "Wybierz �r�d�o danych:";
         Text[ portuguese_brazilian ] = "Choose a data source:";
         Text[ japanese ] = "データソースを選択します:";
-        Text[ korean ] = "데이터 소스를 선택하십시오:";
+        Text[ korean ] = "데이터 원본을 선택하십시오:";
         Text[ chinese_simplified ] = "请您选择一个数据源：";
         Text[ chinese_traditional ] = "選擇資料源：";
         Text[ turkish ] = "Choose a data source:";
@@ -208,7 +208,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
         Text[ chinese_traditional ] = "本機的資料源";
         Text[ arabic ] = "����� ������ �����";
         Text[ greek ] = "������� ����������� ���������";
-        Text[ korean ] = "로컬 데이터 소스";
+        Text[ korean ] = "로컬 데이터 원본";
         Text[ turkish ] = "Yerel veri kaynaklar�";
         Text[ catalan ] = "fonts locals de dades";
         Text[ thai ] = "แหล่งข้อมูลท้องถิ่น";
@@ -219,7 +219,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
         Text [ english ] = "The program library #lib# could not be loaded or is corrupted. The ODBC data source configuration is not available.";
         Text [ english_us ] = "Could not load the program library #lib# or it is corrupted. The ODBC data source configuration is not available.";
         Text[ portuguese ] = "Ou foi imposs�vel carregar a biblioteca #lib# do programa ou esta est� com defeito. A configura��o da fonte de dados ODBC n�o est� dispon�vel.";
-        Text[ russian ] = "���������� ��������� ���������� ��������� #lib# (�������� ��� ����������). ����� ��������� ������ ODBC ����������.";
+        Text[ russian ] = "���������� ��������� ���������� ��������� #lib# (�������� ��� ����������). ��������� ��������� ������ ODBC ����������.";
         Text[ greek ] = "� ���������� ��� ������������ #lib# ��� ���� ������� �� �������� � ����� ������������. � ���������� ��� ����������� ��� ��������� ��� ODBC ��� ? ";
         Text[ dutch ] = "De programmabibliotheek #lib# kan niet worden geladen of is defect. De functie ODBC gegevensbron kiezen is niet beschikbaar.";
         Text[ french ] = "La biblioth�que de programme #lib# n'a pas pu �tre charg�e ou est d�fectueuse. La configuration de la source de donn�es ODBC n'est pas disponible.";
@@ -230,7 +230,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
         Text[ polish ] = "Za�adowanie biblioteki programu #lib# nie by�o mo�liwe. Jest ona by� mo�e uszkodzona. Wyb�r �r�d�a danych ODBC nie jest mo�liwy.";
         Text[ portuguese_brazilian ] = "The program library #lib# could not be loaded or is corrupted. The ODBC data source configuration is not available.";
         Text[ japanese ] = "#lib# プログラムライブラリを読み込めなかったか、またはそれ自体にトラブルがあります。ODBC データソースの設定はできません。";
-        Text[ korean ] = "프로그램 라이브러리 #lib#를 로드할 수 없었거나 라이브러리에 오류가 있습니다. ODBC데이터 소스 구성을 사용할 수 없습니다.";
+        Text[ korean ] = "프로그램 라이브러리 #lib#을(를) 로드할 수 없거나 라이브러리에 오류가 있습니다. ODBC 데이터 원본 설정을 할 수 없습니다.";
         Text[ chinese_simplified ] = "无法装入程序库 #lib# 或已经损坏。无法配置 ODBC 数据源。";
         Text[ chinese_traditional ] = "無法載入程式庫 #lib# 或已經損坏。無法設定 ODBC 資料源。";
         Text[ turkish ] = "The program library #lib# could not be loaded or is corrupted. The ODBC data source configuration is not available.";
@@ -246,6 +246,26 @@ ModalDialog DLG_DATASOURCE_SELECTION
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.32.2.3  2003/02/23 12:01:01  nf
+ *  trasnlation 6.1 Beta / OOo 1.1 Beta / final wave
+ *
+ *  Revision 1.32.2.2  2003/02/23 11:00:52  nf
+ *  6.1 Beta 1/OOo 1.1 Beta translation, second wave
+ *
+ *  Revision 1.32.2.1  2003/02/22 15:48:26  hr
+ *  INTEGRATION: CWS mergep (1.32.20); FILE MERGED
+ *  2003/02/22 10:44:30 nf 1.32.20.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 12:51:14 hjs 1.32.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.32.20.2  2003/02/22 10:44:30  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.32.20.1  2003/01/31 12:51:14  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.32  2002/11/27 16:56:15  kz
+ *  Merge SRX644: 27.11.02 - 17:52:19
+ *
  *  Revision 1.31  2002/09/05 13:58:17  kz
  *  Merge SRX643: 05.09.02 - 15:54:59
  *
@@ -358,3 +378,9 @@ ModalDialog DLG_DATASOURCE_SELECTION
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index c3d4b9ea24d5..3bf4b52c65b6 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: generalpage.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-09 07:50:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,8 +108,8 @@
 #ifndef _VCL_STDTEXT_HXX
 #include <vcl/stdtext.hxx>
 #endif
-#ifndef _SVTOOLS_LOCALRESACCESS_HXX_
-#include <svtools/localresaccess.hxx>
+#ifndef _DBAUI_LOCALRESACCESS_HXX_
+#include "localresaccess.hxx"
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
@@ -162,6 +162,19 @@
 #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_
 #include <com/sun/star/awt/XWindow.hpp>
 #endif
+// #106016# ------------------------------------
+#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#endif
+#ifndef _COM_SUN_STAR_TASK_XPROGRESSHANDLER_HPP_
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#endif
+#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
+#include <comphelper/processfactory.hxx>
+#endif
+#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX
+#include <ucbhelper/commandenvironment.hxx>
+#endif
 
 //.........................................................................
 namespace dbaui
@@ -513,8 +526,7 @@ namespace dbaui
             String sMessage;
             if ( nResId )
             {
-                ModuleRes aModuleRes(PAGE_GENERAL);
-                OLocalResourceAccess aStringResAccess(aModuleRes, RSC_TABPAGE);
+                OLocalResourceAccess aStringResAccess( PAGE_GENERAL, RSC_TABPAGE );
                 sMessage = String(ResId(nResId));
             }
             m_aSpecialMessage.SetText(sMessage);
@@ -859,12 +871,13 @@ namespace dbaui
         ::std::vector< ::rtl::OUString > aToBeCreated;  // the to-be-created levels
 
         // search a level which exists
-        sal_Bool bParentExists = sal_False;
-        while (!bParentExists && aParser.getSegmentCount())
+        // #106016# ---------------------
+        IS_PATH_EXIST eParentExists = PATH_NOT_EXIST;
+        while ( eParentExists == PATH_NOT_EXIST && aParser.getSegmentCount())
         {
             aToBeCreated.push_back(aParser.getName());  // remember the local name for creation
             aParser.removeSegment();                    // cut the local name
-            bParentExists = directoryExists(aParser.GetMainURL(INetURLObject::NO_DECODE));
+            eParentExists = pathExists(aParser.GetMainURL(INetURLObject::NO_DECODE), sal_False);
         }
 
         if (!aParser.getSegmentCount())
@@ -917,37 +930,34 @@ namespace dbaui
         return sal_True;
     }
 
-    //-------------------------------------------------------------------------
-    sal_Bool OGeneralPage::directoryExists(const ::rtl::OUString& _rURL) const
+    // #106016# -------------------------------------------------------------------
+    IS_PATH_EXIST OGeneralPage::pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const
     {
         ::ucb::Content aCheckExistence;
         sal_Bool bExists = sal_False;
+        IS_PATH_EXIST eExists = PATH_NOT_EXIST;
+        Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+        Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = Reference< ::com::sun::star::task::XInteractionHandler >(
+            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY );
+        Reference< XCommandEnvironment > xCmdEnv = new ::ucb::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
         try
         {
-            aCheckExistence = ::ucb::Content(_rURL, Reference< XCommandEnvironment >());
-            bExists = aCheckExistence.isFolder();
+            aCheckExistence = ::ucb::Content(_rURL, xCmdEnv );
+            bExists = bIsFile? aCheckExistence.isDocument(): aCheckExistence.isFolder();
+            eExists = bExists? PATH_EXIST: PATH_NOT_EXIST;
         }
-        catch(const Exception&) { }
-        return bExists;
-    }
-    //-------------------------------------------------------------------------
-    sal_Bool OGeneralPage::fileExists(const ::rtl::OUString& _rURL) const
-    {
-        ::ucb::Content aCheckExistence;
-        sal_Bool bExists = sal_False;
-        try
+        catch(const Exception&)
         {
-            aCheckExistence = ::ucb::Content(_rURL, Reference< XCommandEnvironment >());
-            bExists = aCheckExistence.isDocument();
-        }
-        catch(const Exception&) { }
-        return bExists;
+            eExists = PATH_NOT_KNOWN;
+           }
+        return eExists;
     }
 
     //-------------------------------------------------------------------------
     sal_Int32 OGeneralPage::checkPathExistence(const String& _rURL)
     {
-        if (!directoryExists(_rURL))
+        // #106016# ----------------
+        if ( pathExists(_rURL, sal_False) == PATH_NOT_EXIST )
         {
             String sQuery(ModuleRes(STR_ASK_FOR_DIRECTORY_CREATION));
             OFileNotation aTransformer(_rURL);
@@ -1011,8 +1021,8 @@ namespace dbaui
                 sURL = aTransformer.get(OFileNotation::N_URL);
 
                 if(DST_CALC == m_eCurrentSelection)
-                {
-                    if(!fileExists(sURL))
+                { // #106016# --------------------------
+                    if( pathExists(sURL, sal_True) == PATH_NOT_EXIST )
                     {
                         String sFile = String(ModuleRes(STR_CALCDOC_DOESNOTEXIST));
                         sFile.SearchAndReplaceAscii("$file$", aTransformer.get(OFileNotation::N_SYSTEM));
@@ -1224,8 +1234,7 @@ namespace dbaui
                 }
                 else
                 {
-                    ModuleRes aModuleRes(PAGE_GENERAL);
-                    OLocalResourceAccess aLocRes(aModuleRes, RSC_TABPAGE);
+                    OLocalResourceAccess aLocRes( PAGE_GENERAL, RSC_TABPAGE );
                     String sError(ResId(STR_NO_ADABASE_DATASOURCES));
                     ErrorBox aBox(this, WB_OK, sError);
                     aBox.Execute();
@@ -1409,100 +1418,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.30  2002/12/06 14:50:38  oj
- *  #106045# check if connectionurl should disabled
- *
- *  Revision 1.29  2002/11/21 15:23:01  oj
- *  #105213# impl new feature of rown mysql driver page
- *
- *  Revision 1.28  2002/08/19 07:40:33  oj
- *  #99473# change string resource files
- *
- *  Revision 1.27  2001/10/26 16:14:39  hr
- *  #92924#: gcc-3.0.1 needs lvalue
- *
- *  Revision 1.26  2001/09/11 07:07:26  fs
- *  #92027# accept arbitrary valid URLs - not only file URLs - when browsing for a dBase or text directory
- *
- *  Revision 1.25  2001/08/30 16:12:30  fs
- *  #88427# check for a valid name in implInitControls
- *
- *  Revision 1.24  2001/08/27 06:57:23  oj
- *  #90015# some speedup's
- *
- *  Revision 1.23  2001/08/20 11:31:33  fs
- *  #91278# implInitiControls: more sensitive disabling of the browse button ...
- *
- *  Revision 1.22  2001/08/15 07:28:33  fs
- *  #90803# properly set the cache size
- *
- *  Revision 1.21  2001/08/07 16:05:04  fs
- *  #88431# commitURL: use the pure (untranslated) URL
- *
- *  Revision 1.20  2001/08/07 15:57:43  fs
- *  #88431# centralized methods for setting/retrieving the URL in m_aConnection - this way we can translate URLs so that they're displayed in a decoded version
- *
- *  Revision 1.19  2001/08/02 13:46:58  oj
- *  #90386# set user/pwd and other to zero
- *
- *  Revision 1.18  2001/08/01 08:30:41  fs
- *  #88530# changeConnectionURL / getConnectionURL / minor corrections in the handling of m_eCurrentType
- *
- *  Revision 1.17  2001/07/31 16:01:33  fs
- *  #88530# changes to operate the dialog in a mode where no type change is possible
- *
- *  Revision 1.16  2001/07/23 13:13:38  oj
- *  #90074# check if calc doc exists
- *
- *  Revision 1.15  2001/07/17 07:35:00  oj
- *  #89533# GetMainURL changed
- *
- *  Revision 1.14  2001/07/16 07:48:40  oj
- *  #89578# removed : after address url
- *
- *  Revision 1.13  2001/07/12 13:54:20  oj
- *  #89456# check if old type is already ldap
- *
- *  Revision 1.12  2001/07/09 11:45:43  oj
- *  #89383# ask for directory not displaydir
- *
- *  Revision 1.11  2001/06/20 13:45:26  fs
- *  #88447# call Select when browsing for an address book
- *
- *  Revision 1.10  2001/06/15 09:42:43  fs
- *  #86986# moved css/ui/* to css/ui/dialogs/*
- *
- *  Revision 1.9  2001/06/06 12:24:47  fs
- *  #87187# MUST changes regarding the exceptions thrown by the ucbhelper classes
- *
- *  Revision 1.8  2001/05/31 11:09:07  oj
- *  #87149# change subprotocol and Propertynames
- *
- *  Revision 1.7  2001/05/30 15:10:24  fs
- *  #65293# include CommandAbortedException (solaris can't catch incomplete types)
- *
- *  Revision 1.6  2001/05/30 07:44:07  fs
- *  #87403# removed an obsolete ifdef FS_PRIV_DEBUG
- *
- *  Revision 1.5  2001/05/30 06:48:21  fs
- *  #87531# +SERVICE_EXTENDED_ADABAS_DRIVER (instead of hard coding the string)
- *
- *  Revision 1.4  2001/05/30 06:05:45  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.3  2001/05/29 13:33:12  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.2  2001/05/29 12:28:24  fs
- *  #87403# OnDatasourceTypeSelected: no check for IsTravelSelect anymore
- *
- *  Revision 1.1  2001/05/29 09:59:25  fs
- *  initial checkin - outsourced the class from commonpages
- *
- *
- *  Revision 1.0 29.05.01 11:33:18  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 6a9224f658a9..646178607471 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: generalpage.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 15:23:02 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,6 +70,13 @@
 namespace dbaui
 {
 //.........................................................................
+    // #106016# --------------
+    enum IS_PATH_EXIST
+    {
+        PATH_NOT_EXIST = 0,
+        PATH_EXIST,
+        PATH_NOT_KNOWN
+    };
 
     class ODbAdminDialog;
     //=========================================================================
@@ -144,12 +151,15 @@ namespace dbaui
         String          GetCurrentName() const { return m_aName.GetText(); }
 
         // set the parent dialog typesafe
-        void SetAdminDialog(ODbAdminDialog* _pDialog) { m_pAdminDialog = _pDialog; }
+        inline void SetAdminDialog(ODbAdminDialog* _pDialog) { m_pAdminDialog = _pDialog; }
         void setServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
-            { m_xORB = _rxORB; }
+        {
+            m_xORB = _rxORB;
+            m_aConnection.initializeTypeCollection(m_xORB);
+        }
 
-        void enableConnectionURL() { m_aConnection.SetReadOnly(sal_False); }
-        void disableConnectionURL() { m_aConnection.SetReadOnly(); }
+        inline void enableConnectionURL() { m_aConnection.SetReadOnly(sal_False); }
+        inline void disableConnectionURL() { m_aConnection.SetReadOnly(); }
 
         /** changes the connection URL.
             <p>The new URL must be of the type which is currently selected, only the parts which do not
@@ -171,6 +181,7 @@ namespace dbaui
         virtual long PreNotify( NotifyEvent& _rNEvt );
 
     protected:
+
         void onTypeSelected(const DATASOURCE_TYPE _eType);
         void initializeHistory();
         void initializeTypeList();
@@ -182,8 +193,8 @@ namespace dbaui
         sal_Int32       checkPathExistence(const String& _rURL);
         sal_Bool        commitURL();
         sal_Bool        createDirectoryDeep(const String& _rPathNormalized);
-        sal_Bool        directoryExists(const ::rtl::OUString& _rURL) const;
-        sal_Bool        fileExists(const ::rtl::OUString& _rURL) const;
+        // #106016# ----------------
+        IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const;
 
         void checkCreateDatabase(DATASOURCE_TYPE _eType);
         sal_Bool isBrowseable(DATASOURCE_TYPE _eType) const;
@@ -211,32 +222,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 #endif // _DBAUI_GENERALPAGE_HXX_
-
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.7  2001/08/30 16:12:30  fs
- *  #88427# check for a valid name in implInitControls
- *
- *  Revision 1.6  2001/08/07 15:56:26  fs
- *  #88431# centralized methods for setting/retrieving the URL in m_aConnection - this way we can translate URLs so that they're displayed in a decoded version
- *
- *  Revision 1.5  2001/08/01 08:30:41  fs
- *  #88530# changeConnectionURL / getConnectionURL / minor corrections in the handling of m_eCurrentType
- *
- *  Revision 1.4  2001/07/31 16:01:33  fs
- *  #88530# changes to operate the dialog in a mode where no type change is possible
- *
- *  Revision 1.3  2001/07/23 13:13:38  oj
- *  #90074# check if calc doc exists
- *
- *  Revision 1.2  2001/05/29 13:33:12  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.1  2001/05/29 09:59:32  fs
- *  initial checkin - outsourced the class from commonpages
- *
- *
- *  Revision 1.0 29.05.01 11:31:35  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index caf4a2ae3212..ac74870eb732 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexdialog.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:40:33 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -980,28 +980,3 @@ namespace dbaui
 }   // namespace dbaui
 //......................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.14  2002/07/30 09:45:49  oj
- *  #101836# enable sql92 namechecking when needed!
- *
- *  Revision 1.13  2002/04/29 08:27:33  oj
- *  #98772# impl toolbox hi contrast
- *
- *  Revision 1.12  2001/11/05 10:12:52  oj
- *  #94031# set unique flag every time
- *
- *  Revision 1.11  2001/05/23 14:50:18  fs
- *  #86860# OnIndexSelected: don't cancel the editing of the previously selected index
- *
- *  Revision 1.10  2001/05/11 16:23:16  fs
- *  #86862# allow reset for new indexes - mapped a drop without confirmation
- *
- *  Revision 1.9  2001/05/11 15:22:33  fs
- *  #86788# recognize an active editing when closing / #86860# property check for index name conflicts
- *
- *
- *  Revision 1.0 07.03.01 12:16:06  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index a03155d00e94..02d6777ad286 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexdialog.src,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:33:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -181,14 +181,14 @@ ModalDialog DLG_INDEXDESIGN
                 Text[ greek ] = "���������� ����������";
                 Text[ dutch ] = "nieuwe index";
                 Text[ french ] = "Nouvel index";
-                Text[ spanish ] = "nuevo �ndice";
+                Text[ spanish ] = "�ndice nuevo";
                 Text[ italian ] = "Nuovo indice";
                 Text[ danish ] = "Nyt indeks";
                 Text[ swedish ] = "Nytt index";
                 Text[ polish ] = "Nowy indeks";
                 Text[ portuguese_brazilian ] = "new index";
                 Text[ japanese ] = "新規作成インデックス";
-                Text[ korean ] = "새로운 색인";
+                Text[ korean ] = "새 색인";
                 Text[ chinese_simplified ] = "新建索引";
                 Text[ chinese_traditional ] = "開啟新索引";
                 Text[ turkish ] = "new index";
@@ -210,14 +210,14 @@ ModalDialog DLG_INDEXDESIGN
                 Text[ greek ] = "�������� ��������� ����������";
                 Text[ dutch ] = "Huidig register wissen";
                 Text[ french ] = "Supprimer l'index actif";
-                Text[ spanish ] = "Eliminar el �ndice actual";
+                Text[ spanish ] = "Borrar el �ndice actual";
                 Text[ italian ] = "Elimina l'indice attuale";
                 Text[ danish ] = "Slet aktuelt indeks";
                 Text[ swedish ] = "Radera aktuellt index";
                 Text[ polish ] = "Usu� bie��cy indeks";
                 Text[ portuguese_brazilian ] = "drop current index";
                 Text[ japanese ] = "現在のインデックスの削除";
-                Text[ korean ] = "현재의 색인 삭제";
+                Text[ korean ] = "현재 색인 삭제";
                 Text[ chinese_simplified ] = "删除当前的索引";
                 Text[ chinese_traditional ] = "刪除目前的索引";
                 Text[ turkish ] = "drop current index";
@@ -246,7 +246,7 @@ ModalDialog DLG_INDEXDESIGN
                 Text[ polish ] = "Zmie� nazw� bie��cego indeksu";
                 Text[ portuguese_brazilian ] = "rename current index";
                 Text[ japanese ] = "現在のインデックスの名前を変更";
-                Text[ korean ] = "현재의 색인 이름 바꾸기";
+                Text[ korean ] = "현재 색인 이름 바꾸기";
                 Text[ chinese_simplified ] = "重命名当前的索引";
                 Text[ chinese_traditional ] = "重新命名目前的索引";
                 Text[ turkish ] = "rename current index";
@@ -275,7 +275,7 @@ ModalDialog DLG_INDEXDESIGN
                 Text[ polish ] = "Zapisz bie��cy indeks";
                 Text[ portuguese_brazilian ] = "save current index";
                 Text[ japanese ] = "現在のインデックスの保存";
-                Text[ korean ] = "현재의 색인 저장";
+                Text[ korean ] = "현재 색인 저장";
                 Text[ chinese_simplified ] = "存盘当前的索引";
                 Text[ chinese_traditional ] = "儲存目前的索引";
                 Text[ turkish ] = "save current index";
@@ -304,7 +304,7 @@ ModalDialog DLG_INDEXDESIGN
                 Text[ polish ] = "Zresetuj bie��cy indeks";
                 Text[ portuguese_brazilian ] = "reset current index";
                 Text[ japanese ] = "現在のインデックスを元に戻す";
-                Text[ korean ] = "현재의 색인 리셋";
+                Text[ korean ] = "현재 색인을 원래대로";
                 Text[ chinese_simplified ] = "重设当前的索引";
                 Text[ chinese_traditional ] = "重設目前的索引";
                 Text[ turkish ] = "reset current index";
@@ -333,7 +333,7 @@ ModalDialog DLG_INDEXDESIGN
         Text [ english ] = "Index details";
         Text [ english_us ] = "Index details";
         Text[ portuguese ] = "�ndice: detalhes";
-        Text[ russian ] = "����������� �������";
+        Text[ russian ] = "������";
         Text[ greek ] = "������������ ����������";
         Text[ dutch ] = "Indexdetails";
         Text[ french ] = "Index : d�tails";
@@ -344,7 +344,7 @@ ModalDialog DLG_INDEXDESIGN
         Text[ polish ] = "Szczeg�y indeksu";
         Text[ portuguese_brazilian ] = "Index details";
         Text[ japanese ] = "インデックスの詳細";
-        Text[ korean ] = "색인 세부사항";
+        Text[ korean ] = "색인 세부 정보";
         Text[ chinese_simplified ] = "索引细节";
         Text[ chinese_traditional ] = "索引細節";
         Text[ turkish ] = "Index details";
@@ -369,7 +369,7 @@ ModalDialog DLG_INDEXDESIGN
         Text [ dutch ] = "Indexidentificator:";
         Text [ portuguese ] = "Identificador de �ndice:";
         Text [ chinese_simplified ] = "索引标志：";
-        Text [ russian ] = "������������� �������:";
+        Text [ russian ] = "�������������:";
         Text [ polish ] = "Identyfikator indeksu:";
         Text [ japanese ] = "インデックス ID:";
         Text [ chinese_traditional ] = "索引標誌：";
@@ -397,7 +397,7 @@ ModalDialog DLG_INDEXDESIGN
         Text [ english ] = "~Unique";
         Text [ english_us ] = "~Unique";
         Text[ portuguese ] = "�~nico";
-        Text[ russian ] = "����������";
+        Text[ russian ] = "����������";
         Text[ greek ] = "��������";
         Text[ dutch ] = "~Duidelijk";
         Text[ french ] = "~Unique";
@@ -408,7 +408,7 @@ ModalDialog DLG_INDEXDESIGN
         Text[ polish ] = "Unikatowy";
         Text[ portuguese_brazilian ] = "Unique";
         Text[ japanese ] = "固有(~U)";
-        Text[ korean ] = "단일(~U)";
+        Text[ korean ] = "고유(~U)";
         Text[ chinese_simplified ] = "明确的(~U)";
         Text[ chinese_traditional ] = "明確的(~U)";
         Text[ turkish ] = "Unique";
@@ -533,7 +533,7 @@ String STR_TAB_INDEX_SORTORDER
     Text [ dutch ] = "Sorteervolgorde";
     Text [ chinese_simplified ] = "排序规则";
     Text [ greek ] = "����� �����������";
-    Text [ korean ] = "정렬순서";
+    Text [ korean ] = "정렬 순서";
     Text[ turkish ] = "Sort order";
     Text[ catalan ] = "Ordenaci�";
     Text[ finnish ] = "Lajitteluj�rjestys";
@@ -632,14 +632,14 @@ String STR_CONFIRM_DROP_INDEX
     Text[ greek ] = "������ ������� �� ��������� �� ��������� '$name$';";
     Text[ dutch ] = "Wilt u de index '$name$' werkelijk wissen?";
     Text[ french ] = "Voulez-vous vraiment supprimer l'index '$name$' ?";
-    Text[ spanish ] = "�Desea eliminar realmente el �ndice '$name$'?";
+    Text[ spanish ] = "�Desea borrar realmente el �ndice '$name$'?";
     Text[ italian ] = "Volete davvero eliminare l'indice '$name$'?";
     Text[ danish ] = "Er du sikker p�, at du vil slette indekset '$name$'?";
     Text[ swedish ] = "Vill du verkligen radera indexet '$name$'?";
     Text[ polish ] = "Na pewno usun�� indeks '$name$'?";
     Text[ portuguese_brazilian ] = "Do you really want to drop the index '$name$'?";
     Text[ japanese ] = "インデックス '$name$' を削除しますか。";
-    Text[ korean ] = "색인 '$name$'(을)를 정말 삭제하겠습니까?";
+    Text[ korean ] = "색인 '$name$'(을)를 정말로 삭제하시겠습니까?";
     Text[ chinese_simplified ] = "真要删除索引'$name$'？";
     Text[ chinese_traditional ] = "真要刪除索引<$name$>？";
     Text[ turkish ] = "Do you really want to drop the index '$name$'?";
@@ -710,7 +710,7 @@ ErrorBox ERR_NEED_INDEX_FIELDS
     Message[ polish ] = "Indeks musi zawiera� co najmniej jedno pole.";
     Message[ portuguese_brazilian ] = "Der Index mu? mindestens ein Feld enthalten.";
     Message[ japanese ] = "インデックスにはフィールドが最低１つは必要です。";
-    Message[ korean ] = "색인에 최소 하나의 필드를 포함해야 합니다.";
+    Message[ korean ] = "색인에 최소한 하나의 필드를 포함해야 합니다.";
     Message[ chinese_simplified ] = "索引必须至少含有一个字段。";
     Message[ chinese_traditional ] = "索引必須至少含有一個欄位。";
     Message[ turkish ] = "Der Index mu� mindestens ein Feld enthalten.";
@@ -764,7 +764,7 @@ QueryBox QUERY_SAVE_CURRENT_INDEX
     Message[ polish ] = "Zapisa� modyfikacje bie��cego indeksu?";
     Message[ portuguese_brazilian ] = "Do you want to save the changes made on the current index?";
     Message[ japanese ] = "現在のインデックスで行った変更を保存しますか。";
-    Message[ korean ] = "현재 색인의 변경된 사항을 저장하겠습니까?";
+    Message[ korean ] = "현재 색인의 변경된 내용을 저장하시겠습니까?";
     Message[ chinese_simplified ] = "要存盘当前索引的修改内容？";
     Message[ chinese_traditional ] = "要儲存目前索引的變更內容？";
     Message[ turkish ] = "Do you want to save the changes made on the current index?";
@@ -811,7 +811,7 @@ String STR_INDEX_NAME_ALREADY_USED
     Text[ polish ] = "Istnieje ju� inny indeks o nazwie \"$name$\".";
     Text[ portuguese_brazilian ] = "There's already another index named \"$name$\".";
     Text[ japanese ] = "\"$name$\" のインデックス名はすでにあります。";
-    Text[ korean ] = "이미 \"$name$\"라는 다른 색인 이름이 존재합니다";
+    Text[ korean ] = "\"$name$\"의 색인 이름이 이미 있습니다.";
     Text[ chinese_simplified ] = "There's already another index named \"$name$\".";
     Text[ chinese_traditional ] = "已經存在一個索引<$name$>。";
     Text[ turkish ] = "There's already another index named \"$name$\".";
@@ -839,7 +839,7 @@ String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME
     Text[ polish ] = "U�y�e� dwa razy kolumny \"$name$\" - uwzgl�dnij, �e pojedyncze kolumny tabeli wyst�powa� mog� w definicji indeksu tylko raz!";
     Text[ portuguese_brazilian ] = "In a index definition, every table column may occur at most once, but you entered column \"$name$\" twice.";
     Text[ japanese ] = "インデックスの定義では、テーブルの列の見出しは各一回ずつしか使えません。列の見出し \"$name$\" は、二回目の入力です。";
-    Text[ korean ] = "색인 정의에 따라 각 시트의 열을 한 번만 입력할 수 있는데 사용자가 열 \"$name$\"(을)를 두 번 입력하였습니다.";
+    Text[ korean ] = "색인 정의에 따라 각 테이블의 열을 한 번만 지정할 수 있습니다. 열 \"$name$\"은(는) 두 번 지정되었습니다.";
     Text[ chinese_simplified ] = "在一个索引定义之中仅允许一次使用一个列名称。但是您第二次使用列名称 \"$name$\" 。";
     Text[ chinese_traditional ] = "在一個索引定義之中僅允許最多一次使用一個欄名稱。但現在是第二次使用欄名稱<$name$>。";
     Text[ turkish ] = "In a index definition, every table column may occur at most once, but you entered column \"$name$\" twice.";
@@ -852,6 +852,26 @@ String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.31.2.3  2003/02/23 12:01:01  nf
+ *  trasnlation 6.1 Beta / OOo 1.1 Beta / final wave
+ *
+ *  Revision 1.31.2.2  2003/02/23 11:00:53  nf
+ *  6.1 Beta 1/OOo 1.1 Beta translation, second wave
+ *
+ *  Revision 1.31.2.1  2003/02/22 15:48:39  hr
+ *  INTEGRATION: CWS mergep (1.31.20); FILE MERGED
+ *  2003/02/22 10:44:30 nf 1.31.20.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 12:51:14 hjs 1.31.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.31.20.2  2003/02/22 10:44:30  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.31.20.1  2003/01/31 12:51:14  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.31  2002/12/05 10:33:17  kz
+ *  Merge SRX644: 12/05/02 - 11:29:20
+ *
  *  Revision 1.30  2002/11/25 15:14:27  kz
  *  Merge SRX644: 25.11.02 - 16:10:35
  *
@@ -953,3 +973,9 @@ String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index e5a54bd0b4e5..49b0b4efc475 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexfieldscontrol.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: fs $ $Date: 2002-09-10 14:34:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -541,40 +541,3 @@ namespace dbaui
 }   // namespace dbaui
 //......................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.10  2002/08/19 07:40:33  oj
- *  #99473# change string resource files
- *
- *  Revision 1.9  2002/04/09 07:43:43  oj
- *  #98286# new virtual method GetCellText
- *
- *  Revision 1.8  2002/03/19 07:21:01  oj
- *  #97274# disable traveling with tab to allow control change
- *
- *  Revision 1.7  2001/08/06 07:44:33  fs
- *  #90529# help ids
- *
- *  Revision 1.6  2001/06/29 08:38:00  fs
- *  #86721# DbBrowseBox replaced by svt::EditBrowseBox
- *
- *  Revision 1.5  2001/05/02 11:48:41  fs
- *  #86450# disable m_nMaxColumnsIndex for the moment - need more comprehensive handling for this
- *
- *  Revision 1.4  2001/04/27 14:20:33  fs
- *  #86464# no SaveModified if not IfModified
- *
- *  Revision 1.3  2001/03/30 14:10:22  oj
- *  #85298##85297# correct index impl
- *
- *  Revision 1.2  2001/03/19 06:00:13  fs
- *  no controller if not enabled
- *
- *  Revision 1.1  2001/03/16 16:23:31  fs
- *  initial checkin - index design dialog and friends
- *
- *
- *  Revision 1.0 07.03.01 14:26:26  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 9731bb6fb5de..ead53d14c7ae 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: odbcconfig.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-15 13:09:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -333,28 +333,3 @@ void OOdbcManagement::manageDataSources(void* _pParentSysWindowHandle)
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.6  2001/03/23 13:29:31  jl
- *  replaced: OSL_ENSHURE->OSL_ENSURE
- *
- *  Revision 1.5  2001/01/10 12:09:37  oj
- *  #82620# calling convention of windows changed
- *
- *  Revision 1.4  2000/10/30 15:36:51  fs
- *  don't append the description of the ODBC data source to the DSN name
- *
- *  Revision 1.3  2000/10/26 13:47:46  kz
- *  chg. cast & ifdef WIN
- *
- *  Revision 1.2  2000/10/26 13:11:36  obo
- *  #65293# cant compile for linux
- *
- *  Revision 1.1  2000/10/24 12:48:36  fs
- *  initial checkin - wrapping (system) data source related ODBC functionality
- *
- *
- *  Revision 1.0 24.10.00 10:14:13  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 13377f554b4b..af5da247588c 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: odbcconfig.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2000-10-26 13:11:36 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,13 +171,3 @@ public:
 
 #endif // _DBAUI_ODBC_CONFIG_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2000/10/24 12:48:44  fs
- *  initial checkin - wrapping (system) data source related ODBC functionality
- *
- *
- *  Revision 1.0 24.10.00 10:11:51  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 26c1bfaa95a4..21afbf85cd97 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paramdialog.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:40:32 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -483,31 +483,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.7  2002/04/09 14:52:06  fs
- *  #98181# use a ::dbtools::OPredicateInputController
- *
- *  Revision 1.6  2001/07/11 10:10:30  oj
- *  #87257# change GetUILanguage
- *
- *  Revision 1.5  2001/06/07 15:09:39  fs
- *  #87912# redesigned the dialog
- *
- *  Revision 1.4  2001/03/13 08:23:17  oj
- *  #84710# use stream operators instead of cast
- *
- *  Revision 1.3  2001/02/14 14:34:01  oj
- *  tabledesign changes
- *
- *  Revision 1.2  2000/10/27 08:07:57  fs
- *  OSQLParser interface was changed - adjustments
- *
- *  Revision 1.1  2000/10/26 18:06:51  fs
- *  initial checkin - parameter dialog
- *
- *
- *  Revision 1.0 26.10.00 11:56:41  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 8d0476fc83b6..ac76ab91a66c 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paramdialog.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:01:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,7 +99,7 @@ ModalDialog DLG_PARAMETERS
         Text[ polish ] = "Parametr";
         Text[ portuguese_brazilian ] = "~Parameters";
         Text[ japanese ] = "パラメータ(~P)";
-        Text[ korean ] = "파라미터(~P)";
+        Text[ korean ] = "매개 변수(~P)";
         Text[ chinese_simplified ] = "参数(~P)";
         Text[ chinese_traditional ] = "參數(~P)";
         Text[ arabic ] = "��������";
@@ -165,7 +165,7 @@ ModalDialog DLG_PARAMETERS
         Text[ greek ] = "�����~��";
         Text[ dutch ] = "~volgende";
         Text[ french ] = "Suivant";
-        Text[ spanish ] = "~siguiente";
+        Text[ spanish ] = "~Siguiente";
         Text[ italian ] = "Successi~vo";
         Text[ danish ] = "~n�ste";
         Text[ swedish ] = "~n�sta";
@@ -211,7 +211,7 @@ ModalDialog DLG_PARAMETERS
     Text[ chinese_traditional ] = "輸入參數值";
     Text[ arabic ] = "����� �������";
     Text[ greek ] = "�������� ����������";
-    Text[ korean ] = "파라미터 입력";
+    Text[ korean ] = "매개 변수 입력";
     Text[ turkish ] = "Parametre giri�i";
 
     String STR_COULD_NOT_CONVERT_PARAM
@@ -231,7 +231,7 @@ ModalDialog DLG_PARAMETERS
         Text[ polish ] = "Nie mo�na by�o zamieni� wpisu na wa�n� warto�� kolumny \"$name$\".";
         Text[ portuguese_brazilian ] = "The given input could no be converted into a valid value for column \"$value$\".";
         Text[ japanese ] = "入力値は <$name$> 列で有効な値に変換できませんでした。";
-        Text[ korean ] = "입력이 열\"$name$\"의 유효한 값으로 변환되지 못했습니다.";
+        Text[ korean ] = "입력 항목이 \"$name$\" 열의 유효값으로 변환하지 못했습니다.";
         Text[ chinese_simplified ] = "输入的内容无法转换成一个用于列\"$name$\"的有效数值。";
         Text[ chinese_traditional ] = "這個輸入值無法轉換成欄<$name$>的有效值。";
         Text[ arabic ] = "���� ����� ������� ��� ���� ����� ������ \"$name$\".";
@@ -248,6 +248,26 @@ ModalDialog DLG_PARAMETERS
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.25.2.3  2003/02/23 12:01:03  nf
+ *  trasnlation 6.1 Beta / OOo 1.1 Beta / final wave
+ *
+ *  Revision 1.25.2.2  2003/02/23 11:00:54  nf
+ *  6.1 Beta 1/OOo 1.1 Beta translation, second wave
+ *
+ *  Revision 1.25.2.1  2003/02/22 15:49:06  hr
+ *  INTEGRATION: CWS mergep (1.25.20); FILE MERGED
+ *  2003/02/22 10:44:31 nf 1.25.20.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 12:51:15 hjs 1.25.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.25.20.2  2003/02/22 10:44:31  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.25.20.1  2003/01/31 12:51:15  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.25  2002/11/27 17:01:08  kz
+ *  Merge SRX644: 27.11.02 - 17:57:16
+ *
  *  Revision 1.24  2002/09/05 13:56:30  kz
  *  Merge SRX643: 05.09.02 - 15:53:13
  *
@@ -335,3 +355,9 @@ ModalDialog DLG_PARAMETERS
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index 7184fb566498..6dd1c56785eb 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: queryfilter.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-21 06:26:32 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,7 +102,7 @@
     };\
     StringList [ danish ] = \
     {\
-        < "OG " ; Default ; > ; \
+        < "OG" ; Default ; > ; \
         < "ELLER" ; Default ; > ; \
     };\
     StringList [ french ] = \
@@ -182,8 +182,13 @@ StringList [ language_user1 ] =\
     };\
 StringList [ catalan ] = \
     {\
-            < "Y" ; Default ; > ;\
-        < "O" ; Default ; > ;\
+            < "AND" ; Default ; > ;\
+        < "OR" ; Default ; > ;\
+    };\
+    StringList [ thai ] = \
+    {\
+         < "และ" ; Default ; > ;\
+        < "หรือ" ; Default ; > ;\
     };
 
 ModalDialog DLG_FILTERCRIT
@@ -196,29 +201,29 @@ ModalDialog DLG_FILTERCRIT
     Text ="Standardfilter" ;
     Text [ ENGLISH ] ="Standardfilter" ;
     Text[ english_us ] ="Default Filter";
-    Text[ portuguese ] ="Filtro padr�o";
-    Text[ russian ] ="����������� ������";
-    Text[ dutch ] ="Standaardfilter";
+    Text[ portuguese ] ="Filtro";
+    Text[ russian ] ="������";
+    Text[ dutch ] ="Filter";
     Text[ french ] ="Filtre standard";
     Text[ spanish ] ="Filtro predeterminado";
     Text[ italian ] ="Filtro standard";
-    Text[ danish ] ="Standardfilter";
+    Text[ danish ] ="Filter";
     Text[ swedish ] ="Standardfilter";
-    Text[ polish ] ="Filtr standardowy";
-    Text[ portuguese_brazilian ] ="Filter";
+    Text[ polish ] ="Filtr";
+    Text[ portuguese_brazilian ] ="Filtro Padr�o";
     Text[ japanese ] ="標準フィルタ";
     Text[ chinese_simplified ] ="标准筛选";
     Text[ chinese_traditional ] ="標準篩選";
-    Text[ arabic ] ="���� �����";
-    Text[ dutch ] ="Standaardfilter";
+    Text[ arabic ] ="����";
+    Text[ dutch ] ="Filter";
     Text[ chinese_simplified ] ="标准筛选";
-    Text[ greek ] ="������ �����������";
+    Text[ greek ] ="������";
     Text[ korean ] ="기본 필터";
-    Text[ turkish ] ="Standart filtre";
+    Text[ turkish ] ="Filtre";
     Text[ language_user1 ] ="";
-    Text[ finnish ] ="Oletussuodatin";
-    Text[ catalan ] ="Default Filter";
-    Text[ thai ] ="ค่าเริ่มต้นตัวกรอง";
+    Text[ finnish ] ="Suodatus";
+    Text[ catalan ] ="Filtre";
+    Text[ thai ] ="ตัวกรอง";
 
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -339,14 +344,15 @@ ModalDialog DLG_FILTERCRIT
         Text[ chinese_simplified ] = "字段名称";
         Text[ russian ] = "��� ����";
         Text[ polish ] = "Nazwa pola";
-        Text[ japanese ] = "ﾌｨｰﾙﾄﾞ名";
+        Text[ japanese ] = "フィールド名";
         Text[ chinese_traditional ] = "欄位名稱";
         Text[ arabic ] = "��� �����";
         Text[ greek ] = "����� ������";
         Text[ korean ] = "필드 이름";
         Text[ turkish ] = "Alan ad�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nombre del campo";
+        Text[ catalan ] = "Nom del camp";
+        Text[ thai ] = "ชื่อเขตข้อมูล";
     };
     FixedText FT_WHERECOMP
     {
@@ -376,7 +382,8 @@ ModalDialog DLG_FILTERCRIT
         Text[ korean ] = "조건";
         Text[ turkish ] = "Ko�ul";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Condici�n";
+        Text[ catalan ] = "Condici�";
+        Text[ thai ] = "เงื่อนไข";
     };
     FixedText FT_WHEREVALUE
     {
@@ -406,7 +413,8 @@ ModalDialog DLG_FILTERCRIT
         Text[ korean ] = "값";
         Text[ turkish ] = "De�er";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Valor";
+        Text[ catalan ] = "valor";
+        Text[ thai ] = "ค่า";
     };
     FixedText FT_WHEREOPER
     {
@@ -434,10 +442,11 @@ ModalDialog DLG_FILTERCRIT
         Text[ chinese_traditional ] = "捷徑";
         Text[ arabic ] = "������";
         Text[ greek ] = "�������";
-        Text[ korean ] = "링크";
+        Text[ korean ] = "연산자";
         Text[ turkish ] = "Ba�lant�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "V�nculo";
+        Text[ catalan ] = "Operador";
+        Text[ thai ] = "ตัวปฏิบัติการ";
     };
     FixedLine FL_FIELDS
     {
@@ -466,7 +475,8 @@ ModalDialog DLG_FILTERCRIT
         Text[ korean ] = "기준";
         Text[ turkish ] = "�l��tler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Criterios";
+        Text[ catalan ] = "Criteris";
+        Text[ thai ] = "เกณฑ์";
     };
     OKButton BT_OK
     {
@@ -501,7 +511,7 @@ ModalDialog DLG_FILTERCRIT
         Text [ portuguese ] = "- nenhum -" ;
         Text [ portuguese_brazilian ] = "- keiner -" ;
         Text[ chinese_simplified ] = "- 无 -";
-        Text[ russian ] = "- ��� -";
+        Text[ russian ] = "- ��� -";
         Text[ polish ] = "- brak -";
         Text[ japanese ] = "-なし-";
         Text[ chinese_traditional ] = "- 無 -";
@@ -510,8 +520,9 @@ ModalDialog DLG_FILTERCRIT
         Text[ korean ] = "- 없음 -";
         Text[ turkish ] = "- Yok -";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "- ninguno -";
+        Text[ catalan ] = "- cap -";
         Text[ finnish ] = "- ei mit��n -";
+        Text[ thai ] = "- ไม่มี -";
     };
     String STR_COMPARE_OPERATORS
     {
@@ -528,7 +539,7 @@ ModalDialog DLG_FILTERCRIT
         Text[ swedish ] = "=;<>;<;<=;>;>=;lika med;inte lika med;noll;inte noll";
         Text[ polish ] = "=;<>;<;<=;>;>=;r�wny;nie r�wny;zero;nie zero";
         Text[ portuguese_brazilian ] = "=;<>;<;<=;>;>=;like;not like;null;not null";
-        Text[ japanese ] = "=;<>;<;<=;>;>=;同じ;同じでない;空;空でない";
+        Text[ japanese ] = "=;<>;<;<=;>;>=;like;not like;空;空でない";
         Text[ chinese_simplified ] = "=;<>;<;<=;>;>=;等于;不等于;空缺;不空缺";
         Text[ chinese_traditional ] = "=;<>;<;<=;>;>=;等於;不等於;空缺;不空缺";
         Text[ arabic ] = "=;<>;<;<=;>;>=;���;��� ���;����;��� ������";
@@ -536,8 +547,9 @@ ModalDialog DLG_FILTERCRIT
         Text[ korean ] = "=;<>;<;<=;>;>=;같음;같지 않음;비어 있는;비어있지않음";
         Text[ turkish ] = "=;<>;<;<=;>;>=;gibi;gibi de�il;bo�;bo� de�il";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "=;<>;<;<=;>;>=;como;no como;vac�o;no vac�o";
+        Text[ catalan ] = "=;<>;<;<=;>;>=;com;no com;nul;no nul";
         Text[ finnish ] = "=;<>;<;<=;>;>=;kuten;ei kuten;tyhj�;ei tyhj�";
+        Text[ thai ] = "=;<>;<;<=;>;>=;เหมือน;ไม่เหมือน;ว่าง;ไม่ว่าง";
     };
 };
 
@@ -551,3 +563,10 @@ ModalDialog DLG_FILTERCRIT
 
 
 
+
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index a6b51fce36c0..214a931da1ae 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: queryorder.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 23:07:48 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -220,8 +220,13 @@ ModalDialog DLG_ORDERCRIT
     };
     StringList [ catalan ] =
     {
-            < "ascendente" ; Default ; > ;
-        < "descendente" ; Default ; > ;
+            < "ascendent" ; Default ; > ;
+        < "descendent" ; Default ; > ;
+    };
+    StringList [ thai ] =
+    {
+         < "จากน้อยไปมาก" ; Default ; > ;
+        < "จากมากไปน้อย" ; Default ; > ;
     };
     };
     ListBox LB_ORDERFIELD2
@@ -358,8 +363,13 @@ ModalDialog DLG_ORDERCRIT
     };
     StringList [ catalan ] =
     {
-            < "ascendente" ; Default ; > ;
-        < "descendente" ; Default ; > ;
+            < "ascendent" ; Default ; > ;
+        < "descendent" ; Default ; > ;
+    };
+    StringList [ thai ] =
+    {
+         < "จากน้อยไปมาก" ; Default ; > ;
+        < "จากมากไปน้อย" ; Default ; > ;
     };
     };
     ListBox LB_ORDERFIELD3
@@ -496,8 +506,13 @@ ModalDialog DLG_ORDERCRIT
     };
     StringList [ catalan ] =
     {
-            < "ascendente" ; Default ; > ;
-        < "descendente" ; Default ; > ;
+            < "ascendent" ; Default ; > ;
+        < "descendent" ; Default ; > ;
+    };
+    StringList [ thai ] =
+    {
+         < "จากน้อยไปมาก" ; Default ; > ;
+        < "จากมากไปน้อย" ; Default ; > ;
     };
     };
     FixedText FT_ORDERFIELD
@@ -521,14 +536,15 @@ ModalDialog DLG_ORDERCRIT
         Text[ chinese_simplified ] = "字段名称";
         Text[ russian ] = "��� ����";
         Text[ polish ] = "Nazwa pola";
-        Text[ japanese ] = "ﾌｨｰﾙﾄﾞ名";
+        Text[ japanese ] = "フィールド名";
         Text[ chinese_traditional ] = "欄位名稱";
         Text[ arabic ] = "��� �����";
         Text[ greek ] = "����� ������";
         Text[ korean ] = "필드 이름";
         Text[ turkish ] = "Alan ad�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nombre de campo";
+        Text[ catalan ] = "Nom del camp";
+        Text[ thai ] = "ชื่อเขตข้อมูล";
     };
 
     FixedText FT_ORDERAFTER1
@@ -545,7 +561,7 @@ ModalDialog DLG_ORDERCRIT
         Text [ danish ] = "derefter" ;
         Text [ french ] = "puis" ;
         Text [ swedish ] = "d�refter" ;
-        Text [ dutch ] = "en vervolgens" ;
+        Text [ dutch ] = "vervolgens" ;
         Text [ spanish ] = "despu�s" ;
         Text [ ENGLISH_US ] = "and then" ;
         Text[ chinese_simplified ] = "之后";
@@ -558,7 +574,8 @@ ModalDialog DLG_ORDERCRIT
         Text[ korean ] = "그 다음";
         Text[ turkish ] = "Sonra";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "detr�s";
+        Text[ catalan ] = "i despr�s";
+        Text[ thai ] = "และ  จากนั้น";
     };
     FixedText FT_ORDERAFTER2
     {
@@ -574,7 +591,7 @@ ModalDialog DLG_ORDERCRIT
         Text [ danish ] = "derefter" ;
         Text [ french ] = "puis" ;
         Text [ swedish ] = "d�refter" ;
-        Text [ dutch ] = "en vervolgens" ;
+        Text [ dutch ] = "vervolgens" ;
         Text [ spanish ] = "despu�s" ;
         Text [ ENGLISH_US ] = "and then" ;
         Text[ chinese_simplified ] = "之后";
@@ -587,7 +604,8 @@ ModalDialog DLG_ORDERCRIT
         Text[ korean ] = "그 다음";
         Text[ turkish ] = "Sonra";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "detr�s";
+        Text[ catalan ] = "i despr�s";
+        Text[ thai ] = "และ  จากนั้น";
     };
     FixedText FT_ORDEROPER
     {
@@ -614,10 +632,11 @@ ModalDialog DLG_ORDERCRIT
         Text[ chinese_traditional ] = "捷徑";
         Text[ arabic ] = "������";
         Text[ greek ] = "�������";
-        Text[ korean ] = "링크";
+        Text[ korean ] = "연산자";
         Text[ turkish ] = "��le�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "V�nculo";
+        Text[ catalan ] = "Operador";
+        Text[ thai ] = "ตัวปฏิบัติการ";
     };
     FixedText FT_ORDERDIR
     {
@@ -647,7 +666,8 @@ ModalDialog DLG_ORDERCRIT
         Text[ korean ] = "순서";
         Text[ turkish ] = "S�ra";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Orden";
+        Text[ catalan ] = "Ordre";
+        Text[ thai ] = "ลำดับ";
     };
     OKButton BT_OK
     {
@@ -692,10 +712,11 @@ ModalDialog DLG_ORDERCRIT
         Text[ chinese_traditional ] = "排序";
         Text[ arabic ] = "�����";
         Text[ greek ] = "����������";
-        Text[ korean ] = "정렬";
+        Text[ korean ] = "정렬 순서";
         Text[ turkish ] = "S�ralama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Orden";
+        Text[ catalan ] = "Ordre";
+        Text[ thai ] = "เรียงลำดับ";
     };
     String STR_NOENTRY
     {
@@ -706,14 +727,14 @@ ModalDialog DLG_ORDERCRIT
         Text [ portuguese_brazilian ] = "<nenhum>" ;
         Text [ portuguese ] = "<nenhum>" ;
         Text [ finnish ] = "<ei mit��n>" ;
-        Text [ danish ] = "<ingen>" ;
+        Text [ danish ] = "<intet>" ;
         Text [ french ] = "<aucun(e)>" ;
-        Text [ swedish ] = "<ingen>" ;
+        Text [ swedish ] = "<inget>" ;
         Text [ dutch ] = "<geen>" ;
         Text [ spanish ] = "<ninguno>" ;
         Text [ ENGLISH_US ] = "<none>" ;
         Text[ chinese_simplified ] = "<无>";
-        Text[ russian ] = "<���>";
+        Text[ russian ] = "<���>";
         Text[ polish ] = "<brak>";
         Text[ japanese ] = "<なし>";
         Text[ chinese_traditional ] = "<無>";
@@ -722,7 +743,8 @@ ModalDialog DLG_ORDERCRIT
         Text[ korean ] = "<없음>";
         Text[ turkish ] = "<hi�biri>";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "<ninguno>";
+        Text[ catalan ] = "<cap>";
+        Text[ thai ] = "<ไม่มี>";
     };
     Text[ chinese_simplified ] = "排序";
     Text[ russian ] = "����������";
@@ -731,10 +753,11 @@ ModalDialog DLG_ORDERCRIT
     Text[ chinese_traditional ] = "排序";
     Text[ arabic ] = "����� �����";
     Text[ greek ] = "����������";
-    Text[ korean ] = "정렬";
+    Text[ korean ] = "정렬 순서";
     Text[ turkish ] = "S�ralama";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Orden";
+    Text[ catalan ] = "Ordenaci�";
+    Text[ thai ] = "เรียงลำดับ";
 };
 
 
@@ -749,3 +772,9 @@ ModalDialog DLG_ORDERCRIT
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index b594c9475577..929989773e81 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlmessage.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:40:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -569,49 +569,3 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, pButton )
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.13  2002/07/22 07:38:23  oj
- *  #101514# remove resource entries for PLUS and MINUS
- *
- *  Revision 1.12  2002/04/29 08:27:33  oj
- *  #98772# impl toolbox hi contrast
- *
- *  Revision 1.11  2001/12/10 11:19:16  fs
- *  #95540# for the 'more' dialog, use the error dialog as direct parent
- *
- *  Revision 1.10  2001/11/29 11:21:37  pb
- *  fix: #93646# message FixedText is not a label
- *
- *  Revision 1.9  2001/05/17 13:28:14  sj
- *  #86988# dialog redesign
- *
- *  Revision 1.8  2001/03/02 17:04:27  fs
- *  correcting the building of the exception tree
- *
- *  Revision 1.7  2001/02/05 09:48:50  fs
- *  unique id for the 'more' button
- *
- *  Revision 1.6  2001/01/29 13:21:19  oj
- *  use second exception for message text
- *
- *  Revision 1.5  2000/12/08 17:56:46  fs
- *  #79541# wrong define in the previous brandname fix - and, cause I was just touching it, adjusted the changes to our own style :)
- *
- *  Revision 1.4  2000/12/07 18:55:34  csaba
- *  79541 Branding/Configuration Change
- *
- *  Revision 1.3  2000/10/18 09:11:18  obo
- *  Syntax error with linux compiler
- *
- *  Revision 1.2  2000/10/09 12:39:29  fs
- *  some (a lot of) new imlpementations - still under development
- *
- *  Revision 1.1  2000/10/05 10:06:44  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 02.10.00 12:37:20  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index 638ab8edaf97..49322095bc36 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlmessage.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:59:19 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,7 +135,7 @@ ModalDialog DLG_SQLEXCEPTIONCHAIN
         Text[ polish ] = "Szczeg�y";
         Text[ portuguese_brazilian ] = "details";
         Text[ japanese ] = "詳細";
-        Text[ korean ] = "상세";
+        Text[ korean ] = "자세히";
         Text[ chinese_simplified ] = "细节";
         Text[ chinese_traditional ] = "細節";
         Text[ arabic ] = "��������";
@@ -164,7 +164,7 @@ ModalDialog DLG_SQLEXCEPTIONCHAIN
         Text[ polish ] = "~Lista b��d�w:";
         Text[ portuguese_brazilian ] = "error ~list:";
         Text[ japanese ] = "エラーリスト(~L):";
-        Text[ korean ] = "오류 목록(~L)";
+        Text[ korean ] = "오류 목록(~L):";
         Text[ chinese_simplified ] = "错误列单(~L)：";
         Text[ chinese_traditional ] = "錯誤清單(~L)：";
         Text[ arabic ] = "����� �������:";
@@ -348,7 +348,7 @@ ModalDialog DLG_SQLEXCEPTIONCHAIN
         Text[ polish ] = "Stan SQL";
         Text[ portuguese_brazilian ] = "SQL State";
         Text[ japanese ] = "SQL ステータス";
-        Text[ korean ] = "SQL-상태";
+        Text[ korean ] = "SQL 상태";
         Text[ chinese_simplified ] = "SQL 状态";
         Text[ chinese_traditional ] = "SQL 狀態";
         Text[ turkish ] = "SQL State";
@@ -409,6 +409,26 @@ ModalDialog DLG_SQLEXCEPTIONCHAIN
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.35.2.3  2003/02/23 12:01:04  nf
+ *  trasnlation 6.1 Beta / OOo 1.1 Beta / final wave
+ *
+ *  Revision 1.35.2.2  2003/02/23 11:00:58  nf
+ *  6.1 Beta 1/OOo 1.1 Beta translation, second wave
+ *
+ *  Revision 1.35.2.1  2003/02/22 15:49:45  hr
+ *  INTEGRATION: CWS mergep (1.35.20); FILE MERGED
+ *  2003/02/22 10:44:32 nf 1.35.20.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 12:51:17 hjs 1.35.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.35.20.2  2003/02/22 10:44:32  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.35.20.1  2003/01/31 12:51:17  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.35  2002/11/27 16:59:19  kz
+ *  Merge SRX644: 27.11.02 - 17:55:26
+ *
  *  Revision 1.34  2002/08/19 07:47:24  oj
  *  #99473# change string resource files
  *
@@ -531,3 +551,9 @@ ModalDialog DLG_SQLEXCEPTIONCHAIN
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index d00f411b4b43..a49b9d25e9f8 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tablespage.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-07 13:06:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1474,19 +1474,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.13  2002/08/19 07:40:31  oj
- *  #99473# change string resource files
- *
- *  Revision 1.12  2002/04/29 08:27:33  oj
- *  #98772# impl toolbox hi contrast
- *
- *  Revision 1.11  2001/11/16 15:25:04  oj
- *  #94891# use &Class::method instead of Class::method
- *
- *
- *  Revision 1.0 29.05.01 11:10:11  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index d693076703df..f1cc5880ddbe 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tablespage.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-29 08:27:33 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -253,25 +253,3 @@ namespace dbaui
 
 #endif // _DBAUI_TABLESPAGE_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2001/08/28 08:21:15  fs
- *  #91573# enable the items (drop/add/edit) only if the connection is capable
- *
- *  Revision 1.4  2001/08/15 08:49:57  fs
- *  #89822# doToolboxAction -> onToolBoxAction (now virtual in the base class)
- *
- *  Revision 1.3  2001/08/14 14:12:22  fs
- *  #86945# add notifiers to the tables container of newly opened table design components
- *
- *  Revision 1.2  2001/08/14 12:10:12  fs
- *  preparations for #86945# (be a container listener ...)
- *
- *  Revision 1.1  2001/05/29 09:59:46  fs
- *  initial checkin - outsourced the class from commonpages
- *
- *
- *  Revision 1.0 29.05.01 11:08:49  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 00b15f5ef5cd..210c675c64f3 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DExport.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-28 08:05:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -145,7 +145,7 @@ namespace dbaui
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory;
 
         String              m_sTextToken;       // Zellen Inhalt
-        OTypeInfo*          m_pTypeInfo;    // contains the default type
+        TOTypeInfoSP        m_pTypeInfo;    // contains the default type
         sal_Int32           m_nColumnPos;       // aktuelle Spaltenposition
         sal_Int32           m_nRows;        // Anzahl der Zeilen die durchsucht werden sollen
         sal_Int32           m_nRowCount;    // current count of rows
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 7b279e43e436..28d5ffb0f819 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescControl.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 09:19:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -156,7 +156,7 @@ namespace dbaui
         ScrollBar*              m_pVertScroll;
         ScrollBar*              m_pHorzScroll;
 
-        const OTypeInfo*        m_pPreviousType;
+        TOTypeInfoSP        m_pPreviousType;
         USHORT                  nCurChildId;
         short                   nPos;
         short                   nOldDefaultPos;
@@ -201,19 +201,19 @@ namespace dbaui
 
         virtual ::com::sun::star::lang::Locale  GetLocale() const = 0;
 
-        virtual void        CellModified(long nRow, USHORT nColId ) = 0;
-        virtual void        SetModified(BOOL bModified)             = 0;
+        virtual void                            CellModified(long nRow, USHORT nColId ) = 0;
+        virtual void                            SetModified(BOOL bModified)             = 0;
 
-        virtual const OTypeInfo*    getTypeInfo(sal_Int32 _nPos)        = 0;
-        virtual const OTypeInfoMap* getTypeInfo() const  = 0;
+        virtual TOTypeInfoSP                    getTypeInfo(sal_Int32 _nPos)        = 0;
+        virtual const OTypeInfoMap*             getTypeInfo() const  = 0;
 
-        virtual sal_Bool isAutoIncrementValueEnabled() const = 0;
-        virtual ::rtl::OUString getAutoIncrementValue() const = 0;
+        virtual sal_Bool                        isAutoIncrementValueEnabled() const = 0;
+        virtual ::rtl::OUString                 getAutoIncrementValue() const = 0;
 
-        String  BoolStringPersistent(const String& rUIString) const;
-        String  BoolStringUI(const String& rPersistentString) const;
+        String                                  BoolStringPersistent(const String& rUIString) const;
+        String                                  BoolStringUI(const String& rPersistentString) const;
 
-        const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; }
+        const OPropColumnEditCtrl*              getColumnCtrl() const { return m_pColumnName; }
 
     public:
         OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar);
@@ -237,6 +237,7 @@ namespace dbaui
         void                CheckScrollBars();
         sal_Bool            isCutAllowed();
         sal_Bool            isCopyAllowed();
+        sal_Bool            isPasteAllowed();
 
         void                cut();
         void                copy();
diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx
index 8ead8a23dd80..ad560b5c8777 100644
--- a/dbaccess/source/ui/inc/FieldDescriptions.hxx
+++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescriptions.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-14 07:52:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,7 @@ namespace dbaui
         ::com::sun::star::uno::Any      m_aDefaultValue;    // the default value from the database
         ::com::sun::star::uno::Any      m_aControlDefault;  // the value which the control inserts as default
 
-        const OTypeInfo*    m_pType;
+        TOTypeInfoSP    m_pType;
 
         ::rtl::OUString     m_sName;
         ::rtl::OUString     m_sTypeName;
@@ -112,7 +112,7 @@ namespace dbaui
                             const ::com::sun::star::uno::Any&   _aDefaultValue,
                             const ::com::sun::star::uno::Any&   _aControlDefault,
                             const ::rtl::OUString&  _sAutoIncrementValue,
-                            const OTypeInfo*        _pType,
+                            const TOTypeInfoSP&     _pType,
                             sal_Int32               _nPrecision,
                             sal_Int32               _nScale,
                             sal_Int32               _nIsNullable,
@@ -130,31 +130,31 @@ namespace dbaui
         void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue)      { m_aDefaultValue = _rDefaultValue; }
         void SetControlDefault(const ::com::sun::star::uno::Any& _rControlDefault)  { m_aControlDefault = _rControlDefault; }
         void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue)   { m_sAutoIncrementValue = _sAutoIncValue; }
-        void SetType(const OTypeInfo* _pType)                               { m_pType = _pType; if (m_pType) m_nType = m_pType->nType; }
-        void SetTypeValue(sal_Int32 _nType)                                 { m_nType = _nType; OSL_ENSURE(!m_pType,"Invalid call here!");}
+        void SetType(TOTypeInfoSP _pType)                                   { m_pType = _pType; if ( m_pType.get() ) m_nType = m_pType->nType; }
+        void SetTypeValue(sal_Int32 _nType)                                 { m_nType = _nType; OSL_ENSURE(!m_pType.get(),"Invalid call here!");}
         void SetPrecision(const sal_Int32& _rPrecision)                     { m_nPrecision = _rPrecision; }
         void SetScale(const sal_Int32& _rScale)                             { m_nScale = _rScale; }
         void SetIsNullable(const sal_Int32& _rIsNullable)                   { m_nIsNullable = _rIsNullable; }
         void SetFormatKey(const sal_Int32& _rFormatKey)                     { m_nFormatKey = _rFormatKey; }
         void SetHorJustify(const SvxCellHorJustify& _rHorJustify)           { m_eHorJustify = _rHorJustify; }
         void SetAutoIncrement(sal_Bool _bAuto)                              { m_bIsAutoIncrement = _bAuto; }
-        void SetPrimaryKey(sal_Bool _bPKey)                                 { m_bIsPrimaryKey = _bPKey; }
+        void SetPrimaryKey(sal_Bool _bPKey)                                 { m_bIsPrimaryKey = _bPKey; if ( _bPKey ) SetIsNullable(::com::sun::star::sdbc::ColumnValue::NO_NULLS); }
         void SetCurrency(sal_Bool _bIsCurrency)                             { m_bIsCurrency = _bIsCurrency; }
 
-        void FillFromTypeInfo(const OTypeInfo* _pType,sal_Bool _bForce,sal_Bool _bReset);
+        void FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bForce,sal_Bool _bReset);
 
         ::rtl::OUString             GetName()               const { return m_sName; }
         ::rtl::OUString             GetDescription()        const { return m_sDescription; }
         ::com::sun::star::uno::Any  GetDefaultValue()       const { return m_aDefaultValue; }
         ::com::sun::star::uno::Any  GetControlDefault()     const { return m_aControlDefault; }
         ::rtl::OUString             GetAutoIncrementValue() const { return m_sAutoIncrementValue; }
-        sal_Int32                   GetType()               const { return m_pType ? m_pType->nType : m_nType; }
+        sal_Int32                   GetType()               const { return m_pType.get() ? m_pType->nType : m_nType; }
         sal_Int32                   GetPrecision()          const { return m_nPrecision; }
         sal_Int32                   GetScale()              const { return m_nScale; }
         sal_Int32                   GetIsNullable()         const { return m_nIsNullable; }
         sal_Int32                   GetFormatKey()          const { return m_nFormatKey; }
         SvxCellHorJustify           GetHorJustify()         const { return m_eHorJustify; }
-        const OTypeInfo*            getTypeInfo()           const { return m_pType; }
+        TOTypeInfoSP            getTypeInfo()           const { return m_pType; }
         sal_Bool                    IsAutoIncrement()       const { return m_bIsAutoIncrement; }
         sal_Bool                    IsPrimaryKey()          const { return m_bIsPrimaryKey; }
         sal_Bool                    IsCurrency()            const { return m_bIsCurrency; }
diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx
new file mode 100644
index 000000000000..cab94f2e691e
--- /dev/null
+++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ *  $RCSfile: IClipBoardTest.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:35 $
+ *
+ *  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 DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#define DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+
+namespace dbaui
+{
+    class SAL_NO_VTABLE IClipboardTest
+    {
+    public:
+        virtual sal_Bool isCutAllowed()         = 0;
+        virtual sal_Bool isCopyAllowed()        = 0;
+        virtual sal_Bool isPasteAllowed()       = 0;
+
+        virtual sal_Bool hasChildPathFocus()    = 0;
+
+        virtual void copy()     = 0;
+        virtual void cut()      = 0;
+        virtual void paste()    = 0;
+    };
+}
+#endif // DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 2390e9b4bfb5..d2adb5556a7d 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryDesignView.hxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-24 12:43:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -194,6 +194,7 @@ namespace dbaui
                                                                     const String& _sCriteria,
                                                                     ::rtl::OUString& _rsErrorMessage,
                                                                     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn);
+
     protected:
         // return the Rectangle where I can paint myself
         virtual void resizeDocumentView(Rectangle& rRect);
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index ffe59bad4201..5da8ef1fcb07 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableController.hxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-09 08:53:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,7 +113,7 @@ namespace dbaui
         ::rtl::OUString m_sName;                // table for update data
         ::rtl::OUString m_sAutoIncrementValue;  // the autoincrement value set in the datasource
         String          m_sTypeNames;           // these type names are the ones out of the resource file
-        OTypeInfo*      m_pTypeInfo;            // fall back when type is unkown because database driver has a failure
+        TOTypeInfoSP    m_pTypeInfo;            // fall back when type is unkown because database driver has a failure
 
         sal_Bool        m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property
         sal_Bool        m_bModified : 1;        // is the data modified
@@ -171,20 +171,20 @@ namespace dbaui
         //  const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();}
         // need for undo's and redo's
         SfxUndoManager* getUndoMgr();
-        ::std::vector<OTableRow*>*  getRows() { return &m_vRowList; }
-        const OTypeInfoMap*         getTypeInfo() const { return &m_aTypeInfo; }
+        inline ::std::vector<OTableRow*>*   getRows() { return &m_vRowList; }
+        inline const OTypeInfoMap*          getTypeInfo() const { return &m_aTypeInfo; }
 
-        const OTypeInfo* getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; }
-        const OTypeInfo* getTypeInfoByType(sal_Int32 _nDataType) const;
+        inline TOTypeInfoSP                 getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; }
+        TOTypeInfoSP                        getTypeInfoByType(sal_Int32 _nDataType) const;
 
-        const OTypeInfo* getTypeInfoFallBack() const { return m_pTypeInfo; }
+        inline TOTypeInfoSP                 getTypeInfoFallBack() const { return m_pTypeInfo; }
 
-        virtual sal_Bool Construct(Window* pParent);
+        virtual sal_Bool                    Construct(Window* pParent);
         // XEventListener
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL               disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
 
         // ::com::sun::star::frame::XController
-        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL           suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException );
 
         // ::com::sun::star::lang::XComponent
         virtual void        SAL_CALL disposing();
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index f2ccc5471a9b..2d44dcadc06b 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignControl.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-24 09:18:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,12 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
+#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#include "IClipBoardTest.hxx"
+#endif
+#ifndef DBAUI_TYPEINFO_HXX
+#include "TypeInfo.hxx"
+#endif
 
 #define TABPAGESIZE 70
 namespace dbaui
@@ -79,6 +85,7 @@ namespace dbaui
     class OTypeInfo;
     //==================================================================
     class OTableRowView : public ::svt::EditBrowseBox
+                        ,public IClipboardTest
     {
         friend class OTableDesignUndoAct;
 
@@ -96,7 +103,7 @@ namespace dbaui
         OTableRowView(Window* pParent);
         virtual ~OTableRowView();
 
-        virtual void                SetData( long nRow, USHORT nColId, const OTypeInfo* _pTypeInfo ) = 0;
+        virtual void                SetData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ) = 0;
         virtual void                SetData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0;
         virtual ::com::sun::star::uno::Any          GetData( long nRow, USHORT nColId ) = 0;
         virtual void                SetControlText( long nRow, USHORT nColId, const String& rText ) = 0;
@@ -106,9 +113,10 @@ namespace dbaui
 
         USHORT  GetCurUndoActId(){ return m_nCurUndoActId; }
 
-        virtual void Cut();
-        virtual void Copy();
-        virtual void Paste();
+        // IClipboardTest
+        virtual void cut();
+        virtual void copy();
+        virtual void paste();
 
     protected:
         void Paste( long nRow );
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index 6dd4269dd51e..c6d3ccf2e77b 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignHelpBar.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-14 14:36:40 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,6 +70,9 @@
 #ifndef _SV_TABPAGE_HXX
 #include <vcl/tabpage.hxx>
 #endif
+#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#include "IClipBoardTest.hxx"
+#endif
 
 class MultiLineEdit;
 namespace dbaui
@@ -78,6 +81,7 @@ namespace dbaui
     // Ableitung von TabPage ist ein Trick von TH,
     // um Aenderungen der Systemfarben zu bemerken (Bug #53905)
     class OTableDesignHelpBar : public TabPage
+                                ,public IClipboardTest
     {
     private:
         String          m_sHelpText;
@@ -95,6 +99,16 @@ namespace dbaui
         String GetHelpText() const { return m_sHelpText; }
 
         virtual long PreNotify( NotifyEvent& rNEvt );
+
+        // IClipboardTest
+        virtual sal_Bool isCutAllowed();
+        virtual sal_Bool isCopyAllowed();
+        virtual sal_Bool isPasteAllowed();
+        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
+
+        virtual void copy();
+        virtual void cut();
+        virtual void paste();
     };
 
     //==================================================================
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index f96cdeec374e..0acd72e5a590 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignView.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 06:59:30 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,9 @@
 #ifndef _SV_SPLIT_HXX
 #include <vcl/split.hxx>
 #endif
+#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#include "IClipBoardTest.hxx"
+#endif
 
 namespace dbaui
 {
@@ -104,6 +107,7 @@ namespace dbaui
     };
     //==================================================================
     class OTableDesignView : public ODataView
+                            ,public IClipboardTest
     {
         enum ChildFocusState
         {
@@ -117,6 +121,7 @@ namespace dbaui
         OTableController*                   m_pController;
         ChildFocusState                     m_eChildFocus;
 
+        IClipboardTest* getActiveChild() const;
     protected:
 
 
@@ -139,11 +144,15 @@ namespace dbaui
 
         ::com::sun::star::lang::Locale      getLocale() const { return m_aLocale;}
 
+        // IClipboardTest
         virtual sal_Bool isCutAllowed();
         virtual sal_Bool isCopyAllowed();
+        virtual sal_Bool isPasteAllowed();
+        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
         virtual void copy();
         virtual void cut();
         virtual void paste();
+
         // set the view readonly or not
         virtual void setReadOnly(sal_Bool _bReadOnly);
 
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index 780f82d93256..2e102ab5dd86 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableRow.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 07:42:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,9 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
+#ifndef DBAUI_TYPEINFO_HXX
+#include "TypeInfo.hxx"
+#endif
 
 
 namespace dbaui
@@ -100,7 +103,7 @@ namespace dbaui
         inline OFieldDescription* GetActFieldDescr() const { return m_pActFieldDescr; }
         inline bool isValid() const { return GetActFieldDescr() != NULL; }
 
-        void SetFieldType( const OTypeInfo* _pType, sal_Bool _bForce = sal_False );
+        void SetFieldType( const TOTypeInfoSP& _pType, sal_Bool _bForce = sal_False );
 
         void SetPrimaryKey( BOOL bSet );
         BOOL IsPrimaryKey() const;
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 7a6d00abbdaf..2159060930c9 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindowListBox.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-03-26 09:18:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,9 +68,6 @@
 #ifndef _DBACCESS_UI_CALLBACKS_HXX_
 #include "callbacks.hxx"
 #endif
-#ifndef DBAUI_SCROLLHELPER_HXX
-#include "ScrollHelper.hxx"
-#endif
 
 struct AcceptDropEvent;
 struct ExecuteDropEvent;
@@ -102,7 +99,7 @@ namespace dbaui
         DECL_LINK( ScrollDownHdl, SvTreeListBox* );
         DECL_LINK( DropHdl, void* );
 
-        OScrollHelper               m_aScrollHelper;
+        Timer                       m_aScrollTimer;
         Point                       m_aMousePos;
 
         OTableWindow*               m_pTabWin;
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index 4456709ce814..679a5dde2251 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TypeInfo.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-18 12:04:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,9 @@
 #ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #endif
-#ifndef _MAP_
+#include <boost/shared_ptr.hpp>
 #include <map>
-#endif
+
 
 
 namespace dbaui
@@ -157,25 +157,27 @@ const sal_uInt16 TYPE_OTHER     = 30;
         {}
         sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }
         sal_Bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; }
-        ::rtl::OUString getDBName() const { return aTypeName; }
+        inline ::rtl::OUString  getDBName() const { return aTypeName; }
 
     };
 
-
-    typedef ::std::multimap<sal_Int32,OTypeInfo*> OTypeInfoMap;
+    typedef ::boost::shared_ptr<OTypeInfo>          TOTypeInfoSP;
+    typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap;
     /** return the most suitable typeinfo for a requested type
         @param  _rTypeInfo      contains a map of type to typeinfo
         @param  _nType          the requested type
         @param  _sTypeName      the typename
         @param  _nPrecision     the precision
         @param  _nScale         the scale
+        @param  _bAutoIncrement if it is a auto increment
         @param  _brForceToType  true when type was found which has some differenes
     */
-    const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
+    TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
                                sal_Int32 _nType,
                                const ::rtl::OUString& _sTypeName,
                                sal_Int32 _nPrecision,
                                sal_Int32 _nScale,
+                               sal_Bool _bAutoIncrement,
                                sal_Bool& _brForceToType);
 }
 
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index a45f7fc22b08..5614dc295f61 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UITools.hxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-14 07:53:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -329,7 +329,7 @@ namespace dbaui
         @return
             The type info which can be used to create a primary key column.
     */
-    const OTypeInfo* queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo);
+    TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo);
 
     /** query for a specific type.
         @param  _nDataType
@@ -339,7 +339,25 @@ namespace dbaui
         @return
             The type or <NULL/> if we can't find it.
     */
-    const OTypeInfo* queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rTypeInfo);
+    TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rTypeInfo);
+
+    /** returns the configuration node name of user defined drivers.
+        @return
+            the configuration node name of user defined drivers.
+    */
+    ::rtl::OUString getUserDefinedDriverNodeName();
+
+    /** returns the configuration node name of user defined driver type display name.
+        @return
+            the configuration node name of user defined driver type display name.
+    */
+    ::rtl::OUString getDriverTypeDisplayNodeName();
+
+    /** returns the configuration node name of user defined driver DSN prefix.
+        @return
+            the configuration node name of user defined driver DSN prefix.
+    */
+    ::rtl::OUString getDriverDsnPrefixNodeName();
 
 // .........................................................................
 }
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 0d8be22eb417..8132fe0bce8f 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WCopyTable.hxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 09:19:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -185,7 +185,7 @@ namespace dbaui
         DECL_LINK( ImplNextHdl  , PushButton* );
         DECL_LINK( ImplOKHdl    , OKButton* );
         DECL_LINK( ImplActivateHdl, WizardDialog* );
-        void CheckColumns();
+        sal_Bool CheckColumns(sal_Int32& _rnBreakPos);
         void loadData(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable,
                         ODatabaseExport::TColumns& _rColumns,
                         ODatabaseExport::TColumnVector& _rColVector);
@@ -220,7 +220,7 @@ namespace dbaui
         ::rtl::OUString                 m_sName;    // for a table the name is composed
         ::rtl::OUString                 m_sSourceName;
         ::rtl::OUString                 m_aKeyName;
-        OTypeInfo*                      m_pTypeInfo; // default type
+        TOTypeInfoSP                    m_pTypeInfo; // default type
     public:
         enum Wizard_Create_Style
         {
@@ -269,6 +269,12 @@ namespace dbaui
         void                AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard gel�scht
         void                RemoveWizardPage(OWizardPage* pPage); // Page goes again to user
         void                CheckButtons(); // checks which button can be disabled, enabled
+
+        void                fillTypeInfo();
+        /** has to be called after fillTypeInfo() and only when using the 1st ctor
+        */
+        void                loadData();
+
         // returns a vector where the position of a column and if the column is in the selection
         // when not the value is CONTAINER_ENTRY_NOTFOUND == (sal_uInt32)-1
         ODatabaseExport::TPositions GetColumnPositions()    const { return m_vColumnPos; }
@@ -290,10 +296,10 @@ namespace dbaui
         */
         ::rtl::OUString getPrimaryKeyName() const { return m_aKeyName; }
 
-        const OTypeInfo*    getTypeInfo(sal_Int32 _nPos)        const { return m_aTypeInfoIndex[_nPos]->second; }
+        TOTypeInfoSP        getTypeInfo(sal_Int32 _nPos)        const { return m_aTypeInfoIndex[_nPos]->second; }
         const OTypeInfoMap* getTypeInfo()                       const { return &m_aTypeInfo; }
 
-        const OTypeInfo*    getDestTypeInfo(sal_Int32 _nPos)    const { return m_aDestTypeInfoIndex[_nPos]->second; }
+        TOTypeInfoSP        getDestTypeInfo(sal_Int32 _nPos)    const { return m_aDestTypeInfoIndex[_nPos]->second; }
         const OTypeInfoMap* getDestTypeInfo()                   const { return &m_aDestTypeInfo; }
 
         ::com::sun::star::lang::Locale  GetLocale() const { return m_aLocale; }
@@ -323,7 +329,7 @@ namespace dbaui
                                             const ::rtl::OUString&  _sColumnName,
                                             const ::rtl::OUString&  _sExtraChars,
                                             sal_Int32               _nMaxNameLen);
-        const OTypeInfo* convertType(const OTypeInfo* _pType);
+        TOTypeInfoSP convertType(const TOTypeInfoSP&_pType,sal_Bool& _bNotConvert);
 
         ::rtl::OUString createUniqueName(const ::rtl::OUString& _sName);
     };
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 53ea48261f00..aa9d1239b3d2 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WTypeSelect.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-26 10:49:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,10 +102,10 @@ namespace dbaui
 
         virtual ::com::sun::star::lang::Locale  GetLocale() const;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const;
-        virtual const OTypeInfo*    getTypeInfo(sal_Int32 _nPos);
+        virtual TOTypeInfoSP        getTypeInfo(sal_Int32 _nPos);
         virtual const OTypeInfoMap* getTypeInfo() const;
-        virtual sal_Bool isAutoIncrementValueEnabled() const;
-        virtual ::rtl::OUString getAutoIncrementValue() const;
+        virtual sal_Bool            isAutoIncrementValueEnabled() const;
+        virtual ::rtl::OUString     getAutoIncrementValue() const;
 
     public:
         OWizTypeSelectControl(Window* pParent, OTableDesignHelpBar* pHelpBar=NULL);
@@ -160,6 +160,7 @@ namespace dbaui
         Image                   m_imgPKey;
         SvStream*               m_pParserStream; // stream to read the tokens from or NULL
         ::rtl::OUString         m_sAutoIncrementValue;
+        sal_Int32               m_nDisplayRow;
         sal_Bool                m_bAutoIncrementEnabled;
 
         void                    fillColumnList(sal_uInt32 nRows);
@@ -176,6 +177,8 @@ namespace dbaui
         OWizTypeSelect(Window* pParent,SvStream*    _pStream = NULL);
         virtual ~OWizTypeSelect();
 
+        inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; }
+
     };
 }
 #endif // DBAUI_WIZ_TYPESELECT_HXX
diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx
index d0c137686923..0fe1949f89ae 100644
--- a/dbaccess/source/ui/inc/callbacks.hxx
+++ b/dbaccess/source/ui/inc/callbacks.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: callbacks.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-30 13:05:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,16 +116,3 @@ namespace dbaui
 
 #endif // _DBACCESS_UI_CALLBACKS_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/03/23 10:52:50  fs
- *  new DnD implementations
- *
- *  Revision 1.1  2001/03/22 10:40:44  fs
- *  initial checkin - callbacks
- *
- *
- *  Revision 1.0 22.03.01 10:12:22  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 9a5849a7d657..0694b8884c88 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charsets.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-27 08:05:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,9 @@
 #ifndef _DBHELPER_DBCHARSET_HXX_
 #include <connectivity/dbcharset.hxx>
 #endif
+#ifndef _SVX_TXENCTAB_HXX
+#include <svx/txenctab.hxx>
+#endif
 
 //.........................................................................
 namespace dbaui
@@ -83,10 +86,10 @@ namespace dbaui
     typedef ::dbtools::OCharsetMap OCharsetDisplay_Base;
     class OCharsetDisplay
             :protected OCharsetDisplay_Base
-            ,public Resource
+            ,protected SvxTextEncodingTable
     {
-    private:
-        StringVector    m_aDisplayNames;
+    protected:
+        ::rtl::OUString m_aSystemDisplayName;
 
     public:
         class ExtendedCharsetIterator;
@@ -98,13 +101,11 @@ namespace dbaui
         OCharsetDisplay();
 
         struct IANA     { };
-        struct Logical  { };
         struct Display  { };
 
         // various find operations
         const_iterator find(const rtl_TextEncoding _eEncoding) const;
         const_iterator find(const ::rtl::OUString& _rIanaName, const IANA&) const;
-        const_iterator find(const ::rtl::OUString& _rLogicalName, const Logical&) const;
         const_iterator find(const ::rtl::OUString& _rDisplayName, const Display&) const;
 
         /// get access to the first element of the charset collection
@@ -113,6 +114,9 @@ namespace dbaui
         const_iterator  end() const;
         // size of the map
         sal_Int32   size() const { return OCharsetDisplay_Base::size(); }
+
+    protected:
+        virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const;
     };
 
     //-------------------------------------------------------------------------
@@ -130,7 +134,6 @@ namespace dbaui
 
         rtl_TextEncoding    getEncoding() const         { return CharsetDisplayDerefHelper_Base::getEncoding(); }
         ::rtl::OUString     getIanaName() const         { return CharsetDisplayDerefHelper_Base::getIanaName(); }
-        ::rtl::OUString     getName() const             { return CharsetDisplayDerefHelper_Base::getName(); }
         ::rtl::OUString     getDisplayName() const      { return m_sDisplayName; }
 
     protected:
@@ -154,7 +157,6 @@ namespace dbaui
     protected:
         const OCharsetDisplay*      m_pContainer;
         base_iterator               m_aPosition;
-        sal_Int32                   m_nPosition;    // redundant
 
     public:
         ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource);
@@ -172,7 +174,7 @@ namespace dbaui
         const ExtendedCharsetIterator   operator--(int) { ExtendedCharsetIterator hold(*this); --*this; return hold; }
 
     protected:
-        ExtendedCharsetIterator(const OCharsetDisplay* _pContainer, const base_iterator& _rPosition, const sal_Int32 _nPosition);
+        ExtendedCharsetIterator( const OCharsetDisplay* _pContainer, const base_iterator& _rPosition );
     };
 
 //.........................................................................
@@ -181,19 +183,3 @@ namespace dbaui
 
 #endif // _DBAUI_CHARSETS_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.3  2000/11/29 22:26:20  fs
- *  #80003# re-implemented, now base on dbtools::OCharsetMap
- *
- *  Revision 1.2  2000/10/11 11:31:54  fs
- *  replace unotools with comphelper
- *
- *  Revision 1.1  2000/10/05 10:07:57  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 26.09.00 12:16:37  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx
index 18cfc7d31737..7108fe2473ab 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: commontypes.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-10 12:11:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,19 +81,3 @@ namespace dbaui
 
 #endif // _DBAUI_COMMON_TYPES_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2000/10/30 14:44:34  fs
- *  moved from ../dlg
- *
- *  Revision 1.2  2000/10/26 18:06:21  fs
- *  ByteVector
- *
- *  Revision 1.1  2000/10/24 12:14:48  fs
- *  initial checkin - types commonly used in this project
- *
- *
- *  Revision 1.0 24.10.00 11:56:23  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index 6d4961910926..5eeb17789ad4 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: curledit.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-08 09:55:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,8 +106,9 @@ public:
     /// set a new text, leave the current prefix unchanged
     virtual void    SetTextNoPrefix(const String& _rText);
 
-    void    SaveValueNoPrefix()             { m_sSaveValueNoPrefix = GetTextNoPrefix(); }
-    String  GetSavedValueNoPrefix() const   { return m_sSaveValueNoPrefix; }
+    inline void     SaveValueNoPrefix()             { m_sSaveValueNoPrefix = GetTextNoPrefix(); }
+    inline String   GetSavedValueNoPrefix() const   { return m_sSaveValueNoPrefix; }
+    inline void     initializeTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) { m_aTypeCollection.initUserDriverTypes(_rxORB); }
 };
 
 //.........................................................................
@@ -116,16 +117,3 @@ public:
 
 #endif // _DBAUI_CURLEDIT_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2000/10/24 12:07:36  fs
- *  S/GetTextNoPrefix
- *
- *  Revision 1.1  2000/10/05 10:08:07  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 28.09.00 13:11:23  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx
index 46fa8da2ab1d..c62456a3f44e 100644
--- a/dbaccess/source/ui/inc/datasourceconnector.hxx
+++ b/dbaccess/source/ui/inc/datasourceconnector.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: datasourceconnector.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-15 06:44:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,13 +121,3 @@ namespace dbaui
 
 #endif // _DBAUI_DATASOURCECONNECTOR_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/05/10 12:17:24  fs
- *  initial checkin - helper class for creating a connection for a data source
- *
- *
- *  Revision 1.0 10.05.01 09:36:22  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx
index 0b9ed1b0d72d..182823321be4 100644
--- a/dbaccess/source/ui/inc/datasourcemap.hxx
+++ b/dbaccess/source/ui/inc/datasourcemap.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: datasourcemap.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-25 16:02:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -315,10 +315,3 @@ namespace dbaui
 
 #endif DBAUI_DATASOURCEMAP_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 25.06.01 16:32:23  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index f1dfd5b34fd3..3db56508b514 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.hxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-24 10:30:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -368,109 +368,3 @@ private:
 
 #endif // _DBAUI_DBADMIN_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.26  2001/09/18 14:55:45  vg
- *  #65293# changed to void type of function
- *
- *  Revision 1.25  2001/09/11 15:08:49  fs
- *  #91304# +isUIEnabled / disableUI
- *
- *  Revision 1.24  2001/08/30 16:11:51  fs
- *  #88427# +OnValidateName
- *
- *  Revision 1.23  2001/08/14 14:08:55  fs
- *  #86945# +getCurrentDataSource
- *
- *  Revision 1.22  2001/07/31 15:58:55  fs
- *  #88530# +omSingleEditFixedType
- *
- *  Revision 1.21  2001/07/30 11:31:03  fs
- *  #88530# changes to allow operating the dialog in a 'edit one single data source only' mode
- *
- *  Revision 1.20  2001/06/25 16:03:39  fs
- *  #88004# outsourced ODataSourceMap and ODataSourceSelector
- *
- *  Revision 1.19  2001/06/20 07:04:10  oj
- *  #88434# new method to get the driver
- *
- *  Revision 1.18  2001/05/29 13:11:51  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.17  2001/05/15 15:06:25  fs
- *  #86991# +prepareSwitchDatasource
- *
- *  Revision 1.16  2001/05/10 12:12:46  fs
- *  #86223# remember view settings while applying (no matter if synchron or asynchronously
- *
- *  Revision 1.15  2001/04/26 11:49:58  fs
- *  file is alive, again - added support for data source associated bookmarks
- *
- *  Revision 1.14  2001/03/29 07:44:46  fs
- *  #84826# +clearPassword
- *
- *  Revision 1.13  2001/03/27 06:59:28  oj
- *  new method createConnection and export of ORB
- *
- *  Revision 1.12  2001/03/13 10:21:25  fs
- *  #84827# #84908# allow changes to be applied without re-initializing the page (which could lead to opening a connection)
- *
- *  Revision 1.11  2001/02/20 13:15:59  fs
- *  #84151# applyChanges -> applyChangesAsync / +OnAsyncapplyChanges
- *
- *  Revision 1.10  2001/02/05 13:47:11  fs
- *  #83430# +applyChanges / +isApplyable
- *
- *  Revision 1.9  2000/11/30 08:33:51  fs
- *  #80003# changed some sal_uInt16 to sal_Int32 (need some -1's)
- *
- *  Revision 1.8  2000/11/28 13:49:41  fs
- *  #80152# +ODatasourceSelector::count
- *
- *  Revision 1.7  2000/11/28 11:45:46  oj
- *  #80827# check dbroot if dbconfig failed
- *
- *  Revision 1.6  2000/11/23 02:04:35  svesik
- *  Remove stl/ from #include statement
- *
- *  Revision 1.5  2000/11/10 17:36:50  fs
- *  small bug fixes
- *
- *  Revision 1.4  2000/10/31 08:03:33  fs
- *  +selectDataSource - supporting an initial selecting when creating as service
- *
- *  Revision 1.3  2000/10/30 08:00:23  fs
- *  +getDatasourceType / +getRelevantItems / +hasAuthentication
- *
- *  Revision 1.2  2000/10/26 07:33:19  fs
- *  fillDatasourceInfo
- *
- *  Revision 1.1  2000/10/25 12:49:01  fs
- *  moved herein from ..\dlg
- *
- *  Revision 1.7  2000/10/24 12:12:26  fs
- *  ODatasourceMap::update takes a non-constant set (to reset the ORIGINALNAME item)
- *
- *  Revision 1.6  2000/10/23 12:56:50  fs
- *  added apply functionality
- *
- *  Revision 1.5  2000/10/13 16:06:21  fs
- *  implemented the usage if the 'Info' property of the data sources / allow key usage in the data source list
- *
- *  Revision 1.4  2000/10/12 16:20:42  fs
- *  new implementations ... still under construction
- *
- *  Revision 1.3  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.2  2000/10/09 12:39:29  fs
- *  some (a lot of) new imlpementations - still under development
- *
- *  Revision 1.1  2000/10/05 10:04:54  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 20.09.00 13:09:03  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index ac7ce7813bb8..4a453ba297d8 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_resource.hrc,v $
  *
- *  $Revision: 1.80 $
+ *  $Revision: 1.81 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-14 07:53:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,6 +162,7 @@
 #define TAB_PAGE_USERADMIN              RID_PAGE_START + 16
 #define PAGE_MYSQL                      RID_PAGE_START + 17
 #define TAB_PAGE_TABLEPRIVILEGES        RID_PAGE_START + 18
+#define PAGE_USERDRIVER                 RID_PAGE_START + 19
 
 //========================================================================
 // error boxes
@@ -375,6 +376,16 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.80.2.1  2003/02/20 22:52:47  hr
+ *  INTEGRATION: CWS dba02 (1.80.18); FILE MERGED
+ *  2003/01/29 10:30:44 oj 1.80.18.1: #i11039# allow user defined driver types to appear in the data source admin dialog
+ *
+ *  Revision 1.80.18.1  2003/01/29 10:30:44  oj
+ *  #i11039# allow user defined driver types to appear in the data source admin dialog
+ *
+ *  Revision 1.80  2002/11/14 07:53:12  oj
+ *  #105110# new methods inserted
+ *
  *  Revision 1.79  2002/08/19 07:28:26  oj
  *  #99473# change string resource files
  *
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index c94765129606..b2e8377e4bfb 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: directsql.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2001-06-22 14:17:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -193,13 +193,3 @@ namespace dbaui
 
 #endif // _DBACCESS_UI_DIRECTSQL_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/06/19 10:54:55  fs
- *  initial checkin - dialog for executing SQL statements
- *
- *
- *  Revision 1.0 18.06.01 15:46:43  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx
index f73e2b93855b..4e8ef1210f37 100644
--- a/dbaccess/source/ui/inc/indexcollection.hxx
+++ b/dbaccess/source/ui/inc/indexcollection.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexcollection.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-30 14:10:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -178,16 +178,3 @@ namespace dbaui
 
 #endif // _DBAUI_INDEXCOLLECTION_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/03/19 06:01:51  fs
- *  move OIndexField and OIndex into indexes.hxx
- *
- *  Revision 1.1  2001/03/16 16:21:44  fs
- *  initial checkin - index design related classes
- *
- *
- *  Revision 1.0 07.03.01 15:07:15  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index b4d5717783f7..a1f9a341b521 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexdialog.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-30 09:45:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -238,31 +238,3 @@ namespace dbaui
 
 #endif // _DBAUI_INDEXDIALOG_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.7  2002/04/29 08:08:41  oj
- *  #98772# overload window method for hi contrast
- *
- *  Revision 1.6  2001/05/11 16:24:08  fs
- *  #86788# +m_bEditAgain / #86863# allow a drop without confirmation (mapped from resetting a new index)
- *
- *  Revision 1.5  2001/05/02 11:45:08  fs
- *  #86434# OnEditIndexAgain
- *
- *  Revision 1.4  2001/04/02 12:04:40  fs
- *  #85275# added a help button
- *
- *  Revision 1.3  2001/03/30 14:10:22  oj
- *  #85298##85297# correct index impl
- *
- *  Revision 1.2  2001/03/19 06:02:09  fs
- *  +implCheckPlausibility
- *
- *  Revision 1.1  2001/03/16 16:21:52  fs
- *  initial checkin - index design related classes
- *
- *
- *  Revision 1.0 07.03.01 11:51:22  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx
index ac811ef45f6b..2847e3701cf4 100644
--- a/dbaccess/source/ui/inc/indexes.hxx
+++ b/dbaccess/source/ui/inc/indexes.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexes.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-19 06:02:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -139,10 +139,3 @@ namespace dbaui
 
 #endif // _DBAUI_INDEXES_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 19.03.01 06:35:23  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index ad12f4da728a..b427fdfc6b69 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexfieldscontrol.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-09 07:43:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -142,25 +142,3 @@ namespace dbaui
 
 #endif // _DBAUI_INDEXFIELDSCONTROL_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2002/03/19 07:21:30  oj
- *  #97274# disable traveling with tab to allow control change
- *
- *  Revision 1.4  2001/06/29 08:35:25  fs
- *  #86721# DbBrowseBox replaced by svt::EditBrowseBox
- *
- *  Revision 1.3  2001/05/02 11:47:20  fs
- *  #86464# +IsModified
- *
- *  Revision 1.2  2001/03/30 14:10:22  oj
- *  #85298##85297# correct index impl
- *
- *  Revision 1.1  2001/03/16 16:22:00  fs
- *  initial checkin - index design related classes
- *
- *
- *  Revision 1.0 07.03.01 14:21:34  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index 2d7022d4c48c..dc2d22ee5e2b 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: linkeddocuments.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 06:53:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -148,16 +148,3 @@ namespace dbaui
 
 #endif // _DBAUI_LINKEDDOCUMENTS_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/08/16 14:08:29  fs
- *  #88813# +newFormWithPilot
- *
- *  Revision 1.1  2001/04/26 11:52:20  fs
- *  initial checkin - access to the data source associated bookmarks
- *
- *
- *  Revision 1.0 24.04.01 14:53:19  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 0f35ea8e607f..4f266834c6e4 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: listviewitems.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-30 08:29:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,10 +102,3 @@ namespace dbaui
 
 #endif // _DBAUI_LISTVIEWITEMS_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 29.01.01 10:24:30  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx
index 8e82441ab932..660d2dd117f0 100644
--- a/dbaccess/source/ui/inc/localresaccess.hxx
+++ b/dbaccess/source/ui/inc/localresaccess.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: localresaccess.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 10:08:35 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,15 +62,12 @@
 #ifndef _DBAUI_LOCALRESACCESS_HXX_
 #define _DBAUI_LOCALRESACCESS_HXX_
 
-#ifndef _TOOLS_RC_HXX
-#include <tools/rc.hxx>
-#endif
-#ifndef _TOOLS_RCID_H
-#include <tools/rcid.h>
-#endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
+#ifndef _SVTOOLS_LOCALRESACCESS_HXX_
+#include <svtools/localresaccess.hxx>
+#endif
 
 //.........................................................................
 namespace dbaui
@@ -82,17 +79,13 @@ namespace dbaui
 //=========================================================================
 /** helper class for acessing local resources
 */
-class OLocalResourceAccess : public Resource
+typedef ::svt::OLocalResourceAccess LRA_Base;
+class OLocalResourceAccess : protected LRA_Base
 {
 public:
-    OLocalResourceAccess(sal_uInt16 _nId, RESOURCE_TYPE _rType)
-        :Resource(ModuleRes(_nId).SetRT(_rType).SetAutoRelease(sal_False))
-    {
-    }
-    ~OLocalResourceAccess()
+    inline OLocalResourceAccess( sal_uInt16 _nId, RESOURCE_TYPE _rType )
+        :LRA_Base( ModuleRes( _nId ), _rType )
     {
-        OModule::getResManager()->Increment(OModule::getResManager()->GetRemainSize());
-        FreeResource();
     }
 };
 
@@ -102,10 +95,3 @@ public:
 
 #endif // _DBAUI_LOCALRESACCESS_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 28.09.00 10:43:07  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index b961128d20f1..cec57df61642 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: marktree.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-29 08:13:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -117,22 +117,3 @@ private:
 
 #endif // _DBAUI_MARKTREE_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.4  2001/04/27 08:09:23  fs
- *  +implDeterminedState - needed to correctly implement CheckButtons
- *
- *  Revision 1.3  2001/01/30 08:28:00  fs
- *  +checkedButton_noBroadcast
- *
- *  Revision 1.2  2000/10/09 12:41:31  fs
- *  use a different font when painting a disabled control
- *
- *  Revision 1.1  2000/10/05 10:08:43  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 28.09.00 13:19:31  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx
index 0ad8ed7c8464..f6432efe3424 100644
--- a/dbaccess/source/ui/inc/moduledbu.hxx
+++ b/dbaccess/source/ui/inc/moduledbu.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moduledbu.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-26 14:53:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -139,13 +139,3 @@ public:
 
 #endif // _DBAUI_MODULE_DBU_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2000/10/05 10:08:51  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 20.09.00 15:26:10  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 8db49d343097..12d375d324a8 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paramdialog.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:26:32 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -182,22 +182,3 @@ namespace dbaui
 
 #endif // _DBAUI_PARAMDIALOG_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.4  2002/04/09 14:45:02  fs
- *  #98181# use a ::dbtools::OPredicateInputController
- *
- *  Revision 1.3  2001/06/07 15:09:31  fs
- *  #87912# redesigned the dialog
- *
- *  Revision 1.2  2000/10/27 08:07:40  fs
- *  OSQLParser interface was changed - adjustments
- *
- *  Revision 1.1  2000/10/26 18:08:45  fs
- *  initial checkin - parameter dialog
- *
- *
- *  Revision 1.0 26.10.00 11:54:07  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx
index 4e6f4dfe1152..0a878a1d67e1 100644
--- a/dbaccess/source/ui/inc/propertysetitem.hxx
+++ b/dbaccess/source/ui/inc/propertysetitem.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertysetitem.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-05 14:00:46 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,11 +103,3 @@ namespace dbaui
 
 #endif // _DBAUI_PROPERTYSETITEM_HXX_
 
-
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 05.02.01 13:45:50  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 53491321d584..7328a805808e 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontainerwindow.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-06 09:30:35 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -169,19 +169,3 @@ namespace dbaui
 
 #endif // DBAUI_QUERYCONTAINERWINDOW_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.3  2001/10/23 12:30:27  oj
- *  #93566# slot fixes
- *
- *  Revision 1.2  2001/09/27 06:19:05  oj
- *  #92325# impl new sql functions
- *
- *  Revision 1.1  2001/08/23 14:25:36  fs
- *  initial checkin - outsourced from QueryTextView.hxx (the container window for the query design)
- *
- *
- *  Revision 1.0 23.08.01 12:08:57  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index fc80e0a861f9..ce226dcfc447 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbagrid.hxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-31 12:49:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,7 +102,7 @@ namespace dbaui
     //------------------------------------------------------------------
     struct SbaURLCompare : public binary_function< ::com::sun::star::util::URL, ::com::sun::star::util::URL, bool>
     {
-        bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const {return x.Complete < y.Complete ? true : false;}
+        bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const {return x.Complete == y.Complete ? true : false;}
     };
 
     struct SbaURLHash
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index 52c9ce16d662..3e9c8e4f4fe3 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlmessage.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 10:09:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -181,10 +181,3 @@ private:
 
 #endif // _DBAUI_SQLMESSAGE_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 02.10.00 12:29:04  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx
index dda37099ba06..bab5b54176c0 100644
--- a/dbaccess/source/ui/inc/stringlistitem.hxx
+++ b/dbaccess/source/ui/inc/stringlistitem.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: stringlistitem.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 10:09:14 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,10 +104,3 @@ public:
 
 #endif // _DBAUI_STRINGLISTITEM_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 02.10.00 10:57:48  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 36fb19465880..f8c6751ac4bb 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabletree.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-29 08:19:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -203,34 +203,3 @@ protected:
 
 #endif // _DBAUI_TABLETREE_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.8  2001/08/28 08:20:14  fs
- *  #91573# UpdateTableList returns the driver used for connecting
- *
- *  Revision 1.7  2001/08/14 14:10:59  fs
- *  #86945# removed the tables container parameter from UpdateTableList
- *
- *  Revision 1.6  2001/08/14 12:00:23  fs
- *  preparations for #86945#
- *
- *  Revision 1.5  2001/06/05 12:39:02  fs
- *  #87680# implEmphasize signature changed
- *
- *  Revision 1.4  2001/02/05 14:45:04  oj
- *  new member for hiding first entry
- *
- *  Revision 1.3  2001/01/30 08:28:15  fs
- *  'wildcard checking'
- *
- *  Revision 1.2  2000/10/30 15:20:02  fs
- *  #79816# second UpdateTableList got other parameters
- *
- *  Revision 1.1  2000/10/05 10:09:23  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 28.09.00 13:15:45  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx
index 3e705f0a0e1f..8075c87ec1a3 100644
--- a/dbaccess/source/ui/inc/unoadmin.hxx
+++ b/dbaccess/source/ui/inc/unoadmin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoadmin.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: fs $ $Date: 2001-07-30 11:30:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -142,31 +142,3 @@ private:
 
 #endif // _DBAUI_UNOADMIN_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2001/06/18 12:34:56  fs
- *  #88389# OGenericUnoDialog moved to svtools
- *
- *  Revision 1.4  2001/05/17 09:16:15  fs
- *  #86511# hold the type collection as pointer, not as object - allows construction in createDialog, where it can be guarded by the solar mutex
- *
- *  Revision 1.3  2000/11/01 16:31:30  fs
- *  migrated from awt::XDialog to ui::XExecutableDialog / removed the star* namespace shortcuts
- *
- *  Revision 1.2  2000/10/31 08:07:47  fs
- *  support an initial selection
- *
- *  Revision 1.1  2000/10/25 12:49:14  fs
- *  moved herein from ..\dlg
- *
- *  Revision 1.2  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.1  2000/10/05 10:07:32  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 20.09.00 12:15:14  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 00d8cef45563..f8912f7bc396 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unosqlmessage.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-18 12:34:56 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,22 +123,3 @@ protected:
 
 #endif // _DBAUI_UNOSQLMESSAGE_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2000/11/01 16:31:30  fs
- *  migrated from awt::XDialog to ui::XExecutableDialog / removed the star* namespace shortcuts
- *
- *  Revision 1.1  2000/10/25 12:49:21  fs
- *  moved herein from ..\dlg
- *
- *  Revision 1.2  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.1  2000/10/05 10:07:51  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 02.10.00 13:59:31  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 86f981123492..b5d9e8be94c5 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DExport.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -155,6 +155,16 @@
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
 #include <svtools/syslocale.hxx>
 #endif
+#ifndef _DBHELPER_DBEXCEPTION_HXX_
+#include <connectivity/dbexception.hxx>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_
+#include <com/sun/star/sdbc/SQLWarning.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
+#include <com/sun/star/sdb/SQLContext.hpp>
+#endif
+
 
 #define CONTAINER_ENTRY_NOTFOUND    ((ULONG)0xFFFFFFFF)
 
@@ -285,7 +295,7 @@ ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection,
             sal_Int16 nType = xRow->getShort(2);
             if( nType == DataType::VARCHAR)
             {
-                m_pTypeInfo                 = new OTypeInfo();
+                m_pTypeInfo                 = TOTypeInfoSP(new OTypeInfo());
                 m_pTypeInfo->aTypeName      = sTypeName;
                 m_pTypeInfo->nType          = nType;
                 m_pTypeInfo->nPrecision     = xRow->getInt (3);
@@ -311,7 +321,6 @@ ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection,
 //---------------------------------------------------------------------------
 ODatabaseExport::~ODatabaseExport()
 {
-    delete m_pTypeInfo;
     DBG_DTOR(ODatabaseExport,NULL);
 }
 //------------------------------------------------------------------------------
@@ -669,49 +678,72 @@ sal_Bool ODatabaseExport::createRowSet()
 sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _sTableName,const Any& _aTextColor,const FontDescriptor& _rFont)
 {
     sal_Bool bError = sal_False;
-    OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory);
+    try
+    {
+        OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory);
+        aWizard.fillTypeInfo();
 
-    OCopyTable*         pPage1 = new OCopyTable(&aWizard,COPY, sal_False,OCopyTableWizard::WIZARD_DEF_DATA);
-    OWizNameMatching*   pPage2 = new OWizNameMatching(&aWizard);
-    OWizColumnSelect*   pPage3 = new OWizColumnSelect(&aWizard);
-    OWizTypeSelect*     pPage4 = createPage(&aWizard);
+        OCopyTable*         pPage1 = new OCopyTable(&aWizard,COPY, sal_False,OCopyTableWizard::WIZARD_DEF_DATA);
+        OWizNameMatching*   pPage2 = new OWizNameMatching(&aWizard);
+        OWizColumnSelect*   pPage3 = new OWizColumnSelect(&aWizard);
+        OWizTypeSelect*     pPage4 = createPage(&aWizard);
 
-    aWizard.AddWizardPage(pPage1);
-    aWizard.AddWizardPage(pPage2);
-    aWizard.AddWizardPage(pPage3);
-    aWizard.AddWizardPage(pPage4);
+        aWizard.AddWizardPage(pPage1);
+        aWizard.AddWizardPage(pPage2);
+        aWizard.AddWizardPage(pPage3);
+        aWizard.AddWizardPage(pPage4);
 
-    aWizard.ActivatePage();
+        aWizard.ActivatePage();
 
-    if (aWizard.Execute())
-    {
-        switch(aWizard.getCreateStyle())
+        if (aWizard.Execute())
         {
-            case OCopyTableWizard::WIZARD_DEF_DATA:
-            case OCopyTableWizard::WIZARD_APPEND_DATA:
-                {
-                    m_xTable = aWizard.createTable();
-                    bError = !m_xTable.is();
-                    if(m_xTable.is())
+            switch(aWizard.getCreateStyle())
+            {
+                case OCopyTableWizard::WIZARD_DEF_DATA:
+                case OCopyTableWizard::WIZARD_APPEND_DATA:
                     {
-                        m_xTable->setPropertyValue(PROPERTY_FONT,makeAny(_rFont));
-                        if(_aTextColor.hasValue())
-                            m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,_aTextColor);
+                        m_xTable = aWizard.createTable();
+                        bError = !m_xTable.is();
+                        if(m_xTable.is())
+                        {
+                            m_xTable->setPropertyValue(PROPERTY_FONT,makeAny(_rFont));
+                            if(_aTextColor.hasValue())
+                                m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,_aTextColor);
+                        }
+                        m_bIsAutoIncrement  = aWizard.isAutoincrementEnabled();
+                        m_vColumns          = aWizard.GetColumnPositions();
+                        m_vColumnTypes      = aWizard.GetColumnTypes();
                     }
-                    m_bIsAutoIncrement  = aWizard.isAutoincrementEnabled();
-                    m_vColumns          = aWizard.GetColumnPositions();
-                    m_vColumnTypes      = aWizard.GetColumnTypes();
-                }
-                break;
-            default:
-                bError = sal_True; // there is no error but I have nothing more to do
+                    break;
+                default:
+                    bError = sal_True; // there is no error but I have nothing more to do
+            }
         }
+        else
+            bError = sal_True;
+
+        if(!bError)
+            bError = !createRowSet();
     }
-    else
+    catch(SQLContext& e)
+    {
+        ::dbaui::showError(::dbtools::SQLExceptionInfo(e),NULL,m_xFactory);
         bError = sal_True;
-
-    if(!bError)
-        bError = !createRowSet();
+    }
+    catch(SQLWarning& e)
+    {
+        ::dbaui::showError(::dbtools::SQLExceptionInfo(e),NULL,m_xFactory);
+        bError = sal_True;
+    }
+    catch(SQLException& e)
+    {
+        ::dbaui::showError(::dbtools::SQLExceptionInfo(e),NULL,m_xFactory);
+        bError = sal_True;
+    }
+    catch(Exception& )
+    {
+        OSL_ENSURE(sal_False, "ODatabaseExport::executeWizard: caught a generic exception!");
+    }
 
     return bError;
 }
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index d3bc7b8446f3..5846d7aa1ea3 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TokenWriter.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-25 08:32:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -668,7 +668,7 @@ OHTMLImportExport::OHTMLImportExport(const ODataAccessDescriptor& _aDataDescript
     ,m_bCheckFont(FALSE)
 #endif
 {
-    strcpy( sIndent, sIndentSource );
+    strncpy( sIndent, sIndentSource ,std::min(sizeof(sIndent),sizeof(sIndentSource)));
     sIndent[0] = 0;
 }
 //-------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 2323e5f0f5ea..34c075dbdf40 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UITools.cxx,v $
  *
- *  $Revision: 1.44 $
+ *  $Revision: 1.45 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-29 12:29:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -405,14 +405,15 @@ void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference<
 }
 // -----------------------------------------------------------------------------
 
-const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
+TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
                                sal_Int32 _nType,
                                const ::rtl::OUString& _sTypeName,
                                sal_Int32 _nPrecision,
                                sal_Int32 _nScale,
+                               sal_Bool _bAutoIncrement,
                                sal_Bool& _brForceToType)
 {
-    const OTypeInfo* pTypeInfo = NULL;
+    TOTypeInfoSP pTypeInfo;
     _brForceToType = sal_False;
     // search for type
     ::std::pair<OTypeInfoMap::const_iterator, OTypeInfoMap::const_iterator> aPair = _rTypeInfo.equal_range(_nType);
@@ -423,15 +424,17 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
         {
             // search the best matching type
     #ifdef DBG_UTIL
-            ::rtl::OUString sDBTypeName = aIter->second->aTypeName;
-            sal_Int32       nDBTypePrecision = aIter->second->nPrecision;
-            sal_Int32       nDBTypeScale = aIter->second->nMaximumScale;
+            ::rtl::OUString sDBTypeName         = aIter->second->aTypeName;
+            sal_Int32       nDBTypePrecision    = aIter->second->nPrecision;
+            sal_Int32       nDBTypeScale        = aIter->second->nMaximumScale;
+            sal_Bool        bDBAutoIncrement    = aIter->second->bAutoIncrement;
     #endif
             if  (   (   !_sTypeName.getLength()
                     ||  (aIter->second->aTypeName.equalsIgnoreAsciiCase(_sTypeName))
                     )
                 &&  (aIter->second->nPrecision      >= _nPrecision)
                 &&  (aIter->second->nMaximumScale   >= _nScale)
+                &&  (aIter->second->bAutoIncrement  == _bAutoIncrement)
                 )
                 break;
         }
@@ -440,10 +443,13 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
         {
             for(aIter = aPair.first; aIter != aPair.second; ++aIter)
             {
+                sal_Int32 nPrec = aIter->second->nPrecision;
+                sal_Int32 nScale = aIter->second->nMaximumScale;
                 // search the best matching type (now comparing the local names)
                 if  (   (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName))
-                    &&  (aIter->second->nPrecision      >= _nPrecision)
-                    &&  (aIter->second->nMaximumScale   >= _nScale)
+                    &&  (nPrec  >= _nPrecision)
+                    &&  (nScale >= _nScale)
+                    &&  (aIter->second->bAutoIncrement  == _bAutoIncrement)
                     )
                 {
 // we can not assert here because we could be in d&d
@@ -473,8 +479,56 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
                 +=  ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding())
                 +=  ::rtl::OString(")! Defaulting to the first matching type.")).getStr());
 */
-            pTypeInfo = aPair.first->second;
-            _brForceToType = sal_True;
+            for(aIter = aPair.first; aIter != aPair.second; ++aIter)
+            {
+                // search the best matching type (now comparing the local names)
+#ifdef DBG_UTIL
+                ::rtl::OUString sDBTypeName = aIter->second->aTypeName;
+#endif
+                sal_Int32 nPrec = aIter->second->nPrecision;
+                sal_Int32 nScale = aIter->second->nMaximumScale;
+                if  (   (nPrec  >= _nPrecision)
+                    &&  (nScale >= _nScale)
+                    &&  (aIter->second->bAutoIncrement  == _bAutoIncrement)
+                    )
+                    break;
+            }
+        }
+        if (aIter == aPair.second)
+        {
+            if ( _bAutoIncrement )
+            {
+                for(aIter = aPair.first; aIter != aPair.second; ++aIter)
+                {
+                    // search the best matching type (now comparing the local names)
+#ifdef DBG_UTIL
+                    ::rtl::OUString sDBTypeName = aIter->second->aTypeName;
+#endif
+                    sal_Int32 nScale = aIter->second->nMaximumScale;
+                    if  (   (nScale >= _nScale)
+                        &&  (aIter->second->bAutoIncrement  == _bAutoIncrement)
+                        )
+                        break;
+                }
+                if ( aIter == aPair.second )
+                {
+                    // try it without the auto increment flag
+                    pTypeInfo = getTypeInfoFromType(_rTypeInfo,
+                                   _nType,
+                                   _sTypeName,
+                                   _nPrecision,
+                                   _nScale,
+                                   sal_False,
+                                   _brForceToType);
+                }
+                else
+                    pTypeInfo = aIter->second;
+            }
+            else
+            {
+                pTypeInfo = aPair.first->second;
+                _brForceToType = sal_True;
+            }
         }
         else
             pTypeInfo = aIter->second;
@@ -483,17 +537,16 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
     {
         ::comphelper::TStringMixEqualFunctor aCase(sal_False);
         // search for typeinfo where the typename is equal _sTypeName
-        OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(),
-                                                            _rTypeInfo.end(),
-                                                            ::std::compose1(
-                                                                ::std::bind2nd(aCase, _sTypeName),
-                                                                ::std::compose1(
-                                                                    ::std::mem_fun(&OTypeInfo::getDBName),
-                                                                    ::std::select2nd<OTypeInfoMap::value_type>())
-                                                                )
-                                                            );
-        if(aFind != _rTypeInfo.end())
-            pTypeInfo = aFind->second;
+        OTypeInfoMap::const_iterator aIter = _rTypeInfo.begin();
+        OTypeInfoMap::const_iterator aEnd  = _rTypeInfo.end();
+        for (; aIter != aEnd ; ++aIter)
+        {
+            if ( aCase(aIter->second->getDBName() , _sTypeName) )
+                break;
+        }
+
+        if ( aIter != aEnd )
+            pTypeInfo = aIter->second;
     }
 
 // we can not assert here because we could be in d&d
@@ -518,7 +571,7 @@ void fillTypeInfo(  const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo
         // Loop on the result set until we reach end of file
         while (xRs->next())
         {
-            OTypeInfo* pInfo = new OTypeInfo();
+            TOTypeInfoSP pInfo(new OTypeInfo());
             pInfo->aTypeName        = xRow->getString (1);
             pInfo->nType            = xRow->getShort (2);
             pInfo->nPrecision       = xRow->getInt (3);
@@ -1290,9 +1343,9 @@ void setEvalDateFormatForFormatter(Reference< XNumberFormatter >& _rxFormatter)
     }
 }
 // -----------------------------------------------------------------------------
-const OTypeInfo* queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo)
+TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo)
 {
-    const OTypeInfo* pTypeInfo = NULL;
+    TOTypeInfoSP pTypeInfo;
     // first we search for a type which supports autoIncrement
     OTypeInfoMap::const_iterator aIter = _rTypeInfo.begin();
     OTypeInfoMap::const_iterator aEnd  = _rTypeInfo.end();
@@ -1309,27 +1362,47 @@ const OTypeInfo* queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo)
                 pTypeInfo = aIter->second; // alternative
                 break;
             }
-            else if ( !pTypeInfo && aIter->second->nType == DataType::DOUBLE )
+            else if ( !pTypeInfo.get() && aIter->second->nType == DataType::DOUBLE )
                 pTypeInfo = aIter->second; // alternative
-            else if ( !pTypeInfo && aIter->second->nType == DataType::REAL )
+            else if ( !pTypeInfo.get() && aIter->second->nType == DataType::REAL )
                 pTypeInfo = aIter->second; // alternative
         }
     }
-    if ( !pTypeInfo ) // just a fallback
+    if ( !pTypeInfo.get() ) // just a fallback
         pTypeInfo = queryTypeInfoByType(DataType::VARCHAR,_rTypeInfo);
 
-    OSL_ENSURE(pTypeInfo,"checkColumns: cann't find a type which is useable as a key!");
+    OSL_ENSURE(pTypeInfo.get(),"checkColumns: cann't find a type which is useable as a key!");
     return pTypeInfo;
 }
 // -----------------------------------------------------------------------------
-const OTypeInfo* queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rTypeInfo)
+TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rTypeInfo)
 {
     OTypeInfoMap::const_iterator aIter = _rTypeInfo.find(_nDataType);
     if(aIter != _rTypeInfo.end())
         return aIter->second;
     OSL_ENSURE(0,"Wrong DataType supplied!");
-    return NULL;
+    return TOTypeInfoSP();
 }
+// -----------------------------------------------------------------------------
+::rtl::OUString getUserDefinedDriverNodeName()
+{
+    static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/UserDefinedDriverSettings"));
+    return s_sNodeName;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString getDriverTypeDisplayNodeName()
+{
+    static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverTypeDisplayName"));
+    return s_sNodeName;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString getDriverDsnPrefixNodeName()
+{
+    static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverDsnPrefix"));
+    return s_sNodeName;
+}
+// -----------------------------------------------------------------------------
+
 // .........................................................................
 }
 // .........................................................................
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 410c4d810429..bf9f8b8098c1 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WCPage.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -411,17 +411,18 @@ sal_Bool OCopyTable::checkAppendData()
         ODatabaseExport::TColumnVector::const_iterator aDestIter    = pDestColumns->begin();
         m_pParent->m_vColumnPos.reserve(pDestColumns->size()+1);
         m_pParent->m_vColumnTypes.reserve(pDestColumns->size()+1);
+        sal_Bool bNotConvert;
         for(sal_Int32 nPos = 1;aDestIter != pDestColumns->end();++aDestIter,++nPos)
         {
             m_pParent->m_vColumnPos.push_back( ODatabaseExport::TPositions::value_type(nPos,nPos) );
-            const OTypeInfo* pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo());
-            if(pTypeInfo)
+            TOTypeInfoSP pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo(),bNotConvert);
+            if ( pTypeInfo.get() )
                 m_pParent->m_vColumnTypes.push_back(pTypeInfo->nType);
             else
                 m_pParent->m_vColumnTypes.push_back(DataType::VARCHAR);
         }
     }
-    if(!m_pParent->m_xDestObject.is())
+    if ( !m_pParent->m_xDestObject.is() )
     {
         ErrorBox(this, ModuleRes(ERROR_INVALID_TABLE_NAME)).Execute();
         return sal_False;
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index a7ba85a71a04..5e01c88b7de5 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WColumnSelect.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:51:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -181,7 +181,7 @@ void OWizColumnSelect::Reset()
         m_lbOrgColumnNames.SetEntryData(nPos,(*aIter)->second);
     }
 
-    m_pParent->clearDestColumns();
+    // m_pParent->clearDestColumns();
 
     if(m_lbOrgColumnNames.GetEntryCount())
         m_lbOrgColumnNames.SelectEntryPos(0);
@@ -360,8 +360,9 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox,
                                                                 _nMaxNameLen);
     OFieldDescription* pNewField = new OFieldDescription(*_pSrcField);
     pNewField->SetName(sConvertedName);
-    pNewField->SetType(m_pParent->convertType(_pSrcField->getTypeInfo()));
-    if(!m_pParent->supportsPrimaryKey())
+    sal_Bool bNotConvert;
+    pNewField->SetType(m_pParent->convertType(_pSrcField->getTypeInfo(),bNotConvert));
+    if ( !m_pParent->supportsPrimaryKey() )
         pNewField->SetPrimaryKey(sal_False);
 
     _pListbox->SetEntryData(_pListbox->InsertEntry(sConvertedName),pNewField);
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 18e64d537f24..a96c80b76e3a 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WCopyTable.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,6 +131,9 @@
 #ifndef _SV_WAITOBJ_HXX
 #include <vcl/waitobj.hxx>
 #endif
+#ifndef DBAUI_WIZ_TYPESELECT_HXX
+#include "WTypeSelect.hxx"
+#endif
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -197,8 +200,6 @@ OCopyTableWizard::OCopyTableWizard(Window * pParent,
             _xSourceObject->getPropertyValue(PROPERTY_NAME)         >>= m_sSourceName;
         m_sName = m_sSourceName;
     }
-    loadData(m_xSourceObject,m_vSourceColumns,m_vSourceVec); // create the field description
-
 }
 // -----------------------------------------------------------------------------
 OCopyTableWizard::OCopyTableWizard(Window * pParent,
@@ -261,9 +262,7 @@ void OCopyTableWizard::construct()
 
     FreeResource();
 
-    ::dbaui::fillTypeInfo(m_xSourceConnection,m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex);
-    ::dbaui::fillTypeInfo(m_xConnection,m_sTypeNames,m_aDestTypeInfo,m_aDestTypeInfoIndex);
-    m_pTypeInfo = new OTypeInfo();
+    m_pTypeInfo = TOTypeInfoSP(new OTypeInfo());
     m_pTypeInfo->aUIName = m_sTypeNames.GetToken(TYPE_OTHER);
 }
 //------------------------------------------------------------------------
@@ -283,21 +282,9 @@ OCopyTableWizard::~OCopyTableWizard()
 
     // clear the type information
     m_aTypeInfoIndex.clear();
-    OTypeInfoMap::iterator aIter = m_aTypeInfo.begin();
-    for(;aIter != m_aTypeInfo.end();++aIter)
-        delete aIter->second;
-
     m_aTypeInfo.clear();
-
-    m_aDestTypeInfoIndex.clear();
-    aIter = m_aDestTypeInfo.begin();
-    for(;aIter != m_aDestTypeInfo.end();++aIter)
-        delete aIter->second;
-
     m_aDestTypeInfoIndex.clear();
 
-    DELETEZ(m_pTypeInfo);
-
     DBG_DTOR(OCopyTableWizard,NULL);
 }
 // -----------------------------------------------------------------------
@@ -339,8 +326,9 @@ IMPL_LINK( OCopyTableWizard, ImplNextHdl, PushButton*, EMPTYARG )
     return 0;
 }
 // -----------------------------------------------------------------------
-void OCopyTableWizard::CheckColumns()
+sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
 {
+    sal_Bool bRet = sal_True;
     m_vColumnPos.clear();
     m_vColumnTypes.clear();
 
@@ -357,14 +345,13 @@ void OCopyTableWizard::CheckColumns()
         if ( bPKeyAllowed && isAutoincrementEnabled() )
         {
             // add extra column for the primary key
-            const OTypeInfo* pTypeInfo = queryPrimaryKeyType(m_aDestTypeInfo);
-            if ( pTypeInfo )
+            TOTypeInfoSP pTypeInfo = queryPrimaryKeyType(m_aDestTypeInfo);
+            if ( pTypeInfo.get() )
             {
                 OFieldDescription* pField = new OFieldDescription();
                 pField->SetName(m_aKeyName);
                 pField->FillFromTypeInfo(pTypeInfo,sal_True,sal_True);
                 pField->SetPrimaryKey(sal_True);
-                pField->SetIsNullable(ColumnValue::NO_NULLS);
                 insertColumn(0,pField);
                 m_vColumnPos.push_back(ODatabaseExport::TPositions::value_type(1,1));
                 m_vColumnTypes.push_back(pField->GetType());
@@ -398,11 +385,12 @@ void OCopyTableWizard::CheckColumns()
             sal_Int32 nMaxNameLen       = getMaxColumnNameLength();
 
             ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin();
-            for(;aSrcIter != m_vSourceVec.end();++aSrcIter)
+            for(_rnBreakPos=0;aSrcIter != m_vSourceVec.end() && bRet ;++aSrcIter,++_rnBreakPos)
             {
                 OFieldDescription* pField = new OFieldDescription(*(*aSrcIter)->second);
                 pField->SetName(convertColumnName(TExportColumnFindFunctor(&m_vDestColumns),(*aSrcIter)->first,sExtraChars,nMaxNameLen));
-                pField->SetType(convertType((*aSrcIter)->second->getTypeInfo()));
+                TOTypeInfoSP pType = convertType((*aSrcIter)->second->getTypeInfo(),bRet);
+                pField->SetType(pType);
                 if ( !bPKeyAllowed )
                     pField->SetPrimaryKey(sal_False);
 
@@ -413,6 +401,7 @@ void OCopyTableWizard::CheckColumns()
             }
         }
     }
+    return bRet;
 }
 // -----------------------------------------------------------------------
 IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG )
@@ -428,14 +417,26 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG )
             case WIZARD_DEF_DATA:
             case WIZARD_DEF:
             {
-                if( GetCurLevel() == 0 )
+                sal_Bool bOnFirstPage;
+                if ( bOnFirstPage = (GetCurLevel() == 0) )
                 {
                     // we came from the first page so we have to clear
                     // all column information already collected
                     clearDestColumns();
                     m_mNameMapping.clear();
                 }
-                CheckColumns();
+                sal_Int32 nBreakPos = 0;
+                sal_Bool bCheckOk = CheckColumns(nBreakPos);
+                if ( bOnFirstPage && !bCheckOk )
+                {
+                    OWizTypeSelect* pPage = reinterpret_cast<OWizTypeSelect*>(GetPage(3));
+                    if ( pPage )
+                    {
+                        pPage->setDisplayRow(nBreakPos);
+                        ShowPage(3);
+                        return 0;
+                    }
+                }
                 break;
             }
             case WIZARD_APPEND_DATA:
@@ -589,6 +590,7 @@ void OCopyTableWizard::loadData(const Reference<XPropertySet>& _xTable,
                 sal_Int32 nType         = 0;
                 sal_Int32 nScale        = 0;
                 sal_Int32 nPrecision    = 0;
+                sal_Bool bAutoIncrement = sal_False;
                 ::rtl::OUString sTypeName;
 
                 // get the properties from the column
@@ -596,12 +598,13 @@ void OCopyTableWizard::loadData(const Reference<XPropertySet>& _xTable,
                 xColumn->getPropertyValue(PROPERTY_TYPE)            >>= nType;
                 xColumn->getPropertyValue(PROPERTY_SCALE)           >>= nScale;
                 xColumn->getPropertyValue(PROPERTY_PRECISION)       >>= nPrecision;
+                xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement;
 
                 pActFieldDescr = new OFieldDescription(xColumn);
                 // search for type
                 sal_Bool bForce;
-                const OTypeInfo* pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,nPrecision,nScale,bForce);
-                if ( !pTypeInfo )
+                TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,nPrecision,nScale,bAutoIncrement,bForce);
+                if ( !pTypeInfo.get() )
                     pTypeInfo = m_pTypeInfo;
 
                 pActFieldDescr->FillFromTypeInfo(pTypeInfo,sal_True,sal_False);
@@ -618,8 +621,11 @@ void OCopyTableWizard::loadData(const Reference<XPropertySet>& _xTable,
                 for(;pKeyBegin != pKeyEnd;++pKeyBegin)
                 {
                     ODatabaseExport::TColumns::iterator aIter = _rColumns.find(*pKeyBegin);
-                    if(aIter != _rColumns.end())
+                    if ( aIter != _rColumns.end() )
+                    {
                         aIter->second->SetPrimaryKey(sal_True);
+                        aIter->second->SetIsNullable(ColumnValue::NO_NULLS);
+                    }
                 }
             }
         }
@@ -921,8 +927,14 @@ sal_Bool OCopyTableWizard::supportsPrimaryKey() const
     sal_Bool bAllowed = sal_False;
     if(m_xConnection.is())
     {
-        Reference< XDatabaseMetaData >  xMetaData(m_xConnection->getMetaData());
-        bAllowed = xMetaData.is() && xMetaData->supportsCoreSQLGrammar();
+        try
+        {
+            Reference< XDatabaseMetaData >  xMetaData(m_xConnection->getMetaData());
+            bAllowed = xMetaData.is() && xMetaData->supportsCoreSQLGrammar();
+        }
+        catch(const Exception&)
+        {
+        }
     }
     return bAllowed;
 }
@@ -932,8 +944,14 @@ sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const
     sal_Int32 nLen = 0;
     if(m_xConnection.is())
     {
-        Reference< XDatabaseMetaData >  xMetaData(m_xConnection->getMetaData());
-        nLen = xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0;
+        try
+        {
+            Reference< XDatabaseMetaData >  xMetaData(m_xConnection->getMetaData());
+            nLen = xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0;
+        }
+        catch(const Exception&)
+        {
+        }
     }
     return nLen;
 }
@@ -987,18 +1005,20 @@ OCopyTableWizard::Wizard_Create_Style OCopyTableWizard::getCreateStyle() const
 // -----------------------------------------------------------------------------
 sal_Bool OCopyTableWizard::supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDataType)
 {
-    _rNewDataType = _nDataType;
-    return m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end();
+    sal_Bool bRet = m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end();
+    if ( bRet )
+        _rNewDataType = _nDataType;
+    return bRet;
 }
 // -----------------------------------------------------------------------------
-const OTypeInfo* OCopyTableWizard::convertType(const OTypeInfo* _pType)
+TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& _bNotConvert)
 {
-    if(m_xSourceConnection == m_xConnection)
+    if ( m_xSourceConnection == m_xConnection )
         return _pType;
 
     sal_Bool bForce;
-    const OTypeInfo* pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,_pType->nType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,bForce);
-    if(!pType || bForce)
+    TOTypeInfoSP pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,_pType->nType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,_pType->bAutoIncrement,bForce);
+    if ( !pType.get() || bForce )
     { // no type found so we have to find the correct one ourself
         sal_Int32 nDefaultType = DataType::VARCHAR;
         switch(_pType->nType)
@@ -1030,33 +1050,39 @@ const OTypeInfo* OCopyTableWizard::convertType(const OTypeInfo* _pType)
             case DataType::TIMESTAMP:
             case DataType::REAL:
             case DataType::BIGINT:
-                if(supportsType(DataType::DOUBLE,nDefaultType))
+                if ( supportsType(DataType::DOUBLE,nDefaultType) )
                     break;
                 // run through
             case DataType::DOUBLE:
-                if(supportsType(DataType::NUMERIC,nDefaultType))
+                if ( supportsType(DataType::NUMERIC,nDefaultType) )
                     break;
                 // run through
             case DataType::NUMERIC:
                 supportsType(DataType::DECIMAL,nDefaultType);
                 break;
-                // run through
             case DataType::DECIMAL:
-                if(supportsType(DataType::NUMERIC,nDefaultType))
+                if ( supportsType(DataType::NUMERIC,nDefaultType) )
+                    break;
+                if ( supportsType(DataType::DOUBLE,nDefaultType) )
                     break;
-                if(supportsType(DataType::DOUBLE,nDefaultType))
+                break;
+            case DataType::VARCHAR:
+                if ( supportsType(DataType::LONGVARCHAR,nDefaultType) )
                     break;
                 break;
             default:
                 nDefaultType = DataType::VARCHAR;
         }
-        pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,nDefaultType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,bForce);
-        if(!pType)
+        pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,nDefaultType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,_pType->bAutoIncrement,bForce);
+        if ( !pType.get() )
         {
-            pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,bForce);
-            if(!pType)
+            _bNotConvert = sal_False;
+            pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,50,0,sal_False,bForce);
+            if ( !pType.get() )
                 pType = m_pTypeInfo;
         }
+        else if ( bForce )
+            _bNotConvert = sal_False;
     }
     return pType;
 }
@@ -1081,3 +1107,14 @@ const OTypeInfo* OCopyTableWizard::convertType(const OTypeInfo* _pType)
     return sName;
 }
 // -----------------------------------------------------------------------------
+void OCopyTableWizard::fillTypeInfo()
+{
+    ::dbaui::fillTypeInfo(m_xSourceConnection,m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex);
+    ::dbaui::fillTypeInfo(m_xConnection,m_sTypeNames,m_aDestTypeInfo,m_aDestTypeInfoIndex);
+}
+// -----------------------------------------------------------------------------
+void OCopyTableWizard::loadData()
+{
+    loadData(m_xSourceObject,m_vSourceColumns,m_vSourceVec); // create the field description
+}
+// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 48f5d09df7c6..3dca40141566 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WNameMatch.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:51:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -235,9 +235,10 @@ sal_Bool OWizNameMatching::LeavePage()
 
             m_pParent->m_vColumnPos[nPos].first = ::std::distance(pDestColumns->begin(),aDestIter) + 1;
             m_pParent->m_vColumnPos[nPos].second = ++nParamPos;
-            const OTypeInfo* pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo());
+            sal_Bool bNotConvert;
+            TOTypeInfoSP pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo(),bNotConvert);
             sal_Int32 nType = ::com::sun::star::sdbc::DataType::VARCHAR;
-            if(pTypeInfo)
+            if ( pTypeInfo.get() )
                 nType = pTypeInfo->nType;
             m_pParent->m_vColumnTypes[nPos] = nType;
         }
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index e5683d6e2adb..c7c42bf82ba1 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WTypeSelect.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -245,7 +245,7 @@ Reference< XNumberFormatter > OWizTypeSelectControl::GetFormatter() const
     return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->GetFormatter();
 }
 // -----------------------------------------------------------------------------
-const OTypeInfo*    OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos)
+TOTypeInfoSP    OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos)
 {
     return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo(_nPos);
 }
@@ -291,6 +291,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent,SvStream*   _pStream)
                ,m_pbAuto( this, ModuleRes( PB_AUTO ) )
                ,m_pParserStream(_pStream)
                ,m_bAutoIncrementEnabled(sal_False)
+               ,m_nDisplayRow(0)
 {
     DBG_CTOR(OWizTypeSelect,NULL);
     m_lbColumnNames.SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl));
@@ -378,7 +379,8 @@ void OWizTypeSelect::ActivatePage( )
     Reset();
     m_bFirstTime = bOldFirstTime;
 
-    m_lbColumnNames.SelectEntryPos(0);
+    m_lbColumnNames.SelectEntryPos(m_nDisplayRow);
+    m_nDisplayRow = 0;
     m_lbColumnNames.GetSelectHdl().Call(&m_lbColumnNames);
 }
 // -----------------------------------------------------------------------
@@ -398,7 +400,8 @@ void OWizTypeSelect::EnableAuto(sal_Bool bEnable)
 //------------------------------------------------------------------------------
 IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, pButton )
 {
-    m_pParent->CheckColumns();
+    sal_Int32 nBreakPos;
+    m_pParent->CheckColumns(nBreakPos);
     fillColumnList(m_etAuto.GetText().ToInt32());
 
     ActivatePage();
@@ -423,7 +426,6 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr,sal_uInt1
     String sColumnName = GetEntry(_nPos);
     RemoveEntry(_nPos);
     _pFieldDescr->SetPrimaryKey(_bSet);
-    _pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS);
     if( _bSet )
         InsertEntry(sColumnName,((OWizTypeSelect*)GetParent())->m_imgPKey,_nPos);
     else if( _pFieldDescr->getTypeInfo()->bNullable )
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 18a2657c1b11..15f9ea45c8f0 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WizardPages.src,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:32:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,7 +96,7 @@ String STR_HTML_TITLE
     Text[ polish ] = "Kopiuj tabel� HTML";
     Text[ portuguese_brazilian ] = "Copy HTML table";
     Text[ japanese ] = "HTML テーブルのコピー";
-    Text[ korean ] = "HTML 표 복사";
+    Text[ korean ] = "HTML 테이블 복사";
     Text[ chinese_simplified ] = "复制 HTML 表格";
     Text[ chinese_traditional ] = "複製 HTML 表格";
     Text[ arabic ] = "��� ���� HTML";
@@ -123,7 +123,7 @@ String STR_RTF_TITLE
     Text[ polish ] = "Kopiuj tabel� RTF";
     Text[ portuguese_brazilian ] = "Copy RTF table";
     Text[ japanese ] = "RTF テーブルのコピー";
-    Text[ korean ] = "RTF 표 복사";
+    Text[ korean ] = "RTF 테이블 복사";
     Text[ chinese_simplified ] = "复制 RTF 表格";
     Text[ chinese_traditional ] = "複製RTF表格";
     Text[ arabic ] = "��� ���� RTF";
@@ -143,7 +143,7 @@ String STR_WIZ_COLUMN_SELECT_TITEL
     Text[ greek ] = "�������� ������";
     Text[ dutch ] = "Kolom overnemen";
     Text[ french ] = "Application de colonnes";
-    Text[ spanish ] = "Aplicaci�n de columnas";
+    Text[ spanish ] = "Aplicar columnas";
     Text[ italian ] = "Applica colonne";
     Text[ danish ] = "Overtag kolonner";
     Text[ swedish ] = "�verta kolumner";
@@ -177,7 +177,7 @@ String STR_WIZ_TYPE_SELECT_TITEL
     Text[ polish ] = "Formatowanie typu";
     Text[ portuguese_brazilian ] = "Undo";
     Text[ japanese ] = "タイプの書式設定";
-    Text[ korean ] = "형식 지정";
+    Text[ korean ] = "유형 서식";
     Text[ chinese_simplified ] = "类型格式化";
     Text[ chinese_traditional ] = "類型格式化";
     Text[ arabic ] = "������� �����";
@@ -204,7 +204,7 @@ String STR_WIZ_PKEY_ALREADY_DEFINED
     Text[ polish ] = "Jako klucze g��wne osadzono ju� nast�puj�ce pola:\n";
     Text[ portuguese_brazilian ] = "There are already primary keys defined for this fields:\n";
     Text[ japanese ] = "以下のフィールドはすでにプライマリキーとして設定されています。\n";
-    Text[ korean ] = "다음 필드에는 기본 키가 이미 정의되어 있습니다.:\n";
+    Text[ korean ] = "다음 필드에는 기본 키가 이미 지정되어 있습니다:\n";
     Text[ chinese_simplified ] = "已经为下列字段设定了主关键字：\n";
     Text[ chinese_traditional ] = "以下的欄位已經指定成主關鍵字：\n";
     Text[ arabic ] = "�� ����� ������ ������� ������ ������ �����:\n";
@@ -342,7 +342,7 @@ ModalDialog WIZ_RTFCOPYTABLE
         Text[ polish ] = "< Wstecz";
         Text[ portuguese_brazilian ] = "< ~Back";
         Text[ japanese ] = "< 戻る(~B)";
-        Text[ korean ] = "<뒤로(~B)";
+        Text[ korean ] = "< 뒤로(~B)";
         Text[ chinese_simplified ] = "< 返回(~B)";
         Text[ chinese_traditional ] = "< 返回(~B)";
         Text[ arabic ] = "<������";
@@ -370,7 +370,7 @@ ModalDialog WIZ_RTFCOPYTABLE
         Text[ polish ] = "Dalej>";
         Text[ portuguese_brazilian ] = "~Next>";
         Text[ japanese ] = "次へ(~N)>";
-        Text[ korean ] = "다음(~N)";
+        Text[ korean ] = "다음>(~N)";
         Text[ chinese_simplified ] = "继续 (~N)>";
         Text[ chinese_traditional ] = "繼續 (~N)>";
         Text[ arabic ] = "������>";
@@ -399,7 +399,7 @@ ModalDialog WIZ_RTFCOPYTABLE
         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[ arabic ] = "�����";
@@ -410,7 +410,7 @@ ModalDialog WIZ_RTFCOPYTABLE
     };
 
     Text[ greek ] = "��������� ������ RTF";
-    Text[ korean ] = "RTF 표 복사";
+    Text[ korean ] = "RTF 테이블 복사";
     Text[ chinese_traditional ] = "複製RTF表格";
     Text[ arabic ] = "��� ���� RTF";
     Text[ turkish ] = "RTF tablosunu kopyala";
@@ -635,14 +635,14 @@ TabPage TAB_WIZ_TYPE_SELECT
         Text[ greek ] = "�������� ���������� �����";
         Text[ dutch ] = "Autom. herkenning van type";
         Text[ french ] = "Reconnaissance automatique du type";
-        Text[ spanish ] = "Autoreconocimiento de tipo";
+        Text[ spanish ] = "Reconocimiento autom�tico del tipo";
         Text[ italian ] = "Riconoscimento autom. tipo";
         Text[ danish ] = "Automatisk typegenkendelse";
         Text[ swedish ] = "Autom. typigenk�nning";
         Text[ polish ] = "Automat. identyfikacja typu";
         Text[ portuguese_brazilian ] = "Tablename:";
         Text[ japanese ] = "種類の自動認識";
-        Text[ korean ] = "자동 형식 인식";
+        Text[ korean ] = "자동 유형 인식";
         Text[ chinese_simplified ] = "自动识别类型";
         Text[ chinese_traditional ] = "自動識別類型";
         Text[ arabic ] = "������ ��� ����� ��������";
@@ -672,7 +672,7 @@ TabPage TAB_WIZ_TYPE_SELECT
         Text[ polish ] = "Wiersze (maks.)";
         Text[ portuguese_brazilian ] = "Tablename:";
         Text[ japanese ] = "最大行数(~X)";
-        Text[ korean ] = "(최대)줄(~X):";
+        Text[ korean ] = "최대 줄 수(~X)";
         Text[ chinese_simplified ] = "(最多的)行(~X)";
         Text[ chinese_traditional ] = "(最多的)列(~X)";
         Text[ turkish ] = "Sat�rlar (azami):";
@@ -764,7 +764,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         Text[ polish ] = "Tabela �r�d�owa: \n";
         Text[ portuguese_brazilian ] = "Source table: \n";
         Text[ japanese ] = "ソーステーブル: \n";
-        Text[ korean ] = "시트(소스): \n";
+        Text[ korean ] = "원본 테이블: \n";
         Text[ chinese_simplified ] = "源表格：\n";
         Text[ chinese_traditional ] = "源表格：\n";
         Text[ turkish ] = "Kaynak tablo: \n";
@@ -781,7 +781,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         Text [ ENGLISH ]    = "Destination table: \n" ;
         Text[ english_us ] = "Destination table: \n";
         Text[ portuguese ] = "Tabela de destino: \n";
-        Text[ russian ] = "������� �������: \n";
+        Text[ russian ] = "������� ����������: \n";
         Text[ greek ] = "������� ����������: \n";
         Text[ dutch ] = "Doeltabel: \n";
         Text[ french ] = "Table cible : \n";
@@ -793,7 +793,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         Text[ polish ] = "Tabela docelowa: \n";
         Text[ portuguese_brazilian ] = "Destination table: \n";
         Text[ japanese ] = "ターゲットテーブル: \n";
-        Text[ korean ] = "시트(대상): \n";
+        Text[ korean ] = "대상 테이블: \n";
         Text[ chinese_simplified ] = "目标表格：\n";
         Text[ chinese_traditional ] = "目標表格：\n";
         Text[ turkish ] = "Hedef tablo: \n";
@@ -914,7 +914,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         Text[ greek ] = "�~��";
         Text[ dutch ] = "a~lle";
         Text[ french ] = "~Tous";
-        Text[ spanish ] = "to~dos";
+        Text[ spanish ] = "To~dos";
         Text[ italian ] = "Tutti";
         Text[ danish ] = "a~lle";
         Text[ swedish ] = "A~lla";
@@ -989,7 +989,7 @@ TabPage TAB_WIZ_COPYTABLE
         Text[ polish ] = "Nazwa tabeli";
         Text[ portuguese_brazilian ] = "Tabellenname:";
         Text[ japanese ] = "テーブル名(~B)";
-        Text[ korean ] = "시트 이름(~B):";
+        Text[ korean ] = "테이블 이름(~B)";
         Text[ chinese_simplified ] = "表格名称(~B)";
         Text[ chinese_traditional ] = "表格名稱(~B)";
         Text[ turkish ] = "Tablo ad�:";
@@ -1057,7 +1057,7 @@ TabPage TAB_WIZ_COPYTABLE
         Text[ chinese_traditional ] = "定義和資料(~F)";
         Text[ arabic ]      = "������� ���������";
         Text[ greek ] = "������� ��� �������~�";
-        Text[ korean ] = "정의와 데이터(~F)";
+        Text[ korean ] = "정의 및 데이터(~F)";
         Text[ turkish ] = "Tan�m ve veriler";
         Text[ catalan ] = "De~finici� i dades";
         Text[ finnish ] = "M~��ritys ja tiedot";
@@ -1100,7 +1100,7 @@ TabPage TAB_WIZ_COPYTABLE
         Text [ ENGLISH ]    = "A~s View" ;
         Text[ english_us ] = "A~s table view";
         Text[ portuguese ] = "Como ~vista de tabela";
-        Text[ russian ] = "� ���� �������";
+        Text[ russian ] = "�������������";
         Text[ greek ] = "�~� ������� ������";
         Text[ dutch ] = "Al~s tabelmodus";
         Text[ french ] = "Comme ~vue";
@@ -1111,7 +1111,7 @@ TabPage TAB_WIZ_COPYTABLE
         Text[ polish ] = "Jako widok tabeli";
         Text[ portuguese_brazilian ] = "A~s View";
         Text[ japanese ] = "テーブルビューとして(~S)";
-        Text[ korean ] = "시트 보기로(~S)";
+        Text[ korean ] = "테이블 보기로(~S)";
         Text[ chinese_simplified ] = "当作表格视图(~S)";
         Text[ chinese_traditional ] = "當作表格檢視(~S)";
         Text[ arabic ] = "��� ����� ��� ������";
@@ -1143,7 +1143,7 @@ TabPage TAB_WIZ_COPYTABLE
         Text[ chinese_traditional ] = "附加資料(~D)";
         Text[ arabic ]      = "����� ������";
         Text[ greek ] = "����������� ������~���";
-        Text[ korean ] = "데이터 수정(~D)";
+        Text[ korean ] = "데이터 첨부(~D)";
         Text[ turkish ] = "Verileri ekle";
         Text[ catalan ] = "~Adjunta dades";
         Text[ finnish ] = "~Liit� tiedot";
@@ -1198,7 +1198,7 @@ TabPage TAB_WIZ_COPYTABLE
         Text[ polish ] = "Nazwa";
         Text[ portuguese_brazilian ] = "Name:";
         Text[ japanese ] = "名前";
-        Text[ korean ] = "이름:";
+        Text[ korean ] = "이름";
         Text[ chinese_simplified ] = "名称";
         Text[ chinese_traditional ] = "名稱";
         Text[ turkish ] = "Ad:";
@@ -1222,7 +1222,7 @@ String STR_WIZ_TABLE_COPY
     Text [ ENGLISH ]    = "Copy table" ;
     Text [ english_us ] = "Copy table" ;
     Text[ portuguese ] = "Copiar tabela";
-    Text[ russian ] = "���������� �������";
+    Text[ russian ] = "�����������";
     Text[ greek ] = "��������� ������";
     Text[ dutch ] = "Tabel kopi�ren";
     Text[ french ] = "Copier la table";
@@ -1233,7 +1233,7 @@ String STR_WIZ_TABLE_COPY
     Text[ polish ] = "Kopiuj tabel�";
     Text[ portuguese_brazilian ] = "Copy table";
     Text[ japanese ] = "テーブルのコピー";
-    Text[ korean ] = "시트 복사";
+    Text[ korean ] = "테이블 복사";
     Text[ chinese_simplified ] = "复制表格";
     Text[ chinese_traditional ] = "複製表格";
     Text[ arabic ] = "��� ������";
@@ -1257,13 +1257,13 @@ String STR_COPYTABLE_TITLE_COPY
     Text [ french ] = "Copier la table" ;
     Text [ dutch ] = "Tabel kopi�ren" ;
     Text[ chinese_simplified ] = "复制表格";
-    Text[ russian ] = "���������� �������";
+    Text[ russian ] = "�����������";
     Text[ polish ] = "Kopiuj tabel�";
     Text[ japanese ] = "テーブルのコピー";
     Text[ chinese_traditional ] = "複製表格";
     Text[ arabic ] = "��� ������";
     Text[ greek ] = "��������� ������";
-    Text[ korean ] = "시트 복사";
+    Text[ korean ] = "테이블 복사";
     Text[ turkish ] = "Tabloyu kopyala";
     Text[ catalan ] = "Copia taula";
     Text[ finnish ] = "Kopioi taulu";
@@ -1290,7 +1290,7 @@ String STR_COPYTABLE_TITLE_MOVE
     Text[ chinese_traditional ] = "移動表單";
     Text[ arabic ] = "����� ������";
     Text[ greek ] = "���������� ������";
-    Text[ korean ] = "시트 이동";
+    Text[ korean ] = "테이블 이동";
     Text[ turkish ] = "Tabloyu ta��";
     Text[ catalan ] = "Mou la taula";
     Text[ finnish ] = "Siirr� taulu";
@@ -1317,7 +1317,7 @@ ErrorBox ERROR_INVALID_TABLE_NAME
     Message[ chinese_traditional ] = "使用中的資料庫無法接受這個無效的變更名稱。";
     Message[ arabic ] = "���� ��� ���� ��� ���� �� ����� �������� �������.";
     Message[ greek ] = "���� �� ����� ��� ������ ��� ����� ������ ���� �������� ���� ���������.";
-    Message[ korean ] = "현재 데이터베이스에서 유효하지 않은 시트 이름입니다.";
+    Message[ korean ] = "현재 데이터베이스에서 유효하지 않은 테이블 이름입니다.";
     Message[ turkish ] = "Bu veritaban�nda bu ad ge�erli de�il.";
     Message[ catalan ] = "Aquest nom de taula no �s v�lid en la base de dades actual.";
     Message[ finnish ] = "T�m� taulun nimi ei ole kelvollinen nykyisess� tietokannassa.";
@@ -1343,7 +1343,7 @@ String STR_ERR_DUPL_TABLENAME
     Text[ chinese_traditional ] = "表格名稱 \'$name$\' 已經存在。\n您能夠輸入一個新名稱\n或者將資料附加在現存的表格內。";
     Text[ arabic ] = "��� ������ \'$name$\' ����� ������.\n����� ����� ��� ����\n�� ����� �������� ������� �������.";
     Text[ greek ] = "�� ����� ��� ������ \'$name$\' ������� ���.\n�������� �� �������� ��� ��� �����\n� �� ������������� �� �������� ���� ��� ������� ������.";
-    Text[ korean ] = "시트 이름 \'$name$\'이(가) 이미 존재합니다.\n새 이름을 입력하거나\n데이터를 기존 시트에 추가할 수 있습니다.";
+    Text[ korean ] = "테이블 이름 \'$name$\'은(는) 이미 있습니다.\n새 이름을 입력하거나\n데이터를 기존 테이블에 추가할 수 있습니다.";
     Text[ turkish ] = "Tablo ad� \'$name$\' mevcut durumda.\nBa�ka bir ad girebilir ya da verileri mevcut tabloya ekleyebilirsiniz.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "El nom de taula \'$name$\' ja existeix.\nPot escriure un altre nom\no adjuntar les dades a la taula existent.";
@@ -1369,7 +1369,7 @@ ErrorBox ERROR_INVALID_TABLE_NAME_LENGTH
     Message[ swedish ] = "�ndra tabellnamnet. Det �r f�r l�ngt.";
     Message[ polish ] = "Please change the table name. It is too long.";
     Message[ japanese ] = "表名を変更してください。名前が長すぎます。";
-    Message[ korean ] = "이름이 너무 깁니다. 테이블 이름을 바꿔주십시오.";
+    Message[ korean ] = "이름이 너무 깁니다. 테이블 이름을 변경해주십시오.";
     Message[ chinese_simplified ] = "请您更改表格的名称。当前的名称太长了。";
     Message[ chinese_traditional ] = "請變更表格名稱。目前的名稱太長了。";
     Message[ turkish ] = "Please change the table name. It is too long.";
@@ -1408,3 +1408,9 @@ Image IMG_SORTDOWN_H
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx
index e8d11a87770e..f3f50e18b9ea 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charsets.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:51:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,9 @@
 #ifndef _TOOLS_RCID_H
 #include <tools/rcid.h>
 #endif
+#ifndef _DBAUI_LOCALRESACCESS_HXX_
+#include "localresaccess.hxx"
+#endif
 
 //.........................................................................
 namespace dbaui
@@ -90,79 +93,63 @@ namespace dbaui
     //-------------------------------------------------------------------------
     OCharsetDisplay::OCharsetDisplay()
         :OCharsetMap()
-        ,Resource(RSC_CHARSETS)
+        ,SvxTextEncodingTable()
     {
-#ifdef DBG_UTIL
-        sal_Bool bAlreadyAsserted = sal_False;
-#endif
-
-        sal_Int32 nSize = size();
-        m_aDisplayNames.reserve( nSize );
-        for (sal_Int32 i=1; i<=nSize; ++i)
         {
-            ResId aLocalId( (USHORT)i );
-
-            if ( IsAvailableRes( aLocalId.SetRT( RSC_STRING ) ) )
-                m_aDisplayNames.push_back( String( aLocalId ) );
-            else
-            {
-                DBG_ASSERT( bAlreadyAsserted, "OCharsetDisplay::OCharsetDisplay: invalid resources!" );
-#ifdef DBG_UTIL
-                bAlreadyAsserted = sal_True;
-#endif
-                m_aDisplayNames.push_back( ::rtl::OUString::createFromAscii( "<unknown>" ) );
-            }
+            OLocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE );
+            m_aSystemDisplayName = String( ResId( 1 ) );
         }
+    }
+
+    //-------------------------------------------------------------------------
+    sal_Bool OCharsetDisplay::approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const
+    {
+        if ( !OCharsetMap::approveEncoding( _eEncoding, _rInfo ) )
+            return sal_False;
+
+        if ( RTL_TEXTENCODING_DONTKNOW == _eEncoding )
+            return sal_True;
 
-        FreeResource();
+        return 0 != GetTextString( _eEncoding ).Len();
     }
 
     //-------------------------------------------------------------------------
     OCharsetDisplay::const_iterator OCharsetDisplay::begin() const
     {
-        return const_iterator(this, OCharsetMap::begin(), 0);
+        return const_iterator( this, OCharsetMap::begin() );
     }
 
     //-------------------------------------------------------------------------
     OCharsetDisplay::const_iterator OCharsetDisplay::end() const
     {
-        return const_iterator(this, OCharsetMap::end(), size());
+        return const_iterator( this, OCharsetMap::end() );
     }
 
     //-------------------------------------------------------------------------
     OCharsetDisplay::const_iterator OCharsetDisplay::find(const rtl_TextEncoding _eEncoding) const
     {
         OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_eEncoding);
-        return const_iterator(this, aBaseIter, aBaseIter - OCharsetMap::begin());
+        return const_iterator( this, aBaseIter );
     }
 
     //-------------------------------------------------------------------------
     OCharsetDisplay::const_iterator OCharsetDisplay::find(const ::rtl::OUString& _rIanaName, const IANA&) const
     {
         OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_rIanaName, OCharsetMap::IANA());
-        return const_iterator(this, aBaseIter, aBaseIter - OCharsetMap::begin());
-    }
-
-    //-------------------------------------------------------------------------
-    OCharsetDisplay::const_iterator OCharsetDisplay::find(const ::rtl::OUString& _rLogicalName, const Logical&) const
-    {
-        OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_rLogicalName, OCharsetMap::Logical());
-        return const_iterator(this, aBaseIter, aBaseIter - OCharsetMap::begin());
+        return const_iterator( this, aBaseIter );
     }
 
     //-------------------------------------------------------------------------
     OCharsetDisplay::const_iterator OCharsetDisplay::find(const ::rtl::OUString& _rDisplayName, const Display&) const
     {
-        OCharsetMap::CharsetIterator aBasePos = OCharsetMap::begin();
-        sal_Int32 nIndex = 0;
-        for (   ConstStringVectorIterator aSearch = m_aDisplayNames.begin();
-                aSearch != m_aDisplayNames.end();
-                ++aSearch, ++aBasePos, ++nIndex
-            )
-            if (*aSearch == _rDisplayName)
-                break;
-
-        return const_iterator(this, aBasePos, nIndex);
+        rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW;
+        if ( _rDisplayName != m_aSystemDisplayName )
+        {
+            eEncoding = GetTextEncoding( _rDisplayName );
+            OSL_ENSURE( RTL_TEXTENCODING_DONTKNOW != eEncoding,
+                "OCharsetDisplay::find: non-empty display name, but DONTKNOW!" );
+        }
+        return const_iterator( this, OCharsetMap::find( eEncoding ) );
     }
 
     //=========================================================================
@@ -180,6 +167,7 @@ namespace dbaui
         :CharsetDisplayDerefHelper_Base(_rBase)
         ,m_sDisplayName(_rDisplayName)
     {
+        DBG_ASSERT( m_sDisplayName.getLength(), "CharsetDisplayDerefHelper::CharsetDisplayDerefHelper: invalid display name!" );
     }
 
     //-------------------------------------------------------------------------
@@ -191,82 +179,57 @@ namespace dbaui
     //= OCharsetDisplay::ExtendedCharsetIterator
     //=========================================================================
     //-------------------------------------------------------------------------
-    OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator(const OCharsetDisplay* _pContainer, const base_iterator& _rPosition, const sal_Int32 _nPosition)
+    OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator( const OCharsetDisplay* _pContainer, const base_iterator& _rPosition )
         :m_pContainer(_pContainer)
         ,m_aPosition(_rPosition)
-        ,m_nPosition(_nPosition)
     {
         DBG_ASSERT(m_pContainer, "OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator : invalid container!");
     }
 
     //-------------------------------------------------------------------------
     OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource)
-        :m_pContainer(_rSource.m_pContainer)
-        ,m_aPosition(_rSource.m_aPosition)
-        ,m_nPosition(_rSource.m_nPosition)
+        :m_pContainer( _rSource.m_pContainer )
+        ,m_aPosition( _rSource.m_aPosition )
     {
     }
 
     //-------------------------------------------------------------------------
     CharsetDisplayDerefHelper OCharsetDisplay::ExtendedCharsetIterator::operator*() const
     {
-        DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDisplayNames.size(), "OCharsetDisplay::ExtendedCharsetIterator::operator* : invalid position!");
-        return CharsetDisplayDerefHelper(*m_aPosition, m_pContainer->m_aDisplayNames[m_nPosition]);
+        DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(), "OCharsetDisplay::ExtendedCharsetIterator::operator* : invalid position!");
+
+        rtl_TextEncoding eEncoding = (*m_aPosition).getEncoding();
+        return CharsetDisplayDerefHelper(
+            *m_aPosition,
+            RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : (::rtl::OUString)m_pContainer->GetTextString( eEncoding )
+        );
     }
 
     //-------------------------------------------------------------------------
     const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator++()
     {
-        DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDisplayNames.size(), "OCharsetDisplay::ExtendedCharsetIterator::operator++ : invalid position!");
-        if (m_nPosition < (sal_Int32)m_pContainer->m_aDisplayNames.size())
-        {
-            ++m_nPosition;
+        DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(), "OCharsetDisplay::ExtendedCharsetIterator::operator++ : invalid position!");
+        if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::end() )
             ++m_aPosition;
-        }
         return *this;
     }
 
     //-------------------------------------------------------------------------
     const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator--()
     {
-        DBG_ASSERT(m_nPosition >= 0, "OCharsetDisplay::ExtendedCharsetIterator::operator-- : invalid position!");
-        if (m_nPosition >= 0)
-        {
-            --m_nPosition;
+        DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin(), "OCharsetDisplay::ExtendedCharsetIterator::operator-- : invalid position!");
+        if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin() )
             --m_aPosition;
-        }
         return *this;
     }
 
     //-------------------------------------------------------------------------
     bool operator==(const OCharsetDisplay::ExtendedCharsetIterator& lhs, const OCharsetDisplay::ExtendedCharsetIterator& rhs)
     {
-        return (lhs.m_pContainer == rhs.m_pContainer) && (lhs.m_nPosition == rhs.m_nPosition);
+        return (lhs.m_pContainer == rhs.m_pContainer) && (lhs.m_aPosition == rhs.m_aPosition);
     }
 
 //.........................................................................
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2002/03/14 08:54:05  fs
- *  #97788# assertion for invalid character set maps corrected
- *
- *  Revision 1.4  2001/10/15 13:38:09  fs
- *  #93204# new supported charset IBM866 (cyrillic)
- *
- *  Revision 1.3  2001/05/10 12:02:10  fs
- *  #86849# be a little more tolerant when display names are missing
- *
- *  Revision 1.2  2000/11/29 22:26:32  fs
- *  #80003# re-implemented, now base on dbtools::OCharsetMap
- *
- *  Revision 1.1  2000/10/05 10:08:39  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 26.09.00 12:18:36  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx
index aa9134620192..2ad500fdc3f3 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: datasourceconnector.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-15 06:48:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -258,16 +258,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/05/11 08:29:30  fs
- *  solaris needs complete types to catch them
- *
- *  Revision 1.1  2001/05/10 12:17:59  fs
- *  initial checkin - helper class for creating a connection for a data source
- *
- *
- *  Revision 1.0 10.05.01 09:44:48  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index be3fbfc42dc6..ca52902409ea 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -1,63 +1,63 @@
 /*************************************************************************
- *
- *  $RCSfile: dbumiscres.src,v $
- *
- *  $Revision: 1.52 $
- *
- *  last change: $Author: vg $ $Date: 2002-12-09 09:52:15 $
- *
- *  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 EXPRESS 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): _______________________________________
- *
- *
- ************************************************************************/
+*
+*  $RCSfile: dbumiscres.src,v $
+*
+*  $Revision: 1.53 $
+*
+*  last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $
+*
+*  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 EXPRESS 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 _DBU_MISC_HRC_
 #include "dbu_misc.hrc"
@@ -69,587 +69,287 @@
 //-------------------------------------------------------------------------
 Resource RSC_DATASOURCE_TYPES
 {
-    String STR_CONNTYPES
-    {
-        Text = "sdbc:mysql:odbc:;sdbc:mysql:jdbc:;sdbc:adabas:;jdbc:;sdbc:odbc:;sdbc:dbase:;sdbc:ado:;sdbc:flat:;sdbc:calc:;sdbc:address:" ;
-    };
-    String STR_CONNUINAMES
-    {
-        Text = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Tabellendokument;Adressbuch" ;
-        Text [ english ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Addressbook" ;
-        Text [ english_us ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Address book" ;
-        Text[ language_user1 ] = "Please be carefull with the number/ordering of (semicolon-separated) tokens in the string.";
-        Text[ russian ] = "Adabas;JDBC;ODBC;dBase;ADO;�����;����������� �������;�������� �����";
-        Text[ finnish ] = "Adabas;JDBC;ODBC;dBase;ADO;Teksti;Laskentataulut;Osoitteisto";
-    };
+String STR_CONNTYPES
+{
+    Text = "sdbc:mysql:odbc:;sdbc:mysql:jdbc:;sdbc:adabas:;jdbc:;sdbc:odbc:;sdbc:dbase:;sdbc:ado:;sdbc:flat:;sdbc:calc:;sdbc:address:" ;
+};
+String STR_CONNUINAMES
+{
+    Text = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Tabellendokument;Adressbuch" ;
+    Text [ english ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Addressbook" ;
+    Text [ english_us ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Address book" ;
+    Text[ language_user1 ] = "Please be carefull with the number/ordering of (semicolon-separated) tokens in the string.";
+    Text[ russian ] = "Adabas;JDBC;ODBC;dBase;ADO;�����;����������� �������;�������� �����";
+    Text[ finnish ] = "Adabas;JDBC;ODBC;dBase;ADO;Teksti;Laskentataulut;Osoitteisto";
+    Text[ portuguese ] = "Adabas;JDBC;ODBC;dBase;ADO;Texto;FolhaC�lculo;LivroEndere�os";
+    Text[ greek ] = "Adabas;JDBC;ODBC;dBase;ADO;�������;������� ������;������� �����������";
+    Text[ dutch ] = "Adabas;JDBC;ODBC;dBase;ADO;Tekst;Werkbladdocument;Adresboek";
+    Text[ french ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Texte;Classeur;Carnet d'adresses";
+    Text[ spanish ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Texto;Hoja de c�lculo;Libreta de direcciones";
+    Text[ italian ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Testo;Foglio elettronico;Rubrica";
+    Text[ danish ] = "Adabas;JDBC;ODBC;dBase;ADO;Tekst;Regneark;Adressekartotek";
+    Text[ swedish ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Tabelldokument;Adressbok";
+    Text[ polish ] = "Adabas;JDBC;ODBC;dBase;ADO;Tekst;Arkusz kalkulacyjny;Ksi��ka adresowa";
+    Text[ japanese ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;テキストファイル;表計算ドキュメント;アドレス帳";
+    Text[ korean ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;텍스트;스프레드시트;주소록";
+    Text[ chinese_simplified ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;文字;工作表;通讯簿";
+    Text[ chinese_traditional ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;文字;工作表文件;通訊錄";
+    Text[ turkish ] = "Adabas;JDBC;ODBC;dBase;Text";
+    Text[ arabic ] = "Adabas;JDBC;ODBC;dBase;ADO;��;����� �����";
+    Text[ catalan ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet";
+    Text[ thai ] = "Adabas;JDBC;ODBC;ดีเบส;ADO;ข้อความ;กระดาษคำนวณ;สมุดที่อยู่";
+};
 };
 
 Resource RSC_CHARSETS
 {
-    String 1
-    {
-        Text = "Ansi";
-        Text [ english ] = "Ansi";
-        Text [ english_us ] = "Ansi";
-        Text[ portuguese ] = "Ansi";
-        Text[ russian ] = "Ansi";
-        Text[ greek ] = "Ansi";
-        Text[ dutch ] = "Ansi";
-        Text[ french ] = "Ansi";
-        Text[ spanish ] = "Ansi";
-        Text[ finnish ] = "Ansi";
-        Text[ italian ] = "Ansi";
-        Text[ danish ] = "Ansi";
-        Text[ swedish ] = "Ansi";
-        Text[ polish ] = "Ansi";
-        Text[ portuguese_brazilian ] = "Ansi";
-        Text[ japanese ] = "Ansi";
-        Text[ korean ] = "Ansi";
-        Text[ chinese_simplified ] = "Ansi";
-        Text[ chinese_traditional ] = "Ansi";
-        Text[ turkish ] = "Ansi";
-        Text[ arabic ] = "Ansi";
-        Text[ catalan ] = "Ansi";
-        Text[ thai ] = "Ansi";
-    };
-    String 2
-    {
-        Text = "Mac";
-        Text [ english ] = "Mac";
-        Text [ english_us ] = "Mac";
-        Text[ portuguese ] = "Mac";
-        Text[ russian ] = "Mac";
-        Text[ greek ] = "Mac";
-        Text[ dutch ] = "Mac";
-        Text[ french ] = "Mac";
-        Text[ spanish ] = "Mac";
-        Text[ finnish ] = "Mac";
-        Text[ italian ] = "Mac";
-        Text[ danish ] = "Mac";
-        Text[ swedish ] = "Mac";
-        Text[ polish ] = "Mac";
-        Text[ portuguese_brazilian ] = "Mac";
-        Text[ japanese ] = "Mac";
-        Text[ korean ] = "Mac";
-        Text[ chinese_simplified ] = "Mac";
-        Text[ chinese_traditional ] = "Mac";
-        Text[ turkish ] = "Mac";
-        Text[ arabic ] = "Mac";
-        Text[ catalan ] = "Mac";
-        Text[ thai ] = "Mac";
-    };
-    String 3
-    {
-        Text = "IBMPC (437)";
-        Text [ english ] = "IBMPC (437)";
-        Text [ english_us ] = "IBMPC (437)";
-        Text[ portuguese ] = "IBMPC (437)";
-        Text[ russian ] = "IBMPC (437)";
-        Text[ greek ] = "IBMPC (437)";
-        Text[ dutch ] = "IBMPC (437)";
-        Text[ french ] = "IBMPC (437)";
-        Text[ spanish ] = "IBMPC (437)";
-        Text[ finnish ] = "IBMPC (437)";
-        Text[ italian ] = "IBMPC (437)";
-        Text[ danish ] = "IBMPC (437)";
-        Text[ swedish ] = "IBMPC (437)";
-        Text[ polish ] = "IBMPC (437)";
-        Text[ portuguese_brazilian ] = "IBMPC (437)";
-        Text[ japanese ] = "IBMPC (437)";
-        Text[ korean ] = "IBMPC (437)";
-        Text[ chinese_simplified ] = "IBMPC (437)";
-        Text[ chinese_traditional ] = "IBMPC (437)";
-        Text[ turkish ] = "IBMPC (437)";
-        Text[ arabic ] = "IBMPC (437)";
-        Text[ catalan ] = "IBMPC (437)";
-        Text[ thai ] = "IBMPC (437)";
-    };
-    String 4
-    {
-        Text = "IBMPC (850) / DOS";
-        Text [ english ] = "IBMPC (850) / DOS";
-        Text [ english_us ] = "IBMPC (850) / DOS";
-        Text[ portuguese ] = "IBMPC (850) / DOS";
-        Text[ russian ] = "IBMPC (850) / DOS";
-        Text[ greek ] = "IBMPC (850) / DOS";
-        Text[ dutch ] = "IBMPC (850) / DOS";
-        Text[ french ] = "IBMPC (850) / DOS";
-        Text[ spanish ] = "IBMPC (850) / DOS";
-        Text[ finnish ] = "IBMPC (850) / DOS";
-        Text[ italian ] = "IBMPC (850) / DOS";
-        Text[ danish ] = "IBMPC (850) / DOS";
-        Text[ swedish ] = "IBMPC (850)/DOS";
-        Text[ polish ] = "IBMPC (850) / DOS";
-        Text[ portuguese_brazilian ] = "IBMPC (850) / DOS";
-        Text[ japanese ] = "IBMPC (850) / DOS";
-        Text[ korean ] = "IBMPC (850) / DOS";
-        Text[ chinese_simplified ] = "IBMPC (850) / DOS";
-        Text[ chinese_traditional ] = "IBMPC (850) / DOS";
-        Text[ turkish ] = "IBMPC (850) / DOS";
-        Text[ arabic ] = "IBMPC (850) / DOS";
-        Text[ catalan ] = "IBMPC (850) / DOS";
-        Text[ thai ] = "IBMPC (850) / DOS";
-    };
-    String 5
-    {
-        Text = "IBMPC (860)";
-        Text [ english ] = "IBMPC (860)";
-        Text [ english_us ] = "IBMPC (860)";
-        Text[ portuguese ] = "IBMPC (860)";
-        Text[ russian ] = "IBMPC (860)";
-        Text[ greek ] = "IBMPC (860)";
-        Text[ dutch ] = "IBMPC (860)";
-        Text[ french ] = "IBMPC (860)";
-        Text[ spanish ] = "IBMPC (860)";
-        Text[ finnish ] = "IBMPC (860)";
-        Text[ italian ] = "IBMPC (860)";
-        Text[ danish ] = "IBMPC (860)";
-        Text[ swedish ] = "IBMPC (860)";
-        Text[ polish ] = "IBMPC (860)";
-        Text[ portuguese_brazilian ] = "IBMPC (860)";
-        Text[ japanese ] = "IBMPC (860)";
-        Text[ korean ] = "IBMPC (860)";
-        Text[ chinese_simplified ] = "IBMPC (860)";
-        Text[ chinese_traditional ] = "IBMPC (860)";
-        Text[ turkish ] = "IBMPC (860)";
-        Text[ arabic ] = "IBMPC (860)";
-        Text[ catalan ] = "IBMPC (860)";
-        Text[ thai ] = "IBMPC (860)";
-    };
-    String 6
-    {
-        Text = "IBMPC (861)";
-        Text [ english ] = "IBMPC (861)";
-        Text [ english_us ] = "IBMPC (861)";
-        Text[ portuguese ] = "IBMPC (861)";
-        Text[ russian ] = "IBMPC (861)";
-        Text[ greek ] = "IBMPC (861)";
-        Text[ dutch ] = "IBMPC (861)";
-        Text[ french ] = "IBMPC (861)";
-        Text[ spanish ] = "IBMPC (861)";
-        Text[ finnish ] = "IBMPC (861)";
-        Text[ italian ] = "IBMPC (861)";
-        Text[ danish ] = "IBMPC (861)";
-        Text[ swedish ] = "IBMPC (861)";
-        Text[ polish ] = "IBMPC (861)";
-        Text[ portuguese_brazilian ] = "IBMPC (861)";
-        Text[ japanese ] = "IBMPC (861)";
-        Text[ korean ] = "IBMPC (861)";
-        Text[ chinese_simplified ] = "IBMPC (861)";
-        Text[ chinese_traditional ] = "IBMPC (861)";
-        Text[ turkish ] = "IBMPC (861)";
-        Text[ arabic ] = "IBMPC (861)";
-        Text[ catalan ] = "IBMPC (861)";
-        Text[ thai ] = "IBMPC (861)";
-    };
-    String 7
-    {
-        Text = "IBMPC (863)";
-        Text [ english ] = "IBMPC (863)";
-        Text [ english_us ] = "IBMPC (863)";
-        Text[ portuguese ] = "IBMPC (863)";
-        Text[ russian ] = "IBMPC (863)";
-        Text[ greek ] = "IBMPC (863)";
-        Text[ dutch ] = "IBMPC (863)";
-        Text[ french ] = "IBMPC (863)";
-        Text[ spanish ] = "IBMPC (863)";
-        Text[ finnish ] = "IBMPC (863)";
-        Text[ italian ] = "IBMPC (863)";
-        Text[ danish ] = "IBMPC (863)";
-        Text[ swedish ] = "IBMPC (863)";
-        Text[ polish ] = "IBMPC (863)";
-        Text[ portuguese_brazilian ] = "IBMPC (863)";
-        Text[ japanese ] = "IBMPC (863)";
-        Text[ korean ] = "IBMPC (863)";
-        Text[ chinese_simplified ] = "IBMPC (863)";
-        Text[ chinese_traditional ] = "IBMPC (863)";
-        Text[ turkish ] = "IBMPC (863)";
-        Text[ arabic ] = "IBMPC (863)";
-        Text[ catalan ] = "IBMPC (863)";
-        Text[ thai ] = "IBMPC (863)";
-    };
-    String 8
-    {
-        Text = "IBMPC (865)";
-        Text [ english ] = "IBMPC (865)";
-        Text [ english_us ] = "IBMPC (865)";
-        Text[ portuguese ] = "IBMPC (865)";
-        Text[ russian ] = "IBMPC (865)";
-        Text[ greek ] = "IBMPC (865)";
-        Text[ dutch ] = "IBMPC (865)";
-        Text[ french ] = "IBMPC (865)";
-        Text[ spanish ] = "IBMPC (865)";
-        Text[ finnish ] = "IBMPC (865)";
-        Text[ italian ] = "IBMPC (865)";
-        Text[ danish ] = "IBMPC (865)";
-        Text[ swedish ] = "IBMPC (865)";
-        Text[ polish ] = "IBMPC (865)";
-        Text[ portuguese_brazilian ] = "IBMPC (865)";
-        Text[ japanese ] = "IBMPC (865)";
-        Text[ korean ] = "IBMPC (865)";
-        Text[ chinese_simplified ] = "IBMPC (865)";
-        Text[ chinese_traditional ] = "IBMPC (865)";
-        Text[ turkish ] = "IBMPC (865)";
-        Text[ arabic ] = "IBMPC (865)";
-        Text[ catalan ] = "IBMPC (865)";
-        Text[ thai ] = "IBMPC (865)";
-    };
-    String 9
-    {
-        Text = "IBMPC (866)";
-        Text [ english ] = "IBMPC (866)";
-        Text [ english_us ] = "IBMPC (866)";
-        Text[ portuguese ] = "IBMPC (866)";
-        Text[ russian ] = "IBMPC (866)";
-        Text[ greek ] = "IBMPC (866)";
-        Text[ dutch ] = "IBMPC (866)";
-        Text[ french ] = "IBMPC (866)";
-        Text[ spanish ] = "IBMPC (866)";
-        Text[ finnish ] = "IBMPC (866)";
-        Text[ italian ] = "IBMPC (866)";
-        Text[ danish ] = "IBMPC (866)";
-        Text[ swedish ] = "IBMPC (866)";
-        Text[ polish ] = "IBMPC (866)";
-        Text[ portuguese_brazilian ] = "IBMPC (866)";
-        Text[ japanese ] = "IBMPC (866)";
-        Text[ korean ] = "IBMPC (866)";
-        Text[ chinese_simplified ] = "IBMPC (866)";
-        Text[ chinese_traditional ] = "IBMPC (866)";
-        Text[ turkish ] = "IBMPC (866)";
-        Text[ arabic ] = "IBMPC (866)";
-        Text[ catalan ] = "IBMPC (866)";
-        Text[ thai ] = "IBMPC (866)";
-    };
-    String 10
-    {
-        Text = "System";
-        Text [ english ] = "System";
-        Text [ english_us ] = "System";
-        Text[ portuguese ] = "Sistema";
-        Text[ russian ] = "System";
-        Text[ greek ] = "�������";
-        Text[ dutch ] = "Systeem";
-        Text[ french ] = "Syst�me";
-        Text[ spanish ] = "Sistema";
-        Text[ finnish ] = "J�rjestelm�";
-        Text[ italian ] = "Sistema";
-        Text[ danish ] = "System";
-        Text[ swedish ] = "System";
-        Text[ polish ] = "System";
-        Text[ portuguese_brazilian ] = "System";
-        Text[ japanese ] = "システム";
-        Text[ korean ] = "시스템";
-        Text[ chinese_simplified ] = "系统";
-        Text[ chinese_traditional ] = "系統";
-        Text[ turkish ] = "Sistem";
-        Text[ arabic ] = "������";
-        Text[ catalan ] = "System";
-        Text[ thai ] = "ระบบ";
-    };
-    String 11
-    {
-        Text = "UTF-8";
-        Text [ english ] = "UTF-8";
-        Text [ english_us ] = "UTF-8";
-        Text[ portuguese ] = "UTF-8";
-        Text[ russian ] = "UTF-8";
-        Text[ greek ] = "UTF-8";
-        Text[ dutch ] = "UTF-8";
-        Text[ french ] = "UTF-8";
-        Text[ spanish ] = "UTF-8";
-        Text[ finnish ] = "UTF-8";
-        Text[ italian ] = "UTF-8";
-        Text[ danish ] = "UTF-8";
-        Text[ swedish ] = "UTF-8";
-        Text[ polish ] = "UTF-8";
-        Text[ portuguese_brazilian ] = "UTF-8";
-        Text[ japanese ] = "UTF-8";
-        Text[ korean ] = "UTF-8";
-        Text[ chinese_simplified ] = "UTF-8";
-        Text[ chinese_traditional ] = "UTF-8";
-        Text[ turkish ] = "UTF-8";
-        Text[ arabic ] = "UTF-8";
-        Text[ catalan ] = "UTF-8";
-        Text[ thai ] = "UTF-8";
-    };
-    String 12
-    {
-        Text = "Big5-HKSCS";
-        Text [ english ] = "Big5-HKSCS";
-        Text [ english_us ] = "Big5-HKSCS";
-        Text[ portuguese ] = "Big5-HKSCS";
-        Text[ russian ] = "Big5-HKSCS";
-        Text[ greek ] = "Big5-HKSCS";
-        Text[ dutch ] = "Big5-HKSCS";
-        Text[ french ] = "Big5-HKSCS";
-        Text[ spanish ] = "Big5 HKSCS";
-        Text[ finnish ] = "Big5-HKSCS";
-        Text[ italian ] = "Big5-HKSCS";
-        Text[ danish ] = "Big5-HKSCS";
-        Text[ swedish ] = "Big5-HKSCS";
-        Text[ polish ] = "Big5-HKSCS";
-        Text[ portuguese_brazilian ] = "Big5-HKSCS";
-        Text[ japanese ] = "Big5-HKSCS";
-        Text[ korean ] = "Big5-HKSCS";
-        Text[ chinese_simplified ] = "Big5-HKSCS";
-        Text[ chinese_traditional ] = "Big5-HKSCS";
-        Text[ turkish ] = "Big5-HKSCS";
-        Text[ arabic ] = "Big5-HKSCS";
-        Text[ catalan ] = "Big5-HKSCS";
-        Text[ thai ] = "Big5-HKSCS";
-    };
+String 1
+{
+    Text = "System";
+    Text [ english ] = "System";
+    Text [ english_us ] = "System";
+    Text[ portuguese ] = "Sistema";
+    Text[ russian ] = "Ansi";
+    Text[ greek ] = "�������";
+    Text[ dutch ] = "Ansi";
+    Text[ french ] = "Syst�me";
+    Text[ spanish ] = "Sistema";
+    Text[ finnish ] = "Ansi";
+    Text[ italian ] = "Sistema";
+    Text[ danish ] = "Ansi";
+    Text[ swedish ] = "System";
+    Text[ polish ] = "Ansi";
+    Text[ portuguese_brazilian ] = "System";
+    Text[ japanese ] = "Ansi";
+    Text[ korean ] = "시스템";
+    Text[ chinese_simplified ] = "系统";
+    Text[ chinese_traditional ] = "系統";
+    Text[ turkish ] = "Sistem";
+    Text[ arabic ] = "������";
+    Text[ catalan ] = "Ansi";
+    Text[ thai ] = "ระบบ";
+};
 };
 
 //-------------------------------------------------------------------------
 String STR_GENERAL_SDB_ERROR
 {
-    Text = "Fehler bei der Verbindung mit der Datenquelle";
-    Text [ english ] = "Error while connecting to the data source";
-    Text [ english_us ] = "Error while connecting to the data source";
-    Text[ portuguese ] = "Erro na liga��o � fonte de dados";
-    Text[ russian ] = "������ ����������� � ��������� ������";
-    Text[ greek ] = "������������� ������ ���� �� ������� �� ��� ��������� ��� ���������";
-    Text[ dutch ] = "Fout bij verbinding met gegevensbron";
-    Text[ french ] = "Erreur lors de la connexion � la source de donn�es";
-    Text[ spanish ] = "Error durante la conexi�n con la fuente de datos";
-    Text[ italian ] = "Errore durante il collegamento alla sorgente dati";
-    Text[ danish ] = "Fejl under forbindelsen med datakilden";
-    Text[ swedish ] = "Fel vid anslutningen till datak�llan";
-    Text[ polish ] = "B��d w ��czeniu ze �r�d�em danych";
-    Text[ portuguese_brazilian ] = "Error while connecting to the data source";
-    Text[ japanese ] = "データソースへ接続時のエラー";
-    Text[ korean ] = "데이터 소스에 연결시에 오류";
-    Text[ chinese_simplified ] = "在和数据源连接时发生一个错误";
-    Text[ chinese_traditional ] = "連線到資料源時發生一個錯誤";
-    Text[ turkish ] = "Error while connecting to the data source";
-    Text[ arabic ] = "��� ����� ������� ����� ��������";
-    Text[ finnish ] = "On ilmennyt virhe muodostettaessa yhteytt� tietol�hteeseen";
-    Text[ catalan ] = "S'ha produ�t un error en connectar amb la font de dades";
-    Text[ thai ] = "ผิดพลาดขณะกำลังเชื่อมต่อกับแหล่งข้อมูล";
+Text = "Fehler bei der Verbindung mit der Datenquelle";
+Text [ english ] = "Error while connecting to the data source";
+Text [ english_us ] = "Error while connecting to the data source";
+Text[ portuguese ] = "Erro na liga��o � fonte de dados";
+Text[ russian ] = "������ ����������� � ��������� ������";
+Text[ greek ] = "������������� ������ ���� �� ������� �� ��� ��������� ��� ���������";
+Text[ dutch ] = "Fout bij verbinding met gegevensbron";
+Text[ french ] = "Erreur lors de la connexion � la source de donn�es";
+Text[ spanish ] = "Error durante la conexi�n con la fuente de datos";
+Text[ italian ] = "Errore durante il collegamento alla sorgente dati";
+Text[ danish ] = "Fejl under forbindelsen med datakilden";
+Text[ swedish ] = "Fel vid anslutningen till datak�llan";
+Text[ polish ] = "B��d w ��czeniu ze �r�d�em danych";
+Text[ portuguese_brazilian ] = "Error while connecting to the data source";
+Text[ japanese ] = "データソースへ接続時のエラー";
+Text[ korean ] = "데이터 원본으로 연결하던 중 오류";
+Text[ chinese_simplified ] = "在和数据源连接时发生一个错误";
+Text[ chinese_traditional ] = "連線到資料源時發生一個錯誤";
+Text[ turkish ] = "Error while connecting to the data source";
+Text[ arabic ] = "��� ����� ������� ����� ��������";
+Text[ finnish ] = "On ilmennyt virhe muodostettaessa yhteytt� tietol�hteeseen";
+Text[ catalan ] = "S'ha produ�t un error en connectar amb la font de dades";
+Text[ thai ] = "ผิดพลาดขณะกำลังเชื่อมต่อกับแหล่งข้อมูล";
 };
 
 String STR_OBJECT_ALREADY_EXSISTS
 {
-    Text = "Fehler beim Erzeugen!";
-    Text [ english ] = "Error while creating!";
-    Text [ english_us ] = "Error during creation!";
-    Text[ portuguese ] = "Erro ao criar objecto!";
-    Text[ russian ] = "������ ��������!";
-    Text[ greek ] = "������ ���� ��� ����������!";
-    Text[ dutch ] = "Fout bij defini�ren!";
-    Text[ french ] = "Erreur durant le processus de cr�ation !";
-    Text[ spanish ] = "�Error al crear el objeto!";
-    Text[ italian ] = "Errore nella creazione dell'oggetto";
-    Text[ danish ] = "Fejl under genereringen!";
-    Text[ swedish ] = "Fel n�r objekt skulle skapas!";
-    Text[ polish ] = "B��d w trakcie tworzenia!";
-    Text[ portuguese_brazilian ] = "Error while creating!";
-    Text[ japanese ] = "作成するときのエラー。";
-    Text[ korean ] = "작성 오류!";
-    Text[ chinese_simplified ] = "在生成时发生一个错误！";
-    Text[ chinese_traditional ] = "在建立時發生錯誤";
-    Text[ turkish ] = "Error while creating!";
-    Text[ arabic ] = "��� ����� �������!";
-    Text[ finnish ] = "Virhe luonnin aikana.";
-    Text[ catalan ] = "S'ha produ�t un error durant el proc�s de creaci�";
-    Text[ thai ] = "ผิดพลาดในระหว่างการสร้าง!";
+Text = "Fehler beim Erzeugen!";
+Text [ english ] = "Error while creating!";
+Text [ english_us ] = "Error during creation!";
+Text[ portuguese ] = "Erro ao criar objecto!";
+Text[ russian ] = "������ ��������!";
+Text[ greek ] = "������ ���� ��� ����������!";
+Text[ dutch ] = "Fout bij defini�ren!";
+Text[ french ] = "Erreur durant le processus de cr�ation !";
+Text[ spanish ] = "�Error al crear el objeto!";
+Text[ italian ] = "Errore nella creazione dell'oggetto";
+Text[ danish ] = "Fejl under genereringen!";
+Text[ swedish ] = "Fel n�r objekt skulle skapas!";
+Text[ polish ] = "B��d w trakcie tworzenia!";
+Text[ portuguese_brazilian ] = "Error while creating!";
+Text[ japanese ] = "作成するときのエラー。";
+Text[ korean ] = "만드는 중 오류";
+Text[ chinese_simplified ] = "在生成时发生一个错误！";
+Text[ chinese_traditional ] = "在建立時發生錯誤";
+Text[ turkish ] = "Error while creating!";
+Text[ arabic ] = "��� ����� �������!";
+Text[ finnish ] = "Virhe luonnin aikana.";
+Text[ catalan ] = "S'ha produ�t un error durant el proc�s de creaci�";
+Text[ thai ] = "ผิดพลาดในระหว่างการสร้าง!";
 };
 
 String STR_UNEXPECTED_ERROR
 {
-    Text = "Ein unerwarteter Fehler ist aufgetreten. Die operation kann nicht ausgef�hrt werden.";
-    Text [ english ] = "An unexpected error occured. The operation could not be completed.";
-    Text [ english_us ] = "An unexpected error occurred. The operation could not be performed.";
-    Text[ portuguese ] = "Ocorreu um erro imprevisto. � imposs�vel executar a opera��o.";
-    Text[ russian ] = "��������� ����������� ������. ���������� ��������� ������ ��������.";
-    Text[ greek ] = "������������� ��� �� ����������� ������. ��� ���� ������� �� ���������� � ������.";
-    Text[ dutch ] = "Er is een onverwachte fout opgetreden. De opdracht kan niet worden uitgevoerd.";
-    Text[ french ] = "Une erreur impr�vue s'est produite : impossible d'ex�cuter l'op�ration !";
-    Text[ spanish ] = "Se ha producido un error. Imposible ejecutar la operaci�n.";
-    Text[ finnish ] = "On ilmennyt odottamaton virhe. Toimintoa ei voitu suorittaa.";
-    Text[ italian ] = "Si � verificato un errore inaspettato. Impossibile terminare l'operazione.";
-    Text[ danish ] = "Der er opst�et en uventet fejl. Operationen kan ikke udf�res.";
-    Text[ swedish ] = "Ett ov�ntat fel har uppst�tt. Det g�r inte att utf�ra operationen.";
-    Text[ polish ] = "Wyst�pi� nieoczekiwany b��d. Operacji nie mo�na wykona�.";
-    Text[ portuguese_brazilian ] = "An unexpected error occured. The operation could not be completed.";
-    Text[ japanese ] = "予期しないエラーが発生しました。操作の実行はできません。";
-    Text[ korean ] = "예상치 못했던 오류가 발생했습니다. 작업을 실행할 수 없습니다";
-    Text[ chinese_simplified ] = "发生一个意外的错误。无法执行这个操作。";
-    Text[ chinese_traditional ] = "發生一個意外的錯誤。無法執行這個動作。";
-    Text[ turkish ] = "An unexpected error occured. The operation could not be completed.";
-    Text[ arabic ] = "An unexpected error occured. The operation could not be completed.";
-    Text[ catalan ] = "S'ha produ�t un error inesperat. L'operaci� no s'ha pogut realitzar.";
-    Text[ thai ] = "เกิดข้อผิดพลาดที่ไม่คาดคิด ไม่สามารถแสดงปฏิบัติการได้";
+Text = "Ein unerwarteter Fehler ist aufgetreten. Die operation kann nicht ausgef�hrt werden.";
+Text [ english ] = "An unexpected error occured. The operation could not be completed.";
+Text [ english_us ] = "An unexpected error occurred. The operation could not be performed.";
+Text[ portuguese ] = "Ocorreu um erro imprevisto. � imposs�vel executar a opera��o.";
+Text[ russian ] = "��������� ����������� ������. ���������� ��������� ������ ��������.";
+Text[ greek ] = "������������� ��� �� ����������� ������. ��� ���� ������� �� ���������� � ������.";
+Text[ dutch ] = "Er is een onverwachte fout opgetreden. De opdracht kan niet worden uitgevoerd.";
+Text[ french ] = "Une erreur impr�vue s'est produite : impossible d'ex�cuter l'op�ration !";
+Text[ spanish ] = "Se ha producido un error. Imposible ejecutar la operaci�n.";
+Text[ finnish ] = "On ilmennyt odottamaton virhe. Toimintoa ei voitu suorittaa.";
+Text[ italian ] = "Si � verificato un errore inaspettato. Impossibile terminare l'operazione.";
+Text[ danish ] = "Der er opst�et en uventet fejl. Operationen kan ikke udf�res.";
+Text[ swedish ] = "Ett ov�ntat fel har uppst�tt. Det g�r inte att utf�ra operationen.";
+Text[ polish ] = "Wyst�pi� nieoczekiwany b��d. Operacji nie mo�na wykona�.";
+Text[ portuguese_brazilian ] = "An unexpected error occured. The operation could not be completed.";
+Text[ japanese ] = "予期しないエラーが発生しました。操作の実行はできません。";
+Text[ korean ] = "예상치 못했던 오류가 발생했습니다. 작업을 실행할 수 없습니다.";
+Text[ chinese_simplified ] = "发生一个意外的错误。无法执行这个操作。";
+Text[ chinese_traditional ] = "發生一個意外的錯誤。無法執行這個動作。";
+Text[ turkish ] = "An unexpected error occured. The operation could not be completed.";
+Text[ arabic ] = "An unexpected error occured. The operation could not be completed.";
+Text[ catalan ] = "S'ha produ�t un error inesperat. L'operaci� no s'ha pogut realitzar.";
+Text[ thai ] = "เกิดข้อผิดพลาดที่ไม่คาดคิด ไม่สามารถแสดงปฏิบัติการได้";
 };
 
 String STR_COULDNOTOPEN_LINKEDDOC
 {
-    Text = "Das Dokument\n\n$file$\n\nkonnte nicht ge�ffnet werden.";
-    Text [ english ] = "Th document\n\n$file$\n\ncould not be opened.";
-    Text [ english_us ] = "The document\n\n$file$\n\ncould not be opened.";
-    Text[ portuguese ] = "Foi imposs�vel abrir o documento\n\n$file$\n\n.";
-    Text[ russian ] = "���������� ������� ��������\n\n$file$\n\n.";
-    Text[ greek ] = "��� ���� ������� �� �������� �� �������\n\n$file$.";
-    Text[ dutch ] = "Het document\n\n$file$\n\nkan niet worden geopend.";
-    Text[ french ] = "Impossible d'ouvrir\n\nle document\n\n$file$ !";
-    Text[ spanish ] = "No se pudo abrir el documento\n\n$file$\n\n.";
-    Text[ finnish ] = "Asiakirjan\n\n$file$\n\navaaminen ei onnistunut.";
-    Text[ italian ] = "Impossibile\naprire il documento\n\n$file$.";
-    Text[ danish ] = "Dokumentet\n\n$file$\n\nkunne ikke �bnes.";
-    Text[ swedish ] = "Det gick inte att �ppna dokumentet\n\n$file$\n\n.";
-    Text[ polish ] = "Otwarcie dokumentu\n\n$file$\n\nnie powiod�o si�.";
-    Text[ portuguese_brazilian ] = "Th document\n\n$file$\n\ncould not be opened.";
-    Text[ japanese ] = "ドキュメント\n\n$file$ は\n\n開けませんでした。";
-    Text[ korean ] = "\n\n$파일$\n\n문서를 열수 없었습니다";
-    Text[ chinese_simplified ] = "这个文档\n\n$file$\n\n无法被打开。";
-    Text[ chinese_traditional ] = "這個文件\n\n$file$\n\n無法開啟。";
-    Text[ turkish ] = "Th document\n\n$file$\n\ncould not be opened.";
-    Text[ arabic ] = "Th document\n\n$file$\n\ncould not be opened.";
-    Text[ catalan ] = "No s'ha pogut obrir el document\n\n$file$.\n\n";
-    Text[ thai ] = "ไม่สามารถเปิดเอกสาร\n\n$file$\n\nได้";
+Text = "Das Dokument\n\n$file$\n\nkonnte nicht ge�ffnet werden.";
+Text [ english ] = "Th document\n\n$file$\n\ncould not be opened.";
+Text [ english_us ] = "The document\n\n$file$\n\ncould not be opened.";
+Text[ portuguese ] = "Foi imposs�vel abrir o documento\n\n$file$\n\n.";
+Text[ russian ] = "���������� ������� ��������\n\n$file$\n\n.";
+Text[ greek ] = "��� ���� ������� �� �������� �� �������\n\n$file$.";
+Text[ dutch ] = "Het document\n\n$file$\n\nkan niet worden geopend.";
+Text[ french ] = "Impossible d'ouvrir\n\nle document\n\n$file$ !";
+Text[ spanish ] = "No se pudo abrir el documento\n\n$file$\n\n.";
+Text[ finnish ] = "Asiakirjan\n\n$file$\n\navaaminen ei onnistunut.";
+Text[ italian ] = "Impossibile\naprire il documento\n\n$file$.";
+Text[ danish ] = "Dokumentet\n\n$file$\n\nkunne ikke �bnes.";
+Text[ swedish ] = "Det gick inte att �ppna dokumentet\n\n$file$\n\n.";
+Text[ polish ] = "Otwarcie dokumentu\n\n$file$\n\nnie powiod�o si�.";
+Text[ portuguese_brazilian ] = "Th document\n\n$file$\n\ncould not be opened.";
+Text[ japanese ] = "ドキュメント\n\n$file$ は\n\n開けませんでした。";
+Text[ korean ] = "\n\n$file$\n\n문서를 열지 못했습니다.";
+Text[ chinese_simplified ] = "这个文档\n\n$file$\n\n无法被打开。";
+Text[ chinese_traditional ] = "這個文件\n\n$file$\n\n無法開啟。";
+Text[ turkish ] = "Th document\n\n$file$\n\ncould not be opened.";
+Text[ arabic ] = "Th document\n\n$file$\n\ncould not be opened.";
+Text[ catalan ] = "No s'ha pogut obrir el document\n\n$file$.\n\n";
+Text[ thai ] = "ไม่สามารถเปิดเอกสาร\n\n$file$\n\nได้";
 };
 
 String STR_MISSING_TABLES_XDROP
 {
-    Text = "Die Tabelle kann nicht gel�scht werden, da die Datenbankverbindung diese nicht unterst�tzt.";
-    Text [ english ] = "The table can't be dropped, 'cause the database connection does not support this.";
-    Text [ english_us ] = "The table cannot be deleted because the database connection does not support this.";
-    Text[ portuguese ] = "A tabela n�o tem suporte na liga��o da base de dados e por isso imposs�vel de eliminar.";
-    Text[ russian ] = "���������� ������� �������, ��� ��� ����������� � ���� ������ ��� �� ������������.";
-    Text[ greek ] = "��� ����� ������� �� ��������� � �������, ������ ��� ������� ������� �� ��� ���� ���������.";
-    Text[ dutch ] = "De tabel kan niet worden gewist omdat deze niet wordt ondersteund door de database.";
-    Text[ french ] = "Impossible de supprimer la table : elle n'est pas support�e par la connexion de BD.";
-    Text[ spanish ] = "No se puede eliminar la tabla porque la conexi�n con la base de datos no apoya esta operaci�n.";
-    Text[ finnish ] = "Taulua ei voi poistaa, koska tietokantayhteys ei tue poistamista.";
-    Text[ italian ] = "Impossibile eliminare la tabella perch� non � supportata dal collegamento al database.";
-    Text[ danish ] = "Tabellen kan ikke slettes, da databaseforbindelsen ikke underst�tter den.";
-    Text[ swedish ] = "Det g�r inte att radera tabellen eftersom databasf�rbindelsen inte st�djer den.";
-    Text[ polish ] = "Tabeli nie mo�na usun��, poniewa� nie jest ona os�ugiwana przez po��czenie z baz� danych.";
-    Text[ portuguese_brazilian ] = "The table can't be dropped, 'cause the database connection does not support this.";
-    Text[ japanese ] = "テーブルはデータベースの接続がこれを支援しないため削除できません。";
-    Text[ korean ] = "데이터베이스 연결에서 지원되지 않기 때문에 시트을 삭제할 수 없습니다";
-    Text[ chinese_simplified ] = "因为数据库的连接不支持这个功能而无法删除这个表格。";
-    Text[ chinese_traditional ] = "因為資料庫連線不支援這個動作而無法刪除這個表格。";
-    Text[ turkish ] = "The table can't be dropped, 'cause the database connection does not support this.";
-    Text[ arabic ] = "The table can't be dropped, 'cause the database connection does not support this.";
-    Text[ catalan ] = "No es pot suprimir la taula perqu� la connexi� de la base de dades no ho permet.";
-    Text[ thai ] = "ไม่สามารถลบตารางได้เนื่องจากการเชื่อมต่อฐานข้อมูลไม่สนับสนุนสิ่งนี้";
+Text = "Die Tabelle kann nicht gel�scht werden, da die Datenbankverbindung diese nicht unterst�tzt.";
+Text [ english ] = "The table can't be dropped, 'cause the database connection does not support this.";
+Text [ english_us ] = "The table cannot be deleted because the database connection does not support this.";
+Text[ portuguese ] = "A tabela n�o tem suporte na liga��o da base de dados e por isso imposs�vel de eliminar.";
+Text[ russian ] = "���������� ������� �������, ��� ��� ��� �� �������������� ������������ � ���� ������.";
+Text[ greek ] = "��� ����� ������� �� ��������� � �������, ������ ��� ������� ������� �� ��� ���� ���������.";
+Text[ dutch ] = "De tabel kan niet worden gewist omdat deze niet wordt ondersteund door de database.";
+Text[ french ] = "Impossible de supprimer la table : elle n'est pas support�e par la connexion de BD.";
+Text[ spanish ] = "No se puede borrar la tabla porque la conexi�n con la base de datos no admite esta operaci�n.";
+Text[ finnish ] = "Taulua ei voi poistaa, koska tietokantayhteys ei tue poistamista.";
+Text[ italian ] = "Impossibile eliminare la tabella perch� non � supportata dal collegamento al database.";
+Text[ danish ] = "Tabellen kan ikke slettes, da databaseforbindelsen ikke underst�tter den.";
+Text[ swedish ] = "Det g�r inte att radera tabellen eftersom databasf�rbindelsen inte st�djer den.";
+Text[ polish ] = "Tabeli nie mo�na usun��, poniewa� nie jest ona os�ugiwana przez po��czenie z baz� danych.";
+Text[ portuguese_brazilian ] = "The table can't be dropped, 'cause the database connection does not support this.";
+Text[ japanese ] = "テーブルはデータベースの接続がこれを支援しないため削除できません。";
+Text[ korean ] = "테이블을 데이터베이스 연결에서 지원되지 않기 때문에 삭제할 수 없습니다.";
+Text[ chinese_simplified ] = "因为数据库的连接不支持这个功能而无法删除这个表格。";
+Text[ chinese_traditional ] = "因為資料庫連線不支援這個動作而無法刪除這個表格。";
+Text[ turkish ] = "The table can't be dropped, 'cause the database connection does not support this.";
+Text[ arabic ] = "The table can't be dropped, 'cause the database connection does not support this.";
+Text[ catalan ] = "No es pot suprimir la taula perqu� la connexi� de la base de dades no ho permet.";
+Text[ thai ] = "ไม่สามารถลบตารางได้เนื่องจากการเชื่อมต่อฐานข้อมูลไม่สนับสนุนสิ่งนี้";
 };
 
 String STR_BUTTON_TEXT_ALL
 {
-    Text = "~Alle";
-    Text [ english ] = "~All";
-    Text [ english_us ] = "~All";
+Text = "~Alle";
+Text [ english ] = "~All";
+Text [ english_us ] = "~All";
 
-    Text[ language_user1 ] = "This will be a button text in a dialog asking for confirmation. Something like 'Yes/All/No/Cancel'";
-    Text[ portuguese ] = "~Tudo";
-    Text[ russian ] = "~���";
-    Text[ greek ] = "��~�";
-    Text[ dutch ] = "~Alle";
-    Text[ french ] = "~Tout";
-    Text[ spanish ] = "~Todos";
-    Text[ finnish ] = "~Kaikki";
-    Text[ italian ] = "~Tutti";
-    Text[ danish ] = "~Alle";
-    Text[ swedish ] = "~Alla";
-    Text[ polish ] = "~Wszystkie";
-    Text[ portuguese_brazilian ] = "~All";
-    Text[ japanese ] = "すべて(~A)";
-    Text[ korean ] = "모두(~A)";
-    Text[ chinese_simplified ] = "全部(~A)";
-    Text[ chinese_traditional ] = "全部(~A)";
-    Text[ turkish ] = "~All";
-    Text[ arabic ] = "~All";
-    Text[ catalan ] = "~Tots";
-    Text[ thai ] = "~ทั้งหมด";
+Text[ language_user1 ] = "This will be a button text in a dialog asking for confirmation. Something like 'Yes/All/No/Cancel'";
+Text[ portuguese ] = "~Tudo";
+Text[ russian ] = "~���";
+Text[ greek ] = "��~�";
+Text[ dutch ] = "~Alle";
+Text[ french ] = "~Tout";
+Text[ spanish ] = "~Todos";
+Text[ finnish ] = "~Kaikki";
+Text[ italian ] = "~Tutti";
+Text[ danish ] = "~Alle";
+Text[ swedish ] = "~Alla";
+Text[ polish ] = "~Wszystkie";
+Text[ portuguese_brazilian ] = "~All";
+Text[ japanese ] = "すべて(~A)";
+Text[ korean ] = "모두(~A)";
+Text[ chinese_simplified ] = "全部(~A)";
+Text[ chinese_traditional ] = "全部(~A)";
+Text[ turkish ] = "~All";
+Text[ arabic ] = "~All";
+Text[ catalan ] = "~Tots";
+Text[ thai ] = "~ทั้งหมด";
 };
 
 String STR_UNDO_COLON
 {
-    Text = "R�ckg�ngig:" ;
-    Text [ ENGLISH ] = "Undo:" ;
-    Text[ english_us ] = "Undo:";
-    Text[ portuguese ] = "Anular:";
-    Text[ russian ] = "��������";
-    Text[ greek ] = "��������";
-    Text[ dutch ] = "Ongedaan";
-    Text[ french ] = "Annuler:";
-    Text[ spanish ] = "Deshacer:";
-    Text[ italian ] = "Annulla:";
-    Text[ danish ] = "Fortryd:";
-    Text[ swedish ] = "�ngra:";
-    Text[ polish ] = "Cofnij";
-    Text[ portuguese_brazilian ] = "Undo:";
-    Text[ japanese ] = "元に戻す:";
-    Text[ korean ] = "실행 취소:";
-    Text[ chinese_simplified ] = "撤消命令：";
-    Text[ chinese_traditional ] = "復原：";
-    Text[ turkish ] = "Undo";
-    Text[ arabic ] = "�����";
-    Text[ catalan ] = "Desf�s:";
-    Text[ finnish ] = "Peruuta:";
-    Text[ thai ] = "เลิกทำ";
+Text = "R�ckg�ngig:" ;
+Text [ ENGLISH ] = "Undo:" ;
+Text[ english_us ] = "Undo:";
+Text[ portuguese ] = "Anular:";
+Text[ russian ] = "��������";
+Text[ greek ] = "��������";
+Text[ dutch ] = "Ongedaan";
+Text[ french ] = "Annuler :";
+Text[ spanish ] = "Deshacer:";
+Text[ italian ] = "Annulla:";
+Text[ danish ] = "Fortryd:";
+Text[ swedish ] = "�ngra:";
+Text[ polish ] = "Cofnij";
+Text[ portuguese_brazilian ] = "Undo:";
+Text[ japanese ] = "元に戻す:";
+Text[ korean ] = "실행 취소:";
+Text[ chinese_simplified ] = "撤消命令：";
+Text[ chinese_traditional ] = "復原：";
+Text[ turkish ] = "Undo";
+Text[ arabic ] = "�����";
+Text[ catalan ] = "Desf�s:";
+Text[ finnish ] = "Peruuta:";
+Text[ thai ] = "เลิกทำ";
 };
 
 String STR_REDO_COLON
 {
-    Text = "Wiederherstellen:" ;
-    Text [ ENGLISH ] = "Redo:" ;
-    Text[ english_us ] = "Redo:";
-    Text[ portuguese ] = "Restaurar:";
-    Text[ russian ] = "������������";
-    Text[ greek ] = "���������";
-    Text[ dutch ] = "Herstellen:";
-    Text[ french ] = "Restaurer:";
-    Text[ spanish ] = "Restaurar:";
-    Text[ italian ] = "Ripristina:";
-    Text[ danish ] = "Gendan:";
-    Text[ swedish ] = "�terst�ll:";
-    Text[ polish ] = "Przywr��";
-    Text[ portuguese_brazilian ] = "Redo:";
-    Text[ japanese ] = "やり直し:";
-    Text[ korean ] = "다시 실행:";
-    Text[ chinese_simplified ] = "恢复撤消命令：";
-    Text[ chinese_traditional ] = "恢復撤消指令:";
-    Text[ turkish ] = "Redo";
-    Text[ arabic ] = "�����";
-    Text[ catalan ] = "Ref�s";
-    Text[ finnish ] = "Toista ";
-    Text[ thai ] = "ทำซ้ำ";
+Text = "Wiederherstellen:" ;
+Text [ ENGLISH ] = "Redo:" ;
+Text[ english_us ] = "Redo:";
+Text[ portuguese ] = "Restaurar:";
+Text[ russian ] = "������������";
+Text[ greek ] = "���������";
+Text[ dutch ] = "Herstellen:";
+Text[ french ] = "Restaurer :";
+Text[ spanish ] = "Restaurar:";
+Text[ italian ] = "Ripristina:";
+Text[ danish ] = "Gendan:";
+Text[ swedish ] = "�terst�ll:";
+Text[ polish ] = "Przywr��";
+Text[ portuguese_brazilian ] = "Redo:";
+Text[ japanese ] = "やり直し:";
+Text[ korean ] = "다시 실행:";
+Text[ chinese_simplified ] = "恢复撤消命令：";
+Text[ chinese_traditional ] = "恢復撤消指令:";
+Text[ turkish ] = "Redo";
+Text[ arabic ] = "�����";
+Text[ catalan ] = "Ref�s";
+Text[ finnish ] = "Toista ";
+Text[ thai ] = "ทำซ้ำ";
 };
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.51  2002/12/05 10:31:17  kz
- *  Merge SRX644: 05.12.02 - 11:27:53
- *
- *  Revision 1.50  2002/11/25 15:12:13  kz
- *  Merge SRX644: 25.11.02 - 16:08:20
- *
- *  Revision 1.49  2002/11/21 15:27:11  oj
- *  #105213# impl new feature of rown mysql driver page
- *
- *  Revision 1.48  2002/09/05 10:53:01  kz
- *  Merge SRX643: 05.09.02 - 12:49:41
- *
- *  Revision 1.47  2002/08/19 07:51:10  oj
- *  #99473# change string resource files
- *
- *  Revision 1.46  2002/08/01 20:27:29  kz
- *  Merge SRX643: 01.08.02 - 22:24:17
- *
- *  Revision 1.45  2002/07/22 07:39:28  oj
- *  #101514# remove resource entries for PLUS and MINUS
- *
- *  Revision 1.0 26.09.00 08:26:13  fs
- ************************************************************************/
-
-
-
-
-
 
 
 
diff --git a/dbaccess/source/ui/misc/dsntypes.cxx b/dbaccess/source/ui/misc/dsntypes.cxx
index 26768a6f5e66..3c0dfc1c2c41 100644
--- a/dbaccess/source/ui/misc/dsntypes.cxx
+++ b/dbaccess/source/ui/misc/dsntypes.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsntypes.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 15:24:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,12 +71,19 @@
 #ifndef _DBU_MISCRES_HRC_
 #include "dbumiscres.hrc"
 #endif
-
+#ifndef _UNOTOOLS_CONFIGNODE_HXX_
+#include <unotools/confignode.hxx>
+#endif
+#ifndef DBAUI_TOOLS_HXX
+#include "UITools.hxx"
+#endif
 //.........................................................................
 namespace dbaui
 {
 //.........................................................................
 
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
 //=========================================================================
 //= ODsnTypeCollection
 //=========================================================================
@@ -115,11 +122,54 @@ ODsnTypeCollection::~ODsnTypeCollection()
     DBG_ASSERT(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!");
     DBG_DTOR(ODsnTypeCollection,NULL);
 }
+// -----------------------------------------------------------------------------
+void ODsnTypeCollection::initUserDriverTypes(const Reference< XMultiServiceFactory >& _rxORB)
+{
+    // read the user driver out of the configuration
+    // the config node where all pooling relevant info are stored under
+    ::utl::OConfigurationTreeRoot aUserDefinedDriverRoot = ::utl::OConfigurationTreeRoot::createWithServiceFactory(
+        _rxORB, ::dbaui::getUserDefinedDriverNodeName(), -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
+
+    if ( aUserDefinedDriverRoot.isValid() )
+    {
+        Sequence< ::rtl::OUString > aDriverKeys = aUserDefinedDriverRoot.getNodeNames();
+        const ::rtl::OUString* pDriverKeys = aDriverKeys.getConstArray();
+        const ::rtl::OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength();
+        for (sal_Int32 i=0;pDriverKeys != pDriverKeysEnd && i <= DST_USERDEFINE10; ++pDriverKeys)
+        {
+            ::utl::OConfigurationNode aThisDriverSettings = aUserDefinedDriverRoot.openNode(*pDriverKeys);
+            if ( aUserDefinedDriverRoot.isValid() )
+            {
+                // read the needed information
+                ::rtl::OUString sDsnPrefix,sDsnTypeDisplayName;
+                aThisDriverSettings.getNodeValue(getDriverTypeDisplayNodeName()) >>= sDsnTypeDisplayName;
+                aThisDriverSettings.getNodeValue(getDriverDsnPrefixNodeName()) >>= sDsnPrefix;
+
+                m_aDsnTypesDisplayNames.push_back(sDsnTypeDisplayName);
+                m_aDsnPrefixes.push_back(sDsnPrefix);
+                m_aDsnTypes.push_back(static_cast<DATASOURCE_TYPE>(DST_USERDEFINE1 + i++));
+            }
+        }
+    }
+}
 
 //-------------------------------------------------------------------------
 DATASOURCE_TYPE ODsnTypeCollection::getType(const String& _rDsn)
 {
-    return implDetermineType(_rDsn);
+    DATASOURCE_TYPE eType = DST_UNKNOWN;
+    // look for user defined driver types
+    StringVector::iterator aIter = m_aDsnPrefixes.begin();
+    StringVector::iterator aEnd = m_aDsnPrefixes.end();
+    for (; aIter != aEnd; ++aIter)
+    {
+        if ( aIter->EqualsIgnoreCaseAscii(_rDsn,0, ::std::min<sal_Int32>(static_cast<sal_Int32>(_rDsn.Len()),aIter->Len())) )
+        {
+            size_t nPos = (aIter - m_aDsnPrefixes.begin());
+            if ( nPos < m_aDsnTypes.size() )
+                eType = m_aDsnTypes[nPos];
+        }
+    }
+    return eType;
 }
 
 //-------------------------------------------------------------------------
@@ -156,7 +206,7 @@ String ODsnTypeCollection::cutPrefix(const String& _rDsn)
 //-------------------------------------------------------------------------
 String ODsnTypeCollection::getTypeDisplayName(const String& _rDsn)
 {
-    return getTypeDisplayName(implDetermineType(_rDsn));
+    return getTypeDisplayName(getType(_rDsn));
 }
 
 //-------------------------------------------------------------------------
@@ -179,6 +229,16 @@ sal_Bool ODsnTypeCollection::hasAuthentication(DATASOURCE_TYPE _eType)
 {
     switch (_eType)
     {
+        case DST_USERDEFINE1:   /// first user defined driver
+        case DST_USERDEFINE2:
+        case DST_USERDEFINE3:
+        case DST_USERDEFINE4:
+        case DST_USERDEFINE5:
+        case DST_USERDEFINE6:
+        case DST_USERDEFINE7:
+        case DST_USERDEFINE8:
+        case DST_USERDEFINE9:
+        case DST_USERDEFINE10:
         case DST_ADABAS:
         case DST_JDBC:
         case DST_MYSQL_ODBC:
@@ -295,7 +355,7 @@ sal_Int32 ODsnTypeCollection::implDetermineTypeIndex(DATASOURCE_TYPE _eType)
 //-------------------------------------------------------------------------
 sal_Int32 ODsnTypeCollection::implDetermineTypeIndex(const String& _rDsn)
 {
-    return implDetermineTypeIndex(implDetermineType(_rDsn));
+    return implDetermineTypeIndex(getType(_rDsn));
 }
 
 //-------------------------------------------------------------------------
@@ -456,52 +516,3 @@ ADDRESSBOOK_TYPE AddressBookTypes::getAddressType( const String& _rAddressURL )
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.14  2002/08/19 07:51:11  oj
- *  #99473# change string resource files
- *
- *  Revision 1.13  2001/08/16 13:00:02  hr
- *  #65293#: syntax
- *
- *  Revision 1.12  2001/08/15 13:16:25  oj
- *  #88644# insert some DBG's
- *
- *  Revision 1.11  2001/08/07 15:55:24  fs
- *  #88431# +isFileSystemBased
- *
- *  Revision 1.10  2001/08/01 08:32:49  fs
- *  #88530# getAddressType: allow for invalid URLs without assertion
- *
- *  Revision 1.9  2001/07/31 15:59:13  fs
- *  #88530# +AddressBookType(s)
- *
- *  Revision 1.8  2001/05/29 13:11:51  oj
- *  #87149# addressbook ui impl
- *
- *  Revision 1.7  2001/05/23 14:16:41  oj
- *  #87149# new helpids
- *
- *  Revision 1.6  2001/01/29 16:02:05  nn
- *  added DST_CALC
- *
- *  Revision 1.5  2001/01/04 11:20:23  fs
- *  #81485# +DST_ADO
- *
- *  Revision 1.4  2000/11/21 15:02:06  oj
- *  #80549# wrong dsn for text
- *
- *  Revision 1.3  2000/10/30 07:59:18  fs
- *  + hasAuthentification(DATASOURCE_TYPE)
- *
- *  Revision 1.2  2000/10/20 07:01:39  fs
- *  sdbc:text -> sdbc:flat:file
- *
- *  Revision 1.1  2000/10/05 10:09:11  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 26.09.00 08:05:35  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 9a56f64db72a..dc5b83e60049 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexcollection.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-30 14:12:19 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -450,20 +450,3 @@ namespace dbaui
 }   // namespace dbaui
 //......................................................................
 
-
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.3  2001/03/30 13:56:42  avy
- *  Temporary variable added because of error during compiling under the Lunux
- *
- *  Revision 1.2  2001/03/19 06:03:23  fs
- *  ensure that no fields occure twice when committing
- *
- *  Revision 1.1  2001/03/16 16:22:20  fs
- *  initial checkin - non-UNO index collection
- *
- *
- *  Revision 1.0 07.03.01 15:09:42  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index fb4e6e30b167..36f98127d935 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: linkeddocuments.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-15 06:32:30 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -655,25 +655,3 @@ namespace dbaui
 }   // namespace dbaui
 //......................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.5  2002/08/19 07:51:11  oj
- *  #99473# change string resource files
- *
- *  Revision 1.4  2002/07/25 06:53:40  oj
- *  #100280# new method to start report autopilot
- *
- *  Revision 1.3  2001/08/16 14:10:12  fs
- *  #88813# +newFormWithPilot
- *
- *  Revision 1.2  2001/08/07 14:37:48  fs
- *  #87029# use the new template dialog for selecting a template
- *
- *  Revision 1.1  2001/04/26 11:54:33  fs
- *  initial checkin - access to the data source associated bookmarks
- *
- *
- *  Revision 1.0 24.04.01 14:56:54  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx
index b00aa2dcb66a..30b5ed5e03a1 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moduledbu.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 10:09:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -168,10 +168,3 @@ void OModule::ensureImpl()
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 20.09.00 16:16:54  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx
index f4f094dcbfdc..36e74102b865 100644
--- a/dbaccess/source/ui/misc/propertysetitem.cxx
+++ b/dbaccess/source/ui/misc/propertysetitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertysetitem.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-05 14:00:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,10 +115,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 05.02.01 13:45:48  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index f376dc766040..de5bf92468c6 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: singledoccontroller.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-08 13:18:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -576,34 +576,3 @@ namespace dbaui
 }   // namespace dbaui
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.8  2002/08/19 07:51:11  oj
- *  #99473# change string resource files
- *
- *  Revision 1.7  2002/07/08 08:15:44  oj
- *  #97156# check if we are already suspended
- *
- *  Revision 1.6  2002/05/06 08:50:00  oj
- *  #96363# impl new interface
- *
- *  Revision 1.5  2001/09/07 10:03:53  fs
- *  ::disposing: don't reconnect if we're InDispose
- *
- *  Revision 1.4  2001/08/16 13:00:02  hr
- *  #65293#: syntax
- *
- *  Revision 1.3  2001/08/15 13:36:51  fs
- *  #88637# add a separator above the toolbox
- *
- *  Revision 1.2  2001/08/15 13:16:25  oj
- *  #88644# insert some DBG's
- *
- *  Revision 1.1  2001/08/14 12:00:02  fs
- *  initial checkin - base class for controller which work on one single object belonging to a data source connection
- *
- *
- *  Revision 1.0 14.08.01 09:45:39  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx
index d6d041258282..305dc1cd2be3 100644
--- a/dbaccess/source/ui/misc/stringlistitem.cxx
+++ b/dbaccess/source/ui/misc/stringlistitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: stringlistitem.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 10:09:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,10 +116,3 @@ SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 02.10.00 11:02:21  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index 0b80f4dd87ee..db3828e58961 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryDesignFieldUndoAct.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-30 11:15:52 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,9 +88,15 @@ namespace dbaui
         virtual void    Redo() = 0;
 
     public:
-        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OCommentUndoAction(nCommentID), pOwner(pSelBrwBox), m_nColumnPostion(BROWSER_INVALIDID) { }
+        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID);
+        virtual ~OQueryDesignFieldUndoAct();
 
-        inline void SetColumnPosition(USHORT _nColumnPostion) { m_nColumnPostion = _nColumnPostion; }
+        inline void SetColumnPosition(USHORT _nColumnPostion)
+        {
+            m_nColumnPostion = _nColumnPostion;
+            OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!");
+            OSL_ENSURE(m_nColumnPostion < pOwner->GetColumnCount(),"Position outside the column count!");
+        }
     };
 
     // ================================================================================================
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index f7291cb07e57..b1f2599bd510 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryDesignView.cxx,v $
  *
- *  $Revision: 1.56 $
+ *  $Revision: 1.57 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-07 13:06:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -727,7 +727,7 @@ namespace
                     {
                         // we have to look if we have alias.* here
                         String sTemp = rFieldName;
-                        if(sTemp.GetTokenCount('.') == 2)
+                        if ( sTemp.GetTokenCount('.') == 2 && sTemp.GetToken(1,'.').Len() )
                             rFieldName = sTemp.GetToken(1,'.');
                         if ( rFieldName.toChar() != '*' )
                         {
@@ -2013,7 +2013,11 @@ namespace
                                                         sal_True); // quote is to true because we need quoted elements inside the function
 
                             sal_Int32 nFunctionType = FKT_NONE;
-                            ::connectivity::OSQLParseNode * pParamRef = pColumnRef->getChild(pColumnRef->count()-2);
+                            ::connectivity::OSQLParseNode* pParamRef = NULL;
+                            sal_Int32 nColumnRefPos = pColumnRef->count() - 2;
+                            if ( nColumnRefPos >= 0 && nColumnRefPos < pColumnRef->count() )
+                                pParamRef = pColumnRef->getChild(nColumnRefPos);
+
                             if (    SQL_ISRULE(pColumnRef,general_set_fct)
                                 &&  SQL_ISRULE(pParamRef,column_ref) )
                             {
@@ -2066,7 +2070,7 @@ namespace
                                 OSQLParseNode* pFunctionName = pColumnRef->getChild(0);
                                 if ( !SQL_ISPUNCTUATION(pFunctionName,"{") )
                                 {
-                                    if ( SQL_ISRULE(pColumnRef,char_value_fct) )
+                                    if ( SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) )
                                         pFunctionName = pFunctionName->getChild(0);
 
                                     ::rtl::OUString sFunctionName = pFunctionName->getTokenValue();
@@ -2610,7 +2614,10 @@ long OQueryDesignView::PreNotify(NotifyEvent& rNEvt)
 // check if the statement is correct when not returning false
 sal_Bool OQueryDesignView::checkStatement()
 {
-    return m_pSelectionBox->Save(); // a error occured so we return no
+    sal_Bool bRet = sal_True;
+    if ( m_pSelectionBox )
+        bRet = m_pSelectionBox->Save(); // a error occured so we return no
+    return bRet;
 }
 //-------------------------------------------------------------------------------
 ::rtl::OUString OQueryDesignView::getStatement()
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index 7459e514a544..f9593ef6399f 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryTabWinUndoAct.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-30 11:15:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,6 +85,22 @@
 
 
 using namespace dbaui;
+DBG_NAME(OQueryDesignFieldUndoAct)
+OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID)
+    : OCommentUndoAction(nCommentID)
+    , pOwner(pSelBrwBox)
+    , m_nColumnPostion(BROWSER_INVALIDID)
+{
+    DBG_CTOR(OQueryDesignFieldUndoAct,NULL);
+}
+// -----------------------------------------------------------------------------
+OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct()
+{
+    pOwner = NULL;
+    DBG_DTOR(OQueryDesignFieldUndoAct,NULL);
+}
+// -----------------------------------------------------------------------------
+
 DBG_NAME(OQueryTabWinUndoAct )
 // ------------------------------------------------------------------------------------------------
 OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommentID)
@@ -121,28 +137,41 @@ OQueryTabWinUndoAct::~OQueryTabWinUndoAct()
 //------------------------------------------------------------------------------
 void OTabFieldCellModifiedUndoAct::Undo()
 {
-    USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion);
-    String strNext = pOwner->GetCellContents(m_nCellIndex, nColumnId);
-    pOwner->SetCellContents(m_nCellIndex, nColumnId, m_strNextCellContents);
-    m_strNextCellContents = strNext;
+    OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!");
+    OSL_ENSURE(m_nColumnPostion < pOwner->GetColumnCount(),"Position outside the column count!");
+    if ( m_nColumnPostion != BROWSER_INVALIDID )
+    {
+        USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion);
+        String strNext = pOwner->GetCellContents(m_nCellIndex, nColumnId);
+        pOwner->SetCellContents(m_nCellIndex, nColumnId, m_strNextCellContents);
+        m_strNextCellContents = strNext;
+    }
 }
 
 //------------------------------------------------------------------------------
 void OTabFieldSizedUndoAct::Undo()
 {
-    USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion);
-    long nNextWidth = pOwner->GetColumnWidth(nColumnId);
-    pOwner->SetColWidth(nColumnId, m_nNextWidth);
-    m_nNextWidth = nNextWidth;
+    OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!");
+    if ( m_nColumnPostion != BROWSER_INVALIDID )
+    {
+        USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion);
+        long nNextWidth = pOwner->GetColumnWidth(nColumnId);
+        pOwner->SetColWidth(nColumnId, m_nNextWidth);
+        m_nNextWidth = nNextWidth;
+    }
 }
 // -----------------------------------------------------------------------------
 void OTabFieldMovedUndoAct::Undo()
 {
-    sal_uInt16 nId = pDescr->GetColumnId();
-    USHORT nOldPos = pOwner->GetColumnPos(nId);
-    pOwner->SetColumnPos(nId,m_nColumnPostion);
-    pOwner->ColumnMoved(nId,FALSE);
-    m_nColumnPostion = nOldPos;
+    OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!");
+    if ( m_nColumnPostion != BROWSER_INVALIDID )
+    {
+        sal_uInt16 nId = pDescr->GetColumnId();
+        USHORT nOldPos = pOwner->GetColumnPos(nId);
+        pOwner->SetColumnPos(nId,m_nColumnPostion);
+        pOwner->ColumnMoved(nId,FALSE);
+        m_nColumnPostion = nOldPos;
+    }
 }
 // -----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 0ea8a818a479..3ea7b2d58bb7 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SelectionBrowseBox.cxx,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-24 10:52:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,6 +153,10 @@ const String g_strZero = String::CreateFromAscii("0");
 #define HANDLE_ID            0
 #define HANDLE_COLUMN_WITDH 70
 
+#define SQL_ISRULEOR2(pParseNode, e1,e2)    ((pParseNode)->isRule() && (\
+                                            (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::##e1) || \
+                                            (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::##e2)))
+
 
 // -----------------------------------------------------------------------------
 namespace
@@ -825,12 +829,37 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
                         // append the whole text as field name
                         // so we first clear the function field
                         clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId);
+                        sal_Bool bQuote = sal_False;
+                        if (    SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct)
+                            ||  SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) )
+                        {
+                            bQuote = sal_True;
+                            sal_Int32 nDataType = DataType::DOUBLE;
+                            OSQLParseNode* pFunctionName = pColumnRef->getChild(0);
+                            if ( !SQL_ISPUNCTUATION(pFunctionName,"{") )
+                            {
+                                if ( SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) )
+                                    pFunctionName = pFunctionName->getChild(0);
+
+                                if ( pFunctionName )
+                                {
+                                    ::rtl::OUString sFunctionName = pFunctionName->getTokenValue();
+                                    if ( !sFunctionName.getLength() )
+                                        sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_MS_1252);
+
+                                    nDataType = OSQLParser::getFunctionReturnType(
+                                                        sFunctionName
+                                                        ,&pController->getParser()->getContext());
+                                    aSelEntry->SetDataType(nDataType);
+                                }
+                            }
+                        }
 
-                        // now parse teh hole statement
+                        // now parse the hole statement
                         sal_uInt32 nFunCount = pColumnRef->count();
                         ::rtl::OUString sParameters;
                         for(sal_uInt32 i = 0; i < nFunCount; ++i)
-                            pColumnRef->getChild(i)->parseNodeToStr(sParameters,xMetaData,&pParser->getContext(),sal_True,sal_False);
+                            pColumnRef->getChild(i)->parseNodeToStr(sParameters,xMetaData,&pParser->getContext(),sal_True,bQuote);
 
                         ::rtl::OUString sOldAlias = aSelEntry->GetAlias();
                         aSelEntry->SetAlias(::rtl::OUString());
@@ -838,6 +867,11 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
                         sal_Int32 nNewFunctionType = aSelEntry->GetFunctionType() | FKT_NUMERIC;
                         aSelEntry->SetFunctionType(nNewFunctionType);
 
+
+                        aSelEntry->SetFieldType(TAB_NORMAL_FIELD);
+
+                        aSelEntry->SetTabWindow(NULL);
+
                         aSelEntry->SetField(sParameters);
                         notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId);
                     }
@@ -2177,7 +2211,8 @@ String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     //  DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross");
-    SaveModified();
+    if ( GetCurColumnId() == nColId )
+        SaveModified();
 
     USHORT nPos = GetColumnPos(nColId);
     OTableFieldDescRef pEntry = getFields()[nPos - 1];
@@ -2219,8 +2254,6 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S
             break;
         case BROW_FIELD_ROW:
             pEntry->SetField(strNewText);
-            if (strNewText.Len() == 0)          // bei leerem Feld auch den Tabellennamen loeschen
-                pEntry->SetAlias(strNewText);
             break;
         case BROW_TABLE_ROW:
             pEntry->SetAlias(strNewText);
@@ -2425,6 +2458,7 @@ void OSelectionBrowseBox::appendUndoAction(const String& _rOldValue,const String
     {
         OTabFieldCellModifiedUndoAct* pUndoAct = new OTabFieldCellModifiedUndoAct(this);
         pUndoAct->SetCellIndex(_nRow);
+        OSL_ENSURE(GetColumnPos(GetCurColumnId()) != BROWSER_INVALIDID,"Current position isn't valid!");
         pUndoAct->SetColumnPosition( GetColumnPos(GetCurColumnId()) );
         pUndoAct->SetCellContents(_rOldValue);
         getDesignView()->getController()->addUndoActionAndInvalidate(pUndoAct);
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index a923a4fab622..d7b50d7c4010 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindowListBox.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-21 07:09:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,10 +115,10 @@ OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent, const String& r
     ,m_nDropEvent(0)
 {
     DBG_CTOR(OTableWindowListBox,NULL);
+    m_aScrollTimer.SetTimeout( SCROLLING_TIMESPAN );
     SetDoubleClickHdl( LINK(this, OTableWindowListBox, DoubleClickHdl) );
 
-    m_aScrollHelper.setUpScrollMethod( LINK(this, OTableWindowListBox, ScrollUpHdl) );
-    m_aScrollHelper.setDownScrollMethod( LINK(this, OTableWindowListBox, ScrollDownHdl) );
+    SetSelectionMode(SINGLE_SELECTION);
 
     SetHighlightRange( );
 }
@@ -138,7 +138,8 @@ OTableWindowListBox::~OTableWindowListBox()
 {
     if (m_nDropEvent)
         Application::RemoveUserEvent(m_nDropEvent);
-
+    if( m_aScrollTimer.IsActive() )
+        m_aScrollTimer.Stop();
     m_pTabWin = NULL;
     DBG_DTOR(OTableWindowListBox,NULL);
 }
@@ -229,30 +230,40 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
         return SvTreeListBox::PreNotify(rNEvt);
     return 1L;
 }
-// -----------------------------------------------------------------------------
-void scrollWindow(OTableWindowListBox* _pListBox, const Point& _rPos,sal_Bool _bUp)
+
+//------------------------------------------------------------------------------
+IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, pBox )
 {
-    SvLBoxEntry* pEntry = _pListBox->GetEntry( _rPos );
+    SvLBoxEntry* pEntry = GetEntry( m_aMousePos );
+    if( !pEntry )
+        return 0;
 
-    if( pEntry && pEntry != _pListBox->Last() )
+    if( pEntry != Last() )
     {
-        _pListBox->ScrollOutputArea( _bUp ? -1 : 1 );
-        pEntry = _pListBox->GetEntry( _rPos );
-        _pListBox->Select( pEntry, TRUE );
+        ScrollOutputArea( -1 );
+        pEntry = GetEntry( m_aMousePos );
+        Select( pEntry, TRUE );
+//      m_aScrollTimer.Start();
     }
-}
-//------------------------------------------------------------------------------
-IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, EMPTY_ARG )
-{
-    scrollWindow(this,m_aMousePos,sal_True);
 
     return 0;
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, EMPTY_ARG )
+IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, pBox )
 {
-    scrollWindow(this,m_aMousePos,sal_False);
+    SvLBoxEntry* pEntry = GetEntry( m_aMousePos );
+    if( !pEntry )
+        return 0;
+
+    if( pEntry != Last() )
+    {
+        ScrollOutputArea( 1 );
+        pEntry = GetEntry( m_aMousePos );
+        Select( pEntry, TRUE );
+//      m_aScrollTimer.Start();
+    }
+
     return 0;
 }
 
@@ -285,6 +296,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
         && OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_JOIN) )
     {   // don't drop into the window if it's the drag source itself
 
+
         // remove the selection if the dragging operation is leaving the window
         if (_rEvt.mbLeaving)
             SelectAll(FALSE);
@@ -292,19 +304,49 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
         {
             // hit test
             m_aMousePos = _rEvt.maPosPixel;
+            Size aOutputSize = GetOutputSizePixel();
             SvLBoxEntry* pEntry = GetEntry( m_aMousePos );
-            if( pEntry )
+            if( !pEntry )
+                return DND_ACTION_NONE;
+
+            // Scrolling Areas
+            Rectangle aBottomScrollArea( Point(0, aOutputSize.Height()-LISTBOX_SCROLLING_AREA),
+                                         Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
+            Rectangle aTopScrollArea( Point(0,0), Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
+
+            // Wenn Zeiger auf der oberen ScrollingArea steht, nach oben scrollen
+            if( aBottomScrollArea.IsInside(m_aMousePos) )
+            {
+                if( !m_aScrollTimer.IsActive() )
+                {
+                    m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollUpHdl) );
+                    ScrollUpHdl( this );
+                }
+            }
+
+            // Wenn Zeiger auf der oberen ScrollingArea steht, nach unten scrollen
+            else if( aTopScrollArea.IsInside(m_aMousePos) )
             {
-                m_aScrollHelper.scroll(m_aMousePos,GetOutputSizePixel());
-                // Beim Drag automatisch den richtigen Eintrag selektieren
-                if ((FirstSelected() != pEntry) || (FirstSelected() && NextSelected(FirstSelected())))
-                    SelectAll(FALSE);
-                Select(pEntry, TRUE);
-
-                // Auf den ersten Eintrag (*) kann nicht gedroppt werden
-                if(!( m_pTabWin->GetData()->IsShowAll() && (pEntry==First()) ))
-                    nDND_Action = DND_ACTION_LINK;
+                if( !m_aScrollTimer.IsActive() )
+                {
+                    m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollDownHdl) );
+                    ScrollDownHdl( this );
+                }
+            }
+            else
+            {
+                if( m_aScrollTimer.IsActive() )
+                    m_aScrollTimer.Stop();
             }
+
+            // Beim Drag automatisch den richtigen Eintrag selektieren
+            if ((FirstSelected() != pEntry) || (FirstSelected() && NextSelected(FirstSelected())))
+                SelectAll(FALSE);
+            Select(pEntry, TRUE);
+
+            // Auf den ersten Eintrag (*) kann nicht gedroppt werden
+            if(!( m_pTabWin->GetData()->IsShowAll() && (pEntry==First()) ))
+                nDND_Action = DND_ACTION_LINK;
         }
     }
     return nDND_Action;
@@ -320,7 +362,7 @@ IMPL_LINK( OTableWindowListBox, DropHdl, void *, EMPTY_ARG)
     try
     {
         OJoinTableView* pCont = m_pTabWin->getTableView();
-        OSL_ENSURE(pCont,"No OJoinTableView!");
+        OSL_ENSURE(pCont,"No QueryTableView!");
         pCont->AddConnection(m_aDropInfo.aSource, m_aDropInfo.aDest);
     }
     catch(const SQLException& e)
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 2f6d161a4576..980930762cbd 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: query.src,v $
  *
- *  $Revision: 1.77 $
+ *  $Revision: 1.78 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-12 13:44:48 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -180,7 +180,7 @@ String STR_QUERY_UNDO_TABWINSHOW
     Text[ dutch ] = "Tabelvenster toevoegen";
     Text[ chinese_simplified ] = "新增表格窗口";
     Text[ greek ] = "�������� ��������� ������";
-    Text[ korean ] = "시트 창 삽입";
+    Text[ korean ] = "테이블 창 추가";
     Text[ arabic ] = "����� ����";
     Text[ turkish ] = "Tablo penceresi ekle";
     Text[ language_user1 ] = " ";
@@ -210,7 +210,7 @@ String STR_QUERY_UNDO_MOVETABWIN
     Text[ dutch ] = "Tabelvenster verplaatsen";
     Text[ chinese_simplified ] = "移动表格窗口";
     Text[ greek ] = "���������� ��������� ������";
-    Text[ korean ] = "시트 창 이동";
+    Text[ korean ] = "테이블 창 이동";
     Text[ arabic ] = "����� ����� ����";
     Text[ turkish ] = "Tablo penceresini ta��";
     Text[ language_user1 ] = " ";
@@ -239,7 +239,7 @@ String STR_QUERY_UNDO_INSERTCONNECTION
     Text[ dutch ] = "Verbinding invoegen";
     Text[ chinese_simplified ] = "插入连结";
     Text[ greek ] = "�������� ���������";
-    Text[ korean ] = "연결 삽입";
+    Text[ korean ] = "조인 삽입";
     Text[ arabic ] = "����� ������";
     Text[ turkish ] = "Ba�lant� ekle";
     Text[ language_user1 ] = " ";
@@ -257,7 +257,7 @@ String STR_QUERY_UNDO_REMOVECONNECTION
     Text [ swedish ] = "Radera f�rbindelse" ;
     Text [ danish ] = "Slet forbindelse" ;
     Text [ italian ] = "Termina collegamento" ;
-    Text [ spanish ] = "Eliminar una conexi�n" ;
+    Text [ spanish ] = "Borrar la conexi�n" ;
     Text [ french ] = "Supprimer la jointure" ;
     Text [ dutch ] = "Verbinding wissen" ;
     Text [ portuguese ] = "Eliminar liga��o" ;
@@ -269,7 +269,7 @@ String STR_QUERY_UNDO_REMOVECONNECTION
     Text[ dutch ] = "Verbinding wissen";
     Text[ chinese_simplified ] = "删除连结";
     Text[ greek ] = "�������� ���������";
-    Text[ korean ] = "연결 삭제";
+    Text[ korean ] = "조인 삭제";
     Text[ arabic ] = "��� ������";
     Text[ turkish ] = "Ba�lant�y� sil";
     Text[ language_user1 ] = " ";
@@ -299,7 +299,7 @@ String STR_QUERY_UNDO_SIZETABWIN
     Text[ dutch ] = "Tabelvenster - grootte wijzigen";
     Text[ chinese_simplified ] = "更改表格窗口大小";
     Text[ greek ] = "�������� ������ - ������ ��������";
-    Text[ korean ] = "시트 창 크기 조절";
+    Text[ korean ] = "테이블 창 크기 변경";
     Text[ arabic ] = "����� ��� ����� ����";
     Text[ turkish ] = "Tablo penceresini yeniden boyutland�r";
     Text[ language_user1 ] = " ";
@@ -317,7 +317,7 @@ String STR_QUERY_UNDO_TABFIELDDELETE
     Text [ swedish ] = "Radera kolumn" ;
     Text [ danish ] = "Slet kolonne" ;
     Text [ italian ] = "Elimina colonna" ;
-    Text [ spanish ] = "Eliminar la columna" ;
+    Text [ spanish ] = "Borrar la columna" ;
     Text [ french ] = "Supprimer la colonne" ;
     Text [ dutch ] = "Kolom wissen" ;
     Text [ portuguese ] = "Eliminar coluna" ;
@@ -417,7 +417,7 @@ String RID_STR_TABLE_DOESNT_EXIST
     Text[ dutch ] = "De uitdrukking is ongeldig omdat de tabel '$name$' niet bestaat!";
     Text[ chinese_simplified ] = "这个表达式无效，因为表格 '$name$' 不存在！";
     Text[ greek ] = "� ������� ��� ����� ������ ������ ��� ������� � ������� '$name$'!";
-    Text[ korean ] = "시트 '$name$'가 없어 이 식은 유효하지 않습니다 !";
+    Text[ korean ] = "식이 잘못되었습니다. 테이블 '$name$'가(이) 없습니다.";
     Text[ arabic ] = "������� ��� ����ɡ ���� ���� ������  '$name$'!";
     Text[ turkish ] = "Ge�ersiz deyim. Tablo '$name$' mevcut de�il !";
     Text[ language_user1 ] = " ";
@@ -447,7 +447,7 @@ String RID_STR_FIELD_DOESNT_EXIST
     Text[ dutch ] = "De uitdrukking is ongeldig omdat de veldnaam '$name$' niet kan worden herleid!";
     Text[ chinese_simplified ] = "这个表达式无效，因为无法确认字段名称 '$name$' ！";
     Text[ greek ] = "� ������� ��� ����� ������ ������ ��� ������ �� ������������� �� ����� ��� ������ '$name$'!";
-    Text[ korean ] = "필드명'$name$'이 분류될 수 없어 이 식은 유효하지 않습니다!";
+    Text[ korean ] = "식이 잘못되었습니다. 필드 이름 '$name$'이(가) 없습니다.";
     Text[ arabic ] = "������� ��� ����� ���� ���� ��� ����� '$name$'!";
     Text[ turkish ] = "Ge�ersiz deyim. Alan ad� '$name$' atanam�yor !";
     Text[ language_user1 ] = " ";
@@ -477,7 +477,7 @@ String RID_STR_TOMUCHTABLES
     Text[ dutch ] = "Query bevat #num# tabellen. Het huidige databasetype kan echter maximaal #maxnum# tabel(len) per instructie verwerken!";
     Text[ chinese_simplified ] = "查询含有 #num# 表格。这个类型的数据库在处理一个语句时最多只能够查询 #maxnum# 表格！";
     Text[ greek ] = "�� ������� �������� #num# �������. ����� � ����� ����� ��������� ��� ������ �� ������������ ���� ��� #maxnum# ������/-�� ��� ������!";
-    Text[ korean ] = "질의에 #num# 개의 시트가 포함되어 있습니다. 그러나 현재 데이터베이스 유형은 문장당 최대 #maxnum#개의 시트를 처리할 수 있습니다!";
+    Text[ korean ] = "쿼리에 #num# 개의 테이블이 있습니다. 현재 데이터베이스 유형은 문장 당 최대한 #maxnum#개의 테이블만 처리할 수 있다는 점에 유의하십시오.";
     Text[ arabic ] = "����� ��������� ��� #num# ������/�����. �� ���� ���� ����� �������� ������� ������ ���� �� #maxnum# ������/����� ������� �������!";
     Text[ turkish ] = "Sorgu #num# tablo i�eriyor. Ancak se�ili veritaban� tipi her deyim i�in en fazla #maxnum# tablo i�leyebilmektedir !";
     Text[ finnish ] = "Kysely k�sittelee #num# taulua. Valittu tietokantatyyppi voi kuitenkin k�sitell� enint��n #maxnum# taulua kussakin lausekkeessa.";
@@ -495,7 +495,7 @@ String STR_QUERY_UNDO_TABWINDELETE
     Text [ swedish ] = "Radera tabellf�nster" ;
     Text [ danish ] = "Slet tabelvindue" ;
     Text [ italian ] = "Elimina finestra di tabella" ;
-    Text [ spanish ] = "Eliminar la ventana de tabla" ;
+    Text [ spanish ] = "Borrar la ventana de tabla" ;
     Text [ french ] = "Supprimer la fen�tre de table" ;
     Text [ dutch ] = "Tabelvenster wissen" ;
     Text [ portuguese ] = "Eliminar janela de tabela" ;
@@ -507,7 +507,7 @@ String STR_QUERY_UNDO_TABWINDELETE
     Text[ dutch ] = "Tabelvenster wissen";
     Text[ chinese_simplified ] = "清除表格窗口";
     Text[ greek ] = "�������� ��������� ������";
-    Text[ korean ] = "시트 창 삭제";
+    Text[ korean ] = "테이블 창 삭제";
     Text[ arabic ] = "��� ����� ������";
     Text[ turkish ] = "Tablo penceresini sil";
     Text[ language_user1 ] = " ";
@@ -537,7 +537,7 @@ String STR_QUERY_UNDO_MODIFY_CELL
     Text[ dutch ] = "Kolombeschrijving wijzigen";
     Text[ chinese_simplified ] = "更改列标题";
     Text[ greek ] = "����������� ���������� ������";
-    Text[ korean ] = "열 설명 변경";
+    Text[ korean ] = "열 설명 편집";
     Text[ arabic ] = "����� ��� ����";
     Text[ turkish ] = "S�tun a��klamas�n� de�i�tir";
     Text[ language_user1 ] = " ";
@@ -595,7 +595,7 @@ String STR_QUERY_SORTTEXT
     Text[ dutch ] = "(niet gesorteerd);oplopend;aflopend";
     Text[ chinese_simplified ] = "(不排序);向上;向下";
     Text[ greek ] = "(����� ����������);�������;��������";
-    Text[ korean ] = "(정렬안됨);오름차순;내림차순";
+    Text[ korean ] = "(정렬 안됨);오름차순;내림차순";
     Text[ arabic ] = "(���� ���)��������������";
     Text[ turkish ] = "(s�ralanmam��);artan;azalan";
     Text[ language_user1 ] = " ";
@@ -652,7 +652,7 @@ String STR_QUERY_NOTABLE
     Text[ polish ] = "(bez tabeli)";
     Text[ portuguese_brazilian ] = "(no table)";
     Text[ japanese ] = "(テーブルなし)";
-    Text[ korean ] = "(시트 없음)";
+    Text[ korean ] = "(테이블 없음)";
     Text[ chinese_simplified ] = "(无表格)";
     Text[ chinese_traditional ] = "(無表格)";
     Text[ arabic ] = "(���� ����)";
@@ -670,7 +670,7 @@ String STR_QRY_ORDERBY_UNRELATED
     Text[ russian ] = "���� ������ ������������ ���������� ������ ������� �����.";
     Text[ dutch ] = "De database ondersteunt alleen de sortering voor zichtbare velden.";
     Text[ french ] = "La base de donn�es ne supporte le tri que pour les champs visibles.";
-    Text[ spanish ] = "La base de datos apoya la clasificaci�n solo para campos visibles.";
+    Text[ spanish ] = "La base de datos s�lo admite la clasificaci�n de los campos visibles.";
     Text[ italian ] = "Il database supporta solo la classificazione dei campi visibili.";
     Text[ danish ] = "Databasen underst�tter kun sortering for synlige felter.";
     Text[ swedish ] = "Databasen st�der bara sorteringen f�r synliga f�lt.";
@@ -682,7 +682,7 @@ String STR_QRY_ORDERBY_UNRELATED
     Text[ dutch ] = "De database ondersteunt alleen de sortering voor zichtbare velden.";
     Text[ chinese_simplified ] = "数据库只支持可显示字段的排序。";
     Text[ greek ] = "� ���� ��������� ����������� ��� ���������� ���� ��� ������ ������.";
-    Text[ korean ] = "데이터베이스는 보이는 필드의 정렬만을 지원합니다.";
+    Text[ korean ] = "데이터베이스가 지원하는 정렬 대상은 표시되는 필드뿐입니다.";
     Text[ arabic ] = "����� �������� �� ���� ����� ��� ������ �������.";
     Text[ turkish ] = "Veritaban� yaln�zca g�r�n�r alanlar i�in s�ralamay� destekler.";
     Text[ language_user1 ] = " ";
@@ -752,7 +752,7 @@ Menu RID_QUERYFUNCTION_POPUPMENU
             Text[ dutch ] = "Tabelnaam";
             Text[ chinese_simplified ] = "表格名称";
             Text[ greek ] = "����� ������";
-            Text[ korean ] = "시트 이름";
+            Text[ korean ] = "테이블 이름";
             Text[ arabic ] = "��� ������";
             Text[ turkish ] = "Tablo ad�";
             Text[ language_user1 ] = " ";
@@ -783,7 +783,7 @@ Menu RID_QUERYFUNCTION_POPUPMENU
             Text[ dutch ] = "Aliasnaam";
             Text[ chinese_simplified ] = "别名";
             Text[ greek ] = "���������";
-            Text[ korean ] = "별칭 이름";
+            Text[ korean ] = "별칭";
             Text[ arabic ] = "��� ������";
             Text[ turkish ] = "Di�er ad";
             Text[ language_user1 ] = " ";
@@ -812,13 +812,13 @@ Menu RID_QUERYFUNCTION_POPUPMENU
             Text[ swedish ] = "Entydiga v�rden";
             Text[ polish ] = "Jednoznaczne warto�ci";
             Text[ portuguese_brazilian ] = "Distinct values";
-            Text[ japanese ] = "明瞭値";
+            Text[ japanese ] = "固有値";
             Text[ chinese_simplified ] = "明确的数值";
             Text[ chinese_traditional ] = "明確的數值";
             Text[ dutch ] = "Duidelijke waarden";
             Text[ chinese_simplified ] = "明确的数值";
             Text[ greek ] = "����������� �����";
-            Text[ korean ] = "고유값";
+            Text[ korean ] = "명료값";
             Text[ arabic ] = "��� �����";
             Text[ turkish ] = "Benzersiz de�erler";
             Text[ language_user1 ] = " ";
@@ -849,7 +849,7 @@ String STR_QUERY_HANDLETEXT
     Text[ dutch ] = "Veld;Alias;Tabel;Volgorde;Zichtbaar;Functie;Criterium;of;of";
     Text[ chinese_simplified ] = "字段;别名;表格;排序;可见的;功能;条件;或者;或者";
     Text[ greek ] = "�����;���������;�������;����������;�����;���������;��������;����;����";
-    Text[ korean ] = "필드:별칭;시트;정렬;가시적;기능;기준;또는;또는";
+    Text[ korean ] = "필드:별칭;테이블;정렬;표시;기능;기준;또는;또는";
     Text[ arabic ] = "���;��� ������;����;���;����;����;�����;��;��";
     Text[ turkish ] = "Alan;Di�er ad;Tablo;S�ralama;G�r�n�r;��lev;�l��t;ya da;ya da";
     Text[ language_user1 ] = " ";
@@ -907,7 +907,7 @@ ErrorBox ERR_QRY_CRITERIA_ON_ASTERISK
     Message[ polish ] = "Warunek dla pola [*] nie jest mo�liwy";
     Message[ japanese ] = "[*] フィールドに条件は使えません。";
     Message[ greek ] = "��� ����� ������� �� ������� ������� ��� �� ����� [*]";
-    Message[ korean ] = "필드[*]에는 아무 조건도 지정할 수 없음 ";
+    Message[ korean ] = "필드[*]에는 아무 조건도 지정할 수 없습니다 ";
     Message[ chinese_traditional ] = "欄位的條件[*]無效。";
     Message[ arabic ] = "�� ���� ����� ��� ��� ����� [*]";
     Message[ turkish ] = "[*] alan� i�in ko�ul belirlenemiyor";
@@ -936,7 +936,7 @@ String STR_QRY_TOO_LONG_STATEMENT
     Text[ dutch ] = "Deze SQL-uitdrukking is te lang.";
     Text[ chinese_simplified ] = "生成的 SQL 表达式太长。";
     Text[ greek ] = "�� ����� ��� �������� SQL ��� ������������� ����� ���������� ������.";
-    Text[ korean ] = "작성된 SQL문장이 너무 깁니다.";
+    Text[ korean ] = "작성된 SQL 문장이 너무 깁니다.";
     Text[ arabic ] = "����� SQL ���� �� ������� ����� ����.";
     Text[ turkish ] = "Yarat�lan SQL deyimi �ok uzun.";
     Text[ language_user1 ] = " ";
@@ -967,7 +967,7 @@ String STR_QRY_TOOCOMPLEX
     Text[ dutch ] = "De query is te complex";
     Text[ chinese_simplified ] = "查询内容太复合";
     Text[ greek ] = "�� ������� ����� ���� ���������";
-    Text[ korean ] = "쿼리가 너무 복잡합니다";
+    Text[ korean ] = "쿼리가 너무 복잡합니다.";
     Text[ arabic ] = "��������� �� ���� �������";
     Text[ turkish ] = "Sorgu �ok karma��k";
     Text[ language_user1 ] = " ";
@@ -997,7 +997,7 @@ String STR_QRY_NOSELECT
     Text[ dutch ] = "De selectie ontbreekt!";
     Text[ chinese_simplified ] = "没有选择任何内容！";
     Text[ greek ] = "��� ����� �������!";
-    Text[ korean ] = "선택하신 것이 없습니다";
+    Text[ korean ] = "선택하신 것이 없습니다.";
     Text[ arabic ] = "�� ��� ��� �����";
     Text[ turkish ] = "Se�im yap�lmad�";
     Text[ language_user1 ] = " ";
@@ -1027,7 +1027,7 @@ String STR_QRY_TOOMANYCOND
     Text[ dutch ] = "Teveel zoekcriteria";
     Text[ chinese_simplified ] = "太多的搜寻规则";
     Text[ greek ] = "� ������� ��� ��������� ���������� ����� ���������� �������";
-    Text[ korean ] = "검색기준이 너무 많습니다";
+    Text[ korean ] = "검색기준이 너무 많습니다.";
     Text[ arabic ] = "������ ����� ����� ������";
     Text[ turkish ] = "Arama �l��t� say�s� �ok fazla";
     Text[ language_user1 ] = " ";
@@ -1084,7 +1084,7 @@ ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK
     Message[ greek ] = "��� ����� ������� �� ����� ���������� �� ���� �� [*].";
     Message[ arabic ] = "�� ���� ����� ����� �� [*].";
     Message[ chinese_traditional ] = "無法按[*]編排。";
-    Message[ korean ] = "[*]에 따라 정렬할 수 없음";
+    Message[ korean ] = "[*] 기준으로 정렬할 수 없습니다.";
     Message[ turkish ] = "[*] s�ralama �l��t� olarak kullan�lamaz.";
     Message[ language_user1 ] = " ";
     Message[ finnish ] = "Kohdetta [*] ei voi k�ytt�� hakuehtona.";
@@ -1201,7 +1201,7 @@ String STR_QRY_NATIVE
     Text[ dutch ] = "Bij een query in SQL-dialect van database wordt statement niet overgenomen.";
     Text[ chinese_simplified ] = "不接受数据库的 SQL 方言查询指令。";
     Text[ greek ] = "���� ��� �������� ��� ���������� ��� �������� SQL ��� ����� ��������� � ������ ��� �� ����������";
-    Text[ korean ] = "데이터베이스의 SQL 방언으로 조회하실 경우에는 그 문장이 적용되지 않습니다";
+    Text[ korean ] = "데이터베이스의 SQL 방언으로 조회하실 경우에는 문장이 적용되지 않습니다.";
     Text[ arabic ] = "�� ��� ����� ������ɡ ��� ��� ��������� ����� SQL ������ ������ �������� ";
     Text[ turkish ] = "Deyim, sorgunun bu veritaban�n�n SQL dilinde yap�lmas� halinde kullan�lmayacakt�r";
     Text[ language_user1 ] = " ";
@@ -1232,7 +1232,7 @@ ErrorBox ERR_QRY_AMB_FIELD
     Message[ dutch ] = "Veldnaam niet gevonden of niet duidelijk";
     Message[ chinese_simplified ] = "没有找到字段名称或者字段名称不明确。";
     Message[ greek ] = "��� ������� �� ����� ��� ������ � ��� ����� ������������";
-    Message[ korean ] = "필드명을 찾지 못했거나 분명하지 않습니다.";
+    Message[ korean ] = "필드 이름을 찾지 못했거나 고유하지 않습니다.";
     Message[ arabic ] = "��� ����� ��� ����� �� ��� ����";
     Message[ turkish ] = "Alan ad� bulunamad� ya da benzersiz de�il";
     Message[ catalan ] = "No s'ha trobat el nom del camp o no �s �nic";
@@ -1262,7 +1262,7 @@ String STR_QRY_ILLEGAL_JOIN
     Text[ dutch ] = "Koppeling kon niet tot stand worden gebracht";
     Text[ chinese_simplified ] = "无法执行连结功能";
     Text[ greek ] = "� ��������� ��� ���� ������� �� �����������";
-    Text[ korean ] = "결합이 실행되지 못했습니다.";
+    Text[ korean ] = "조인을 실행하지 못했습니다.";
     Text[ arabic ] = "�� ���� ����� ������";
     Text[ turkish ] = "Ba�lant� olu�turulamad�";
     Text[ language_user1 ] = " ";
@@ -1539,10 +1539,10 @@ ToolBox RID_BRW_QUERYDESIGN_TOOLBOX
             Text[ swedish ] = "Show Parse Tree";
             Text[ polish ] = "Show Parse Tree";
             Text[ portuguese_brazilian ] = "Show Parse Tree";
-            Text[ japanese ] = "Show Parse Tree";
+            Text[ japanese ] = "パースツリーを表示";
             Text[ korean ] = "Show Parse Tree";
             Text[ chinese_simplified ] = "Show Parse Tree";
-            Text[ chinese_traditional ] = "Show Parse Tree";
+            Text[ chinese_traditional ] = "顯示剖析樹";
             Text[ turkish ] = "Show Parse Tree";
             Text[ arabic ] = "Show Parse Tree";
             Text[ catalan ] = "Show Parse Tree";
@@ -1596,7 +1596,7 @@ QueryBox QUERY_DESIGN_SAVEMODIFIED
     Message[ polish ] = "Zmieniono kwerend�.\nZapisa� zmiany?";
     Message[ portuguese_brazilian ] = "The query has been changed.\nDo you want to save the changes?";
     Message[ japanese ] = "クエリーは変更されました。\n変更を保存しますか。";
-    Message[ korean ] = "질의가 변경되었습니다.\n변경 사항을 저장하겠습니까?";
+    Message[ korean ] = "쿼리가 변경되었습니다.\n변경 내용을 저장하시겠습니까?";
     Message[ chinese_simplified ] = "这个查询已经更改。\n要存盘更改的内容?";
     Message[ chinese_traditional ] = "這個查詢已經變更。\n要儲存變更內容？";
     Message[ turkish ] = "The query has been changed.\nDo you want to save the changes?";
@@ -1625,7 +1625,7 @@ QueryBox QUERY_VIEW_DESIGN_SAVEMODIFIED
     Message[ polish ] = "Zmieniono widok tabeli.\nZapisa� zmiany?";
     Message[ portuguese_brazilian ] = "The view has been changed.\nDo you want to save the changes?";
     Message[ japanese ] = "テーブルビューが変更されています。\n変更を保存しますか。";
-    Message[ korean ] = "뷰가 변경되었습니다.\n변경 내용을 저장하겠습니까?";
+    Message[ korean ] = "테이블 보기가 변경되었습니다.\n변경 내용을 저장하시겠습니까?";
     Message[ chinese_simplified ] = "这个表格视图已经改变。\n要存盘更改的内容?";
     Message[ chinese_traditional ] = "這個檢視已經變更。\n要儲存變更內容?";
     Message[ turkish ] = "The view has been changed.\nDo you want to save the changes?";
@@ -1669,11 +1669,11 @@ String STR_QUERYDESIGN_NO_VIEW_SUPPORT
     Text [ ENGLISH ] = "This database doesn't support views!";
     Text[ english_us ] = "This database does not support table views!";
     Text[ portuguese ] = "Esta base de dados n�o tem suporte para vistas de tabelas!";
-    Text[ russian ] = "��� ���� ������ �� ������������ ���� ������!";
+    Text[ russian ] = "��� ���� ������ �� ������������ �������������!";
     Text[ greek ] = "This database doesn't support views!";
     Text[ dutch ] = "Deze database ondersteunt geen weergave van tabellen!";
     Text[ french ] = "Cette base de donn�es ne supporte pas les vues !";
-    Text[ spanish ] = "�Esta base de datos no apoya ninguna visualizaci�n de tablas!";
+    Text[ spanish ] = "�Esta base de datos no admite ninguna visualizaci�n de tablas!";
     Text[ finnish ] = "T�m� tietokanta ei tue taulun�kymi�.";
     Text[ italian ] = "Questo database non supporta la vista tabella";
     Text[ danish ] = "Denne database underst�tter ingen tabelvisninger!";
@@ -1681,7 +1681,7 @@ String STR_QUERYDESIGN_NO_VIEW_SUPPORT
     Text[ polish ] = "Ta baza danych nie obs�uguje widok�w tabeli!";
     Text[ portuguese_brazilian ] = "This database doesn't support views!";
     Text[ japanese ] = "このデータベースはテーブルビューを支援しません。";
-    Text[ korean ] = "이 데이터베이스는 표 보기를 지원하지 않습니다.!";
+    Text[ korean ] = "이 데이터베이스는 테이블 보기를 지원하지 않습니다.";
     Text[ chinese_simplified ] = "这个数据库不支持表格视图的功能！";
     Text[ chinese_traditional ] = "這個資料庫不支援表格檢視功能！";
     Text[ turkish ] = "This database doesn't support views!";
@@ -1708,7 +1708,7 @@ String STR_QUERYDESIGN_NO_VIEW_ASK
     Text[ polish ] = "Utworzy� wzamian kwerend�?";
     Text[ portuguese_brazilian ] = "Do you want to create a view instead?";
     Text[ japanese ] = "その代わりにクエリーを作成しますか。";
-    Text[ korean ] = "대신 질의를 작성하겠습니까?";
+    Text[ korean ] = "대신 쿼리를 만드시겠습니까?";
     Text[ chinese_simplified ] = "要改为生成一个查询？";
     Text[ chinese_traditional ] = "改為要建立一個查詢？";
     Text[ turkish ] = "Do you want to create a view instead?";
@@ -1734,7 +1734,7 @@ ErrorBox ERR_QRY_NOSTATEMENT
     Message[ polish ] = "Utworzenie kwerendy nie powiod�o si�!";
     Message[ portuguese_brazilian ] = "No query could be created!";
     Message[ japanese ] = "クエリーは作成できませんでした。";
-    Message[ korean ] = "질의를 작성하지 못했습니다!";
+    Message[ korean ] = "쿼리를 만들지 못했습니다.";
     Message[ chinese_simplified ] = "无法建立任何查询！";
     Message[ chinese_traditional ] = "無法建立查詢！";
     Message[ turkish ] = "No query could be created!";
@@ -1761,7 +1761,7 @@ ErrorBox ERR_QRY_NOCRITERIA
     Message[ polish ] = "Utworzenie kwerendy nie powiod�o si�, poniewa� nie wybrano �adnych p�l!";
     Message[ portuguese_brazilian ] = "No query could be created because no fields were selected!";
     Message[ japanese ] = "フィールドが選択されてなかったので、クエリーは作成できませんでした。";
-    Message[ korean ] = "필드를 선택하지 않았으므로 질의를 작성하지 못했습니다!";
+    Message[ korean ] = "필드가 선택되지 않았으므로 쿼리를 만들지 못했습니다.";
     Message[ chinese_simplified ] = "因为没有选中任何字段而无法建立查询！";
     Message[ chinese_traditional ] = "因為沒有選中任何欄位而無法建立查詢！";
     Message[ turkish ] = "No query could be created because no fields were selected!";
@@ -1893,7 +1893,7 @@ Menu RID_QUERY_DESIGN_MAIN_MENU
                     Text[ polish ] = "Przywr��";
                     Text[ portuguese_brazilian ] = "Redo";
                     Text[ japanese ] = "やり直し";
-                    Text[ korean ] = "복원";
+                    Text[ korean ] = "다시 실행";
                     Text[ chinese_simplified ] = "恢复撤消命令";
                     Text[ chinese_traditional ] = "恢復撤消指令";
                     Text[ turkish ] = "Redo";
@@ -2124,7 +2124,7 @@ String STR_DATASOURCE_DELETED
     Text[ greek ] = "The datasource was deleted. It is not possible to save datasource relevant data.";
     Text[ dutch ] = "De bijbehorende gegevensbron is gewist. De desbetreffende gegevens kunnen niet worden opgeslagen.";
     Text[ french ] = "Impossible d'enregistrer les donn�es : la source de donn�es correspondante a �t� supprim�e.";
-    Text[ spanish ] = "Se ha eliminado la fuente de datos. Los datos correspondientes no se pueden guardar.";
+    Text[ spanish ] = "Se ha borrado la fuente de datos. Los datos correspondientes no se pueden guardar.";
     Text[ finnish ] = "Vastaava tietol�hde on poistettu. Sen vuoksi tietol�hteeseen liittyvi� tietoja ei voi tallentaa.";
     Text[ italian ] = "La sorgente dati � stata eliminata. Impossibile salvare i dati corrispondenti.";
     Text[ danish ] = "Den tilh�rende datakilde er blevet slettet. Det er ikke muligt at gemme data med relation til denne.";
@@ -2132,7 +2132,7 @@ String STR_DATASOURCE_DELETED
     Text[ polish ] = "Przynale�ne �r�d�o danych zosta�o usuni�te. Zapisanie dotycz�cych go danych nie jest mo�liwe.";
     Text[ portuguese_brazilian ] = "The datasource was deleted. It is not possible to save datasource relevant data.";
     Text[ japanese ] = "従属するデータソースが削除されています。これに関連するデータは保存できません。";
-    Text[ korean ] = "해당하는 데이터 소스가 삭제되었습니다. 데이터 소스의 관련 데이터를 저장할 수 없습니다.";
+    Text[ korean ] = "해당하는 데이터 원본이 삭제되었습니다. 데이터 원본에 관련되는 데이터를 저장할 수 없습니다.";
     Text[ chinese_simplified ] = "这个数据库已经被删除。因此无法保存任何相关数据。";
     Text[ chinese_traditional ] = "這個資料源已經被刪除。因此無法儲存任何資料。";
     Text[ turkish ] = "The datasource was deleted. It is not possible to save datasource relevant data.";
@@ -2158,7 +2158,7 @@ String STR_QRY_COLUMN_NOT_FOUND
     Text[ swedish ] = "Kolumnen '$name$' �r ok�nd!";
     Text[ polish ] = "The column '$name$' is unknown!";
     Text[ japanese ] = "列 '$name$' は不明です。";
-    Text[ korean ] = "열 '$name$' 이(가) 불분명합니다.";
+    Text[ korean ] = "열 '$name$'은(는) 알 수 없습니다.";
     Text[ chinese_simplified ] = "列 '$name$' 不明！";
     Text[ chinese_traditional ] = "欄位 '$name$' 不明！";
     Text[ turkish ] = "The column '$name$' is unknown!";
@@ -2206,7 +2206,7 @@ String STR_QRY_LIKE_LEFT_NO_COLUMN
     Text[ swedish ] = "Det m�ste st� ett kolumnnamn framf�r 'SOM'.";
     Text[ polish ] = "On the left side of a 'LIKE' statement only a column name is allowed.";
     Text[ japanese ] = "'LIKE' の前に列名を記述する必要があります。";
-    Text[ korean ] = "'LIKE' 문장의 왼쪽에는 열 이름을 하나 밖에 사용할 수 없습니다.";
+    Text[ korean ] = "'LIKE' 앞에 열 이름을 사용해야 합니다.";
     Text[ chinese_simplified ] = "在 LIKE 之前必须输入一个列名称。";
     Text[ chinese_traditional ] = "在 'LIKE' 之前必須輸入一個欄位名稱。";
     Text[ turkish ] = "On the left side of a 'LIKE' statement only a column name is allowed.";
@@ -2229,7 +2229,7 @@ String STR_QRY_CHECK_CASESENSITIVE
     Text[ swedish ] = "Kolumnen kunde inte hittas. Observera att databasen g�r skillnad p� stor och liten bokstav.";
     Text[ polish ] = "Please check if you are using the correct case.";
     Text[ japanese ] = "列は見つかりませんでした。データベースでは大文字と小文字が区別されることに注意してください。";
-    Text[ korean ] = "단락을 찾지 못했습니다. 데이터베이스가 대소문자를 구분한다는 점을 유의해주십시오.";
+    Text[ korean ] = "열을 찾지 못했습니다. 데이터베이스가 대소문자를 구분한다는 점에 유의해주십시오.";
     Text[ chinese_simplified ] = "无法找到列。请注意本数据库区分字母的大小写。";
     Text[ chinese_traditional ] = "無法找到欄位。請注意本資料庫區分字母的大小寫。";
     Text[ turkish ] = "Please check if you are using the correct case.";
@@ -2238,24 +2238,24 @@ String STR_QRY_CHECK_CASESENSITIVE
 
 String STR_QUERYDESIGN
 {
-    Text = "Abfrageentwurf";
-    Text[ english_us ] = "Query Design";
+    Text = "Abfrageentwurf:";
+    Text[ english_us ] = "Query Design:";
     Text[ portuguese ] = "Query Design";
     Text[ russian ] = "Query Design";
     Text[ greek ] = "Query Design";
     Text[ dutch ] = "Query Design";
-    Text[ french ] = "Query Design";
-    Text[ spanish ] = "Query Design";
+    Text[ french ] = "�bauche de requ�te";
+    Text[ spanish ] = "Dise�o de consulta";
     Text[ finnish ] = "Query Design";
-    Text[ italian ] = "Query Design";
+    Text[ italian ] = "Struttura ricerca:";
     Text[ danish ] = "Query Design";
-    Text[ swedish ] = "Query Design";
+    Text[ swedish ] = "S�kningsutkast:";
     Text[ polish ] = "Query Design";
     Text[ portuguese_brazilian ] = "Query Design";
-    Text[ japanese ] = "Query Design";
-    Text[ korean ] = "Query Design";
-    Text[ chinese_simplified ] = "Query Design";
-    Text[ chinese_traditional ] = "Query Design";
+    Text[ japanese ] = "クエリーデザイン";
+    Text[ korean ] = "쿼리 디자인:";
+    Text[ chinese_simplified ] = "查询设计：";
+    Text[ chinese_traditional ] = "查詢設計：";
     Text[ turkish ] = "Query Design";
     Text[ arabic ] = "Query Design";
     Text[ catalan ] = "Query Design";
@@ -2264,24 +2264,24 @@ String STR_QUERYDESIGN
 
 String STR_VIEWDESIGN
 {
-    Text = "Ansichtsentwurf";
-    Text[ english_us ] = "View Design";
+    Text = "Ansichtsentwurf:";
+    Text[ english_us ] = "View Design:";
     Text[ portuguese ] = "View Design";
     Text[ russian ] = "View Design";
     Text[ greek ] = "View Design";
     Text[ dutch ] = "View Design";
-    Text[ french ] = "View Design";
-    Text[ spanish ] = "View Design";
+    Text[ french ] = "�bauche de vue";
+    Text[ spanish ] = "Dise�o de vista";
     Text[ finnish ] = "View Design";
-    Text[ italian ] = "View Design";
+    Text[ italian ] = "Struttura visualizzazione:";
     Text[ danish ] = "View Design";
-    Text[ swedish ] = "View Design";
+    Text[ swedish ] = "Vyutkast:";
     Text[ polish ] = "View Design";
     Text[ portuguese_brazilian ] = "View Design";
-    Text[ japanese ] = "View Design";
-    Text[ korean ] = "View Design";
-    Text[ chinese_simplified ] = "View Design";
-    Text[ chinese_traditional ] = "View Design";
+    Text[ japanese ] = "ビューデザイン";
+    Text[ korean ] = "디자인 보기:";
+    Text[ chinese_simplified ] = "视图设计：";
+    Text[ chinese_traditional ] = "檢視設計：";
     Text[ turkish ] = "View Design";
     Text[ arabic ] = "View Design";
     Text[ catalan ] = "View Design";
@@ -2290,3 +2290,9 @@ String STR_VIEWDESIGN
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 761f1dbe9c0e..54d439111e51 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontainerwindow.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:04:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -126,6 +126,10 @@ namespace dbaui
     OQueryContainerWindow::~OQueryContainerWindow()
     {
 
+        {
+            ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
+            m_pViewSwitch = NULL;
+        }
         if ( m_pBeamer )
             ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
         m_pBeamer = NULL;
@@ -145,10 +149,7 @@ namespace dbaui
             ::std::auto_ptr<Window> aTemp(m_pSplitter);
             m_pSplitter = NULL;
         }
-        {
-            ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
-            m_pViewSwitch = NULL;
-        }
+
         DBG_DTOR(OQueryContainerWindow,NULL);
     }
     // -----------------------------------------------------------------------------
@@ -319,34 +320,4 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.8  2002/05/29 08:28:58  oj
- *  #99650# use of auto_ptr when deleting window
- *
- *  Revision 1.7  2002/05/06 09:52:47  oj
- *  #96363# change return type of switchView
- *
- *  Revision 1.6  2002/05/02 07:54:11  oj
- *  #98916# enable F6 key
- *
- *  Revision 1.5  2002/03/01 14:42:07  oj
- *  #97850# correct F6 handling
- *
- *  Revision 1.4  2002/02/11 12:58:53  oj
- *  #90580# enable F6 key for components
- *
- *  Revision 1.3  2001/09/20 12:56:16  oj
- *  #92232# fixes for BIGINT type and new property HELPTEXT
- *
- *  Revision 1.2  2001/09/07 10:05:58  fs
- *  #65293# syntax
- *
- *  Revision 1.1  2001/08/23 14:39:40  fs
- *  initial checkin - outsourced from QueryTextView.hxx (the container window for the query design)
- *
- *
- *  Revision 1.0 23.08.01 12:15:26  fs
- ************************************************************************/
 
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index e3a3893c832f..8188ae4ae828 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontroller.cxx,v $
  *
- *  $Revision: 1.88 $
+ *  $Revision: 1.89 $
  *
- *  last change: $Author: oj $ $Date: 2002-12-12 13:44:48 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -828,7 +828,7 @@ void OQueryController::setTitle(const ::rtl::OUString& _sName)
             sName = ::dbtools::createUniqueName(getElements(),aDefaultName);
         }
         String aName = String(ModuleRes(m_bCreateView ? STR_VIEWDESIGN : STR_QUERYDESIGN));
-        sName = aName + ::rtl::OUString::createFromAscii(": ") + sName;
+        sName = aName + ::rtl::OUString::createFromAscii(" ") + sName;
         xProp->setPropertyValue(PROPERTY_TITLE,makeAny(sName));
     }
 }
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 533f56249b62..05d7cf3c0ef4 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querydlg.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:31:41 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -172,7 +172,7 @@ ModalDialog DLG_QRY_JOIN
         Text [ ENGLISH ] = "Options" ;
         Text[ english_us ] = "Options";
         Text[ portuguese ] = "Op��es";
-        Text[ russian ] = "���������";
+        Text[ russian ] = "��������� ����������";
         Text[ dutch ] = "Opties";
         Text[ french ] = "Options";
         Text[ spanish ] = "Opciones";
@@ -355,10 +355,10 @@ ModalDialog DLG_QRY_JOIN
     };
     StringList [ korean ] =
     {
-         < "내부 결합" ; Default; > ;
-        < "좌측 결합" ; Default; > ;
-        < "우측 결합" ; Default; > ;
-        < "완전 외부 결합"  ; Default; > ;
+         < "내부 조인" ; Default; > ;
+        < "왼쪽 조인" ; Default; > ;
+        < "오른쪽 조인" ; Default; > ;
+        < "완전 외부 조인"  ; Default; > ;
     };
     StringList [ chinese_simplified ] =
     {
@@ -450,7 +450,7 @@ ModalDialog DLG_QRY_JOIN
     Text[ dutch ] = "Verbindingseigenschappen";
     Text[ chinese_simplified ] = "连结属性";
     Text[ greek ] = "��������� ���������";
-    Text[ korean ] = "조인 속성";
+    Text[ korean ] = "조인 등록 정보";
     Text[ arabic ] = "����� �����";
     Text[ turkish ] = "Birle�me �zellikleri";
     Text[ language_user1 ] = " ";
@@ -480,7 +480,7 @@ String STR_QUERY_INNER_JOIN
     Text[ dutch ] = "Bevat alleen records waarbij de inhoud van de gekoppelde velden in beide tabellen gelijk is.";
     Text[ chinese_simplified ] = "只包含两个表格中引用字段相同的数据条目。";
     Text[ greek ] = "�������� ���� ��� �������� ��� ��������� ���� ������ ����������� �� ����������� ��� ������������ ������ ��� ����� ��� �������.";
-    Text[ korean ] = "두 개 시트의 링크된 필드 내용이 같은 레코드만을 포함합니다.";
+    Text[ korean ] = "두 테이블의 관계된 필드 내용이 일치하는 레코드만을 포함합니다.";
     Text[ arabic ] = "��� ����� ��� ��� ������� ���� ������ ���� ������� ������ �������� �� ��� ��������.";
     Text[ turkish ] = "Yaln�zca her iki tablodaki ili�kili alan i�eriklerinin ayn� oldu�u kay�tlar� i�erir.";
     Text[ language_user1 ] = " ";
@@ -510,7 +510,7 @@ String STR_QUERY_LEFTRIGHT_JOIN
     Text[ dutch ] = "Bevat ALLE records uit '%1' en alleen de records uit '%2' waarbij de inhoud van de gekoppelde velden in beide tabellen gelijk is.";
     Text[ chinese_simplified ] = "含有'%1'中的所有数据条目和'%2'中两个表格引用字段相同的数据条目。";
     Text[ greek ] = "�������� ���� ��� �������� ��� ������ '%1' ��� ��� �������� ��� ������ '%2' ���� ������ ����������� �� ����������� ��� ������������ ������ ��� ";
-    Text[ korean ] = "시트'%1'에는 모든 레코드, 시트 '%2'에는 두 개 시트의 링크된 필드 내용이 같은 레코드만이 포함됩니다 .";
+    Text[ korean ] = "테이블 '%1'에는 모든 레코드가 테이블 '%2'에는 두 테이블의 관계된 필드 내용이 일치하는 레코드만이 포함됩니다.";
     Text[ arabic ] = "����� ��� �� ����� '%1'� ������ '%2' ���� ������ ���� ������� ������ �������� �� ��� �������� ���.";
     Text[ turkish ] = "'%1' tablosundaki kay�tlar�n TAMAMINI ve '%2' tablosundaki kay�tlardan yaln�zca her iki tablodaki ili�kili alan i�erikleri ayn� olan kay�tlar� i�erir.";
     Text[ language_user1 ] = " ";
@@ -540,7 +540,7 @@ String STR_QUERY_FULL_JOIN
     Text[ dutch ] = "Bevat ALLE records uit '%1' en '%2'.";
     Text[ chinese_simplified ] = "含有 '%1'和'%2'内全部的数据条目";
     Text[ greek ] = "�������� ���� ��� �������� ��� '%1' ��� '%2'.";
-    Text[ korean ] = "시트'%1' 와(과) '%2'의 모든 레코드를 포함합니다.";
+    Text[ korean ] = "'%1' 와(과) '%2'의 모든 레코드를 포함합니다.";
     Text[ arabic ] = "����� ��� �� ������� �� '%1' � '%2'.";
     Text[ turkish ] = "'%1' ve '%2' tablolar�ndaki T�M kay�tlar� i�erir.";
     Text[ language_user1 ] = " ";
@@ -565,3 +565,9 @@ String STR_QUERY_FULL_JOIN
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src
index 8b829e18ef21..7a7366a93a0b 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: relation.src,v $
  *
- *  $Revision: 1.47 $
+ *  $Revision: 1.48 $
  *
- *  last change: $Author: rt $ $Date: 2002-12-05 14:05:52 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -252,7 +252,7 @@ String STR_QUERY_REL_EDIT_RELATION
     Text[ polish ] = "Relacja ju� istnieje. Czy chcesz j� edytowa�?";
     Text[ portuguese_brazilian ] = "This relation already exsits. Do you want to edit it?";
     Text[ japanese ] = "このリレーションはすでにあります。これを編集しますか。";
-    Text[ korean ] = "이 관계가 이미 존재합니다. 이 관계를 편집하겠습니까 ?";
+    Text[ korean ] = "이 관계는 이미 있습니다. 이 관계를 편집하시겠습니까?";
     Text[ chinese_simplified ] = "这个关系已经存在。您想编辑它？";
     Text[ chinese_traditional ] = "這個關係已經存在。要編輯它？";
     Text[ arabic ] = "��� ������� ������ ������. �� ���� ������ǿ";
@@ -267,7 +267,7 @@ String STR_RELATIONDESIGN
     Text [ English ] = "Relation design" ;
     Text [ english_us ] = "Relation design" ;
     Text[ portuguese ] = "Esbo�ar rela��o";
-    Text[ russian ] = "������ ������";
+    Text[ russian ] = "�������������� ������";
     Text[ greek ] = "���������� ������";
     Text[ dutch ] = "Relatie-ontwerp";
     Text[ french ] = "�bauche de relation";
@@ -297,14 +297,14 @@ String STR_RELATIONDESIGN_NOT_AVAILABLE
     Text[ greek ] = "� ���� ��������� ��� ����������� �������!";
     Text[ dutch ] = "De database ondersteunt geen relaties! ";
     Text[ french ] = "La base de donn�es ne supporte pas les relations !";
-    Text[ spanish ] = "La base de datos no apoya ninguna relaci�n.";
+    Text[ spanish ] = "La base de datos no admite ninguna relaci�n.";
     Text[ italian ] = "Il database non supporta alcuna relazione.";
     Text[ danish ] = "Databasen underst�tter ingen relationer!";
     Text[ swedish ] = "Databasen underst�der inte n�gra relationer.";
     Text[ polish ] = "Baza danych nie obs�uguje relacji.";
     Text[ portuguese_brazilian ] = "The database doesn't support any relations. The relation design will be closed!";
     Text[ japanese ] = "データベースはリレーションを支援しません。";
-    Text[ korean ] = "데이터베이스는 어떠한 관계도 지원하지 않습니다!";
+    Text[ korean ] = "데이터베이스는 관계를 지원하지 않습니다.";
     Text[ chinese_simplified ] = "这个数据库不支持关系功能！";
     Text[ chinese_traditional ] = "這個資料庫不支援關係功能！";
     Text[ turkish ] = "The database doesn't support any relations. The relation design will be closed!";
@@ -321,7 +321,7 @@ QueryBox RELATION_DESIGN_SAVEMODIFIED
     Message [ English ] = "The relation design has been modified.\nDo you want to save your changes?" ;
     Message [ english_us ] = "The relation design has been changed.\nDo you want to save the changes?" ;
     Message[ portuguese ] = "O esbo�o de rela��es foi modificado.\nGuardar as modifica��es?";
-    Message[ russian ] = "������ ������ �������.\n��������� ���������?";
+    Message[ russian ] = "����� ���� ��������.\n��������� ���������?";
     Message[ greek ] = "�� ������ ��� ������ �������������.\n������ �� ������������ �� �������;";
     Message[ dutch ] = "Het relatie-ontwerp is gewijzigd.\nWilt u de wijzigingen opslaan?";
     Message[ french ] = "L'�bauche de relation a �t� modifi�e.\nVoulez-vous enregistrer les modifications ?";
@@ -332,7 +332,7 @@ QueryBox RELATION_DESIGN_SAVEMODIFIED
     Message[ polish ] = "Zmieniono projekt relacji.\nZapisa� zmiany?";
     Message[ portuguese_brazilian ] = "The relation design has been changed.\nDo you want to save the changes?";
     Message[ japanese ] = "リレーションのデザインが変更されています。\n変更を保存しますか。";
-    Message[ korean ] = "관계 디자인이 변경되었습니다.\n변경 사항을 저장하겠습니까?";
+    Message[ korean ] = "관계 디자인이 변경되었습니다.\n변경 내용을 저장하시겠습니까?";
     Message[ chinese_simplified ] = "这个关系数据已经更改。\n要存盘这些更改内容？";
     Message[ chinese_traditional ] = "這個關係設計已經變更。\n要儲存變更內容？";
     Message[ turkish ] = "The relation design has been changed.\nDo you want to save the changes?";
@@ -459,7 +459,7 @@ Menu RID_RELATION_DESIGN_MAIN_MENU
                     Text[ polish ] = "Przywr��";
                     Text[ portuguese_brazilian ] = "Redo";
                     Text[ japanese ] = "やり直し";
-                    Text[ korean ] = "삭제 취소";
+                    Text[ korean ] = "다시 실행";
                     Text[ chinese_simplified ] = "恢复撤消命令";
                     Text[ chinese_traditional ] = "恢復撤消指令";
                     Text[ turkish ] = "Redo";
@@ -599,7 +599,7 @@ String STR_QUERY_REL_DELETE_WINDOW
     Text[ greek ] = "When you delete this table all corresponding relations will be deleted as well. Continue?";
     Text[ dutch ] = "Als u deze tabel wist, worden alle bijbehorende relaties eveneens gewist. Wilt u doorgaan?";
     Text[ french ] = "Supprimer cette table entra�ne la suppression des relations associ�es. Continuer ?";
-    Text[ spanish ] = "Si elimina esta tabla se eliminar�n tambi�n todas las relaciones correspondientes. �Desea continuar?";
+    Text[ spanish ] = "Si borra esta tabla se borrar�n tambi�n todas las relaciones correspondientes. �Desea continuar?";
     Text[ finnish ] = "Kun poistat t�m�n taulun, kaikki vastaavat yhteydet poistetaan my�s. Jatketaanko?";
     Text[ italian ] = "Eliminando questa tabella eliminerete anche tutte le relazioni corrispondenti. Volete procedere comunque?";
     Text[ danish ] = "Hvis du sletter denne tabel, slettes ogs� alle tilh�rende relationer. Vil du forts�tte?";
@@ -607,7 +607,7 @@ String STR_QUERY_REL_DELETE_WINDOW
     Text[ polish ] = "Wraz z tabel� usuni�te zostan� wszystkie przynale�ne relacje. Kontynuowa�?";
     Text[ portuguese_brazilian ] = "When you delete this table all corresponding relations will be deleted as well. Continue?";
     Text[ japanese ] = "このテーブルを削除すると、これに属するすべてのリレーションも削除されてします。続行しますか。";
-    Text[ korean ] = "이 시트를 삭제하면 해당하는 모든 관계들도 삭제됩니다. 계속하겠습니까?";
+    Text[ korean ] = "이 테이블을 삭제하면 해당하는 모든 관계 역시 삭제됩니다. 계속하시겠습니까?";
     Text[ chinese_simplified ] = "如果删除这个表格，就会一同删除所有的从属关系。要继续？";
     Text[ chinese_traditional ] = "如果刪除這個表格，也就會一起刪除全部的從屬關係。要繼續？";
     Text[ turkish ] = "When you delete this table all corresponding relations will be deleted as well. Continue?";
@@ -634,3 +634,9 @@ String STR_QUERY_REL_DELETE_WINDOW
 
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 4ba33ebcbf54..255b8f74f2fb 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescGenWin.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-31 07:47:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -207,6 +207,11 @@ sal_Bool OFieldDescGenWin::isCutAllowed()
     return (m_pFieldControl && m_pFieldControl->isCutAllowed());
 }
 // -----------------------------------------------------------------------------
+sal_Bool OFieldDescGenWin::isPasteAllowed()
+{
+    return (m_pFieldControl && m_pFieldControl->isPasteAllowed());
+}
+// -----------------------------------------------------------------------------
 void OFieldDescGenWin::cut()
 {
     if(m_pFieldControl)
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 38aabd200d3a..9b025b8099ae 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescGenWin.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2002-09-25 11:26:55 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,7 +64,9 @@
 #ifndef _SV_TABPAGE_HXX
 #include <vcl/tabpage.hxx>
 #endif
-
+#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#include "IClipBoardTest.hxx"
+#endif
 
 namespace dbaui
 {
@@ -74,6 +76,7 @@ namespace dbaui
     class OTableEditorCtrl;
     //==================================================================
     class OFieldDescGenWin : public TabPage
+                            ,public IClipboardTest
     {
 
         OTableFieldControl  *m_pFieldControl;
@@ -103,12 +106,15 @@ namespace dbaui
         String BoolStringPersistent(const String& rUIString) const;
         String BoolStringUI(const String& rPersistentString) const;
 
-        sal_Bool isCutAllowed();
-        sal_Bool isCopyAllowed();
+        // IClipboardTest
+        virtual sal_Bool isCutAllowed();
+        virtual sal_Bool isCopyAllowed();
+        virtual sal_Bool isPasteAllowed();
+        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
 
-        void    cut();
-        void    copy();
-        void    paste();
+        virtual void copy();
+        virtual void cut();
+        virtual void paste();
 
         inline OTableFieldControl*  getFieldControl() const { return m_pFieldControl; }
     };
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 2dc467114b05..971d2a5e39c8 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescriptions.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-14 07:55:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -145,7 +145,7 @@ OFieldDescription::OFieldDescription(   const ::rtl::OUString&  _sName,
                     const ::com::sun::star::uno::Any&   _aDefaultValue,
                     const ::com::sun::star::uno::Any&   _aControlDefault,
                     const ::rtl::OUString&  _sAutoIncrementValue,
-                    const OTypeInfo*        _pType,
+                    const TOTypeInfoSP&     _pType,
                     sal_Int32               _nPrecision,
                     sal_Int32               _nScale,
                     sal_Int32               _nIsNullable,
@@ -225,9 +225,9 @@ OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedC
     }
 }
 // -----------------------------------------------------------------------------
-void OFieldDescription::FillFromTypeInfo(const OTypeInfo* _pType,sal_Bool _bForce,sal_Bool _bReset)
+void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bForce,sal_Bool _bReset)
 {
-    const OTypeInfo* pOldType = getTypeInfo();
+    TOTypeInfoSP pOldType = getTypeInfo();
     if ( _pType != pOldType )
     {
         // reset type depending information
@@ -237,7 +237,7 @@ void OFieldDescription::FillFromTypeInfo(const OTypeInfo* _pType,sal_Bool _bForc
             SetControlDefault(Any());
         }
 
-        sal_Bool bForce = _bForce || pOldType == NULL || pOldType->nType != _pType->nType;
+        sal_Bool bForce = _bForce || pOldType.get() == NULL || pOldType->nType != _pType->nType;
         switch ( _pType->nType )
         {
             case DataType::CHAR:
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 7453974e1ea5..07477df699a0 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TEditControl.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 13:57:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -671,7 +671,7 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
                 if (pActFieldDescr)
                 {
                     GetUndoManager()->AddUndoAction(new OTableEditorTypeSelUndoAct(this, nRow, FIELD_TYPE, pActFieldDescr->getTypeInfo()));
-                    SwitchType(NULL);
+                    SwitchType(TOTypeInfoSP());
                     pActFieldDescr = pActRow->GetActFieldDescr();
                 }
                 else
@@ -815,7 +815,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
         if ( !pTypeInfoMap->empty() )
         {
             OTypeInfoMap::const_iterator aTypeIter = pTypeInfoMap->find(DataType::VARCHAR);
-            if(aTypeIter == pTypeInfoMap->end())
+            if ( aTypeIter == pTypeInfoMap->end() )
                 aTypeIter = pTypeInfoMap->begin();
             pActRow->SetFieldType( aTypeIter->second );
         }
@@ -825,7 +825,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
         nInvalidateTypeEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, InvalidateFieldType) );
         pActFieldDescr = pActRow->GetActFieldDescr();
         pDescrWin->DisplayData( pActFieldDescr );
-        GetUndoManager()->AddUndoAction( new OTableEditorTypeSelUndoAct(this, nRow, nColId+1, NULL) );
+        GetUndoManager()->AddUndoAction( new OTableEditorTypeSelUndoAct(this, nRow, nColId+1, TOTypeInfoSP()) );
     }
 
     if( nColId != FIELD_TYPE )
@@ -837,7 +837,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
         if(nPos != LISTBOX_ENTRY_NOTFOUND)
             SwitchType( GetView()->getController()->getTypeInfo(nPos) );
         else
-            SwitchType(NULL);
+            SwitchType(TOTypeInfoSP());
 
     }
 
@@ -1113,7 +1113,7 @@ void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const Strin
     }
 }
 //------------------------------------------------------------------------------
-void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const OTypeInfo* _pTypeInfo )
+void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo )
 {
     DBG_CHKTHIS(OTableEditorCtrl,NULL);
     //////////////////////////////////////////////////////////////////////
@@ -1134,7 +1134,7 @@ void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const OTypeInfo* _
         default:
             OSL_ENSURE(sal_False, "OTableEditorCtrl::SetData: invalid column!");
     }
-    SetControlText(nRow,nColId,_pTypeInfo ? _pTypeInfo->aUIName : ::rtl::OUString());
+    SetControlText(nRow,nColId,_pTypeInfo.get() ? _pTypeInfo->aUIName : ::rtl::OUString());
 }
 //------------------------------------------------------------------------------
 void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData )
@@ -1389,11 +1389,22 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long nRow )
 sal_Bool OTableEditorCtrl::IsPasteAllowed( long nRow )
 {
     DBG_CHKTHIS(OTableEditorCtrl,NULL);
-    return GetView()->getController()->isAddAllowed();
+    sal_Bool bAllowed = GetView()->getController()->isAddAllowed();
+    if ( bAllowed )
+    {
+        TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
+        sal_Bool bRowFormat = aTransferData.HasFormat(SOT_FORMATSTR_ID_SBA_TABED);
+        if ( m_eChildFocus == ROW )
+            bAllowed = bRowFormat;
+        else
+            bAllowed = !bRowFormat && aTransferData.HasFormat(SOT_FORMAT_STRING);
+    }
+
+    return bAllowed;
 }
 
 //------------------------------------------------------------------------------
-void OTableEditorCtrl::Cut()
+void OTableEditorCtrl::cut()
 {
     if(m_eChildFocus == NAME)
     {
@@ -1422,10 +1433,10 @@ void OTableEditorCtrl::Cut()
 }
 
 //------------------------------------------------------------------------------
-void OTableEditorCtrl::Copy()
+void OTableEditorCtrl::copy()
 {
     if(GetSelectRowCount())
-        OTableRowView::Copy();
+        OTableRowView::copy();
     else if(m_eChildFocus == NAME)
         pNameCell->Copy();
     else if(m_eChildFocus == DESCRIPTION)
@@ -1433,7 +1444,7 @@ void OTableEditorCtrl::Copy()
 }
 
 //------------------------------------------------------------------------------
-void OTableEditorCtrl::Paste()
+void OTableEditorCtrl::paste()
 {
     TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
     if(aTransferData.HasFormat(SOT_FORMATSTR_ID_SBA_TABED))
@@ -1545,7 +1556,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long nRow )
             // Wenn Feldtyp Memo oder Image, kein PrimKey
             // oder wenn Spalten nicht gedroped werden k�nnen und das Required Flag ist nicht gesetzt
             // oder wenn eine ::com::sun::star::sdbcx::View vorhanden ist und das Required Flag nicht gesetzt ist
-            const OTypeInfo* pTypeInfo = pFieldDescr->getTypeInfo();
+            TOTypeInfoSP pTypeInfo = pFieldDescr->getTypeInfo();
             if( pTypeInfo->nSearchType == ColumnSearch::NONE                    ||
                 (pFieldDescr->IsNullable() && pRow->IsReadOnly())
               )
@@ -1641,13 +1652,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
                     switch (aContextMenu.Execute(this, aMenuPos))
                     {
                         case SID_CUT:
-                            Cut();
+                            cut();
                             break;
                         case SID_COPY:
-                            Copy();
+                            copy();
                             break;
                         case SID_PASTE:
-                            Paste();
+                            paste();
                             break;
                         case SID_DELETE:
                             if( nDeleteEvent )
@@ -1679,7 +1690,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
 IMPL_LINK( OTableEditorCtrl, DelayedCut, void*, EMPTYTAG )
 {
     nCutEvent = 0;
-    OTableRowView::Cut();
+    OTableRowView::cut();
     return 0;
 }
 
@@ -1827,7 +1838,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKey()
 }
 
 //------------------------------------------------------------------------------
-void OTableEditorCtrl::SwitchType( const OTypeInfo* _pType )
+void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType )
 {
     DBG_CHKTHIS(OTableEditorCtrl,NULL);
     //////////////////////////////////////////////////////////////////////
@@ -1843,7 +1854,7 @@ void OTableEditorCtrl::SwitchType( const OTypeInfo* _pType )
     // Neue Beschreibung darstellen
     OTableRow* pRow = (*m_pRowList)[nRow];
     pRow->SetFieldType( _pType, sal_True );
-    if(_pType)
+    if ( _pType.get() )
     {
         sal_uInt16 nCurrentlySelected = pTypeCell->GetSelectEntryPos();
         OTableController* pController = GetView()->getController();
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 12deeee1b499..75d48b57b5c1 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TEditControl.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-24 09:19:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,6 +76,9 @@
 #ifndef DBAUI_ENUMTYPES_HXX
 #include "QEnumTypes.hxx"
 #endif
+#ifndef DBAUI_TYPEINFO_HXX
+#include "TypeInfo.hxx"
+#endif
 
 class Edit;
 class SfxUndoManager;
@@ -185,12 +188,12 @@ namespace dbaui
 
         void            SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); }
         BOOL            SaveCurRow();
-        void            SwitchType( const OTypeInfo* _pType );
+        void            SwitchType( const TOTypeInfoSP& _pType );
 
         void            DisplayData( long nRow, BOOL bGrabFocus = TRUE );
             // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist)
 
-        virtual void    SetData( long nRow, USHORT nColId, const OTypeInfo* _pTypeInfo );
+        virtual void    SetData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo );
         virtual void    SetData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rSaveData );
         virtual ::com::sun::star::uno::Any  GetData( long nRow, USHORT nColId );
         virtual void    SetControlText( long nRow, USHORT nColId, const String& rText );
@@ -215,9 +218,15 @@ namespace dbaui
         // window overloads
         virtual long            PreNotify( NotifyEvent& rNEvt );
 
-        virtual void Cut();
-        virtual void Copy();
-        virtual void Paste();
+        // IClipboardTest
+        virtual sal_Bool isCutAllowed() { return IsCutAllowed(); }
+        virtual sal_Bool isCopyAllowed() { return IsCopyAllowed(); }
+        virtual sal_Bool isPasteAllowed() { return IsPasteAllowed(); }
+        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
+
+        virtual void cut();
+        virtual void copy();
+        virtual void paste();
     private:
         DECL_LINK( StartIndexing, void* );
         DECL_LINK( DelayedCut, void* );
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 96bd29b03cdc..15570a2af408 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableController.cxx,v $
  *
- *  $Revision: 1.87 $
+ *  $Revision: 1.88 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-21 14:39:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -265,18 +265,13 @@ OTableController::OTableController(const Reference< XMultiServiceFactory >& _rM)
     ,m_bAllowAutoIncrementValue(sal_False)
 {
     InvalidateAll();
-    m_pTypeInfo = new OTypeInfo();
+    m_pTypeInfo = TOTypeInfoSP(new OTypeInfo());
     m_pTypeInfo->aUIName = m_sTypeNames.GetToken(TYPE_OTHER);
 }
 // -----------------------------------------------------------------------------
 OTableController::~OTableController()
 {
-    DELETEZ(m_pTypeInfo);
     m_aTypeInfoIndex.clear();
-    OTypeInfoMap::iterator aIter = m_aTypeInfo.begin();
-    for(;aIter != m_aTypeInfo.end();++aIter)
-        delete aIter->second;
-
     m_aTypeInfo.clear();
 }
 
@@ -348,7 +343,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const
             aReturn.bEnabled = m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isCopyAllowed();
             break;
         case ID_BROWSER_PASTE:
-            aReturn.bEnabled = isEditable() && m_bFrameUiActive;
+            aReturn.bEnabled = isEditable() && m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isPasteAllowed();
             break;
         case SID_INDEXDESIGN:
             aReturn.bEnabled =
@@ -903,7 +898,7 @@ void OTableController::reconnect(sal_Bool _bUI)
     }
 }
 // -----------------------------------------------------------------------------
-const OTypeInfo* OTableController::getTypeInfoByType(sal_Int32 _nDataType) const
+TOTypeInfoSP OTableController::getTypeInfoByType(sal_Int32 _nDataType) const
 {
     return queryTypeInfoByType(_nDataType,m_aTypeInfo);
 }
@@ -1044,8 +1039,8 @@ void OTableController::loadData()
             xColumn->getPropertyValue(PROPERTY_NAME)            >>= sName;
             xColumn->getPropertyValue(PROPERTY_TYPENAME)        >>= sTypeName;
             xColumn->getPropertyValue(PROPERTY_ISNULLABLE)      >>= nNullable;
-            bIsAutoIncrement    = ::cppu::any2bool(xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT));
-            bIsCurrency         = ::cppu::any2bool(xColumn->getPropertyValue(PROPERTY_ISCURRENCY));
+            xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bIsAutoIncrement;
+            xColumn->getPropertyValue(PROPERTY_ISCURRENCY)      >>= bIsCurrency;
             xColumn->getPropertyValue(PROPERTY_TYPE)            >>= nType;
             xColumn->getPropertyValue(PROPERTY_SCALE)           >>= nScale;
             xColumn->getPropertyValue(PROPERTY_PRECISION)       >>= nPrecision;
@@ -1064,8 +1059,8 @@ void OTableController::loadData()
             pTabEdRow->SetReadOnly(!bIsAlterAllowed);
             // search for type
             sal_Bool bForce;
-            const OTypeInfo* pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,nPrecision,nScale,bForce);
-            if(!pTypeInfo)
+            TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,nPrecision,nScale,bIsAutoIncrement,bForce);
+            if ( !pTypeInfo.get() )
                 pTypeInfo = m_pTypeInfo;
             pTabEdRow->SetFieldType( pTypeInfo, bForce );
 
@@ -1214,9 +1209,9 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star::
             if (nReturn == RET_YES)
             {
                 OTableRow* pNewRow = new OTableRow();
-                const OTypeInfo* pTypeInfo = ::dbaui::queryPrimaryKeyType(m_aTypeInfo);
+                TOTypeInfoSP pTypeInfo = ::dbaui::queryPrimaryKeyType(m_aTypeInfo);
 
-                if ( pTypeInfo )
+                if ( pTypeInfo.get() )
                 {
                     pNewRow->SetFieldType( pTypeInfo );
                     OFieldDescription* pActFieldDescr = pNewRow->GetActFieldDescr();
@@ -1293,7 +1288,7 @@ void OTableController::alterColumns()
             xColumn->getPropertyValue(PROPERTY_PRECISION)       >>= nPrecision;
             xColumn->getPropertyValue(PROPERTY_SCALE)           >>= nScale;
             xColumn->getPropertyValue(PROPERTY_ISNULLABLE)      >>= nNullable;
-            bAutoIncrement = ::cppu::any2bool(xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT));
+            xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement;
             //  xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency()));
             if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_HELPTEXT))
                 xColumn->getPropertyValue(PROPERTY_HELPTEXT) >>= sDescription;
@@ -1570,7 +1565,6 @@ void OTableController::assignTable()
                 startTableListening();
 
                 // check if we set the table editable
-                Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY);
                 setEditable( isAlterAllowed() || isDropAllowed() || isAddAllowed() );
                 if(!isEditable())
                 {
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index f2b89a81d62a..0f667ea9e900 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignControl.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:45:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -200,10 +200,10 @@ void OTableRowView::Command(const CommandEvent& rEvt)
                 switch (aContextMenu.Execute(this, rEvt.GetMousePosPixel()))
                 {
                     case SID_CUT:
-                        Cut();
+                        cut();
                         break;
                     case SID_COPY:
-                        Copy();
+                        copy();
                         break;
                     case SID_PASTE:
                         Paste( nRow );
@@ -234,20 +234,20 @@ void OTableRowView::Command(const CommandEvent& rEvt)
 }
 
 //------------------------------------------------------------------------------
-void OTableRowView::Cut()
+void OTableRowView::cut()
 {
     CopyRows();
     DeleteRows();
 }
 
 //------------------------------------------------------------------------------
-void OTableRowView::Copy()
+void OTableRowView::copy()
 {
     CopyRows();
 }
 
 //------------------------------------------------------------------------------
-void OTableRowView::Paste()
+void OTableRowView::paste()
 {
     OSL_ENSURE(0,"OTableRowView::Paste : (pseudo-) abstract method called !");
 }
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index cdc97329eada..07c3b175f624 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignHelpBar.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-02 09:54:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,6 +130,36 @@ long OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt )
         SetHelpText(String());
     return TabPage::PreNotify(rNEvt);
 }
+// -----------------------------------------------------------------------------
+sal_Bool OTableDesignHelpBar::isCopyAllowed()
+{
+    return m_pTextWin && m_pTextWin->GetSelected().Len();
+}
+// -----------------------------------------------------------------------------
+sal_Bool OTableDesignHelpBar::isCutAllowed()
+{
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+sal_Bool OTableDesignHelpBar::isPasteAllowed()
+{
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+void OTableDesignHelpBar::cut()
+{
+}
+// -----------------------------------------------------------------------------
+void OTableDesignHelpBar::copy()
+{
+    if ( m_pTextWin )
+        m_pTextWin->Copy();
+}
+// -----------------------------------------------------------------------------
+void OTableDesignHelpBar::paste()
+{
+}
+
 
 //==================================================================
 // class OFieldPropTabCtrl
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 9fb43663b460..eddfb4495833 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignView.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 07:03:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -361,70 +361,58 @@ long OTableDesignView::PreNotify( NotifyEvent& rNEvt )
     return bHandled ? 1L : ODataView::PreNotify(rNEvt);
 }
 // -----------------------------------------------------------------------------
-sal_Bool OTableDesignView::isCopyAllowed()
+IClipboardTest* OTableDesignView::getActiveChild() const
 {
-    sal_Bool bAllowed = sal_False;
+    IClipboardTest* pTest = NULL;
     switch(m_eChildFocus)
     {
         case DESCRIPTION:
-            bAllowed = GetDescWin()->isCopyAllowed();
+            pTest = GetDescWin();
             break;
         case EDITOR:
-            bAllowed = GetEditorCtrl()->IsCopyAllowed();
+            pTest = GetEditorCtrl();
             break;
     }
-    return bAllowed;
+    return pTest;
+}
+// -----------------------------------------------------------------------------
+sal_Bool OTableDesignView::isCopyAllowed()
+{
+    IClipboardTest* pTest = getActiveChild();
+    return pTest && pTest->isCopyAllowed();
 }
 // -----------------------------------------------------------------------------
 sal_Bool OTableDesignView::isCutAllowed()
 {
-    sal_Bool bAllowed = sal_False;
-    switch(m_eChildFocus)
-    {
-        case DESCRIPTION:
-            bAllowed = GetDescWin()->isCutAllowed();
-            break;
-        case EDITOR:
-            bAllowed = GetEditorCtrl()->IsCutAllowed();
-            break;
-    }
-    return bAllowed;
+    IClipboardTest* pTest = getActiveChild();
+    return pTest && pTest->isCutAllowed();
+}
+// -----------------------------------------------------------------------------
+sal_Bool OTableDesignView::isPasteAllowed()
+{
+    IClipboardTest* pTest = getActiveChild();
+    return pTest && pTest->isPasteAllowed();
 }
 // -----------------------------------------------------------------------------
 void OTableDesignView::copy()
 {
-    if( m_eChildFocus == DESCRIPTION)
-    {
-        GetDescWin()->copy();
-    }
-    else if( m_eChildFocus == EDITOR)
-    {
-        GetEditorCtrl()->Copy();
-    }
+    IClipboardTest* pTest = getActiveChild();
+    if ( pTest )
+        pTest->copy();
 }
 // -----------------------------------------------------------------------------
 void OTableDesignView::cut()
 {
-    if( m_eChildFocus == DESCRIPTION)
-    {
-        GetDescWin()->cut();
-    }
-    else if( m_eChildFocus == EDITOR)
-    {
-        GetEditorCtrl()->Cut();
-    }
+    IClipboardTest* pTest = getActiveChild();
+    if ( pTest )
+        pTest->cut();
 }
 // -----------------------------------------------------------------------------
 void OTableDesignView::paste()
 {
-    if( m_eChildFocus == DESCRIPTION)
-    {
-        GetDescWin()->paste();
-    }
-    else if( m_eChildFocus == EDITOR)
-    {
-        GetEditorCtrl()->Paste();
-    }
+    IClipboardTest* pTest = getActiveChild();
+    if ( pTest )
+        pTest->paste();
 }
 // -----------------------------------------------------------------------------
 // set the view readonly or not
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 232bc35f2617..b581729c0f0a 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableFieldControl.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-26 10:49:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -177,7 +177,7 @@ Reference< XNumberFormatter >   OTableFieldControl::GetFormatter() const
     return GetCtrl()->GetView()->getController()->getNumberFormatter();
 }
 // -----------------------------------------------------------------------------
-const OTypeInfo* OTableFieldControl::getTypeInfo(sal_Int32 _nPos)
+TOTypeInfoSP OTableFieldControl::getTypeInfo(sal_Int32 _nPos)
 {
     return GetCtrl()->GetView()->getController()->getTypeInfo(_nPos);
 }
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
index 45bd00bc4e09..e4bef49645ae 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableFieldControl.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-26 10:49:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,10 +86,10 @@ namespace dbaui
 
         virtual ::com::sun::star::lang::Locale  GetLocale() const;
 
-        virtual const OTypeInfo*    getTypeInfo(sal_Int32 _nPos);
-        virtual const OTypeInfoMap* getTypeInfo() const;
-        virtual sal_Bool isAutoIncrementValueEnabled() const;
-        virtual ::rtl::OUString getAutoIncrementValue() const;
+        virtual TOTypeInfoSP                    getTypeInfo(sal_Int32 _nPos);
+        virtual const OTypeInfoMap*             getTypeInfo() const;
+        virtual sal_Bool                        isAutoIncrementValueEnabled() const;
+        virtual ::rtl::OUString                 getAutoIncrementValue() const;
 
     public:
         OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar);
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 7883118753a2..55f87ee64be5 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableFieldDescWin.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:45:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,8 +128,8 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent)
     m_pHelpBar->Show();
 
     m_pGenPage = new OFieldDescGenWin( this, m_pHelpBar );
-    m_pGenPage->SetHelpId( HID_TABLE_DESIGN_TABPAGE_GENERAL );
-    m_pGenPage->Show();
+    getGenPage()->SetHelpId( HID_TABLE_DESIGN_TABPAGE_GENERAL );
+    getGenPage()->Show();
 }
 
 //------------------------------------------------------------------------------
@@ -139,7 +139,7 @@ OTableFieldDescWin::~OTableFieldDescWin()
     //////////////////////////////////////////////////////////////////////
     // Childs zerstoeren
     m_pHelpBar->Hide();
-    m_pGenPage->Hide();
+    getGenPage()->Hide();
     m_pHeader->Hide();
 
     {
@@ -159,29 +159,29 @@ OTableFieldDescWin::~OTableFieldDescWin()
 //------------------------------------------------------------------------------
 void OTableFieldDescWin::Init()
 {
-    DBG_ASSERT(m_pGenPage != NULL, "OTableFieldDescWin::Init : ups ... no GenericPage ... this will crash ...");
-    m_pGenPage->Init();
+    DBG_ASSERT(getGenPage() != NULL, "OTableFieldDescWin::Init : ups ... no GenericPage ... this will crash ...");
+    getGenPage()->Init();
 }
 
 //------------------------------------------------------------------------------
 void OTableFieldDescWin::SetReadOnly( sal_Bool bRead )
 {
     DBG_CHKTHIS(OTableFieldDescWin,NULL);
-    m_pGenPage->SetReadOnly( bRead );
+    getGenPage()->SetReadOnly( bRead );
 }
 
 //------------------------------------------------------------------------------
 void OTableFieldDescWin::DisplayData( OFieldDescription* pFieldDescr )
 {
     DBG_CHKTHIS(OTableFieldDescWin,NULL);
-    m_pGenPage->DisplayData( pFieldDescr );
+    getGenPage()->DisplayData( pFieldDescr );
 }
 
 //------------------------------------------------------------------------------
 void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr )
 {
     DBG_CHKTHIS(OTableFieldDescWin,NULL);
-    m_pGenPage->SaveData( pFieldDescr );
+    getGenPage()->SaveData( pFieldDescr );
 }
 
 //------------------------------------------------------------------------------
@@ -264,7 +264,7 @@ void OTableFieldDescWin::Resize()
 
     m_pHeader->SetPosSizePixel( Point(0, STANDARD_MARGIN), Size(nOutputWidth, 15) );
 
-    m_pGenPage->SetPosSizePixel(Point   (   STANDARD_MARGIN,
+    getGenPage()->SetPosSizePixel(Point (   STANDARD_MARGIN,
                                         STANDARD_MARGIN + DETAILS_HEADER_HEIGHT
                                     ),
                               Size  (   nPageWidth,
@@ -289,46 +289,80 @@ void OTableFieldDescWin::Resize()
     Invalidate();
 }
 // -----------------------------------------------------------------------------
+IClipboardTest* OTableFieldDescWin::getActiveChild() const
+{
+    IClipboardTest* pTest = NULL;
+    switch(m_eChildFocus)
+    {
+        case DESCRIPTION:
+            pTest = getGenPage();
+            break;
+        default:
+            pTest = getHelpBar();
+            break;
+    }
+    return pTest;
+}
+// -----------------------------------------------------------------------------
 sal_Bool OTableFieldDescWin::isCopyAllowed()
 {
-    return (m_pGenPage && m_pGenPage->isCutAllowed());
+    return getActiveChild() && getActiveChild()->isCopyAllowed();
 }
 // -----------------------------------------------------------------------------
 sal_Bool OTableFieldDescWin::isCutAllowed()
 {
-    return (m_pGenPage && m_pGenPage->isCutAllowed());
+    return (getGenPage() && getGenPage()->HasChildPathFocus() && getGenPage()->isCutAllowed());
+}
+// -----------------------------------------------------------------------------
+sal_Bool OTableFieldDescWin::isPasteAllowed()
+{
+    return (getGenPage() && getGenPage()->HasChildPathFocus() && getGenPage()->isPasteAllowed());
 }
 // -----------------------------------------------------------------------------
 void OTableFieldDescWin::cut()
 {
-    if(m_pGenPage)
-        m_pGenPage->cut();
+    if ( getGenPage() && getGenPage()->HasChildPathFocus() )
+        getGenPage()->cut();
 }
 // -----------------------------------------------------------------------------
 void OTableFieldDescWin::copy()
 {
-    if(m_pGenPage)
-        m_pGenPage->copy();
+    if ( getActiveChild() )
+        getActiveChild()->copy();
 }
 // -----------------------------------------------------------------------------
 void OTableFieldDescWin::paste()
 {
-    if(m_pGenPage)
-        m_pGenPage->paste();
+    if ( getGenPage() && getGenPage()->HasChildPathFocus() )
+        getGenPage()->paste();
 }
 // -----------------------------------------------------------------------------
 void OTableFieldDescWin::GetFocus()
 {
-    if ( m_pGenPage )
-        m_pGenPage->GetFocus();
+    if ( getGenPage() )
+        getGenPage()->GetFocus();
 }
 // -----------------------------------------------------------------------------
 void OTableFieldDescWin::LoseFocus()
 {
-    if ( m_pGenPage )
-        m_pGenPage->LoseFocus();
+    if ( getGenPage() )
+        getGenPage()->LoseFocus();
 }
 // -----------------------------------------------------------------------------
+long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
+{
+    BOOL bHandled = FALSE;
+    switch(rNEvt.GetType())
+    {
+        case EVENT_GETFOCUS:
+            if( getGenPage() && getGenPage()->HasChildPathFocus() )
+                m_eChildFocus = DESCRIPTION;
+            else
+                m_eChildFocus = HELP;
+            break;
+    }
 
+    return bHandled ? 1L : TabPage::PreNotify(rNEvt);
+}
 
 
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index b8ca3180fd78..813cd731359a 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableFieldDescWin.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-24 09:19:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,9 @@
 #ifndef DBAUI_TABLEFIELDDESCGENPAGE_HXX
 #include "FieldDescGenWin.hxx"
 #endif
+#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#include "IClipBoardTest.hxx"
+#endif
 
 class FixedText;
 namespace dbaui
@@ -78,11 +81,21 @@ namespace dbaui
     // Ableitung von TabPage ist ein Trick von TH,
     // um Aenderungen der Systemfarben zu bemerken (Bug #53905)
     class OTableFieldDescWin : public TabPage
+                                ,public IClipboardTest
     {
+        enum ChildFocusState
+        {
+            DESCRIPTION,
+            HELP,
+            NONE
+        };
     private:
         OTableDesignHelpBar*    m_pHelpBar;
         OFieldDescGenWin*       m_pGenPage;
         FixedText*              m_pHeader;
+        ChildFocusState         m_eChildFocus;
+
+        IClipboardTest* getActiveChild() const;
 
     protected:
         virtual void Resize();
@@ -98,8 +111,11 @@ namespace dbaui
         void SaveData( OFieldDescription* pFieldDescr );
         void SetReadOnly( BOOL bReadOnly );
 
+        // window overloads
+        virtual long PreNotify( NotifyEvent& rNEvt );
         virtual void GetFocus();
         virtual void LoseFocus();
+
         void SetControlText( USHORT nControlId, const String& rText )
                 { m_pGenPage->SetControlText(nControlId,rText); }
         String GetControlText( USHORT nControlId )
@@ -113,14 +129,18 @@ namespace dbaui
         String  BoolStringPersistent(const String& rUIString) const { return m_pGenPage->BoolStringPersistent(rUIString); }
         String  BoolStringUI(const String& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); }
 
-        sal_Bool isCutAllowed();
-        sal_Bool isCopyAllowed();
+        // IClipboardTest
+        virtual sal_Bool isCutAllowed();
+        virtual sal_Bool isCopyAllowed();
+        virtual sal_Bool isPasteAllowed();
+        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
 
-        void    cut();
-        void    copy();
-        void    paste();
+        virtual void copy();
+        virtual void cut();
+        virtual void paste();
 
         inline OFieldDescGenWin* getGenPage() const { return m_pGenPage; }
+        inline OTableDesignHelpBar* getHelpBar() const { return m_pHelpBar; }
 
     };
 }
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index 8104b83c5ba1..aec5d2364695 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableRow.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-14 07:55:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,10 +137,10 @@ sal_Bool OTableRow::IsPrimaryKey() const
     return m_pActFieldDescr && m_pActFieldDescr->IsPrimaryKey();
 }
 // -----------------------------------------------------------------------------
-void OTableRow::SetFieldType( const OTypeInfo* _pType, sal_Bool _bForce )
+void OTableRow::SetFieldType( const TOTypeInfoSP& _pType, sal_Bool _bForce )
 {
     DBG_CHKTHIS(OTableRow,NULL);
-    if ( _pType )
+    if ( _pType.get() )
     {
         if( !m_pActFieldDescr )
         {
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index 44900e317bf5..eb4c3eac9281 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableUndo.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-24 09:19:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,7 +213,7 @@ OTableEditorUndoAct::~OTableEditorUndoAct()
 // class OTableEditorTypeSelUndoAct
 //==============================================================================
 DBG_NAME(OTableEditorTypeSelUndoAct);
-OTableEditorTypeSelUndoAct::OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const OTypeInfo* _pOldType ) :
+OTableEditorTypeSelUndoAct::OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const TOTypeInfoSP& _pOldType ) :
      OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_TYPE_CHANGED)
     ,m_nRow( nRowID )
     ,m_nCol( nColumn )
@@ -239,7 +239,7 @@ void OTableEditorTypeSelUndoAct::Undo()
     if(pFieldDesc)
         m_pNewType = pFieldDesc->getTypeInfo();
     else
-        m_pNewType = NULL;
+        m_pNewType = TOTypeInfoSP();
     pTabEdCtrl->SetData(m_nRow,m_nCol,m_pOldType);
     pTabEdCtrl->SwitchType( m_pOldType );
 
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 8abcb162c784..ec0b95eb97e5 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableUndo.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-24 09:19:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,9 @@
 #ifndef _COM_SUN_STAR_UNO_ANY_H_
 #include <com/sun/star/uno/Any.h>
 #endif
+#ifndef DBAUI_TYPEINFO_HXX
+#include "TypeInfo.hxx"
+#endif
 
 namespace dbaui
 {
@@ -125,15 +128,15 @@ namespace dbaui
     class OTableEditorTypeSelUndoAct : public OTableEditorUndoAct
     {
     protected:
-        USHORT              m_nCol;
-        long                m_nRow;
-        const OTypeInfo*    m_pOldType;
-        const OTypeInfo*    m_pNewType;
+        USHORT          m_nCol;
+        long            m_nRow;
+        TOTypeInfoSP    m_pOldType;
+        TOTypeInfoSP    m_pNewType;
 
         virtual void    Undo();
         virtual void    Redo();
     public:
-        OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const OTypeInfo* _pOldType );
+        OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const TOTypeInfoSP& _pOldType );
         virtual ~OTableEditorTypeSelUndoAct();
     };
 
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index ebde8236d85d..ff78cdc2cc46 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.src,v $
  *
- *  $Revision: 1.74 $
+ *  $Revision: 1.75 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-09 11:38:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,7 +93,7 @@
     Text [ english ] = "I~ndex Desgin..." ; \
     Text [ english_us ] = "~Index Design...";   \
     Text[ portuguese ] = "E~sbo�ar �ndice..."; \
-    Text[ russian ] = "������ �������..."; \
+    Text[ russian ] = "�������������� �������..."; \
     Text[ greek ] = "���������� ����������"; \
     Text[ dutch ] = "~Ontwerp-index..."; \
     Text[ french ] = "�bauche d'i~ndex..."; \
@@ -105,7 +105,7 @@
     Text[ polish ] = "~Projekt indeksu..."; \
     Text[ portuguese_brazilian ] = "Index Desgin"; \
     Text[ japanese ] = "インデックスデザイン(~I)..."; \
-    Text[ korean ] = "색인 윤곽(~I)"; \
+    Text[ korean ] = "색인 디자인(~I)..."; \
     Text[ chinese_simplified ] = "索引设计(~I)..."; \
     Text[ chinese_traditional ] = "索引設計(~I)..."; \
     Text[ turkish ] = "Index Desgin"; \
@@ -135,7 +135,7 @@ String STR_TABLEDESIGN_DBFIELDTYPES
     Text[ polish ] = "Nieznany;Tekst;Liczba;Data/Godzina;Data;Godzina;Tak/Nie;Waluta;Memorandum;Licznik;Obraz;Tekst (sta�y);Dziesi�tny;Pole binarne (sta�e);BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Zero;Obiekt;Distinct;Struktura;Pole;BLOB;CLOB;REF;OTHER";
     Text[ portuguese_brazilian ] = "Unknown;Text;Number;Date/Time;Date;Time;Boolean;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Struct;Feld;BLOB;CLOB;REF";
     Text[ japanese ] = "不明;テキスト;数詞;日付/時刻;日付;時刻;はい/いいえ;通貨単位;メモ;カウンタ;イメージ;テキスト(固定);十進法;二進法フィールド(固定);二進法フィールド;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL ゼロ;オブジェクト;Distinct;構造;フィールド;BLOB;CLOB;REF";
-    Text[ korean ] = "알려져 있지 않은;텍스트;수;날짜/시간;날짜;시간;예/아니오;화폐;메모;카운터;이미지;텍스트 (고정);10진;2진 (고정);2진;BigInt;더블;부동;Real;정수;작은 정수;작은 정수;SQL 널;개체;Distinct;Struct;필드;BLOB;CLOB;REF;OTHER";
+    Text[ korean ] = "알 수 없는;텍스트;수;날짜/시간;날짜;시간;예/아니오;화폐;메모;카운터;이미지;텍스트(고정);10진;2진 (고정);2진;BigInt;더블;부동;Real;정수;작은 정수;작은 정수;SQL Null;개체;Distinct;Struct;필드;BLOB;CLOB;REF;OTHER";
     Text[ chinese_simplified ] = "不明;文字;数字;日期/时间;日期;时间;是/否;货币;Memo;计数;图像;文字(固定);十进制;二进制(固定);二进制;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Objekt;Distinct;Struktur;Feld;BLOB;CLOB;REF;其它";
     Text[ chinese_traditional ] = "不明;文字;數字;日期/時間;日期;時間;是/否;貨幣;Memo;計數;影像;文字(固定);十進位;二進位(固定);二進位;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;其它";
     Text[ turkish ] = "Unknown;Text;Number;Date/Time;Date;Time;Boolean;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Struct;Feld;BLOB;CLOB;REF";
@@ -153,7 +153,7 @@ String STR_TABLEDESIGN_UNDO_PRIMKEY
     Text [ swedish ] = "Infoga/ta bort prim�rnyckel" ;
     Text [ danish ] = "Inds�t/fjern prim�rn�gle" ;
     Text [ italian ] = "Inserisci/elimina la chiave primaria" ;
-    Text [ spanish ] = "Insertar/eliminar llave primaria" ;
+    Text [ spanish ] = "Insertar/borrar una clave primaria" ;
     Text [ french ] = "Ins�rer/supprimer une cl� primaire" ;
     Text [ dutch ] = "Primaire sleutel invoegen/verwijderen" ;
     Text [ portuguese ] = "Inserir/remover chave prim�ria" ;
@@ -166,7 +166,7 @@ String STR_TABLEDESIGN_UNDO_PRIMKEY
     Text[ dutch ] = "Primaire sleutel invoegen/verwijderen";
     Text[ chinese_simplified ] = "新增或删除主关键字";
     Text[ greek ] = "��������/�������� �������� ������";
-    Text[ korean ] = "기본키 삽입/삭제";
+    Text[ korean ] = "기본키 삽입/제거";
     Text[ turkish ] = "Birinci anahtar ekle/kald�r";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Insereix/suprimeix la clau prim�ria";
@@ -372,7 +372,7 @@ String STR_TAB_FIELD_DATATYPE
     Text[ dutch ] = "Veldtype";
     Text[ chinese_simplified ] = "字段类型";
     Text[ greek ] = "����� ������";
-    Text[ korean ] = "필드 형식";
+    Text[ korean ] = "필드 유형";
     Text[ turkish ] = "Alan t�r�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Tipus de camp";
@@ -459,7 +459,7 @@ String STR_TAB_FIELD_NULLABLE
     Text[ dutch ] = "Invoer vereist";
     Text[ chinese_simplified ] = "要求输入";
     Text[ greek ] = "���������� ��������";
-    Text[ korean ] = "입력이 요구됨";
+    Text[ korean ] = "입력 필요";
     Text[ turkish ] = "Veri giri�i gerekiyor";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Es necessita una entrada";
@@ -517,7 +517,7 @@ String STR_TAB_PROPERTIES
     Text[ dutch ] = "Veldeigenschappen";
     Text[ chinese_simplified ] = "字段属性";
     Text[ greek ] = "��������� ������";
-    Text[ korean ] = "필드 등록정보";
+    Text[ korean ] = "필드 등록 정보";
     Text[ turkish ] = "Alan �zellikleri";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Propietats del camp";
@@ -570,7 +570,7 @@ String STR_TAB_TABLE_DESCRIPTION
     Text[ polish ] = "Opis :";
     Text[ portuguese_brazilian ] = "Description :";
     Text[ japanese ] = "概要:";
-    Text[ korean ] = "설명 :";
+    Text[ korean ] = "설명:";
     Text[ chinese_simplified ] = "说明：";
     Text[ chinese_traditional ] = "描述：";
     Text[ arabic ] = "����� :";
@@ -597,7 +597,7 @@ String STR_TAB_TABLE_PROPERTIES
     Text[ polish ] = "W�a�ciwo�ci tabeli";
     Text[ portuguese_brazilian ] = "Table properties";
     Text[ japanese ] = "テーブルの属性";
-    Text[ korean ] = "시트 등록정보";
+    Text[ korean ] = "테이블 등록 정보";
     Text[ chinese_simplified ] = "表格属性";
     Text[ chinese_traditional ] = "表格屬性";
     Text[ arabic ] = "����� ������";
@@ -773,7 +773,7 @@ String STR_TABED_UNDO_ROWDELETED
     Text [ swedish ] = "Radera rad" ;
     Text [ danish ] = "Slet r�kke" ;
     Text [ italian ] = "Elimina riga" ;
-    Text [ spanish ] = "Eliminar la fila" ;
+    Text [ spanish ] = "Borrar la fila" ;
     Text [ french ] = "Supprimer la ligne" ;
     Text [ dutch ] = "Rij wissen" ;
     Text [ portuguese ] = "Eliminar linha" ;
@@ -815,7 +815,7 @@ String STR_TABED_UNDO_TYPE_CHANGED
     Text[ dutch ] = "Veldtype wijzigen";
     Text[ chinese_simplified ] = "更改字段类型";
     Text[ greek ] = "������ ����� ������";
-    Text[ korean ] = "필드형식 변경";
+    Text[ korean ] = "필드 유형 변경";
     Text[ turkish ] = "Alan t�r�n� de�i�tir";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Modifica el tipus de camp";
@@ -886,7 +886,7 @@ String STR_TABED_UNDO_PRIMKEY
     Text [ swedish ] = "Infoga/ta bort prim�rnyckel" ;
     Text [ danish ] = "Inds�t/fjern prim�rn�gle" ;
     Text [ italian ] = "Inserisci/elimina la chiave primaria" ;
-    Text [ spanish ] = "Insertar/eliminar llave primaria" ;
+    Text [ spanish ] = "Insertar/borrar una clave primaria" ;
     Text [ french ] = "Ins�rer/supprimer une cl� primaire" ;
     Text [ dutch ] = "Primaire sleutel invoegen/verwijderen" ;
     Text [ portuguese ] = "Inserir/remover chave prim�ria" ;
@@ -899,7 +899,7 @@ String STR_TABED_UNDO_PRIMKEY
     Text[ dutch ] = "Primaire sleutel invoegen/verwijderen";
     Text[ chinese_simplified ] = "新增或删除主关键字";
     Text[ greek ] = "��������/�������� �������� ������";
-    Text[ korean ] = "기본키 삽입/삭제";
+    Text[ korean ] = "기본키 삽입/제거";
     Text[ turkish ] = "Birinci anahtar ekle/kald�r";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Insereix/suprimeix la clau prim�ria";
@@ -1047,7 +1047,7 @@ ToolBox RID_BRW_TABLEDESIGN_TOOLBOX
             Text[ russian ] = "��� ����������";
             Text[ greek ] = "��� ������� �������";
             Text[ dutch ] = "Geen verbinding";
-            Text[ french ] = "Aucun connexion";
+            Text[ french ] = "Aucune connexion";
             Text[ spanish ] = "Sin conexi�n";
             Text[ italian ] = "Nessun collegamento";
             Text[ danish ] = "Ingen forbindelse";
@@ -1055,7 +1055,7 @@ ToolBox RID_BRW_TABLEDESIGN_TOOLBOX
             Text[ polish ] = "Brak po��czenia";
             Text[ portuguese_brazilian ] = "No connection";
             Text[ japanese ] = "接続なし";
-            Text[ korean ] = "연결되지 않음";
+            Text[ korean ] = "연결 없음";
             Text[ chinese_simplified ] = "无法连接";
             Text[ chinese_traditional ] = "沒有連線";
             Text[ turkish ] = "No connection";
@@ -1088,7 +1088,7 @@ String STR_DEFAULT_VALUE
     Text[ dutch ] = "~Standaardwaarde";
     Text[ chinese_simplified ] = "默认值(~D)";
     Text[ greek ] = "���� �����������";
-    Text[ korean ] = "기본 값(~D)";
+    Text[ korean ] = "기본값(~D)";
     Text[ turkish ] = "~Standart de�er";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Valor per ~defecte";
@@ -1117,7 +1117,7 @@ String STR_FIELD_REQUIRED
     Text[ dutch ] = "~Invoer vereist";
     Text[ chinese_simplified ] = "要求输入(~E)";
     Text[ greek ] = "�����~����� ��������";
-    Text[ korean ] = "입력 필수(~E)";
+    Text[ korean ] = "입력 필요(~E)";
     Text[ turkish ] = "~Giri� gerekiyor";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Es necessita una ~entrada";
@@ -1233,7 +1233,7 @@ String STR_SCALE
     Text[ dutch ] = "Aantal de~cimalen";
     Text[ chinese_simplified ] = "小数点位数(~P)";
     Text[ greek ] = "�������� �����";
-    Text[ korean ] = "소수점 이하 자리(~P)";
+    Text[ korean ] = "소수점 이하 자릿수(~P)";
     Text[ turkish ] = "~Ondal�k basamaklar";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Llocs ~decimals";
@@ -1283,7 +1283,7 @@ String STR_HELP_BOOL_DEFAULT
     Text[ spanish ] = "Elija el valor que deba aparecer como predeterminado en cada registro de datos que se\ninserte de nuevo. Elija la secuencia vac�a si el campo no ha de contener tal valor predeterminado.";
     Text[ english_us ] = "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string.";
     Text[ chinese_simplified ] = "请选择一个用于每新增数据条目的标准数值。\n如果字段不应含有这个标准数值，您就选择一个空白的字串。";
-    Text[ russian ] = "�������� ��������, ������� ����� ���������� �� ��������� � ������ ����� ������.\n�������� ������ ������, ���� ���� �� ����� ��������� ����� ��������.";
+    Text[ russian ] = "�������� ��������, ������� ����� ������������� ����� ���� ��� ������ ����� ������.\n�������� ������ ������, ���� ���� �� ����� ��������� ������ ��������.";
     Text[ polish ] = "Wybierz warto��, kt�ra w ka�dym nowo wstawionym rekordzie b�dzie warto�ci� domy�ln�.\nWybierz pusty ci�g znak�w, je�li pole nie ma mie� domy�lnej warto�ci.";
     Text[ japanese ] = "新しくレコードを挿入するときに表示される標準値を選択します。\nまたフィールドに標準値設定をしないときは、空白のままにしておきます。";
     Text[ chinese_traditional ] = "請選擇一個用於每一個新增資料條目的標準數值。\n若欄位不應該含有這個標準數值，就選擇一個空字串。";
@@ -1291,7 +1291,7 @@ String STR_HELP_BOOL_DEFAULT
     Text[ dutch ] = "Kies een waarde die in iedere nieuwe ingevoegd record als standaard moet verschijnen.\nKies een lege string als u niet wilt dat het veld de standaardwaarde krijgt toegewezen.";
     Text[ chinese_simplified ] = "请选择一个用于每新增数据条目的标准数值。\n如果字段不应含有这个标准数值，您就选择一个空白的字串。";
     Text[ greek ] = "�������� ��� ����, � ����� �� ����������� �� ���������� �� ���� ��� ������� ��� �� ����������.\n�� ��� ���������� �� ������� ������ ����, ��� ";
-    Text[ korean ] = "모든 새 레코드를 위한 초기값을 선택하십시오.\n필드의 초기값을 지정하지 않으려면 빈 문자열을 선택하십시오.";
+    Text[ korean ] = "새 레코드에서 기본값으로 표시될 값을 선택하십시오.\n필드에 기본값을 설정하지 않으려면 빈 문자열을 선택하십시오.";
     Text[ turkish ] = "Yeni eklenen her kay�tta standart olarak bulunacak bir de�er se�in.\nAlan i�in bu t�r bir standart de�er belirlenmeyecekse bo� dizilim se�in.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Seleccioneu un valor que apareixer� a tots els registres com a valor per defecte.\nSi el camp no ha de tenir un valor per defecte, seleccioneu la cadena buida.";
@@ -1312,7 +1312,7 @@ String STR_HELP_DEFAULT_VALUE
     Text [ dutch ] = "Geef hier een standaardwaarde voor het veld op.\n\nAls u later gegevens invoert in de tabel, wordt deze tekenreeks in iedere nieuwe record gebruikt voor het huidige veld en moet deze corresponderen met de hierna te defini�ren celopmaak." ;
     Text [ portuguese ] = "Indique um valor padr�o para este campo.\n\nEsta cadeia de caracteres ser� utilizada para todos os novos registos de dados que introduzir no campo activo da tabela. Por esta raz�o, ela deve corresponder ao formato de c�lula a indicar mais abaixo." ;
     Text[ chinese_simplified ] = "请在此为这个字段输入一个默认值。\n\n如果您以后在表格中输入数据，每个新的数据条目会采用这个数据格式。这样的设定可以满足以下的单元格格式的要求。";
-    Text[ russian ] = "������� �������� �� ��������� ��� ����� ����.\n\n���� �� ����� ������� ������ � �������, �� ������ ������ ����� �������������� � ������ ����� ������. ������ ������ ��������������� ������� �����, ��������� ����.";
+    Text[ russian ] = "������� �������� �� ��������� ��� ����� ����.\n\n��� ����� ������ � �������, ��� �������� ����� �������������� � ������ ����� ������. �������� �� ��������� ������ ��������������� ������� �����, ������������ ����.";
     Text[ polish ] = "Nale�y poda� warto�� domy�ln� pola.\n\nW trakcie p�niejszego wpisywania danych do tabeli, dany ci�g znak�w u�yty zostanie w ka�dym nowym rekordzie odno�nie aktualnego pola. Format ci�gu znak�w powinien zgadza� si� z podanym poni�ej formatem kom�rek.";
     Text[ japanese ] = "ここにフィールドの標準値を入力します。\n\nこの標準値は、データをテーブルに入力すると変更できます。標準値は、下で指定するセルの書式に対応している必要があります。";
     Text[ chinese_traditional ] = "請您為這個欄位輸入一個默認值。\n\n在這個欄位之下輸入其他資料時就會自動採用這個儲存格的格式。";
@@ -1320,7 +1320,7 @@ String STR_HELP_DEFAULT_VALUE
     Text[ dutch ] = "Geef hier een standaardwaarde voor het veld op.\n\nAls u later gegevens invoert in de tabel, wordt deze tekenreeks in iedere nieuwe record gebruikt voor het huidige veld en moet deze corresponderen met de hierna te defini�ren celopmaak.";
     Text[ chinese_simplified ] = "请在此为这个字段输入一个默认值。\n\n如果您以后在表格中输入数据，每个新的数据条目会采用这个数据格式。这样的设定可以满足以下的单元格格式的要求。";
     Text[ greek ] = "�������� ��� ���� ����������� ��� �� �����.\n\n�� �������� �������� �� �������� �������� ���� ������ �� �������������� ���� � ���� ��� ���� ? ";
-    Text[ korean ] = "이 필드를 위한 기본 값을 입력하십시오.\n\n후에 테이블에 데이터를 입력하게 되면 모든 새 레코드에서 활성화된 필드에 이 문자열이 사용될 것입니다. 따라서 이 문자열은 아래에 입력할 셀 서식에 적합해야 합니다.";
+    Text[ korean ] = "여기에 필드의 기본값을 입력하십시오.\n\n차후에 테이블에 데이터를 입력하게 되면 모든 새 레코드의 활성화된 필드에서 이 문자열이 사용될 것입니다. 따라서 이 문자열은 아래에 입력할 셀 서식에 적합해야 합니다.";
     Text[ turkish ] = "Alan i�in bir standart de�er girin.\n\nDaha sonra tabloya veri giri�i yapt���n�zda, her yeni veri k�mesinde, y�r�rl�kteki alan i�in bu dize kullan�l�r. Dize bu nedenle a�a��da girilmesi gereken h�cre format�na uygun olmal�d�r.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Introdu�u un valor per defecte per a aquest camp.\n\nQuan introdu�u les dades en la taula posteriorment, aquesta cadena s'utilitzar� en cada registre nou per al camp seleccionat. Hauria de correspondre's, doncs, amb el format de cel.la que cal introduir a sota.";
@@ -1341,7 +1341,7 @@ String STR_HELP_FIELD_REQUIRED
     Text [ dutch ] = "Activeer deze optie als in dit veld geen NUL-waarde is toegestaan, d.w.z. dat de gebruiker hier altijd iets moet invullen." ;
     Text [ portuguese ] = "Active esta op��o se n�o forem permitidos valores NULL neste campo, tendo o utilizador que introduzir sempre os dados." ;
     Text[ chinese_simplified ] = "如果这个字段内不允许使用零值而必须要求输入数据，就选择使用这个选项。";
-    Text[ russian ] = "����������� ��� �����, ���� � ���� ���� �� ����������� �������� NULL, �� ���� ������������ ������ ������ ������� � ���� ������.";
+    Text[ russian ] = "�������� \"��\", ���� �������� ����� ���� �� ������ ���� ����� NULL, �� ���� ���� ����������� ������ ��������� ������.";
     Text[ polish ] = "Uaktywnij t� opcj�, je�li niedozwolone s� w tym polu warto�ci ZEROWE, w wi�c je�li u�ytkownik musi zawsze wpisywa� dane.";
     Text[ japanese ] = "このフィールドにゼロ値は使わず、常にユーザーがデータを入力するような場合は、このオプションをアクティブにします。";
     Text[ chinese_traditional ] = "如果要設定這個欄位內不可以輸入零值而必須輸入有效數值時，您就必須採用這個選項。";
@@ -1349,7 +1349,7 @@ String STR_HELP_FIELD_REQUIRED
     Text[ dutch ] = "Activeer deze optie als in dit veld geen NUL-waarde is toegestaan, d.w.z. dat de gebruiker hier altijd iets moet invullen.";
     Text[ chinese_simplified ] = "如果这个字段内不允许使用零值而必须要求输入数据，就选择使用这个选项。";
     Text[ greek ] = "������������� ���� ��� ������� ���� ��� ������������ ��������� ����� �� ���� �� �����, ���. ���� � ������� ������ ����������� �� ������� �� ";
-    Text[ korean ] = "이 필드에 널 값이 허용되어 있지 않아 사용자가 항상 데이터를 입력해야 할 경우 이 옵션을 활성화하십시오.";
+    Text[ korean ] = "이 필드에 0 값이 허용되어 있지 않아서 사용자가 항상 데이터를 입력해야 할 경우 이 옵션을 활성화하십시오.";
     Text[ turkish ] = "Bu se�ene�i, bu alana BO� de�er girilememesi, yani kullan�c�n�n daima vergi girmek zorunda olmas� halinde etkinle�tiriniz.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Activeu aquesta opci� en cas que aquest camp no pugui contenir valors NULL. �s a dir, l'usuari sempre hi haur� d'introduir alguna dada.";
@@ -1399,7 +1399,7 @@ String STR_HELP_NUMERIC_TYPE
     Text [ dutch ] = "Geef de getalnotatie op." ;
     Text [ portuguese ] = "Defina o formato num�rico." ;
     Text[ chinese_simplified ] = "请您在此设定数字类型。";
-    Text[ russian ] = "������� ��� �����.";
+    Text[ russian ] = "������� ������ �����.";
     Text[ polish ] = "Tutaj nale�y ustali� typ liczby.";
     Text[ japanese ] = "数の書式を指定します。";
     Text[ chinese_traditional ] = "請設定數字類型。";
@@ -1427,7 +1427,7 @@ String STR_HELP_LENGTH
     Text [ dutch ] = "Geef de lengte van dit veldtype op.\n\nVoor decimale velden is dit de maximale lengte van het in te vullen getal, voor binaire velden de lengte van het gegevensblok.\nAls het veld langer is dan voor deze database maximaal is toegestaan, wordt de lengte gecorrigeerd." ;
     Text [ portuguese ] = "Defina o comprimento para os dados deste campo.\n\nPara campos decimais este � o comprimento m�ximo do n�mero indicado; para campos bin�rios � o comprimento do bloco de dados.\nEste valor ser� devidamente corrigido se for superior ao m�ximo permitido para esta base de dados." ;
     Text[ chinese_simplified ] = "请您设定这个字段中的数据长度。\n\n在十进制字段中设定的是数据最大长度，在二进制字段中设定的是数据块长度。\n如果这个数值大于数据库允许的最大值，数据库就会相应地更正这个数值。";
-    Text[ russian ] = "������� ����� ������ ��� ����� ����.\n\n��� ���������� ����� - ��� ������������ ����� ���������� �����, ��� �������� ����� - ��� ����� ����� ������.\n���� �������� �������� ����� ������ ����������� ����������� ��� ���� ���� ������, �� ��� ����� �������������� ����������.";
+    Text[ russian ] = "������� ����� ������ ��� ����� ����.\n\n��� ���������� ����� - ��� ������������ ����� ���������� �����, ��� �������� ����� - ��� ����� ����� ������.\n���� �������� �������� ����� ������� ����������� ����������� ��� ���� ���� ������, �� ��� ����� ������������� ���������������.";
     Text[ polish ] = "Podaj ��dan� d�ugo�� danych w tym polu.\n\nW przypadku p�l dziesi�tnych okre�la ona maksymaln� d�ugo�� wpisanych liczb, w przypadku p�l birarnych okre�la ona d�ugo�� bloku danych.\nJe�eli warto�� b�dzie przekracza� dopuszczaln� dla tego pola warto�� maksymaln�, zostanie ona odpowiednio skorygowana.";
     Text[ japanese ] = "このフィールドに入力するデータの長さを指定します。\n\n十進法フィールドには入力値の最大桁数、二進法フィールドにはデータブロックの長さを指定します。\n入力値がこのデータベースの最大限を超えた場合は、修正されます。";
     Text[ chinese_traditional ] = "請設定這個欄位類型的長度。\n\n十進位欄位指定指是輸入數字的最長數目，二進位欄位是指資料區域的長度。\n如果輸入數據超過設定範圍，程式就會自動修正。";
@@ -1464,7 +1464,7 @@ String STR_HELP_SCALE
     Text[ dutch ] = "Geef het aantal decimalen op.";
     Text[ chinese_simplified ] = "请为这个字段内的数字设定小数点位数。";
     Text[ greek ] = "��������� �� ������ ��� ��������� ������ ��� ������� ����� ��� ������.";
-    Text[ korean ] = "이 필드의 숫자에 포함될 소수 이하 자리 수를 지정하십시오.";
+    Text[ korean ] = "이 필드의 숫자에 포함될 소수점 이하 자릿수를 지정하십시오.";
     Text[ turkish ] = "Bu alandaki say�lar�n sahip olmas� gereken ondal�k basamak say�s�n� belirleyiniz.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Indiqueu el nombre de llocs decimals permesos en aquest camp.";
@@ -1485,7 +1485,7 @@ String STR_HELP_FORMAT_CODE
     Text[ spanish ] = "Aqu� puede ver c�mo se formatear�an los datos de la columna actual con el formato definido actualmente (utilice el bot�n de la derecha para modificar el formato).";
     Text[ english_us ] = "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format).";
     Text[ chinese_simplified ] = "您看到能够通过点击旁边的按钮，来更改当前列的数据格式。";
-    Text[ russian ] = "����� ����� �������, ��� ����� ������������ ������ � ������� ������� (� ������� ������������� ������ ������ ����� �������� ������).";
+    Text[ russian ] = "����� ����� �������, ��� ������������ ������ ��������� ���������� ������� (� ������� ������������� ������ ������ ����� �������� ������).";
     Text[ polish ] = "Tutaj wy�wietlony zostanie podgl�d sformatowanych danych aktualnej kolumny. Format mo�na zmieni� klikni�ciem przycisku znajduj�cego si� obok.";
     Text[ japanese ] = "列のデータが、現在設定された書式でどう変わったか、ここで見れます。横にあるボタンを使うと、書式の変更ができます。";
     Text[ chinese_traditional ] = "在這裡您能夠看到透過按一下旁邊的按鈕來變更目前的欄內資料格式。";
@@ -1493,7 +1493,7 @@ String STR_HELP_FORMAT_CODE
     Text[ dutch ] = "Hier ziet u hoe de gegevens in de huidige kolom eruit zouden zien met de momenteel ingestelde opmaak. Deze instelling kunt u wijzigen met de nevenstaande knoppen.";
     Text[ chinese_simplified ] = "您看到能够通过点击旁边的按钮，来更改当前列的数据格式。";
     Text[ greek ] = "��� ������� ��� ��� ��� ��������� ��� ��������� ������ �� ����������� � �������� ����� (�������������� �� ������� ����� ��� ��� ������� ��? ";
-    Text[ korean ] = "여기에서 현재 설정된 서식으로 현재 열의 데이터의 서식이 지정되는 것(옆에 있는 버튼을 이용하여 서식을 변경할 수 있음)을 볼 수 있습니다.";
+    Text[ korean ] = "여기에서 데이터가 현재 어떻게 서식이 설정되어 있는 지 볼 수 있습니다. 오른쪽에 있는 버튼을 사용하면 서식을 변경할 수 있습니다.";
     Text[ turkish ] = "Burada, se�ili s�tundaki verilerin - yandaki d��me ile de�i�tirebilece�iniz - y�r�rl�kteki ayarlar ile nas�l formatlanaca��n� g�rebilirsiniz.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Aqu� podeu veure com es visualitzarien les dades en el format actual (utilitzeu el bot� de la dreta per modificar el format).";
@@ -1508,13 +1508,13 @@ String STR_HELP_FORMAT_BUTTON
     Text[ portuguese_brazilian ] = "Hiermit k?nen Sie festlegen, wie die Daten der Tabelle bei der Ausgabe formatiert werden sollen.";
     Text[ portuguese ] = "Permite-lhe definir o formato para a impress�o dos dados da tabela.";
     Text[ danish ] = "P� denne m�de kan du definere, hvordan dataene i tabellen skal formateres ved udskrivningen.";
-    Text[ french ] = "Permet de d�finir le format de sortie des donn�es de la table.";
+    Text[ french ] = "D�finition du format de sortie des donn�es de la table.";
     Text[ swedish ] = "H�r kan du best�mma hur tabellernas data skall formateras vid utmatning.";
     Text[ dutch ] = "Hiermee kunt u instellen hoe u de gegevens in de tabel wilt opmaken.";
     Text[ spanish ] = "Aqu� puede determinar el tipo de formateado para la salida de los datos de la tabla.";
     Text[ english_us ] = "This is where you determine the output format of the data.";
     Text[ chinese_simplified ] = "您能够在这里设定表格的打印格式。";
-    Text[ russian ] = "����� ����� ���������� ������ ������ ������ �������.";
+    Text[ russian ] = "����� ����� ���������� ������ ������ ������.";
     Text[ polish ] = "Tutaj mo�na ustawi� wyj�ciowy format tabeli.";
     Text[ japanese ] = "ここで、テーブルのデータを出力するときの書式を指定できます。";
     Text[ chinese_traditional ] = "您能夠在這�設定表格數據的列印格式。";
@@ -1522,7 +1522,7 @@ String STR_HELP_FORMAT_BUTTON
     Text[ dutch ] = "Hiermee kunt u instellen hoe u de gegevens in de tabel wilt opmaken.";
     Text[ chinese_simplified ] = "您能够在这里设定表格的打印格式。";
     Text[ greek ] = "��� ����� �� ���������� �� ������� �� ����� ��� �� ���������� ��� �������� ��� ������ ���� ��� ������� ����.";
-    Text[ korean ] = "이와 같은 방식으로 시트 데이터의 서식 지정 방법을 설정할 수 있습니다.";
+    Text[ korean ] = "여기에서 출력하려는 데이터의 서식을 지정할 수 있습니다.";
     Text[ turkish ] = "Burada tablo verilerinin ��kt� format�n� belirleyebilirsiniz.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Aqu� podeu determinar el format de sortida de les dades.";
@@ -1542,7 +1542,7 @@ String STR_HELP_AUTOINCREMENT
     Text[ dutch ] = "U kunt dit veld een auto increment-waarde toewijzen.\n\nIn dat geval kunt u hierin geen gegevens typen, maar iedere nieuwe record krijgt automatisch een eigen waarde toegewezen die het resultaat is van het incrementeren van de vorige.";
     Text[ spanish ] = "Defina si este campo debe contener valores de incremento autom�tico.\n\nEn este caso no podr� introducir los datos directamente, sino que a cada nuevo registro de datos se le asignar� autom�ticamente un valor propio (que resulta del incremento proveniente del registro anterior).";
     Text[ chinese_simplified ] = "请选择这个字段是否应该含有自动递增的数值。\n\n您不能手动输入数据，因为每个新数据组会自动得到一个自己的数值(从它之前的数据组中通过递增方式得到)。";
-    Text[ russian ] = "�������� ��� ��������, ���� ���� ����� ��������� ���������������� ��������.\n\n����� �� �� ������� ��������������� ������� � ���� ������, ��������� ������ ����� ������ ����� ������������� ��������� ����������� �������� (������� ���������, ���������  ���������� �������� ���������� ������).";
+    Text[ russian ] = "�������� ��� ��������, ���� ���� ����� ��������� ���������������� ��������.\n\n� ���� ������, �� �� ������� ��������������� ������� � ���� ������, ��������� ��� ������ ����� ������ ����� ���� ����� ������������� ��������� ���������� �������� (������� ����������, ��������� ���������� �� ������� �������� �� ���������� ������).";
     Text[ polish ] = "Nale�y ustali�, czy pole to ma zawiera� warto�ci autoinkrementu.\n\nDo tego pola nie mo�na wprowadzi� danych bezpo�rednio. Ka�demu rekordowi zostanie przypisana automatycznie w�asna warto�� (kt�ra wyniknie z inkrementacji poprzedniego rekordu).";
     Text[ japanese ] = "このフィールドを自動増加入力値にするか、選択します。\n\n選択すると、そこへ直接にデータを入力できなくなり、自動的に新しいレコードには前のレコードの数値を基に増加算出された結果値が入力されます。";
     Text[ chinese_traditional ] = "請您選擇這個欄位是否應該含有自動遞增的數值。\n\n您不能直接輸入資料﹐因為每個新資料組會自動得到一個自己的數值(從它之前的資料組中通過遞增得出)。";
@@ -1550,7 +1550,7 @@ String STR_HELP_AUTOINCREMENT
     Text[ dutch ] = "U kunt dit veld een auto increment-waarde toewijzen.\n\nIn dat geval kunt u hierin geen gegevens typen, maar iedere nieuwe record krijgt automatisch een eigen waarde toegewezen die het resultaat is van het incrementeren van de vorige.";
     Text[ chinese_simplified ] = "请选择这个字段是否应该含有自动递增的数值。\n\n您不能手动输入数据，因为每个新数据组会自动得到一个自己的数值(从它之前的数据组中通过递增方式得到)。";
     Text[ greek ] = "��������� �� �� ����� �� �������� ����� ��������� �����������.\n\n��� ��������� ���� ��� �� ��������� �� �������� ��������� �������� �� ���� �� �����, ���� ���� ��� ������� �� ������� ��������� ������ ����� ��� ���� (� ����� �� ��������� ��� ��� ���������� ��� ������������ ��������).";
-    Text[ korean ] = "이 필드에 자동 증가값의 포함 여부를 선택하십시오.\n\n이러한 필드에는 데이터를 직접 입력할 수 없으며 새 레코드는 모두 자동으로 고유값(이전의 레코드를 증가시킴으로써 얻게됨)을 할당 받게 됩니다.";
+    Text[ korean ] = "이 필드에 자동 증분이 포함되어야 할지 선택하십시오.\n\n이 유형의 필드에는 데이터를 직접 입력할 수 없으며 새 레코드는 이전 레코드를 증분하여 얻게된 고유값을 자동으로 할당 받게 됩니다.";
     Text[ turkish ] = "Bu alana, otomatik art�� de�erleri konulup konulmayaca��n� se�iniz.\n\nBu alana art�k do�rudan veri giri�i yapamazs�n�z. Bunun yerine her yeni kay�t i�in otomatik olarak (bir �nceki kayd�n art���ndan olu�an) �zel bir de�er atan�r.";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Trieu si aquest camp ha de contenir valors d'increment autom�tic.\n\nNo podeu introduir dades en aquest tipus de camps. S'assignar� un valor intr�nsec a cada registre nou de manera autom�tica (que provindr� de l'increment del registre anterior).";
@@ -1600,7 +1600,7 @@ String STR_TABLEDESIGN_DUPLICATE_NAME
     Text[ polish ] = "Tabeli nie mo�na zapisa�, poniew� nazwa kolumny \"$column$\" zosta�a ju� raz nadana.";
     Text[ portuguese_brazilian ] = "The table can't be saved as the column name \"$column$\" is used twice.";
     Text[ japanese ] = "\"$column$\" の列名が重複していて、テーブルの保存ができません。";
-    Text[ korean ] = "열 이름\"$column$\"이 중복으로 할당되어 있어 시트를 저장할 수 없습니다.";
+    Text[ korean ] = "열 이름 \"$column$\"이(가) 중복 지정되어 있어 테이블을 저장할 수 없습니다.";
     Text[ chinese_simplified ] = "因为重复使用列名称\"$column$\"，所以无法存盘这个表格。";
     Text[ chinese_traditional ] = "無法儲存這個表格，因為欄位名稱<$column$>已經存在。";
     Text[ arabic ] = "�� ���� ��� ������ ���� �������� ��� ������ \"$column$\" �����.";
@@ -1618,14 +1618,14 @@ String STR_TBL_COLUMN_IS_KEYCOLUMN
     Text[ greek ] = "�� ������� \"$column$\" ������� ��� �������� ������. ���� ��������� ��� ���������� �����, �� ��������� ��� �� �������� ������. ������ �� ��������� ";
     Text[ dutch ] = "De kolom \"$column$\" behoort tot de primaire sleutel. Wist u deze kolom, dan wordt ook de primaire sleutel gewist. Wilt u de kolom werkelijk wissen?";
     Text[ french ] = "La colonne \"$column$\" appartient � la cl� primaire. Sa suppression entra�nera �galement la suppression de la cl� primaire. Continuer ?";
-    Text[ spanish ] = "La columna \"$column$\" pertenece a la llave primaria. En caso de eliminarla, eliminar� tambi�n la llave primaria. �Desea continuar?";
+    Text[ spanish ] = "La columna \"$column$\" pertenece a la clave primaria. En caso de borrarla, borrar� tambi�n la clave primaria. �Desea continuar?";
     Text[ italian ] = "La colonna \"$column$\" appartiene alla chiave primaria. Se la colonna viene eliminata, si canceller� anche la chiave primaria. Volete proseguire comunque?";
     Text[ danish ] = "Kolonnerne \"$column$\" h�rer til prim�rn�glen. Hvis denne kolonne slettes, slettes ogs� prim�rn�glen.Vil du forts�tte?";
     Text[ swedish ] = "Kolumnen \"$column$\" h�r till prim�rnyckeln. Om kolumnen raderas kommer �ven prim�rnyckeln att raderas. Vill du forts�tta?";
     Text[ polish ] = "Kolumna \"$column$\" nale�y do klucza g��wnego. Je�li zostanie usuni�ta, razem z ni� usuni�ty zostanie r�wnie� klucz g��wny. Czy na pewno j� usun��?";
     Text[ portuguese_brazilian ] = "The column \"$column$\" belongs to the primary key. If the column will be deleted the primary key will be deleted as well. Do you really want to delete the column?";
     Text[ japanese ] = "列 \"$column$\" はプライマリキーに属します。これを削除すると、プライマリキーも削除されてしまいます。削除してもかまいませんか。";
-    Text[ korean ] = "열 \"$column$\"은(는) 기본 키에 속합니다. 이 열이 삭제되면 기본 키도 삭제됩니다. 그래도 계속하겠습니까?";
+    Text[ korean ] = "열 \"$column$\"은(는) 기본 키에 속합니다. 이 열이 삭제되면 기본 키도 삭제됩니다. 그래도 계속하시겠습니까?";
     Text[ chinese_simplified ] = "这个字段 \"$column$\" 属于主关键字。如果您删除这个字段，也就会一起删除主关键字。要删除这个字段？";
     Text[ chinese_traditional ] = "這個欄<$column$>屬於主關鍵字。如果刪除這個欄位，也就會一起刪除主關鍵字。要刪除這個欄位？";
     Text[ turkish ] = "The column \"$column$\" belongs to the primary key. If the column will be deleted the primary key will be deleted as well. Do you really want to delete the column?";
@@ -1650,7 +1650,7 @@ String STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE
     Text[ polish ] = "Dotyczy klucza g��wnego";
     Text[ portuguese_brazilian ] = "primary key related";
     Text[ japanese ] = "プライマリキーに関連";
-    Text[ korean ] = "기본 키 해당";
+    Text[ korean ] = "기본 키 관련";
     Text[ chinese_simplified ] = "和主关键字关联";
     Text[ chinese_traditional ] = "和主關鍵字關聯";
     Text[ turkish ] = "primary key related";
@@ -1707,7 +1707,7 @@ String STR_QRY_CONTINUE
     Text[ dutch ] = "Wilt u toch doorgaan?";
     Text[ chinese_simplified ] = "您还是要继续？";
     Text[ greek ] = "������ �� ����������;";
-    Text[ korean ] = "계속하겠습니까?";
+    Text[ korean ] = "계속하시겠습니까?";
     Text[ turkish ] = "Yine de devam etmek istiyor musunuz?";
     Text[ catalan ] = "Voleu continuar igualment?";
     Text[ finnish ] = "Jatketaanko kuitenkin?";
@@ -1735,7 +1735,7 @@ String STR_STAT_WARNING
     Text[ dutch ] = "Waarschuwing!";
     Text[ chinese_simplified ] = "警告！";
     Text[ greek ] = "�������������!";
-    Text[ korean ] = "경고!";
+    Text[ korean ] = "경고";
     Text[ turkish ] = "Uyar�!";
     Text[ catalan ] = "Av�s!";
     Text[ finnish ] = "Varoitus";
@@ -1760,7 +1760,7 @@ QueryBox TABLE_DESIGN_SAVEMODIFIED
     Message[ polish ] = "Tabela zosta�a zmieniona.\nZapisa� zmiany?";
     Message[ portuguese_brazilian ] = "The table has been changed.\nDo you want to save the changes?";
     Message[ japanese ] = "テーブルは変更されています。\n変更を保存しますか。";
-    Message[ korean ] = "시트가 변경되었습니다.\n변경 사항을 저장하겠습니까?";
+    Message[ korean ] = "테이블이 변경되었습니다.\n변경 내용을 저장하시겠습니까?";
     Message[ chinese_simplified ] = "表格已经更改。\n要存盘更改的内容？";
     Message[ chinese_traditional ] = "這個表格已經變更。\n您要儲存這個變更內容？";
     Message[ turkish ] = "The table has been changed.\nDo you want to save the changes?";
@@ -1776,7 +1776,7 @@ QueryBox TABLE_QUERY_CONNECTION_LOST
     Message [ English ] = "The connection to the database was lost! The tabledesign can only be used with limited functionality without a connection.\nReconnect?" ;
     Message [ english_us ] = "The connection to the database was lost! The table design can only be used with limited functionality without a connection.\nReconnect?" ;
     Message[ portuguese ] = "A liga��o � base de dados foi cancelada! Sem esta, o esbo�o da tabela pode ser utilizado apenas de forma limitada.\nRetomar a liga��o?";
-    Message[ russian ] = "����� � ����� ������ ��������! ������������� ������� ������� ����������.\n������������ �����?";
+    Message[ russian ] = "����� � ����� ������ ��������! �������������� ������� �������� � ������������� �� �����������.\n������������ �����?";
     Message[ greek ] = "� ������� �� ��� ���� ��������� ������! ����� ��� ������� � ���������� ������� ��� ������ �� �������������� ������.\n�� ����� � �����������? ";
     Message[ dutch ] = "De verbinding met de database is verwijderd! Zonder deze verbinding kan de ontwerptabel slechts beperkt worden gebruikt.\nWilt u de verbinding met de database weer tot stand brengen?";
     Message[ french ] = "La connexion � la base de donn�es a �t� interrompue ! Ceci entra�ne une perte de fonctionnalit� dans l'utilisation de l'�bauche de table.\nReconnecter ?";
@@ -1787,7 +1787,7 @@ QueryBox TABLE_QUERY_CONNECTION_LOST
     Message[ polish ] = "Przerwano po��czenie z baz� danych! Bez po��czenia z baz� danych mo�liwo�� korzystania z projektu tabeli b�dzie ograniczona.\nPo��czy� ponownie z baz� danych?";
     Message[ portuguese_brazilian ] = "The connection to the database was lost! The tabledesign can only be used with limited functionality without a connection.\nReconnect?";
     Message[ japanese ] = "データベースへの接続が削除されました。この接続がなければ、テーブルのデザインは制限された使用しかできません。\n接続しなおしますか。";
-    Message[ korean ] = "데이터베이스와의 연결이 끊어졌습니다! 연결이 끊어진 상태에서는 시트 디자인을 제한적으로만 이용할 수 있습니다.\n데이터베이스에 다시 연결하겠습니까?";
+    Message[ korean ] = "데이터베이스와의 연결이 끊어졌습니다. 연결이 끊긴 상태에서는 테이블 디자인을 제한적으로만 사용할 수 있습니다.\n데이터베이스로 다시 연결하시겠습니까?";
     Message[ chinese_simplified ] = "和数据库的连接已经关闭！您只能有限地使用表格设计的功能。\n要和数据库重建连接？";
     Message[ chinese_traditional ] = "和資料庫的連結已經被刪除！您只能有限地使用表格設計的功能。\n要和資料庫重建連結？";
     Message[ turkish ] = "The connection to the database was lost! The tabledesign can only be used with limited functionality without a connection.\nReconnect?";
@@ -1813,7 +1813,7 @@ String STR_TABLEDESIGN_CONNECTION_MISSING
     Text[ polish ] = "Zapisanie tabeli nie by�o mo�liwe z powodu braku po��czenia z baz� danych.";
     Text[ portuguese_brazilian ] = "The table couldn't be saved due to connection problems.";
     Text[ japanese ] = "データベースへ接続できなかったため、テーブルを保存できませんでした。";
-    Text[ korean ] = "데이터베이스와의 연결이 설정되지 않아 시트를 저장하지 못했습니다.";
+    Text[ korean ] = "데이터베이스와 연결 하지 못해 테이블을 저장하지 못했습니다.";
     Text[ chinese_simplified ] = "未能够和数据库建立连接，因此无法存盘表格。";
     Text[ chinese_traditional ] = "未能夠和資料庫建立連結，因此無法儲存表格。";
     Text[ turkish ] = "The table couldn't be saved due to connection problems.";
@@ -1828,11 +1828,11 @@ String STR_TABLEDESIGN_DATASOURCE_DELETED
     Text [ english_us ] = "The table filter could not be adjusted because the data source has been deleted.";
     Text [ english ] = "The table filter could not be saved because the datasource was deleted before.";
     Text[ portuguese ] = "Foi imposs�vel ajustar o filtro da tabela porque a fonte de dados foi eliminada.";
-    Text[ russian ] = "���������� ������������ ������ �������, ��� ��� �������� ������ ������.";
+    Text[ russian ] = "���������� ��������� ������, ��� ��� �������� ������ ������.";
     Text[ greek ] = "The table filter could not be saved because the datasource was deleted before.";
     Text[ dutch ] = "De tabellenfilter kan niet worden aangepast omdat de gegevensbron is gewist.";
     Text[ french ] = "Impossible d'adapter le filtre de table : la source de donn�es a �t� supprim�e.";
-    Text[ spanish ] = "No se pudo ajustar el filtro de tablas porque se elimin� la fuente de datos.";
+    Text[ spanish ] = "No se pudo ajustar el filtro de tablas porque la fuente de datos se ha borrado.";
     Text[ finnish ] = "Taulun suodatusta ei voitu s��t��, koska tietol�hde on poistettu.";
     Text[ italian ] = "Impossibile salvare il filtro della tabella poich� la sorgente dati � stata eliminata.";
     Text[ danish ] = "Tabelfiltret kunne ikke tilpasses, da datakilden blev slettet.";
@@ -1840,7 +1840,7 @@ String STR_TABLEDESIGN_DATASOURCE_DELETED
     Text[ polish ] = "Dopasowanie filtra tabeli nie jest mo�liwe, poniewa� usuni�to �r�d�o danych.";
     Text[ portuguese_brazilian ] = "The table filter could not be saved because the datasource was deleted before.";
     Text[ japanese ] = "データソースが削除されてしまっているために、テーブルフィルタを適合できませんでした。";
-    Text[ korean ] = "이미 데이터 소스가 삭제되었으므로 시트 필터를 적용하지 못했습니다.";
+    Text[ korean ] = "데이터 원본이 삭제된 이유로 테이블 필터를 조정하지 못했습니다.";
     Text[ chinese_simplified ] = "无法调整表格筛选，因为数据源已经被删除。";
     Text[ chinese_traditional ] = "無法調整表格篩選，因爲資料源已經被刪除。";
     Text[ turkish ] = "The table filter could not be saved because the datasource was deleted before.";
@@ -1868,7 +1868,7 @@ FixedText FIXED_NO_CONNECTION
     Text[ polish ] = "Brak po��czenia";
     Text[ portuguese_brazilian ] = "no connection";
     Text[ japanese ] = "接続なし";
-    Text[ korean ] = "연결되지 않음";
+    Text[ korean ] = "연결 없음";
     Text[ chinese_simplified ] = "无法连接";
     Text[ chinese_traditional ] = "沒有連線";
     Text[ turkish ] = "no connection";
@@ -1898,7 +1898,7 @@ QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES
     Message[ polish ] = "Przed zmodyfikowaniem indeks�w tabeli nale�y tabel� zapisa�.\nZapisa� teraz zmiany dokonane na strukturze tabeli?";
     Message[ portuguese_brazilian ] = "Before you can edit the indexes of a table, it must be saved.\nDo you want to save your changes now?";
     Message[ japanese ] = "テーブルのインデックスを編集するには、その前にまずこれを保存しておく必要があります。\nテーブル構成の変更をいますぐ保存しますか。";
-    Message[ korean ] = "시트의 색인을 수정하기 전에 반드시 저장해야 합니다.\n시트 구조의 변경 사항을 저장하겠습니까?";
+    Message[ korean ] = "테이블의 색인을 수정하기 전에 반드시 저장해야 합니다.\n테이블 구조의 변경 내용을 저장하시겠습니까?";
     Message[ chinese_simplified ] = "在修改一个表格的索引之前必须先存盘表格。\n要存盘表格结构的更改内容？";
     Message[ chinese_traditional ] = "在變更一個表格的索引之前必須先儲存表格。\n要儲存表格結构的變更內容？";
     Message[ turkish ] = "Before you can edit the indexes of a table, it must be saved.\nDo you want to save your changes now?";
@@ -1957,7 +1957,7 @@ String STR_TABLEDESIGN_NO_PRIM_KEY
     Text[ dutch ] = "In deze database is een index of een primaire sleutel vereist ter identificatie van records.\nU kunt alleen gegevens invoeren in de tabel als u voldoet aan een van deze beide criteria.\nWilt u nu een primaire sleutel defini�ren?";
     Text[ chinese_simplified ] = "识别数据库中的数据条目要求使用明确的索引或主关键字，\n在设定只会才能在表格中输入数据。\n\n现在要生成一个主关键字？";
     Text[ greek ] = "��� ��� ���������� ��� �������� �� ���� �� ���� ��������� ���������� ��� �������� ��������� � ��� �������� ������.\n�������� �� �������� �� �������� ���� ������ ����� ������ ���������� ��� ��� ��� ��� ����� �������� �����.\n\n������ �� ������������ ���� ��� �������� ������;";
-    Text[ korean ] = "이 데이터베이스에서 데이터 레코드를 식별하려면 단일 색인이나 기본 키가 있어야 합니다.\n이 두 가지 구조 조건 중에서 하나가 충족되어야만 데이터를 시트에 입력할 수 있습니다.\n\n지금 기본 키를 생성하겠습니까?";
+    Text[ korean ] = "이 데이터베이스에서 데이터 레코드를 식별하려면 고유 색인이나 기본 키가 필요합니다.\n이 두 가지 구조 조건 중에서 하나가 충족되어야만 데이터를 테이블에 입력할 수 있습니다.\n\n지금 기본 키를 만드시겠습니까?";
     Text[ turkish ] = "Bu veritaban�nda, kay�t tan�mlama i�in benzersiz bir dizin ya da birinci anahtar� gerekiyor.\nBu tabloya veri giri�i yapabilmek i�in bu yap�sal ko�ullardan en az biri yerine getirilmelidir.\n\n�imdi bir birinci anahtar olu�turulsun mu?";
     Text[ catalan ] = "�s necess�ria una clau prim�ria o b� un �ndex �nic per a poder accedir en aquesta base de dades.\nNom�s podeu entrar dades en aquesta taula si una d'aquestes dues condicions es compleix.\n\nVoleu crear ara una clau prim�ria?";
     Text[ finnish ] = "T�ss� tietokannassa on oltava yksil�llinen indeksi tai perusavain tietueiden tunnistamista varten.\nT�h�n tauluun voi sy�tt�� tietoja vain, jos jompikumpi n�ist� on m��ritetty.\n\nHaluatko luoda perusavaimen nyt?";
@@ -1965,24 +1965,24 @@ String STR_TABLEDESIGN_NO_PRIM_KEY
 };
 String STR_TABLEDESIGN_TITLE
 {
-    Text = "Tabellen Entwurf";
-    Text [ ENGLISH ] = "table design";
-    Text[ english_us ] = "Table Design";
+    Text = "Tabellenentwurf:";
+    Text [ ENGLISH ] = "table design:";
+    Text[ english_us ] = "Table Design:";
     Text[ portuguese ] = "Esbo�ar tabela";
-    Text[ russian ] = "������ �������";
+    Text[ russian ] = "�������������� �������";
     Text[ greek ] = "���������� ������";
     Text[ dutch ] = "Tabelontwerp";
     Text[ french ] = "�bauche de table";
     Text[ spanish ] = "Dise�o de tabla";
-    Text[ italian ] = "Struttura tabella";
+    Text[ italian ] = "Struttura tabella:";
     Text[ danish ] = "Tabeludkast";
-    Text[ swedish ] = "Tabellutkast";
+    Text[ swedish ] = "Tabellutkast:";
     Text[ polish ] = "Projekt tabeli";
     Text[ portuguese_brazilian ] = "table design";
     Text[ japanese ] = "テーブルデザイン";
-    Text[ korean ] = "시트 디자인";
-    Text[ chinese_simplified ] = "表格设计";
-    Text[ chinese_traditional ] = "表格設計";
+    Text[ korean ] = "테이블 디자인:";
+    Text[ chinese_simplified ] = "表格设计：";
+    Text[ chinese_traditional ] = "表格設計：";
     Text[ turkish ] = "table design";
     Text[ arabic ] = "table design";
     Text[ catalan ] = "Disseny de la taula";
@@ -2110,7 +2110,7 @@ Menu RID_TABLE_DESIGN_MAIN_MENU
                     Text[ polish ] = "Przywr��";
                     Text[ portuguese_brazilian ] = "Redo";
                     Text[ japanese ] = "やり直し";
-                    Text[ korean ] = "삭제 취소";
+                    Text[ korean ] = "다시 실행";
                     Text[ chinese_simplified ] = "恢复撤消命令";
                     Text[ chinese_traditional ] = "恢復撤消指令";
                     Text[ turkish ] = "Redo";
@@ -2224,7 +2224,7 @@ String STR_TABLEDESIGN_ALTER_ERROR
     Text[ greek ] = "The column \"\\$column\\$\" could not be changed. Should instead the column definition be appended?";
     Text[ dutch ] = "De kolom '$column$' kan niet worden gewijzigd. Wilt u de kolom in plaats daarvan wissen en van de nieuwe opmaak voorzien?";
     Text[ french ] = "Impossible de modifier la colonne \"\\$column\\$\". Alternative : suppression de la colonne et application du nouveau format. Continuer ?";
-    Text[ spanish ] = "No se pudo modificar la columna \"$column$\". �Prefiere eliminarla y aplicar el nuevo formato?";
+    Text[ spanish ] = "No se pudo modificar la columna \"$column$\". �Prefiere borrarla y aplicar el nuevo formato?";
     Text[ finnish ] = "Saraketta \"$column$\" ei voitu muuttaa. Poistetaanko sarake ja k�ytet��n uutta muotoa?";
     Text[ italian ] = "Impossibile cambiare la colonna \"\\$column\\$\". Preferite eliminare la colonna e applicare un nuovo formato?";
     Text[ danish ] = "Kolonnen \"\\$column\\$\" kunne ikke �ndres. Skal den i stedet slettes og det nye format vedh�ftes?";
@@ -2232,7 +2232,7 @@ String STR_TABLEDESIGN_ALTER_ERROR
     Text[ polish ] = "Modyfikacja kolumny \"\\$column\\$\" nie powiod�a si�. Usun�� j� i za��czy� nowy format?";
     Text[ portuguese_brazilian ] = "The column \"\\$column\\$\" could not be changed. Should instead the column definition be appended?";
     Text[ japanese ] = "列 \"\\$column\\$\" は変更できませんでした。そのかわりに、削除して新しい書式を添付しますか。";
-    Text[ korean ] = "\"\\$column\\$\" 열을(를) 변경하지 못했습니다. 대신에 이 열을 삭제하고 새로운 형식을 추가하겠습니까?";
+    Text[ korean ] = "\"\\$column\\$\" 열을(를) 변경하지 못했습니다. 대신에 이 열을 삭제하고 새 서식을 추가하시겠습니까?";
     Text[ chinese_simplified ] = "无法更改列 \"\\$column\\$\" 。要重新设定这个列的格式?";
     Text[ chinese_traditional ] = "無法變更欄 \\$column\\$。要刪除它再重新設定格式？";
     Text[ turkish ] = "The column \"\\$column\\$\" could not be changed. Should instead the column definition be appended?";
@@ -2253,7 +2253,7 @@ QueryBox TABLE_DESIGN_ALL_ROWS_DELETED
     Message[ greek ] = "You are trying to delete all columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged.";
     Message[ dutch ] = "You are trying to delete all columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged.";
     Message[ french ] = "Vous �tes en train d'essayer de supprimer toutes les colonnes de la table. Or, une table ne peut exister sans colonne. Voulez-vous supprimer la table de la base de donn�es ? Si tel n'est pas le cas, la table restera inchang�e.";
-    Message[ spanish ] = "Intenta eliminar todas las columnas de la tabla. Una tabla no puede existir sin columnas. �Desea eliminar la tabla de la base de datos? Si ese no es el caso, la tabla permanecer� inalterada. ";
+    Message[ spanish ] = "Intenta borrar todas las columnas de la tabla. Una tabla no puede existir sin columnas. �Desea borrar la tabla de la base de datos? Si ese no es el caso, la tabla permanecer� inalterada. ";
     Message[ finnish ] = "You are trying to delete all columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged.";
     Message[ italian ] = "Volete eliminare tutte le colonne della tabella. Una tabella, per essere tale, dev'essere composta anche da colonne. Volete eliminare l'intera tabella dal database? In caso contrario la tabella non subir� cambiamenti.";
     Message[ danish ] = "You are trying to delete all columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged.";
@@ -2285,7 +2285,7 @@ String STR_AUTOINCREMENT_VALUE
     Text[ polish ] = "A~uto-increment statement";
     Text[ portuguese_brazilian ] = "A~uto-increment statement";
     Text[ japanese ] = "オートインクリメント命令文";
-    Text[ korean ] = "자동 증가량 명령문";
+    Text[ korean ] = "자동 증분 명령문";
     Text[ chinese_simplified ] = "自动递增陈述";
     Text[ chinese_traditional ] = "自動遞增陳述";
     Text[ turkish ] = "A~uto-increment statement";
@@ -2311,7 +2311,7 @@ String STR_HELP_AUTOINCREMENT_VALUE
     Text[ polish ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.";
     Text[ portuguese_brazilian ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.";
     Text[ japanese ] = "オートインクリメントのフィールドに使う SQL ステートメントをここに入力します。\n\nこのステートメントは、テーブルを作成するときに直接データベースに転送されます。";
-    Text[ korean ] = "자동 증가량 필드를 위한 SOL 명령문을 여기에 입력해주십시오.\n\n 이 문장은 테이블이 만들어지면 데이터베이스로 곧 전송될 것입니다.";
+    Text[ korean ] = "자동 증분 필드를 위한 SOL 명령문을 여기에 입력해주십시오.\n\n 이 문장은 테이블이 만들어지면 데이터베이스로 곧 전송될 것입니다.";
     Text[ chinese_simplified ] = "在此输入一个用于自动递增字段的 SQL 陈述。\n\n在生成表格的同时，这个陈述就会被直接传给数据库。";
     Text[ chinese_traditional ] = "在此輸入一個用於自動遞增欄位的 SQL 陳述。\n\n在產生表格的同時，這個陳述就會被直接傳給資料庫。";
     Text[ turkish ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.";
@@ -2326,25 +2326,31 @@ String STR_NO_TYPE_INFO_AVAILABLE
     Text[ english ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ portuguese ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ russian ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ spanish ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ italian ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ swedish ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
+    Text[ spanish ] = "No se ha podido extraer informaci�n, relativa al tipo, de la base de datos.\nEl modo dise�o de tabla no est� disponible para esta fuente de datos. ";
+    Text[ italian ] = "Impossibile reperire i tipi di informazione dal database.\\Il modo struttura della tabella non � disponibile per questa sorgente dati.";
+    Text[ swedish ] = "Det gick inte att f� fram typinformation fr�n databasen.\nTabellutkastl�get �r inte tillg�ngligt f�r den h�r datak�llan.";
     Text[ polish ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ portuguese_brazilian ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ japanese ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ korean ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
+    Text[ japanese ] = "データベースからはタイプ情報は検索できませんでした。\nこのデータソースにはテーブルデザインモードは使用できません。";
+    Text[ korean ] = "데이터베이스에서 유형 정보를 찾을 수 없습니다.\\테이블 디자인 모드는 이 데이터 원본용으로 사용할 수 없습니다.";
     Text[ turkish ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ thai ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ english_us ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ greek ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ dutch ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ french ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
+    Text[ french ] = "Impossible de r�cup�rer des informations concernant le type dans la base de donn�es !\nLe mode �bauche de table n'est pas disponible pour cette source de donn�es.";
     Text[ finnish ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ danish ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ chinese_simplified ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-    Text[ chinese_traditional ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
+    Text[ chinese_simplified ] = "无法从数据库获得类型信息。\n不提供此数据源的表格设计模式。";
+    Text[ chinese_traditional ] = "無法從資料庫檢索類別資訊。\n這個資料源沒有表格設計模式。";
     Text[ arabic ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
     Text[ catalan ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
 };
 
 
+
+
+
+
+
+
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 9bfd07870457..5472b4a8bcb3 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinteraction.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:54:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -437,31 +437,3 @@ namespace dbaui
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.7  2001/05/17 09:09:44  fs
- *  #86509# acquire the solar mutex in all implHandle methods (needed for opening the dialogs)
- *
- *  Revision 1.6  2001/01/05 12:16:07  fs
- *  adjusted the implementation name
- *
- *  Revision 1.5  2000/12/15 15:48:13  fs
- *  #82151# two instances of the registration helper module - one for every library in this project
- *
- *  Revision 1.4  2000/11/08 11:01:05  fs
- *  set the account only the the requests states that there is an account ...
- *
- *  Revision 1.3  2000/10/26 18:08:16  fs
- *  handling of parameter requests
- *
- *  Revision 1.2  2000/10/26 07:32:32  fs
- *  special login request text, with interpreting the ServerName as data source name
- *
- *  Revision 1.1  2000/10/25 12:59:42  fs
- *  initial checkin - InteractionHandler for common database related interaction requests
- *
- *
- *  Revision 1.0 25.10.00 10:18:21  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 4a5e344ebf4f..29f3e91584af 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinteraction.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-26 18:08:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -173,13 +173,3 @@ namespace dbaui
 
 #endif // _DBAUI_INTERACTION_HXX_
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2000/10/25 12:59:51  fs
- *  initial checkin - InteractionHandler for common database related interaction requests
- *
- *
- *  Revision 1.0 25.10.00 10:18:27  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/uno/dbinteraction.src b/dbaccess/source/ui/uno/dbinteraction.src
index f2426fa56377..23157f63e292 100644
--- a/dbaccess/source/ui/uno/dbinteraction.src
+++ b/dbaccess/source/ui/uno/dbinteraction.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinteraction.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: rt $ $Date: 2002-09-05 10:52:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,20 +72,20 @@ String STR_REMEMBERPASSWORD_SESSION
     Text[ chinese_simplified ] = "结束程序之前一直记住密码(~R)";
     Text[ chinese_traditional ] = "結束程式之前一直記住密碼(~R)";
     Text[ danish ] = "~Husk adgangskode til lukning af programmet";
-    Text[ dutch ] = "Wachtwoord o~nthouden tot aan be�indigen van het programma";
-    Text[ dutch ] = "Wachtwoord o~nthouden tot aan be�indigen van het programma";
+    Text[ dutch ] = "Wachtwoord o~nthouden tot aan be�indigen van programma";
+    Text[ dutch ] = "Wachtwoord o~nthouden tot aan be�indigen van programma";
     Text[ english_us ] = "~Remember password till end of session";
-    Text[ french ] = "Se rappeler du ~mot de passe jusqu'� la fin de la session";
+    Text[ french ] = "M�moriser le ~mot de passe jusqu'� la fin de la session";
     Text[ greek ] = "���~���������� ������� ��� �� ����� ��� ���������";
-    Text[ italian ] = "An~nota password fino alla fine dell'applicazione";
-    Text[ japanese ] = "パスワードはアプリケーション終了まで記憶しておく(~R)";
-    Text[ korean ] = "응용 프로그램을 종료할 때까지 패스워드 기억(~R)";
+    Text[ italian ] = "Memorizza password fino alla fine dell'applicazione";
+    Text[ japanese ] = "パスワードをアプリケーション終了まで保存しておく(~R)";
+    Text[ korean ] = "응용 프로그램 종료까지 암호 보존(~R)";
     Text[ polish ] = "Zapami�taj has�o do ko�ca aplikacji";
     Text[ portuguese ] = "~Lembrar senha at� terminar a aplica��o";
     Text[ portuguese_brazilian ] = "Passwort ~merken";
-    Text[ russian ] = "��������� ������ �� ����� ����������";
-    Text[ spanish ] = "~Recordar contrase�a hasta finalizar la aplicaci�n";
-    Text[ swedish ] = "Ko~m ih�g l�senordet tills till�mpningen avslutas";
+    Text[ russian ] = "��������� ������ �� ����� ������";
+    Text[ spanish ] = "~Recordar la contrase�a hasta el fin de la aplicaci�n";
+    Text[ swedish ] = "Ko~m ih�g l�senordet tills programmet avslutas";
     Text[ turkish ] = "~Remember password till end of session";
     Text[ catalan ] = "~Recorda la contrasenya fins a la fi de la sessi�";
     Text[ finnish ] = "~Muista salasana istunnon loppuun asti";
@@ -106,9 +106,9 @@ String STR_REMEMBERPASSWORD_PERSISTENT
     Text[ english_us ] = "~Remember password";
     Text[ french ] = "~Enregistrer le mot de passe";
     Text[ greek ] = "������ ��������~�� ������� ���������";
-    Text[ italian ] = "Salva pa~ssword ";
-    Text[ japanese ] = "パスワードをずっと保存(~R)";
-    Text[ korean ] = "패스워드 영구 저장(~R)";
+    Text[ italian ] = "Memorizza pa~ssword";
+    Text[ japanese ] = "パスワードを保存しておく(~R)";
+    Text[ korean ] = "암호 보존(~R)";
     Text[ polish ] = "Zapisz has�o na sta�e";
     Text[ portuguese ] = "~Guardar senha";
     Text[ portuguese_brazilian ] = "Passwort ~speichern";
@@ -125,6 +125,26 @@ String STR_REMEMBERPASSWORD_PERSISTENT
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.17.4.3.2.1  2003/02/22 15:51:55  hr
+ *  INTEGRATION: CWS mergep (1.17.4.3.20); FILE MERGED
+ *  2003/02/22 10:44:41 nf 1.17.4.3.20.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 12:51:32 hjs 1.17.4.3.20.1: #107113# merge on SRX644p
+ *
+ *  Revision 1.17.4.3.20.2  2003/02/22 10:44:41  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.17.4.3.20.1  2003/01/31 12:51:32  hjs
+ *  #107113# merge on SRX644p
+ *
+ *  Revision 1.17.4.3  2002/11/27 16:56:38  kz
+ *  Merge SRX644: 27.11.02 - 17:53:26
+ *
+ *  Revision 1.17.4.2  2002/09/13 14:36:44  kz
+ *  Merge SRX643: 13.09.02 - 16:33:06
+ *
+ *  Revision 1.17.4.1  2002/09/05 13:43:54  kz
+ *  Merge SRX643: 05.09.02 - 15:40:32
+ *
  *  Revision 1.17  2002/08/19 07:54:08  oj
  *  #99473# change string resource files
  *
@@ -188,3 +208,5 @@ String STR_REMEMBERPASSWORD_PERSISTENT
 
 
 
+
+
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index fc793aac4ada..9b568908c110 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoadmin.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: fs $ $Date: 2001-07-31 16:02:21 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -215,7 +215,10 @@ void ODatabaseAdministrationDialog::destroyDialog()
 Dialog* ODatabaseAdministrationDialog::createDialog(Window* _pParent)
 {
     if (!m_pCollection)
-        m_pCollection = new ODsnTypeCollection;
+    {
+        m_pCollection = new ODsnTypeCollection();
+        m_pCollection->initUserDriverTypes(m_xORB);
+    }
 
     ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection);
     ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_xORB);
@@ -293,49 +296,3 @@ void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue)
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.10  2001/07/30 11:32:08  fs
- *  #88530# changes to allow operating the dialog in a 'edit one single data source only' mode
- *
- *  Revision 1.9  2001/06/18 12:35:37  fs
- *  #88389# OGenericUnoDialog moved to svtools
- *
- *  Revision 1.8  2001/05/17 09:16:26  fs
- *  #86511# hold the type collection as pointer, not as object - allows construction in createDialog, where it can be guarded by the solar mutex
- *
- *  Revision 1.7  2001/03/15 08:27:03  fs
- *  cppuhelper/extract -> comphelper/extract
- *
- *  Revision 1.6  2001/01/05 12:16:07  fs
- *  adjusted the implementation name
- *
- *  Revision 1.5  2000/12/15 15:48:13  fs
- *  #82151# two instances of the registration helper module - one for every library in this project
- *
- *  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:48  fs
- *  support an initial selection
- *
- *  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:26  fs
- *  moved herein from ..\dlg
- *
- *  Revision 1.3  2000/10/16 10:46:59  fs
- *  service name changed
- *
- *  Revision 1.2  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.1  2000/10/05 10:07:23  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 20.09.00 12:12:44  fs
- ************************************************************************/
-
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 84eb20948114..2a2bf5067820 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unosqlmessage.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-18 12:35:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:53:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -203,40 +203,3 @@ Dialog* OSQLMessageDialog::createDialog(Window* _pParent)
 }   // namespace dbaui
 //.........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.7  2001/03/23 13:33:59  jl
- *  replaced: OSL_ENSHURE->OSL_ENSURE
- *
- *  Revision 1.6  2001/01/05 12:16:07  fs
- *  adjusted the implementation name
- *
- *  Revision 1.5  2000/12/15 15:48:13  fs
- *  #82151# two instances of the registration helper module - one for every library in this project
- *
- *  Revision 1.4  2000/11/06 17:47:01  fs
- *  forgot a property attribute in ctor
- *
- *  Revision 1.3  2000/11/01 16:34:16  fs
- *  migrated from awt::XDialog to ui::XExecutableDialog / removed the star* namespace shortcuts
- *
- *  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:32  fs
- *  moved herein from ..\dlg
- *
- *  Revision 1.3  2000/10/16 10:46:59  fs
- *  service name changed
- *
- *  Revision 1.2  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.1  2000/10/05 10:07:40  fs
- *  initial checkin
- *
- *
- *  Revision 1.0 02.10.00 13:59:29  fs
- ************************************************************************/
-