cvs commit: xml-xerces/c/src/xercesc/validators/schema TraverseSchema.cpp

[knoaman]

knoaman     2003/03/18 09:55:53

  Modified:    c/src/xercesc/validators/schema TraverseSchema.cpp
  Log:
  Bug 18063: References to attributeGroup/group definition are not allowed to have 
annotations
  Patch by Alberto Massari.
  
  Revision  Changes    Path
  1.68      +3 -3      xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
  
  Index: TraverseSchema.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- TraverseSchema.cpp        11 Mar 2003 21:29:05 -0000      1.67
  +++ TraverseSchema.cpp        18 Mar 2003 17:55:52 -0000      1.68
  @@ -6423,7 +6423,7 @@
   XercesGroupInfo* TraverseSchema::processGroupRef(const DOMElement* const elem,
                                                    const XMLCh* const refName) {
   
  -    if (XUtil::getFirstChildElement(elem) != 0) {
  +    if (checkContent(elem, XUtil::getFirstChildElement(elem), true) != 0) {
           reportSchemaError(elem, XMLUni::fgValidityDomain, 
XMLValid::NoContentForRef, SchemaSymbols::fgELT_GROUP);
       }
   
  @@ -6533,7 +6533,7 @@
                                            const XMLCh* const refName,
                                            ComplexTypeInfo* const typeInfo) {
   
  -    if (XUtil::getFirstChildElement(elem) != 0) {
  +if (checkContent(elem, XUtil::getFirstChildElement(elem), true) != 0) {
           reportSchemaError(elem ,XMLUni::fgValidityDomain, 
XMLValid::NoContentForRef, SchemaSymbols::fgELT_ATTRIBUTEGROUP);
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]