User: kz Date: 2008-03-05 16:54:56+0000 Modified: dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
Log: 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: File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DBSetupConnectionPages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx?r1=1.6&r2=1.7 Delta lines: +12 -1 -------------------- --- DBSetupConnectionPages.hxx 2007-05-10 10:22:35+0000 1.6 +++ DBSetupConnectionPages.hxx 2008-03-05 16:54:53+0000 1.7 @@ -162,6 +162,7 @@ , 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 @@ String m_sDefaultJdbcDriverName; USHORT m_nPortId; + bool m_bUseClass; }; @@ -227,10 +229,17 @@ 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 @@ + protected: virtual BOOL FillItemSet(SfxItemSet& _rSet); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -248,6 +258,7 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
