Tag: cws_src680_qiq User: fs Date: 2006/06/27 04:54:16 Modified: dba/dbaccess/source/core/api/RowSet.cxx
Log: RESYNC: (1.143-1.144); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.143.10.5&r2=1.143.10.6 Delta lines: +37 -38 --------------------- --- RowSet.cxx 16 Jun 2006 13:35:23 -0000 1.143.10.5 +++ RowSet.cxx 27 Jun 2006 11:54:13 -0000 1.143.10.6 @@ -263,26 +263,26 @@ ORowSet::ORowSet(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFac) : ORowSet_BASE1(m_aMutex) , ORowSetBase(ORowSet_BASE1::rBHelper,&m_aMutex) - , m_xServiceManager(_xFac) + ,m_xServiceManager(_xFac) ,m_aRowsetListeners(*m_pMutex) ,m_aApproveListeners(*m_pMutex) + ,m_pTables(NULL) ,m_nFetchDirection(FetchDirection::FORWARD) ,m_nFetchSize(1) - ,m_nCommandType(CommandType::COMMAND) ,m_nMaxFieldSize(0) - ,m_nTransactionIsolation(0) - ,m_nPrivileges(0) ,m_nMaxRows(0) ,m_nQueryTimeOut(0) + ,m_nCommandType(CommandType::COMMAND) + ,m_nTransactionIsolation(0) + ,m_nPrivileges(0) ,m_bUseEscapeProcessing(sal_True) ,m_bApplyFilter(sal_False) ,m_bCreateStatement(sal_True) ,m_bModified(sal_False) ,m_bRebuildConnOnExecute(sal_False) - ,m_bNew(sal_False) ,m_bIsBookmarable(sal_True) + ,m_bNew(sal_False) ,m_bCanUpdateInsertedRows(sal_True) - ,m_pTables(NULL) ,m_bOwnConnection(sal_False) { m_nResultSetType = ResultSetType::SCROLL_SENSITIVE; @@ -1481,28 +1481,28 @@ return ORowSetBase::getCharacterStream(columnIndex); } // ------------------------------------------------------------------------- -Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& typeMap ) throw(SQLException, RuntimeException) +Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex).makeAny(); } // ------------------------------------------------------------------------- -Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return Reference< XRef >(); } // ------------------------------------------------------------------------- -Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return Reference< XBlob >(); } // ------------------------------------------------------------------------- -Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return Reference< XClob >(); } // ------------------------------------------------------------------------- -Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return Reference< XArray >(); } @@ -1679,12 +1679,12 @@ } Reference< XParameters > xParam( m_xStatement, UNO_QUERY_THROW ); - sal_Int32 i = 1; + sal_Int32 index = 1; for ( ORowVector< ORowSetValue >::const_iterator aParam = m_aParameterRow.begin(); aParam != m_aParameterRow.end(); - ++aParam, ++i ) + ++aParam, ++index ) { - ::dbtools::setObjectWithInfo( xParam, i, aParam->makeAny(), aParam->getTypeKind() ); + ::dbtools::setObjectWithInfo( xParam, index, aParam->makeAny(), aParam->getTypeKind() ); } xResultSet = m_xStatement->executeQuery(); @@ -1722,7 +1722,7 @@ if ( m_aUpdateTableName.getLength() ) aComposedUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, m_aUpdateTableName, sal_False, ::dbtools::eInDataManipulation ); - m_pCache = new ORowSetCache(xResultSet,m_xComposer.get(),m_xServiceManager,m_aParameterRow,aComposedUpdateTableName,m_bModified,m_bNew); + m_pCache = new ORowSetCache(xResultSet,m_xComposer.get(),m_xServiceManager,aComposedUpdateTableName,m_bModified,m_bNew); if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY ) { m_nPrivileges = Privilege::SELECT; @@ -1773,10 +1773,10 @@ if(aColumnMap.find(sName) != aColumnMap.end()) { ::rtl::OUString sAlias(sName); - sal_Int32 i=1; + sal_Int32 searchIndex=1; while(aColumnMap.find(sAlias) != aColumnMap.end()) { - (sAlias = sName) += ::rtl::OUString::valueOf(i++); + (sAlias = sName) += ::rtl::OUString::valueOf(searchIndex++); } sName = sAlias; } @@ -2307,7 +2307,7 @@ } // ------------------------------------------------------------------------- // XParameters -void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(SQLException, RuntimeException) +void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aColumnsMutex ); checkAndResizeParameters(parameterIndex); @@ -2315,9 +2315,8 @@ m_aParameterRow[parameterIndex-1].setNull(); } // ------------------------------------------------------------------------- -void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aColumnsMutex ); checkAndResizeParameters(parameterIndex); m_aParameterRow[parameterIndex-1].setNull(); @@ -2440,7 +2439,7 @@ } } // ------------------------------------------------------------------------- -void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) +void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aColumnsMutex ); checkAndResizeParameters(parameterIndex); @@ -2448,24 +2447,24 @@ m_aParameterRow[parameterIndex-1].setTypeKind(targetSqlType); } // ------------------------------------------------------------------------- -void SAL_CALL ORowSet::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException) +void SAL_CALL ORowSet::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException) { - throw SQLException(); + ::dbtools::throwFeatureNotImplementedException( "XParameters::setRef", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL ORowSet::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException) +void SAL_CALL ORowSet::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException) { - throw SQLException(); + ::dbtools::throwFeatureNotImplementedException( "XParameters::setBlob", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL ORowSet::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException) +void SAL_CALL ORowSet::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException) { - throw SQLException(); + ::dbtools::throwFeatureNotImplementedException( "XParameters::setClob", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL ORowSet::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException) +void SAL_CALL ORowSet::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException) { - throw SQLException(); + ::dbtools::throwFeatureNotImplementedException( "XParameters::setArray", *this ); } // ------------------------------------------------------------------------- void SAL_CALL ORowSet::clearParameters( ) throw(SQLException, RuntimeException) @@ -2566,10 +2565,10 @@ ORowSetClone::ORowSetClone(ORowSet& rParent,::osl::Mutex* _pMutex) :OSubComponent(m_aMutex, rParent) ,ORowSetBase(OComponentHelper::rBHelper,_pMutex) + ,m_pParent(&rParent) ,m_nFetchDirection(rParent.m_nFetchDirection) ,m_nFetchSize(rParent.m_nFetchSize) ,m_bIsBookmarable(sal_True) - ,m_pParent(&rParent) { DBG_CTOR(ORowSetClone, NULL); @@ -2811,13 +2810,13 @@ } // ------------------------------------------------------------------------- -void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException) +void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException) { throwFunctionNotSupportedException( "RowSetClone::XRowSet", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException) +void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException) { throwFunctionNotSupportedException( "RowSetClone::XRowSet", *this ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
