INTEGRATION: CWS dba30a (1.6.134); FILE MERGED

2008/02/14 08:37:47 oj 1.6.134.1: #i86088# add url handling for sdbc:mysqlc:

1 files changed, 14 insertions, 3 deletions

diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index ef349a5751ce..3128b3fe9acf 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DBSetupConnectionPages.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2007-05-10 10:22:35 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 16:54:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -162,6 +162,7 @@ namespace dbaui
                                         , USHORT _nHeaderTextResId
                                         , USHORT _nDriverClassId );
     static  OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+    static  OGenericAdministrationPage* CreateMySQLNATIVETabPage( Window* pParent, const SfxItemSet& _rAttrSet );
     static  OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
     virtual Link getControlModifiedLink() { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
 
@@ -192,6 +193,7 @@ namespace dbaui
 
         String              m_sDefaultJdbcDriverName;
         USHORT              m_nPortId;
+        bool                m_bUseClass;
     };
 
 
@@ -227,10 +229,17 @@ namespace dbaui
     class OMySQLIntroPageSetup : public OGenericAdministrationPage
     {
     public:
+        enum ConnectionType
+        {
+            VIA_ODBC,
+            VIA_JDBC,
+            VIA_NATIVE
+        };
+
         OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs);
 
         static OMySQLIntroPageSetup*    CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet );
-        int getMySQLMode();
+        ConnectionType      getMySQLMode();
         Link                maClickHdl;
         void                SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
         const Link&         GetClickHdl() const { return maClickHdl; }
@@ -238,6 +247,7 @@ namespace dbaui
 
 
 
+
     protected:
         virtual BOOL FillItemSet(SfxItemSet& _rSet);
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
@@ -248,6 +258,7 @@ namespace dbaui
     private:
         RadioButton         m_aRB_ODBCDatabase;
         RadioButton         m_aRB_JDBCDatabase;
+        RadioButton         m_aRB_NATIVEDatabase;
         FixedText           m_aFT_ConnectionMode;
         FixedText           m_aFT_Helptext;
         FixedText           m_aFT_Headertext;