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

Spreadsheet: Fix for issue #3225.

Browse Source 
Done by adding a selector function to Document::renameObjectIdentifiers(...) to ensure
that the Spreadsheet document object is not rewritten twice.
This commit is contained in:
Eivind Kvedalen
2017-11-04 20:05:31 +01:00
committed by wmayer
parent bb764b1475
commit 5fe7a9af71
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/Document.cpp
View File

@@ -2029,7 +2029,7 @@ std::vector<App::DocumentObject*> Document::getDependencyList(const std::vector<
* @param paths Map with current and new names
*/
void Document::renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> &paths)
void Document::renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> &paths, const std::function<bool(const App::DocumentObject*)> & selector)
{
std::map<App::ObjectIdentifier, App::ObjectIdentifier> extendedPaths;
@@ -2040,7 +2040,8 @@ void Document::renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App
}
for (std::vector<DocumentObject*>::iterator it = d->objectArray.begin(); it != d->objectArray.end(); ++it)
(*it)->renameObjectIdentifiers(extendedPaths);
if (selector(*it))
(*it)->renameObjectIdentifiers(extendedPaths);
}
#ifdef USE_OLD_DAG

3
src/App/Document.h
View File

@@ -35,6 +35,7 @@
#include <map>
#include <vector>
#include <stack>
#include <functional>
#include <boost/signals.hpp>
@@ -338,7 +339,7 @@ public:
//@}
/// Function called to signal that an object identifier has been renamed
void renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> & paths);
void renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> & paths, const std::function<bool(const App::DocumentObject*)> &selector = [](const App::DocumentObject *) { return true; });
virtual PyObject *getPyObject(void);

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

@@ -678,7 +678,8 @@ void PropertySheet::insertRows(int row, int count)
moveCell(*i, CellAddress(i->row() + count, i->col()), renames);
}
owner->getDocument()->renameObjectIdentifiers(renames);
const App::DocumentObject * docObj = static_cast<const App::DocumentObject*>(getContainer());
owner->getDocument()->renameObjectIdentifiers(renames, [docObj](const App::DocumentObject * obj) { return obj != docObj; });
}
/**
@@ -728,7 +729,8 @@ void PropertySheet::removeRows(int row, int count)
moveCell(*i, CellAddress(i->row() - count, i->col()), renames);
}
owner->getDocument()->renameObjectIdentifiers(renames);
const App::DocumentObject * docObj = static_cast<const App::DocumentObject*>(getContainer());
owner->getDocument()->renameObjectIdentifiers(renames, [docObj](const App::DocumentObject * obj) { return obj != docObj; });
}
void PropertySheet::insertColumns(int col, int count)
@@ -764,7 +766,8 @@ void PropertySheet::insertColumns(int col, int count)
moveCell(*i, CellAddress(i->row(), i->col() + count), renames);
}
owner->getDocument()->renameObjectIdentifiers(renames);
const App::DocumentObject * docObj = static_cast<const App::DocumentObject*>(getContainer());
owner->getDocument()->renameObjectIdentifiers(renames, [docObj](const App::DocumentObject * obj) { return obj != docObj; });
}
/**
@@ -814,7 +817,8 @@ void PropertySheet::removeColumns(int col, int count)
moveCell(*i, CellAddress(i->row(), i->col() - count), renames);
}
owner->getDocument()->renameObjectIdentifiers(renames);
const App::DocumentObject * docObj = static_cast<const App::DocumentObject*>(getContainer());
owner->getDocument()->renameObjectIdentifiers(renames, [docObj](const App::DocumentObject * obj) { return obj != docObj; } );
}
unsigned int PropertySheet::getMemSize() const

8
src/Mod/Spreadsheet/TestSpreadsheet.py
View File

@@ -660,6 +660,14 @@ class SpreadsheetCases(unittest.TestCase):
sheet.insertRows('2', 1)
self.assertEqual(sheet.getContents("B1"),"=B3")
def testIssue3225(self):
""" Inserting rows -- check renaming of internal cells """
sheet = self.doc.addObject('Spreadsheet::Sheet','Spreadsheet')
sheet.set('B2', '25')
sheet.set('B3', '=B2')
sheet.insertRows('2', 1)
self.assertEqual(sheet.getContents("B4"),"=B3")
def testRenameAlias(self):
""" Test renaming of alias1 to alias2 in a spreadsheet """
sheet = self.doc.addObject('Spreadsheet::Sheet','Spreadsheet')