diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-19 12:21:12 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-19 12:26:41 +0100 |
| commit | 9ad3fc29dd98167c35fcb599da0b4e764ddf04dd (patch) | |
| tree | 3e917373b7fa68099115249eee5b405d8e6d51a0 /sd | |
| parent | 3d024d29fa7344240f6cf407d023ef3537b0a5a9 (diff) | |
Avoid app specific CreateDialogFactory code for non-DESKTOP.
As happened in 7e9ac5952711400ad856b3328c5cc00c05cec6f2 for cui library.
Change-Id: If51201eb452d4b84729b37949fb9b949020b47b8
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Module_sd.mk | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdabstdlg.cxx | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 3321279e6e20..63a345ef05ad 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 \ - Library_sdui \ + $(call gb_Helper_optional,DESKTOP,Library_sdui) \ Package_opengl \ Package_web \ Package_xml \ diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index b62eea74fda9..34b737aa9c94 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "sdabstdlg.hxx" @@ -38,19 +39,21 @@ extern "C" SdAbstractDialogFactory* SdCreateDialogFactory(); SdAbstractDialogFactory* SdAbstractDialogFactory::Create() { -#ifndef DISABLE_DYNLOADING SdFuncPtrCreateDialogFactory fp = 0; +#if HAVE_FEATURE_DESKTOP +#ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) ) fp = ( SdAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" ); +#else + fp = SdCreateDialogFactory(); +#endif +#endif if ( fp ) return fp(); return 0; -#else - return SdCreateDialogFactory(); -#endif } |