From 156e86ac8af750a4e7d9d968ccac8eee38ecf342 Mon Sep 17 00:00:00 2001 From: Sander Vesik Date: Wed, 21 Apr 2004 12:49:28 +0000 Subject: [PATCH] INTEGRATION: CWS ooo20040329 (1.4.4); FILE MERGED 2004/03/17 12:26:23 waratah 1.4.4.1: #i1858# alter the order of some definitions to fix some -Wall warnings --- UnoControls/source/base/multiplexer.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index cb87889d223b..6f745db6cd0c 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: multiplexer.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-02-04 12:27:12 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:49:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - //____________________________________________________________________________________________________________ // my own include //____________________________________________________________________________________________________________ @@ -131,9 +130,9 @@ namespace unocontrols{ OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper( const Reference< XWindow >& xControl , const Reference< XWindow >& xPeer ) - : m_aListenerHolder ( m_aMutex ) + : m_xPeer ( xPeer ) , m_xControl ( xControl ) - , m_xPeer ( xPeer ) + , m_aListenerHolder ( m_aMutex ) { }