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

Spreadsheet: Consistently use App::Document::Label as reference for document names when tracking dependencies.

Browse Source
This commit is contained in:
Eivind Kvedalen
2015-02-16 00:11:10 +01:00
committed by wmayer
parent 9eac357945
commit e0f4e74b9e
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -659,7 +659,7 @@ const char *Sheet::getPropertyName(const Property *prop) const
void Sheet::recomputeCell(CellAddress p)
{
Cell * cell = cells.getValue(p);
std::string docName = getDocument()->getName();
std::string docName = getDocument()->Label.getValue();
std::string docObjName = std::string(getNameInDocument());
std::string name = docName + "#" + docObjName + "." + toAddress(p);
@@ -1036,7 +1036,7 @@ std::set<std::string> Sheet::dependsOn(CellAddress address) const
void Sheet::providesTo(CellAddress address, std::set<std::string> & result) const
{
const char * docName = getDocument()->getName();
const char * docName = getDocument()->Label.getValue();
const char * docObjName = getNameInDocument();
std::string fullName = std::string(docName) + "#" + std::string(docObjName) + "." + toAddress(address);
std::set<CellAddress> tmpResult = cells.getDeps(fullName);
@@ -1047,7 +1047,7 @@ void Sheet::providesTo(CellAddress address, std::set<std::string> & result) cons
void Sheet::providesTo(CellAddress address, std::set<CellAddress> & result) const
{
const char * docName = getDocument()->getName();
const char * docName = getDocument()->Label.getValue();
const char * docObjName = getNameInDocument();
std::string fullName = std::string(docName) + "#" + std::string(docObjName) + "." + toAddress(address);
result = cells.getDeps(fullName);
@@ -1062,23 +1062,25 @@ void Sheet::onDocumentRestored()
void Sheet::onRelabledDocument(const Document &document)
{
cells.renamedDocument(&document);
cells.purgeTouched();
}
void Sheet::onRenamedDocument(const Document &document)
{
}
void Sheet::observeDocument(const std::string & docName)
void Sheet::observeDocument(Document * document)
{
ObserverMap::const_iterator it = observers.find(docName);
ObserverMap::const_iterator it = observers.find(document->getName());
if (it != observers.end()) {
// An observer already exists, increase reference counter for it
it->second->ref();
}
else {
// Create a new observer
SheetObserver * observer = new SheetObserver(GetApplication().getDocument(docName.c_str()), &cells);
SheetObserver * observer = new SheetObserver(document, &cells);
observers[docName] = observer;
observers[document->getName()] = observer;
}
}