diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-24 15:16:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-24 15:48:52 +0000 |
| commit | 3cc3dc176e00062d8395d9f3d83b49ab24542a61 (patch) | |
| tree | 107c0063b267f2f33a443e15e6f15b1f11cccabe /hwpfilter | |
| parent | 3a74745367a73ed9351379fc32bbe9253cdae697 (diff) | |
hwpfilter needs a new filter for each document
setUp is called just once at the start of the sequence of loads
so we're reusing the previous import state which isn't what this
filter expects
This reverts commit 0af436083e12516eb9251d4cc6f594f80ed06d3d.
Change-Id: Iae355ed6099086fd3cc1c79203786017507d4ed4
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/qa/cppunit/data/fail/skipblock-1.hwp | bin | 0 -> 10225 bytes | |||
| -rw-r--r-- | hwpfilter/qa/cppunit/test_hwpfilter.cxx | 16 |
2 files changed, 4 insertions, 12 deletions
diff --git a/hwpfilter/qa/cppunit/data/fail/skipblock-1.hwp b/hwpfilter/qa/cppunit/data/fail/skipblock-1.hwp Binary files differnew file mode 100644 index 000000000000..8fd8e7abf9fc --- /dev/null +++ b/hwpfilter/qa/cppunit/data/fail/skipblock-1.hwp diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx index f497d12ec3e6..040c98edb1b7 100644 --- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx +++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx @@ -24,7 +24,6 @@ namespace , public test::BootstrapFixture { public: - virtual void setUp() override; virtual bool load(const OUString &, const OUString &rURL, const OUString &, @@ -35,26 +34,19 @@ namespace CPPUNIT_TEST_SUITE(HwpFilterTest); CPPUNIT_TEST(test); CPPUNIT_TEST_SUITE_END(); - private: - uno::Reference<document::XFilter> m_xFilter; }; - void HwpFilterTest::setUp() - { - test::BootstrapFixture::setUp(); - - m_xFilter.set(m_xSFactory->createInstance("com.sun.comp.hwpimport.HwpImportFilter"), - uno::UNO_QUERY_THROW); - } - bool HwpFilterTest::load(const OUString &, const OUString &rURL, const OUString &, SfxFilterFlags, SotClipboardFormatId, unsigned int) { + uno::Reference<document::XFilter> xFilter(m_xSFactory->createInstance("com.sun.comp.hwpimport.HwpImportFilter"), + uno::UNO_QUERY_THROW); + uno::Sequence< beans::PropertyValue > aDescriptor(1); aDescriptor[0].Name = "URL"; aDescriptor[0].Value <<= rURL; - return m_xFilter->filter(aDescriptor); + return xFilter->filter(aDescriptor); } void HwpFilterTest::test() |