You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2005/08/18 03:04:52 UTC

cvs commit: xml-xalan/c/src/xalanc/XSLT ElemTemplate.cpp ElemTemplate.hpp

dbertoni    2005/08/17 18:04:52

  Modified:    c/src/xalanc/XSLT ElemTemplate.cpp ElemTemplate.hpp
  Log:
  Fixes for Jira issue XALANC-543.
  
  Revision  Changes    Path
  1.13      +21 -0     xml-xalan/c/src/xalanc/XSLT/ElemTemplate.cpp
  
  Index: ElemTemplate.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplate.cpp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ElemTemplate.cpp	29 Apr 2005 21:39:44 -0000	1.12
  +++ ElemTemplate.cpp	18 Aug 2005 01:04:52 -0000	1.13
  @@ -229,6 +229,27 @@
   }
   
   
  +
  +bool
  +ElemTemplate::childTypeAllowed(int  xslToken) const
  +{
  +    bool    fResult = true;
  +    
  +    switch(xslToken)
  +    {
  +    case StylesheetConstructionContext::ELEMNAME_WITH_PARAM:
  +        fResult = false;
  +        break;
  +        
  +    default:
  +        break;
  +    }
  +    
  +    return fResult;
  +}
  +
  +
  +
   #if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
   void
   ElemTemplate::executeChildren(StylesheetExecutionContext&   executionContext) const
  
  
  
  1.9       +7 -3      xml-xalan/c/src/xalanc/XSLT/ElemTemplate.hpp
  
  Index: ElemTemplate.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplate.hpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ElemTemplate.hpp	31 Jul 2004 05:08:49 -0000	1.8
  +++ ElemTemplate.hpp	18 Aug 2005 01:04:52 -0000	1.9
  @@ -137,17 +137,21 @@
       }
   #endif
   
  -    	virtual	const XPath*
  +    virtual	const XPath*
   	getXPath(unsigned int	index = 0) const;
   
  +protected:
  +
  +	virtual bool
  +	childTypeAllowed(int	xslToken) const;
   
   private:
   
   	// not implemented
  -	ElemTemplate(const ElemTemplate &);
  +	ElemTemplate(const ElemTemplate&);
   
   	ElemTemplate&
  -	operator=(const ElemTemplate &);
  +	operator=(const ElemTemplate&);
   
   	// Data members...
   	const XPath*		m_matchPattern;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org