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 /sc/source/ui/attrdlg | |
| parent | 3d024d29fa7344240f6cf407d023ef3537b0a5a9 (diff) | |
Avoid app specific CreateDialogFactory code for non-DESKTOP.
As happened in 7e9ac5952711400ad856b3328c5cc00c05cec6f2 for cui library.
Change-Id: If51201eb452d4b84729b37949fb9b949020b47b8
Diffstat (limited to 'sc/source/ui/attrdlg')
| -rw-r--r-- | sc/source/ui/attrdlg/scabstdlg.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
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: */ |