User: hr Date: 06/06/19 20:03:45 Modified: /dba/dbaccess/source/ui/dlg/ DbAdminImpl.cxx
Log: INTEGRATION: CWS warnings01 (1.11.48); FILE MERGED 2006/05/23 23:51:02 sb 1.11.48.2: RESYNC: (1.11-1.12); FILE MERGED 2006/03/24 15:36:09 fs 1.11.48.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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.12&r2=1.13 Delta lines: +6 -6 ------------------- --- DbAdminImpl.cxx 19 Apr 2006 13:20:20 -0000 1.12 +++ DbAdminImpl.cxx 20 Jun 2006 03:03:42 -0000 1.13 @@ -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 @@ -617,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()) { @@ -938,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 ); @@ -1084,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]
