[Libreoffice-commits] .: sd/CppunitTest_sd_filters_test.mk sd/qa sd/source

[Libreoffice Gerrit user]

 sd/CppunitTest_sd_filters_test.mk            |    1 +
 sd/qa/unit/data/odg/pass/CVE-2012-4233-2.odg |binary
 sd/qa/unit/filters-test.cxx                  |    4 ++++
 sd/source/filter/xml/sdxmlwrp.cxx            |    6 +++---
 4 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit a6e4a84197aa7a658e2ffb76c0326016dda76d8b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 1 14:00:40 2012 +0000

    add .odg regression load test
    
    Change-Id: I5f7dc2a389c020a90b8087aefc90c054a809ef25

diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 4440c1d..132980a 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
     unotools/util/utl \
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
+    xmloff/util/xo \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sd_filters_test))
diff --git a/sd/qa/unit/data/odg/fail/.gitignore b/sd/qa/unit/data/odg/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sd/qa/unit/data/odg/indeterminate/.gitignore b/sd/qa/unit/data/odg/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sd/qa/unit/data/odg/pass/.gitignore b/sd/qa/unit/data/odg/pass/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sd/qa/unit/data/odg/pass/CVE-2012-4233-2.odg b/sd/qa/unit/data/odg/pass/CVE-2012-4233-2.odg
new file mode 100644
index 0000000..321bd9c
Binary files /dev/null and b/sd/qa/unit/data/odg/pass/CVE-2012-4233-2.odg differ
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index f274c2c..a834686 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -205,6 +205,10 @@ void SdFiltersTest::testCVEs()
     testDir(rtl::OUString("MS PowerPoint 97"),
             getURLFromSrc("/sd/qa/unit/data/ppt/"),
             rtl::OUString("sdfilt"));
+
+    testDir(rtl::OUString("draw8"),
+            getURLFromSrc("/sd/qa/unit/data/odg/"),
+            rtl::OUString("sdfilt"));
 #endif
 }
 
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index fb8598e..1dc3543 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -234,11 +234,11 @@ sal_Int32 ReadThroughComponent(
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" );
 
     // get filter
+    OUString aFilterName(OUString::createFromAscii(pFilterName));
     Reference< xml::sax::XDocumentHandler > xFilter(
-        rFactory->createInstanceWithArguments(
-            OUString::createFromAscii(pFilterName), rFilterArguments),
+        rFactory->createInstanceWithArguments(aFilterName, rFilterArguments),
         UNO_QUERY );
-    DBG_ASSERT( xFilter.is(), "Can't instantiate filter component." );
+    SAL_WARN_IF(!xFilter.is(), "sd", "Can't instantiate filter component: " << aFilterName);
     if( !xFilter.is() )
         return SD_XML_READERROR;
     RTL_LOGFILE_CONTEXT_TRACE1( aLog, "%s created", pFilterName );