Put mxDropMediaSizeListener inside HAVE_FEATURE_AVMEDIA
Also another compilation fix for !HAVE_FEATURE_AVMEDIA. Change-Id: I442d81f4817fbd28ff04e91c1503f947890007fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194559 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196671 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Jenkins
This commit is contained in:
@@ -19,6 +19,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <config_features.h>
|
||||
|
||||
#include <memory>
|
||||
#include <pres.hxx>
|
||||
#include <tools/gen.hxx>
|
||||
@@ -268,7 +270,9 @@ protected:
|
||||
sal_Int8 mnAction;
|
||||
Idle maDropErrorIdle;
|
||||
Idle maDropInsertFileIdle;
|
||||
#if HAVE_FEATURE_AVMEDIA
|
||||
rtl::Reference<avmedia::PlayerListener> mxDropMediaSizeListener;
|
||||
#endif
|
||||
sal_uInt16 mnLockRedrawSmph;
|
||||
bool mbIsDropAllowed;
|
||||
|
||||
|
||||
@@ -406,6 +406,10 @@ namespace slideshow::internal
|
||||
void ViewMediaShape::implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds,
|
||||
const uno::Sequence< uno::Any >& rVCLDeviceParams )
|
||||
{
|
||||
#if !HAVE_FEATURE_AVMEDIA
|
||||
(void) rBounds;
|
||||
(void) rVCLDeviceParams;
|
||||
#else
|
||||
SAL_INFO("slideshow", "ViewMediaShape::implInitializePlayerWindow" );
|
||||
if( mpMediaWindow || rBounds.isEmpty() )
|
||||
return;
|
||||
@@ -508,6 +512,7 @@ namespace slideshow::internal
|
||||
{
|
||||
TOOLS_WARN_EXCEPTION( "slideshow", "" );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user