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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/qa/unit/filters-test.cxx | 11 | ||||
| -rw-r--r-- | sd/qa/unit/regression-test.cxx | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx index 76fd560f9486..f274c2c94f73 100644 --- a/sd/qa/unit/filters-test.cxx +++ b/sd/qa/unit/filters-test.cxx @@ -62,7 +62,10 @@ public: SdFiltersTest(); ::sd::DrawDocShellRef loadURL( const rtl::OUString &rURL ); - virtual bool load( const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData); + virtual bool load( const rtl::OUString &rFilter, + const rtl::OUString &rURL, const rtl::OUString &rUserData, + unsigned int nFilterFlags, unsigned int nClipboardID, + unsigned int nFilterVersion); virtual void setUp(); virtual void tearDown(); @@ -179,12 +182,14 @@ void SdFiltersTest::testN778859() } bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData) + const rtl::OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, + unsigned int nFilterVersion) { SfxFilter aFilter( rFilter, - rtl::OUString(), 0, 0, rtl::OUString(), 0, rtl::OUString(), + rtl::OUString(), nFilterFlags, nClipboardID, rtl::OUString(), 0, rtl::OUString(), rUserData, rtl::OUString() ); + aFilter.SetVersion(nFilterVersion); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ); diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx index 266f538b035d..e378ff073319 100644 --- a/sd/qa/unit/regression-test.cxx +++ b/sd/qa/unit/regression-test.cxx @@ -76,7 +76,10 @@ public: SdFiltersTest(); ::sd::DrawDocShellRef loadURL( const rtl::OUString &rURL ); - virtual bool load( const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData); + virtual bool load( const rtl::OUString &rFilter, + const rtl::OUString &rURL, const rtl::OUString &rUserData, + unsigned int nFilterFlags, unsigned int nClipboardID, + unsigned int nFilterVersion); virtual void setUp(); virtual void tearDown(); @@ -246,12 +249,14 @@ void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OStrin } bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData) + const rtl::OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, + unsigned int nFilterVersion) { SfxFilter aFilter( rFilter, - rtl::OUString(), 0, 0, rtl::OUString(), 0, rtl::OUString(), + rtl::OUString(), nFilterFlags, nClipboardID, rtl::OUString(), 0, rtl::OUString(), rUserData, rtl::OUString() ); + aFilter.SetVersion(nFilterVersion); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ); |