solenv/bin/native-code.py | 2 ++
vcl/source/filter/graphicfilter.cxx | 30 ++++++++++++++----------------
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 80457313b4cf9e9d846c5c694500edb71cccb8d7
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Jun 4 14:58:20 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Jun 4 15:49:51 2019 +0300
Add css_comp_Impress_oox_PowerPointExport
Change-Id: I17d95cce0dd69e2ba8b4ebc7045544fc5659a249
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9160dece3961..aa3a03d3fd20 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -391,6 +391,8 @@ draw_constructor_list = [
"com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation",
# sd/util/sdd.component
"com_sun_star_comp_draw_FormatDetector_get_implementation",
+# sd/util/sdfilt.component
+ "css_comp_Impress_oox_PowerPointExport",
# writerperfect/source/draw/wpftdraw.component
"com_sun_star_comp_Draw_VisioImportFilter_get_implementation",
]
commit a4807544be6a8d042883796386eb7a651d576238
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Jun 4 14:20:45 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Jun 4 15:49:51 2019 +0300
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
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 1307f31817bf..61c38ec51067 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -721,27 +721,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
}
@@ -1893,9 +1893,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 = ImpGetScaledGraphic( rGraphic, aConfigItem );
@@ -2187,11 +2185,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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
