User: kz Date: 2008-03-05 16:59:56+0000 Modified: dba/dbaccess/source/ui/dlg/detailpages.cxx
Log: INTEGRATION: CWS dba30a (1.49.34); FILE MERGED 2008/02/14 08:37:48 oj 1.49.34.1: #i86088# add url handling for sdbc:mysqlc: File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: detailpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.cxx?r1=1.49&r2=1.50 Delta lines: +40 -11 --------------------- --- detailpages.cxx 2007-11-21 15:57:03+0000 1.49 +++ detailpages.cxx 2008-03-05 16:59:53+0000 1.50 @@ -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 ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
