summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-03 09:55:21 +0200
committerNoel Grandin <noel@peralex.com>2015-08-03 11:12:31 +0200
commit0ea54aed15ee17a02c9dff861c16d06505f35741 (patch)
tree344e0be9c23b5c7941ad4012261bf5e38a135247 /framework
parent69df701742a9c3946e2031488c377c18a5ec4de0 (diff)
remove some unused defines
Change-Id: I85a9a2bc12681e13fc482374165ff9bd6858dc93
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/macros/xinterface.hxx16
-rw-r--r--framework/inc/macros/xtypeprovider.hxx58
2 files changed, 0 insertions, 74 deletions
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index d32eb7caa207..2667ec3286d2 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -63,18 +63,6 @@ ________________________________________________________________________________
}
// private
-// implementation of XInterface::queryInterface() without any other interfaces!
-
-#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS ) \
- ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \
- { \
- /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \
- /* I have no own supported interfaces ... */ \
- /* ... ask baseclass for interfaces! */ \
- return BASECLASS::queryInterface( aType ); \
- }
-
-// private
// implementation of XInterface::queryInterface() with max. 12 other interfaces!
#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES ) \
@@ -123,10 +111,6 @@ ________________________________________________________________________________
// private
// complete implementation of XInterface for different use cases
-#define PRIVATE_DEFINE_XINTERFACE_PURE( CLASS, BASECLASS ) \
- PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS ) \
- PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS )
-
#define PRIVATE_DEFINE_XINTERFACE( CLASS, BASECLASS, INTERFACES ) \
PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS ) \
PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES )
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 8fb243d1bd38..f26bc980c168 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -139,56 +139,6 @@ ________________________________________________________________________________
}
// private
-// implementation of XTypeProvider::getTypes() with using max. 12 interfaces + baseclass!
-
-#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES ) \
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException ) \
- { \
- /* Optimize this method ! */ \
- /* We initialize a static variable only one time. */ \
- /* And we don't must use a mutex at every call! */ \
- /* For the first call; pTypeCollection is NULL - */ \
- /* for the second call pTypeCollection is different from NULL! */ \
- static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL; \
- if ( pTypeCollection == NULL ) \
- { \
- /* Ready for multithreading; get global mutex for first call of this method only! see before */ \
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \
- /* Control these pointer again ... it can be, that another instance will be faster then these! */ \
- if ( pTypeCollection == NULL ) \
- { \
- /* Create static typecollection for my own interfaces! */ \
- static ::cppu::OTypeCollection aTypeCollection TYPES; \
- /* Copy all items from my list sequences and from my baseclass */ \
- /* to one result list! */ \
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes1 = aTypeCollection.getTypes(); \
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes2 = BASECLASS::getTypes(); \
- sal_Int32 nCount1 = seqTypes1.getLength(); \
- sal_Int32 nCount2 = seqTypes2.getLength(); \
- static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqResult ( nCount1+nCount2 ); \
- sal_Int32 nSource = 0; \
- sal_Int32 nDestination= 0; \
- while( nSource<nCount1 ) \
- { \
- seqResult[nDestination] = seqTypes1[nSource]; \
- ++nSource; \
- ++nDestination; \
- } \
- nSource = 0; \
- while( nSource<nCount2 ) \
- { \
- seqResult[nDestination] = seqTypes2[nSource]; \
- ++nSource; \
- ++nDestination; \
- } \
- /* ... and set his address to static pointer! */ \
- pTypeCollection = &seqResult; \
- } \
- } \
- return *pTypeCollection; \
- }
-
-// private
// help macros to replace TYPES in getTypes() [see before]
#define PRIVATE_DEFINE_TYPE_1( TYPE1 ) \
@@ -241,10 +191,6 @@ ________________________________________________________________________________
// private
// complete implementation of XTypeProvider
-#define PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, cppu::UnoType<com::sun::star::lang::XTypeProvider>::get())
-
#define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES ) \
PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES )
@@ -253,10 +199,6 @@ ________________________________________________________________________________
PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND )
-#define PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS( CLASS, BASECLASS, TYPES ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES )
-
// public
// declaration of XTypeProvider