X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_Common.cpp;h=e6657fe4f1663822901ba26c62f7dfd521352eb3;hb=bdbfb368d71ed11cc0391354a7d86c880cd94949;hp=46a3f3ce1d8301422dbff62227a2cd4d3bf0ef23;hpb=8193b76f73047e852eaecfb4c0ff86cf44e1f8c9;p=modules%2Fshaper.git diff --git a/src/Config/Config_Common.cpp b/src/Config/Config_Common.cpp index 46a3f3ce1..e6657fe4f 100644 --- a/src/Config/Config_Common.cpp +++ b/src/Config/Config_Common.cpp @@ -55,13 +55,13 @@ bool isAttributeNode(xmlNodePtr theNode) if(!isElementNode(theNode)) return false; // it's parent is "feature" or "source" or page ("case" or "box") - if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE, + if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE, WDG_GROUP, WDG_OPTIONALBOX, WDG_TOOLBOX_BOX, WDG_SWITCH_CASE, NULL)) return false; //it should not be a "source" or a "validator" node - bool isLogical = isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NODE_SELFILTER, NULL); + bool isLogical = isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NULL); // here must be only widgets not connected to attributes bool isPagedContainer = isNode(theNode, WDG_TOOLBOX_BOX, WDG_GROUP, @@ -79,7 +79,7 @@ bool isWidgetNode(xmlNodePtr theNode) return false; //it should not be a "source" or a "validator" node - return !isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NODE_SELFILTER, NULL); + return !isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NULL); } // widget api? @@ -233,7 +233,7 @@ std::string getProperty(xmlNodePtr theNode, const char* thePropName) xmlFree(aPropChars); std::string::iterator new_end = std::unique(result.begin(), result.end(), BothAreSpaces); - result.erase(new_end, result.end()); + result.erase(new_end, result.end()); return result; }