suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spreadsheet: Fixed too liberal decoding of cell addresses.

Browse Source
This commit is contained in:
Eivind Kvedalen 2015-09-26 15:15:58 +02:00 committed by wmayer
parent f439208282
commit eecb6f3536
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Spreadsheet/App/Utils.cpp
View File

@ -110,7 +110,7 @@ int Spreadsheet::decodeColumn(const std::string &colstr)
if ((colstr[0] >= 'A' && colstr[0] <= 'Z')) if ((colstr[0] >= 'A' && colstr[0] <= 'Z'))
col = colstr[0] - 'A'; col = colstr[0] - 'A';
else else
col = colstr[0] - 'a'; throw Base::Exception("Invalid column specification");
} }
else { else {
col = 0; col = 0;
@ -119,8 +119,6 @@ int Spreadsheet::decodeColumn(const std::string &colstr)
if ((*i >= 'A' && *i <= 'Z')) if ((*i >= 'A' && *i <= 'Z'))
v = *i - 'A'; v = *i - 'A';
else if ((*i >= 'a' && *i <= 'z'))
v = *i - 'a';
else else
throw Base::Exception("Invalid column specification"); throw Base::Exception("Invalid column specification");
@ -145,7 +143,7 @@ int Spreadsheet::decodeColumn(const std::string &colstr)
Spreadsheet::CellAddress Spreadsheet::stringToAddress(const char * strAddress) Spreadsheet::CellAddress Spreadsheet::stringToAddress(const char * strAddress)
{ {
static const boost::regex e("\\${0,1}([A-Za-z]+)\\${0,1}([0-9]+)"); static const boost::regex e("\\${0,1}([A-Z]{1,2})\\${0,1}([0-9]{1,5})");
boost::cmatch cm; boost::cmatch cm;
Q_ASSERT(strAddress != 0); Q_ASSERT(strAddress != 0);