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

Base::Reader: support reading child element with the same name as parent

Browse Source 
Future GuiDocument.xml will save recursive tree item expansion status
using child element with the same name as the parent.
This commit is contained in:
Zheng, Lei
2019-07-10 09:21:16 +08:00
committed by wmayer
parent 8227103ceb
commit aa3e81f4fc
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Base/Reader.cpp
View File

@@ -252,10 +252,18 @@ void Base::XMLReader::readElement(const char* ElementName)
(ElementName && LocalName != ElementName));
}
void Base::XMLReader::readEndElement(const char* ElementName)
int Base::XMLReader::level() const {
return Level;
}
void Base::XMLReader::readEndElement(const char* ElementName, int level)
{
// if we are already at the end of the current element
if (ReadType == EndElement && LocalName == ElementName) {
if (ReadType == EndElement
&& ElementName
&& LocalName == ElementName
&& (level<0 || level==Level))
{
return;
}
else if (ReadType == EndDocument) {
@@ -268,7 +276,10 @@ void Base::XMLReader::readEndElement(const char* ElementName)
ok = read(); if (!ok) break;
if (ReadType == EndDocument)
break;
} while (ReadType != EndElement || (ElementName && LocalName != ElementName));
} while (ReadType != EndElement
|| (ElementName
&& (LocalName != ElementName
|| (level>=0 && level!=Level))));
}
void Base::XMLReader::readCharacters(void)