StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #646 from tfussell/fix-unhandled-values-in-switch

Browse Source 
Fix unhandled enumeration values in switch statement
This commit is contained in:
Thomas Fussell 2022-08-13 09:15:17 -05:00 committed by GitHub
commit 69a20f3627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/detail/serialization/xlsx_producer.cpp
View File

@ -672,14 +672,22 @@ void xlsx_producer::write_workbook(const relationship &rel)
for (const auto &child_rel : workbook_rels) for (const auto &child_rel : workbook_rels)
{ {
if (child_rel.type() == relationship_type::calculation_chain) continue; if (child_rel.type() == relationship_type::calculation_chain)
{
// We don't yet have a VBA interpreter which can evaluate formulas.
// If we write an outdated calculate chain, Excel will treat the XLSX
// as corrupt. As a workaround, we keep the relationship but don't
// write the calculation chain file so Excel will recalculate all formulae
// on load.
continue;
}
path archive_path(child_rel.source().path().parent().append(child_rel.target().path())); auto child_target_path = child_rel.target().path();
path archive_path(child_rel.source().path().parent().append(child_target_path));
// write binary // write binary
switch (child_rel.type()) if (child_rel.type() == relationship_type::vbaproject)
{ {
case relationship_type::vbaproject:
write_binary(archive_path); write_binary(archive_path);
continue; continue;
} }
@ -3071,23 +3079,22 @@ void xlsx_producer::write_worksheet(const relationship &rel)
if (child_rel.type() == relationship_type::printer_settings) if (child_rel.type() == relationship_type::printer_settings)
{ {
write_binary(archive_path); write_binary(archive_path);
continue;
} }
else
{
begin_part(archive_path);
if (child_rel.type() == relationship_type::comments) begin_part(archive_path);
{
write_comments(child_rel, ws, cells_with_comments); if (child_rel.type() == relationship_type::comments)
} {
else if (child_rel.type() == relationship_type::vml_drawing) write_comments(child_rel, ws, cells_with_comments);
{ }
write_vml_drawings(child_rel, ws, cells_with_comments); else if (child_rel.type() == relationship_type::vml_drawing)
} {
else if (child_rel.type() == relationship_type::drawings) write_vml_drawings(child_rel, ws, cells_with_comments);
{ }
write_drawings(child_rel, ws); else if (child_rel.type() == relationship_type::drawings)
} {
write_drawings(child_rel, ws);
} }
} }
} }