User: hr      
Date: 06/01/25 07:10:09

Modified:
 /dba/dbaccess/source/core/api/
  RowSet.hxx

Log:
 INTEGRATION: CWS rowsetdel (1.41.74); FILE MERGED
 2006/01/20 12:09:18 fs 1.41.74.3: #i55731# slightly corrected 
onDeleteRow/onDeletedRow
 2006/01/20 09:02:49 fs 1.41.74.2: #i55731# deletion of rows even more refined
 2006/01/16 10:12:37 fs 1.41.74.1: #i55731# fixed the handling when deleting 
records

File Changes:

Directory: /dba/dbaccess/source/core/api/
=========================================

File [changed]: RowSet.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.hxx?r1=1.41&r2=1.42
Delta lines:  +17 -25
---------------------
--- RowSet.hxx  8 Sep 2005 10:00:41 -0000       1.41
+++ RowSet.hxx  25 Jan 2006 15:10:07 -0000      1.42
@@ -159,19 +159,12 @@
                sal_Int32                                       m_nCommandType;
                sal_Int32                                       
m_nTransactionIsolation;
                sal_Int32                                       m_nPrivileges;
-               sal_Int32                                       
m_nAsyncUpdateRowCount;
+        sal_Int32                   m_nLastKnownRowCount;
+        sal_Bool                    m_bLastKnownRowCountFinal;
                sal_Bool                                        
m_bUseEscapeProcessing ;
                sal_Bool                                        m_bApplyFilter ;
-               sal_Bool                                        m_bFirst ;
-               sal_Bool                                        m_bLast ;
                sal_Bool                                        
m_bCreateStatement ;    // determines we to create a new prepared statement
-               sal_Bool                                        m_bDeleted ;
-               sal_Bool                                        m_bInserted ;
-               sal_Bool                                        m_bUpdated ;
-               sal_Bool                                        
m_bOwnsResultRow ;
-               sal_Bool                                        m_bRowObsolete ;
                sal_Bool                                        m_bModified ;
-               sal_Bool                                        m_bCanceled ;
                sal_Bool                                        
m_bRebuildConnOnExecute ;
                sal_Bool                                        
m_bIsBookmarable ;
                sal_Bool                                        m_bNew ;
@@ -188,10 +181,13 @@
                // fire a change for one column
                // _nPos starts at zero
                void firePropertyChange(sal_Int32 _nPos,const 
::connectivity::ORowSetValue& _rNewValue);
-               // inform the clones that we have deleted some records
-               void notifyClonesRowDeleted(const ::com::sun::star::uno::Any& 
_rBookmark);
-               // inform the clones that we will delete some records
-               void notifyClonesRowDelete(const ::com::sun::star::uno::Any& 
_rBookmark);
+
+        /// informs the clones (and ourself) that we are going to delete a 
record with a given bookmark
+               void notifyRowSetAndClonesRowDelete( const 
::com::sun::star::uno::Any& _rBookmark );
+
+        /// inform the clones (and ourself) that we have deleted a record with 
a given bookmark
+               void notifyRowSetAndClonesRowDeleted( const 
::com::sun::star::uno::Any& _rBookmark, sal_Int32 _nPos );
+
                void checkUpdateIterator();
                const connectivity::ORowSetValue& getInsertValue(sal_Int32 
columnIndex);
                void setParameter(sal_Int32 parameterIndex, const 
connectivity::ORowSetValue& x);
@@ -206,8 +202,8 @@
                virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( 
sal_Int32 _nHandle ) const;
 
                virtual void fireRowcount();
-               virtual sal_Bool 
notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rGuard,const 
::com::sun::star::sdb::RowChangeEvent &rEvt);
-               virtual void 
notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,const 
::com::sun::star::sdb::RowChangeEvent &rEvt);
+                       void 
notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rGuard,const 
::com::sun::star::sdb::RowChangeEvent &rEvt);
+                       void 
notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,const 
::com::sun::star::lang::EventObject& rEvt);
                virtual sal_Bool 
notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard);
                virtual void 
notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard);
                virtual void notifyAllListeners(::osl::ResettableMutexGuard& 
_rGuard);
@@ -403,10 +399,6 @@
                sal_Int32                                       
m_nFetchDirection;
                sal_Int32                                       m_nFetchSize;
                sal_Bool                                        
m_bIsBookmarable;
-               sal_Bool                                        m_bFirst : 1;
-               sal_Bool                                        m_bLast : 1;
-               sal_Bool                                        m_bRowObsolete 
: 1;
-               sal_Bool                                        m_bDeleted : 1;
 
        protected:
                // the clone can not insert anything
@@ -453,16 +445,16 @@
                        return 
::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
                }
 
+       // ::com::sun::star::sdbc::XRowSet
+               virtual void SAL_CALL execute(  ) 
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException);
+               virtual void SAL_CALL addRowSetListener( const 
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener >& 
listener ) throw(::com::sun::star::uno::RuntimeException);
+               virtual void SAL_CALL removeRowSetListener( const 
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener >& 
listener ) throw(::com::sun::star::uno::RuntimeException);
+
        // comphelper::OPropertyArrayUsageHelper
                virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) 
const;
 
        // cppu::OPropertySetHelper
                virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-
-               // is called when the rowset is going to delete this bookmark 
_rBookmark
-               void rowDelete(const ::com::sun::star::uno::Any& _rBookmark);
-               // is called when the rowset has deleted this bookmark 
_rBookmark
-               void rowDeleted(const ::com::sun::star::uno::Any& _rBookmark);
        };
 
 }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to