#194

src/reader/xlsx/worksheet.rs

@@ -1,8 +1,10 @@
 use super::driver::*;
 use super::XlsxError;
+use hashbrown::HashMap;
 use quick_xml::events::Event;
 use quick_xml::Reader;
 
+use helper::formula::*;
 use structs::office2010::excel::DataValidations as DataValidations2010;
 use structs::raw::RawRelationships;
 use structs::raw::RawWorksheet;
@@ -27,7 +29,7 @@ pub(crate) fn read(
     let data = std::io::Cursor::new(raw_data_of_worksheet.get_worksheet_file().get_file_data());
     let mut reader = Reader::from_reader(data);
     reader.config_mut().trim_text(true);
-
+    let mut formula_shared_list: HashMap<u32, (String, Vec<FormulaToken>)> = HashMap::new();
     xml_read_loop!(
         reader,
         Event::Start(ref e) => match e.name().into_inner() {
@@ -71,6 +73,7 @@ pub(crate) fn read(
                     worksheet.get_cell_collection_crate_mut(),
                     shared_string_table,
                     stylesheet,
+                    &mut formula_shared_list,
                     false,
                 );
                 worksheet.set_row_dimension(obj);
@@ -170,6 +173,7 @@ pub(crate) fn read(
                     worksheet.get_cell_collection_crate_mut(),
                     shared_string_table,
                     stylesheet,
+                    &mut formula_shared_list,
                     true,
                 );
                 worksheet.set_row_dimension(obj);
@@ -224,7 +228,7 @@ pub(crate) fn read_lite(
     reader.config_mut().trim_text(true);
 
     let mut cells = Cells::default();
-
+    let mut formula_shared_list: HashMap<u32, (String, Vec<FormulaToken>)> = HashMap::new();
     xml_read_loop!(
         reader,
         Event::Start(ref e) => {
@@ -236,6 +240,7 @@ pub(crate) fn read_lite(
                     &mut cells,
                     shared_string_table,
                     stylesheet,
+                    &mut formula_shared_list,
                     false,
                 );
             }
@@ -249,6 +254,7 @@ pub(crate) fn read_lite(
                     &mut cells,
                     shared_string_table,
                     stylesheet,
+                    &mut formula_shared_list,
                     true,
                 );
             }

src/structs/cell_formula.rs

@@ -1,6 +1,7 @@
 use hashbrown::HashMap;
 use helper::coordinate::*;
 use helper::formula::*;
+use quick_xml::de;
 use quick_xml::events::{BytesStart, Event};
 use quick_xml::Reader;
 use quick_xml::Writer;

src/structs/row.rs

@@ -103,6 +103,7 @@ impl Row {
         cells: &mut Cells,
         shared_string_table: &SharedStringTable,
         stylesheet: &Stylesheet,
+        formula_shared_list: &mut HashMap<u32, (String, Vec<FormulaToken>)>,
         empty_flag: bool,
     ) {
         set_string_from_xml!(self, e, row_num, "r");
@@ -126,20 +127,19 @@ impl Row {
             return;
         }
 
-        let mut formula_shared_list: HashMap<u32, (String, Vec<FormulaToken>)> = HashMap::new();
         xml_read_loop!(
             reader,
             Event::Empty(ref e) => {
                 if e.name().into_inner() == b"c" {
                     let mut obj = Cell::default();
-                    obj.set_attributes(reader, e, shared_string_table, stylesheet, true, &mut formula_shared_list);
+                    obj.set_attributes(reader, e, shared_string_table, stylesheet, true, formula_shared_list);
                     cells.set_fast(obj);
                 }
             },
             Event::Start(ref e) => {
                 if e.name().into_inner() == b"c" {
                     let mut obj = Cell::default();
-                    obj.set_attributes(reader, e, shared_string_table, stylesheet, false, &mut formula_shared_list);
+                    obj.set_attributes(reader, e, shared_string_table, stylesheet, false, formula_shared_list);
                     cells.set_fast(obj);
                 }
             },

tests/integration_test.rs

@@ -1500,6 +1500,17 @@ fn issue_194_2() {
     let path = std::path::Path::new("./tests/test_files/issue_194_2.xlsx");
     let mut book = umya_spreadsheet::reader::xlsx::read(path).unwrap();
 
+    dbg!(book
+        .get_sheet(&0)
+        .unwrap()
+        .get_cell("P16")
+        .map_or("", |c| c.get_formula()));
+    dbg!(book
+        .get_sheet(&0)
+        .unwrap()
+        .get_cell("P17")
+        .map_or("", |c| c.get_formula()));
+
     let path = std::path::Path::new("./tests/result_files/issue_194_2.xlsx");
     let _ = umya_spreadsheet::writer::xlsx::write(&book, path);
 }