sd/Module_sd.mk | 2 +-
sd/source/ui/dlg/filedlg.cxx | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit db8fd12c2b7ab17583e71a2502274ed40861d0ae
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Feb 25 15:49:11 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Sep 20 11:46:08 2019 +0200
Fix build when !HAVE_FEATURE_AVMEDIA
Change-Id: I17fa4d503d197b9b7c7405281001ea92714494a9
(cherry picked from commit e54e668c51ec9230a3fc6a7cb1080d5696bea14e)
Reviewed-on: https://gerrit.libreoffice.org/79172
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 75b7a5783b1a..2b0626230d2a 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -119,6 +119,7 @@ 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_QUERY_THROW );
@@ -129,7 +130,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
{
mxPlayer.clear();
}
-
+#endif
if (mxPlayer.is())
{
try
commit 364651f84ea839a1e8f4793de95c7a0f21f31bc7
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Feb 25 15:36:38 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Sep 20 11:45:43 2019 +0200
Build the sdui library for non-DESKTOP, too
In order to get the Impress-specific dialogs in the (new,
Online-based) iOS and Android apps, too.
Change-Id: I7400326bafc1b8a0470b5ed0fb631ae984b7b795
(cherry picked from commit d71c5461704e120af9ae33aeefb79702be475680)
Reviewed-on: https://gerrit.libreoffice.org/79171
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index b0f63ddc1ed1..2bf2e94ab297 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,sd,\
Library_sd \
Library_sdd \
Library_sdfilt \
- $(call gb_Helper_optional,DESKTOP,Library_sdui) \
+ Library_sdui \
Package_opengl \
Package_web \
Package_xml \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
