kill XINTERFACE_IMPL_3

Change-Id: I72448b67ae52e89c206f9c313b3d351ae2a56dc3

14 files changed, 286 insertions, 83 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 15912091e074..a59cdf4f1542 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2201,13 +2201,28 @@ CachedContentResultSetFactory::~CachedContentResultSetFactory()
 
 
 // CachedContentResultSetFactory XInterface methods.
+void SAL_CALL CachedContentResultSetFactory::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL CachedContentResultSetFactory::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_3( CachedContentResultSetFactory,
-                   XTypeProvider,
-                   XServiceInfo,
-                   XCachedContentResultSetFactory );
-
+css::uno::Any SAL_CALL CachedContentResultSetFactory::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< XServiceInfo* >(this)),
+                                               (static_cast< XCachedContentResultSetFactory* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // CachedContentResultSetFactory XTypeProvider methods.
 
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 98653b180e85..ea830d38bd7b 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -507,13 +507,28 @@ CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory()
 
 
 // CachedContentResultSetStubFactory XInterface methods.
+void SAL_CALL CachedContentResultSetStubFactory::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL CachedContentResultSetStubFactory::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_3( CachedContentResultSetStubFactory,
-                   XTypeProvider,
-                   XServiceInfo,
-                   XCachedContentResultSetStubFactory );
-
+css::uno::Any SAL_CALL CachedContentResultSetStubFactory::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< XServiceInfo* >(this)),
+                                               (static_cast< XCachedContentResultSetStubFactory* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // CachedContentResultSetStubFactory XTypeProvider methods.
 
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 2f56d04c60e1..50a4414e8b27 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -153,13 +153,28 @@ CachedDynamicResultSetFactory::~CachedDynamicResultSetFactory()
 
 
 // CachedDynamicResultSetFactory XInterface methods.
+void SAL_CALL CachedDynamicResultSetFactory::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL CachedDynamicResultSetFactory::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_3( CachedDynamicResultSetFactory,
-                   XTypeProvider,
-                   XServiceInfo,
-                   XCachedDynamicResultSetFactory );
-
+css::uno::Any SAL_CALL CachedDynamicResultSetFactory::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< XServiceInfo* >(this)),
+                                               (static_cast< XCachedDynamicResultSetFactory* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // CachedDynamicResultSetFactory XTypeProvider methods.
 
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 36fe89cad150..2ae7166b8b5d 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -143,13 +143,28 @@ CachedDynamicResultSetStubFactory::~CachedDynamicResultSetStubFactory()
 
 
 // CachedDynamicResultSetStubFactory XInterface methods.
+void SAL_CALL CachedDynamicResultSetStubFactory::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL CachedDynamicResultSetStubFactory::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_3( CachedDynamicResultSetStubFactory,
-                   XTypeProvider,
-                   XServiceInfo,
-                   XCachedDynamicResultSetStubFactory );
-
+css::uno::Any SAL_CALL CachedDynamicResultSetStubFactory::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< XServiceInfo* >(this)),
+                                               (static_cast< XCachedDynamicResultSetStubFactory* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // CachedDynamicResultSetStubFactory XTypeProvider methods.
 
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index aa475e731298..a28ae6cd77be 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -51,15 +51,28 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
 
 
 // XInterface methods.
+void SAL_CALL UcbContentProviderProxyFactory::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL UcbContentProviderProxyFactory::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_3( UcbContentProviderProxyFactory,
-                   XTypeProvider,
-                   XServiceInfo,
-                   XContentProviderFactory );
-
-
+css::uno::Any SAL_CALL UcbContentProviderProxyFactory::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< XServiceInfo* >(this)),
+                                               (static_cast< XContentProviderFactory* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index ff1b4a2a3ac2..3a20cc0ada74 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -309,15 +309,28 @@ UcbPropertiesManager::~UcbPropertiesManager()
 
 
 // XInterface methods.
+void SAL_CALL UcbPropertiesManager::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL UcbPropertiesManager::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_3( UcbPropertiesManager,
-                   XTypeProvider,
-                   XServiceInfo,
-                   XPropertySetInfo );
-
-
+css::uno::Any SAL_CALL UcbPropertiesManager::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< XServiceInfo* >(this)),
+                                               (static_cast< XPropertySetInfo* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 9bce7009b585..f174a96783ad 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -492,13 +492,28 @@ SortedDynamicResultSetFactory::~SortedDynamicResultSetFactory()
 
 
 // XInterface methods.
+void SAL_CALL SortedDynamicResultSetFactory::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL SortedDynamicResultSetFactory::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_3( SortedDynamicResultSetFactory,
-                   XTypeProvider,
-                   XServiceInfo,
-                   XSortedDynamicResultSetFactory );
-
+css::uno::Any SAL_CALL SortedDynamicResultSetFactory::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< XServiceInfo* >(this)),
+                                               (static_cast< XSortedDynamicResultSetFactory* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 9c3b2c48b9af..932828d919c5 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -87,10 +87,29 @@ ContentProvider::~ContentProvider()
 {
 }
 
-XINTERFACE_IMPL_3( ContentProvider,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   com::sun::star::ucb::XContentProvider );
+//XInterface
+void SAL_CALL ContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL ContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
+
+css::uno::Any SAL_CALL ContentProvider::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( ContentProvider,
                       lang::XTypeProvider,
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index f2130cdb5a96..14d642c2f6e7 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -68,15 +68,28 @@ FTPContentProvider::~FTPContentProvider()
 
 
 // XInterface methods.
+void SAL_CALL FTPContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL FTPContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_3(FTPContentProvider,
-                  XTypeProvider,
-                  XServiceInfo,
-                  XContentProvider)
-
-
+css::uno::Any SAL_CALL FTPContentProvider::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< XServiceInfo* >(this)),
+    (static_cast< XContentProvider* >(this))
+                    );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 721cb9ec5119..ce8654fcc8d3 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -74,10 +74,29 @@ ContentProvider::~ContentProvider()
 {
 }
 
-XINTERFACE_IMPL_3( ContentProvider,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   com::sun::star::ucb::XContentProvider );
+// XInterface
+void SAL_CALL ContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL ContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
+
+css::uno::Any SAL_CALL ContentProvider::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( ContentProvider,
                       lang::XTypeProvider,
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 4b58dc61a0c6..b6372234da98 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -50,15 +50,28 @@ ContentProvider::~ContentProvider()
 
 
 // XInterface methods.
+void SAL_CALL ContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_3( ContentProvider,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   com::sun::star::ucb::XContentProvider );
-
-
+css::uno::Any SAL_CALL ContentProvider::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 methods.
 
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 82ebd7a07443..0b014797bdbe 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -145,18 +145,29 @@ ContentProvider::~ContentProvider()
     delete m_pPackages;
 }
 
-
-
 // XInterface methods.
+void SAL_CALL ContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_3( ContentProvider,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   ucb::XContentProvider );
-
-
+css::uno::Any SAL_CALL ContentProvider::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< ucb::XContentProvider* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 79d7e56e1859..bdaa4d071466 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -69,14 +69,28 @@ ContentProvider::~ContentProvider()
 
 // XInterface methods.
 
+void SAL_CALL ContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_3( ContentProvider,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   ucb::XContentProvider );
-
-
+css::uno::Any SAL_CALL ContentProvider::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< ucb::XContentProvider* >(this))
+                    );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 9cb0c4ced9c6..f3bca2edd967 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -124,15 +124,28 @@ ContentProvider::~ContentProvider()
 
 
 // XInterface methods.
+void SAL_CALL ContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_3( ContentProvider,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   ucb::XContentProvider );
-
-
+css::uno::Any SAL_CALL ContentProvider::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< ucb::XContentProvider* >(this))
+                    );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.