User: obo Date: 05/03/18 02:05:03 Modified: /dba/dbaccess/source/core/api/ RowSetBase.cxx
Log: INTEGRATION: CWS dba25 (1.73.50); FILE MERGED 2005/03/14 13:22:13 fs 1.73.50.2: RESYNC: (1.73-1.74); FILE MERGED 2005/03/02 09:45:33 oj 1.73.50.1: #i43849# fix events when moving 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.74&r2=1.75 Delta lines: +13 -13 --------------------- --- RowSetBase.cxx 10 Mar 2005 16:31:23 -0000 1.74 +++ RowSetBase.cxx 18 Mar 2005 10:05:00 -0000 1.75 @@ -622,9 +622,11 @@ if ( m_aBookmark.hasValue() ) // #104474# OJ positionCache(); + sal_Bool bAfterLast = m_pCache->isAfterLast(); bRet = m_pCache->next(); - if ( bRet ) + + if ( bRet || bAfterLast != m_pCache->isAfterLast() ) { // notification order // - column values @@ -734,25 +736,23 @@ ORowSetNotifier aNotifier( this ); // this will call cancelRowModification on the cache if necessary - ORowSetRow aOldValues = getOldRow(bWasNew); - - if(!m_bBeforeFirst) + if ( !m_bBeforeFirst ) { + ORowSetRow aOldValues = getOldRow(bWasNew); m_pCache->beforeFirst(); - m_aBookmark = Any(); - m_aCurrentRow = m_pCache->getEnd(); - m_aCurrentRow.setBookmark(m_aBookmark); - m_bBeforeFirst = !(m_bAfterLast = sal_False); // notification order // - column values // - cursorMoved setCurrentRow(sal_True,aOldValues,aGuard); - } // - IsModified - // - IsNew + // - Isnew aNotifier.fire(); + + // - RowCount/IsRowCountFinal + fireRowcount(); + } // to be done _after_ the notifications! m_aOldRow->clearRow(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
