Skip to content

C
core
Kaydet (Commit) c9e08e14 authored tarafından Jochen Nitschke's avatar Jochen Nitschke
Dosyalara gözat
Seçenekler

framework: remove unused macros 

Change-Id: I10589a17b9c01998a54328ea290983de72067f5e
Reviewed-on: https://gerrit.libreoffice.org/38540Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJochen Nitschke <j.nitschke+logerrit@ok.de>
üst 44221190
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 56 deletions
framework/inc/macros/xinterface.hxx
Dosyayı görüntüle @ c9e08e14
...@@ -20,12 +20,9 @@ ...@@ -20,12 +20,9 @@
#ifndef INCLUDED_FRAMEWORK_INC_MACROS_XINTERFACE_HXX #ifndef INCLUDED_FRAMEWORK_INC_MACROS_XINTERFACE_HXX
#define INCLUDED_FRAMEWORK_INC_MACROS_XINTERFACE_HXX #define INCLUDED_FRAMEWORK_INC_MACROS_XINTERFACE_HXX
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/Type.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <rtl/ustring.hxx>
namespace framework{ namespace framework{
...@@ -85,27 +82,13 @@ ________________________________________________________________________________ ...@@ -85,27 +82,13 @@ ________________________________________________________________________________
// private // private
// help macros to replace INTERFACES in queryInterface() [see before] // help macros to replace INTERFACES in queryInterface() [see before]
/* #define PRIVATE_DEFINE_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \
#ifdef ENABLE_SERVICEDEBUG INTERFACE1, \
#define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \
static_cast< XSPECIALDEBUGINTERFACE##* >( this ), \
INTERFACE1
#else
*/
#define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \
INTERFACE1
//#endif // #ifdef ENABLE_SERVICEDEBUG
#define PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \
PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ), \
INTERFACE2, \ INTERFACE2, \
INTERFACE3, \ INTERFACE3, \
INTERFACE4, \ INTERFACE4, \
INTERFACE5, \ INTERFACE5, \
INTERFACE6 INTERFACE6, \
#define PRIVATE_DEFINE_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \
PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \
INTERFACE7, \ INTERFACE7, \
INTERFACE8, \ INTERFACE8, \
INTERFACE9, \ INTERFACE9, \
...@@ -135,19 +118,6 @@ ________________________________________________________________________________ ...@@ -135,19 +118,6 @@ ________________________________________________________________________________
// public // public
// implementation of XInterface // implementation of XInterface
// 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, \
BASECLASS, \
( aType, PRIVATE_DEFINE_INTERFACE_6 ( INTERFACE1 , \
INTERFACE2 , \
INTERFACE3 , \
INTERFACE4 , \
INTERFACE5 , \
INTERFACE6 \
) \
) \
)
// implementation of XInterface with 11 additional interfaces for queryInterface() // 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 ) \ #define DEFINE_XINTERFACE_11( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \
......
framework/inc/macros/xtypeprovider.hxx
Dosyayı görüntüle @ c9e08e14
...@@ -21,13 +21,11 @@ ...@@ -21,13 +21,11 @@
#define INCLUDED_FRAMEWORK_INC_MACROS_XTYPEPROVIDER_HXX #define INCLUDED_FRAMEWORK_INC_MACROS_XTYPEPROVIDER_HXX
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/Type.hxx>
#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/typeprovider.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
namespace framework{ namespace framework{
...@@ -59,22 +57,16 @@ ________________________________________________________________________________ ...@@ -59,22 +57,16 @@ ________________________________________________________________________________
// private // private
// help macros to replace TYPES in getTypes() [see before] // help macros to replace TYPES in getTypes() [see before]
#define PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ #define PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \
cppu::UnoType<TYPE1>::get(), \ cppu::UnoType<TYPE1>::get(), \
cppu::UnoType<TYPE2>::get(), \ cppu::UnoType<TYPE2>::get(), \
cppu::UnoType<TYPE3>::get(), \ cppu::UnoType<TYPE3>::get(), \
cppu::UnoType<TYPE4>::get(), \ cppu::UnoType<TYPE4>::get(), \
cppu::UnoType<TYPE5>::get(), \ cppu::UnoType<TYPE5>::get(), \
cppu::UnoType<TYPE6>::get() cppu::UnoType<TYPE6>::get(), \
#define PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \
PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \
cppu::UnoType<TYPE7>::get(), \ cppu::UnoType<TYPE7>::get(), \
cppu::UnoType<TYPE8>::get(), \ cppu::UnoType<TYPE8>::get(), \
cppu::UnoType<TYPE9>::get() cppu::UnoType<TYPE9>::get(), \
#define PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \
PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \
cppu::UnoType<TYPE10>::get(), \ cppu::UnoType<TYPE10>::get(), \
cppu::UnoType<TYPE11>::get() cppu::UnoType<TYPE11>::get()
...@@ -122,18 +114,6 @@ ________________________________________________________________________________ ...@@ -122,18 +114,6 @@ ________________________________________________________________________________
// XTypeProvider is used as the only one interface automatically. // XTypeProvider is used as the only one interface automatically.
// implementation of XTypeProvider with 6 additional interfaces for getTypes()
#define DEFINE_XTYPEPROVIDER_6( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \
PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
(PRIVATE_DEFINE_TYPE_6 ( TYPE1 , \
TYPE2 , \
TYPE3 , \
TYPE4 , \
TYPE5 , \
TYPE6 \
)) \
)
// implementation of XTypeProvider with 11 additional interfaces for getTypes() // 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 ) \ #define DEFINE_XTYPEPROVIDER_11( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \
PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment