ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Revert "properly prefix graphic filter methods"

Browse Source 
This reverts commit eacf12eeb1.

Appears to be broken.

Conflicts:
	vcl/source/filter/graphicfilter.cxx

Change-Id: I9ae3fbac2e7e9d08484c063cdb10e080ca89def2
This commit is contained in:
Peter Foley
2013-05-06 14:27:03 -04:00
parent 37690fe74c
commit 38e95dc334
29 changed files with 131 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filter/README
+1 -1
View File
@@ -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 (!).
filter/qa/cppunit/filters-pict-test.cxx
+6 -2
View File
@@ -16,10 +16,14 @@
#include <osl/file.hxx>
#include <osl/process.h>
#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()
filter/qa/cppunit/filters-tga-test.cxx
+6 -2
View File
@@ -19,10 +19,14 @@
#include <osl/file.hxx>
#include <osl/process.h>
#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()
filter/qa/cppunit/filters-tiff-test.cxx
+6 -2
View File
@@ -19,10 +19,14 @@
#include <osl/file.hxx>
#include <osl/process.h>
#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()
filter/source/graphicfilter/egif/egif.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/eos2met/eos2met.cxx
+5 -1
View File
@@ -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
filter/source/graphicfilter/epbm/epbm.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/epgm/epgm.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/epict/epict.cxx
+5 -1
View File
@@ -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;
filter/source/graphicfilter/eppm/eppm.cxx
+5 -1
View File
@@ -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 );
filter/source/graphicfilter/eps/eps.cxx
+5 -1
View File
@@ -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 );
filter/source/graphicfilter/eras/eras.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/etiff/etiff.cxx
+5 -1
View File
@@ -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 );
filter/source/graphicfilter/expm/expm.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/idxf/idxf.cxx
+6 -2
View File
@@ -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;
filter/source/graphicfilter/ieps/ieps.cxx
+5 -1
View File
@@ -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;
filter/source/graphicfilter/ios2met/ios2met.cxx
+5 -1
View File
@@ -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;
filter/source/graphicfilter/ipbm/ipbm.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/ipcd/ipcd.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/ipcx/ipcx.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/ipict/ipict.cxx
+5 -1
View File
@@ -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;
filter/source/graphicfilter/ipsd/ipsd.cxx
+5 -1
View File
@@ -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);
filter/source/graphicfilter/iras/iras.cxx
+6 -2
View File
@@ -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);
filter/source/graphicfilter/itga/itga.cxx
+6 -2
View File
@@ -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);
filter/source/graphicfilter/itiff/itiff.cxx
+5 -1
View File
@@ -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;
filter/source/msfilter/msdffimp.cxx
+1
View File
@@ -68,6 +68,7 @@
#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>
filter/source/xsltfilter/LibXSLTTransformer.cxx
+1
View File
@@ -31,6 +31,7 @@
#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>
filter/source/xsltfilter/OleHandler.hxx
+1
View File
@@ -26,6 +26,7 @@
#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>
vcl/source/filter/graphicfilter.cxx
+1 -1
View File
@@ -985,7 +985,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
if( !mpfnImport )
{
#ifndef DISABLE_DYNLOADING
mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(maFiltername+IMPORT_FUNCTION_NAME));
mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME));
#else
if( maFiltername.EqualsAscii( "icd" ) )
mpfnImport = icdGraphicImport;