kill XINTERFACE_IMPL_3

Change-Id: I72448b67ae52e89c206f9c313b3d351ae2a56dc3

include/ucbhelper/macros.hxx

@@ -35,33 +35,6 @@
 #define CPPU_TYPE( T )      getCppuType( static_cast< T * >( 0 ) )
 #define CPPU_TYPE_REF( T )  CPPU_TYPE( com::sun::star::uno::Reference< T > )
 
-// XInterface impl.
-
-// 3 interfaces implemented
-#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 )                        \
-void SAL_CALL Class::acquire()                                              \
-    throw()                                                                 \
-{                                                                           \
-    OWeakObject::acquire();                                                 \
-}                                                                           \
-                                                                            \
-void SAL_CALL Class::release()                                              \
-    throw()                                                                 \
-{                                                                           \
-    OWeakObject::release();                                                 \
-} \
-com::sun::star::uno::Any SAL_CALL Class::queryInterface(                    \
-                                const com::sun::star::uno::Type & rType )   \
-    throw( com::sun::star::uno::RuntimeException, std::exception )          \
-{                                                                           \
-    com::sun::star::uno::Any aRet = cppu::queryInterface( rType, \
-    (static_cast< Ifc1* >(this)),                                         \
-    (static_cast< Ifc2* >(this)),                                         \
-    (static_cast< Ifc3* >(this))                                          \
-                    );                                                      \
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );   \
-}\
-
 // XTypeProvider decl.
 
 

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.
 

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.
 

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.
 

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.
 

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.
 

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.
 

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.
 

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,

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.
 

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,

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.
 

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.
 

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.
 

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.
 

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.
 

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,