User: hr Date: 06/01/25 05:42:24 Modified: /dba/dbaccess/source/core/api/ CRowSetDataColumn.cxx
Log: INTEGRATION: CWS stlusagefix01 (1.30.16); FILE MERGED 2006/01/16 13:47:15 oj 1.30.16.1: #i60480# fix stl usage File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: CRowSetDataColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CRowSetDataColumn.cxx?r1=1.30&r2=1.31 Delta lines: +4 -6 ------------------- --- CRowSetDataColumn.cxx 19 Dec 2005 17:13:32 -0000 1.30 +++ CRowSetDataColumn.cxx 25 Jan 2006 13:42:21 -0000 1.31 @@ -76,12 +76,10 @@ sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, - const ORowSetCacheIterator& _rColumnValue, - ORowSetMatrix::iterator& _rEnd) + const ORowSetCacheIterator& _rColumnValue) : ODataColumn(_xMetaData,_xRow,_xRowUpdate,_nPos,_rxDBMeta) ,m_aDescription(_rDescription) ,m_aColumnValue(_rColumnValue) - ,m_rEnd(_rEnd) { DBG_CTOR(ORowSetDataColumn,NULL); } @@ -155,7 +153,7 @@ OColumnSettings::getFastPropertyValue( rValue, nHandle ); break; case PROPERTY_ID_VALUE: - if(!m_aColumnValue.isNull() && m_aColumnValue != m_rEnd && m_aColumnValue->isValid()) + if ( !m_aColumnValue.isNull() && m_aColumnValue->isValid() ) { ORowSetRow aRow = *m_aColumnValue; OSL_ENSURE((sal_Int32)aRow->size() > m_nPos,"Pos is greater than size of vector"); @@ -237,7 +235,7 @@ // ------------------------------------------------------------------------- void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue) { - if(!m_aColumnValue.isNull() && m_aColumnValue != m_rEnd && m_aColumnValue->isValid() && (!((*(*m_aColumnValue))[m_nPos] == _rOldValue))) + if ( !m_aColumnValue.isNull() && m_aColumnValue->isValid() && (!((*(*m_aColumnValue))[m_nPos] == _rOldValue)) ) { sal_Int32 nHandle = PROPERTY_ID_VALUE; m_aOldValue = _rOldValue.makeAny(); @@ -245,7 +243,7 @@ fire(&nHandle, &aNew, &m_aOldValue, 1, sal_False ); } - else if ( !m_aColumnValue.isNull() && m_aColumnValue == m_rEnd && !_rOldValue.isNull() ) + else if ( !m_aColumnValue.isNull() && !_rOldValue.isNull() ) { sal_Int32 nHandle = PROPERTY_ID_VALUE; m_aOldValue = _rOldValue.makeAny(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
