1 files changed, 9 insertions, 25 deletions
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 2ba824d0afbd..0aff2b0aaba1 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -18,19 +18,15 @@
  */
 
 #include "querydescriptor.hxx"
-#include <apitools.hxx>
 #include <stringconstants.hxx>
+#include <strings.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
 using namespace ::osl;
 using namespace ::cppu;
 
@@ -64,7 +60,14 @@ css::uno::Sequence<sal_Int8> OQueryDescriptor::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
-IMPLEMENT_GETTYPES2(OQueryDescriptor,OQueryDescriptor_Base,ODataSettings);
+css::uno::Sequence< css::uno::Type > OQueryDescriptor::getTypes()
+{
+    return  ::comphelper::concatSequences(
+        OQueryDescriptor_Base::getTypes( ),
+        ODataSettings::getTypes( )
+    );
+}
+
 IMPLEMENT_FORWARD_XINTERFACE3( OQueryDescriptor,OWeakObject,OQueryDescriptor_Base,ODataSettings)
 
 void OQueryDescriptor::registerProperties()
@@ -138,25 +141,6 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base()
     m_pColumns->disposing();
 }
 
-sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier )
-{
-    if (isUnoTunnelId<OQueryDescriptor_Base>(_rIdentifier))
-        return reinterpret_cast<sal_Int64>(this);
-
-    return 0;
-}
-
-css::uno::Sequence<sal_Int8> OQueryDescriptor_Base::getUnoTunnelId()
-{
-    static cppu::OImplementationId aId;
-    return aId.getImplementationId();
-}
-
-css::uno::Sequence<sal_Int8> OQueryDescriptor_Base::getImplementationId()
-{
-    return css::uno::Sequence<sal_Int8>();
-}
-
 void OQueryDescriptor_Base::setColumnsOutOfDate( bool _bOutOfDate )
 {
     m_bColumnsOutOfDate = _bOutOfDate;