unordf: replace external entity disabling handler code ...

... with a configure check for the fixed raptor library.

Change-Id: I495d5d28e9a4e7b6234f8f9d17c2bda36154316d

configure.ac

@@ -8475,6 +8475,8 @@ dnl ===================================================================
 dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
 libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland >= 1.0.8])
 if test "$with_system_redland" = "yes"; then
+    # need at least 2.0.7 for CVE-2012-0037
+    PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= 2.0.7])
     libo_MINGW_CHECK_DLL([REDLAND], [librdf])
     libo_MINGW_TRY_DLL([RAPTOR], [libraptor])
     libo_MINGW_TRY_DLL([RASQAL], [librasqal])

unoxml/source/rdf/librdf_repository.cxx

@@ -32,7 +32,6 @@
 #include <boost/bind.hpp>
 
 #include <libxslt/security.h>
-#include <libxml/parser.h>
 
 #include <redland.h>
 
@@ -872,11 +871,6 @@ bool formatNeedsBaseURI(::sal_Int16 i_Format)
     return true;
 }
 
-xmlParserInputPtr myExtEntityLoader( const char* /*URL*/, const char* /*ID*/, xmlParserCtxtPtr /*context*/)
-{
-	return NULL;
-}
-
 //void SAL_CALL
 uno::Reference<rdf::XNamedGraph> SAL_CALL
 librdf_Repository::importGraph(::sal_Int16 i_Format,
@@ -954,9 +948,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
                 "librdf_new_parser failed", *this);
     }
 
-    xmlExternalEntityLoader oldExtEntityLoader = xmlGetExternalEntityLoader();
-    xmlSetExternalEntityLoader( myExtEntityLoader);
-
     uno::Sequence<sal_Int8> buf;
     uno::Reference<io::XSeekable> xSeekable(i_xInStream, uno::UNO_QUERY);
     // UGLY: if only that redland junk could read streams...
@@ -982,7 +973,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             "librdf_model_context_add_statements failed", *this);
     }
 
-    xmlSetExternalEntityLoader( oldExtEntityLoader);
     return getGraph(i_xGraphName);
 }