[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Nov 6 10:58:35 UTC 2018
sd/source/ui/dlg/filedlg.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 2a6e3fa7a0d938a7db2d75cabb2341149903437a
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 6 11:58:33 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Nov 6 11:57:43 2018 +0100
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>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index d266b16d4490..4db7263c5d99 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 <comphelper/processfactory.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XInitialization.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