Commit e59eff3a authored by ElenaSubbotina's avatar ElenaSubbotina

fix user file

parent 2206b3b3
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(IntDir)\XlsFileTestD.pdb" ProgramDataBaseFileName="$(IntDir)\XlsFileTestD.pdb"
WarningLevel="3" WarningLevel="3"
......
...@@ -516,7 +516,7 @@ const std::wstring tab2sheet_name(const short tabid, std::vector<std::wstring>& ...@@ -516,7 +516,7 @@ const std::wstring tab2sheet_name(const short tabid, std::vector<std::wstring>&
const std::wstring name2sheet_name(std::wstring name, const std::wstring prefix) const std::wstring name2sheet_name(std::wstring name, const std::wstring prefix)
{ {
static boost::wregex correct_sheet_name(L"^\\'.+?\\'$"); static boost::wregex correct_sheet_name(L"^\\'.+?\\'$");
static boost::wregex test_sheet_name(L"[\\s)(\\'&:-]+"); //.??? 6442946.xls static boost::wregex test_sheet_name(L"[\\s)(\\!\\'&:-]+"); //.??? 6442946.xls
std::wstring sheet_first = prefix + name; std::wstring sheet_first = prefix + name;
...@@ -537,7 +537,7 @@ const std::wstring xti_indexes2sheet_name(const short tabFirst, const short tabL ...@@ -537,7 +537,7 @@ const std::wstring xti_indexes2sheet_name(const short tabFirst, const short tabL
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)(\\'&:-]+"); //.??? 6442946.xls static boost::wregex test_sheet_name(L"[\\s)(\\!\\'&:-]+"); //.??? 6442946.xls
std::wstring sheet_first = prefix + tab2sheet_name(tabFirst, names); std::wstring sheet_first = prefix + tab2sheet_name(tabFirst, names);
......
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