diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-25 14:43:30 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-25 14:45:40 -0400 |
| commit | 1a04271d2e5de7dccfeb3ac0609e49155b5fe250 (patch) | |
| tree | b15bb1639e046b0a9cf2080b124765c6584636a8 /sc | |
| parent | 5ebb1a593d193f57722e38d5dc0fea4c93207d41 (diff) | |
fix scfilt with Library_merged
Change-Id: Ic7361d813a229606c2fe36891ac0908b490403c5
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index d9858a5aacaa..25002671bbea 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2259,7 +2259,11 @@ ScFormatFilterPlugin &ScFormatFilter::Get() return *plugin; #ifndef DISABLE_DYNLOADING - ::rtl::OUString sFilterLib(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("scfilt"))); + #if LIBO_MERGELIBS + OUString sFilterLib(SVLIBRARY("merged")); + #else + OUString sFilterLib(SVLIBRARY("scfilt")); + #endif static ::osl::Module aModule; bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib); if (!bLoaded) |