1 files changed, 6 insertions, 20 deletions

diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 35e121c6bb7a..9c2734ede8f1 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -37,7 +37,7 @@ OAdoKey::OAdoKey(bool _bCase,OConnection* _pConnection, ADOKey* _pKey)
     ,m_pConnection(_pConnection)
 {
     construct();
-    m_aKey = WpADOKey(_pKey);
+    m_aKey.set(_pKey);
     fillPropertyValues();
 }
 
@@ -66,20 +66,6 @@ void OAdoKey::refreshColumns()
         m_pColumns.reset(new OColumns(*this, m_aMutex, aVector, aColumns, isCaseSensitive(), m_pConnection));
 }
 
-Sequence< sal_Int8 > OAdoKey::getUnoTunnelId()
-{
-    static const comphelper::UnoIdInit implId;
-    return implId.getSeq();
-}
-
-// css::lang::XUnoTunnel
-
-sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId )
-{
-    return comphelper::getSomethingImpl(rId, this,
-                                        comphelper::FallbackToGetSomethingOf<OKey_ADO>{});
-}
-
 void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if(m_aKey.IsValid())
@@ -91,7 +77,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
                     OUString aVal;
                     rValue >>= aVal;
                     m_aKey.put_Name(aVal);
-                    ADOS::ThrowException(*m_pConnection->getConnection(),*this);
+                    ADOS::ThrowException(m_pConnection->getConnection(),*this);
                 }
                 break;
             case PROPERTY_ID_TYPE:
@@ -99,7 +85,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
                     sal_Int32 nVal=0;
                     rValue >>= nVal;
                     m_aKey.put_Type(Map2KeyRule(nVal));
-                    ADOS::ThrowException(*m_pConnection->getConnection(),*this);
+                    ADOS::ThrowException(m_pConnection->getConnection(),*this);
                 }
                 break;
             case PROPERTY_ID_REFERENCEDTABLE:
@@ -107,7 +93,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
                     OUString aVal;
                     rValue >>= aVal;
                     m_aKey.put_RelatedTable(aVal);
-                    ADOS::ThrowException(*m_pConnection->getConnection(),*this);
+                    ADOS::ThrowException(m_pConnection->getConnection(),*this);
                 }
                 break;
             case PROPERTY_ID_UPDATERULE:
@@ -115,7 +101,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
                     sal_Int32 nVal=0;
                     rValue >>= nVal;
                     m_aKey.put_UpdateRule(Map2Rule(nVal));
-                    ADOS::ThrowException(*m_pConnection->getConnection(),*this);
+                    ADOS::ThrowException(m_pConnection->getConnection(),*this);
                 }
                 break;
             case PROPERTY_ID_DELETERULE:
@@ -123,7 +109,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
                     sal_Int32 nVal=0;
                     rValue >>= nVal;
                     m_aKey.put_DeleteRule(Map2Rule(nVal));
-                    ADOS::ThrowException(*m_pConnection->getConnection(),*this);
+                    ADOS::ThrowException(m_pConnection->getConnection(),*this);
                 }
                 break;
         }