diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-09-04 16:33:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-09-04 16:37:25 +0200 |
| commit | dc86610d16a561ff1a0455d5fef157431f9271e3 (patch) | |
| tree | 66c7e8e7ac60e7f9cb43cecf770a5f54e8c2c11e | |
| parent | 2349713c72be2ce4069fa5be3062a18fd9318587 (diff) | |
fdo#68210: Make tiff import work again with merged-libs
- there was a symbol mismatch for dynamic loading
- while this fixes fdo#68210, similar fixes are likely needed for the other
dynamically loaded functionality
Change-Id: I7e4d6baf256dbe7b145dcbc118b4cac2075e07f5
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 7b47690a5be7..71bd7e027e81 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1358,7 +1358,10 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) //================== GraphicImport - 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 GraphicImport itiGraphicImport #endif |