Skip to content

C
core
Kaydet (Commit) 40800be3 authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

Revert "fix scfilt with Library_merged" 

This reverts commit 1a04271d.

Conflicts:
	sc/source/ui/docshell/impex.cxx

Change-Id: I723727e045ca7e81ef9396a8b50e83ea95b162ab
üst 3609fc4b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
sc/source/ui/docshell/impex.cxx
Dosyayı görüntüle @ 40800be3
...@@ -2260,11 +2260,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() ...@@ -2260,11 +2260,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get()
return *plugin; return *plugin;
#ifndef DISABLE_DYNLOADING #ifndef DISABLE_DYNLOADING
#ifdef LIBO_MERGELIBS
OUString sFilterLib(SVLIBRARY("merged"));
#else
OUString sFilterLib(SVLIBRARY("scfilt")); OUString sFilterLib(SVLIBRARY("scfilt"));
#endif
static ::osl::Module aModule; static ::osl::Module aModule;
bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib); bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib);
if (!bLoaded) if (!bLoaded)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment