de-macroize QUERYINTERFACE_IMPL_START QUERYINTERFACE_IMPL_END

Change-Id: I152d82e34446111cead4b060f789260552d5920d

include/ucbhelper/macros.hxx

@@ -66,12 +66,8 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface(                    \
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );   \
 }
 
-
-
 // XInterface impl.
 
-
-
 // 2 interfaces implemented
 #define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 )                              \
 XINTERFACE_COMMON_IMPL( Class )                                             \

ucb/source/cacher/contentresultsetwrapper.cxx

@@ -338,20 +338,21 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
 // XInterface methods.
 
-//list all interfaces inclusive baseclasses of interfaces
-QUERYINTERFACE_IMPL_START( ContentResultSetWrapper )
-
-    (static_cast< XComponent* >(this)),
-    (static_cast< XCloseable* >(this)),
-    (static_cast< XResultSetMetaDataSupplier* >(this)),
-    (static_cast< XPropertySet* >(this)),
-
-    (static_cast< XContentAccess* >(this)),
-    (static_cast< XResultSet* >(this)),
-    (static_cast< XRow* >(this))
-
-QUERYINTERFACE_IMPL_END
-
+css::uno::Any SAL_CALL ContentResultSetWrapper::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    //list all interfaces inclusive baseclasses of interfaces
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< XComponent* >(this)),
+                                               (static_cast< XCloseable* >(this)),
+                                               (static_cast< XResultSetMetaDataSupplier* >(this)),
+                                               (static_cast< XPropertySet* >(this)),
+                                               (static_cast< XContentAccess* >(this)),
+                                               (static_cast< XResultSet* >(this)),
+                                               (static_cast< XRow* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XComponent methods.
 

ucb/source/cacher/dynamicresultsetwrapper.cxx

@@ -121,16 +121,18 @@ void SAL_CALL DynamicResultSetWrapper
     m_xMyResultTwo = xResultSet;
 }
 
-
 // XInterface methods.
-
-//list all interfaces inclusive baseclasses of interfaces
-QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper )
-    (static_cast< XComponent* >(this)) //base of XDynamicResultSet
-    , (static_cast< XDynamicResultSet* >(this))
-    , (static_cast< XSourceInitialization* >(this))
-QUERYINTERFACE_IMPL_END
-
+css::uno::Any SAL_CALL DynamicResultSetWrapper::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    //list all interfaces inclusive baseclasses of interfaces
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< XComponent* >(this)), //base of XDynamicResultSet
+                                               (static_cast< XDynamicResultSet* >(this)),
+                                               (static_cast< XSourceInitialization* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XComponent methods.