diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-10-13 08:42:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-10-13 08:42:40 +0000 |
| commit | 6a452499a411e5e350d4189410c90694b8949c18 (patch) | |
| tree | ec709b6efd19e7e5fc26e4a7b837503d18c91600 | |
| parent | cb893b74831943f9c70c0d11fb01bf5b85fd25eb (diff) | |
INTEGRATION: CWS merge20to201v2 (1.4.8); FILE MERGED
2005/10/07 14:04:32 hr 1.4.8.1: #i55617: merge OOO680 CWS macosx11
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 24363c5e9350..b0217cf8ee8f 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mediawindow_impl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:43:42 $ + * last change: $Author: obo $ $Date: 2005-10-13 09:42:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -247,8 +247,15 @@ void MediaWindowImpl::onURLChanged() aArgs[ 0 ] = uno::makeAny( nWndHandle ); aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) ); - if( nWndHandle != 0 ) - xPlayerWindow = getPlayer()->createPlayerWindow( aArgs ); + try + { + if( nWndHandle != 0 ) + xPlayerWindow = getPlayer()->createPlayerWindow( aArgs ); + } + catch( uno::RuntimeException ) + { + // happens eg, on MacOSX where Java frames cannot be created from X11 window handles + } setPlayerWindow( xPlayerWindow ); |