[Libreoffice-commits] core.git: connectivity/source

[Andrzej J.R. Hunt]

 connectivity/source/drivers/firebird/FConnection.cxx |    2 +-
 connectivity/source/drivers/firebird/FConnection.hxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f2ef6605e294d3a95dc1c9639e4c23245988e61a
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Wed Jul 17 08:05:19 2013 +0200

    Make m_aMutex a member variable rather than base type.
    
    Change-Id: I91491af582b57ae602b89a971ccbe5e4901834bf

diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx
index 5cb0200..f9ba966 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 789b724..67771f9 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
             //====================================================================