User: hr Date: 2006/08/15 03:29:47 Modified: dba/connectivity/source/drivers/odbc/OConnection.cxx
Log: INTEGRATION: CWS dba30 (1.31.28); FILE MERGED 2006/07/19 10:37:13 fs 1.31.28.6: RESYNC: (1.35-1.36); FILE MERGED 2006/04/18 13:12:49 oj 1.31.28.5: RESYNC: (1.34-1.35); FILE MERGED 2006/03/22 15:04:52 fs 1.31.28.4: #i10000# 2006/03/21 15:46:39 fs 1.31.28.3: RESYNC: (1.32-1.34); FILE MERGED 2005/09/28 12:40:38 fs 1.31.28.2: RESYNC: (1.31-1.32); FILE MERGED 2005/04/06 07:10:25 fs 1.31.28.1: #i46768# some assertions on the type of connection properties File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OConnection.cxx?r1=1.36&r2=1.37 Delta lines: +12 -12 --------------------- --- OConnection.cxx 20 Jun 2006 01:54:35 -0000 1.36 +++ OConnection.cxx 15 Aug 2006 10:29:45 -0000 1.37 @@ -248,51 +248,51 @@ for(;pBegin != pEnd;++pBegin) { if(!pBegin->Name.compareToAscii(pTimeout)) - pBegin->Value >>= nTimeout; + OSL_VERIFY( pBegin->Value >>= nTimeout ); else if(!pBegin->Name.compareToAscii(pSilent)) - pBegin->Value >>= bSilent; + OSL_VERIFY( pBegin->Value >>= bSilent ); else if(!pBegin->Name.compareToAscii(pPrivName)) - pBegin->Value >>= m_bIgnoreDriverPrivileges; + OSL_VERIFY( pBegin->Value >>= m_bIgnoreDriverPrivileges ); else if(!pBegin->Name.compareToAscii(pVerColName)) - pBegin->Value >>= m_bPreventGetVersionColumns; + OSL_VERIFY( pBegin->Value >>= m_bPreventGetVersionColumns ); else if(!pBegin->Name.compareToAscii(pParaName)) - pBegin->Value >>= m_bParameterSubstitution; + OSL_VERIFY( pBegin->Value >>= m_bParameterSubstitution ); else if(!pBegin->Name.compareToAscii(pRetrieving)) { sal_Bool bAutoRetrievingEnabled = sal_False; - pBegin->Value >>= bAutoRetrievingEnabled; + OSL_VERIFY( pBegin->Value >>= bAutoRetrievingEnabled ); enableAutoRetrievingEnabled(bAutoRetrievingEnabled); } else if(!pBegin->Name.compareToAscii(pRetriStmt)) { ::rtl::OUString sGeneratedValueStatement; - pBegin->Value >>= sGeneratedValueStatement; + OSL_VERIFY( pBegin->Value >>= sGeneratedValueStatement ); setAutoRetrievingStatement(sGeneratedValueStatement); } else if(!pBegin->Name.compareToAscii(pUser)) { - pBegin->Value >>= aUID; + OSL_VERIFY( pBegin->Value >>= aUID ); aDSN = aDSN + ::rtl::OUString::createFromAscii(";UID=") + aUID; } else if(!pBegin->Name.compareToAscii(pPwd)) { - pBegin->Value >>= aPWD; + OSL_VERIFY( pBegin->Value >>= aPWD ); aDSN = aDSN + ::rtl::OUString::createFromAscii(";PWD=") + aPWD; } else if(!pBegin->Name.compareToAscii(pUseCatalog)) { - pBegin->Value >>= m_bUseCatalog; + OSL_VERIFY( pBegin->Value >>= m_bUseCatalog ); } else if(!pBegin->Name.compareToAscii(pSysDrv)) { - pBegin->Value >>= aSysDrvSettings; + OSL_VERIFY( pBegin->Value >>= aSysDrvSettings ); aDSN += ::rtl::OUString::createFromAscii(";"); aDSN += aSysDrvSettings; } else if(0 == pBegin->Name.compareToAscii(pCharSet)) { ::rtl::OUString sIanaName; - pBegin->Value >>= sIanaName; + OSL_VERIFY( pBegin->Value >>= sIanaName ); ::dbtools::OCharsetMap aLookupIanaName; ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
