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

[Noel Grandin]

 connectivity/source/drivers/ado/AIndex.cxx |   12 ++++++------
 connectivity/source/inc/ado/AIndex.hxx     |    4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 59a3d972d2909650506409eeb6d4a71fa263dc29
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Mar 18 08:08:34 2016 +0200

    replace typedef OIndex_ADO->sdbcx::OIndex
    
    Change-Id: Ib6ac581689f640811051623b17978bc5caa8c246
    Reviewed-on: https://gerrit.libreoffice.org/23351
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index f061df1..c81c0c7 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::sdbc;
 
 
 OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex)
-    : OIndex_ADO(OUString(),OUString(),sal_False,sal_False,sal_False,_bCase)
+    : sdbcx::OIndex(OUString(),OUString(),sal_False,sal_False,sal_False,_bCase)
     ,m_pConnection(_pConnection)
 {
     construct();
@@ -46,7 +46,7 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex
 }
 
 OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection)
-    : OIndex_ADO(_bCase)
+    : sdbcx::OIndex(_bCase)
     ,m_pConnection(_pConnection)
 {
     construct();
@@ -93,7 +93,7 @@ sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
-                : OIndex_ADO::getSomething(rId);
+                : sdbcx::OIndex::getSomething(rId);
 }
 
 void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
@@ -127,17 +127,17 @@ void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
                 break;
         }
     }
-    OIndex_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue);
+    sdbcx::OIndex::setFastPropertyValue_NoBroadcast(nHandle,rValue);
 }
 
 void SAL_CALL OAdoIndex::acquire() throw()
 {
-    OIndex_ADO::acquire();
+    sdbcx::OIndex::acquire();
 }
 
 void SAL_CALL OAdoIndex::release() throw()
 {
-    OIndex_ADO::release();
+    sdbcx::OIndex::release();
 }
 
 
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index e7c859a..9794d60 100644
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
@@ -28,10 +28,8 @@ namespace connectivity
 {
     namespace ado
     {
-        typedef sdbcx::OIndex OIndex_ADO;
-
         class OConnection;
-        class OAdoIndex :    public OIndex_ADO
+        class OAdoIndex : public sdbcx::OIndex
         {
             WpADOIndex      m_aIndex;
             OConnection*    m_pConnection;