cvs commit: xml-xerces/c/src/xercesc/internal XSObjectFactory.cpp

[knoaman]

knoaman     2004/03/05 08:28:22

  Modified:    c/src/xercesc/internal XSObjectFactory.cpp
  Log:
  PSVI: prohibited attributes should not be part of attribute use. Patch by Mike Boos.
  
  Revision  Changes    Path
  1.21      +10 -4     xml-xerces/c/src/xercesc/internal/XSObjectFactory.cpp
  
  Index: XSObjectFactory.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSObjectFactory.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- XSObjectFactory.cpp       5 Feb 2004 18:09:53 -0000       1.20
  +++ XSObjectFactory.cpp       5 Mar 2004 16:28:21 -0000       1.21
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.21  2004/03/05 16:28:21  knoaman
  + * PSVI: prohibited attributes should not be part of attribute use. Patch by Mike 
Boos.
  + *
    * Revision 1.20  2004/02/05 18:09:53  cargilld
    * Fix a seg fault with PSVI and set basetype of anysimpletype to be anytype.
    *
  @@ -676,9 +679,12 @@
                   else
                       xsAttDecl = addOrFind(&attDef, xsModel, xsObj);
   
  -                XSAttributeUse* attUse = createXSAttributeUse(xsAttDecl, xsModel);
  -                xsAttList->addElement(attUse);
  -                processAttUse(&attDef, attUse);
  +                if (attDef.getDefaultType() != XMLAttDef::Prohibited) {
  +
  +                    XSAttributeUse* attUse = createXSAttributeUse(xsAttDecl, 
xsModel);
  +                    xsAttList->addElement(attUse);
  +                    processAttUse(&attDef, attUse);
  +                }
               }
           }
   
  @@ -858,7 +864,7 @@
               else
                   xsAttDecl = addOrFind(attDef, xsModel);
   
  -            if (xsAttDecl) // just for sanity
  +            if (xsAttDecl && (attDef->getDefaultType() != XMLAttDef::Prohibited)) 
// just for sanity
               {
                   XSAttributeUse* attUse = createXSAttributeUse(xsAttDecl, xsModel);
                   xsAttList->addElement(attUse);
  
  
  

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