summaryrefslogtreecommitdiff
path: root/UnoControls/source/base/multiplexer.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-06-12 09:43:38 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-06-12 09:43:38 +0000
commit86127a42eb3454d496bfed4f0a7f579c32a7fee7 (patch)
treeff5d3df2c64242c36a94eefe68301dc950f9b25a /UnoControls/source/base/multiplexer.cxx
parent77ac7a9f817ef7f7365060d064cbef86d133c5f3 (diff)
INTEGRATION: CWS mh11rc (1.2.44); FILE MERGED
2003/06/06 13:06:44 mh 1.2.44.1: join: from cws_srx644_ooo11beta2
Diffstat (limited to 'UnoControls/source/base/multiplexer.cxx')
-rw-r--r--UnoControls/source/base/multiplexer.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 2a3584708310..0d2bcad6d4ac 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: multiplexer.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2001-12-07 16:11:09 $
+ * last change: $Author: vg $ $Date: 2003-06-12 10:43:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,12 +98,12 @@ namespace unocontrols{
#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT ) \
\
/* First get all interfaces from container with right type.*/ \
- OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE## >*)0) ); \
+ OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE >*)0) ); \
/* Do the follow only, if elements in container exist.*/ \
if( pContainer != NULL ) \
{ \
OInterfaceIteratorHelper aIterator( *pContainer ); \
- EVENTTYP aLocalEvent = EVENT##; \
+ EVENTTYP aLocalEvent = EVENT; \
/* Remark: The control is the event source not the peer.*/ \
/* We must change the source of the event. */ \
aLocalEvent.Source = m_xControl ; \
@@ -112,10 +112,10 @@ namespace unocontrols{
{ \
if( aIterator.hasMoreElements() ) \
{ \
- INTERFACE## * pListener = (INTERFACE## *)aIterator.next(); \
+ INTERFACE * pListener = (INTERFACE *)aIterator.next(); \
try \
{ \
- pListener->METHOD##( aLocalEvent ); \
+ pListener->METHOD( aLocalEvent ); \
} \
catch( RuntimeException& ) \
{ \