diff options
6 files changed, 64 insertions, 64 deletions
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index d209612019ff..56ca793a46d1 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ODatabaseMetaDataResultSet.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: oj $ $Date: 2001-03-15 08:17:11 $ + * last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -778,7 +778,7 @@ void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( throw Exception(); break; default: - OSL_ENSHURE(0,"setFastPropertyValue_NoBroadcast: Illegal handle value!"); + OSL_ENSURE(0,"setFastPropertyValue_NoBroadcast: Illegal handle value!"); } } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 3da89fe2f85e..10af041e396a 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OPreparedStatement.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: oj $ $Date: 2001-02-05 12:26:40 $ + * last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -142,7 +142,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr if(!isPrepared()) prepareStatement(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); if(!m_xMetaData.is()) m_xMetaData = new OResultSetMetaData(m_aStatementHandle); return m_xMetaData; @@ -196,7 +196,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc if(!isPrepared()) prepareStatement(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); try { SQLRETURN nReturn = N3SQLExecute(m_aStatementHandle); @@ -390,7 +390,7 @@ void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x if( !parameterIndex || parameterIndex > numParams) throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString::createFromAscii("07009"),0,Any()); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int8* bindBuf = allocBindBuf(parameterIndex, 4); PREP_BIND_PARAM(sal_Int8,SQL_TINYINT); } @@ -413,7 +413,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& sal_Int8* bindBuf = allocBindBuf (parameterIndex, 32); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); DATE_STRUCT x = OTools::DateToOdbcDate(aData); PREP_BIND_PARAM(DATE_STRUCT,DataType::DATE); } @@ -436,7 +436,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& sal_Int8* bindBuf = allocBindBuf (parameterIndex, 32); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); TIME_STRUCT x = OTools::TimeToOdbcTime(aVal); PREP_BIND_PARAM(TIME_STRUCT,DataType::TIME); } @@ -458,7 +458,7 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const sal_Int8* bindBuf = allocBindBuf (parameterIndex, 32); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); TIMESTAMP_STRUCT x = OTools::DateTimeToTimestamp(aVal); PREP_BIND_PARAM(TIMESTAMP_STRUCT,DataType::TIMESTAMP); } @@ -478,7 +478,7 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x if( !parameterIndex || parameterIndex > numParams) throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString::createFromAscii("07009"),0,Any()); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int8* bindBuf = allocBindBuf (parameterIndex, 8); PREP_BIND_PARAM(double,DataType::DOUBLE); } @@ -499,7 +499,7 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) if( !parameterIndex || parameterIndex > numParams) throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString::createFromAscii("07009"),0,Any()); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int8* bindBuf = allocBindBuf (parameterIndex, 8); PREP_BIND_PARAM(float,DataType::FLOAT); } @@ -519,7 +519,7 @@ void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x if( !parameterIndex || parameterIndex > numParams) throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString::createFromAscii("07009"),0,Any()); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int8* bindBuf = allocBindBuf (parameterIndex, 4); PREP_BIND_PARAM(sal_Int32,DataType::INTEGER); } @@ -540,7 +540,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 a if( !parameterIndex || parameterIndex > numParams) throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString::createFromAscii("07009"),0,Any()); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int8 *bindBuf = allocBindBuf (parameterIndex, 8); float x = (float)aVal; PREP_BIND_PARAM(float,DataType::BIGINT); @@ -765,7 +765,7 @@ void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 if( !parameterIndex || parameterIndex > numParams) throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString::createFromAscii("07009"),0,Any()); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int8* bindBuf = allocBindBuf (parameterIndex, 4); PREP_BIND_PARAM(sal_Int16,DataType::SMALLINT); } @@ -819,7 +819,7 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim { if(!isPrepared()) prepareStatement(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); N3SQLFreeStmt (m_aStatementHandle, SQL_RESET_PARAMS); } // ------------------------------------------------------------------------- @@ -852,7 +852,7 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLExc void OPreparedStatement::initBoundParam () throw(SQLException) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); // Get the number of parameters numParams = 0; N3SQLNumParams (m_aStatementHandle,(short*)&numParams); @@ -1060,7 +1060,7 @@ void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException) } // Put the data - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); N3SQLPutData (m_aStatementHandle, buf.getArray(), realLen); @@ -1135,7 +1135,7 @@ void OPreparedStatement::setStream ( Ctype = SQL_C_BINARY; - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); N3SQLBindParameter(m_aStatementHandle, ParameterIndex,SQL_PARAM_INPUT,Ctype, SQLtype, length,0, dataBuf, sizeof(ParameterIndex),(SDWORD*)lenBuf); @@ -1175,7 +1175,7 @@ void OPreparedStatement::setChar(sal_Int32 parameterIndex, // precision = 2000; // // bindParameter(m_aStatementHandle,parameterIndex,bindBuf); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); PREP_BIND_PARAM(char*,SQLtype); // // Make a copy of the data @@ -1258,7 +1258,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons void OPreparedStatement::prepareStatement() { m_bPrepared = sal_True; - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); ::rtl::OString aSql(::rtl::OUStringToOString(m_sSqlStatement,getOwnConnection()->getTextEncoding())); SQLRETURN nReturn = N3SQLPrepare(m_aStatementHandle,(SDB_ODBC_CHAR *) aSql.getStr(),aSql.getLength()); OTools::ThrowException(nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this); diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index b6314d17b514..49261285f207 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OResultSet.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: fs $ $Date: 2001-03-15 08:54:04 $ + * last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -263,7 +263,7 @@ void OResultSet::allocBuffer(sal_Bool _bAllocRow) m_aBindVector.push_back(new sal_Int8[xMeta->getPrecision(i)]); break; default: - OSL_ENSHURE(0,"Unknown type"); + OSL_ENSURE(0,"Unknown type"); m_aBindVector.push_back(NULL); } } @@ -279,7 +279,7 @@ void OResultSet::releaseBuffer() void** pValue = m_aBindVector.begin() + 1; for(sal_Int32 i = 1; i<=nLen; ++i, ++pValue) { - OSL_ENSHURE(pValue != m_aBindVector.end(),"Iterator is equal end!"); + OSL_ENSURE(pValue != m_aBindVector.end(),"Iterator is equal end!"); switch (xMeta->getColumnType(i)) { case DataType::CHAR: @@ -1268,7 +1268,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th // break; // case TypeClass_ENUM: // default: -// OSL_ENSHURE(0,"UNKOWN TYPE for OResultSet::updateObject"); +// OSL_ENSURE(0,"UNKOWN TYPE for OResultSet::updateObject"); // } // return; // // Parameter konvertieren @@ -1287,7 +1287,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& throw DisposedException(); columnIndex = mapColumn(columnIndex); - OSL_ENSHURE(0,"OResultSet::updateNumericObject: NYI"); + OSL_ENSURE(0,"OResultSet::updateNumericObject: NYI"); // SDBThreadAttach t; // if( t.pEnv ) // { diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 755054583c1b..769ee4ee1294 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OStatement.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fs $ $Date: 2001-03-15 08:54:04 $ + * last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,7 +123,7 @@ } \ catch(SQLException&) \ { \ - OSL_ENSHURE(0,"Exception in odbc catched"); \ + OSL_ENSURE(0,"Exception in odbc catched"); \ } #endif @@ -176,7 +176,7 @@ void OStatement_BASE2::disposing() disposeResultSet(); - OSL_ENSHURE(m_aStatementHandle,"OStatement_BASE2::disposing: StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"OStatement_BASE2::disposing: StatementHandle is null!"); if (N3SQLFreeStmt(m_aStatementHandle,SQL_RESET_PARAMS) || N3SQLFreeStmt(m_aStatementHandle,SQL_UNBIND) || N3SQLFreeStmt(m_aStatementHandle,SQL_CLOSE)) @@ -217,7 +217,7 @@ void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) ::osl::MutexGuard aGuard( m_aMutex ); if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); OTools::ThrowException(N3SQLCancel(m_aStatementHandle),m_aStatementHandle,SQL_HANDLE_STMT,*this); } // ------------------------------------------------------------------------- @@ -314,7 +314,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const ::rtl::OUString& sql) throw( SQ if (index > 0) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); try { SQLINTEGER nLock = SQL_CONCUR_LOCK; @@ -356,7 +356,7 @@ sal_Int32 OStatement_Base::getColumnCount () throw( SQLException) throw DisposedException(); sal_Int16 numCols = 0; - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); try { THROW_SQL(N3SQLNumResultCols(m_aStatementHandle,&numCols)); @@ -389,7 +389,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(S lockIfNecessary (sql); // Call SQLExecDirect - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); try { THROW_SQL(N3SQLExecDirect(m_aStatementHandle, (SDB_ODBC_CHAR*)aSql.getStr(),aSql.getLength())); @@ -445,7 +445,7 @@ Reference< XResultSet > OStatement_Base::getResultSet (sal_Bool checkCount) thro if (numCols > 0) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); pRs = new OResultSet(m_aStatementHandle,this); // Save a copy of our last result set @@ -469,7 +469,7 @@ sal_Int32 OStatement_Base::getStmtOption (short fOption) const throw( SQLExcepti // Reset last warning message // clearWarnings(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); try { N3SQLGetStmtAttr(m_aStatementHandle, fOption,&result,SQL_IS_INTEGER,NULL); } @@ -546,7 +546,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, aBatchSql += ";"; } - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); THROW_SQL(N3SQLExecDirect(m_aStatementHandle, (SDB_ODBC_CHAR*)aBatchSql.getStr(),aBatchSql.getLength())); Sequence< sal_Int32 > aRet(nLen); @@ -635,7 +635,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim clearWarnings (); // Call SQLMoreResults - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); try { hasResultSet = N3SQLMoreResults(m_aStatementHandle) == SQL_SUCCESS; @@ -706,7 +706,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti //------------------------------------------------------------------------------ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_uInt32 nValue; SQLRETURN nRetCode = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,&nValue,SQL_IS_UINTEGER,0); if(nValue == SQL_CONCUR_READ_ONLY) @@ -718,7 +718,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, R //------------------------------------------------------------------------------ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_uInt32 nValue = SQL_CURSOR_FORWARD_ONLY; SQLRETURN nRetCode = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SENSITIVITY,&nValue,SQL_IS_UINTEGER,0); nRetCode = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nValue,SQL_IS_UINTEGER,0); @@ -741,7 +741,7 @@ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeE //------------------------------------------------------------------------------ sal_Int32 OStatement_Base::getFetchDirection() const throw(SQLException, RuntimeException) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_uInt32 nValue = 0; SQLRETURN nRetCode = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SCROLLABLE,&nValue,SQL_IS_UINTEGER,0); @@ -760,7 +760,7 @@ sal_Int32 OStatement_Base::getFetchDirection() const throw(SQLException, Runtime //------------------------------------------------------------------------------ sal_Int32 OStatement_Base::getFetchSize() const throw(SQLException, RuntimeException) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_uInt32 nValue; SQLRETURN nRetCode = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,&nValue,SQL_IS_UINTEGER,0); @@ -774,7 +774,7 @@ sal_Int32 OStatement_Base::getMaxFieldSize() const throw(SQLException, RuntimeEx //------------------------------------------------------------------------------ ::rtl::OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException) { - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); SQLCHAR pName[258]; SQLSMALLINT nRealLen = 0; SQLRETURN nRetCode = N3SQLGetCursorName(m_aStatementHandle,(SQLCHAR*)pName,256,&nRealLen); @@ -788,7 +788,7 @@ void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, Run if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); SQLRETURN nRetCode = N3SQLSetStmtAttr(m_aStatementHandle, SQL_ATTR_QUERY_TIMEOUT,(SQLPOINTER)seconds,SQL_IS_UINTEGER); #ifdef DEBUG DEBUG_THROW @@ -801,7 +801,7 @@ void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeExc if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); SQLRETURN nRetCode = N3SQLSetStmtAttr(m_aStatementHandle, SQL_ATTR_MAX_ROWS, (SQLPOINTER)_par0,SQL_IS_UINTEGER); #ifdef DEBUG DEBUG_THROW @@ -821,7 +821,7 @@ void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLExceptio else nSet = SQL_CONCUR_VALUES; - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); THROW_SQL(N3SQLSetStmtAttr(m_aStatementHandle, SQL_ATTR_CONCURRENCY,(SQLPOINTER)nSet,SQL_IS_UINTEGER)); } @@ -832,7 +832,7 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, Runt if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); SQLRETURN nRetCode = N3SQLSetStmtAttr(m_aStatementHandle, SQL_ATTR_ROW_BIND_TYPE,(SQLPOINTER)SQL_BIND_BY_COLUMN,SQL_IS_UINTEGER); SQLUINTEGER nSet; @@ -871,7 +871,7 @@ void OStatement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLException, Run if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int32 nCursType = 0; SQLRETURN nRetCode = SQL_SUCCESS; if(_par0 == FetchDirection::FORWARD) @@ -896,7 +896,7 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); SQLRETURN nRetCode = N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,(SQLPOINTER)_par0,SQL_IS_UINTEGER); @@ -919,7 +919,7 @@ void OStatement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLException, Runti if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); THROW_SQL(N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_MAX_LENGTH,(SQLPOINTER)_par0,SQL_IS_UINTEGER)); } //------------------------------------------------------------------------------ @@ -929,7 +929,7 @@ void OStatement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLExcep if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); ::rtl::OString aName(::rtl::OUStringToOString(_par0,getOwnConnection()->getTextEncoding())); THROW_SQL(N3SQLSetCursorName(m_aStatementHandle,(SDB_ODBC_CHAR*)aName.getStr(),aName.getLength())); } @@ -939,7 +939,7 @@ sal_Bool OStatement_Base::isUsingBookmarks() const throw(SQLException, RuntimeEx if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_uInt32 nValue = SQL_UB_OFF; SQLRETURN nRet = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&nValue,SQL_IS_UINTEGER,NULL); // THROW_SQL(nRet); @@ -952,7 +952,7 @@ void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark) throw(SQLExcepti if (OStatement_BASE::rBHelper.bDisposed) throw DisposedException(); - OSL_ENSHURE(m_aStatementHandle,"StatementHandle is null!"); + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_uInt32 nValue = _bUseBookmark ? SQL_UB_VARIABLE : SQL_UB_OFF; SQLRETURN nRet = N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,(SQLPOINTER)nValue,SQL_IS_UINTEGER); THROW_SQL(nRet); diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index b7cf8ea3404e..8dd9495daea1 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OTools.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2001-02-05 12:26:40 $ + * last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,7 +99,7 @@ void OTools::ThrowException(SQLRETURN _rRetCode,SQLHANDLE _pContext,SQLSMALLINT case SQL_ERROR: break; - case SQL_INVALID_HANDLE: OSL_ENSHURE(0,"SdbODBC3_SetStatus: SQL_INVALID_HANDLE"); + case SQL_INVALID_HANDLE: OSL_ENSURE(0,"SdbODBC3_SetStatus: SQL_INVALID_HANDLE"); throw RuntimeException(); break; } @@ -123,8 +123,8 @@ void OTools::ThrowException(SQLRETURN _rRetCode,SQLHANDLE _pContext,SQLSMALLINT szSqlState, &pfNativeError, szErrorMessage,sizeof szErrorMessage - 1,&pcbErrorMsg); - OSL_ENSHURE(n != SQL_INVALID_HANDLE,"SdbODBC3_SetStatus: SQLError returned SQL_INVALID_HANDLE"); - OSL_ENSHURE(n == SQL_SUCCESS || n == SQL_SUCCESS_WITH_INFO || n == SQL_NO_DATA_FOUND || n == SQL_ERROR,"SdbODBC3_SetStatus: SQLError failed"); + OSL_ENSURE(n != SQL_INVALID_HANDLE,"SdbODBC3_SetStatus: SQLError returned SQL_INVALID_HANDLE"); + OSL_ENSURE(n == SQL_SUCCESS || n == SQL_SUCCESS_WITH_INFO || n == SQL_NO_DATA_FOUND || n == SQL_ERROR,"SdbODBC3_SetStatus: SQLError failed"); // Zum Return Code von SQLError siehe ODBC 2.0 Programmer's Reference Seite 287ff throw SQLException( ::rtl::OUString((char *)szErrorMessage,pcbErrorMsg,_nTextEncoding), diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 7e6bf4bc118a..ced2b096aa15 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -2,9 +2,9 @@ * * $RCSfile: oservices.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:23 $ + * last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ void REGISTER_PROVIDER( aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSHURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !"); + OSL_ENSURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !"); for (sal_uInt32 i=0; i<Services.getLength(); ++i) xNewKey->createKey(Services[i]); @@ -177,7 +177,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } catch (::com::sun::star::registry::InvalidRegistryException& ) { - OSL_ENSHURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); + OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); } return sal_False; |