diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-08 18:33:56 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-08 18:34:33 +0200 |
| commit | 22e9b1188c37340941dca2cdbdca4a1d9dd474ca (patch) | |
| tree | 9221cc9cefed57a1358551b45b1d8be92bd06477 /avmedia | |
| parent | 05c141bc3ab264c8e1f4fba57c4a82fa93e91261 (diff) | |
avmedia: fix media embedding problem in edit mode
Some of the media player interfaces don't use the given
SystemChildWindow, but they work with the parent window handle.
e.g. directx (avmedia/source/win) and
quicktime (avmedia/source/quicktime)
Without the parent window handle they create a
separate child window outside impress window.
It affects only editing and not the slideshow.
Change-Id: I80252ce35fcd29ab2cce081299529b85129017ee
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 58c2d49cc0aa..ab9d35156d3d 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -517,9 +517,8 @@ void MediaWindowImpl::onURLChanged() uno::Reference< media::XPlayerWindow > xPlayerWindow; const Point aPoint; const Size aSize( mpChildWindow->GetSizePixel() ); - const sal_Int32 nWndHandle = 0; - aArgs[ 0 ] = uno::makeAny( nWndHandle ); + aArgs[ 0 ] = uno::makeAny( mpChildWindow->GetParentWindowHandle() ); aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) ); aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( mpChildWindow.get() ) ); |