From b214551b6da6ec2edbcf24d4e2a5ffa639c9e34e Mon Sep 17 00:00:00 2001 From: Eivind Kvedalen Date: Sun, 20 Mar 2016 13:53:34 +0100 Subject: [PATCH] Spreadsheet: Expose parse error to user. --- src/Mod/Spreadsheet/App/Cell.cpp | 3 +-- src/Mod/Spreadsheet/App/Cell.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp index 21ac96803d..0867951cec 100644 --- a/src/Mod/Spreadsheet/App/Cell.cpp +++ b/src/Mod/Spreadsheet/App/Cell.cpp @@ -219,9 +219,8 @@ void Cell::setContent(const char * value) expr = Spreadsheet::ExpressionParser::parse(owner->sheet(), value + 1); } catch (Base::Exception & e) { - QString msg = QString::fromUtf8("ERR: %1").arg(QString::fromUtf8(e.what())); expr = new App::StringExpression(owner->sheet(), value); - setUsed(PARSE_EXCEPTION_SET); + setParseException(e.what()); } } else if (*value == '\'') diff --git a/src/Mod/Spreadsheet/App/Cell.h b/src/Mod/Spreadsheet/App/Cell.h index c620370b22..2f2964ff8c 100644 --- a/src/Mod/Spreadsheet/App/Cell.h +++ b/src/Mod/Spreadsheet/App/Cell.h @@ -93,8 +93,6 @@ public: void clearDirty(); - void setParseException(const std::string & e); - void setResolveException(const std::string &e); void clearResolveException(); @@ -144,6 +142,8 @@ public: private: + void setParseException(const std::string & e); + //void setExpression(const Expression * expr); void setExpression(App::Expression *expr);