Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion src/structs/cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,13 @@ impl Cell {
pub fn formatted_value(&self) -> String {
let value = self.value();

if matches!(
self.raw_value(),
CellRawValue::String(_) | CellRawValue::RichText(_)
) {
return value.into_owned();
}

// convert value
let result = match self.style().number_format() {
Some(number_format) => to_formatted_string(&value, number_format.format_code()),
Expand Down Expand Up @@ -651,7 +658,7 @@ impl Cell {
},
b"is" => {
if type_value == "inlineStr" {
self.set_value_crate(&string_value);
self.set_value_string_crate(&string_value);
}
}
b"c" => return,
Expand Down Expand Up @@ -824,3 +831,33 @@ impl AdjustmentCoordinateWith2Sheet for Cell {
);
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn inline_string_that_looks_numeric_stays_string() {
let mut reader = Reader::from_str(r#"<c r="A1" t="inlineStr"><is><t>0050</t></is></c>"#);
let cell_start = match reader.read_event().unwrap() {
Event::Start(event) => event,
event => panic!("expected cell start event, got {event:?}"),
};
let mut cell = Cell::default();
let mut formula_shared_list = HashMap::new();

cell.set_attributes(
&mut reader,
&cell_start,
&SharedStringTable::default(),
&Stylesheet::default(),
false,
&mut formula_shared_list,
);

assert_eq!(cell.value(), "0050");
assert_eq!(cell.formatted_value(), "0050");
assert_eq!(cell.data_type(), "s");
assert!(cell.value_number().is_none());
}
}
Loading