diff options
29 files changed, 33 insertions, 132 deletions
diff --git a/filter/README b/filter/README index 9ebd0fba2a95..68f398975ab1 100644 --- a/filter/README +++ b/filter/README @@ -6,6 +6,6 @@ the code in each subdirectory of filter/source/graphicfilter are graphic format import or export filters. But they don't have uniform API. Some have either an GraphicImport or GraphicExport entry point, and are loaded and used in a uniform fashion from code in -svtools/source/filter/filter.cxx. Others have different API and are +vcl/source/filter/graphicfilter.cxx. Others have different API and are loaded from other places. For instance "icgm" has ImportCGM, and is loaded and used by sd/source/filter/cgm/sdcgmfilter.cxx (!). diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index 36d8d226cc56..e69604f3ad7c 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -16,14 +16,10 @@ #include <osl/file.hxx> #include <osl/process.h> -#ifdef LIBO_MERGELIBS -#define GraphicImport iptGraphicImport -#endif - extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL - GraphicImport(SvStream & rStream, Graphic & rGraphic, + iptGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } @@ -58,7 +54,7 @@ bool PictFilterTest::load(const OUString &, { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; - return GraphicImport(aFileStream, aGraphic, NULL, 0); + return iptGraphicImport(aFileStream, aGraphic, NULL, 0); } void PictFilterTest::testCVEs() diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index a30c277c99d4..1c9907ff04df 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -36,14 +36,10 @@ #include <osl/file.hxx> #include <osl/process.h> -#ifdef LIBO_MERGELIBS -#define GraphicImport itgGraphicImport -#endif - extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL - GraphicImport(SvStream & rStream, Graphic & rGraphic, + itgGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } @@ -78,7 +74,7 @@ bool TgaFilterTest::load(const OUString &, { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; - return GraphicImport(aFileStream, aGraphic, NULL, 0); + return itgGraphicImport(aFileStream, aGraphic, NULL, 0); } void TgaFilterTest::testCVEs() diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index 1c9f03f51e7b..4be6e051bbfd 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -36,14 +36,10 @@ #include <osl/file.hxx> #include <osl/process.h> -#ifdef LIBO_MERGELIBS -#define GraphicImport itiGraphicImport -#endif - extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL - GraphicImport(SvStream & rStream, Graphic & rGraphic, + itiGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } @@ -78,7 +74,7 @@ bool TiffFilterTest::load(const OUString &, { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; - return GraphicImport(aFileStream, aGraphic, NULL, 0); + return itiGraphicImport(aFileStream, aGraphic, NULL, 0); } void TiffFilterTest::testCVEs() diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 0f701f9f6ab2..46512eaebbe8 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -558,12 +558,8 @@ void GIFWriter::WriteTerminator() // ------------------------------------------------------------------------ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport egiGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport( SvStream& rStream, Graphic& rGraphic, +egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ) { GIFWriter aWriter(rStream); diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index f5a5a23965dc..897af1cc7781 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -2552,12 +2552,8 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, //================== GraphicExport - the exported Function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport emeGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool ) +emeGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool ) { METWriter aMETWriter; // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 4080d70f0dba..3969ed07bb21 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -189,12 +189,8 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport epbGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +epbGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PBMWriter aPBMWriter(rStream); diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 47c0860715d2..50741b5280e8 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -213,12 +213,8 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport epgGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +epgGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PGMWriter aPGMWriter(rStream); diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 155a7dfc3331..fe2f84acebd7 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2266,12 +2266,8 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea //================== GraphicExport - the exported Function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport eptGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +eptGraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PictWriter aPictWriter; diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 666135ae74b8..8a2cf531b203 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -222,12 +222,8 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport eppGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +eppGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PPMWriter aPPMWriter(rStream); return aPPMWriter.WritePPM( rGraphic, pFilterConfigItem ); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index b48fba706ada..5482d242aa2b 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2752,12 +2752,8 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL //================== GraphicExport - die exportierte Funktion ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport epsGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +epsGraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { PSWriter aPSWriter; return aPSWriter.WritePS( rGraphic, rStream, pFilterConfigItem ); diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 77d6009e2f60..bfb4c332d572 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -269,12 +269,8 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis ) // - exported function - // --------------------- -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport eraGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +eraGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { RASWriter aRASWriter(rStream); diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 6475c90ecdb2..b3a5c3b4b014 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -596,12 +596,8 @@ void TIFFWriter::EndCompression() // - exported function - // --------------------- -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport etiGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +etiGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { TIFFWriter aWriter(rStream); return aWriter.WriteTIFF( rGraphic, pFilterConfigItem ); diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 7af3eca251eb..02781a11ff53 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -251,12 +251,8 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) // - exported function - // --------------------- -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicExport expGraphicExport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +expGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { XPMWriter aXPMWriter(rStream); diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index b2639b30f24b..b960d79cc93f 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -27,14 +27,10 @@ class FilterConfigItem; -//================== GraphicImport - die exportierte Funktion ================ - -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport idxGraphicImport -#endif +//================== GraphicImport - the exported Function ================ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +idxGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { DXFRepresentation aDXF; DXF2GDIMetaFile aConverter; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index e45b1dd57beb..0ba2dae71780 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -475,12 +475,8 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, //================== GraphicImport - the exported function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport ipsGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +ipsGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { if ( rStream.GetError() ) return sal_False; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 834bd1155f6e..6d3d909825c8 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2704,12 +2704,8 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF //================== GraphicImport - the exported function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport imeGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +imeGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { OS2METReader aOS2METReader; GDIMetaFile aMTF; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index f9b7f932f4ed..e97a735d83df 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -520,12 +520,8 @@ sal_Bool PBMReader::ImplReadBody() //================== GraphicImport - the exported function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport ipbGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +ipbGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PBMReader aPBMReader(rStream); diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index d9f249b0b625..23d5dae76b8e 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -367,12 +367,8 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent) //================== GraphicImport - the exported Function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport icdGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool) +icdGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool) { PCDReader aPCDReader(rStream); return aPCDReader.ReadPCD(rGraphic, pConfigItem); diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index a73c64b6b071..0bb922ca1a8b 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -399,12 +399,8 @@ void PCXReader::ImplReadPalette( sal_uLong nCol ) //================== GraphicImport - the exported function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport ipxGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +ipxGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PCXReader aPCXReader(rStream); sal_Bool nRetValue = aPCXReader.ReadPCX(rGraphic); diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 583250967d34..042c5355caa2 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1864,12 +1864,8 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) //================== GraphicImport - the exported function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport iptGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +iptGraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { GDIMetaFile aMTF; PictReader aPictReader; diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 50c2f8e5bbe1..e37f7cb9da67 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -720,12 +720,8 @@ sal_Bool PSDReader::ImplReadBody() //================== GraphicImport - the exported function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport ipdGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +ipdGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PSDReader aPSDReader(rStream); diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index c5f94626a03b..c023aa1dda9b 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -336,14 +336,10 @@ sal_uInt8 RASReader::ImplGetByte() } } -//================== GraphicImport - die exportierte Funktion ================ - -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport iraGraphicImport -#endif +//================== GraphicImport - the exported Function ================ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +iraGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { RASReader aRASReader(rStream); diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index b17c70a68fa6..e69f3d198cd7 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -795,14 +795,10 @@ sal_Bool TGAReader::ImplReadPalette() return mbStatus; } -//================== GraphicImport - die exportierte Funktion ================ - -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport itgGraphicImport -#endif +//================== GraphicImport - the exported Function ================ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +itgGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { TGAReader aTGAReader(rStream); diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 94dbed6460d3..c72efcd1fdbf 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1366,12 +1366,8 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) //================== GraphicImport - the exported function ================ -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) -#define GraphicImport itiGraphicImport -#endif - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +itiGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { TIFFReader aTIFFReader; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 969d300f77f3..ade7b811f577 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -68,7 +68,6 @@ #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> -#include <sfx2/module.hxx> #include <svx/sdgcpitm.hxx> #include <svx/sdgmoitm.hxx> #include <editeng/tstpitem.hxx> diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 29b0faf25a67..d5822dc124e5 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -50,7 +50,6 @@ #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/module.h> #include <osl/file.hxx> #include <osl/process.h> #include <com/sun/star/lang/XComponent.hpp> diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx index b3275ff2823d..10216456f776 100644 --- a/filter/source/xsltfilter/OleHandler.hxx +++ b/filter/source/xsltfilter/OleHandler.hxx @@ -45,7 +45,6 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/module.h> #include <osl/file.hxx> #include <osl/process.h> #include <com/sun/star/lang/XComponent.hpp> diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index eb861046b4cd..fc875f7886e5 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -990,7 +990,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() if( !mpfnImport ) { #ifndef DISABLE_DYNLOADING - mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME)); + mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(maFiltername+IMPORT_FUNCTION_NAME)); #else if( maFiltername.EqualsAscii( "icd" ) ) mpfnImport = icdGraphicImport; @@ -2070,7 +2070,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& String aPhysicalName( ImpCreateFullFilterPath( getToken(aFilterPath, i, ';'), aFilterName ) ); osl::Module aLibrary( aPhysicalName ); - PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME)); + PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(OUString(aFilterName+EXPORT_FUNCTION_NAME)); // Dialog in DLL ausfuehren #else PFilterCall pFunc = NULL; |