Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:53:54 Modified: dba/dbaccess/source/ui/dlg/ConnectionPage.cxx
Log: RESYNC: (1.13-1.15); FILE MERGED 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.12.4.4&r2=1.12.4.5 Delta lines: +10 -12 --------------------- --- ConnectionPage.cxx 25 Apr 2006 13:02:49 -0000 1.12.4.4 +++ ConnectionPage.cxx 4 Jul 2006 07:53:51 -0000 1.12.4.5 @@ -193,18 +193,18 @@ DBG_NAME(OConnectionTabPage) OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs) + ,m_pCollection(NULL) + ,m_bUserGrabFocus(sal_True) + ,m_aFL1(this, ResId(FL_SEPARATOR1)) + ,m_aFL2(this, ResId(FL_SEPARATOR2)) ,m_aUserNameLabel(this, ResId(FT_USERNAME)) ,m_aUserName(this, ResId(ET_USERNAME)) ,m_aPasswordRequired(this, ResId(CB_PASSWORD_REQUIRED)) + ,m_aFL3(this, ResId(FL_SEPARATOR3)) ,m_aJavaDriverLabel(this, ResId(FT_JDBCDRIVERCLASS)) ,m_aJavaDriver(this, ResId(ET_JDBCDRIVERCLASS)) ,m_aTestJavaDriver(this, ResId(PB_TESTDRIVERCLASS)) ,m_aTestConnection(this, ResId(PB_TESTCONNECTION)) - ,m_aFL1(this, ResId(FL_SEPARATOR1)) - ,m_aFL2(this, ResId(FL_SEPARATOR2)) - ,m_aFL3(this, ResId(FL_SEPARATOR3)) - ,m_pCollection(NULL) - ,m_bUserGrabFocus(sal_True) { DBG_CTOR(OConnectionTabPage,NULL); m_aET_Connection.SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified)); @@ -241,7 +241,7 @@ OConnectionHelper::implInitControls( _rSet, _bSaveValue); sal_Bool bShowUser = sal_True; - OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); + LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); switch( m_eType ) { case DST_DBASE: @@ -327,11 +327,9 @@ // collect the items SFX_ITEMSET_GET(_rSet, pUidItem, SfxStringItem, DSID_USER, sal_True); - SFX_ITEMSET_GET(_rSet, pPwdItem, SfxStringItem, DSID_PASSWORD, sal_True); SFX_ITEMSET_GET(_rSet, pJdbcDrvItem, SfxStringItem, DSID_JDBCDRIVERCLASS, sal_True); SFX_ITEMSET_GET(_rSet, pUrlItem, SfxStringItem, DSID_CONNECTURL, sal_True); SFX_ITEMSET_GET(_rSet, pAllowEmptyPwd, SfxBoolItem, DSID_PASSWORDREQUIRED, sal_True); - SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); // forward the values to the controls if ( bValid ) @@ -406,7 +404,7 @@ return bChangedSomething; } // ----------------------------------------------------------------------- - IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, _pButton) + IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
