User: vg Date: 05/03/10 08:47:42 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionPageSetup.cxx
Log: INTEGRATION: CWS dba24 (1.3.4); FILE MERGED 2005/03/07 13:59:37 oj 1.3.4.1: #i43911# fix for oracle jdbc tabpage File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionPageSetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx?r1=1.3&r2=1.4 Delta lines: +7 -0 ------------------- --- ConnectionPageSetup.cxx 21 Jan 2005 17:12:18 -0000 1.3 +++ ConnectionPageSetup.cxx 10 Mar 2005 16:47:39 -0000 1.4 @@ -300,7 +300,14 @@ // ----------------------------------------------------------------------- void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { + m_eType = m_pAdminDialog->getDatasourceType(_rSet); + // special handling for oracle, this can only happen + // if the user enters the same url as used for Oracle and we are on the JDBC path + if ( DST_ORACLE_JDBC == m_eType ) + m_eType = DST_JDBC; + OConnectionHelper::implInitControls(_rSet, _bSaveValue); + if ( m_eType >= DST_USERDEFINE1 ) { String sDisplayName = m_pCollection->getTypeDisplayName(m_eType); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
