sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Removes ununsed borders code

Browse Source
This commit is contained in:
Nicolás Hatcher
2024-11-06 18:34:42 +01:00
committed by Nicolás Hatcher Andrés
parent d08fe32f97
commit 8cdb3b8c60
2 changed files with 3 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
base/src/user_model/common.rs
View File

@@ -13,8 +13,8 @@ use crate::{
},
model::Model,
types::{
Alignment, BorderItem, BorderStyle, CellType, Col, HorizontalAlignment, SheetProperties,
Style, VerticalAlignment,
Alignment, BorderItem, CellType, Col, HorizontalAlignment, SheetProperties, Style,
VerticalAlignment,
},
utils::is_valid_hex_color,
};
@@ -103,37 +103,6 @@ fn color(value: &str) -> Result<Option<String>, String> {
Ok(Some(value.to_owned()))
}
fn border(value: &str) -> Result<Option<BorderItem>, String> {
if value.is_empty() {
return Ok(None);
}
let parts = value.split(',');
let values = parts.collect::<Vec<&str>>();
match values[..] {
[border_style, color_str] => {
let style = match border_style {
"thin" => BorderStyle::Thin,
"medium" => BorderStyle::Medium,
"thick" => BorderStyle::Thick,
"double" => BorderStyle::Double,
"dotted" => BorderStyle::Dotted,
"slantDashDot" => BorderStyle::SlantDashDot,
"mediumDashed" => BorderStyle::MediumDashed,
"mediumDashDotDot" => BorderStyle::MediumDashDotDot,
"mediumDashDot" => BorderStyle::MediumDashDot,
_ => {
return Err(format!("Invalid border style: '{border_style}'."));
}
};
Ok(Some(BorderItem {
style,
color: color(color_str)?,
}))
}
_ => Err(format!("Invalid border value: '{value}'.")),
}
}
fn horizontal(value: &str) -> Result<HorizontalAlignment, String> {
match value {
"center" => Ok(HorizontalAlignment::Center),
@@ -1067,18 +1036,6 @@ impl UserModel {
"num_fmt" => {
value.clone_into(&mut style.num_fmt);
}
"border.left" => {
style.border.left = border(value)?;
}
"border.right" => {
style.border.right = border(value)?;
}
"border.top" => {
style.border.top = border(value)?;
}
"border.bottom" => {
style.border.bottom = border(value)?;
}
"alignment" => {
if !value.is_empty() {
return Err(format!("Alignment must be empty, but found: '{value}'."));