diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-21 12:35:59 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-21 12:35:59 +0200 |
| commit | e12896d4e2571451e2453d3b14a7e24f7371a4a4 (patch) | |
| tree | c4fe52f8586a1bfeaec4ad9f2f386e2b32f247fb /unoxml | |
| parent | c38b58b826847b71aafac9b25b51a68b76581903 (diff) | |
| parent | 9fe6487ae84c8f52d9cd87400229cd78fedf4c25 (diff) | |
CWS-TOOLING: integrate CWS sw33bf03
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 21 | ||||
| -rw-r--r-- | unoxml/source/rdf/makefile.mk | 8 |
2 files changed, 29 insertions, 0 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 72c89aeac19d..a7e50e7e232d 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -64,6 +64,19 @@ #include <comphelper/stlunosequence.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/makesequence.hxx> +#include <librdf.h> +#include <libxslt/security.h> + +#include <boost/utility.hpp> +#include <boost/shared_ptr.hpp> +#include <boost/shared_array.hpp> +#include <boost/bind.hpp> + +#include <map> +#include <functional> +#include <algorithm> + +#include <string.h> /** @@ -1889,7 +1902,15 @@ librdf_world *librdf_TypeConverter::createWorld() const m_rRep); } //FIXME logger, digest, features? + xsltSecurityPrefsPtr origprefs = xsltGetDefaultSecurityPrefs(); librdf_world_open(pWorld); + xsltSecurityPrefsPtr newprefs = xsltGetDefaultSecurityPrefs(); + if (newprefs != origprefs) { + // #i110523# restore libxslt global configuration + // (gratuitously overwritten by raptor_init_parser_grddl_common) + // (this is the only reason unordf is linked against libxslt) + xsltSetDefaultSecurityPrefs(origprefs); + } return pWorld; } diff --git a/unoxml/source/rdf/makefile.mk b/unoxml/source/rdf/makefile.mk index 1fd36f45ce0b..3f6d7f445297 100644 --- a/unoxml/source/rdf/makefile.mk +++ b/unoxml/source/rdf/makefile.mk @@ -41,6 +41,13 @@ ENABLE_EXCEPTIONS=TRUE CFLAGS+=-DSYSTEM_REDLAND $(REDLAND_CFLAGS) .ENDIF +.IF "$(SYSTEM_LIBXSLT)" == "YES" +CFLAGS+= $(LIBXSLT_CFLAGS) +.ELSE +LIBXSLTINCDIR=external$/libxslt +CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) +.ENDIF + # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" @@ -64,6 +71,7 @@ DEF1NAME=$(SHL1TARGET) SHL1STDLIBS= \ $(REDLANDLIB) \ + $(XSLTLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ |