From 22e9b1188c37340941dca2cdbdca4a1d9dd474ca Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 8 May 2014 18:33:56 +0200 Subject: 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 --- avmedia/source/viewer/mediawindow_impl.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'avmedia/source/viewer') 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() ) ); -- cgit