Spreadsheet: Compilation fixes for cherry-picked commits
This commit is contained in:
@@ -120,17 +120,6 @@ const Cell * PropertySheet::getValueFromAlias(const std::string &alias) const
|
||||
return 0;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
}
|
||||
|
||||
bool PropertySheet::isValidAlias(const std::string &candidate)
|
||||
{
|
||||
static const boost::regex gen("^[A-Za-z][_A-Za-z0-9]*$");
|
||||
|
||||
@@ -48,8 +48,6 @@ public:
|
||||
|
||||
virtual std::map<App::ObjectIdentifier, const App::Expression*> getExpressions() const override;
|
||||
virtual void setExpressions(std::map<App::ObjectIdentifier, App::ExpressionPtr> &&exprs) override;
|
||||
App::CellAddress getCellAddress(const char *addr, bool silent) const;
|
||||
App::Range getRange(const char *range, bool silent) const;
|
||||
virtual void onRelabeledDocument(const App::Document &doc) override;
|
||||
|
||||
virtual void updateElementReference(
|
||||
@@ -112,8 +110,6 @@ public:
|
||||
|
||||
const Cell * getValueFromAlias(const std::string &alias) const;
|
||||
|
||||
Cell * getValueFromAlias(const std::string &alias);
|
||||
|
||||
bool isValidAlias(const std::string &candidate);
|
||||
|
||||
std::set<App::CellAddress> getUsedCells() const;
|
||||
|
||||
Reference in New Issue
Block a user