diff options
29 files changed, 14 insertions, 1127 deletions
diff --git a/bin/find-unused-defines.awk b/bin/find-unused-defines.awk index c5c52963975b..193986ea2466 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 6c07de4aeea5..bd03cdcfa075 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 cc9cd98c2e5a..40c7dad24cd8 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 912516344715..7b826e09058d 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 6672420abac6..330a7e06b689 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 1ae8ebcffa71..bfbc55f6b558 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 2c2f378639dc..d32eb7caa207 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 d6e463c5ae3f..8fb243d1bd38 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 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \ - TYPE2 , \ - TYPE3 \ - )) \ - ) -// implementation of XTypeProvider with 4 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_4_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 \ - )) \ - ) -// implementation of XTypeProvider with 5 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_5_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 \ - )) \ - ) } // namespace framework diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx index 0658f79570bf..edb488573b3b 100644 --- a/include/comphelper/classids.hxx +++ b/include/comphelper/classids.hxx @@ -67,18 +67,6 @@ * StarWriter/Web */ -/* 4.0 */ - -#define SO3_SWWEB_CLASSID_40 \ - 0xf0caa840, 0x7821, 0x11d0, 0xa4, 0xa7, 0x0, \ - 0xa0, 0x24, 0x9d, 0x57, 0xb1 - -/* 5.0 */ - -#define SO3_SWWEB_CLASSID_50 \ - 0xc20cf9d2, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \ - 0x60, 0x97, 0xda, 0x56, 0x1a - /* 6.0, 7, 8 */ #define SO3_SWWEB_CLASSID_60 \ @@ -93,18 +81,6 @@ * Globaldokument */ -/* 4.0 */ - -#define SO3_SWGLOB_CLASSID_40 \ - 0x340ac970, 0xe30d, 0x11d0, 0xa5, 0x3f, 0x0, \ - 0xa0, 0x24, 0x9d, 0x57, 0xb1 - -/* 5.0 */ - -#define SO3_SWGLOB_CLASSID_50 \ - 0xc20cf9d3, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \ - 0x60, 0x97, 0xda, 0x56, 0x1a - /* 6.0, 7, 8 */ #define SO3_SWGLOB_CLASSID_60 \ @@ -286,31 +262,6 @@ 0x80243D39, 0x6741, 0x46C5, 0x92, 0x6E, 0x06, \ 0x91, 0x64, 0xFF, 0x87, 0xBB -/**************************************************** -* StarImage -****************************************************/ - -/* 3.0 */ - -#define SO3_SIM_CLASSID_30 \ - 0xEA60C941L, 0x2C6C, 0x101C, 0x8E, 0x2C, 0x00, \ - 0x00, 0x1B, 0x4C, 0xC7, 0x11 - -/* 4.0 */ - -#define SO3_SIM_CLASSID_40 \ - 0x447BB8A0L, 0x41FB, 0x11D0, 0x89, 0xCA, 0x00, \ - 0x80, 0x29, 0xE4, 0xB0, 0xB1 - -/* 5.0 */ - -#define SO3_SIM_CLASSID_50 \ - 0x65c68d00L, 0x85de, 0x11d1, 0x89, 0xd0, 0x00, \ - 0x80, 0x29, 0xe4, 0xb0, 0xb1 - -/* aktuell */ - - /*************************************************** * StarMath ***************************************************/ @@ -379,11 +330,6 @@ 0xd7896d52, 0xb7af, 0x4820, \ 0x9d, 0xfe, 0xd4, 0x04, 0xd0, 0x15, 0x96, 0x0f -#define SO3_RPT_SCH_CLASSID_90 \ - 0x80243d39, 0x6741, 0x46c5, \ - 0x92, 0x6e, 0x06, 0x91, 0x64, 0xff, 0x87, 0xbb - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index fdfce88fcbb0..22b0ed1f6792 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -91,17 +91,6 @@ typedef unsigned short LanguageType; #define LANGUAGE_MASK_PRIMARY 0x03ff -#ifdef __cplusplus -/* Please use the methods provided in mslangid.hxx for type-safety! */ -#else -#define MSLANGID_MAKELANGID( nSubLangId, nPriLangId ) \ - (((nSubLangId) << 10) | (nPriLangId)) -#define MSLANGID_GETPRIMARYLANGUAGE( nLangID ) \ - ((nLangID) & LANGUAGE_MASK_PRIMARY) -#define MSLANGID_GETSUBLANGUAGE( nLangID ) \ - (((nLangID) & ~LANGUAGE_MASK_PRIMARY) >> 10) -#endif - #define LANGUAGE_DONTKNOW 0x03FF /* yes, the mask */ #define LANGUAGE_NONE 0x00FF diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 855cff7be1e1..bfe3a0822a52 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -275,23 +275,6 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa return aNames; \ } \ - - -#define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \ - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ - { \ - ::com::sun::star::uno::Sequence< OUString > aNames( 1 ); \ - aNames[ 0 ] = OUString::createFromAscii( ServiceName ); \ - return aNames; \ - } \ - DECLIMPL_SUPPORTS_SERVICE( ) - - - - - - #endif // INCLUDED_TOOLKIT_HELPER_MACROS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h index 55cfe16a4f19..12946154d16b 100644 --- a/include/tools/diagnose_ex.h +++ b/include/tools/diagnose_ex.h @@ -125,26 +125,6 @@ return; \ } -/** asserts a given condition (in debug mode), and continues the most-inner - loop if the condition is not met -*/ -#define ENSURE_OR_CONTINUE( c, m ) \ - if ( !(c) ) \ - { \ - OSL_ENSURE( false, m ); \ - continue; \ - } - -/** asserts a given condition (in debug mode), and continues the most-inner - loop if the condition is not met -*/ -#define ENSURE_OR_BREAK( c, m ) \ - if ( !(c) ) \ - { \ - OSL_ENSURE( false, m ); \ - break; \ - } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx index 1bc9c448c3d5..9f178d2ae739 100644 --- a/include/tools/rtti.hxx +++ b/include/tools/rtti.hxx @@ -39,13 +39,6 @@ typedef void* (*TypeId)(); virtual TypeId Type() const SAL_OVERRIDE; \ virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE -#define TYPEINFO_VISIBILITY(visibility) \ - visibility static void* CreateType(); \ - visibility static TypeId StaticType(); \ - visibility static bool IsOf( TypeId aSameOrSuperType ); \ - visibility virtual TypeId Type() const; \ - visibility virtual bool IsA( TypeId aSameOrSuperType ) const - #define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \ visibility static void* CreateType(); \ visibility static TypeId StaticType(); \ diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 202e3ff5a6ff..3b9f26891ae5 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -61,12 +61,6 @@ namespace o3tl template<> struct typed_flags<StreamMode> : is_typed_flags<StreamMode, 0x0f1f> {}; } -#define STREAM_READWRITEBITS (StreamMode::READ | StreamMode::WRITE | \ - StreamMode::NOCREATE | StreamMode::TRUNC) - -#define STREAM_SHAREBITS (StreamMode::SHARE_DENYNONE | StreamMode::SHARE_DENYREAD |\ - StreamMode::SHARE_DENYWRITE | StreamMode::SHARE_DENYALL) - #define STREAM_READWRITE (StreamMode::READ | StreamMode::WRITE) #define STREAM_SHARE_DENYREADWRITE (StreamMode::SHARE_DENYREAD | StreamMode::SHARE_DENYWRITE) diff --git a/include/tubes/file-transfer-helper.h b/include/tubes/file-transfer-helper.h index 5754314f86bf..25a4ce9faa7c 100644 --- a/include/tubes/file-transfer-helper.h +++ b/include/tubes/file-transfer-helper.h @@ -38,16 +38,8 @@ G_BEGIN_DECLS #define EMPATHY_FT_HANDLER(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ EMPATHY_TYPE_FT_HANDLER, EmpathyFTHandler)) -#define EMPATHY_FT_HANDLER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - EMPATHY_TYPE_FT_HANDLER, EmpathyFTHandlerClass)) #define EMPATHY_IS_FT_HANDLER(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_FT_HANDLER)) -#define EMPATHY_IS_FT_HANDLER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_FT_HANDLER)) -#define EMPATHY_FT_HANDLER_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - EMPATHY_TYPE_FT_HANDLER, EmpathyFTHandlerClass)) typedef struct _EmpathyFTHandlerPriv EmpathyFTHandlerPriv; diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index b51d7429d8ac..13ebe03ffcb7 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -112,45 +112,6 @@ GETTYPES_IMPL_START( Class ) \ CPPU_TYPE_REF( I5 ) \ GETTYPES_IMPL_END -// 6 interfaces supported -#define XTYPEPROVIDER_IMPL_6( Class, I1,I2,I3,I4,I5,I6 ) \ -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 ) \ -GETTYPES_IMPL_END - -// 7 interfaces supported -#define XTYPEPROVIDER_IMPL_7( Class, I1,I2,I3,I4,I5,I6,I7 ) \ -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 ) \ -GETTYPES_IMPL_END - -// 8 interfaces supported -#define XTYPEPROVIDER_IMPL_8( Class, I1,I2,I3,I4,I5,I6,I7,I8 ) \ -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 ) \ -GETTYPES_IMPL_END - // 9 interfaces supported #define XTYPEPROVIDER_IMPL_9( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \ XTYPEPROVIDER_COMMON_IMPL( Class ) \ @@ -300,14 +261,6 @@ Class::getSupportedServiceNames_Static() \ // Service with service factory. // Own implementation of getSupportedServiceNames_Static(). -#define XSERVICEINFO_IMPL_0( Class, ImplName ) \ -XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ -XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ - \ -com::sun::star::uno::Sequence< OUString > \ -Class::getSupportedServiceNames_Static() - -// Own implementation of getSupportedServiceNames_Static(). #define XSERVICEINFO_IMPL_0_CTX( Class, ImplName ) \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ diff --git a/onlineupdate/source/update/updater/nsWindowsRestart.cxx b/onlineupdate/source/update/updater/nsWindowsRestart.cxx index 8623d5117baf..5ecf70e2aac8 100644 --- a/onlineupdate/source/update/updater/nsWindowsRestart.cxx +++ b/onlineupdate/source/update/updater/nsWindowsRestart.cxx @@ -55,12 +55,6 @@ // Everything else is not a surrogate: 0x000 -- 0xD7FF, 0xE000 -- 0xFFFF -// N = (H - 0xD800) * 0x400 + 0x10000 + (L - 0xDC00) -// I wonder whether we could somehow assert that H is a high surrogate -// and L is a low surrogate -#define SURROGATE_TO_UCS4(h, l) (((uint32_t(h) & 0x03FF) << 10) + \ - (uint32_t(l) & 0x03FF) + PLANE1_BASE) - // Extract surrogates from a UCS4 char // Reference: the Unicode standard 4.0, section 3.9 // Since (c - 0x10000) >> 10 == (c >> 10) - 0x0080 and diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 47f59f17e9e3..54e5bc6c709f 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -103,10 +103,6 @@ TXT_FILE_BODY; \ Styles = (PACKED) -#define ARCHIVE_TXT_FILE_BODY \ - TXT_FILE_BODY; \ - Styles = (ARCHIVE) - #ifdef WITH_HELPPACK_INTEGRATION #define FILELIST_TXT_FILE_BODY_HELPPACK \ TXT_FILE_BODY; \ @@ -196,15 +192,6 @@ End Styles = (PACKED); \ End -#define STD_FONTWIN_FILE(id,name,fontname) \ - File id \ - TXT_FILE_BODY; \ - Dir = gid_Dir_Fonts_Truetype; \ - Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \ - Name = STRING(name) ; \ - NetDir = gid_Dir_Winfonts; \ - End - #ifdef UNX #define STD_FONT_FILELIST(id,name) \ File id \ @@ -241,14 +228,6 @@ End Styles = (PACKED); \ End -#define STD_PY_FILE(id,name) \ - File id \ - PACKED_TXT_FILE_BODY; \ - Dir = GID_DIR_PY; \ - Name = name; \ - End - - #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ ParentID = modid; \ @@ -377,16 +356,6 @@ End Styles = (); \ End -#define REGISTRY_ENTRY_KINDMAP(name, modid, key) \ - RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \ - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ - ModuleID = modid; \ - ComponentCondition = STRING(VersionNT >= 600); \ - Subkey = STRING(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap); \ - Name = STRING(CONCAT2(.,key)); \ - Value = STRING(document); \ - End - #define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ CONDITIONAL_MODULE_ENTRY(name,modid) \ REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \ diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index bf3083077840..5221ff1f35f2 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -76,14 +76,6 @@ Text [ en-US ] = "Page ~Layout" ; \ }; -#define MN_MODIFY_SLIDE \ - MenuItem\ - {\ - Identifier = SID_MODIFYPAGE ; \ - HelpId = CMD_SID_MODIFYPAGE ; \ - Text [ en-US ] = "Slide ~Layout" ; \ - }; - #define MN_FORMAT_PAGE \ MenuItem\ {\ diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 6e790cd80e45..d175504f6a49 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -429,14 +429,6 @@ AutoCheck = TRUE ; \ }; -#define TBI_SOLID_CREATE \ - ToolBoxItem\ - {\ - Identifier = SID_SOLID_CREATE ; \ - HelpID = SID_SOLID_CREATE ; \ - AutoCheck = TRUE ; \ - }; - #define TBI_LEAVE_ALL_GROUPS \ ToolBoxItem\ {\ diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h index 11d927a60fa5..b8411e57ad56 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h @@ -258,9 +258,6 @@ enum kDebugInterruptDepthMask = 0x00FF0000 }; -#define DebugExtractTaskLevelInterruptLevel( LEVEL ) \ - ( ( ( LEVEL ) &kDebugInterruptLevelMask ) >> kDebugInterruptLevelShift ) - #define DebugExtractTaskLevelInterruptDepth( LEVEL ) \ ( ( ( LEVEL ) &kDebugInterruptDepthMask ) >> kDebugInterruptDepthShift ) diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 7e659430a3b1..8575a2e21b2d 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -181,20 +181,6 @@ struct SfxItemPool_Impl } \ } -#define CHECK_FILEFORMAT_RELEASE( rStream, nTag, pPointer ) \ - { sal_uInt16 nFileTag; \ - rStream.ReadUInt16( nFileTag ); \ - if ( nTag != nFileTag ) \ - { \ - OSL_FAIL( #nTag ); /*! s.u. */ \ - /*! Set error code and evaluate! */ \ - (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ - pImp->bStreaming = false; \ - delete pPointer; \ - return rStream; \ - } \ - } - #define CHECK_FILEFORMAT2( rStream, nTag1, nTag2 ) \ { sal_uInt16 nFileTag; \ rStream.ReadUInt16( nFileTag ); \ diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 8d8248914e21..17d201aebbdf 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -243,11 +243,6 @@ Command = ".uno:Paste" ; \ Text [ en-US ] = "~Paste" ; \ -#define ITEM_EDIT_IMAP \ - Identifier = SID_IMAP ; \ - Command = ".uno:ImageMapDialog" ; \ - Text [ en-US ] = "ImageMap" ; \ - #define ITEM_EXTERNAL_EDIT \ Identifier = SID_EXTERNAL_EDIT ; \ Command = ".uno:ExternalEdit" ; \ @@ -408,32 +403,11 @@ Toolbar-IDs ------------------------------------------------------------------------*/ -#define ITEM_TOOLBAR_TEMPLATE_APPLY \ - Identifier = SID_STYLE_APPLY ; \ - Command = ".uno:StyleApply" ; \ - #define ITEM_TOOLBAR_ATTR_CHAR_COLOR \ Identifier = SID_ATTR_CHAR_COLOR ; \ Command = ".uno:Color" ; \ DropDown = TRUE ; -#define ITEM_TOOLBAR_BACKGROUND_COLOR \ - Identifier = SID_BACKGROUND_COLOR ; \ - Command = ".uno:BackgroundColor" ; \ - DropDown = TRUE ; - -#define ITEM_TOOLBAR_ATTR_BORDER \ - Identifier = SID_ATTR_BORDER ; \ - Command = ".uno:BorderStyle" ; \ - -#define ITEM_TOOLBAR_FRAME_LINESTYLE \ - Identifier = SID_FRAME_LINESTYLE ; \ - Command = ".uno:LineStyle" ; \ - -#define ITEM_TOOLBAR_FRAME_LINECOLOR \ - Identifier = SID_FRAME_LINECOLOR ; \ - Command = ".uno:FrameLineColor" ; \ - #define ITEM_TOOLBAR_ATTR_LINEEND_STYLE \ Identifier = SID_ATTR_LINEEND_STYLE ; \ Command = ".uno:LineEndStyle" ; \ diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index db5f4cd4ee2a..b77ab69b7b55 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -54,7 +54,7 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory() XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory, OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ), - PROVIDER_FACTORY_SERVICE_NAME ); + "com.sun.star.ucb.ContentProviderProxyFactory" ); @@ -185,8 +185,7 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy, OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ), - PROVIDER_PROXY_SERVICE_NAME ); - + "com.sun.star.ucb.ContentProviderProxy" ); // XContentProvider methods. diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index e217e964f437..03ab40fb1aea 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -34,12 +34,6 @@ -#define PROVIDER_FACTORY_SERVICE_NAME \ - "com.sun.star.ucb.ContentProviderProxyFactory" -#define PROVIDER_PROXY_SERVICE_NAME \ - "com.sun.star.ucb.ContentProviderProxy" - - // class UcbContentProviderProxyFactory. diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 0bf3c71ad616..864593a901b9 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -417,9 +417,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { uno::Sequence< OUString > aSNS( 1 ); if ( isFolder() ) - aSNS.getArray()[ 0 ] = PACKAGE_FOLDER_CONTENT_SERVICE_NAME; + aSNS.getArray()[ 0 ] = "com.sun.star.ucb.PackageFolderContent"; else - aSNS.getArray()[ 0 ] = PACKAGE_STREAM_CONTENT_SERVICE_NAME; + aSNS.getArray()[ 0 ] = "com.sun.star.ucb.PackageStreamContent"; return aSNS; } diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index b5e4f8d26f74..9f909ce7793f 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -59,14 +59,6 @@ namespace package_ucp -// UNO service name for the content. -#define PACKAGE_FOLDER_CONTENT_SERVICE_NAME \ - "com.sun.star.ucb.PackageFolderContent" -#define PACKAGE_STREAM_CONTENT_SERVICE_NAME \ - "com.sun.star.ucb.PackageStreamContent" - - - struct ContentProperties { OUString aTitle; // Title diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h index ea005aef3935..080b679d38f6 100644 --- a/vcl/inc/unx/gtk/gloactiongroup.h +++ b/vcl/inc/unx/gtk/gloactiongroup.h @@ -18,14 +18,8 @@ G_BEGIN_DECLS #define G_TYPE_LO_ACTION_GROUP (g_lo_action_group_get_type ()) #define G_LO_ACTION_GROUP(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ G_TYPE_LO_ACTION_GROUP, GLOActionGroup)) -#define G_LO_ACTION_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ - G_TYPE_LO_ACTION_GROUP, GLOActionGroupClass)) #define G_IS_LO_ACTION_GROUP(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ G_TYPE_LO_ACTION_GROUP)) -#define G_IS_LO_ACTION_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - G_TYPE_LO_ACTION_GROUP)) -#define G_LO_ACTION_GROUP_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ - G_TYPE_LO_ACTION_GROUP, GLOActionGroupClass)) typedef struct _GLOActionGroupPrivate GLOActionGroupPrivate; typedef struct _GLOActionGroupClass GLOActionGroupClass; diff --git a/vcl/source/filter/jpeg/jinclude.h b/vcl/source/filter/jpeg/jinclude.h index edd608deacf4..4536a09c7acc 100644 --- a/vcl/source/filter/jpeg/jinclude.h +++ b/vcl/source/filter/jpeg/jinclude.h @@ -78,13 +78,4 @@ #define SIZEOF(object) ((size_t) sizeof(object)) -/* - * The modules that use fread() and fwrite() always invoke them through - * these macros. On some systems you may need to twiddle the argument casts. - * CAUTION: argument order is different from underlying functions! - */ -#define JFREAD(file,buf,sizeofbuf) \ - ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) -#define JFWRITE(file,buf,sizeofbuf) \ - ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) |