diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-10-28 02:28:18 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-10-30 08:21:55 +0100 |
| commit | 08a43cc97ccf88faa9d3a04afc3aacd2c885a2d1 (patch) | |
| tree | 11f416701d1be0a962c7653ea86060f30f708b56 /slideshow | |
| parent | 8d994f83568073eb79ab987069f740c3c940405e (diff) | |
related: tdf#103884 remove gltf/collada feature
Change-Id: Icd26ad96c0337844ef1463dabfbe791caa00dd2d
Reviewed-on: https://gerrit.libreoffice.org/43972
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 3af464c38d53..4f3255591a88 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -44,7 +44,6 @@ #include <cppcanvas/vclfactory.hxx> #include <cppcanvas/basegfxfactory.hxx> #include <avmedia/mediawindow.hxx> -#include <avmedia/modeltools.hxx> #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLContext.hxx> @@ -410,7 +409,7 @@ namespace slideshow void ViewMediaShape::implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds, const uno::Sequence< uno::Any >& rVCLDeviceParams, - const OUString& rMimeType ) + const OUString& ) { SAL_INFO("slideshow", "ViewMediaShape::implInitializePlayerWindow" ); if( !mpMediaWindow.get() && !rBounds.isEmpty() ) @@ -439,25 +438,6 @@ namespace slideshow rRangePix.getMinY(), rRangePix.getMaxX() - rRangePix.getMinX(), rRangePix.getMaxY() - rRangePix.getMinY() ); -#if !HAVE_FEATURE_GLTF || !HAVE_FEATURE_OPENGL - (void)rMimeType; -#else - if( avmedia::IsModel(rMimeType) ) - { - mpMediaWindow.disposeAndClear(); - mpEventHandlerParent.disposeAndClear(); - mpEventHandlerParent = VclPtr<vcl::Window>::Create(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL); - mpEventHandlerParent->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), - Size( aAWTRect.Width, aAWTRect.Height ) ); - mpEventHandlerParent->EnablePaint(false); - mpEventHandlerParent->Show(); - SystemWindowData aWinData = OpenGLContext::Create()->generateWinData(mpEventHandlerParent.get(), false); - mpMediaWindow = VclPtr<SystemChildWindow>::Create(mpEventHandlerParent.get(), 0, &aWinData); - mpMediaWindow->SetPosSizePixel( Point( 0, 0 ), - Size( aAWTRect.Width, aAWTRect.Height ) ); - } - else -#endif { mpMediaWindow.disposeAndClear(); mpMediaWindow = VclPtr<SystemChildWindow>::Create( pWindow, WB_CLIPCHILDREN ); |