diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-10 18:42:46 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-12 08:53:53 +0100 |
| commit | 623f9a6e42cb045ef40ff39c9555fb45f48c2d9c (patch) | |
| tree | 4ebb49f4ee1191bb89854bcc88e71e39257ada73 /connectivity | |
| parent | WaE: enumeral and non-enumeral type in conditional expression (diff) | |
| download | core-623f9a6e42cb045ef40ff39c9555fb45f48c2d9c.tar.gz core-623f9a6e42cb045ef40ff39c9555fb45f48c2d9c.zip | |
WaE: declaration of 'first' shadows a member of 'this'
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/ado/AResultSet.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 3c83cc0acad3..e36ef0a89c00 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -878,15 +878,15 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos])); } //------------------------------------------------------------------------------ -sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& first, const Any& second ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); sal_Int32 nPos1; - first >>= nPos1; + bookmark1 >>= nPos1; sal_Int32 nPos2; - second >>= nPos2; + bookmark2 >>= nPos2; if(nPos1 == nPos2) // they should be equal return sal_True; |