From 38e95dc334047dfb9a7ae959deda4e4d2f39b3bf Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 6 May 2013 14:27:03 -0400 Subject: Revert "properly prefix graphic filter methods" This reverts commit eacf12eeb174e35a301570726bf74434a4dd4b94. Appears to be broken. Conflicts: vcl/source/filter/graphicfilter.cxx Change-Id: I9ae3fbac2e7e9d08484c063cdb10e080ca89def2 --- filter/README | 2 +- filter/qa/cppunit/filters-pict-test.cxx | 8 ++++++-- filter/qa/cppunit/filters-tga-test.cxx | 8 ++++++-- filter/qa/cppunit/filters-tiff-test.cxx | 8 ++++++-- filter/source/graphicfilter/egif/egif.cxx | 6 +++++- filter/source/graphicfilter/eos2met/eos2met.cxx | 6 +++++- filter/source/graphicfilter/epbm/epbm.cxx | 6 +++++- filter/source/graphicfilter/epgm/epgm.cxx | 6 +++++- filter/source/graphicfilter/epict/epict.cxx | 6 +++++- filter/source/graphicfilter/eppm/eppm.cxx | 6 +++++- filter/source/graphicfilter/eps/eps.cxx | 6 +++++- filter/source/graphicfilter/eras/eras.cxx | 6 +++++- filter/source/graphicfilter/etiff/etiff.cxx | 6 +++++- filter/source/graphicfilter/expm/expm.cxx | 6 +++++- filter/source/graphicfilter/idxf/idxf.cxx | 8 ++++++-- filter/source/graphicfilter/ieps/ieps.cxx | 6 +++++- filter/source/graphicfilter/ios2met/ios2met.cxx | 6 +++++- filter/source/graphicfilter/ipbm/ipbm.cxx | 6 +++++- filter/source/graphicfilter/ipcd/ipcd.cxx | 6 +++++- filter/source/graphicfilter/ipcx/ipcx.cxx | 6 +++++- filter/source/graphicfilter/ipict/ipict.cxx | 6 +++++- filter/source/graphicfilter/ipsd/ipsd.cxx | 6 +++++- filter/source/graphicfilter/iras/iras.cxx | 8 ++++++-- filter/source/graphicfilter/itga/itga.cxx | 8 ++++++-- filter/source/graphicfilter/itiff/itiff.cxx | 6 +++++- filter/source/msfilter/msdffimp.cxx | 1 + filter/source/xsltfilter/LibXSLTTransformer.cxx | 1 + filter/source/xsltfilter/OleHandler.hxx | 1 + 28 files changed, 130 insertions(+), 31 deletions(-) (limited to 'filter') diff --git a/filter/README b/filter/README index 68f398975ab1..9ebd0fba2a95 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 -vcl/source/filter/graphicfilter.cxx. Others have different API and are +svtools/source/filter/filter.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 e69604f3ad7c..36d8d226cc56 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -16,10 +16,14 @@ #include #include +#ifdef LIBO_MERGELIBS +#define GraphicImport iptGraphicImport +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL - iptGraphicImport(SvStream & rStream, Graphic & rGraphic, + GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } @@ -54,7 +58,7 @@ bool PictFilterTest::load(const OUString &, { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; - return iptGraphicImport(aFileStream, aGraphic, NULL, 0); + return GraphicImport(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 44ab26826363..bedabb59f259 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -19,10 +19,14 @@ #include #include +#ifdef LIBO_MERGELIBS +#define GraphicImport itgGraphicImport +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL - itgGraphicImport(SvStream & rStream, Graphic & rGraphic, + GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } @@ -57,7 +61,7 @@ bool TgaFilterTest::load(const OUString &, { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; - return itgGraphicImport(aFileStream, aGraphic, NULL, 0); + return GraphicImport(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 791b22472297..a9850ce07a63 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -19,10 +19,14 @@ #include #include +#ifdef LIBO_MERGELIBS +#define GraphicImport itiGraphicImport +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL - itiGraphicImport(SvStream & rStream, Graphic & rGraphic, + GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool); } @@ -57,7 +61,7 @@ bool TiffFilterTest::load(const OUString &, { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; - return itiGraphicImport(aFileStream, aGraphic, NULL, 0); + return GraphicImport(aFileStream, aGraphic, NULL, 0); } void TiffFilterTest::testCVEs() diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 46512eaebbe8..0f701f9f6ab2 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -558,8 +558,12 @@ void GIFWriter::WriteTerminator() // ------------------------------------------------------------------------ +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +#define GraphicExport egiGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -egiGraphicExport( SvStream& rStream, Graphic& rGraphic, +GraphicExport( 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 897af1cc7781..f5a5a23965dc 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -2552,8 +2552,12 @@ 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 -emeGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool ) +GraphicExport( 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 3969ed07bb21..4080d70f0dba 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -189,8 +189,12 @@ 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 -epbGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 50741b5280e8..47c0860715d2 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -213,8 +213,12 @@ 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 -epgGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 52d7efe0f092..35123846bae6 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2266,8 +2266,12 @@ 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 -eptGraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 8a2cf531b203..666135ae74b8 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -222,8 +222,12 @@ 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 -eppGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 5482d242aa2b..b48fba706ada 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2752,8 +2752,12 @@ 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 -epsGraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 bfb4c332d572..77d6009e2f60 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -269,8 +269,12 @@ 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 -eraGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 b3a5c3b4b014..6475c90ecdb2 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -596,8 +596,12 @@ 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 -etiGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 02781a11ff53..7af3eca251eb 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -251,8 +251,12 @@ 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 -expGraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) +GraphicExport(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 b960d79cc93f..b2639b30f24b 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -27,10 +27,14 @@ class FilterConfigItem; -//================== GraphicImport - the exported Function ================ +//================== GraphicImport - die exportierte Funktion ================ + +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +#define GraphicImport idxGraphicImport +#endif extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -idxGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 0ba2dae71780..e45b1dd57beb 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -475,8 +475,12 @@ 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 -ipsGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 6d3d909825c8..834bd1155f6e 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2704,8 +2704,12 @@ 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 -imeGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 e97a735d83df..f9b7f932f4ed 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -520,8 +520,12 @@ 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 -ipbGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 23d5dae76b8e..d9f249b0b625 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -367,8 +367,12 @@ 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 -icdGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool) +GraphicImport(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 0bb922ca1a8b..a73c64b6b071 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -399,8 +399,12 @@ 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 -ipxGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 042c5355caa2..583250967d34 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1864,8 +1864,12 @@ 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 -iptGraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport( 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 e37f7cb9da67..50c2f8e5bbe1 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -720,8 +720,12 @@ 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 -ipdGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 c023aa1dda9b..c5f94626a03b 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -336,10 +336,14 @@ sal_uInt8 RASReader::ImplGetByte() } } -//================== GraphicImport - the exported Function ================ +//================== GraphicImport - die exportierte Funktion ================ + +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +#define GraphicImport iraGraphicImport +#endif extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -iraGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 e69f3d198cd7..b17c70a68fa6 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -795,10 +795,14 @@ sal_Bool TGAReader::ImplReadPalette() return mbStatus; } -//================== GraphicImport - the exported Function ================ +//================== GraphicImport - die exportierte Funktion ================ + +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +#define GraphicImport itgGraphicImport +#endif extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -itgGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(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 a0543a00f6ed..0698a146183f 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1366,8 +1366,12 @@ 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 -itiGraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { TIFFReader aTIFFReader; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index d75f020a054c..5955e50f71d2 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -68,6 +68,7 @@ #include #include #include +#include #include #include #include diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index a7b0023091c7..b98d71ca7609 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx index b80712716061..e7e0f4c268cc 100644 --- a/filter/source/xsltfilter/OleHandler.hxx +++ b/filter/source/xsltfilter/OleHandler.hxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include -- cgit