From a347d9c05d5c50b5373d6a1532b5217573f5f9c1 Mon Sep 17 00:00:00 2001
From: Crzyrndm <joshcrawfy@gmail.com>
Date: Sun, 24 Jun 2018 21:25:58 +1200
Subject: [PATCH] ext_list parsing for worksheets

---
 source/detail/serialization/xlsx_consumer.cpp |  3 ++-
 source/packaging/ext_list.cpp                 | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/source/detail/serialization/xlsx_consumer.cpp b/source/detail/serialization/xlsx_consumer.cpp
index 19a4c1ad..9a05c01a 100644
--- a/source/detail/serialization/xlsx_consumer.cpp
+++ b/source/detail/serialization/xlsx_consumer.cpp
@@ -1190,7 +1190,8 @@ worksheet xlsx_consumer::read_worksheet_end(const std::string &rel_id)
         }
         else if (current_worksheet_element == qn("spreadsheetml", "extLst"))
         {
-            skip_remaining_content(current_worksheet_element);
+            ext_list extensions(parser());
+            ws.d_->extension_list_.set(extensions);
         }
         else
         {
diff --git a/source/packaging/ext_list.cpp b/source/packaging/ext_list.cpp
index 7f837124..c5eefde4 100644
--- a/source/packaging/ext_list.cpp
+++ b/source/packaging/ext_list.cpp
@@ -6,9 +6,10 @@
 namespace {
     // send elements straight from parser to serialiser without modification
     // runs until the end of the current open element
-    void roundtrip(xml::parser& p, xml::serializer &s)
+    xlnt::uri roundtrip(xml::parser& p, xml::serializer &s)
     {
-        int nest_level = 0;
+        xlnt::uri ext_uri;
+        int nest_level = 0; // ext element already opened on entry
         while (nest_level > 0 || (p.peek() != xml::parser::event_type::end_element && p.peek() != xml::parser::event_type::eof))
         {
             switch (p.next())
@@ -16,11 +17,14 @@ namespace {
             case xml::parser::start_element:
             {
                 ++nest_level;
-                s.start_element(p.qname());
+                s.start_element(p.name());
+                if (nest_level == 1)
+                {
+                    ext_uri = p.attribute("uri");
+                }
                 for (auto &ele : p.attribute_map())
                 {
-                    s.attribute(ele.first, ele.second.value);
-                    ele.second.handled = true;
+                    s.attribute(ele.first.string(), ele.second.value);
                 }
                 break;
             }
@@ -45,13 +49,14 @@ namespace {
                 break;
             }
             case xml::parser::eof:
-                return;
+                return ext_uri;
             case xml::parser::start_attribute:
             case xml::parser::end_attribute:
             default:
                 break;
             }
         }
+        return ext_uri;
     }
 }
 
@@ -59,15 +64,12 @@ namespace xlnt {
 
 ext_list::ext::ext(xml::parser &parser)
 {
-    // because libstudxml is a streaming parser, this is parsed once to acquire the complete string form, and then a second time for the URI
+    //parser.next_expect(xml::parser::start_element, "ext");
+    //extension_ID_ = uri(parser.attribute("uri"));
     std::ostringstream serialisation_stream;
     xml::serializer s(serialisation_stream, "", 0);
-    roundtrip(parser, s);
+    extension_ID_ = roundtrip(parser, s);
     serialised_value_ = serialisation_stream.str();
-    const std::string uri_specifier = R"(uri=")";
-    int offset = serialised_value_.find(uri_specifier) + uri_specifier.size();
-    int len = serialised_value_.find('"', offset) - offset;
-    extension_ID_ = uri(serialised_value_.substr(offset, len));
 }
 
 ext_list::ext::ext(const uri &ID, const std::string &serialised)
@@ -83,6 +85,7 @@ void ext_list::ext::serialise(xml::serializer &serialiser)
 
 ext_list::ext_list(xml::parser &parser)
 {
+    parser.content(xml::parser::content_type::mixed);
     // begin with the start element already parsed
     while (parser.peek() == xml::parser::start_element)
     {