User: rt Date: 2008-01-30 08:29:20+0000 Modified: dba/dbaccess/source/core/api/RowSet.hxx
Log: INTEGRATION: CWS dba24d (1.48.70); FILE MERGED 2007/12/04 09:24:09 oj 1.48.70.3: #i81644# add new common var to block elementInserted events 2007/12/01 13:39:05 fs 1.48.70.2: RESYNC: (1.48-1.49); FILE MERGED 2007/11/22 13:09:41 fs 1.48.70.1: #i81658# moved the DBA services to use the helpers in unotools/componentresmodule resp. comphelper/componentmodule. Those helpers allow for old- and new-style singletons to co-exist, which wasn't the case for the old helpers previously found in dba_reghelper.hxx 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.49&r2=1.50 Delta lines: +4 -3 ------------------- --- RowSet.hxx 2007-11-21 15:32:12+0000 1.49 +++ RowSet.hxx 2008-01-30 08:29:17+0000 1.50 @@ -166,6 +166,7 @@ sal_Int32 m_nTransactionIsolation; sal_Int32 m_nPrivileges; sal_Int32 m_nLastKnownRowCount; + oslInterlockedCount m_nInAppend; sal_Bool m_bLastKnownRowCountFinal; sal_Bool m_bUseEscapeProcessing ; sal_Bool m_bApplyFilter ; @@ -305,10 +306,10 @@ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // OComponentHelper virtual void SAL_CALL disposing(void); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
