User: vg Date: 05/03/10 08:47:16 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionPage.cxx
Log: INTEGRATION: CWS dba24 (1.7.4); FILE MERGED 2005/03/08 10:18:17 oj 1.7.4.4: RESYNC: (1.7-1.8); FILE MERGED 2005/03/07 13:59:37 oj 1.7.4.3: #i43911# fix for oracle jdbc tabpage 2005/02/04 12:51:38 oj 1.7.4.2: #i42049# make JDBC prefix work again, new wizard removed it 2005/02/01 07:52:00 oj 1.7.4.1: #i41727# disable propeties for specific types 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.8&r2=1.9 Delta lines: +4 -4 ------------------- --- ConnectionPage.cxx 21 Feb 2005 12:41:21 -0000 1.8 +++ ConnectionPage.cxx 10 Mar 2005 16:47:13 -0000 1.9 @@ -267,6 +267,7 @@ getFlags(_rSet, bValid, bReadonly); m_eType = m_pAdminDialog->getDatasourceType(_rSet); + OConnectionHelper::implInitControls( _rSet, _bSaveValue); OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); switch( m_eType ) @@ -330,11 +331,10 @@ sText.SearchAndReplaceAscii("~",sTemp); m_aFT_Connection.SetText(sText); } - m_aFT_Connection.Hide(); + m_aET_Connection.Hide(); break; case DST_JDBC: m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); - m_aET_Connection.ShowPrefix(TRUE); // run through default: m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); @@ -349,6 +349,7 @@ // 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); @@ -379,7 +380,6 @@ m_aET_Connection.ClearModifyFlag(); m_aJavaDriver.ClearModifyFlag(); } - OConnectionHelper::implInitControls( _rSet, _bSaveValue); } // ----------------------------------------------------------------------- void OConnectionTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
