summaryrefslogtreecommitdiff
path: root/framework/inc/macros
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-06 19:36:08 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-06 19:37:48 +0300
commitee3945bd98194010656fa9b3366e7471b9f160fd (patch)
tree105c8722e412ae47582aeeb506d6ef135ab7a974 /framework/inc/macros
parent951ed199f1a47c02dad3dc899b9804b4574a151d (diff)
Kill superfluous spacing before semicolons
Change-Id: I53689e78221f3fe074e47d6b47f1a2c3fef96222
Diffstat (limited to 'framework/inc/macros')
-rw-r--r--framework/inc/macros/registration.hxx10
-rw-r--r--framework/inc/macros/xinterface.hxx2
-rw-r--r--framework/inc/macros/xserviceinfo.hxx4
-rw-r--r--framework/inc/macros/xtypeprovider.hxx16
4 files changed, 16 insertions, 16 deletions
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index fa2b6afb2492..66e70ce6ca71 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -57,16 +57,16 @@ ________________________________________________________________________________
void* /*pRegistryKey*/ ) \
{ \
/* Set default return value for this operation - if it failed. */ \
- void* pReturn = NULL ; \
+ void* pReturn = NULL; \
if ( \
( pImplementationName != NULL ) && \
( pServiceManager != NULL ) \
) \
{ \
/* Define variables which are used in following macros. */ \
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xFactory ; \
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager ; \
- xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ; \
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xFactory; \
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; \
+ xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ); \
/* These parameter will expand to */ \
/* "IF_NAME_CREATECOMPONENTFACTORY(a) */ \
/* else */ \
@@ -82,7 +82,7 @@ ________________________________________________________________________________
} \
} \
/* Return with result of this operation. */ \
- return pReturn ; \
+ return pReturn; \
}
//} // namespace framework
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 4651e6721be0..d3329904e90a 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -108,7 +108,7 @@ ________________________________________________________________________________
if ( !aReturn.hasValue() ) \
{ \
/* ... search in second group. (cppuhelper support 12 items only!) */ \
- aReturn = ::cppu::queryInterface INTERFACES_SECOND ; \
+ aReturn = ::cppu::queryInterface INTERFACES_SECOND; \
/* If searched interface not supported by this class ... */ \
if ( !aReturn.hasValue() ) \
{ \
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 3bfa0b034d63..22fd2015ab79 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -70,13 +70,13 @@ namespace framework{
css::uno::Sequence< OUString > CLASS::impl_getStaticSupportedServiceNames() \
{ \
css::uno::Sequence< OUString > seqServiceNames( 1 ); \
- seqServiceNames.getArray() [0] = SERVICENAME ; \
+ seqServiceNames.getArray() [0] = SERVICENAME; \
return seqServiceNames; \
} \
\
OUString CLASS::impl_getStaticImplementationName() \
{ \
- return IMPLEMENTATIONNAME ; \
+ return IMPLEMENTATIONNAME; \
}
#define PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index cf8fcf6a628f..1aa3dd1cc601 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -69,7 +69,7 @@ ________________________________________________________________________________
/* 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 ::cppu::OTypeCollection* pTypeCollection = NULL ; \
+ static ::cppu::OTypeCollection* pTypeCollection = NULL; \
if ( pTypeCollection == NULL ) \
{ \
/* Ready for multithreading; get global mutex for first call of this method only! see before */ \
@@ -79,9 +79,9 @@ ________________________________________________________________________________
{ \
/* Create a static typecollection ... */ \
/* Attention: "TYPES" will expand to "(...)"! */ \
- static ::cppu::OTypeCollection aTypeCollection TYPES ; \
+ static ::cppu::OTypeCollection aTypeCollection TYPES; \
/* ... and set his address to static pointer! */ \
- pTypeCollection = &aTypeCollection ; \
+ pTypeCollection = &aTypeCollection; \
} \
} \
return pTypeCollection->getTypes(); \
@@ -98,7 +98,7 @@ ________________________________________________________________________________
/* 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 ; \
+ 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 */ \
@@ -108,8 +108,8 @@ ________________________________________________________________________________
{ \
/* Create two typecollections */ \
/* (cppuhelper support 12 items per collection only!) */ \
- ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST ; \
- ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND ; \
+ ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST; \
+ ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND; \
/* Copy all items from both sequences to one result list! */ \
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes1 = aTypeCollection1.getTypes(); \
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes2 = aTypeCollection2.getTypes(); \
@@ -149,7 +149,7 @@ ________________________________________________________________________________
/* 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 ; \
+ 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 */ \
@@ -158,7 +158,7 @@ ________________________________________________________________________________
if ( pTypeCollection == NULL ) \
{ \
/* Create static typecollection for my own interfaces! */ \
- static ::cppu::OTypeCollection aTypeCollection TYPES ; \
+ 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(); \
generated by cgit (git 2.34.1) at 2024-07-21 07:35:56 +0000