include/ucbhelper/macros.hxx | 234 -----------------------
ucb/source/cacher/cachedcontentresultset.cxx | 13 +
ucb/source/cacher/cachedcontentresultsetstub.cxx | 11 -
ucb/source/cacher/cacheddynamicresultset.cxx | 11 -
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 11 -
ucb/source/cacher/contentresultsetwrapper.cxx | 12 +
ucb/source/core/provprox.cxx | 15 -
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 14 -
8 files changed, 72 insertions(+), 249 deletions(-)
New commits:
commit 10fe4b9fd17e1da11ea7ebfa354f40c2e2da3f3f
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Tue Mar 4 12:55:44 2014 -0600
de-macroize XINTERFACE_COMMON_IMPL
Change-Id: I7cffc8a111dd939272c6dbef8827b6f5c04a4590
Reviewed-on: https://gerrit.libreoffice.org/8455
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index c6f31a6..4a494e9 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -72,13 +72,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface(
\
-// 1 interface implemented
-#define XINTERFACE_IMPL_1( Class, Ifc1 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (static_cast< Ifc1* >(this)) \
-QUERYINTERFACE_IMPL_END
-
// 2 interfaces implemented
#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \
XINTERFACE_COMMON_IMPL( Class ) \
@@ -129,33 +122,6 @@ QUERYINTERFACE_IMPL_START( Class )
\
(static_cast< I6* >(this)) \
QUERYINTERFACE_IMPL_END
-// 7 interfaces implemented
-#define XINTERFACE_IMPL_7( Class,I1,I2,I3,I4,I5,I6,I7 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)) \
-QUERYINTERFACE_IMPL_END
-
-// 8 interfaces implemented
-#define XINTERFACE_IMPL_8( Class,I1,I2,I3,I4,I5,I6,I7,I8 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)) \
-QUERYINTERFACE_IMPL_END
-
// 9 interfaces implemented
#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \
XINTERFACE_COMMON_IMPL( Class ) \
@@ -171,119 +137,6 @@ QUERYINTERFACE_IMPL_START( Class )
\
(static_cast< I9* >(this)) \
QUERYINTERFACE_IMPL_END
-// 10 interfaces implemented
-#define XINTERFACE_IMPL_10( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)), \
- (static_cast< I10* >(this)) \
-QUERYINTERFACE_IMPL_END
-
-// 11 interfaces implemented
-#define XINTERFACE_IMPL_11( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)), \
- (static_cast< I10* >(this)), \
- (static_cast< I11* >(this)) \
-QUERYINTERFACE_IMPL_END
-
-// 12 interfaces implemented
-#define XINTERFACE_IMPL_12( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)), \
- (static_cast< I10* >(this)), \
- (static_cast< I11* >(this)), \
- (static_cast< I12* >(this)) \
-QUERYINTERFACE_IMPL_END
-
-// 13 interfaces implemented
-#define XINTERFACE_IMPL_13( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 )
\
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)), \
- (static_cast< I10* >(this)), \
- (static_cast< I11* >(this)), \
- (static_cast< I12* >(this)), \
- (static_cast< I13* >(this)) \
-QUERYINTERFACE_IMPL_END
-
-// 14 interfaces implemented
-#define XINTERFACE_IMPL_14(
Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)), \
- (static_cast< I10* >(this)), \
- (static_cast< I11* >(this)), \
- (static_cast< I12* >(this)), \
- (static_cast< I13* >(this)), \
- (static_cast< I14* >(this)) \
-QUERYINTERFACE_IMPL_END
-
-// 15 interfaces implemented
-#define XINTERFACE_IMPL_15(
Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class ) \
- (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)), \
- (static_cast< I10* >(this)), \
- (static_cast< I11* >(this)), \
- (static_cast< I12* >(this)), \
- (static_cast< I13* >(this)), \
- (static_cast< I14* >(this)), \
- (static_cast< I15* >(this)) \
-QUERYINTERFACE_IMPL_END
-
-
-
// XTypeProvider decl.
@@ -347,13 +200,6 @@ Class::getTypes()
\
-// 1 interface supported
-#define XTYPEPROVIDER_IMPL_1( Class, I1 ) \
-XTYPEPROVIDER_COMMON_IMPL( Class ) \
-GETTYPES_IMPL_START( Class ) \
- CPPU_TYPE_REF( I1 ) \
-GETTYPES_IMPL_END
-
// 2 interfaces supported
#define XTYPEPROVIDER_IMPL_2( Class, I1,I2 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
@@ -479,86 +325,6 @@ GETTYPES_IMPL_START( Class )
\
CPPU_TYPE_REF( I11 ) \
GETTYPES_IMPL_END
-// 12 interfaces supported
-#define XTYPEPROVIDER_IMPL_12( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 )
\
-XTYPEPROVIDER_COMMON_IMPL( Class ) \
-GETTYPES_IMPL_START( Class ) \
- CPPU_TYPE_REF( I1 ), \
- CPPU_TYPE_REF( I2 ), \
- CPPU_TYPE_REF( I3 ), \
- CPPU_TYPE_REF( I4 ), \
- CPPU_TYPE_REF( I5 ), \
- CPPU_TYPE_REF( I6 ), \
- CPPU_TYPE_REF( I7 ), \
- CPPU_TYPE_REF( I8 ), \
- CPPU_TYPE_REF( I9 ), \
- CPPU_TYPE_REF( I10 ), \
- CPPU_TYPE_REF( I11 ), \
- CPPU_TYPE_REF( I12 ) \
-GETTYPES_IMPL_END
-
-// 13 interfaces supported
-#define XTYPEPROVIDER_IMPL_13( Class,
I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 ) \
-XTYPEPROVIDER_COMMON_IMPL( Class ) \
-GETTYPES_IMPL_START( Class ) \
- CPPU_TYPE_REF( I1 ), \
- CPPU_TYPE_REF( I2 ), \
- CPPU_TYPE_REF( I3 ), \
- CPPU_TYPE_REF( I4 ), \
- CPPU_TYPE_REF( I5 ), \
- CPPU_TYPE_REF( I6 ), \
- CPPU_TYPE_REF( I7 ), \
- CPPU_TYPE_REF( I8 ), \
- CPPU_TYPE_REF( I9 ), \
- CPPU_TYPE_REF( I10 ), \
- CPPU_TYPE_REF( I11 ), \
- CPPU_TYPE_REF( I12 ), \
- CPPU_TYPE_REF( I13 ) \
-GETTYPES_IMPL_END
-
-// 14 interfaces supported
-#define XTYPEPROVIDER_IMPL_14( Class,
I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 ) \
-XTYPEPROVIDER_COMMON_IMPL( Class ) \
-GETTYPES_IMPL_START( Class ) \
- CPPU_TYPE_REF( I1 ), \
- CPPU_TYPE_REF( I2 ), \
- CPPU_TYPE_REF( I3 ), \
- CPPU_TYPE_REF( I4 ), \
- CPPU_TYPE_REF( I5 ), \
- CPPU_TYPE_REF( I6 ), \
- CPPU_TYPE_REF( I7 ), \
- CPPU_TYPE_REF( I8 ), \
- CPPU_TYPE_REF( I9 ), \
- CPPU_TYPE_REF( I10 ), \
- CPPU_TYPE_REF( I11 ), \
- CPPU_TYPE_REF( I12 ), \
- CPPU_TYPE_REF( I13 ), \
- CPPU_TYPE_REF( I14 ) \
-GETTYPES_IMPL_END
-
-// 15 interfaces supported
-#define XTYPEPROVIDER_IMPL_15( Class,
I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 ) \
-XTYPEPROVIDER_COMMON_IMPL( Class ) \
-GETTYPES_IMPL_START( Class ) \
- CPPU_TYPE_REF( I1 ), \
- CPPU_TYPE_REF( I2 ), \
- CPPU_TYPE_REF( I3 ), \
- CPPU_TYPE_REF( I4 ), \
- CPPU_TYPE_REF( I5 ), \
- CPPU_TYPE_REF( I6 ), \
- CPPU_TYPE_REF( I7 ), \
- CPPU_TYPE_REF( I8 ), \
- CPPU_TYPE_REF( I9 ), \
- CPPU_TYPE_REF( I10 ), \
- CPPU_TYPE_REF( I11 ), \
- CPPU_TYPE_REF( I12 ), \
- CPPU_TYPE_REF( I13 ), \
- CPPU_TYPE_REF( I14 ), \
- CPPU_TYPE_REF( I15 ) \
-GETTYPES_IMPL_END
-
-
-
// XServiceInfo decl.
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index 311e2bc..e692926 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -917,9 +917,18 @@ void SAL_CALL CachedContentResultSet
}
-// XInterface methods. ( inherited )
+// XInterface methods.
+void SAL_CALL CachedContentResultSet::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_COMMON_IMPL( CachedContentResultSet )
+void SAL_CALL CachedContentResultSet::release()
+ throw()
+{
+ OWeakObject::release();
+}
Any SAL_CALL CachedContentResultSet
::queryInterface( const Type& rType )
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx
b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index dd3d896..98653b1 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -53,8 +53,17 @@ CachedContentResultSetStub::~CachedContentResultSetStub()
// XInterface methods.
+void SAL_CALL CachedContentResultSetStub::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_COMMON_IMPL( CachedContentResultSetStub )
+void SAL_CALL CachedContentResultSetStub::release()
+ throw()
+{
+ OWeakObject::release();
+}
Any SAL_CALL CachedContentResultSetStub
::queryInterface( const Type& rType )
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx
b/ucb/source/cacher/cacheddynamicresultset.cxx
index 917a6f6..2f56d04 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -75,8 +75,17 @@ void SAL_CALL CachedDynamicResultSet
// XInterface methods.
+void SAL_CALL CachedDynamicResultSet::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_COMMON_IMPL( CachedDynamicResultSet )
+void SAL_CALL CachedDynamicResultSet::release()
+ throw()
+{
+ OWeakObject::release();
+}
Any SAL_CALL CachedDynamicResultSet
::queryInterface( const Type& rType )
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index efbb359..36fe89c 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -76,8 +76,17 @@ void SAL_CALL CachedDynamicResultSetStub
// XInterface methods.
+void SAL_CALL CachedDynamicResultSetStub::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-XINTERFACE_COMMON_IMPL( CachedDynamicResultSetStub )
+void SAL_CALL CachedDynamicResultSetStub::release()
+ throw()
+{
+ OWeakObject::release();
+}
Any SAL_CALL CachedDynamicResultSetStub
::queryInterface( const Type& rType )
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx
b/ucb/source/cacher/contentresultsetwrapper.cxx
index 516b719..42c16c2 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -1407,9 +1407,19 @@
ContentResultSetWrapperListener::~ContentResultSetWrapperListener()
// XInterface methods.
+void SAL_CALL ContentResultSetWrapperListener::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+
+void SAL_CALL ContentResultSetWrapperListener::release()
+ throw()
+{
+ OWeakObject::release();
+}
//list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_COMMON_IMPL( ContentResultSetWrapperListener )
QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener )
static_cast< XEventListener * >(
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index f0864f0..aa475e7 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -129,13 +129,18 @@ UcbContentProviderProxy::~UcbContentProviderProxy()
}
-
// XInterface methods.
+void SAL_CALL UcbContentProviderProxy::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-
-
-XINTERFACE_COMMON_IMPL( UcbContentProviderProxy );
-
+void SAL_CALL UcbContentProviderProxy::release()
+ throw()
+{
+ OWeakObject::release();
+}
// virtual
Any SAL_CALL
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 5370e6a..4208f12 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -610,11 +610,17 @@ HierarchyDataAccess::~HierarchyDataAccess()
// XInterface methods.
+void SAL_CALL HierarchyDataAccess::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
-
-
-XINTERFACE_COMMON_IMPL( HierarchyDataAccess );
-
+void SAL_CALL HierarchyDataAccess::release()
+ throw()
+{
+ OWeakObject::release();
+}
// virtual
uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
