User: hr Date: 06/06/19 19:43:15 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx
Log: INTEGRATION: CWS warnings01 (1.10.26); FILE MERGED 2006/04/07 20:46:18 sb 1.10.26.2: RESYNC: (1.10-1.12); FILE MERGED 2006/03/24 15:35:51 fs 1.10.26.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.12&r2=1.13 Delta lines: +17 -17 --------------------- --- ModelImpl.cxx 29 Mar 2006 12:32:40 -0000 1.12 +++ ModelImpl.cxx 20 Jun 2006 02:43:12 -0000 1.13 @@ -319,7 +319,7 @@ } //-------------------------------------------------------------------------- -void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& aEvent ) throw (Exception, RuntimeException) +void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException) { // not interested in } @@ -346,13 +346,13 @@ } //-------------------------------------------------------------------------- -void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& aEvent ) throw (Exception, RuntimeException) +void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException) { // not interested in } //-------------------------------------------------------------------------- -void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& aEvent ) throw (RuntimeException) +void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (RuntimeException) { // not interested in } @@ -382,22 +382,22 @@ //-------------------------------------------------------------------------- ODatabaseModelImpl::ODatabaseModelImpl(const Reference< XMultiServiceFactory >& _rxFactory , const Reference< XModel>& _xModel) - :m_xServiceFactory(_rxFactory) + :m_xModel(_xModel) + ,m_pStorageAccess( NULL ) + ,m_xMutex( new SharedMutex ) + ,m_xServiceFactory(_rxFactory) + ,m_nLoginTimeout(0) ,m_bReadOnly(sal_False) // we're created as service and have to allow the setting of properties ,m_bPasswordRequired(sal_False) ,m_bSuppressVersionColumns(sal_True) - ,m_pSharedConnectionManager(NULL) ,m_bModified(sal_False) ,m_bDocumentReadOnly(sal_False) ,m_bDisposingSubStorages( sal_False ) ,m_pDBContext(NULL) + ,m_pSharedConnectionManager(NULL) + ,m_refCount(0) ,m_nControllerLockCount(0) ,m_bOwnStorage(sal_False) - ,m_xModel(_xModel) - ,m_nLoginTimeout(0) - ,m_refCount(0) - ,m_pStorageAccess( NULL ) - ,m_xMutex( new SharedMutex ) { // some kind of default DBG_CTOR(ODatabaseModelImpl,NULL); @@ -413,22 +413,22 @@ const Reference< XMultiServiceFactory >& _rxFactory, ODatabaseContext* _pDBContext ) - :m_sName(_rRegistrationName) + :m_pStorageAccess( NULL ) + ,m_xMutex( new SharedMutex ) ,m_xServiceFactory(_rxFactory) + ,m_sName(_rRegistrationName) + ,m_nLoginTimeout(0) ,m_bReadOnly(sal_True) // assume readonly for the moment, adjusted below ,m_bPasswordRequired(sal_False) ,m_bSuppressVersionColumns(sal_True) - ,m_pSharedConnectionManager(NULL) ,m_bModified(sal_False) ,m_bDocumentReadOnly(sal_False) ,m_bDisposingSubStorages( sal_False ) ,m_pDBContext(_pDBContext) + ,m_pSharedConnectionManager(NULL) + ,m_refCount(0) ,m_nControllerLockCount(0) ,m_bOwnStorage(sal_False) - ,m_nLoginTimeout(0) - ,m_refCount(0) - ,m_pStorageAccess( NULL ) - ,m_xMutex( new SharedMutex ) { DBG_CTOR(ODatabaseModelImpl,NULL); // adjust our readonly flag --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
