diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-06-04 14:20:45 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-09-20 14:35:56 +0200 |
| commit | 5f309214aa83fd7a68fac664586123171a71f78f (patch) | |
| tree | 83a85847236c212a027f05b655776bdf331ca59a | |
| parent | tdf#124364: Add some missing components from chart2, svtools, and xmloff (diff) | |
| download | core-5f309214aa83fd7a68fac664586123171a71f78f.tar.gz core-5f309214aa83fd7a68fac664586123171a71f78f.zip | |
Fix "external" graphic filter code for the DISABLE_DYNLOADING case
The DISABLE_DYNLOADING case in ImpFilterLibCacheEntry::GetImportFunction()
had apparently been broken from the start, but nobody never noticed as
the common formats (PNG, JPEG, GIF etc) use a more "internal" code
path. The problem was noticed now with a TIFF image in a presentation.
The fix for the import case seems to work, but I could not test the
fix for the export case.
Change-Id: Icbd33c7cb654136a562f18b06d5b0896e701bf3d
Reviewed-on: https://gerrit.libreoffice.org/79239
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 5da009d46bcf..0aea92f7ad36 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -973,27 +973,27 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() else if (maFormatName == "iti") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("itiGraphicImport")); #else - if (maFiltername == "icd") + if (maFormatName == "icd") mpfnImport = icdGraphicImport; - else if (maFiltername == "idx") + else if (maFormatName == "idx") mpfnImport = idxGraphicImport; - else if (maFiltername == "ime") + else if (maFormatName == "ime") mpfnImport = imeGraphicImport; - else if (maFiltername == "ipb") + else if (maFormatName == "ipb") mpfnImport = ipbGraphicImport; - else if (maFiltername == "ipd") + else if (maFormatName == "ipd") mpfnImport = ipdGraphicImport; - else if (maFiltername == "ips") + else if (maFormatName == "ips") mpfnImport = ipsGraphicImport; - else if (maFiltername == "ipt") + else if (maFormatName == "ipt") mpfnImport = iptGraphicImport; - else if (maFiltername == "ipx") + else if (maFormatName == "ipx") mpfnImport = ipxGraphicImport; - else if (maFiltername == "ira") + else if (maFormatName == "ira") mpfnImport = iraGraphicImport; - else if (maFiltername == "itg") + else if (maFormatName == "itg") mpfnImport = itgGraphicImport; - else if (maFiltername == "iti") + else if (maFormatName == "iti") mpfnImport = itiGraphicImport; #endif } @@ -2174,9 +2174,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r FilterConfigItem aConfigItem( pFilterData ); OUString aFilterName( pConfig->GetExportFilterName( nFormat ) ); -#ifndef DISABLE_DYNLOADING OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, true)); -#endif ErrCode nStatus = ERRCODE_NONE; GraphicType eType; Graphic aGraphic( rGraphic ); @@ -2470,11 +2468,11 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r #else --nIdx; // Just one iteration PFilterCall pFunc = NULL; - if (aFilterName == "egi") + if (aExternalFilterName == "egi") pFunc = egiGraphicExport; - else if (aFilterName == "eps") + else if (aExternalFilterName == "eps") pFunc = epsGraphicExport; - else if (aFilterName == "eti") + else if (aExternalFilterName == "eti") pFunc = etiGraphicExport; #endif if( pFunc ) |