File fix-linking.patch of Package liborcus

Overview Repositories Revisions Requests Users Attributes Meta

File fix-linking.patch of Package liborcus (Revision e475c9a2bdc764354ff519ff9f3f93b2)

Currently displaying revision e475c9a2bdc764354ff519ff9f3f93b2 , Show latest

From 1e024e37c59574965e1b07bc5097c014d4625227 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 15 Aug 2019 15:40:14 +0200
Subject: [PATCH] Fix linking of newly created element

(see downstream <https://gerrit.libreoffice.org/#/c/77519/> "Fix linking of
newly created element in liborcus 0.15.0")
---
 src/liborcus/xml_map_tree.cpp | 39 ++++++++++++++---------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
index 166eb8b9..d6fa5c47 100644
--- a/src/liborcus/xml_map_tree.cpp
+++ b/src/liborcus/xml_map_tree.cpp
@@ -723,34 +723,27 @@ xml_map_tree::linked_node_type xml_map_tree::get_linked_node(const pstring& xpat
         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);
-- 
2.22.0

Places

File fix-linking.patch of Package liborcus (Revision e475c9a2bdc764354ff519ff9f3f93b2)

Places