merge
This commit is contained in:
commit
1bfba35cd0
1 changed files with 3 additions and 0 deletions
|
@ -168,12 +168,15 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
|
||||||
_Id.IdInfos.Type = typeId;
|
_Id.IdInfos.Type = typeId;
|
||||||
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
|
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
|
||||||
_DevSheetNameToId[unknownNewType] = _Id.Id;
|
_DevSheetNameToId[unknownNewType] = _Id.Id;
|
||||||
|
if (sheetName == "unknown")
|
||||||
|
return true; // Return with the unknown sheet id of this type
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
typeId = tit->second;
|
typeId = tit->second;
|
||||||
_Id.IdInfos.Type = typeId;
|
_Id.IdInfos.Type = typeId;
|
||||||
}
|
}
|
||||||
|
// Add a new sheet name to the type
|
||||||
_DevSheetIdToName[typeId].push_back(sheetNameLc);
|
_DevSheetIdToName[typeId].push_back(sheetNameLc);
|
||||||
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
|
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
|
||||||
// nldebug("SHEETID: Type %i, id %i, sheetid %i", _Id.IdInfos.Type, _Id.IdInfos.Id, _Id.Id);
|
// nldebug("SHEETID: Type %i, id %i, sheetid %i", _Id.IdInfos.Type, _Id.IdInfos.Id, _Id.Id);
|
||||||
|
|
Loading…
Reference in a new issue