Tag: cws_src680_dba24 User: oj Date: 05/03/07 05:59:41 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionHelper.cxx, ConnectionPage.cxx, ConnectionPageSetup.cxx
Log: #i43911# fix for oracle jdbc tabpage 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.4.3&r2=1.4.4.4 Delta lines: +2 -9 ------------------- --- ConnectionHelper.cxx 25 Feb 2005 13:39:32 -0000 1.4.4.3 +++ ConnectionHelper.cxx 7 Mar 2005 13:59:36 -0000 1.4.4.4 @@ -2,9 +2,9 @@ * * $RCSfile: ConnectionHelper.cxx,v $ * - * $Revision: 1.4.4.3 $ + * $Revision: 1.4.4.4 $ * - * last change: $Author: oj $ $Date: 2005/02/25 13:39:32 $ + * last change: $Author: oj $ $Date: 2005/03/07 13:59:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,13 +237,6 @@ // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) sal_Bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); - - m_eType = m_pAdminDialog->getDatasourceType(_rSet); - // special handling for oracle and wizard mode - if ( DST_ORACLE_JDBC == m_eType && m_aET_Connection.GetHelpId() != HID_DSADMIN_ORACLE_DATABASE ) - { - m_eType = DST_JDBC; - } BOOL bEnableBrowseButton = m_pCollection->supportsBrowsing(m_eType); m_aFT_Connection.Show(); File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.7.4.2&r2=1.7.4.3 Delta lines: +7 -4 ------------------- --- ConnectionPage.cxx 4 Feb 2005 12:51:38 -0000 1.7.4.2 +++ ConnectionPage.cxx 7 Mar 2005 13:59:37 -0000 1.7.4.3 @@ -2,9 +2,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.7.4.2 $ + * $Revision: 1.7.4.3 $ * - * last change: $Author: oj $ $Date: 2005/02/04 12:51:38 $ + * last change: $Author: oj $ $Date: 2005/03/07 13:59:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -264,9 +264,11 @@ { // 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); + OConnectionHelper::implInitControls( _rSet, _bSaveValue); + OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); switch( m_eType ) { @@ -340,6 +342,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); File [changed]: ConnectionPageSetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx?r1=1.3&r2=1.3.4.1 Delta lines: +10 -3 -------------------- --- ConnectionPageSetup.cxx 21 Jan 2005 17:12:18 -0000 1.3 +++ ConnectionPageSetup.cxx 7 Mar 2005 13:59:37 -0000 1.3.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: ConnectionPageSetup.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.4.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:12:18 $ + * last change: $Author: oj $ $Date: 2005/03/07 13:59:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -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]
