User: vg Date: 05/03/10 08:47:03 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionHelper.cxx
Log: INTEGRATION: CWS dba24 (1.4.4); FILE MERGED 2005/03/08 10:18:09 oj 1.4.4.5: RESYNC: (1.4-1.5); FILE MERGED 2005/03/07 13:59:36 oj 1.4.4.4: #i43911# fix for oracle jdbc tabpage 2005/02/25 13:39:32 oj 1.4.4.3: #i42289 # state toggling corrected 2005/02/04 13:11:29 oj 1.4.4.2: #i41996# allow to reject the creation of a new folder 2005/02/04 12:51:37 oj 1.4.4.1: #i42049# make JDBC prefix work again, new wizard removed it File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.5&r2=1.6 Delta lines: +7 -10 -------------------- --- ConnectionHelper.cxx 21 Feb 2005 12:41:07 -0000 1.5 +++ ConnectionHelper.cxx 10 Mar 2005 16:47:00 -0000 1.6 @@ -244,14 +244,11 @@ sal_Bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); - m_eType = m_pAdminDialog->getDatasourceType(_rSet); - BOOL bEnableBrowseButton = m_pCollection->supportsBrowsing(m_eType); m_aFT_Connection.Show(); m_aET_Connection.Show(); - m_aET_Connection.ShowPrefix(FALSE); + m_aET_Connection.ShowPrefix(DST_JDBC == m_eType ); m_aPB_Connection.Show(sal_True); - m_aET_Connection.ShowPrefix(FALSE); OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); @@ -688,7 +685,7 @@ break; case RET_NO: - SetRoadmapStateValue(sal_False); + // SetRoadmapStateValue(sal_False); callModifiedHdl(); return RET_OK; @@ -840,11 +837,11 @@ break; case EVENT_LOSEFOCUS: - //if (m_aET_Connection.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) - //{ // a descendant of the URL edit field lost the focus - // if (!commitURL()) - // return 1L; // handled - //} + if (m_aET_Connection.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) + { // a descendant of the URL edit field lost the focus + if (!commitURL()) + return 1L; // handled + } break; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
