Skip to content

C
core
Kaydet (Commit) f2ef6605 authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt
Dosyalara gözat
Seçenekler

Make m_aMutex a member variable rather than base type. 

Change-Id: I91491af582b57ae602b89a971ccbe5e4901834bf
üst 30905e48
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
connectivity/source/drivers/firebird/FConnection.cxx
Dosyayı görüntüle @ f2ef6605
...@@ -85,7 +85,7 @@ using namespace ::com::sun::star::uno; ...@@ -85,7 +85,7 @@ using namespace ::com::sun::star::uno;
const OUString OConnection::sDBLocation( "firebird.fdb" ); const OUString OConnection::sDBLocation( "firebird.fdb" );
OConnection::OConnection(FirebirdDriver* _pDriver) OConnection::OConnection(FirebirdDriver* _pDriver)
:OMetaConnection_BASE(m_aMutex), :OConnection_BASE(m_aMutex),
OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
m_xMetaData(NULL), m_xMetaData(NULL),
m_bIsEmbedded(sal_False), m_bIsEmbedded(sal_False),
......
connectivity/source/drivers/firebird/FConnection.hxx
Dosyayı görüntüle @ f2ef6605
...@@ -77,13 +77,13 @@ namespace connectivity ...@@ -77,13 +77,13 @@ namespace connectivity
typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector;
typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
class OConnection : public OBase_Mutex, class OConnection : public OConnection_BASE,
public OConnection_BASE,
public connectivity::OSubComponent<OConnection, OConnection_BASE> public connectivity::OSubComponent<OConnection, OConnection_BASE>
{ {
friend class connectivity::OSubComponent<OConnection, OConnection_BASE>; friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
protected: protected:
::osl::Mutex m_aMutex;
static const OUString sDBLocation; // Location within .odb container static const OUString sDBLocation; // Location within .odb container
rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions
//==================================================================== //====================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment