[Libreoffice-commits] core.git: 8 commits - include/ucbhelper ucbhelper/source ucb/source xmlhelp/source
Norbert Thiebaud
nthiebaud at gmail.com
Wed Mar 5 07:45:29 PST 2014
include/ucbhelper/macros.hxx | 102 -------------------
ucb/source/cacher/cachedcontentresultset.cxx | 50 +++++++--
ucb/source/cacher/cachedcontentresultsetstub.cxx | 25 +++-
ucb/source/cacher/cacheddynamicresultset.cxx | 25 +++-
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 25 +++-
ucb/source/cacher/contentresultsetwrapper.cxx | 52 +++++----
ucb/source/cacher/dynamicresultsetwrapper.cxx | 45 +++++---
ucb/source/core/identify.cxx | 25 +++-
ucb/source/core/provprox.cxx | 27 +++--
ucb/source/core/ucb.cxx | 39 ++++---
ucb/source/core/ucbprops.cxx | 27 +++--
ucb/source/core/ucbstore.cxx | 123 ++++++++++++++++-------
ucb/source/sorter/sortdynres.cxx | 74 +++++++++++--
ucb/source/sorter/sortresult.cxx | 58 ++++++++--
ucb/source/ucp/cmis/cmis_provider.cxx | 27 ++++-
ucb/source/ucp/ftp/ftpcontent.cxx | 32 ++++-
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 27 +++--
ucb/source/ucp/gio/gio_provider.cxx | 27 ++++-
ucb/source/ucp/gvfs/gvfs_provider.cxx | 27 +++--
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 29 +++--
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 28 +++--
ucb/source/ucp/package/pkgprovider.cxx | 29 +++--
ucb/source/ucp/tdoc/tdoc_provider.cxx | 29 +++--
ucb/source/ucp/webdav-neon/webdavprovider.cxx | 26 +++-
ucb/source/ucp/webdav/webdavprovider.cxx | 27 +++--
ucbhelper/source/client/activedatasink.cxx | 24 +++-
ucbhelper/source/client/activedatastreamer.cxx | 24 +++-
ucbhelper/source/client/commandenvironment.cxx | 24 +++-
ucbhelper/source/client/content.cxx | 24 +++-
ucbhelper/source/provider/contentinfo.cxx | 55 +++++++---
ucbhelper/source/provider/propertyvalueset.cxx | 27 +++--
ucbhelper/source/provider/providerhelper.cxx | 27 ++++-
ucbhelper/source/provider/resultset.cxx | 64 ++++++++---
ucbhelper/source/provider/resultsethelper.cxx | 29 +++--
ucbhelper/source/provider/resultsetmetadata.cxx | 24 +++-
xmlhelp/source/cxxhelp/provider/provider.cxx | 31 ++++-
36 files changed, 938 insertions(+), 420 deletions(-)
New commits:
commit cf1878f5dcac82f61f696410faa685c7a2d795a8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 16:42:53 2014 -0600
kill XINTERFACE_IMPL_3
Change-Id: I72448b67ae52e89c206f9c313b3d351ae2a56dc3
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 6b80fc8..e74c597 100644
--- a/include/ucbhelper/macros.hxx
+++ b/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.
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 1591209..a59cdf4 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 98653b1..ea830d3 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 2f56d04..50a4414 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 36fe89c..2ae7166 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 aa475e7..a28ae6c 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 ff1b4a2..3a20cc0 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 9bce700..f174a96 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 9c3b2c4..932828d 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 f2130cd..14d642c 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 721cb9e..ce8654f 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 4b58dc6..b637223 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 82ebd7a..0b01479 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 79d7e56..bdaa4d0 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 9cb0c4c..f3bca2e 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.
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 7c77cbe..d962af6 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 2678099..21dcd08 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,
commit 8b40ddd9f092ea97707fbde8c4d7dd58ac867af2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 16:08:15 2014 -0600
kill XINTERFACE_IMPL_4
Change-Id: I88e2e62b82f40cfa3e892023d381f7611e093fd6
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index c7f87f3..6b80fc8 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -62,33 +62,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
}\
-// 4 interfaces implemented
-#define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 ) \
-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)), \
- (static_cast< Ifc4* >(this)) \
- ); \
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
-}\
-
-// 9 interfaces implemented
// XTypeProvider decl.
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 010ff21..8b2d2be 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -194,16 +194,29 @@ UcbStore::~UcbStore()
// XInterface methods.
+void SAL_CALL UcbStore::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL UcbStore::release()
+ throw()
+{
+ OWeakObject::release();
+}
-
-XINTERFACE_IMPL_4( UcbStore,
- XTypeProvider,
- XServiceInfo,
- XPropertySetRegistryFactory,
- XInitialization );
-
-
+css::uno::Any SAL_CALL UcbStore::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< XPropertySetRegistryFactory* >(this)),
+ (static_cast< XInitialization* >(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 28bc8f5..9bce700 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -103,14 +103,29 @@ SortedDynamicResultSet::~SortedDynamicResultSet()
// XInterface methods.
+void SAL_CALL SortedDynamicResultSet::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL SortedDynamicResultSet::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_4( SortedDynamicResultSet,
- XTypeProvider,
- XServiceInfo,
- XComponent, /* base class of XDynamicResultSet */
- XDynamicResultSet );
-
+css::uno::Any SAL_CALL SortedDynamicResultSet::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< XComponent* >(this)),
+ (static_cast< XDynamicResultSet* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 4208f12..5d4d9c9 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -234,16 +234,29 @@ HierarchyDataSource::~HierarchyDataSource()
// XInterface methods.
+void SAL_CALL HierarchyDataSource::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL HierarchyDataSource::release()
+ throw()
+{
+ OWeakObject::release();
+}
-
-XINTERFACE_IMPL_4( HierarchyDataSource,
- lang::XTypeProvider,
- lang::XServiceInfo,
- lang::XComponent,
- lang::XMultiServiceFactory );
-
-
+css::uno::Any SAL_CALL HierarchyDataSource::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< lang::XComponent* >(this)),
+ (static_cast< lang::XMultiServiceFactory* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index e5e981a..6355d86 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -64,15 +64,29 @@ HierarchyContentProvider::~HierarchyContentProvider()
// XInterface methods.
+void SAL_CALL HierarchyContentProvider::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL HierarchyContentProvider::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_4( HierarchyContentProvider,
- lang::XTypeProvider,
- lang::XServiceInfo,
- ucb::XContentProvider,
- lang::XInitialization );
-
-
+css::uno::Any SAL_CALL HierarchyContentProvider::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)),
+ (static_cast< lang::XInitialization* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 4226091..1b0f11a 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -68,16 +68,29 @@ ContentProvider::~ContentProvider()
// XInterface methods.
+void SAL_CALL ContentProvider::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ContentProvider::release()
+ throw()
+{
+ OWeakObject::release();
+}
-
-XINTERFACE_IMPL_4( ContentProvider,
- lang::XTypeProvider,
- lang::XServiceInfo,
- ucb::XContentProvider,
- frame::XTransientDocumentsDocumentContentFactory );
-
-
+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)),
+ (static_cast< frame::XTransientDocumentsDocumentContentFactory* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 4fcd0e1..359cca5 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -70,16 +70,29 @@ ResultSetImplHelper::~ResultSetImplHelper()
// XInterface methods.
+void SAL_CALL ResultSetImplHelper::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ResultSetImplHelper::release()
+ throw()
+{
+ OWeakObject::release();
+}
-
-XINTERFACE_IMPL_4( ResultSetImplHelper,
- lang::XTypeProvider,
- lang::XServiceInfo,
- lang::XComponent, /* base of XDynamicResultSet */
- com::sun::star::ucb::XDynamicResultSet );
-
-
+css::uno::Any SAL_CALL ResultSetImplHelper::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< lang::XComponent* >(this)),
+ (static_cast< css::ucb::XDynamicResultSet* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
commit a5aad2ac58f01702b91db051e66e2e855de00b10
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 15:41:50 2014 -0600
kill XINTERFACE_IMPL_9
Change-Id: I651599cf3ec82a31f3260985907b5b2d56665da3
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index b745f40..c7f87f3 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -89,36 +89,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \
}\
// 9 interfaces implemented
-#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \
-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< I1* >(this)), \
- (static_cast< I2* >(this)), \
- (static_cast< I3* >(this)), \
- (static_cast< I4* >(this)), \
- (static_cast< I5* >(this)), \
- (static_cast< I6* >(this)), \
- (static_cast< I7* >(this)), \
- (static_cast< I8* >(this)), \
- (static_cast< I9* >(this)) \
- ); \
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
-}\
-
// XTypeProvider decl.
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 70ea59b..0f3308f 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -251,21 +251,34 @@ UniversalContentBroker::~UniversalContentBroker()
// XInterface methods.
+void SAL_CALL UniversalContentBroker::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL UniversalContentBroker::release()
+ throw()
+{
+ OWeakObject::release();
+}
-
-XINTERFACE_IMPL_9( UniversalContentBroker,
- XUniversalContentBroker,
- XTypeProvider,
- XComponent,
- XServiceInfo,
- XInitialization,
- XContentProviderManager,
- XContentProvider,
- XContentIdentifierFactory,
- XCommandProcessor );
-
-
+css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ (static_cast< XUniversalContentBroker* >(this)),
+ (static_cast< XTypeProvider* >(this)),
+ (static_cast< XComponent* >(this)),
+ (static_cast< XServiceInfo* >(this)),
+ (static_cast< XInitialization* >(this)),
+ (static_cast< XContentProviderManager* >(this)),
+ (static_cast< XContentProvider* >(this)),
+ (static_cast< XContentIdentifierFactory* >(this)),
+ (static_cast< XCommandProcessor* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 28d3426..010ff21 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -1282,21 +1282,34 @@ PersistentPropertySet::~PersistentPropertySet()
// XInterface methods.
+void SAL_CALL PersistentPropertySet::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL PersistentPropertySet::release()
+ throw()
+{
+ OWeakObject::release();
+}
-
-XINTERFACE_IMPL_9( PersistentPropertySet,
- XTypeProvider,
- XServiceInfo,
- XComponent,
- XPropertySet, /* base of XPersistentPropertySet */
- XNamed,
- XPersistentPropertySet,
- XPropertyContainer,
- XPropertySetInfoChangeNotifier,
- XPropertyAccess );
-
-
+css::uno::Any SAL_CALL PersistentPropertySet::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< XComponent* >(this)),
+ (static_cast< XPropertySet* >(this)),
+ (static_cast< XNamed* >(this)),
+ (static_cast< XPersistentPropertySet* >(this)),
+ (static_cast< XPropertyContainer* >(this)),
+ (static_cast< XPropertySetInfoChangeNotifier* >(this)),
+ (static_cast< XPropertyAccess* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 29ae56c..22577ca 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -210,18 +210,34 @@ SortedResultSet::~SortedResultSet()
// XInterface methods.
+void SAL_CALL SortedResultSet::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_IMPL_9( SortedResultSet,
- XTypeProvider,
- XServiceInfo,
- XComponent,
- XContentAccess,
- XResultSet,
- XRow,
- XCloseable,
- XResultSetMetaDataSupplier,
- XPropertySet );
+void SAL_CALL SortedResultSet::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL SortedResultSet::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< XComponent* >(this)),
+ (static_cast< XContentAccess* >(this)),
+ (static_cast< XResultSet* >(this)),
+ (static_cast< XRow* >(this)),
+ (static_cast< XCloseable* >(this)),
+ (static_cast< XResultSetMetaDataSupplier* >(this)),
+ (static_cast< XPropertySet* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 9e98e36..8c3d791 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -248,20 +248,34 @@ ResultSet::~ResultSet()
// XInterface methods.
+void SAL_CALL ResultSet::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ResultSet::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_9( ResultSet,
- lang::XTypeProvider,
- lang::XServiceInfo,
- lang::XComponent,
- com::sun::star::ucb::XContentAccess,
- sdbc::XResultSet,
- sdbc::XResultSetMetaDataSupplier,
- sdbc::XRow,
- sdbc::XCloseable,
- beans::XPropertySet );
-
-
+css::uno::Any SAL_CALL ResultSet::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< lang::XComponent* >(this)),
+ (static_cast< css::ucb::XContentAccess* >(this)),
+ (static_cast< sdbc::XResultSet* >(this)),
+ (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)),
+ (static_cast< sdbc::XRow* >(this)),
+ (static_cast< sdbc::XCloseable* >(this)),
+ (static_cast< beans::XPropertySet* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
commit 2ef98b947e8babddeaf5b67e580ba2f184c0e157
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 15:22:44 2014 -0600
kill XINTERFACE_IMPL_6
Change-Id: I1445524d3c15a3dec881c1499910779b9d61b840
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 791e352..b745f40 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -88,34 +88,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
}\
-// 6 interfaces implemented
-#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 ) \
-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< I1* >(this)), \
- (static_cast< I2* >(this)), \
- (static_cast< I3* >(this)), \
- (static_cast< I4* >(this)), \
- (static_cast< I5* >(this)), \
- (static_cast< I6* >(this)) \
- ); \
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
-}\
-
// 9 interfaces implemented
#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \
void SAL_CALL Class::acquire() \
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index cbb7a5e..e4caebb 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -130,17 +130,31 @@ FTPContent::~FTPContent()
// XInterface methods.
+void SAL_CALL FTPContent::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL FTPContent::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_6( FTPContent,
- XTypeProvider,
- XServiceInfo,
- XContent,
- XCommandProcessor,
- XContentCreator,
- XChild);
-
-
+css::uno::Any SAL_CALL FTPContent::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< XContent* >(this)),
+ (static_cast< XCommandProcessor* >(this)),
+ (static_cast< XContentCreator* >(this)),
+ (static_cast< XChild* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 3bc85c8..40142c4 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -62,14 +62,31 @@ ContentProvider::~ContentProvider()
}
// XInterface methods.
+void SAL_CALL ContentProvider::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_IMPL_6( ContentProvider,
- lang::XTypeProvider,
- lang::XServiceInfo,
- ucb::XContentProvider,
- lang::XComponent,
- lang::XEventListener, /* base of XContainerListener */
- container::XContainerListener);
+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< ucb::XContentProvider* >(this)),
+ (static_cast< lang::XComponent* >(this)),
+ (static_cast< lang::XEventListener* >(this)),
+ (static_cast< container::XContainerListener* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
commit fbf7bd25b0d6e4b37d36f0fa227bf20faf0d6db1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 15:08:33 2014 -0600
kill XINTERFACE_IMPL_5
Change-Id: Id1e61cd6873458f052d61c95617ade753face61c
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index ab35b0d..791e352 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -88,33 +88,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
}\
-// 5 interfaces implemented
-#define XINTERFACE_IMPL_5( Class, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 ) \
-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)), \
- (static_cast< Ifc4* >(this)), \
- (static_cast< Ifc5* >(this)) \
- ); \
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
-}\
-
// 6 interfaces implemented
#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 ) \
void SAL_CALL Class::acquire() \
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 131aa36..28d3426 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -331,21 +331,34 @@ PropertySetRegistry::~PropertySetRegistry()
// XInterface methods.
+void SAL_CALL PropertySetRegistry::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL PropertySetRegistry::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_5( PropertySetRegistry,
- XTypeProvider,
- XServiceInfo,
- XPropertySetRegistry,
- XElementAccess, /* base of XNameAccess */
- XNameAccess );
-
-
+css::uno::Any SAL_CALL PropertySetRegistry::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< XPropertySetRegistry* >(this)),
+ (static_cast< XElementAccess* >(this)),
+ (static_cast< XNameAccess* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
-
XTYPEPROVIDER_IMPL_4( PropertySetRegistry,
XTypeProvider,
XServiceInfo,
commit e090a0f5802904ca8cded9208993e09bc08a3052
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 15:00:14 2014 -0600
kill XINTERFACE_IMPL_2
Change-Id: Ic735b7d6ddfaacab9af7405e4dacc62f818bed8c
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 94c5b7d..ab35b0d 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -37,30 +37,6 @@
// XInterface impl.
-// 2 interfaces implemented
-#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \
-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)) \
- ); \
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
-}\
-
// 3 interfaces implemented
#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 ) \
void SAL_CALL Class::acquire() \
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index e692926..1591209 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -521,12 +521,27 @@ CCRS_PropertySetInfo::~CCRS_PropertySetInfo()
// XInterface methods.
-//list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_IMPL_2( CCRS_PropertySetInfo
- , XTypeProvider
- , XPropertySetInfo
- );
+void SAL_CALL CCRS_PropertySetInfo::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+
+void SAL_CALL CCRS_PropertySetInfo::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL CCRS_PropertySetInfo::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< XPropertySetInfo* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index caf6378..b0c510b 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -470,12 +470,27 @@ DynamicResultSetWrapperListener::~DynamicResultSetWrapperListener()
// XInterface methods.
-//list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_IMPL_2( DynamicResultSetWrapperListener
- , XDynamicResultSetListener
- , XEventListener //base of XDynamicResultSetListener
- );
+void SAL_CALL DynamicResultSetWrapperListener::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+
+void SAL_CALL DynamicResultSetWrapperListener::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ (static_cast< XDynamicResultSetListener* >(this)),
+ (static_cast< XEventListener* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XDynamicResultSetListener methods:
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index e20ef5a..7da0d47 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -53,13 +53,28 @@ ContentIdentifier::~ContentIdentifier()
// XInterface methods.
+void SAL_CALL ContentIdentifier::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ContentIdentifier::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( ContentIdentifier,
- XTypeProvider,
- XContentIdentifier );
-
-
+css::uno::Any SAL_CALL ContentIdentifier::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< XContentIdentifier* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 3bbd924..131aa36 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -2365,13 +2365,27 @@ PropertySetInfo_Impl::~PropertySetInfo_Impl()
// XInterface methods.
+void SAL_CALL PropertySetInfo_Impl::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL PropertySetInfo_Impl::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( PropertySetInfo_Impl,
- XTypeProvider,
- XPropertySetInfo );
-
-
+css::uno::Any SAL_CALL PropertySetInfo_Impl::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< 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 618f45a..28bc8f5 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -570,11 +570,27 @@ SortedDynamicResultSetListener::~SortedDynamicResultSetListener()
// XInterface methods.
+void SAL_CALL SortedDynamicResultSetListener::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_IMPL_2( SortedDynamicResultSetListener,
- XEventListener, /* base class of XDynamicResultSetListener */
- XDynamicResultSetListener );
+void SAL_CALL SortedDynamicResultSetListener::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL SortedDynamicResultSetListener::queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ (static_cast< XEventListener* >(this)),
+ (static_cast< XDynamicResultSetListener* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XEventListener ( base of XDynamicResultSetListener )
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index bbeec37..29ae56c 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -2021,11 +2021,27 @@ SRSPropertySetInfo::~SRSPropertySetInfo()
// XInterface methods.
+void SAL_CALL SRSPropertySetInfo::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_IMPL_2( SRSPropertySetInfo,
- XTypeProvider,
- XPropertySetInfo );
+void SAL_CALL SRSPropertySetInfo::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL SRSPropertySetInfo::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< XPropertySetInfo* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx
index aed7305..d83643f 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.cxx
@@ -42,13 +42,27 @@ namespace ucbhelper
// XInterface methods
+void SAL_CALL ActiveDataSink::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ActiveDataSink::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( ActiveDataSink,
- lang::XTypeProvider,
- io::XActiveDataSink );
-
-
+css::uno::Any SAL_CALL ActiveDataSink::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< io::XActiveDataSink* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods
diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx
index 27ab53a..15baa8e 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.cxx
@@ -42,13 +42,27 @@ namespace ucbhelper
// XInterface methods
+void SAL_CALL ActiveDataStreamer::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ActiveDataStreamer::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( ActiveDataStreamer,
- lang::XTypeProvider,
- io::XActiveDataStreamer );
-
-
+css::uno::Any SAL_CALL ActiveDataStreamer::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< io::XActiveDataStreamer* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods
diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index a8e938c..80b0004 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.cxx
@@ -85,13 +85,27 @@ CommandEnvironment::~CommandEnvironment()
// XInterface methods
+void SAL_CALL CommandEnvironment::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL CommandEnvironment::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( CommandEnvironment,
- XTypeProvider,
- XCommandEnvironment );
-
-
+css::uno::Any SAL_CALL CommandEnvironment::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< XCommandEnvironment* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 2cffd34..f4b9beb 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1321,13 +1321,27 @@ void Content_Impl::inserted()
// XInterface methods.
+void SAL_CALL ContentEventListener_Impl::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ContentEventListener_Impl::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( ContentEventListener_Impl,
- XContentEventListener,
- XEventListener ); /* base of XContentEventListener */
-
-
+css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ (static_cast< XContentEventListener* >(this)),
+ (static_cast< XEventListener* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XContentEventListener methods.
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index b3a20b8..b3f0ca9 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -62,22 +62,32 @@ PropertySetInfo::~PropertySetInfo()
// XInterface methods.
+void SAL_CALL PropertySetInfo::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL PropertySetInfo::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( PropertySetInfo,
- lang::XTypeProvider,
- beans::XPropertySetInfo );
-
-
+css::uno::Any SAL_CALL PropertySetInfo::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< beans::XPropertySetInfo* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
-
-
-
XTYPEPROVIDER_IMPL_2( PropertySetInfo,
- lang::XTypeProvider,
- beans::XPropertySetInfo );
-
+ lang::XTypeProvider,
+ beans::XPropertySetInfo );
// XPropertySetInfo methods.
@@ -236,12 +246,27 @@ CommandProcessorInfo::~CommandProcessorInfo()
// XInterface methods.
+void SAL_CALL CommandProcessorInfo::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_IMPL_2( CommandProcessorInfo,
- lang::XTypeProvider,
- com::sun::star::ucb::XCommandInfo );
-
+void SAL_CALL CommandProcessorInfo::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL CommandProcessorInfo::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< css::ucb::XCommandInfo* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 6202e4c..9e98e36 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -1594,14 +1594,28 @@ PropertySetInfo::~PropertySetInfo()
// XInterface methods.
+void SAL_CALL PropertySetInfo::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL PropertySetInfo::release()
+ throw()
+{
+ OWeakObject::release();
+}
-
-XINTERFACE_IMPL_2( PropertySetInfo,
- lang::XTypeProvider,
- beans::XPropertySetInfo );
-
-
+css::uno::Any SAL_CALL PropertySetInfo::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< beans::XPropertySetInfo* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 1bea9ae..25b6e84 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -118,13 +118,27 @@ ResultSetMetaData::~ResultSetMetaData()
// XInterface methods.
+void SAL_CALL ResultSetMetaData::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+void SAL_CALL ResultSetMetaData::release()
+ throw()
+{
+ OWeakObject::release();
+}
-XINTERFACE_IMPL_2( ResultSetMetaData,
- XTypeProvider,
- XResultSetMetaData );
-
-
+css::uno::Any SAL_CALL ResultSetMetaData::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< XResultSetMetaData* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
commit 149da07aed965ba8cc3330163821922f10381d8c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 14:00:38 2014 -0600
kill QUERYINTERFACE_IMPL_START/END
Change-Id: I9b9457cac9b93b550ccb16522b035aeb53be9bf3
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 2df37a3..94c5b7d 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -35,13 +35,10 @@
#define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) )
#define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > )
+// XInterface impl.
-
-// XInterface impl. internals.
-
-
-
-#define XINTERFACE_COMMON_IMPL( Class ) \
+// 2 interfaces implemented
+#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \
void SAL_CALL Class::acquire() \
throw() \
{ \
@@ -52,76 +49,142 @@ void SAL_CALL Class::release() \
throw() \
{ \
OWeakObject::release(); \
-}
-
-#define QUERYINTERFACE_IMPL_START( Class ) \
+} \
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,
-
-#define QUERYINTERFACE_IMPL_END \
- ); \
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
-}
-
-// XInterface impl.
-
-// 2 interfaces implemented
-#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
+ com::sun::star::uno::Any aRet = cppu::queryInterface( rType, \
(static_cast< Ifc1* >(this)), \
(static_cast< Ifc2* >(this)) \
-QUERYINTERFACE_IMPL_END
+ ); \
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
+}\
// 3 interfaces implemented
#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
+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)) \
-QUERYINTERFACE_IMPL_END
+ ); \
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
+}\
// 4 interfaces implemented
#define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
+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)), \
(static_cast< Ifc4* >(this)) \
-QUERYINTERFACE_IMPL_END
+ ); \
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
+}\
// 5 interfaces implemented
#define XINTERFACE_IMPL_5( Class, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
+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)), \
(static_cast< Ifc4* >(this)), \
(static_cast< Ifc5* >(this)) \
-QUERYINTERFACE_IMPL_END
+ ); \
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
+}\
// 6 interfaces implemented
#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
+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< I1* >(this)), \
(static_cast< I2* >(this)), \
(static_cast< I3* >(this)), \
(static_cast< I4* >(this)), \
(static_cast< I5* >(this)), \
(static_cast< I6* >(this)) \
-QUERYINTERFACE_IMPL_END
+ ); \
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
+}\
// 9 interfaces implemented
#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
+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< I1* >(this)), \
(static_cast< I2* >(this)), \
(static_cast< I3* >(this)), \
@@ -131,7 +194,9 @@ QUERYINTERFACE_IMPL_START( Class ) \
(static_cast< I7* >(this)), \
(static_cast< I8* >(this)), \
(static_cast< I9* >(this)) \
-QUERYINTERFACE_IMPL_END
+ ); \
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
+}\
// XTypeProvider decl.
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index dfa4c9b..aca8dc3 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -1420,17 +1420,18 @@ void SAL_CALL ContentResultSetWrapperListener::release()
OWeakObject::release();
}
-//list all interfaces inclusive baseclasses of interfaces
-QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener )
-
- static_cast< XEventListener * >(
- static_cast< XPropertyChangeListener * >(this))
- , (static_cast< XPropertyChangeListener* >(this))
- , (static_cast< XVetoableChangeListener* >(this))
-
-QUERYINTERFACE_IMPL_END
-
-
+css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
+{
+ //list all interfaces inclusive baseclasses of interfaces
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ static_cast< XEventListener * >(
+ static_cast< XPropertyChangeListener * >(this)),
+ static_cast< XPropertyChangeListener* >(this),
+ static_cast< XVetoableChangeListener* >(this)
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
//XEventListener methods.
commit 7ec9ea3c52609f033c57d9af90d334583e32b80e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 4 13:23:41 2014 -0600
de-macroize QUERYINTERFACE_IMPL_START QUERYINTERFACE_IMPL_END
Change-Id: I152d82e34446111cead4b060f789260552d5920d
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 4a494e9..2df37a3 100644
--- a/include/ucbhelper/macros.hxx
+++ b/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 ) \
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 42c16c2..dfa4c9b 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/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.
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 3e777ca..caf6378 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/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.
More information about the Libreoffice-commits
mailing list