summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorKohei Yoshida <kohei@libreoffice.org>2019-08-22 16:48:50 -0400
committerKohei Yoshida <kohei@libreoffice.org>2019-08-23 01:41:23 +0200
commit52800fd6d9867252b795b6afacce19f66b5a5107 (patch)
treec1c8cb6d55abc43fda48517d7dde2da38d949c30 /external
parentff398785bede2b403f8f8e6391ce07538f6cc213 (diff)
Update orcus to 0.15.1.
Change-Id: Ifd945d03719bf2ed1fb145b405f1ea9297ebeb68 Reviewed-on: https://gerrit.libreoffice.org/77983 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
Diffstat (limited to 'external')
-rw-r--r--external/liborcus/UnpackedTarball_liborcus.mk1
-rw-r--r--external/liborcus/create-element.patch.055
2 files changed, 0 insertions, 56 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index 834b8128d39f..e1aef32edcf7 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
- external/liborcus/create-element.patch.0 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/create-element.patch.0 b/external/liborcus/create-element.patch.0
deleted file mode 100644
index b1012e5c90d8..000000000000
--- a/external/liborcus/create-element.patch.0
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/liborcus/xml_map_tree.cpp
-+++ src/liborcus/xml_map_tree.cpp
-@@ -723,35 +723,28 @@
- element* elem = r.first;
- bool created = r.second;
-
-- if (created)
-- {
-- // No element of that name exists.
-- elem->elem_type = element_linked;
-- elem->ref_type = ref_type;
-- }
-- else
-+ if (!created)
- {
- // This element already exists. Check if this is already linked.
- if (elem->ref_type != reference_unknown || elem->elem_type != element_unlinked)
- throw xpath_error("This element is already linked. You can't link the same element twice.");
--
-- // Turn this existing non-linked element into a linked one.
-- delete elem->child_elements;
-- elem->elem_type = element_linked;
-- elem->ref_type = ref_type;
-- switch (ref_type)
-- {
-- case reference_cell:
-- elem->cell_ref = new cell_reference;
-- break;
-- case reference_range_field:
-- elem->field_ref = new field_in_range;
-- break;
-- default:
-- throw general_error("Unknown reference type in xml_map_tree::get_element_stack.");
-- }
--
- }
-+
-+ // Turn this existing non-linked element into a linked one.
-+ delete elem->child_elements;
-+ elem->elem_type = element_linked;
-+ elem->ref_type = ref_type;
-+ switch (ref_type)
-+ {
-+ case reference_cell:
-+ elem->cell_ref = new cell_reference;
-+ break;
-+ case reference_range_field:
-+ elem->field_ref = new field_in_range;
-+ break;
-+ default:
-+ throw general_error("Unknown reference type in xml_map_tree::get_element_stack.");
-+ }
-
- ret.elem_stack.push_back(elem);
- ret.node = elem;