2 files changed, 31 insertions, 7 deletions
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index d8e34acce752..fb6d33239c41 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -270,10 +270,23 @@ XTYPEPROVIDER_IMPL_9( ResultSet,
 
 // XServiceInfo methods.
 
+OUString SAL_CALL ResultSet::getImplementationName()
+    throw( css::uno::RuntimeException, std::exception )
+{
+    return OUString( "ResultSet" );
+}
+
+sal_Bool SAL_CALL ResultSet::supportsService( const OUString& ServiceName )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    return cppu::supportsService( this, ServiceName );
+}
 
-XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet,
-                    OUString("ResultSet"),
-                    RESULTSET_SERVICE_NAME );
+css::uno::Sequence< OUString > SAL_CALL ResultSet::getSupportedServiceNames()
+    throw( css::uno::RuntimeException, std::exception )
+{
+    return { RESULTSET_SERVICE_NAME };
+}
 
 
 // XComponent methods.
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 98a3a09545f9..37a131011df4 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -100,12 +100,23 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
 
 // XServiceInfo methods.
 
+OUString SAL_CALL ResultSetImplHelper::getImplementationName()
+    throw( css::uno::RuntimeException, std::exception )
+{
+    return OUString( "ResultSetImplHelper" );
+}
 
-XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper,
-                               OUString(
-                                   "ResultSetImplHelper" ),
-                               DYNAMICRESULTSET_SERVICE_NAME );
+sal_Bool SAL_CALL ResultSetImplHelper::supportsService( const OUString& ServiceName )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    return cppu::supportsService( this, ServiceName );
+}
 
+css::uno::Sequence< OUString > SAL_CALL ResultSetImplHelper::getSupportedServiceNames()
+    throw( css::uno::RuntimeException, std::exception )
+{
+    return { DYNAMICRESULTSET_SERVICE_NAME };
+}
 
 // XComponent methods.