[Libreoffice-commits] core.git: svx/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Nov 3 14:32:49 UTC 2018


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

New commits:
commit 5b32b3df5d4e19b9515ac4e71958a3cdffdc68a8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sat Nov 3 01:29:12 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sat Nov 3 15:32:28 2018 +0100

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

diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 3560421cacc7..1a95c134bedb 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
 }
 
 static void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize)


More information about the Libreoffice-commits mailing list