sd/source/ui/inc/View.hxx | 4 ++++ slideshow/source/engine/shapes/viewmediashape.cxx | 5 +++++ 2 files changed, 9 insertions(+)
New commits: commit 1238770c7b462fd26840904c7e601a5b5b289cb2 Author: Tor Lillqvist <[email protected]> AuthorDate: Wed Oct 9 14:45:47 2024 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Thu Jan 8 12:33:43 2026 +0100 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 <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196671 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 95feac17807d..ccdadc43094e 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -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; diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 310bc42800ca..f50350b53ed4 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -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 } }
