MWS_SRX644: migrate branch mws_srx644 -> HEAD

42 files changed, 309 insertions, 612 deletions

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
- ************************************************************************/
-