diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-01 13:12:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-01 13:14:09 +0000 |
| commit | c2913591d895666c7b8019e3307355511a7a5f95 (patch) | |
| tree | f782e6cee3de6fba62e8c3b62d88fd52d85c227c /filter | |
| parent | 2ffd82c350efb7d04ea0019fc1845f314940f995 (diff) | |
rework filters test to squeeze through extra flags
that are needed to load .odt, .sxw etc files, and
add a regression test for CVE-2012-4233
Change-Id: Ie178725ded3d76942030d12f23074de519cf62de
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/qa/cppunit/filters-pict-test.cxx | 7 | ||||
| -rw-r--r-- | filter/qa/cppunit/filters-tga-test.cxx | 7 | ||||
| -rw-r--r-- | filter/qa/cppunit/filters-tiff-test.cxx | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index 69228f34f946..9e5a296e7e16 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -34,7 +34,9 @@ class PictFilterTest public: PictFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &); + virtual bool load(const rtl::OUString &, + const rtl::OUString &rURL, const rtl::OUString &, + unsigned int, unsigned int, unsigned int); /** * Ensure CVEs remain unbroken @@ -47,7 +49,8 @@ public: }; bool PictFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &) + const rtl::OUString &rURL, const rtl::OUString &, + unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index c0eba97d41f6..9edcf62b57a7 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -54,7 +54,9 @@ class TgaFilterTest public: TgaFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &); + virtual bool load(const rtl::OUString &, + const rtl::OUString &rURL, const rtl::OUString &, + unsigned int, unsigned int, unsigned int); /** * Ensure CVEs remain unbroken @@ -67,7 +69,8 @@ public: }; bool TgaFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &) + const rtl::OUString &rURL, const rtl::OUString &, + unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index 942ad1609290..b967393e9ec8 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -54,7 +54,9 @@ class TiffFilterTest public: TiffFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &); + virtual bool load(const rtl::OUString &, + const rtl::OUString &rURL, const rtl::OUString &, + unsigned int, unsigned int, unsigned int); /** * Ensure CVEs remain unbroken @@ -67,7 +69,8 @@ public: }; bool TiffFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &) + const rtl::OUString &rURL, const rtl::OUString &, + unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); Graphic aGraphic; |