StarMirror
/
xlnt
mirror of https://github.com/tfussell/xlnt
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #628 from softvise/softvise/patches 

Fix format::number_format
pull/646/head
Thomas Fussell 2022-08-06 13:53:08 -05:00 committed by GitHub
parent ef4dec6ebc cef67bdc45
commit f3bbaa3eeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/styles/format.cpp
View File

@ -124,13 +124,28 @@ format format::font(const xlnt::font &new_font, optional<bool> applied)
xlnt::number_format format::number_format() const
{
if (number_format::is_builtin_format(d_->number_format_id.get()))
if (d_->number_format_id.is_set())
{
return number_format::from_builtin_id(d_->number_format_id.get());
const auto number_format_id = d_->number_format_id.get();
if (number_format::is_builtin_format(number_format_id))
{
return number_format::from_builtin_id(number_format_id);
}
const auto it = std::find_if(d_->parent->number_formats.begin(),
d_->parent->number_formats.end(),
[number_format_id](const xlnt::number_format &nf)
{
return nf.id() == number_format_id;
});
if (it != d_->parent->number_formats.end())
{
return *it;
}
}
return *std::find_if(d_->parent->number_formats.begin(), d_->parent->number_formats.end(),
[&](const xlnt::number_format nf) { return nf.id() == d_->number_format_id.get(); });
return xlnt::number_format();
}
format format::number_format(const xlnt::number_format &new_number_format, optional<bool> applied)