diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-01-02 22:07:41 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-01-04 22:02:51 +0100 |
commit | 0c22f3eadd3ffb461eada94f4b019fbb2161f197 (patch) | |
tree | 81091634b534d4b017a6a1a153df942046da7447 /vcl/qa/cppunit | |
parent | 255c03d6ad4ed13c456ee621e0af765684a475d2 (diff) |
Make LO buildable again after the GraphicFilter move.
Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
Diffstat (limited to 'vcl/qa/cppunit')
-rw-r--r-- | vcl/qa/cppunit/graphicfilter/filters-test.cxx | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index bdf8269575e2..bec3cc0d9c6d 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -33,18 +33,18 @@ #include <osl/file.hxx> #include <osl/process.h> -#include <svtools/filter.hxx> +#include <vcl/graphicfilter.hxx> using namespace ::com::sun::star; /* Implementation of Filters test */ -class SvtoolsFiltersTest +class VclFiltersTest : public test::FiltersTest , public test::BootstrapFixture { public: - SvtoolsFiltersTest() : BootstrapFixture(true, false) {} + VclFiltersTest() : BootstrapFixture(true, false) {} virtual bool load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &, @@ -55,12 +55,12 @@ public: */ void testCVEs(); - CPPUNIT_TEST_SUITE(SvtoolsFiltersTest); + CPPUNIT_TEST_SUITE(VclFiltersTest); CPPUNIT_TEST(testCVEs); CPPUNIT_TEST_SUITE_END(); }; -bool SvtoolsFiltersTest::load(const rtl::OUString &, +bool VclFiltersTest::load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &, unsigned int, unsigned int, unsigned int) { @@ -70,38 +70,40 @@ bool SvtoolsFiltersTest::load(const rtl::OUString &, return aGraphicFilter.ImportGraphic(aGraphic, rURL, aFileStream) == 0; } -void SvtoolsFiltersTest::testCVEs() +void VclFiltersTest::testCVEs() { +#ifndef DISABLE_CVE_TESTS testDir(rtl::OUString(), - getURLFromSrc("/svtools/qa/cppunit/data/wmf/"), + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/"), rtl::OUString()); testDir(rtl::OUString(), - getURLFromSrc("/svtools/qa/cppunit/data/emf/"), + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/"), rtl::OUString()); testDir(rtl::OUString(), - getURLFromSrc("/svtools/qa/cppunit/data/sgv/"), + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/"), rtl::OUString()); testDir(rtl::OUString(), - getURLFromSrc("/svtools/qa/cppunit/data/png/"), + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/"), rtl::OUString()); testDir(rtl::OUString(), - getURLFromSrc("/svtools/qa/cppunit/data/jpg/"), + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/"), rtl::OUString()); testDir(rtl::OUString(), - getURLFromSrc("/svtools/qa/cppunit/data/gif/"), + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/"), rtl::OUString()); testDir(rtl::OUString(), - getURLFromSrc("/svtools/qa/cppunit/data/bmp/"), + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/"), rtl::OUString()); +#endif } -CPPUNIT_TEST_SUITE_REGISTRATION(SvtoolsFiltersTest); +CPPUNIT_TEST_SUITE_REGISTRATION(VclFiltersTest); CPPUNIT_PLUGIN_IMPLEMENT(); |