[Libreoffice-commits] core.git: 2 commits - sd/source

[Tor Lillqvist (via logerrit)]

 sd/source/ui/dlg/filedlg.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit bb59923408b38f0b8504df19db443d13e1593dd6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 7 15:14:02 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Oct 7 15:14:02 2019 +0300

    Bin pointless nested #if HAVE_FEATURE_AVMEDIA
    
    Change-Id: Id36265c5bd50d95105e3abf37e999aba80b4712c

diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index c7e153fe5823..d45b4823cf9c 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -111,7 +111,6 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
         OUString aUrl( GetPath() );
         if ( !aUrl.isEmpty() )
         {
-#if HAVE_FEATURE_AVMEDIA
             try
             {
                 mxPlayer.set( avmedia::MediaWindow::createPlayer( aUrl, "" ), css::uno::UNO_SET_THROW );
@@ -122,7 +121,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
             {
                 mxPlayer.clear();
             }
-#endif
+
             if (mxPlayer.is())
             {
                 try
commit a1ed2eccb044481b336732d6c58b211d66254310
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 6 11:58:33 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Oct 7 15:13:11 2019 +0300

    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 443d46f1652c..c7e153fe5823 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -90,6 +90,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
         mxPlayer.clear();
     }
 
+#if HAVE_FEATURE_AVMEDIA
     if( mbLabelPlaying )
     {
         try
@@ -139,6 +140,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
             }
         }
     }
+#endif
 }
 
 IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void)