Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:54:43 Modified: dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx
Log: RESYNC: (1.11-1.13); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.11.6.3&r2=1.11.6.4 Delta lines: +11 -10 --------------------- --- DbAdminImpl.cxx 25 Apr 2006 13:02:50 -0000 1.11.6.3 +++ DbAdminImpl.cxx 4 Jul 2006 07:54:40 -0000 1.11.6.4 @@ -197,8 +197,8 @@ //======================================================================== ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XMultiServiceFactory >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper) : m_xORB(_xORB) - , m_pItemSetHelper(_pItemSetHelper) , m_pParent(_pParent) + , m_pItemSetHelper(_pItemSetHelper) { /// initialize the property translation map // direct properties of a data source @@ -335,6 +335,7 @@ makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE)); } + if ( !aReturn.empty() ) _rDriverParam = Sequence< PropertyValue >(&(*aReturn.begin()), aReturn.size()); // append all the other stuff (charset etc.) @@ -616,8 +617,6 @@ { ::rtl::OUString sNewConnectURL, sName, sUid, sPwd; Sequence< ::rtl::OUString > aTableFitler; - sal_Bool bPasswordRequired = sal_False; - sal_Bool bReadOnly = sal_True; if (_rxSource.is()) { @@ -937,9 +936,9 @@ } else { - MapInt2String::const_iterator aPos = m_aIndirectPropTranslator.find( _nId ); - if ( m_aIndirectPropTranslator.end() != aPos ) - aString = aPos->second; + MapInt2String::const_iterator indirectPos = m_aIndirectPropTranslator.find( _nId ); + if ( m_aIndirectPropTranslator.end() != indirectPos ) + aString = indirectPos->second; } ::rtl::OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); @@ -1083,6 +1082,8 @@ case DST_LDAP: nPortNumberId = DSID_CONN_LDAP_PORTNUMBER; break; + default: + break; } if ( sUrlPart.Len() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
