mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: initialization order

Browse Source
This commit is contained in:
David Tardon
2012-03-10 18:34:00 +01:00
parent 3bee1da46b
commit 5511f8e05d
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/source/drivers/ado/ACatalog.cxx
View File

@@ -41,8 +41,8 @@ using namespace connectivity;
using namespace connectivity::ado; using namespace connectivity::ado;
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
OCatalog::OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) OCatalog::OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
,m_pConnection(_pCon)
,m_aCatalog(_pCatalog) ,m_aCatalog(_pCatalog)
,m_pConnection(_pCon)
{ {
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

6
connectivity/source/drivers/ado/AConnection.cxx
View File

@@ -57,13 +57,13 @@ IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.sta
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException)
: OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
m_bClosed(sal_False),
m_xCatalog(NULL), m_xCatalog(NULL),
m_pDriver(_pDriver), m_pDriver(_pDriver),
m_pAdoConnection(NULL), m_pAdoConnection(NULL),
m_bAutocommit(sal_True), m_pCatalog(NULL),
m_nEngineType(0), m_nEngineType(0),
m_pCatalog(NULL) m_bClosed(sal_False),
m_bAutocommit(sal_True)
{ {
osl_incrementInterlockedCount( &m_refCount ); osl_incrementInterlockedCount( &m_refCount );

2
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
View File

@@ -61,9 +61,9 @@ using namespace com::sun::star::sdbc;
ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet) ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet)
:ODatabaseMetaDataResultSet_BASE(m_aMutex) :ODatabaseMetaDataResultSet_BASE(m_aMutex)
,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper) ,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_pRecordSet(_pRecordSet)
,m_aStatement(NULL) ,m_aStatement(NULL)
,m_xMetaData(NULL) ,m_xMetaData(NULL)
,m_pRecordSet(_pRecordSet)
,m_bEOF(sal_False) ,m_bEOF(sal_False)
{ {
osl_incrementInterlockedCount( &m_refCount ); osl_incrementInterlockedCount( &m_refCount );

10
connectivity/source/drivers/ado/AResultSet.cxx
View File

@@ -87,20 +87,20 @@ sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceN
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex) OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper) ,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_xStatement(*pStmt)
,m_pStmt(pStmt)
,m_nRowPos(0)
,m_xMetaData(NULL)
,m_pRecordSet(_pRecordSet) ,m_pRecordSet(_pRecordSet)
,m_pStmt(pStmt)
,m_xStatement(*pStmt)
,m_xMetaData(NULL)
,m_nRowPos(0)
,m_bEOF(sal_False) ,m_bEOF(sal_False)
{ {
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex) OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper) ,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_pRecordSet(_pRecordSet)
,m_xStatement(NULL) ,m_xStatement(NULL)
,m_xMetaData(NULL) ,m_xMetaData(NULL)
,m_pRecordSet(_pRecordSet)
,m_bEOF(sal_False) ,m_bEOF(sal_False)
{ {
} }

2
connectivity/source/drivers/ado/AStatement.cxx
View File

@@ -65,8 +65,8 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(
,OPropertySetHelper(OStatement_BASE::rBHelper) ,OPropertySetHelper(OStatement_BASE::rBHelper)
,OSubComponent<OStatement_Base, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this) ,OSubComponent<OStatement_Base, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this)
,m_pConnection(_pConnection) ,m_pConnection(_pConnection)
,m_nFetchSize(1)
,m_nMaxRows(0) ,m_nMaxRows(0)
,m_nFetchSize(1)
,m_eLockType(adLockReadOnly) ,m_eLockType(adLockReadOnly)
,m_eCursorType(adOpenForwardOnly) ,m_eCursorType(adOpenForwardOnly)
{ {

2
connectivity/source/inc/ado/ATables.hxx
View File

@@ -53,8 +53,8 @@ namespace connectivity
const TStringVector &_rVector, const TStringVector &_rVector,
const WpADOTables& _rCollection, const WpADOTables& _rCollection,
sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector)
,m_pCatalog(_pParent)
,m_aCollection(_rCollection) ,m_aCollection(_rCollection)
,m_pCatalog(_pParent)
{ {
OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
} }