User: hr Date: 06/06/19 18:25:55 Modified: /dba/connectivity/source/drivers/file/ FPreparedStatement.cxx
Log: INTEGRATION: CWS warnings01 (1.35.10); FILE MERGED 2005/12/22 11:44:43 fs 1.35.10.4: #i57457# warning-free code 2005/11/16 12:59:01 fs 1.35.10.3: #i57457# warning free code 2005/11/07 19:07:00 pl 1.35.10.2: RESYNC: (1.35-1.36); FILE MERGED 2005/11/07 14:43:30 fs 1.35.10.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FPreparedStatement.cxx?r1=1.36&r2=1.37 Delta lines: +29 -22 --------------------- --- FPreparedStatement.cxx 23 Sep 2005 11:38:35 -0000 1.36 +++ FPreparedStatement.cxx 20 Jun 2006 01:25:53 -0000 1.37 @@ -71,6 +71,9 @@ #ifndef _CONNECTIVITY_PCOLUMN_HXX_ #include "connectivity/PColumn.hxx" #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif @@ -299,13 +302,13 @@ } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 aVal ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException) { - throwInvalidIndexException(*this); + throwFeatureNotImplementedException( "XParameters::setLong", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkAndResizeParameters(parameterIndex); @@ -317,27 +320,27 @@ } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException) { - throwInvalidIndexException(*this); + throwFeatureNotImplementedException( "XParameters::setClob", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException) { - throwInvalidIndexException(*this); + throwFeatureNotImplementedException( "XParameters::setBlob", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException) { - throwInvalidIndexException(*this); + throwFeatureNotImplementedException( "XParameters::setArray", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException) { - throwInvalidIndexException(*this); + throwFeatureNotImplementedException( "XParameters::setRef", *this ); } // ------------------------------------------------------------------------- @@ -347,18 +350,18 @@ } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 /*parameterIndex*/, const Any& /*x*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - throwInvalidIndexException(*this); + throwFeatureNotImplementedException( "XParameters::setObject", *this ); // setObject (parameterIndex, x, sqlType, 0); } // ------------------------------------------------------------------------- @@ -466,9 +469,13 @@ // ----------------------------------------------------------------------------- UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol) { + OSL_UNUSED( pParameter ); OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument ist kein Parameter"); OSL_ENSURE(pParameter->count() > 0,"OResultSet: Fehler im Parse Tree"); +#if OSL_DEBUG_LEVEL > 0 OSQLParseNode * pMark = pParameter->getChild(0); + OSL_UNUSED( pMark ); +#endif ::rtl::OUString sParameterName; // Parameter-Column aufsetzen: @@ -556,8 +563,8 @@ USHORT nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an // Nach zu substituierenden Parametern suchen: - UINT16 nCount = m_aAssignValues.isValid() ? m_aAssignValues->size() : 1; // 1 ist wichtig fuer die Kriterien - for (UINT16 j = 1; j < nCount; j++) + size_t nCount = m_aAssignValues.isValid() ? m_aAssignValues->size() : 1; // 1 ist wichtig fuer die Kriterien + for (size_t j = 1; j < nCount; j++) { UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j); if (nParameter == SQL_NO_PARAMETER) @@ -572,9 +579,9 @@ if (m_aParameterRow.isValid() && (m_xParamColumns->size()+1) != m_aParameterRow->size() ) { sal_Int32 i = m_aParameterRow->size(); - sal_Int32 nCount = m_xParamColumns->size()+1; - m_aParameterRow->resize(nCount); - for ( ;i <= nCount; ++i ) + sal_Int32 nParamColumns = m_xParamColumns->size()+1; + m_aParameterRow->resize(nParamColumns); + for ( ;i <= nParamColumns; ++i ) { if ( !(*m_aParameterRow)[i].isValid() ) (*m_aParameterRow)[i] = new ORowSetValueDecorator; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
