From e324532cd87985489f5306aa8f89ec5f4724d3ee Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 6 Aug 2022 19:59:06 +0200 Subject: [PATCH] [App] [Spreadsheet] fix compilation errors - introduced by #7318 and #7319 --- src/App/ObjectIdentifier.cpp | 2 +- src/Mod/Spreadsheet/App/Sheet.cpp | 2 +- src/Mod/Spreadsheet/App/SheetPyImp.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App/ObjectIdentifier.cpp b/src/App/ObjectIdentifier.cpp index 9c551a1052..7469c8a824 100644 --- a/src/App/ObjectIdentifier.cpp +++ b/src/App/ObjectIdentifier.cpp @@ -1685,7 +1685,7 @@ Py::Object ObjectIdentifier::access(const ResolveResults &result, auto &propset = (*deps)[obj]; // inserting a blank name in the propset indicates the dependency is // on all properties of the corresponding object. - if (propset.size() != 1 || !propset.begin()->->empty()) { + if (propset.size() != 1 || !propset.begin()->empty()) { if (!propName) { propset.clear(); propset.insert(""); diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp index 33c0d86c4c..75417e1dac 100644 --- a/src/Mod/Spreadsheet/App/Sheet.cpp +++ b/src/Mod/Spreadsheet/App/Sheet.cpp @@ -208,7 +208,7 @@ bool Sheet::importFromFile(const std::string &filename, char delimiter, char quo tokenizer > tok(line, e); for(tokenizer >::iterator i = tok.begin(); i != tok.end();++i) { - if (!*i.empty()) + if ((*i).size() > 0) setCell(CellAddress(row, col), (*i).c_str()); col++; } diff --git a/src/Mod/Spreadsheet/App/SheetPyImp.cpp b/src/Mod/Spreadsheet/App/SheetPyImp.cpp index 012786afab..c17cf1d2f7 100644 --- a/src/Mod/Spreadsheet/App/SheetPyImp.cpp +++ b/src/Mod/Spreadsheet/App/SheetPyImp.cpp @@ -622,7 +622,7 @@ PyObject* SheetPy::setAlignment(PyObject *args) tokenizer > tok(line, e); for(tokenizer >::iterator i = tok.begin(); i != tok.end();++i) { - if(!i->->empty()) + if(!i->empty()) alignment = Cell::decodeAlignment(*i, alignment); } }