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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Sep 19 16:03:04 UTC 2019


 sd/source/ui/dlg/filedlg.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 2b09926c939187097c66321ab9026eee4c726aa5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 6 11:58:33 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 19 18:02:20 2019 +0200

    Some !HAVE_FEATURE_AVMEDIA fallout
    
    Change-Id: Ie7c2f75ec66ae4c1f8dc49075624617c294cbc25
    Reviewed-on: https://gerrit.libreoffice.org/62945
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/79131

diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 268c0f4a9f9d..75b7a5783b1a 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
@@ -96,6 +98,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
         mxPlayer.clear();
     }
 
+#if HAVE_FEATURE_AVMEDIA
     if( mbLabelPlaying )
     {
         try
@@ -144,6 +147,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
             }
         }
     }
+#endif
 }
 
 IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void)


More information about the Libreoffice-commits mailing list