diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:05:49 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:37:48 +0300 |
commit | 951ed199f1a47c02dad3dc899b9804b4574a151d (patch) | |
tree | d8f82a3afa345351ce6a4a206424c6f2bd2aed46 /framework/inc/macros | |
parent | be616c26f990d651c752be201e29e2b89ba17f2a (diff) |
Kill superfluous vertical whitespace
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
Diffstat (limited to 'framework/inc/macros')
-rw-r--r-- | framework/inc/macros/generic.hxx | 2 | ||||
-rw-r--r-- | framework/inc/macros/registration.hxx | 3 | ||||
-rw-r--r-- | framework/inc/macros/xinterface.hxx | 11 | ||||
-rw-r--r-- | framework/inc/macros/xtypeprovider.hxx | 8 |
4 files changed, 0 insertions, 24 deletions
diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx index ee99f0ed834b..d8ab361e9866 100644 --- a/framework/inc/macros/generic.hxx +++ b/framework/inc/macros/generic.hxx @@ -23,10 +23,8 @@ #include <rtl/ustring.hxx> #include <rtl/textenc.h> - // generic macros - /*_________________________________________________________________________________________________________________ DECLARE_ASCII( SASCIIVALUE ) diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 2dff57de9543..fa2b6afb2492 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX #define INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX - #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -36,7 +35,6 @@ _________________________________________________________________________________________________________________*/ - // public // use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) @@ -50,7 +48,6 @@ ________________________________________________________________________________ xFactory = CLASS::impl_createFactory( xServiceManager ); \ } - // public // define method to instanciate new services diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 20dc382c6274..4651e6721be0 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -45,7 +45,6 @@ namespace framework{ _________________________________________________________________________________________________________________*/ - // private // implementation of XInterface::aquire() // XInterface::release() @@ -63,7 +62,6 @@ ________________________________________________________________________________ BASECLASS::release(); \ } - // private // implementation of XInterface::queryInterface() without any other interfaces! @@ -76,7 +74,6 @@ ________________________________________________________________________________ return BASECLASS::queryInterface( aType ); \ } - // private // implementation of XInterface::queryInterface() with max. 12 other interfaces! @@ -97,7 +94,6 @@ ________________________________________________________________________________ return aReturn; \ } - // private // implementation of XInterface::queryInterface() with more then 12 other interfaces! @@ -124,7 +120,6 @@ ________________________________________________________________________________ return aReturn; \ } - // private // complete implementation of XInterface for different use cases @@ -140,7 +135,6 @@ ________________________________________________________________________________ PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) - // private // help macros to replace INTERFACES in queryInterface() [see before] @@ -195,11 +189,9 @@ ________________________________________________________________________________ PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \ INTERFACE11 - // public // help macros for follow XInterface definitions - // Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN use an interface directly in queryInterface()! #define DIRECT_INTERFACE( INTERFACE ) \ static_cast< INTERFACE* >( this ) @@ -209,7 +201,6 @@ ________________________________________________________________________________ #define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \ static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) ) - // public // declaration of XInterface @@ -218,11 +209,9 @@ ________________________________________________________________________________ virtual void SAL_CALL acquire ( ) throw() SAL_OVERRIDE; \ virtual void SAL_CALL release ( ) throw() SAL_OVERRIDE; - // public // implementation of XInterface - // implementation of XInterface with 0 additional interface for queryInterface() #define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \ PRIVATE_DEFINE_XINTERFACE_PURE ( CLASS, \ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index 8b4f91e979df..cf8fcf6a628f 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -49,7 +49,6 @@ namespace framework{ _________________________________________________________________________________________________________________*/ - // private // implementation of XTypeProvider::getImplementationId() @@ -59,7 +58,6 @@ ________________________________________________________________________________ return css::uno::Sequence<sal_Int8>(); \ } - // private // implementation of XTypeProvider::getTypes() with max. 12 interfaces! @@ -89,7 +87,6 @@ ________________________________________________________________________________ return pTypeCollection->getTypes(); \ } - // private // implementation of XTypeProvider::getTypes() with more then 12 interfaces! @@ -141,7 +138,6 @@ ________________________________________________________________________________ return *pTypeCollection; \ } - // private // implementation of XTypeProvider::getTypes() with using max. 12 interfaces + baseclass! @@ -192,7 +188,6 @@ ________________________________________________________________________________ return *pTypeCollection; \ } - // private // help macros to replace TYPES in getTypes() [see before] @@ -243,7 +238,6 @@ ________________________________________________________________________________ PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE12 >*)NULL ) - // private // complete implementation of XTypeProvider @@ -263,7 +257,6 @@ ________________________________________________________________________________ PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES ) - // public // declaration of XTypeProvider @@ -271,7 +264,6 @@ ________________________________________________________________________________ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes () throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;\ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // public // implementation of XTypeProvider |