2 files changed, 43 insertions, 11 deletions
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 7c77cbe667d9..d962af6052d3 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -271,15 +271,28 @@ PropertyValueSet::~PropertyValueSet()
 
 
 // XInterface methods.
+void SAL_CALL PropertyValueSet::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL PropertyValueSet::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_3( PropertyValueSet,
-                   XTypeProvider,
-                   XRow,
-                   XColumnLocate );
-
-
+css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< XTypeProvider* >(this)),
+                                               (static_cast< XRow* >(this)),
+                                               (static_cast< XColumnLocate* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index 2678099b8b35..21dcd08d1bb5 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -89,10 +89,29 @@ ContentProviderImplHelper::~ContentProviderImplHelper()
     delete m_pImpl;
 }
 
-XINTERFACE_IMPL_3( ContentProviderImplHelper,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   com::sun::star::ucb::XContentProvider );
+// XInterface
+void SAL_CALL ContentProviderImplHelper::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL ContentProviderImplHelper::release()
+    throw()
+{
+    OWeakObject::release();
+}
+
+css::uno::Any SAL_CALL ContentProviderImplHelper::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< lang::XTypeProvider* >(this)),
+                                               (static_cast< lang::XServiceInfo* >(this)),
+                                               (static_cast< css::ucb::XContentProvider* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
                          lang::XTypeProvider,