From a25187f7889fcc4b071ef648c3be6b9c15438897 Mon Sep 17 00:00:00 2001
From: JCrawfy <joshcrawfy@gmail.com>
Date: Mon, 18 Nov 2019 20:46:34 +1300
Subject: [PATCH] fix using attribute<double> (causes bugs when '.' is not the
 decimal separator

---
 source/detail/serialization/xlsx_consumer.cpp | 23 ++++++++-----------
 source/detail/serialization/xlsx_consumer.hpp |  2 ++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/source/detail/serialization/xlsx_consumer.cpp b/source/detail/serialization/xlsx_consumer.cpp
index 3fe41b49..6a8a38b9 100644
--- a/source/detail/serialization/xlsx_consumer.cpp
+++ b/source/detail/serialization/xlsx_consumer.cpp
@@ -598,8 +598,6 @@ cell xlsx_consumer::read_cell()
         cell.formula(formula_value_string);
     }
 
-    number_converter converter;
-
     if (has_value)
     {
         if (type == "str")
@@ -614,7 +612,7 @@ cell xlsx_consumer::read_cell()
         }
         else if (type == "s")
         {
-            cell.d_->value_numeric_ = converter.stold(value_string);
+            cell.d_->value_numeric_ = converter_.stold(value_string);
             cell.data_type(cell::type::shared_string);
         }
         else if (type == "b") // boolean
@@ -623,7 +621,7 @@ cell xlsx_consumer::read_cell()
         }
         else if (type == "n") // numeric
         {
-            cell.value(converter.stold(value_string));
+            cell.value(converter_.stold(value_string));
         }
         else if (!value_string.empty() && value_string[0] == '#')
         {
@@ -974,8 +972,7 @@ void xlsx_consumer::read_worksheet_sheetdata()
     {
         return;
     }
-    number_converter converter;
-    Sheet_Data ws_data = parse_sheet_data(parser_, converter);
+    Sheet_Data ws_data = parse_sheet_data(parser_, converter_);
     // NOTE: parse->construct are seperated here and could easily be threaded
     // with a SPSC queue for what is likely to be an easy performance win
     for (auto &row : ws_data.parsed_rows)
@@ -1013,7 +1010,7 @@ void xlsx_consumer::read_worksheet_sheetdata()
             }
             case cell::type::number:
             {
-                ws_cell_impl->value_numeric_ = converter.stold(cell.value);
+                ws_cell_impl->value_numeric_ = converter_.stold(cell.value);
                 break;
             }
             case cell::type::shared_string:
@@ -1213,12 +1210,12 @@ worksheet xlsx_consumer::read_worksheet_end(const std::string &rel_id)
         {
             page_margins margins;
 
-            margins.top(parser().attribute<double>("top"));
-            margins.bottom(parser().attribute<double>("bottom"));
-            margins.left(parser().attribute<double>("left"));
-            margins.right(parser().attribute<double>("right"));
-            margins.header(parser().attribute<double>("header"));
-            margins.footer(parser().attribute<double>("footer"));
+            margins.top(converter_.stold(parser().attribute("top")));
+            margins.bottom(converter_.stold(parser().attribute("bottom")));
+            margins.left(converter_.stold(parser().attribute("left")));
+            margins.right(converter_.stold(parser().attribute("right")));
+            margins.header(converter_.stold(parser().attribute("header")));
+            margins.footer(converter_.stold(parser().attribute("footer")));
 
             ws.page_margins(margins);
         }
diff --git a/source/detail/serialization/xlsx_consumer.hpp b/source/detail/serialization/xlsx_consumer.hpp
index fd6d70fb..c1c36006 100644
--- a/source/detail/serialization/xlsx_consumer.hpp
+++ b/source/detail/serialization/xlsx_consumer.hpp
@@ -34,6 +34,7 @@
 
 #include <detail/external/include_libstudxml.hpp>
 #include <detail/serialization/zstream.hpp>
+#include <xlnt/utils/numeric.hpp>
 
 namespace xlnt {
 
@@ -409,6 +410,7 @@ private:
     detail::cell_impl *current_cell_;
 
     detail::worksheet_impl *current_worksheet_;
+    number_converter converter_;
 };
 
 } // namespace detail