Tag: cws_src680_dba24 User: oj Date: 05/02/04 04:51:41 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionHelper.cxx, ConnectionPage.cxx
Log: #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.4&r2=1.4.4.1 Delta lines: +8 -7 ------------------- --- ConnectionHelper.cxx 21 Jan 2005 17:11:18 -0000 1.4 +++ ConnectionHelper.cxx 4 Feb 2005 12:51:37 -0000 1.4.4.1 @@ -243,9 +243,8 @@ 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 ); @@ -790,11 +789,13 @@ 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; } File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.7.4.1&r2=1.7.4.2 Delta lines: +1 -4 ------------------- --- ConnectionPage.cxx 1 Feb 2005 07:52:00 -0000 1.7.4.1 +++ ConnectionPage.cxx 4 Feb 2005 12:51:38 -0000 1.7.4.2 @@ -264,10 +264,9 @@ { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) sal_Bool bValid, bReadonly; + OConnectionHelper::implInitControls( _rSet, _bSaveValue); getFlags(_rSet, bValid, bReadonly); - m_eType = m_pAdminDialog->getDatasourceType(_rSet); - OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); switch( m_eType ) { @@ -327,7 +326,6 @@ 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))); @@ -372,7 +370,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]
