diff options
| -rwxr-xr-x | filter/source/config/tools/merge/pyAltFCFGMerge | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | oox/inc/oox/ole/axbinaryreader.hxx | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | oox/source/ole/axbinaryreader.cxx | 0 | ||||
| -rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 21 | ||||
| -rw-r--r-- | unoxml/source/rdf/makefile.mk | 8 |
5 files changed, 30 insertions, 1 deletions
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index faf9b9c34cb7..d9a974eb9fec 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -11,7 +11,7 @@ import sys, string, os.path -CFGFILE = "../../../../transex3/source/filter/merge/FCFGMerge.cfg" +CFGFILE = "../../../../l10ntools/source/filter/merge/FCFGMerge.cfg" PROP_XMLVERSION = "xmlversion" # // <= global cfg file PROP_XMLENCODING = "xmlencoding" # // <= global cfg file diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx index d036e958a446..d036e958a446 100644..100755 --- a/oox/inc/oox/ole/axbinaryreader.hxx +++ b/oox/inc/oox/ole/axbinaryreader.hxx diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx index cb7e292b8cf4..cb7e292b8cf4 100644..100755 --- a/oox/source/ole/axbinaryreader.cxx +++ b/oox/source/ole/axbinaryreader.cxx 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) \ |