diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-05-06 14:27:03 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-05-06 14:27:03 -0400 |
| commit | 38e95dc334047dfb9a7ae959deda4e4d2f39b3bf (patch) | |
| tree | 620dac7d724a06aad05bdd6403cafac1b31855fb /filter/qa | |
| parent | 37690fe74c4c585564c67c1ff7b8be353cf68033 (diff) | |
Revert "properly prefix graphic filter methods"
This reverts commit eacf12eeb174e35a301570726bf74434a4dd4b94.
Appears to be broken.
Conflicts:
vcl/source/filter/graphicfilter.cxx
Change-Id: I9ae3fbac2e7e9d08484c063cdb10e080ca89def2
Diffstat (limited to 'filter/qa')
| -rw-r--r-- | filter/qa/cppunit/filters-pict-test.cxx | 8 | ||||
| -rw-r--r-- | filter/qa/cppunit/filters-tga-test.cxx | 8 | ||||
| -rw-r--r-- | filter/qa/cppunit/filters-tiff-test.cxx | 8 |
3 files changed, 18 insertions, 6 deletions
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 <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() 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 <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() 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 <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() |