diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-09-04 16:33:43 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-09-11 10:43:33 +0000 |
| commit | 88a97db7e630a70e68afcc80277174b9dd5ec159 (patch) | |
| tree | 3ca5ff4b705ef61680e8f1d3040790d3d6a27f3c /filter/source/graphicfilter/epict/epict.cxx | |
| parent | Resolves: fdo#68081 why would I want a spinner that doesn't repeat (diff) | |
| download | core-88a97db7e630a70e68afcc80277174b9dd5ec159.tar.gz core-88a97db7e630a70e68afcc80277174b9dd5ec159.zip | |
fdo#68210: Make tiff import work again with merged-libs
- there was a symbol mismatch for dynamic loading
- this fixes fdo#68210 and the other dynamically loaded functionality
- this also includes Change-Id: I6041ca10f58335187928995368db673c1ce22e7b
- this also includes Change-Id: Ie59f2ba4daec0375d1d64b765be3b1484e8cba3e
(tests that ensure the master to be broken arent that helpful)
Change-Id: I7e4d6baf256dbe7b145dcbc118b4cac2075e07f5
Reviewed-on: https://gerrit.libreoffice.org/5813
Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>
Tested-by: Tomáš Chvátal <tchvatal@suse.cz>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'filter/source/graphicfilter/epict/epict.cxx')
| -rw-r--r-- | filter/source/graphicfilter/epict/epict.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 8af1c52abc5f..60419f7c78e6 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2266,7 +2266,10 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea //================== GraphicExport - the exported Function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +// this needs to be kept in sync with +// ImpFilterLibCacheEntry::GetImportFunction() from +// vcl/source/filter/graphicfilter.cxx +#if defined(DISABLE_DYNLOADING) #define GraphicExport eptGraphicExport #endif |