filter/source/xsltfilter/XSLTFilter.cxx | 6 +++--
offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl | 23 ----------------------
3 files changed, 4 insertions(+), 26 deletions(-)
New commits:
commit d22f3b8c787b93c38925adf92af542362dbda3e6
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Feb 15 08:28:47 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Feb 15 08:44:21 2023 +0000
Remove css.xml.xslt.XSLT2Transformer not implemented by LO
(see f4238ed900cdfa65d447fbef81b2e8ae95095a4e "Revert
'XSLT2Transformer::create
should always succeed'": "LO does not ship this service, it's only provided
by
Saxon extension")
Change-Id: I8ff8c9e4bd0eae7055dcb4fc83a04ea41310b9a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147038
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx
b/filter/source/xsltfilter/XSLTFilter.cxx
index e3be62221468..44f9ce4d8172 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -65,7 +65,6 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <com/sun/star/xml/xslt/XSLT2Transformer.hpp>
#include <com/sun/star/xml/xslt/XSLTTransformer.hpp>
#include <utility>
@@ -234,7 +233,10 @@ namespace XSLT
{
try
{
- xTransformer = xslt::XSLT2Transformer::create(m_xContext,
rArgs);
+ xTransformer.set(
+
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+ "com.sun.star.xml.xslt.XSLT2Transformer", rArgs,
m_xContext),
+ css::uno::UNO_QUERY_THROW);
}
catch (const Exception&)
{
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e56e1dcf7754..5a592600797e 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -484,7 +484,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/xpath,\
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/xslt,\
XSLTTransformer \
- XSLT2Transformer \
))
diff --git a/offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl
b/offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl
deleted file mode 100644
index f42a9ba4a036..000000000000
--- a/offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-module com { module sun { module star { module xml { module xslt {
-
-/** Get XSLT filter transformer supporting XSLT 2.0.
-
- @since LibreOffice 4.0
- */
-service XSLT2Transformer : XXSLTTransformer
-{
- create([in] sequence<any> args);
-};
-
-}; }; }; }; };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
