[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - svx/source

[Libreoffice Gerrit user]

 svx/source/gallery2/galctrl.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 2d2abfbb8682992e8584ac04ea8551fd59b0db3c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sat Nov 3 01:29:12 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 13:07:02 2018 +0100

    More !HAVE_FEATURE_AVMEDIA fallout
    
    Change-Id: I5b2c24e555f77199782d60d56086455f04787821
    Reviewed-on: https://gerrit.libreoffice.org/62869
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 27074fd6560f..d2b781d27391 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -238,6 +238,7 @@ void GalleryPreview::StartDrag( sal_Int8, const Point& )
 
 void GalleryPreview::PreviewMedia( const INetURLObject& rURL )
 {
+#if HAVE_FEATURE_AVMEDIA
     if (rURL.GetProtocol() != INetProtocol::NotValid)
     {
         ::avmedia::MediaFloater* pFloater = avmedia::getMediaFloater();
@@ -251,6 +252,9 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL )
         if (pFloater)
             pFloater->setURL( rURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "", true );
     }
+#else
+    (void) rURL;
+#endif
 }
 
 void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize)