Commit fb00ba7e authored by ElenaSubbotina's avatar ElenaSubbotina

fix users file

parent 9dd115ec
...@@ -108,37 +108,37 @@ BaseObjectPtr SERIESDATA::clone() ...@@ -108,37 +108,37 @@ BaseObjectPtr SERIESDATA::clone()
// SERIESDATA = Dimensions 3(SIIndex *(Number / BoolErr / Blank / Label)) // SERIESDATA = Dimensions 3(SIIndex *(Number / BoolErr / Blank / Label))
const bool SERIESDATA::loadContent(BinProcessor& proc) const bool SERIESDATA::loadContent(BinProcessor& proc)
{ {
if(!proc.optional<Dimensions>()) bool result = false;
{ if(proc.optional<Dimensions>())
return false;
}
if (elements_.size() > 0)
{ {
m_Dimensions = elements_.back(); m_Dimensions = elements_.back();
elements_.pop_back(); elements_.pop_back();
result = true;
} }
int count = proc.repeated<Parenthesis_SERIESDATA_1>(3, 3); int count = proc.repeated<Parenthesis_SERIESDATA_1>(3, 3);
if (count > 0)
int count1= elements_.size();
while(count1 > 0)
{ {
if ("SIIndex" == elements_.front()->getClassName()) result = true;
{
m_arSIIndex.push_back(elements_.front()); count--; int count1= elements_.size();
} while(count1 > 0)
else
{ {
SIIndex * si_in = dynamic_cast<SIIndex *>(m_arSIIndex.back().get()); if ("SIIndex" == elements_.front()->getClassName())
if (si_in) {
si_in->m_arData.push_back(elements_.front()); m_arSIIndex.push_back(elements_.front()); count--;
}
else
{
SIIndex * si_in = dynamic_cast<SIIndex *>(m_arSIIndex.back().get());
if (si_in)
si_in->m_arData.push_back(elements_.front());
}
elements_.pop_front(); count1--;
} }
elements_.pop_front(); count1--;
} }
return true; return result;
} }
} // namespace XLS } // namespace XLS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment