diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-15 09:11:46 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-15 09:12:08 -0400 |
| commit | eacf12eeb174e35a301570726bf74434a4dd4b94 (patch) | |
| tree | b949387be30dfac602a1d1693835a4a918c30db2 /filter/qa | |
| parent | cd79d51420b90117d0f3e1d5f3cdf9187bd61b88 (diff) | |
properly prefix graphic filter methods
Change-Id: I1d14e2330447e446ab35832d03220c71ee326866
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, 6 insertions, 18 deletions
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() |