diff options
| -rw-r--r-- | sc/Module_sc.mk | 2 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scabstdlg.cxx | 11 | ||||
| -rw-r--r-- | sd/Module_sd.mk | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdabstdlg.cxx | 11 | ||||
| -rw-r--r-- | sw/Module_sw.mk | 5 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swabstdlg.cxx | 11 |
6 files changed, 25 insertions, 17 deletions
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 094290ad368d..fae40f5bf622 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,sc,\ Library_sc \ Library_scd \ Library_scfilt \ - Library_scui \ + $(call gb_Helper_optional,DESKTOP,Library_scui) \ )) $(eval $(call gb_Module_add_l10n_targets,sc,\ diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 10be2588d8cd..88768ed9762d 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "scabstdlg.hxx" @@ -38,8 +39,9 @@ extern "C" ScAbstractDialogFactory* ScCreateDialogFactory(); ScAbstractDialogFactory* ScAbstractDialogFactory::Create() { -#ifndef DISABLE_DYNLOADING ScFuncPtrCreateDialogFactory fp = 0; +#if HAVE_FEATURE_DESKTOP +#ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; OUStringBuffer aStrBuf; @@ -49,12 +51,13 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( ScAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ); +#else + fp = ScCreateDialogFactory(); +#endif +#endif if ( fp ) return fp(); return 0; -#else - return ScCreateDialogFactory(); -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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 } diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index d5d3f4463c97..804cea26116b 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -20,12 +20,11 @@ $(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_add_targets,sw,\ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - Executable_tiledrendering) \ + $(call gb_Helper_optional,DESKTOP,Executable_tiledrendering) \ Library_msword \ Library_sw \ Library_swd \ - Library_swui \ + $(call gb_Helper_optional,DESKTOP,Library_swui) \ )) $(eval $(call gb_Module_add_l10n_targets,sw,\ diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index 64da0e38898a..db26ac17f09a 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "swabstdlg.hxx" @@ -37,20 +38,22 @@ extern "C" SwAbstractDialogFactory* SwCreateDialogFactory(); SwAbstractDialogFactory* SwAbstractDialogFactory::Create() { -#ifndef DISABLE_DYNLOADING SwFuncPtrCreateDialogFactory fp = 0; +#if HAVE_FEATURE_DESKTOP +#ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; static const OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( SwAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory")); +#else + fp = SwCreateDialogFactory(); +#endif +#endif if ( fp ) return fp(); return 0; -#else - return SwCreateDialogFactory(); -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |