Tag: cws_src680_dba24c User: fs Date: 2007-10-23 05:30:56+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: #i10000# (member initialization order) 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.19.22.3&r2=1.19.22.4 Delta lines: +12 -7 -------------------- --- ModelImpl.cxx 2007-10-22 20:59:29+0000 1.19.22.3 +++ ModelImpl.cxx 2007-10-23 05:30:54+0000 1.19.22.4 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.19.22.3 $ + * $Revision: 1.19.22.4 $ * - * last change: $Author: fs $ $Date: 2007/10/22 20:59:29 $ + * last change: $Author: fs $ $Date: 2007/10/23 05:30:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -315,10 +315,13 @@ ODatabaseModelImpl::ODatabaseModelImpl(const Reference< XMultiServiceFactory >& _rxFactory , const Reference< XModel>& _xModel) :m_xModel(_xModel) + ,m_xDataSource() ,m_pStorageAccess( NULL ) ,m_xMutex( new SharedMutex ) - ,m_xServiceFactory(_rxFactory) ,m_aContainer(4) + ,m_aStorages() + ,m_aMacroMode( *this ) + ,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) @@ -326,7 +329,6 @@ ,m_bModified(sal_False) ,m_bDocumentReadOnly(sal_False) ,m_bDisposingSubStorages( sal_False ) - ,m_aMacroMode( *this ) ,m_pDBContext(NULL) ,m_pSharedConnectionManager(NULL) ,m_refCount(0) @@ -347,10 +349,14 @@ const Reference< XMultiServiceFactory >& _rxFactory, ODatabaseContext* _pDBContext ) - :m_pStorageAccess( NULL ) + :m_xModel() + ,m_xDataSource() + ,m_pStorageAccess( NULL ) ,m_xMutex( new SharedMutex ) - ,m_xServiceFactory(_rxFactory) ,m_aContainer(4) + ,m_aStorages() + ,m_aMacroMode( *this ) + ,m_xServiceFactory(_rxFactory) ,m_sName(_rRegistrationName) ,m_nLoginTimeout(0) ,m_bReadOnly(sal_False) @@ -359,7 +365,6 @@ ,m_bModified(sal_False) ,m_bDocumentReadOnly(sal_False) ,m_bDisposingSubStorages( sal_False ) - ,m_aMacroMode( *this ) ,m_pDBContext(_pDBContext) ,m_pSharedConnectionManager(NULL) ,m_refCount(0) File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.15.22.3&r2=1.15.22.4 Delta lines: +3 -4 ------------------- --- ModelImpl.hxx 2007-10-22 20:59:29+0000 1.15.22.3 +++ ModelImpl.hxx 2007-10-23 05:30:54+0000 1.15.22.4 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.15.22.3 $ + * $Revision: 1.15.22.4 $ * - * last change: $Author: fs $ $Date: 2007/10/22 20:59:29 $ + * last change: $Author: fs $ $Date: 2007/10/23 05:30:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -163,7 +163,6 @@ public: OWeakConnectionArray m_aConnections; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; public: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
