mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed previous configmgr layer numbering fix.

Browse Source
This commit is contained in:
Stephan Bergmann
2011-10-27 08:33:55 +02:00
parent eac87fed20
commit 9d9f9939bd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configmgr/source/xcuparser.cxx
View File

@@ -1109,7 +1109,8 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
bool known = i != set->getMembers().end(); bool known = i != set->getMembers().end();
if (known && !state_.top().locked && if (known && !state_.top().locked &&
finalizedLayer >= valueParser_.getLayer() && finalizedLayer >= valueParser_.getLayer() &&
(!mandatory || mandatoryLayer > valueParser_.getLayer())) (mandatoryLayer == Data::NO_LAYER ||
mandatoryLayer > valueParser_.getLayer()))
{ {
set->getMembers().erase(i); set->getMembers().erase(i);
} }