summaryrefslogtreecommitdiff
path: root/sot
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 /sot
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 'sot')
-rw-r--r--sot/qa/cppunit/test_sot.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx
index d0bda111cb61..dc4b38f782e9 100644
--- a/sot/qa/cppunit/test_sot.cxx
+++ b/sot/qa/cppunit/test_sot.cxx
@@ -52,7 +52,8 @@ namespace
bool checkStorage( const SotStorageRef &xObjStor );
virtual bool load(const rtl::OUString &,
- const rtl::OUString &rURL, const rtl::OUString &);
+ const rtl::OUString &rURL, const rtl::OUString &,
+ unsigned int, unsigned int, unsigned int);
void test();
@@ -107,9 +108,6 @@ namespace
for( SvStorageInfoList::iterator aIt = aInfoList.begin();
aIt != aInfoList.end(); ++aIt )
{
-// fprintf( stderr, "Stream '%s' size %ld\n",
-// rtl::OUStringToOString( aIt->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(),
-// (long)aIt->GetSize() );
if( aIt->IsStorage() )
{
SotStorageRef xChild( xObjStor->OpenSotStorage( aIt->GetName() ) );
@@ -123,7 +121,8 @@ namespace
}
bool SotTest::load(const rtl::OUString &,
- const rtl::OUString &rURL, const rtl::OUString &)
+ const rtl::OUString &rURL, const rtl::OUString &,
+ unsigned int, unsigned int, unsigned int)
{
SvFileStream aStream(rURL, STREAM_READ);
SotStorageRef xObjStor = new SotStorage(aStream);