diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-04 17:59:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-05 03:54:00 -0600 |
| commit | 4cb3765cccd22cb127a263be4125470466c65467 (patch) | |
| tree | 33fabb0fb7639160bee7481c3dd836206892e105 /filter/source | |
| parent | 9a32be03681a595ce075e6fc6d6c60494a70a2fb (diff) | |
filter: make LibXSLTTransformer init backward compatible
As reported by Fernand Vanrie, initializing the XSLT service can fail
because the LibXSLTTransformer::initialize was changed to require
the parameters as a nested Sequence; accept previous parameter
convention as a fall-back.
(regression from ca0ea73a4ab104031a16b5bac7a9bb6e57c77ba0)
(cherry picked from commit 6967da019b69767a15116de101d33a16b95c8a44)
filter: and we learn that BootstrapFixture requires boost headers
(cherry picked from commit bfdd18eb35f5c8bf7f713910ec35b853c7456969)
filter: don't wait forever if the xslt test fails
(cherry picked from commit 8af7a8953248dd184cd620b934ee6abc147f4076)
I imagine this should have a SAL_CALL decoration
(cherry picked from commit 62d6252d2cde33f6ef0e627c3192a63d43ba2a87)
filter: sigh... fix the xslt test to run on WNT too
(cherry picked from commit 4fcd5534348adcb61ab85b93478c272b8d9e8f8c)
Change-Id: I136e6e6338f11ffecf9f856f0736d1d0e6b17c3f
Reviewed-on: https://gerrit.libreoffice.org/8451
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter/source')
| -rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index c0abb8831323..f7b25006e0b7 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -478,7 +478,10 @@ namespace XSLT throw (RuntimeException) { Sequence<Any> params; - args[0] >>= params; + if (!(args[0] >>= params)) + { // backward compatibility for old clients using createInstance + params = args; + } xmlSubstituteEntitiesDefault(0); m_parameters.clear(); for (int i = 0; i < params.getLength(); i++) |