Tag: cws_src680_dba204b User: fs Date: 2006/07/13 00:10:47 Modified: dba/dbaccess/source/core/api/RowSetBase.cxx
Log: RESYNC: (1.86-1.87); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.86.12.1&r2=1.86.12.2 Delta lines: +19 -16 --------------------- --- RowSetBase.cxx 10 Jul 2006 07:59:46 -0000 1.86.12.1 +++ RowSetBase.cxx 13 Jul 2006 07:10:44 -0000 1.86.12.2 @@ -482,7 +482,7 @@ checkCache(); - sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); if ( bRet ) { // check if we are inserting a row @@ -524,8 +524,8 @@ checkPositioningAllowed(); - sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); - if( bRet ) + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); + if ( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -627,7 +627,7 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkCache(); - sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); if ( bRet ) { // check if we are inserting a row @@ -833,8 +833,8 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); - sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); - if ( bRet ) + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); + if( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -927,7 +927,8 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); - sal_Bool bRet = row > 0 && notifyAllListenersCursorBeforeMove(aGuard) ; + sal_Bool bRet = ( row > 0 ) + && notifyAllListenersCursorBeforeMove( aGuard ); if ( bRet ) { // check if we are inserting a row @@ -976,9 +977,11 @@ checkPositioningAllowed(); - sal_Bool bRet = (!((m_bAfterLast && rows > 0) || (m_bBeforeFirst && rows < 0))) // we are already behind the last row or before the first - && notifyAllListenersCursorBeforeMove(aGuard); - + sal_Bool bRet = + ( ( !m_bAfterLast || rows <= 0 ) + && ( !m_bBeforeFirst || rows >= 0 ) + && notifyAllListenersCursorBeforeMove( aGuard ) + ); if ( bRet ) { @@ -1025,7 +1028,8 @@ checkPositioningAllowed(); - sal_Bool bRet = !m_bBeforeFirst && notifyAllListenersCursorBeforeMove(aGuard); + sal_Bool bRet = !m_bBeforeFirst + && notifyAllListenersCursorBeforeMove(aGuard); if ( bRet ) { @@ -1227,8 +1231,7 @@ DBG_TRACE2("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); OSL_ENSURE(m_pColumns,"Columns can not be NULL here!"); #if OSL_DEBUG_LEVEL > 1 - sal_Bool bNull = m_aCurrentRow.isNull(); - bNull = bNull; // avoid compiler warning :-) + sal_Bool bNull = m_aCurrentRow.isNull(); (void)bNull; ORowSetMatrix::iterator atest = m_aCurrentRow; #endif sal_Int32 i=0; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
