summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-10 18:34:00 +0100
committerDavid Tardon <dtardon@redhat.com>2012-03-12 08:53:52 +0100
commit5511f8e05dbf971f3f4af89c9f42f0003a63c1a5 (patch)
tree674a3508fbfcbf15a448a3a7447617dfacfe5644 /connectivity
parent3bee1da46b18a6b5b9a25dbb266be2ee5972e80d (diff)
WaE: initialization order
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/ado/ACatalog.cxx2
-rw-r--r--connectivity/source/drivers/ado/AConnection.cxx6
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx2
-rw-r--r--connectivity/source/drivers/ado/AResultSet.cxx8
-rw-r--r--connectivity/source/drivers/ado/AStatement.cxx2
-rw-r--r--connectivity/source/inc/ado/ATables.hxx2
6 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index e2f46a70fdcd..0cb3a68e5b31 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -41,8 +41,8 @@ using namespace connectivity;
using namespace connectivity::ado;
// -------------------------------------------------------------------------
OCatalog::OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
- ,m_pConnection(_pCon)
,m_aCatalog(_pCatalog)
+ ,m_pConnection(_pCon)
{
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 94cab5d934f6..40c93b3d66b7 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -57,13 +57,13 @@ IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.sta
// --------------------------------------------------------------------------------
OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException)
: OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
- m_bClosed(sal_False),
m_xCatalog(NULL),
m_pDriver(_pDriver),
m_pAdoConnection(NULL),
- m_bAutocommit(sal_True),
+ m_pCatalog(NULL),
m_nEngineType(0),
- m_pCatalog(NULL)
+ m_bClosed(sal_False),
+ m_bAutocommit(sal_True)
{
osl_incrementInterlockedCount( &m_refCount );
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 356afab40676..ff703d051577 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -61,9 +61,9 @@ using namespace com::sun::star::sdbc;
ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet)
:ODatabaseMetaDataResultSet_BASE(m_aMutex)
,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper)
+ ,m_pRecordSet(_pRecordSet)
,m_aStatement(NULL)
,m_xMetaData(NULL)
- ,m_pRecordSet(_pRecordSet)
,m_bEOF(sal_False)
{
osl_incrementInterlockedCount( &m_refCount );
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 315545815292..4ba03a6f67fb 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -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)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
- ,m_xStatement(*pStmt)
+ ,m_pRecordSet(_pRecordSet)
,m_pStmt(pStmt)
- ,m_nRowPos(0)
+ ,m_xStatement(*pStmt)
,m_xMetaData(NULL)
- ,m_pRecordSet(_pRecordSet)
+ ,m_nRowPos(0)
,m_bEOF(sal_False)
{
}
// -------------------------------------------------------------------------
OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
+ ,m_pRecordSet(_pRecordSet)
,m_xStatement(NULL)
,m_xMetaData(NULL)
- ,m_pRecordSet(_pRecordSet)
,m_bEOF(sal_False)
{
}
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index ff75f75cddff..5d00d31106e5 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -65,8 +65,8 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(
,OPropertySetHelper(OStatement_BASE::rBHelper)
,OSubComponent<OStatement_Base, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this)
,m_pConnection(_pConnection)
- ,m_nFetchSize(1)
,m_nMaxRows(0)
+ ,m_nFetchSize(1)
,m_eLockType(adLockReadOnly)
,m_eCursorType(adOpenForwardOnly)
{
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 1548cd34f7f5..2feca48f16c3 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -53,8 +53,8 @@ namespace connectivity
const TStringVector &_rVector,
const WpADOTables& _rCollection,
sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector)
- ,m_pCatalog(_pParent)
,m_aCollection(_rCollection)
+ ,m_pCatalog(_pParent)
{
OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
}