sd/Module_sd.mk | 2 +- sd/source/ui/dlg/filedlg.cxx | 5 ++++- sd/source/ui/dlg/sdabstdlg.cxx | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-)
New commits: commit 79d7e69384ed7af40f1f87965f5f5dc723d8e188 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Mon Feb 25 15:49:11 2019 +0200 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Mon Feb 25 15:55:57 2019 +0200 Fix build when !HAVE_FEATURE_AVMEDIA Change-Id: I17fa4d503d197b9b7c7405281001ea92714494a9 diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 063d70476408..ab9653fdc766 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> @@ -116,6 +118,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 ); @@ -126,7 +129,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void) { mxPlayer.clear(); } - +#endif if (mxPlayer.is()) { try commit 42e8bf6df607f13ed31e73a597ff62ff5c532f03 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Mon Feb 25 15:36:38 2019 +0200 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Mon Feb 25 15:55:57 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 diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 22f6fa17c194..7bfb9f8a2c08 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 \ commit c600817e8349db7957f517365f65f25e4e042439 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Mon Feb 25 15:34:13 2019 +0200 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Mon Feb 25 15:55:57 2019 +0200 Make SdAbstractDialogFactory::Create() do its job also on non-DESKTOP Change-Id: Ife76336dbdeaadf08f631e3542be73a8568f5368 diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index 57dd6e3c53e4..4b56b82c61fd 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -39,7 +39,6 @@ extern "C" SdAbstractDialogFactory* SdCreateDialogFactory(); SdAbstractDialogFactory* SdAbstractDialogFactory::Create() { SdFuncPtrCreateDialogFactory fp = nullptr; -#if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; static const OUString sLibName(SDUI_DLL_NAME); @@ -49,7 +48,6 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() #else fp = SdCreateDialogFactory; #endif -#endif if ( fp ) return fp(); return nullptr; commit 287e8aa212212e33445bb63e9a89822cb75ddc61 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Mon Feb 25 15:33:01 2019 +0200 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Mon Feb 25 15:55:56 2019 +0200 We want the function pointer here, but not call it yet We will call it just a few lines later. Change-Id: I967ff4eec2cfb1dcc7e8b02f32232be65b6366db diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index d5bed9b764fc..57dd6e3c53e4 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -47,7 +47,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() fp = reinterpret_cast<SdAbstractDialogFactory* (SAL_CALL*)()>( aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" )); #else - fp = SdCreateDialogFactory(); + fp = SdCreateDialogFactory; #endif #endif if ( fp ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits