diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-18 01:03:15 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-18 01:23:50 +0300 |
| commit | 4048a810a0c00af2bf94d24243ff02a832f63de3 (patch) | |
| tree | 6aa7dc2ac7b67bfe3f9aa26acc7349f70c84c073 | |
| parent | b0105caa7f1445e3b1e4abac6d8f82445a4eba68 (diff) | |
Just link statically to ScFilterCreate() in the DISABLE_DYNLOADING case
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index f9d00abea95f..e98c67bcb18a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2227,6 +2227,8 @@ bool ScImportExport::HTML2Doc( SvStream& rStrm, const String& rBaseURL ) return bOk; } +#ifndef DISABLE_DYNLOADING + #define RETURN_ERROR { return eERR_INTERN; } class ScFormatFilterMissing : public ScFormatFilterPlugin { public: @@ -2260,6 +2262,15 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { }; extern "C" { static void SAL_CALL thisModule() {} } + +#else + +extern "C" { +ScFormatFilterPlugin* ScFilterCreate(); +} + +#endif + typedef ScFormatFilterPlugin * (*FilterFn)(void); ScFormatFilterPlugin &ScFormatFilter::Get() { @@ -2268,6 +2279,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() if (plugin != NULL) return *plugin; +#ifndef DISABLE_DYNLOADING ::rtl::OUString sFilterLib(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("scfilt"))); static ::osl::Module aModule; bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib); @@ -2281,6 +2293,9 @@ ScFormatFilterPlugin &ScFormatFilter::Get() } if (plugin == NULL) plugin = new ScFormatFilterMissing(); +#else + plugin = ScFilterCreate(); +#endif return *plugin; } |