Commit d2b1ca4e authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

x2t linux (+centos) build - version 2.0.2.355

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68952 954022d7-b5bf-4e40-9824-e11837661b57
parent ad4907f3
...@@ -642,7 +642,7 @@ const std::wstring xti_indexes2sheet_name(const short itabFirst, const short ita ...@@ -642,7 +642,7 @@ const std::wstring xti_indexes2sheet_name(const short itabFirst, const short ita
return L"#REF!"; return L"#REF!";
} }
static boost::wregex correct_sheet_name(L"^\\'.+?\\'$"); static boost::wregex correct_sheet_name(L"^\\'.+?\\'$");
static boost::wregex test_sheet_name(L"[\\s\\':.-]+"); static boost::wregex test_sheet_name(L"[\\s)(\\':.-]+");
std::wstring sheet_first = tab2sheet_name(itabFirst, sheets_names); std::wstring sheet_first = tab2sheet_name(itabFirst, sheets_names);
if(!boost::regex_search(sheet_first.begin(), sheet_first.end(), correct_sheet_name)) if(!boost::regex_search(sheet_first.begin(), sheet_first.end(), correct_sheet_name))
......
...@@ -2255,7 +2255,16 @@ namespace BinXlsxRW { ...@@ -2255,7 +2255,16 @@ namespace BinXlsxRW {
//Value //Value
if(oCell.m_oValue.IsInit()) if(oCell.m_oValue.IsInit())
{ {
double dValue = _wtof(oCell.m_oValue->ToString());
double dValue = 0;
__try
{
dValue = _wtof(oCell.m_oValue->ToString());
}
catch(...)
{ //1.3912059045063478e-310
//Lighting Load Calculation.xls
}
nCurPos = m_oBcw.WriteItemStart(c_oSerCellTypes::Value); nCurPos = m_oBcw.WriteItemStart(c_oSerCellTypes::Value);
m_oBcw.m_oStream.WriteDoubleReal(dValue); m_oBcw.m_oStream.WriteDoubleReal(dValue);
......
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