bin/find-unused-defines.awk | 2
bin/find-unused-defines.sh | 17
config_host/config_version.h.in | 3
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 7
dbaccess/source/inc/apitools.hxx | 38
forms/source/inc/property.hxx | 20
framework/inc/macros/xinterface.hxx | 392 ----------
framework/inc/macros/xtypeprovider.hxx | 358 ---------
include/comphelper/classids.hxx | 54 -
include/i18nlangtag/lang.h | 11
include/toolkit/helper/macros.hxx | 17
include/tools/diagnose_ex.h | 20
include/tools/rtti.hxx | 7
include/tools/stream.hxx | 6
include/tubes/file-transfer-helper.h | 8
include/ucbhelper/macros.hxx | 47 -
onlineupdate/source/update/updater/nsWindowsRestart.cxx | 6
scp2/inc/macros.inc | 31
sd/source/ui/app/menuids_tmpl.src | 8
sd/source/ui/app/tbxids_tmpl.src | 8
sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h | 3
svl/source/inc/poolio.hxx | 14
svx/inc/globlmn_tmpl.hrc | 26
ucb/source/core/provprox.cxx | 5
ucb/source/core/provprox.hxx | 6
ucb/source/ucp/package/pkgcontent.cxx | 4
ucb/source/ucp/package/pkgcontent.hxx | 8
vcl/inc/unx/gtk/gloactiongroup.h | 6
vcl/source/filter/jpeg/jinclude.h | 9
29 files changed, 14 insertions(+), 1127 deletions(-)
New commits:
commit efac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 24 13:39:49 2015 +0200
remove some unused defines
Change-Id: Ib2d50e8c29ccbc5ffcb52cdff4ae3eaae9a62188
Reviewed-on: https://gerrit.libreoffice.org/17332
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/bin/find-unused-defines.awk b/bin/find-unused-defines.awk
index c5c5296..193986e 100644
--- a/bin/find-unused-defines.awk
+++ b/bin/find-unused-defines.awk
@@ -6,6 +6,8 @@
END {
tmp = substr(y, 0, index(y, ":")-1)
if (x==1) print "sed -i '/[[:space:]]" p1 "[[:space:]]/d' " tmp
+ # mark these as potential places to inline a constant
+ if (x==2) print "#inline " p1 " " tmp
}
diff --git a/bin/find-unused-defines.sh b/bin/find-unused-defines.sh
index 6c07de4..bd03cdc 100755
--- a/bin/find-unused-defines.sh
+++ b/bin/find-unused-defines.sh
@@ -10,17 +10,16 @@
# Algorithm Detail:
# (1) find #defines, excluding the externals folder
# (2) extract just the constant name from the search results
-# (3) trim blank lines
-# (4) sort the results, mostly so I have an idea how far along the process is
-# (5) for each result:
-# (6) grep for the constant
-# (7) use awk to to check if only one match for a given constant was found
-# (8) if so, generate a sed command to remove the #define
+# (3) sort and uniq the results, mostly so I have an idea how far along the process is
+# (4) for each result:
+# (5) grep for the constant
+# (6) use awk to to check if only one match for a given constant was found
+# (7) if so, generate a sed command to remove the #define
#
-git grep -P '^#define\s+\w+\s+\w' -- "[!e][!x][!t]*" \
- | cut -s -d ' ' -f 2 \
- | sed '/^$/d' \
+git grep -hP '^#define\s+\w+.*\\' -- "[!e][!x][!t]*" \
+ | sed -r 's/#define[ ]+([a-zA-Z0-9_]+).*/\1/' \
| sort \
+ | uniq \
| xargs -Ixxx sh -c \
"git grep -w 'xxx' | awk -f bin/find-unused-defines.awk -v p1=xxx && echo \"xxx\" 1>&2"
diff --git a/config_host/config_version.h.in b/config_host/config_version.h.in
index cc9cd98..40c7dad 100644
--- a/config_host/config_version.h.in
+++ b/config_host/config_version.h.in
@@ -21,7 +21,4 @@ Version settings
LIBO_VERSION_STRINGIFY(LIBO_VERSION_MICRO) "." \
LIBO_VERSION_STRINGIFY(LIBO_VERSION_PATCH)
-#define LIBO_VERSION_ENCODED_IN_32BITS \
- ((LIBO_VERSION_MAJOR << 24) | (LIBO_VERSION_MINOR << 16) | (LIBO_VERSION_MICRO << 8) | LIBO_VERSION_PATCH)
-
#endif
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 9125163..7b826e0 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -188,13 +188,6 @@ static nsresult insertPABDescription()
#define NS_RDF_CONTRACTID "@mozilla.org/rdf"
#define NS_RDF_DATASOURCE_CONTRACTID NS_RDF_CONTRACTID "/datasource;1"
#define NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_RDF_DATASOURCE_CONTRACTID "?name="
-#define NS_ABDIRECTORYDATASOURCE_CONTRACTID \
- NS_RDF_DATASOURCE_CONTRACTID_PREFIX "addressdirectory"
-#define NS_ABDIRECTORYDATASOURCE_CID \
-{ /* 0A79186D-F754-11d2-A2DA-001083003D0C */ \
- 0xa79186d, 0xf754, 0x11d2, \
- {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc} \
-}
// Case where we get a parent uri, and need to list its children.
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 6672420..330a7e0 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -160,12 +160,6 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
-#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \
- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
- IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
-
#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
@@ -182,14 +176,6 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
-#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
-
-#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
-
// XTypeProvider helpers
#define DECLARE_IMPLEMENTATION_ID( ) \
@@ -199,10 +185,6 @@ public:
#define DECLARE_GETTYPES( ) \
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-#define DECLARE_TYPEPROVIDER( ) \
- DECLARE_GETTYPES( ) \
- DECLARE_IMPLEMENTATION_ID( )
-
#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \
::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \
{ \
@@ -242,14 +224,6 @@ public:
); \
}
-#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
- IMPLEMENT_IMPLEMENTATION_ID( classname) \
- IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 )
-
-#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \
- IMPLEMENT_IMPLEMENTATION_ID( classname) \
- IMPLEMENT_GETTYPES3(classname, baseclass1, baseclass2, baseclass3 )
-
// helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper
#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
@@ -293,33 +267,21 @@ public:
#define DECL_PROP0_BOOL(varname) \
DECL_PROP_IMPL(varname, cppu::UnoType<bool>::get()) 0)
-#define DECL_PROP0_IFACE(varname, iface) \
- DECL_PROP_IMPL(varname, cppu::UnoType<iface>::get()) 0)
-
#define DECL_PROP1(varname, type, attrib1) \
DECL_PROP_IMPL(varname, cppu::UnoType<type>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1)
#define DECL_PROP1_BOOL(varname, attrib1) \
DECL_PROP_IMPL(varname, cppu::UnoType<bool>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1)
-#define DECL_PROP1_IFACE(varname, iface, attrib1) \
- DECL_PROP_IMPL(varname, cppu::UnoType<iface>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1)
-
#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \
DECL_PROP_IMPL(varname, cppu::UnoType<iface>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
#define DECL_PROP2(varname, type, attrib1, attrib2) \
DECL_PROP_IMPL(varname, cppu::UnoType<type>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
-#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \
- DECL_PROP_IMPL(varname, cppu::UnoType<bool>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
-
#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \
DECL_PROP_IMPL(varname, cppu::UnoType<type>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
-#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \
- DECL_PROP_IMPL(varname, cppu::UnoType<bool>::get()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
-
#define END_PROPERTY_SEQUENCE() \
OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 1ae8ebc..bfbc55f 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -155,14 +155,6 @@ public:
// === some property types require special handling
// === such as interfaces
-#define DECL_IFACE_PROP0(varname, type) \
- DECL_IFACE_PROP_IMPL(varname, type) 0)
-
-
-#define DECL_IFACE_PROP1(varname, type, attrib1) \
- DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1)
-
-
#define DECL_IFACE_PROP2(varname, type, attrib1, attrib2) \
DECL_IFACE_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2)
@@ -176,10 +168,6 @@ public:
// === or Boolean properties
-#define DECL_BOOL_PROP0(varname) \
- DECL_BOOL_PROP_IMPL(varname) 0)
-
-
#define DECL_BOOL_PROP1(varname, attrib1) \
DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1)
@@ -198,10 +186,6 @@ public:
-#define REGISTER_PROP_1( prop, member, attrib1 ) \
- registerProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::attrib1, \
- &member, cppu::UnoType<decltype(member)>::get() );
-
#define REGISTER_PROP_2( prop, member, attrib1, attrib2 ) \
registerProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::attrib1 | PropertyAttribute::attrib2, \
&member, cppu::UnoType<decltype(member)>::get() );
@@ -211,10 +195,6 @@ public:
&member, cppu::UnoType<decltype(member)>::get() );
-#define REGISTER_VOID_PROP_1( prop, memberAny, type, attrib1 ) \
- registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::MAYBEVOID | PropertyAttribute::attrib1, \
- &memberAny, cppu::UnoType<type>::get() );
-
#define REGISTER_VOID_PROP_2( prop, memberAny, type, attrib1, attrib2 ) \
registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::MAYBEVOID | PropertyAttribute::attrib1 | PropertyAttribute::attrib2, \
&memberAny, cppu::UnoType<type>::get() );
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 2c2f378..d32eb7c 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -212,67 +212,6 @@ ________________________________________________________________________________
// public
// implementation of XInterface
-// implementation of XInterface with 0 additional interface for queryInterface()
-#define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \
- PRIVATE_DEFINE_XINTERFACE_PURE ( CLASS, \
- BASECLASS \
- )
-
-// implementation of XInterface with 1 additional interface for queryInterface()
-#define DEFINE_XINTERFACE_1( CLASS, BASECLASS, INTERFACE1 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE1 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 2 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_2( CLASS, BASECLASS, INTERFACE1, INTERFACE2 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE1 , \
- INTERFACE2 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 3 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_3( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 4 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_4( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 5 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_5( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 \
- ) \
- ) \
- )
-
// implementation of XInterface with 6 additional interfaces for queryInterface()
#define DEFINE_XINTERFACE_6( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \
PRIVATE_DEFINE_XINTERFACE ( CLASS, \
@@ -287,72 +226,6 @@ ________________________________________________________________________________
) \
)
-// implementation of XInterface with 7 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_7( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_7 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 8 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_8( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_8 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 9 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_9( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_9 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 10 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_10( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \
- PRIVATE_DEFINE_XINTERFACE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_10 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 \
- ) \
- ) \
- )
-
// implementation of XInterface with 11 additional interfaces for queryInterface()
#define DEFINE_XINTERFACE_11( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \
PRIVATE_DEFINE_XINTERFACE ( CLASS, \
@@ -372,271 +245,6 @@ ________________________________________________________________________________
) \
)
-// implementation of XInterface with 12 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_12( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE12 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 13 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_13( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE12 , \
- INTERFACE13 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 14 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_14( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 15 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_15( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 , \
- INTERFACE15 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 16 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_16( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 , \
- INTERFACE15 , \
- INTERFACE16 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 17 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_17( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_6 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 , \
- INTERFACE15 , \
- INTERFACE16 , \
- INTERFACE17 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 18 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_18( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_7 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 , \
- INTERFACE15 , \
- INTERFACE16 , \
- INTERFACE17 , \
- INTERFACE18 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 19 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_19( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_8 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 , \
- INTERFACE15 , \
- INTERFACE16 , \
- INTERFACE17 , \
- INTERFACE18 , \
- INTERFACE19 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 20 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_20( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_9 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 , \
- INTERFACE15 , \
- INTERFACE16 , \
- INTERFACE17 , \
- INTERFACE18 , \
- INTERFACE19 , \
- INTERFACE20 \
- ) \
- ) \
- )
-
-// implementation of XInterface with 21 additional interfaces for queryInterface()
-#define DEFINE_XINTERFACE_21( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20, INTERFACE21 ) \
- PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
- BASECLASS, \
- ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \
- INTERFACE2 , \
- INTERFACE3 , \
- INTERFACE4 , \
- INTERFACE5 , \
- INTERFACE6 , \
- INTERFACE7 , \
- INTERFACE8 , \
- INTERFACE9 , \
- INTERFACE10 , \
- INTERFACE11 \
- ) \
- ), \
- ( aType, PRIVATE_DEFINE_INTERFACE_10 ( INTERFACE12 , \
- INTERFACE13 , \
- INTERFACE14 , \
- INTERFACE15 , \
- INTERFACE16 , \
- INTERFACE17 , \
- INTERFACE18 , \
- INTERFACE19 , \
- INTERFACE20 , \
- INTERFACE21 \
- ) \
- ) \
- )
-
// implementation of XInterface with 22 additional interfaces for queryInterface()
#define DEFINE_XINTERFACE_22( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20, INTERFACE21, INTERFACE22 ) \
PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index d6e463c..8fb243d1 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -269,54 +269,7 @@ ________________________________________________________________________________
// implementation of XTypeProvider without additional interface for getTypes()
// XTypeProvider is used as the only one interface automatically.
-// Following defines don't use XTypeProvider automatically!!!!
-#define DEFINE_XTYPEPROVIDER_0( CLASS ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS )
-// implementation of XTypeProvider with 1 additional interface for getTypes()
-#define DEFINE_XTYPEPROVIDER_1( CLASS, TYPE1 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \
- )) \
- )
-
-// implementation of XTypeProvider with 2 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_2( CLASS, TYPE1, TYPE2 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \
- TYPE2 \
- )) \
- )
-
-// implementation of XTypeProvider with 3 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_3( CLASS, TYPE1, TYPE2, TYPE3 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \
- TYPE2 , \
- TYPE3 \
- )) \
- )
-
-// implementation of XTypeProvider with 4 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_4( CLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 \
- )) \
- )
-
-// implementation of XTypeProvider with 5 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_5( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 \
- )) \
- )
// implementation of XTypeProvider with 6 additional interfaces for getTypes()
#define DEFINE_XTYPEPROVIDER_6( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \
@@ -330,64 +283,6 @@ ________________________________________________________________________________
)) \
)
-// implementation of XTypeProvider with 7 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_7( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_7 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 \
- )) \
- )
-
-// implementation of XTypeProvider with 8 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_8( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_8 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 \
- )) \
- )
-
-// implementation of XTypeProvider with 9 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_9( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_9 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 \
- )) \
- )
-
-// implementation of XTypeProvider with 10 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_10( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_10 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 \
- )) \
- )
-
// implementation of XTypeProvider with 11 additional interfaces for getTypes()
#define DEFINE_XTYPEPROVIDER_11( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \
PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
@@ -405,212 +300,6 @@ ________________________________________________________________________________
)) \
)
-// implementation of XTypeProvider with 12 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_12( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )) \
- )
-
-// implementation of XTypeProvider with 13 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_13( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_1 ( TYPE13 \
- )) \
- )
-
-// implementation of XTypeProvider with 14 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_14( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_2 ( TYPE13 , \
- TYPE14 \
- )) \
- )
-
-// implementation of XTypeProvider with 15 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_15( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_3 ( TYPE13 , \
- TYPE14 , \
- TYPE15 \
- )) \
- )
-
-// implementation of XTypeProvider with 16 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_16( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_4 ( TYPE13 , \
- TYPE14 , \
- TYPE15 , \
- TYPE16 \
- )) \
- )
-
-// implementation of XTypeProvider with 17 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_17( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_5 ( TYPE13 , \
- TYPE14 , \
- TYPE15 , \
- TYPE16 , \
- TYPE17 \
- )) \
- )
-
-// implementation of XTypeProvider with 18 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_18( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_6 ( TYPE13 , \
- TYPE14 , \
- TYPE15 , \
- TYPE16 , \
- TYPE17 , \
- TYPE18 \
- )) \
- )
-
-// implementation of XTypeProvider with 19 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_19( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_7 ( TYPE13 , \
- TYPE14 , \
- TYPE15 , \
- TYPE16 , \
- TYPE17 , \
- TYPE18 , \
- TYPE19 \
- )) \
- )
-
-// implementation of XTypeProvider with 20 additional interfaces for getTypes()
-#define DEFINE_XTYPEPROVIDER_20( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19, TYPE20 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
- (PRIVATE_DEFINE_TYPE_8 ( TYPE13 , \
- TYPE14 , \
- TYPE15 , \
- TYPE16 , \
- TYPE17 , \
- TYPE18 , \
- TYPE19 , \
- TYPE20 \
- )) \
- )
-
// implementation of XTypeProvider with 20 additional interfaces for getTypes()
#define DEFINE_XTYPEPROVIDER_21( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19, TYPE20, TYPE21 ) \
PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
@@ -639,53 +328,6 @@ ________________________________________________________________________________
)) \
)
-// implementation of XTypeProvider with 1 additional interface for getTypes() AND using 1 baseclass
-#define DEFINE_XTYPEPROVIDER_1_WITH_BASECLASS( CLASS, BASECLASS, TYPE1 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \
- BASECLASS, \
- (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \
- )) \
- )
-
-// implementation of XTypeProvider with 2 additional interface for getTypes() AND using 1 baseclass
-#define DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2 ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \
- BASECLASS, \
- (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \
- TYPE2 \
- )) \
- )
-
-// implementation of XTypeProvider with 3 additional interface for getTypes() AND using 1 baseclass
-#define DEFINE_XTYPEPROVIDER_3_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3 ) \
... etc. - the rest is truncated