diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-17 08:05:19 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-17 08:07:22 +0200 |
| commit | f2ef6605e294d3a95dc1c9639e4c23245988e61a (patch) | |
| tree | abc5ec35015a2a0a79a4d5cacf2cd629de0dc042 | |
| parent | 30905e486b4c0b40b893a4c0a31e7e6daee28ffc (diff) | |
Make m_aMutex a member variable rather than base type.
Change-Id: I91491af582b57ae602b89a971ccbe5e4901834bf
| -rw-r--r-- | connectivity/source/drivers/firebird/FConnection.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/firebird/FConnection.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx index 5cb02006a97f..f9ba966540ee 100644 --- a/connectivity/source/drivers/firebird/FConnection.cxx +++ b/connectivity/source/drivers/firebird/FConnection.cxx @@ -85,7 +85,7 @@ using namespace ::com::sun::star::uno; const OUString OConnection::sDBLocation( "firebird.fdb" ); OConnection::OConnection(FirebirdDriver* _pDriver) - :OMetaConnection_BASE(m_aMutex), + :OConnection_BASE(m_aMutex), OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_xMetaData(NULL), m_bIsEmbedded(sal_False), diff --git a/connectivity/source/drivers/firebird/FConnection.hxx b/connectivity/source/drivers/firebird/FConnection.hxx index 789b724de242..67771f9094c7 100644 --- a/connectivity/source/drivers/firebird/FConnection.hxx +++ b/connectivity/source/drivers/firebird/FConnection.hxx @@ -77,13 +77,13 @@ namespace connectivity typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; - class OConnection : public OBase_Mutex, - public OConnection_BASE, + class OConnection : public OConnection_BASE, public connectivity::OSubComponent<OConnection, OConnection_BASE> { friend class connectivity::OSubComponent<OConnection, OConnection_BASE>; protected: + ::osl::Mutex m_aMutex; static const OUString sDBLocation; // Location within .odb container rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions //==================================================================== |