diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:42:52 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:42:52 +0000 |
| commit | 5514fc00bdc977ebb3eaef8ce5610d48324b2404 (patch) | |
| tree | a940dde3f974b797432996bd62d79fa9948d8f4c /slideshow/source/engine/eventmultiplexer.cxx | |
| parent | b1ccee455fdbfe0db2ca7eaecbd5f19473c1f7e1 (diff) | |
INTEGRATION: CWS presenterview (1.13.4); FILE MERGED
2008/01/11 14:13:51 cl 1.13.4.3: check if view is still available to prevent possible gpf
2008/01/09 18:11:56 cl 1.13.4.2: #i15900# moved slideshow api to offapi
2007/10/12 14:01:31 cl 1.13.4.1: #i40844# add notifySlideTransitionStarted()
Diffstat (limited to 'slideshow/source/engine/eventmultiplexer.cxx')
| -rw-r--r-- | slideshow/source/engine/eventmultiplexer.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 9a0646e69d30..bafed361317b 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: eventmultiplexer.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2007-07-17 14:35:58 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:42:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -562,8 +562,8 @@ void EventMultiplexerImpl::clear() aIter!=aEnd; ++aIter ) { - (*aIter)->getUnoView()->removeMouseListener( - mxListener.get() ); + if( (*aIter)->getUnoView().is() ) + (*aIter)->getUnoView()->removeMouseListener( mxListener.get() ); } } @@ -574,8 +574,8 @@ void EventMultiplexerImpl::clear() aIter!=aEnd; ++aIter ) { - (*aIter)->getUnoView()->removeMouseMotionListener( - mxListener.get() ); + if( (*aIter)->getUnoView().is() ) + (*aIter)->getUnoView()->removeMouseMotionListener( mxListener.get() ); } } @@ -1227,6 +1227,11 @@ bool EventMultiplexer::notifyHyperlinkClicked( boost::cref(hyperLink)) ); } +bool EventMultiplexer::notifySlideTransitionStarted() +{ + return true; +} + } // namespace internal } // namespace presentation |