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 branch 'master' into time-struct-warning

Browse Source
This commit is contained in:
Thomas Fussell 2021-01-02 16:09:15 -05:00 committed by GitHub
commit b9a1b48811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 530 additions and 1339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1849
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -9,8 +9,8 @@
},
"dependencies": {},
"devDependencies": {
"@release-it/bumper": "^1.1.0",
"release-it": "^13.1.1"
"@release-it/bumper": "^2.0.0",
"release-it": "^14.2.2"
},
"scripts": {
"release": "release-it"

4
source/detail/serialization/xlsx_consumer.cpp
View File

@ -2098,15 +2098,13 @@ void xlsx_consumer::read_shared_string_table()
{
expect_start_element(qn("spreadsheetml", "si"), xml::content::complex);
auto rt = read_rich_text(qn("spreadsheetml", "si"));
// by reading in it can happen we have similar strings from modified excel worksheets
// so allow to add duplicates
target_.add_shared_string(rt, true);
expect_end_element(qn("spreadsheetml", "si"));
}
expect_end_element(qn("spreadsheetml", "sst"));
if (has_unique_count && unique_count != target_.shared_strings_by_id().size())
if (has_unique_count && unique_count != target_.shared_strings().size())
{
throw invalid_file("sizes don't match");
}

12
source/workbook/workbook.cpp
View File

@ -1398,17 +1398,9 @@ std::size_t workbook::add_shared_string(const rich_text &shared, bool allow_dupl
}
}
// it can happen that similar strings are more then onetime in the shared stringtable (Excel bugfix?)
// shared_strings_values map should start on position 0
auto sz = d_->shared_strings_values_.size();
if (d_->shared_strings_values_.count(sz) > 0)
{
// something went wrong!
throw invalid_file("Error in shared string table!");
}
d_->shared_strings_values_[sz] = shared;
auto sz = d_->shared_strings_ids_.size();
d_->shared_strings_ids_[shared] = sz;
d_->shared_strings_values_.push_back(shared);
return sz;
}