1 files changed, 4 insertions, 6 deletions
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index a3bc953d93b4..3424801e3842 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -32,7 +32,6 @@
 #include <strings.hrc>
 #include <connectivity/dbexception.hxx>
 
-using namespace ::comphelper;
 using namespace connectivity;
 using namespace connectivity::dbase;
 using namespace connectivity::file;
@@ -40,7 +39,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
 sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName)
@@ -65,10 +63,10 @@ Reference< XPropertySet > ODbaseTables::createDescriptor()
 // XAppend
 sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
-    auto pTable = comphelper::getFromUnoTunnel<ODbaseTable>(descriptor);
+    auto pTable = dynamic_cast<ODbaseTable*>(descriptor.get());
     if(pTable)
     {
-        pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(_rForName));
+        pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),Any(_rForName));
         try
         {
             if(!pTable->CreateImpl())
@@ -90,7 +88,7 @@ sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const R
 // XDrop
 void ODbaseTables::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
 {
-    Reference< XUnoTunnel> xTunnel;
+    Reference< XInterface > xTunnel;
     try
     {
         xTunnel.set(getObject(_nPos),UNO_QUERY);
@@ -103,7 +101,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
 
     if ( xTunnel.is() )
     {
-        ODbaseTable* pTable = comphelper::getFromUnoTunnel<ODbaseTable>(xTunnel);
+        ODbaseTable* pTable = dynamic_cast<ODbaseTable*>(xTunnel.get());
         if(pTable)
             pTable->DropImpl();
     }