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

Spreadsheet: Issue #2402: Don't allow duplicate aliases.

Browse Source
This commit is contained in:
Eivind Kvedalen
2016-01-15 23:37:41 +01:00
committed by wmayer
parent dafdc6b591
commit 00433d83e5
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Spreadsheet/App/SheetPyImp.cpp
View File

@@ -441,14 +441,21 @@ PyObject* SheetPy::setAlias(PyObject *args)
{
CellAddress address;
const char * strAddress;
const char * value;
PyObject * value;
if (!PyArg_ParseTuple(args, "ss:setAlias", &strAddress, &value))
if (!PyArg_ParseTuple(args, "sO:setAlias", &strAddress, &value))
return 0;
try {
address = stringToAddress(strAddress);
getSheetPtr()->setAlias(address, value);
if (PyString_Check(value))
getSheetPtr()->setAlias(address, PyString_AsString(value));
else if (value == Py_None)
getSheetPtr()->setAlias(address, "");
else
throw Base::TypeError("String or None expected");
Py_Return;
}
catch (const Base::Exception & e) {