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 /sw/source/filter | |
| 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 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 80af530197ee..310818d25aa3 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -162,11 +162,11 @@ sal_Int32 ReadThroughComponent( RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); // get filter + OUString aFilterName(OUString::createFromAscii(pFilterName)); uno::Reference< xml::sax::XDocumentHandler > xFilter( - rFactory->createInstanceWithArguments( - OUString::createFromAscii(pFilterName), rFilterArguments), - UNO_QUERY ); - OSL_ENSURE( xFilter.is(), "Can't instantiate filter component." ); + rFactory->createInstanceWithArguments(aFilterName, rFilterArguments), + UNO_QUERY); + SAL_WARN_IF(!xFilter.is(), "sw", "Can't instantiate filter component: " << aFilterName); if( !xFilter.is() ) return ERR_SWG_READ_ERROR; RTL_LOGFILE_CONTEXT_TRACE1( aLog, "%s created", pFilterName ); |