User: hr Date: 06/06/19 19:44:47 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.cxx
Log: INTEGRATION: CWS warnings01 (1.65.28); FILE MERGED 2006/06/13 12:45:47 fs 1.65.28.4: #i66365# adjust error message 2006/05/23 23:44:59 sb 1.65.28.3: RESYNC: (1.67-1.68); FILE MERGED 2006/04/07 20:47:18 sb 1.65.28.2: RESYNC: (1.65-1.67); FILE MERGED 2006/03/24 15:35:52 fs 1.65.28.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.68&r2=1.69 Delta lines: +18 -20 --------------------- --- datasource.cxx 19 Apr 2006 13:19:05 -0000 1.68 +++ datasource.cxx 20 Jun 2006 02:44:44 -0000 1.69 @@ -307,7 +307,7 @@ } //-------------------------------------------------------------------------- - void SAL_CALL OAuthenticationContinuation::setRealm( const ::rtl::OUString& Realm ) throw(RuntimeException) + void SAL_CALL OAuthenticationContinuation::setRealm( const ::rtl::OUString& /*Realm*/ ) throw(RuntimeException) { DBG_ERROR("OAuthenticationContinuation::setRealm: not supported!"); } @@ -372,7 +372,7 @@ } //-------------------------------------------------------------------------- - void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication Remember ) throw(RuntimeException) + void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ ) throw(RuntimeException) { DBG_ERROR("OAuthenticationContinuation::setRememberAccount: not supported!"); } @@ -849,7 +849,9 @@ ::rtl::OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId ); SQLContext aContext; - aContext.Message = m_pImpl->m_sConnectURL; + aContext.Message = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "A connection for the following URL was requested: " ) ); + // TODO: resource + aContext.Message += m_pImpl->m_sConnectURL; throwGenericSQLException( sMessage, static_cast< XDataSource* >( this ), makeAny( aContext ) ); } @@ -933,11 +935,11 @@ if (!(rValue >>= aValues)) throw IllegalArgumentException(); - const PropertyValue* pBegin = aValues.getConstArray(); - const PropertyValue* pEnd = pBegin + aValues.getLength(); - for (;pBegin != pEnd ; ++pBegin) + const PropertyValue* valueEnd = aValues.getConstArray() + aValues.getLength(); + const PropertyValue* checkName = aValues.getConstArray(); + for ( ;checkName != valueEnd; ++checkName ) { - if ( !pBegin->Name.getLength() ) + if ( !checkName->Name.getLength() ) throw IllegalArgumentException(); } @@ -946,14 +948,13 @@ if ( !bModified ) { const PropertyValue* pInfoIter = m_pImpl->m_aInfo.getConstArray(); - const PropertyValue* pBegin = aValues.getConstArray(); - const PropertyValue* pEnd = pBegin + aValues.getLength(); - for (;!bModified && pBegin != pEnd ; ++pBegin,++pInfoIter) + const PropertyValue* checkValue = aValues.getConstArray(); + for ( ;!bModified && checkValue != valueEnd ; ++checkValue,++pInfoIter) { - bModified = pBegin->Name != pInfoIter->Name; + bModified = checkValue->Name != pInfoIter->Name; if ( !bModified ) { - bModified = !::comphelper::compare(pBegin->Value,pInfoIter->Value); + bModified = !::comphelper::compare(checkValue->Value,pInfoIter->Value); } } } @@ -1164,15 +1165,12 @@ catch(Exception&) { if (bNewPasswordGiven) - // assume that we had an authentication problem. Without this we may, after an unsucessfull connect, while + // assume that we had an authentication problem. Without this we may, after an unsucessful connect, while // the user gave us a password an the order to remember it, never allow an password input again (at least // not without restarting the session) m_pImpl->m_aPassword = ::rtl::OUString(); throw; } - - DBG_ERROR("ODatabaseSource::connectWithCompletion: reached the unreacable!"); - return Reference< XConnection >(); } // ----------------------------------------------------------------------------- Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const rtl::OUString& user, const rtl::OUString& password) @@ -1290,7 +1288,7 @@ } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseSource::flushed( const EventObject& rEvent ) throw (RuntimeException) +void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (RuntimeException) { ModelMethodGuard aGuard( *this ); @@ -1333,21 +1331,21 @@ m_aFlushListeners.removeInterface(_xListener); } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& Event ) throw (RuntimeException) +void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException) { ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) m_pImpl->setModified(sal_True); } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException) +void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException) { ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) m_pImpl->setModified(sal_True); } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException) +void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException) { ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
