Tag: cws_src680_dba30 User: fs Date: 05/04/06 00:10:28 Modified: /dba/connectivity/source/drivers/adabas/ BConnection.cxx /dba/connectivity/source/drivers/file/ FConnection.cxx /dba/connectivity/source/drivers/flat/ EConnection.cxx /dba/connectivity/source/drivers/jdbc/ Connection.cxx, tools.cxx /dba/connectivity/source/drivers/mozab/ MConnection.cxx /dba/connectivity/source/drivers/mysql/ YDriver.cxx /dba/connectivity/source/drivers/odbc/ OConnection.cxx
Log: #i46768# some assertions on the type of connection properties File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BConnection.cxx?r1=1.17&r2=1.17.68.1 Delta lines: +4 -4 ------------------- --- BConnection.cxx 2 Aug 2004 16:55:19 -0000 1.17 +++ BConnection.cxx 6 Apr 2005 07:10:22 -0000 1.17.68.1 @@ -2,9 +2,9 @@ * * $RCSfile: BConnection.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.68.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 16:55:19 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,7 +152,7 @@ else if(0 == pBegin->Name.compareToAscii("CharSet")) { ::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()); Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FConnection.cxx?r1=1.40&r2=1.40.68.1 Delta lines: +6 -6 ------------------- --- FConnection.cxx 2 Aug 2004 17:02:07 -0000 1.40 +++ FConnection.cxx 6 Apr 2005 07:10:23 -0000 1.40.68.1 @@ -2,9 +2,9 @@ * * $RCSfile: FConnection.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.40.68.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 17:02:07 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,11 +203,11 @@ for(;pBegin != pEnd;++pBegin) { if(0 == pBegin->Name.compareToAscii("Extension")) - pBegin->Value >>= aExt; + OSL_VERIFY( pBegin->Value >>= aExt ); else if(0 == pBegin->Name.compareToAscii("CharSet")) { ::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()); @@ -221,7 +221,7 @@ } else if (0 == pBegin->Name.compareToAscii("ShowDeleted")) { - pBegin->Value >>= m_bShowDeleted; + OSL_VERIFY( pBegin->Value >>= m_bShowDeleted ); } else if (0 == pBegin->Name.compareToAscii("EnableSQL92Check")) { Directory: /dba/connectivity/source/drivers/flat/ ================================================= File [changed]: EConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/flat/EConnection.cxx?r1=1.10&r2=1.10.16.1 Delta lines: +17 -13 --------------------- --- EConnection.cxx 10 Mar 2005 15:28:38 -0000 1.10 +++ EConnection.cxx 6 Apr 2005 07:10:23 -0000 1.10.16.1 @@ -2,9 +2,9 @@ * * $RCSfile: EConnection.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.16.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 15:28:38 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,26 +134,30 @@ for(;pBegin != pEnd;++pBegin) { if(!pBegin->Name.compareToAscii("HeaderLine")) - m_bHeaderLine = cppu::any2bool(pBegin->Value); + OSL_VERIFY( pBegin->Value >>= m_bHeaderLine ); else if(!pBegin->Name.compareToAscii("FieldDelimiter")) { ::rtl::OUString aVal; - pBegin->Value >>= aVal; m_cFieldDelimiter = aVal.toChar(); + OSL_VERIFY( pBegin->Value >>= aVal ); + m_cFieldDelimiter = aVal.toChar(); } else if(!pBegin->Name.compareToAscii("StringDelimiter")) { ::rtl::OUString aVal; - pBegin->Value >>= aVal; m_cStringDelimiter = aVal.toChar(); + OSL_VERIFY( pBegin->Value >>= aVal ); + m_cStringDelimiter = aVal.toChar(); } else if(!pBegin->Name.compareToAscii("DecimalDelimiter")) { ::rtl::OUString aVal; - pBegin->Value >>= aVal; m_cDecimalDelimiter = aVal.toChar(); + OSL_VERIFY( pBegin->Value >>= aVal ); + m_cDecimalDelimiter = aVal.toChar(); } else if(!pBegin->Name.compareToAscii("ThousandDelimiter")) { ::rtl::OUString aVal; - pBegin->Value >>= aVal; m_cThousandDelimiter = aVal.toChar(); + OSL_VERIFY( pBegin->Value >>= aVal ); + m_cThousandDelimiter = aVal.toChar(); } } Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: Connection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/Connection.cxx?r1=1.22&r2=1.22.8.1 Delta lines: +8 -8 ------------------- --- Connection.cxx 16 Feb 2005 17:27:51 -0000 1.22 +++ Connection.cxx 6 Apr 2005 07:10:24 -0000 1.22.8.1 @@ -2,9 +2,9 @@ * * $RCSfile: Connection.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.8.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:27:51 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -744,7 +744,7 @@ java_lang_Throwable::getMyClass(); ::rtl::OUString aStr; - pBegin->Value >>= aStr; + OSL_VERIFY( pBegin->Value >>= aStr ); OSL_ASSERT( aStr.getLength()); if ( aStr.getLength() ) { @@ -770,19 +770,19 @@ } else if(!pBegin->Name.compareToAscii("IsAutoRetrievingEnabled")) { - pBegin->Value >>= _rbAutoRetrievingEnabled; + OSL_VERIFY( pBegin->Value >>= _rbAutoRetrievingEnabled ); } else if(!pBegin->Name.compareToAscii("AutoRetrievingStatement")) { - pBegin->Value >>= _rsGeneratedValueStatement; + OSL_VERIFY( pBegin->Value >>= _rsGeneratedValueStatement ); } else if(!pBegin->Name.compareToAscii("ParameterNameSubstitution")) { - pBegin->Value >>= _bParameterSubstitution; + OSL_VERIFY( pBegin->Value >>= _bParameterSubstitution ); } else if(!pBegin->Name.compareToAscii("IgnoreDriverPrivileges")) { - pBegin->Value >>= _bIgnoreDriverPrivileges; + OSL_VERIFY( pBegin->Value >>= _bIgnoreDriverPrivileges ); } } } File [changed]: tools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/tools.cxx?r1=1.19&r2=1.19.8.1 Delta lines: +6 -5 ------------------- --- tools.cxx 16 Feb 2005 17:30:42 -0000 1.19 +++ tools.cxx 6 Apr 2005 07:10:24 -0000 1.19.8.1 @@ -2,9 +2,9 @@ * * $RCSfile: tools.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.19.8.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:30:42 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -196,10 +196,11 @@ pBegin->Name.compareToAscii("NoNameLengthLimit") && pBegin->Name.compareToAscii("EnableSQL92Check") && pBegin->Name.compareToAscii("EnableOuterJoinEscape") && - pBegin->Name.compareToAscii("BooleanComparisonMode")) + pBegin->Name.compareToAscii("BooleanComparisonMode") && + pBegin->Name.compareToAscii("IgnoreDriverPrivileges")) { ::rtl::OUString aStr; - pBegin->Value >>= aStr; + OSL_VERIFY( pBegin->Value >>= aStr ); pProps->setProperty(pBegin->Name,aStr); } } Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConnection.cxx?r1=1.18&r2=1.18.6.1 Delta lines: +4 -4 ------------------- --- MConnection.cxx 21 Feb 2005 12:21:27 -0000 1.18 +++ MConnection.cxx 6 Apr 2005 07:10:24 -0000 1.18.6.1 @@ -2,9 +2,9 @@ * * $RCSfile: MConnection.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.6.1 $ * - * last change: $Author: vg $ $Date: 2005/02/21 12:21:27 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -303,7 +303,7 @@ } else if ( 0 == pInfo->Name.compareToAscii("PortNumber") ) { - pInfo->Value >>= nPortNumber; + OSL_VERIFY( pInfo->Value >>= nPortNumber ); } else if ( 0 == pInfo->Name.compareToAscii("MaxRowCount") ) { Directory: /dba/connectivity/source/drivers/mysql/ ================================================== File [changed]: YDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mysql/YDriver.cxx?r1=1.12&r2=1.12.16.1 Delta lines: +4 -4 ------------------- --- YDriver.cxx 10 Mar 2005 15:31:16 -0000 1.12 +++ YDriver.cxx 6 Apr 2005 07:10:25 -0000 1.12.16.1 @@ -2,9 +2,9 @@ * * $RCSfile: YDriver.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.16.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 15:31:16 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -156,7 +156,7 @@ for (;pSupported != pEnd; ++pSupported) if ( !pSupported->Name.compareToAscii("JavaDriverClass") ) { - pSupported->Value >>= sRet; + OSL_VERIFY( pSupported->Value >>= sRet ); break; } 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.31&r2=1.31.28.1 Delta lines: +14 -14 --------------------- --- OConnection.cxx 21 Jan 2005 16:42:40 -0000 1.31 +++ OConnection.cxx 6 Apr 2005 07:10:25 -0000 1.31.28.1 @@ -2,9 +2,9 @@ * * $RCSfile: OConnection.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.31.28.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 16:42:40 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:10:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -268,49 +268,49 @@ 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(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]
