Commit 4acaa75b authored by Oleg Korshul's avatar Oleg Korshul

Merge branch 'release/v5.0.0' of https://github.com/ONLYOFFICE/core into release/v5.0.0

parents 431115ef 2d66d990
......@@ -209,21 +209,7 @@ XlsConverter::XlsConverter(const std::wstring & xls_file, const std::wstring & _
XLS::BinReaderProcessor proc(pivot_cache_reader , pivot_cache.get() , true);
proc.mandatory(*pivot_cache.get());
int index = -1;
try
{
index = boost::lexical_cast<int>(it->c_str());
}
catch(...)
{
}
if (index < 0)
{
//может быть шестнадцатеричное
index = XmlUtils::GetHex(*it);
}
if (index < 0)
index = last_index + 1;
int index = XmlUtils::GetHex(*it);
xls_global_info->mapPivotCacheStream.insert(std::make_pair(index, pivot_cache));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment