strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress57 (1.4.22); FILE MERGED

Browse source 
2005/06/01 09:02:22 af 1.4.22.2: #i41306# Removed generation of debug output.
2005/05/25 16:10:46 af 1.4.22.1: #i43497# Fixed the ConnectToController() and DisconnectFromController() methods to properly handle failed connects.
This commit is contained in:
Jens-Heiner Rechtien 2005-09-23 10:32:40 +00:00
parent 491cc8bfc3
commit 5b820a179f
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sd/source/ui/tools/EventMultiplexer.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: EventMultiplexer.cxx,v $ * $RCSfile: EventMultiplexer.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 06:44:14 $ * last change: $Author: hr $ $Date: 2005-09-23 11:32:40 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -393,7 +393,6 @@ void EventMultiplexer::Implementation::ConnectToController (void)
// time may be destroyed.) // time may be destroyed.)
Reference<frame::XController> xController = mrBase.GetController(); Reference<frame::XController> xController = mrBase.GetController();
mxControllerWeak = mrBase.GetController(); mxControllerWeak = mrBase.GetController();
OSL_TRACE("EventMultiplexer %x connecting to controller %x", this,mxControllerWeak.get());
try try
{ {
@ -450,7 +449,6 @@ void EventMultiplexer::Implementation::DisconnectFromController (void)
{ {
mbListeningToController = false; mbListeningToController = false;
OSL_TRACE("EventMultiplexer %x disconnecting from controller %x", this,mxControllerWeak.get());
Reference<frame::XController> xController = mxControllerWeak; Reference<frame::XController> xController = mxControllerWeak;
Reference<beans::XPropertySet> xSet (xController, UNO_QUERY); Reference<beans::XPropertySet> xSet (xController, UNO_QUERY);
@ -532,10 +530,6 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange (
static const ::rtl::OUString sEditModePropertyName ( static const ::rtl::OUString sEditModePropertyName (
RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")); RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode"));
OSL_TRACE ("property changed: %s",
::rtl::OUStringToOString(rEvent.PropertyName,
RTL_TEXTENCODING_UTF8).getStr());
if (rEvent.PropertyName.equals (sCurrentPagePropertyName)) if (rEvent.PropertyName.equals (sCurrentPagePropertyName))
{ {
CallListeners ( CallListeners (