diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 02:22:49 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 15:32:30 +0200 |
| commit | 40800be3816760fe606e7fa8dcf7d3d9ad550257 (patch) | |
| tree | bad359e132e7e8132482ef3780dc2aa272e26f12 /sc | |
| parent | 3609fc4b6f8a0de00d81fedfd58aab84dfb97a22 (diff) | |
Revert "fix scfilt with Library_merged"
This reverts commit 1a04271d2e5de7dccfeb3ac0609e49155b5fe250.
Conflicts:
sc/source/ui/docshell/impex.cxx
Change-Id: I723727e045ca7e81ef9396a8b50e83ea95b162ab
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 7e734d3e3bf6..b6c4869f6e66 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2260,11 +2260,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() return *plugin; #ifndef DISABLE_DYNLOADING -#ifdef LIBO_MERGELIBS - OUString sFilterLib(SVLIBRARY("merged")); -#else OUString sFilterLib(SVLIBRARY("scfilt")); -#endif static ::osl::Module aModule; bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib); if (!bLoaded) |