Spreadsheet: Removed own expression parser and instead use the one in App.

This commit is contained in:
Eivind Kvedalen
2016-03-17 00:32:00 +01:00
committed by wmayer
parent 4f7470c5e8
commit ae111d11b5
33 changed files with 121 additions and 3666 deletions

View File

@@ -30,7 +30,7 @@
#include <boost/tokenizer.hpp>
#include <Base/Reader.h>
#include <Base/Writer.h>
#include "SpreadsheetExpression.h"
#include <App/Expression.h>
#include "Sheet.h"
#include <iomanip>
@@ -38,6 +38,7 @@
#define __func__ __FUNCTION__
#endif
using namespace App;
using namespace Base;
using namespace Spreadsheet;
@@ -216,7 +217,7 @@ void Cell::setContent(const char * value)
if (value != 0) {
if (*value == '=') {
try {
expr = Spreadsheet::ExpressionParser::parse(owner->sheet(), value + 1);
expr = App::ExpressionParser::parse(owner->sheet(), value + 1);
}
catch (Base::Exception & e) {
expr = new App::StringExpression(owner->sheet(), value);