summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-01 13:12:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-11-01 13:14:09 +0000
commitc2913591d895666c7b8019e3307355511a7a5f95 (patch)
treef782e6cee3de6fba62e8c3b62d88fd52d85c227c /writerfilter
parent2ffd82c350efb7d04ea0019fc1845f314940f995 (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 'writerfilter')
-rw-r--r--writerfilter/qa/cppunittests/rtftok/testrtftok.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index e5e656c8d549..69e0e7b998f9 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -45,7 +45,10 @@ public:
virtual void setUp();
- virtual bool load(const OUString &, const OUString &rURL, const OUString &);
+ virtual bool load(const rtl::OUString &,
+ const rtl::OUString &rURL, const rtl::OUString &,
+ unsigned int, unsigned int, unsigned int);
+
void test();
CPPUNIT_TEST_SUITE(RtfTest);
@@ -62,7 +65,9 @@ void RtfTest::setUp()
m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW);
}
-bool RtfTest::load(const OUString &, const OUString &rURL, const OUString &)
+bool RtfTest::load(const rtl::OUString &,
+ const rtl::OUString &rURL, const rtl::OUString &,
+ unsigned int, unsigned int, unsigned int)
{
uno::Sequence< beans::PropertyValue > aDescriptor(1);
aDescriptor[0].Name = "URL";