[ObjectHandler-cvs] ObjectHandler/ohxl rangereference.cpp,1.2,1.3

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/ohxl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2143/ohxl

Modified Files:
	rangereference.cpp 
Log Message:
fix bug that was causing ohRetrieveError() to fail on workbooks containing a hyphen ("-") in the name

Index: rangereference.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/rangereference.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rangereference.cpp	26 Oct 2006 11:29:50 -0000	1.2
--- rangereference.cpp	6 Dec 2006 11:58:31 -0000	1.3
***************
*** 39,43 ****
          // try to handle case where book name != sheet name
          static boost::regex r(
!           "=?'?.*\\[([\\w\\s]+)(?:\\.XLS)?\\]([\\w\\s]+)'?!R(\\d*)C(\\d*)(?::R(\\d*)C(\\d*))?");
          boost::smatch m; 
          if (!boost::regex_match(addressUpper_, m, r))
--- 39,43 ----
          // try to handle case where book name != sheet name
          static boost::regex r(
!           "=?'?.*\\[([\\w\\s-]+)(?:\\.XLS)?\\]([\\w\\s]+)'?!R(\\d*)C(\\d*)(?::R(\\d*)C(\\d*))?");
          boost::smatch m; 
          if (!boost::regex_match(addressUpper_, m, r))