diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 20:07:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 20:07:30 +0000 |
| commit | 453c6f7d66be3dd005053d28a5e9232164ceafb5 (patch) | |
| tree | 6676ead17bb768d1bc8a4a93bd0c0b9c4d35f849 /avmedia/source/viewer | |
| parent | 1fc3005814fbeaf7f23cfadb6aa2b3621adc5407 (diff) | |
INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED
2004/11/22 10:38:08 ka 1.2.2.1: added dispose call
Diffstat (limited to 'avmedia/source/viewer')
| -rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index 13fb7fa534a2..50cf4dc790de 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mediawindowbase_impl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-11-03 15:55:09 $ + * last change: $Author: rt $ $Date: 2004-11-26 21:07:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,9 @@ #ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HPP_ #include <com/sun/star/media/XManager.hpp> #endif +#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_ +#include <com/sun/star/lang/XComponent.hdl> +#endif #define MEDIA_TIMER_TIMEOUT 100 @@ -221,15 +224,17 @@ void MediaWindowBaseImpl::setPlayerWindow( const uno::Reference< media::XPlayerW void MediaWindowBaseImpl::cleanUp() { if( mxPlayer.is() ) + { mxPlayer->stop(); - if( mxPlayerWindow.is() ) - { - mxPlayerWindow->setVisible( false ); - mxPlayerWindow.clear(); + uno::Reference< lang::XComponent > xComponent( mxPlayer, uno::UNO_QUERY ); + + if( xComponent.is() ) + xComponent->dispose(); + + mxPlayer.clear(); } - mxPlayer.clear(); mpMediaWindow = NULL; } |