User: obo Date: 2006/07/10 08:03:40 Modified: dba/dbaccess/source/core/api/RowSetBase.cxx
Log: INTEGRATION: CWS qiq (1.86.2); FILE MERGED 2006/06/30 13:26:01 fs 1.86.2.1: warning-free code 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&r2=1.87 Delta lines: +21 -16 --------------------- --- RowSetBase.cxx 20 Jun 2006 02:36:00 -0000 1.86 +++ RowSetBase.cxx 10 Jul 2006 15:03:37 -0000 1.87 @@ -468,8 +468,8 @@ checkCache(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard)) + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); + if ( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -510,8 +510,8 @@ checkPositioningAllowed(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard)) + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); + if ( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -613,8 +613,8 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkCache(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard)) + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); + if ( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -819,8 +819,8 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard) ) + sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); + if( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -913,8 +913,9 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); - sal_Bool bRet = row > 0; - if ( bRet && (bRet = notifyAllListenersCursorBeforeMove(aGuard)) ) + sal_Bool bRet = ( row > 0 ) + && notifyAllListenersCursorBeforeMove( aGuard ); + if ( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -962,10 +963,13 @@ checkPositioningAllowed(); - sal_Bool bRet =!((m_bAfterLast && rows > 0) || (m_bBeforeFirst && rows < 0)); // we are already behind the last row or before the first + sal_Bool bRet = + ( ( !m_bAfterLast || rows <= 0 ) + && ( !m_bBeforeFirst || rows >= 0 ) + && notifyAllListenersCursorBeforeMove( aGuard ) + ); - - if(bRet && (bRet = notifyAllListenersCursorBeforeMove(aGuard))) + if ( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -1010,9 +1014,10 @@ checkPositioningAllowed(); - sal_Bool bRet = !m_bBeforeFirst; + sal_Bool bRet = !m_bBeforeFirst + && notifyAllListenersCursorBeforeMove(aGuard); - if(bRet && (bRet = notifyAllListenersCursorBeforeMove(aGuard))) + if ( bRet ) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -1209,7 +1214,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(); + 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]
