diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
| commit | a0c13ffcceea4978bf95b8559bff4a71aa55aa88 (patch) | |
| tree | 2adb4d620b027141c5578565d860434657ba0b3c /slideshow/source/engine/shapes/viewmediashape.cxx | |
| parent | adea34547d7bc43e9795032c7761e293a28c1df7 (diff) | |
| parent | 19232495c4985faf1423075bf8814e786da6ddcd (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
sd/source/ui/func/fuinsfil.cxx
sd/source/ui/func/fuprobjs.cxx
sd/source/ui/slideshow/slideshowimpl.cxx
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/view/drawview.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/outlview.cxx
Diffstat (limited to 'slideshow/source/engine/shapes/viewmediashape.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index fc3bfacde25c..f46ac03cab23 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -40,7 +40,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <vcl/window.hxx> -#include <vcl/javachild.hxx> +#include <vcl/syschild.hxx> #include <vcl/salbtype.hxx> #ifdef GSTREAMER #include <vcl/sysdata.hxx> @@ -157,11 +157,7 @@ namespace slideshow mxPlayerWindow.clear(); } -#ifdef GSTREAMER mpMediaWindow = ::std::auto_ptr< SystemChildWindow >(); -#else - mpMediaWindow = ::std::auto_ptr< JavaChildWindow >(); -#endif // shutdown player if( mxPlayer.is() ) @@ -446,30 +442,24 @@ namespace slideshow rRangePix.getMaxX() - rRangePix.getMinX(), rRangePix.getMaxY() - rRangePix.getMinY() ); -#ifdef GSTREAMER - OSL_TRACE( "created sys child window for viewmediashape" ); + mpMediaWindow = ::std::auto_ptr< SystemChildWindow >( new + SystemChildWindow( pWindow, WB_CLIPCHILDREN ) ); mpMediaWindow = ::std::auto_ptr< SystemChildWindow >( new SystemChildWindow( pWindow, WB_CLIPCHILDREN ) ); -#else - mpMediaWindow = ::std::auto_ptr< JavaChildWindow >( new JavaChildWindow( pWindow, WB_CLIPCHILDREN ) ); -#endif mpMediaWindow->SetBackground( Color( COL_BLACK ) ); - mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, - aAWTRect.Y ), - Size( aAWTRect.Width, - aAWTRect.Height )); + mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), + Size( aAWTRect.Width, aAWTRect.Height ) ); mpMediaWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - mpMediaWindow->EnableEraseBackground( FALSE ); - mpMediaWindow->EnablePaint( FALSE ); - mpMediaWindow->SetForwardKey( TRUE ); - mpMediaWindow->SetMouseTransparent( TRUE ); + mpMediaWindow->EnableEraseBackground( sal_False ); + mpMediaWindow->EnablePaint( sal_False ); + mpMediaWindow->SetForwardKey( sal_True ); + mpMediaWindow->SetMouseTransparent( sal_True ); mpMediaWindow->Show(); if( mxPlayer.is() ) { #ifndef GSTREAMER aArgs[ 0 ] = uno::makeAny( - sal::static_int_cast<sal_IntPtr>( - mpMediaWindow->getParentWindowHandleForJava()) ); + sal::static_int_cast< sal_IntPtr >( mpMediaWindow->GetParentWindowHandle() ) ); #else aArgs[ 0 ] = uno::makeAny ( (sal_Int32) 0 ); #endif @@ -481,6 +471,8 @@ namespace slideshow aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow ); #endif + aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() ) ); + mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) ); if( mxPlayerWindow.is() ) @@ -541,9 +533,7 @@ namespace slideshow if( mxPlayer.is() ) { - aArgs[ 0 ] = uno::makeAny( - sal::static_int_cast<sal_Int32>( - aWNDVal) ); + aArgs[ 0 ] = uno::makeAny( sal::static_int_cast< sal_Int32 >( aWNDVal) ); aArgs[ 1 ] = uno::makeAny( aAWTRect ); mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) ); |