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 /unotest/inc | |
| 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 'unotest/inc')
| -rw-r--r-- | unotest/inc/unotest/filters-test.hxx | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/unotest/inc/unotest/filters-test.hxx b/unotest/inc/unotest/filters-test.hxx index d26c7f7b834f..390ad05230a3 100644 --- a/unotest/inc/unotest/filters-test.hxx +++ b/unotest/inc/unotest/filters-test.hxx @@ -27,6 +27,7 @@ * instead of those above. */ +#include <comphelper/documentconstants.hxx> #include <rtl/ustring.hxx> #include "unotest/detail/unotestdllapi.hxx" @@ -56,21 +57,33 @@ public: //root dir of test files, must contain pass, fail, indeterminate const rtl::OUString &rURL, //additional filter data for SfxFilter - const rtl::OUString &rUserData); + const rtl::OUString &rUserData = rtl::OUString(), + //SfxFilterFlags for SfxFilter + unsigned int nFilterFlags = SFX_FILTER_IMPORT, + //Clipboard id for SfxFilter + unsigned int nClipboardID = 0, + //additional filter version for SfxFilter + unsigned int nFilterVersion = 0); virtual bool load( const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData) = 0; + const rtl::OUString &rUserData, + unsigned int nFilterFlags, + unsigned int nClipboardID, + unsigned int nFilterVersion) = 0; protected: ~FiltersTest() {} void recursiveScan( + filterStatus nExpected, const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData, - filterStatus nExpected); + unsigned int nFilterFlags, + unsigned int nClipboardID, + unsigned int nFilterVersion); }; } |