mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwpfilter needs a new filter for each document

Browse Source 
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 0af436083e.

Change-Id: Iae355ed6099086fd3cc1c79203786017507d4ed4
This commit is contained in:
Caolán McNamara
2017-02-24 15:16:27 +00:00
parent 3a74745367
commit 3cc3dc176e
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
hwpfilter/qa/cppunit/data/fail/skipblock-1.hwp Normal file
View File

Binary file not shown.

16
hwpfilter/qa/cppunit/test_hwpfilter.cxx
View File

@@ -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()