kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spreadsheet: Compilation fixes for cherry-picked commits

Browse Source
This commit is contained in:
Chris Hennes
2021-12-16 14:07:30 -06:00
parent 68fca40983
commit 79cda0a1b7
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Spreadsheet/App/PropertySheet.cpp
View File

@@ -100,6 +100,15 @@ const Cell *PropertySheet::getValue(CellAddress key) const
return i->second;
}
Cell * PropertySheet::getValueFromAlias(const std::string &alias)
{
std::map<std::string, CellAddress>::const_iterator it = revAliasProp.find(alias);
if (it != revAliasProp.end())
return getValue(it->second);
else
return 0;
}
const Cell * PropertySheet::getValueFromAlias(const std::string &alias) const
{
@@ -109,7 +118,6 @@ const Cell * PropertySheet::getValueFromAlias(const std::string &alias) const
return getValue(it->second);
else
return 0;
}
bool PropertySheet::isValidAlias(const std::string &candidate)
@@ -1448,7 +1456,7 @@ PyObject *PropertySheet::getPyValue(PyObject *key) {
Py_Return;
}
Range range = getRange(Py::Object(key).as_string().c_str());
Range range = getRange(Py::Object(key).as_string().c_str(), false);
if(!range.from().isValid() || !range.to().isValid())
return Py::new_reference_to(Py::Tuple());
@@ -1796,10 +1804,10 @@ void PropertySheet::setPathValue(const ObjectIdentifier &path, const boost::any
<< " in " << getFullName());
App::CellAddress targetFrom = other->getCellAddress(
Py::Object(seq[1].ptr()).as_string().c_str());
Py::Object(seq[1].ptr()).as_string().c_str(), false);
App::CellAddress targetTo = other->getCellAddress(
Py::Object(seq[2].ptr()).as_string().c_str());
Py::Object(seq[2].ptr()).as_string().c_str(), false);
App::Range range(from,to);
App::Range rangeTarget(targetFrom,targetTo);