Tag: cws_src680_dba30a User: oj Date: 2008-02-14 08:37:51+0000 Modified: dba/dbaccess/source/ui/dlg/ConnectionPage.cxx dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx dba/dbaccess/source/ui/dlg/DriverSettings.cxx dba/dbaccess/source/ui/dlg/DriverSettings.hxx dba/dbaccess/source/ui/dlg/dbadmin.cxx dba/dbaccess/source/ui/dlg/dbadminsetup.hrc dba/dbaccess/source/ui/dlg/dbadminsetup.src dba/dbaccess/source/ui/dlg/dbwiz.cxx dba/dbaccess/source/ui/dlg/dbwizsetup.cxx dba/dbaccess/source/ui/dlg/detailpages.cxx dba/dbaccess/source/ui/dlg/detailpages.hxx dba/dbaccess/source/ui/dlg/generalpage.cxx dba/dbaccess/source/ui/inc/dbu_resource.hrc dba/dbaccess/source/ui/inc/dsntypes.hxx dba/dbaccess/source/ui/misc/dbumiscres.hrc dba/dbaccess/source/ui/misc/dbumiscres.src dba/dbaccess/source/ui/misc/dsmeta.cxx dba/dbaccess/source/ui/misc/dsntypes.cxx
Log: #i86088# add url handling for sdbc:mysqlc: File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.22&r2=1.22.36.1 Delta lines: +4 -3 ------------------- --- ConnectionPage.cxx 2007-11-21 15:53:00+0000 1.22 +++ ConnectionPage.cxx 2008-02-14 08:37:47+0000 1.22.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.36.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:53:00 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -274,6 +274,7 @@ m_aFT_Connection.SetText(String(ModuleRes(STR_MSACCESS_MDB_FILE))); m_aET_Connection.SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE); break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: m_aFT_Connection.SetText(String(ModuleRes(STR_MYSQL_DATABASE_NAME))); m_aET_Connection.SetHelpId(HID_DSADMIN_MYSQL_DATABASE); File [changed]: DBSetupConnectionPages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx?r1=1.15&r2=1.15.36.1 Delta lines: +60 -20 --------------------- --- DBSetupConnectionPages.cxx 2007-11-21 15:53:40+0000 1.15 +++ DBSetupConnectionPages.cxx 2008-02-14 08:37:47+0000 1.15.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: DBSetupConnectionPages.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.36.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:53:40 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -369,6 +369,7 @@ :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_MYSQL_INTRO), _rCoreAttrs) ,m_aRB_ODBCDatabase(this, ModuleRes(RB_CONNECTVIAODBC)) ,m_aRB_JDBCDatabase(this, ModuleRes(RB_CONNECTVIAJDBC)) + ,m_aRB_NATIVEDatabase(this, ModuleRes(RB_CONNECTVIANATIVE)) ,m_aFT_ConnectionMode(this, ModuleRes(FT_MYSQLCONNECTIONMODE)) ,m_aFT_Helptext(this, ModuleRes(FT_MYSQL_HELPTEXT)) ,m_aFT_Headertext(this, ModuleRes(FT_MYSQL_HEADERTEXT)) @@ -421,12 +422,14 @@ } - int OMySQLIntroPageSetup::getMySQLMode() + OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode() { if (m_aRB_JDBCDatabase.IsChecked()) - return 1; + return VIA_JDBC; + else if (m_aRB_NATIVEDatabase.IsChecked()) + return VIA_NATIVE; else - return 0; + return VIA_ODBC; } @@ -444,6 +447,20 @@ STR_MYSQL_DRIVERCLASSTEXT) ); } + // ----------------------------------------------------------------------- + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLNATIVETabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + { + return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, + PAGE_DBWIZARD_MYSQL_NATIVE, + _rAttrSet, + DSID_MYSQL_PORTNUMBER , + STR_MYSQL_DEFAULT, + NULL, + STR_MYSQLJDBC_HELPTEXT, + STR_MYSQLJDBC_HEADERTEXT, + 0) ); + } + // ----------------------------------------------------------------------- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) @@ -478,8 +495,17 @@ ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) ,m_nPortId(_nPortId) + ,m_bUseClass(true) { + if ( _nDriverClassId ) m_aFTDriverClass.SetText(String(ModuleRes(_nDriverClassId))); + else + { + m_bUseClass = false; + m_aFTDriverClass.Show(FALSE); + m_aPBTestJavaDriver.Show(FALSE); + m_aETDriverClass.Show(FALSE); + } m_aFTDefaultPortNumber.SetText(String(ModuleRes(_nDefaultPortResId))); String sHelpText = String(ModuleRes(_nHelpTextResId)); m_aFTHelpText.SetText(sHelpText); @@ -490,10 +516,14 @@ m_aETHostname.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); + if ( m_bUseClass ) + { m_aETDriverClass.SetModifyHdl(LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified)); m_aPBTestJavaDriver.SetClickHdl(LINK(this,OGeneralSpecialJDBCConnectionPageSetup,OnTestJavaClickHdl)); + } m_aNFPortNumber.SetUseThousandSep(sal_False); + if ( m_bUseClass ) m_sDefaultJdbcDriverName = String::CreateFromAscii(_pDriverName); SetRoadmapStateValue(sal_False); FreeResource(); @@ -516,6 +546,7 @@ _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTPortNumber)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDefaultPortNumber)); + if ( m_bUseClass ) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } @@ -523,6 +554,7 @@ sal_Bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; + if ( m_bUseClass ) fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); fillString(_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething); fillString(_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething); @@ -537,14 +569,20 @@ sal_Bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); - SFX_ITEMSET_GET(_rSet, pDrvItem, SfxStringItem, DSID_JDBCDRIVERCLASS, sal_True); + const SfxStringItem *pDrvItem = NULL; + if ( m_bUseClass ) + pDrvItem = (const SfxStringItem*) (_rSet).GetItem( DSID_JDBCDRIVERCLASS, sal_True, TYPE(SfxStringItem) ); + SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, m_nPortId, sal_True); if ( bValid ) { + if ( m_bUseClass ) + { m_aETDriverClass.SetText(pDrvItem->GetValue()); m_aETDriverClass.ClearModifyFlag(); + } m_aETHostname.SetText(pHostName->GetValue()); m_aETHostname.ClearModifyFlag(); @@ -554,15 +592,15 @@ } OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); - // to get the correcxt value when saveValue was called by base class - if ( !m_aETDriverClass.GetText().Len() ) + // to get the correct value when saveValue was called by base class + if ( m_bUseClass && !m_aETDriverClass.GetText().Len() ) { m_aETDriverClass.SetText(m_sDefaultJdbcDriverName); m_aETDriverClass.SetModifyFlag(); } callModifiedHdl(); - sal_Bool bRoadmapState = ((m_aETDatabasename.GetText().Len() != 0 ) && ( m_aETHostname.GetText().Len() != 0 ) && (m_aNFPortNumber.GetText().Len() != 0 ) && ( m_aETDriverClass.GetText().Len() != 0 )); + sal_Bool bRoadmapState = ((m_aETDatabasename.GetText().Len() != 0 ) && ( m_aETHostname.GetText().Len() != 0 ) && (m_aNFPortNumber.GetText().Len() != 0 ) && ( !m_bUseClass || m_aETDriverClass.GetText().Len() != 0 )); SetRoadmapStateValue(bRoadmapState); } @@ -570,6 +608,8 @@ IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); + OSL_ENSURE(m_bUseClass,"Who called this one?"); + sal_Bool bSuccess = sal_False; try { @@ -593,9 +633,9 @@ // ----------------------------------------------------------------------- IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit) { - if ( _pEdit == &m_aETDriverClass ) + if ( m_bUseClass && _pEdit == &m_aETDriverClass ) m_aPBTestJavaDriver.Enable( m_aETDriverClass.GetText().Len() != 0 ); - sal_Bool bRoadmapState = ((m_aETDatabasename.GetText().Len() != 0 ) && ( m_aETHostname.GetText().Len() != 0 ) && (m_aNFPortNumber.GetText().Len() != 0 ) && ( m_aETDriverClass.GetText().Len() != 0 )); + sal_Bool bRoadmapState = ((m_aETDatabasename.GetText().Len() != 0 ) && ( m_aETHostname.GetText().Len() != 0 ) && (m_aNFPortNumber.GetText().Len() != 0 ) && ( !m_bUseClass || m_aETDriverClass.GetText().Len() != 0 )); SetRoadmapStateValue(bRoadmapState); callModifiedHdl(); return 0L; File [changed]: DBSetupConnectionPages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx?r1=1.6&r2=1.6.134.1 Delta lines: +15 -4 -------------------- --- DBSetupConnectionPages.hxx 2007-05-10 10:22:35+0000 1.6 +++ DBSetupConnectionPages.hxx 2008-02-14 08:37:47+0000 1.6.134.1 @@ -4,9 +4,9 @@ * * $RCSfile: DBSetupConnectionPages.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.134.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:22:35 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:47 $ * * 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 @@ , 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; File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.22&r2=1.22.12.1 Delta lines: +6 -4 ------------------- --- DbAdminImpl.cxx 2008-01-30 08:43:26+0000 1.22 +++ DbAdminImpl.cxx 2008-02-14 08:37:47+0000 1.22.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: DbAdminImpl.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.12.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:43:26 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -542,6 +542,7 @@ } } break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: { SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); @@ -1096,6 +1097,7 @@ switch( eType ) { + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: nPortNumberId = DSID_MYSQL_PORTNUMBER; break; File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.14&r2=1.14.12.1 Delta lines: +6 -3 ------------------- --- DriverSettings.cxx 2008-01-30 08:43:40+0000 1.14 +++ DriverSettings.cxx 2008-02-14 08:37:47+0000 1.14.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.12.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:43:40 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,6 +107,9 @@ _out_rDetailsIds.push_back(DSID_USECATALOG); break; + case DST_MYSQL_NATIVE: + _out_rDetailsIds.push_back(DSID_CHARSET); + break; case DST_MYSQL_JDBC: _out_rDetailsIds.push_back(DSID_CHARSET); _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); File [changed]: DriverSettings.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.hxx?r1=1.7&r2=1.7.46.1 Delta lines: +7 -3 ------------------- --- DriverSettings.hxx 2007-11-01 15:07:02+0000 1.7 +++ DriverSettings.hxx 2008-02-14 08:37:47+0000 1.7.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.46.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:07:02 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,6 +87,10 @@ */ static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + /** Creates the detail page for MySQLNATIVE + */ + static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); + /** Creates the detail page for Oracle JDBC */ static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.105&r2=1.105.34.1 Delta lines: +6 -3 ------------------- --- dbadmin.cxx 2007-11-27 12:11:19+0000 1.105 +++ dbadmin.cxx 2008-02-14 08:37:47+0000 1.105.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.cxx,v $ * - * $Revision: 1.105 $ + * $Revision: 1.105.34.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/27 12:11:19 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -215,6 +215,9 @@ case DST_MYSQL_JDBC: addDetailPage(PAGE_MYSQL_JDBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateMySQLJDBC); break; + case DST_MYSQL_NATIVE: + addDetailPage(PAGE_MYSQL_JDBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateMySQLNATIVE); + break; case DST_ORACLE_JDBC: addDetailPage(PAGE_ORACLE_JDBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateOracleJDBC); break; File [changed]: dbadminsetup.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadminsetup.hrc?r1=1.5&r2=1.5.48.1 Delta lines: +4 -3 ------------------- --- dbadminsetup.hrc 2007-11-01 15:11:19+0000 1.5 +++ dbadminsetup.hrc 2008-02-14 08:37:48+0000 1.5.48.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadminsetup.hrc,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.48.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:11:19 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -131,6 +131,7 @@ #define RB_CONNECTVIAJDBC 2 #define RB_REGISTERDATASOURCE 3 #define RB_DONTREGISTERDATASOURCE 4 +#define RB_CONNECTVIANATIVE 5 #define CB_WIZ_USESSL 1 #define CB_STARTTABLEWIZARD 2 File [changed]: dbadminsetup.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadminsetup.src?r1=1.13&r2=1.13.48.1 Delta lines: +33 -3 -------------------- --- dbadminsetup.src 2007-11-01 15:11:40+0000 1.13 +++ dbadminsetup.src 2008-02-14 08:37:48+0000 1.13.48.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadminsetup.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.48.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:11:40 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -205,6 +205,13 @@ Size = MAP_APPFONT ( 208 , 8 ) ; Text[ en-US ] = "Connect using JDBC (Java Database Connectivity)" ; }; + RadioButton RB_CONNECTVIANATIVE + { + Pos = MAP_APPFONT (START_X + 6 , 115 ) ; + Size = MAP_APPFONT ( 205 , 9 ) ; + Text[ en-US ] = "Connect native" ; + Hide = TRUE ; + }; }; @@ -378,6 +385,29 @@ AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME) }; +TabPage PAGE_DBWIZARD_MYSQL_NATIVE +{ + SVLook = TRUE ; + Pos = MAP_APPFONT ( 0 , 0 ) ; + Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; + Hide = TRUE ; + + + String STR_MYSQLJDBC_HEADERTEXT + { + Text[ en-US ] = "Set up connection to a MySQL database" ; + }; + + String STR_MYSQLJDBC_HELPTEXT{ + Text[ en-US ] = "Please enter the required information to connect to a MySQL database."; + }; + + String STR_MYSQL_DEFAULT{ + Text[ en-US ] = "Default: 3306"; + }; + + AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME) +}; TabPage PAGE_DBWIZARD_DBASE File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.18&r2=1.18.36.1 Delta lines: +10 -3 -------------------- --- dbwiz.cxx 2007-11-21 15:56:33+0000 1.18 +++ dbwiz.cxx 2008-02-14 08:37:48+0000 1.18.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.36.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:56:33 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -118,6 +118,7 @@ #define ADDITIONAL_PAGE_ADO 9 #define ADDITIONAL_PAGE_ODBC 10 #define ADDITIONAL_USERDEFINED 11 +#define ADDITIONAL_PAGE_MYSQL_NATIVE 12 DBG_NAME(ODbTypeWizDialog) @@ -238,6 +239,9 @@ case DST_ADABAS: nNextState = ADDITIONAL_PAGE_ADABAS; break; + case DST_MYSQL_NATIVE: + nNextState = ADDITIONAL_PAGE_MYSQL_NATIVE; + break; case DST_MYSQL_JDBC: nNextState = ADDITIONAL_PAGE_MYSQL_JDBC; break; @@ -335,6 +339,9 @@ case ADDITIONAL_PAGE_MYSQL_JDBC: pPage = ODriversSettings::CreateMySQLJDBC(this,*m_pOutSet); break; + case ADDITIONAL_PAGE_MYSQL_NATIVE: + pPage = ODriversSettings::CreateMySQLNATIVE(this,*m_pOutSet); + break; case ADDITIONAL_PAGE_MYSQL_ODBC: pPage = ODriversSettings::CreateMySQLODBC(this,*m_pOutSet); break; File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.29&r2=1.29.36.1 Delta lines: +39 -12 --------------------- --- dbwizsetup.cxx 2007-11-21 17:00:03+0000 1.29 +++ dbwizsetup.cxx 2008-02-14 08:37:48+0000 1.29.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.29.36.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 17:00:03 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -235,6 +235,7 @@ #define PAGE_DBSETUPWIZARD_MOZILLA 15 #define PAGE_DBSETUPWIZARD_FINAL 16 #define PAGE_DBSETUPWIZARD_USERDEFINED 17 +#define PAGE_DBSETUPWIZARD_MYSQL_NATIVE 18 #define DBASE_PATH 1 @@ -262,6 +263,7 @@ #define USERDEFINED_PATH 23 #define OPEN_DOC_PATH 24 #define MSACCESS2007_PATH 25 +#define MYSQL_NATIVE_PATH 26 OFinalDBPageSetup* pFinalPage; @@ -340,6 +342,7 @@ declareAuthDepPath( DST_JDBC, JDBC_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_JDBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_MYSQL_ODBC, MYSQL_ODBC_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_ODBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_MYSQL_JDBC, MYSQL_JDBC_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_JDBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); + declareAuthDepPath( DST_MYSQL_NATIVE, MYSQL_NATIVE_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_NATIVE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_ORACLE_JDBC, ORACLE_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ORACLE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_ADABAS, ADABAS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ADABAS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_LDAP, LDAP_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_LDAP, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); @@ -429,6 +432,9 @@ case PAGE_DBSETUPWIZARD_MYSQL_JDBC: sRoadmapItem = m_sRM_JDBCText; break; + case PAGE_DBSETUPWIZARD_MYSQL_NATIVE: + sRoadmapItem = m_sRM_JDBCText; + break; case PAGE_DBSETUPWIZARD_MYSQL_ODBC: sRoadmapItem = m_sRM_ODBCText; break; @@ -500,6 +506,7 @@ { DST_ODBC, ODBC_PATH }, { DST_JDBC, JDBC_PATH }, { DST_MYSQL_JDBC, MYSQL_JDBC_PATH }, + { DST_MYSQL_NATIVE, MYSQL_NATIVE_PATH }, { DST_MYSQL_ODBC, MYSQL_ODBC_PATH }, { DST_ORACLE_JDBC, ORACLE_PATH }, { DST_ADABAS, ADABAS_PATH }, @@ -644,16 +651,21 @@ DATASOURCE_TYPE ODbTypeWizDialogSetup::VerifyDataSourceType(const DATASOURCE_TYPE _DatabaseType) const { DATASOURCE_TYPE LocDatabaseType = _DatabaseType; - if ((LocDatabaseType == DST_MYSQL_JDBC) || (LocDatabaseType == DST_MYSQL_ODBC)) + if ((LocDatabaseType == DST_MYSQL_JDBC) || (LocDatabaseType == DST_MYSQL_ODBC) || (LocDatabaseType == DST_MYSQL_NATIVE)) { if (m_pMySQLIntroPage != NULL) { - if (m_pMySQLIntroPage->getMySQLMode() == 1) // TODO: use constant or Enum) + switch( m_pMySQLIntroPage->getMySQLMode() ) + { + case OMySQLIntroPageSetup::VIA_JDBC: return DST_MYSQL_JDBC; - else + case OMySQLIntroPageSetup::VIA_NATIVE: + return DST_MYSQL_NATIVE; + case OMySQLIntroPageSetup::VIA_ODBC: return DST_MYSQL_ODBC; } } + } return LocDatabaseType; } @@ -718,6 +730,10 @@ m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix(DST_MYSQL_JDBC))); pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet); break; + case PAGE_DBSETUPWIZARD_MYSQL_NATIVE: + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix(DST_MYSQL_NATIVE))); + pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLNATIVETabPage( this, *m_pOutSet); + break; case PAGE_DBSETUPWIZARD_ORACLE: pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( this, *m_pOutSet); @@ -794,10 +810,21 @@ // ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, /*_pMySQLIntroPageSetup*/) { - if (getDatasourceType(*m_pOutSet) == DST_MYSQL_ODBC) + const DATASOURCE_TYPE eType = getDatasourceType(*m_pOutSet); + switch( eType ) + { + case DST_MYSQL_ODBC: activatePath( MYSQL_ODBC_PATH, sal_True); - else + break; + case DST_MYSQL_JDBC: activatePath( MYSQL_JDBC_PATH, sal_True); + break; + case DST_MYSQL_NATIVE: + activatePath( MYSQL_NATIVE_PATH, sal_True); + break; + default: + ; + } return sal_True; } File [changed]: detailpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.cxx?r1=1.49&r2=1.49.34.1 Delta lines: +43 -14 --------------------- --- detailpages.cxx 2007-11-21 15:57:03+0000 1.49 +++ detailpages.cxx 2008-02-14 08:37:48+0000 1.49.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: detailpages.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.49.34.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:57:03 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -580,13 +580,28 @@ ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) ,m_nPortId(_nPortId) + ,m_bUseClass(true) + { + if ( _pDriverName != NULL ) { m_aEDDriverClass.SetModifyHdl(getControlModifiedLink()); + } + else + { + m_bUseClass = false; + m_aFTDriverClass.Show(FALSE); + m_aEDDriverClass.Show(FALSE); + m_aTestJavaDriver.Show(FALSE); + } + m_aEDHostname.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); + if ( m_bUseClass ) + { m_aEDDriverClass.SetModifyHdl(LINK(this, OGeneralSpecialJDBCDetailsPage, OnEditModified)); m_aTestJavaDriver.SetClickHdl(LINK(this,OGeneralSpecialJDBCDetailsPage,OnTestJavaClickHdl)); + } // #98982# OJ m_aNFPortNumber.SetUseThousandSep(sal_False); @@ -602,6 +617,7 @@ FreeResource(); + if ( m_bUseClass ) m_sDefaultJdbcDriverName = String::CreateFromAscii(_pDriverName); } @@ -609,6 +625,7 @@ void OGeneralSpecialJDBCDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); + if ( m_bUseClass ) _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDDriverClass)); _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDHostname)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); @@ -619,6 +636,7 @@ OCommonBehaviourTabPage::fillWindows(_rControlList); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aPortNumber)); + if ( m_bUseClass ) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } @@ -627,6 +645,7 @@ sal_Bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); + if ( m_bUseClass ) fillString(_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); @@ -646,8 +665,11 @@ if ( bValid ) { + if ( m_bUseClass ) + { m_aEDDriverClass.SetText(pDrvItem->GetValue()); m_aEDDriverClass.ClearModifyFlag(); + } m_aEDHostname.SetText(pHostName->GetValue()); m_aEDHostname.ClearModifyFlag(); @@ -659,7 +681,7 @@ OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); // to get the correcxt value when saveValue was called by base class - if ( !m_aEDDriverClass.GetText().Len() ) + if ( m_bUseClass && !m_aEDDriverClass.GetText().Len() ) { m_aEDDriverClass.SetText(m_sDefaultJdbcDriverName); m_aEDDriverClass.SetModifyFlag(); @@ -669,6 +691,8 @@ IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); + OSL_ENSURE(m_bUseClass,"Who called me?"); + sal_Bool bSuccess = sal_False; try { @@ -691,7 +715,7 @@ // ----------------------------------------------------------------------- IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnEditModified, Edit*, _pEdit) { - if ( _pEdit == &m_aEDDriverClass ) + if ( m_bUseClass && _pEdit == &m_aEDDriverClass ) m_aTestJavaDriver.Enable( m_aEDDriverClass.GetText().Len() != 0 ); // tell the listener we were modified @@ -704,6 +728,11 @@ { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, _rAttrSet,DSID_MYSQL_PORTNUMBER ,"com.mysql.jdbc.Driver") ); } + // ----------------------------------------------------------------------- + SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) + { + return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, _rAttrSet,DSID_MYSQL_PORTNUMBER ,0) ); + } // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) File [changed]: detailpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.hxx?r1=1.27&r2=1.27.46.1 Delta lines: +4 -3 ------------------- --- detailpages.hxx 2007-11-01 15:12:47+0000 1.27 +++ detailpages.hxx 2008-02-14 08:37:48+0000 1.27.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: detailpages.hxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.27.46.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:12:47 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -249,6 +249,7 @@ String m_sDefaultJdbcDriverName; USHORT m_nPortId; + bool m_bUseClass; }; //======================================================================== File [changed]: generalpage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.cxx?r1=1.54&r2=1.54.12.1 Delta lines: +8 -5 ------------------- --- generalpage.cxx 2008-01-30 08:45:43+0000 1.54 +++ generalpage.cxx 2008-02-14 08:37:48+0000 1.54.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.54.12.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:45:43 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -442,10 +442,13 @@ if ( m_DBWizardMode && ( eType == DST_MYSQL_JDBC ) ) _inout_rDisplayName = m_sMySQLEntry; - if ( m_DBWizardMode && ( eType == DST_MYSQL_ODBC ) ) + else if ( m_DBWizardMode && ( eType == DST_MYSQL_ODBC ) ) _inout_rDisplayName = String(); - if ( eType == DST_EMBEDDED_HSQLDB ) + else if ( m_DBWizardMode && ( eType == DST_MYSQL_NATIVE ) ) + _inout_rDisplayName = String(); + + else if ( eType == DST_EMBEDDED_HSQLDB ) _inout_rDisplayName = String(); return _inout_rDisplayName.Len() > 0; Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dbu_resource.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_resource.hrc?r1=1.100&r2=1.100.10.1 Delta lines: +4 -3 ------------------- --- dbu_resource.hrc 2008-01-30 08:49:36+0000 1.100 +++ dbu_resource.hrc 2008-02-14 08:37:48+0000 1.100.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbu_resource.hrc,v $ * - * $Revision: 1.100 $ + * $Revision: 1.100.10.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:49:36 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -180,6 +180,7 @@ #define PAGE_DBWIZARD_MYSQL_JDBC RID_PAGE_START + 54 #define PAGE_DBWIZARD_FINAL RID_PAGE_START + 55 #define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56 +#define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START + 57 //======================================================================== // error boxes File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsntypes.hxx?r1=1.25&r2=1.25.36.1 Delta lines: +4 -3 ------------------- --- dsntypes.hxx 2007-11-21 17:01:38+0000 1.25 +++ dsntypes.hxx 2008-02-14 08:37:48+0000 1.25.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.36.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 17:01:38 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,6 +76,7 @@ DST_MACAB = 21, DST_MSACCESS_2007 = 22, DST_EMBEDDED_HSQLDB = 23, + DST_MYSQL_NATIVE = 24, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dbumiscres.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.hrc?r1=1.12&r2=1.12.36.1 Delta lines: +6 -5 ------------------- --- dbumiscres.hrc 2007-11-21 17:10:35+0000 1.12 +++ dbumiscres.hrc 2008-02-14 08:37:48+0000 1.12.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.hrc,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.36.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 17:10:35 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,8 +62,9 @@ #define STR_MACAB 21 #define STR_EMBEDDED_HSQLDB 22 #define STR_THUNDERBIRD 23 +#define STR_MYSQL_NATIVE 24 -#define STR_END STR_THUNDERBIRD + 1 +#define STR_END STR_MYSQL_NATIVE + 1 #endif // _DBU_MISCRES_HRC_ File [changed]: dbumiscres.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.src?r1=1.78&r2=1.78.36.1 Delta lines: +11 -3 -------------------- --- dbumiscres.src 2007-11-21 16:09:34+0000 1.78 +++ dbumiscres.src 2008-02-14 08:37:48+0000 1.78.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.src,v $ * - * $Revision: 1.78 $ + * $Revision: 1.78.36.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 16:09:34 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -135,6 +135,10 @@ { Text ="sdbc:address:thunderbird:"; }; + String STR_MYSQL_NATIVE + { + Text ="sdbc:mysqlc:"; + }; }; Resource RSC_DATASOURCE_TYPE_UINAMES { @@ -231,6 +235,10 @@ { Text[ en-US ] = "Thunderbird Address Book"; }; + String STR_MYSQL_NATIVE + { + Text[ en-US ] = "MySQL (Native)"; + }; }; Resource RSC_CHARSETS File [changed]: dsmeta.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsmeta.cxx?r1=1.5&r2=1.5.12.1 Delta lines: +5 -3 ------------------- --- dsmeta.cxx 2008-01-30 08:53:14+0000 1.5 +++ dsmeta.cxx 2008-02-14 08:37:49+0000 1.5.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.12.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:53:14 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -125,6 +125,7 @@ s_aSupport[ DST_MSACCESS ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 ); s_aSupport[ DST_MYSQL_ODBC ] = InitAdvanced( 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 ); s_aSupport[ DST_MYSQL_JDBC ] = InitAdvanced( 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 ); + s_aSupport[ DST_MYSQL_NATIVE ] = InitAdvanced( 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 ); s_aSupport[ DST_ORACLE_JDBC ] = InitAdvanced( InitAdvanced::All ); s_aSupport[ DST_ADABAS ] = InitAdvanced( 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0 ); s_aSupport[ DST_CALC ] = InitAdvanced( InitAdvanced::None ); @@ -169,6 +170,7 @@ if ( s_aSupport.empty() ) { s_aSupport[ DST_MSACCESS ] = FeatureSupport( AuthNone ); + s_aSupport[ DST_MYSQL_NATIVE ] = FeatureSupport( AuthUserPwd ); s_aSupport[ DST_MYSQL_ODBC ] = FeatureSupport( AuthUserPwd ); s_aSupport[ DST_MYSQL_JDBC ] = FeatureSupport( AuthUserPwd ); s_aSupport[ DST_ORACLE_JDBC ] = FeatureSupport( AuthUserPwd ); File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.38&r2=1.38.34.1 Delta lines: +8 -5 ------------------- --- dsntypes.cxx 2007-11-27 12:27:59+0000 1.38 +++ dsntypes.cxx 2008-02-14 08:37:49+0000 1.38.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.34.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/27 12:27:59 $ + * last change: $Author: oj $ $Date: 2008/02/14 08:37:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -276,6 +276,7 @@ _rsHostname = sUrl.GetToken(0,':'); _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':'); break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: { lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber); @@ -357,6 +358,7 @@ case DST_MYSQL_ODBC: case DST_ODBC: case DST_MYSQL_JDBC: + case DST_MYSQL_NATIVE: case DST_ORACLE_JDBC: case DST_LDAP: case DST_JDBC: @@ -385,6 +387,7 @@ case DST_THUNDERBIRD: bEnableBrowseButton = TRUE; break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: case DST_ORACLE_JDBC: case DST_LDAP: @@ -460,6 +463,8 @@ return DST_FLAT; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:calc:", 0, nSeparator)) return DST_CALC; + if ( ( 11 <= nSeparator) && _rDsn.EqualsIgnoreCaseAscii("sdbc:mysqlc:", 0, nSeparator)) + return DST_MYSQL_NATIVE; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:embedded:hsqldb", 0, _rDsn.Len())) return DST_EMBEDDED_HSQLDB; @@ -502,8 +507,6 @@ if (_rDsn.EqualsIgnoreCaseAscii("sdbc:mysql:jdbc", 0, nSeparator)) return DST_MYSQL_JDBC; - - DBG_ERROR("ODsnTypeCollection::implDetermineType : unrecognized data source type !"); return DST_UNKNOWN; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
