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 2003/02/03 23:13:08 UTC

cvs commit: xml-xalan/c/src/XalanEXSLT XalanEXSLTCommon.cpp XalanEXSLTCommonImpl.hpp XalanEXSLTMath.cpp XalanEXSLTSet.cpp

dbertoni    2003/02/03 14:13:08

  Modified:    c/src/XalanEXSLT XalanEXSLTCommon.cpp
                        XalanEXSLTCommonImpl.hpp XalanEXSLTMath.cpp
                        XalanEXSLTSet.cpp
  Log:
  Fixes Bugzilla 16721.
  
  Revision  Changes    Path
  1.5       +1 -0      xml-xalan/c/src/XalanEXSLT/XalanEXSLTCommon.cpp
  
  Index: XalanEXSLTCommon.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTCommon.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XalanEXSLTCommon.cpp	25 Nov 2002 19:26:34 -0000	1.4
  +++ XalanEXSLTCommon.cpp	3 Feb 2003 22:13:07 -0000	1.5
  @@ -282,6 +282,7 @@
   
   
   static const XalanEXSLTFunctionNodeSet		s_nodesetFunction;
  +
   // Note this is a special constructor of XalanEXSLTFunctionObjectType which
   // allocates no memory.  It is only used here, so we can have table-based
   // initialization, but not have any memory allocation.
  
  
  
  1.4       +4 -2      xml-xalan/c/src/XalanEXSLT/XalanEXSLTCommonImpl.hpp
  
  Index: XalanEXSLTCommonImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTCommonImpl.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanEXSLTCommonImpl.hpp	25 Nov 2002 19:26:34 -0000	1.3
  +++ XalanEXSLTCommonImpl.hpp	3 Feb 2003 22:13:07 -0000	1.4
  @@ -135,7 +135,7 @@
   		m_external(s_externalString),
   		m_nodeSet(s_nodeSetString),
   		m_number(s_numberString),
  -		m_rtf(s_stringString),
  +		m_rtf(s_rtfString),
   		m_string(s_stringString)
   	{
   	}
  @@ -173,7 +173,7 @@
   #endif
   	clone() const
   	{
  -		return new XalanEXSLTFunctionObjectType(*this);
  +		return new XalanEXSLTFunctionObjectType;
   	}
   
   protected:
  @@ -184,6 +184,8 @@
   private:
   
   	// Not implemented...
  +	XalanEXSLTFunctionObjectType(const XalanEXSLTFunctionObjectType&);
  +
   	XalanEXSLTFunctionObjectType&
   	operator=(const XalanEXSLTFunctionObjectType&);
   
  
  
  
  1.5       +2 -2      xml-xalan/c/src/XalanEXSLT/XalanEXSLTMath.cpp
  
  Index: XalanEXSLTMath.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTMath.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XalanEXSLTMath.cpp	12 Dec 2002 16:29:56 -0000	1.4
  +++ XalanEXSLTMath.cpp	3 Feb 2003 22:13:07 -0000	1.5
  @@ -229,6 +229,8 @@
   		{
   			assert(theNodeSet.item(i) != 0);
   
  +			theStringValue.clear();
  +
   			DOMServices::getNodeData(*theNodeSet.item(i), theStringValue);
   
   			const double	theCurrent = DOMStringToDouble(theStringValue);
  @@ -243,8 +245,6 @@
   			{
   				theResult = theCurrent;
   			}
  -
  -			theStringValue.clear();
   		}
   
   		return executionContext.getXObjectFactory().createNumber(theResult);
  
  
  
  1.4       +2 -2      xml-xalan/c/src/XalanEXSLT/XalanEXSLTSet.cpp
  
  Index: XalanEXSLTSet.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTSet.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanEXSLTSet.cpp	12 Dec 2002 16:29:56 -0000	1.3
  +++ XalanEXSLTSet.cpp	3 Feb 2003 22:13:07 -0000	1.4
  @@ -90,7 +90,7 @@
   	const NodeRefListBase&	nodeset2 = args[1]->nodeset();
   
   	const NodeRefListBase::size_type	theLength1 = nodeset1.getLength();
  -	const NodeRefListBase::size_type	theLength2 = nodeset1.getLength();
  +	const NodeRefListBase::size_type	theLength2 = nodeset2.getLength();
   
   	bool	fResult = false;
   
  @@ -129,7 +129,7 @@
   	const NodeRefListBase&	nodeset2 = args[1]->nodeset();
   
   	const NodeRefListBase::size_type	theLength1 = nodeset1.getLength();
  -	const NodeRefListBase::size_type	theLength2 = nodeset1.getLength();
  +	const NodeRefListBase::size_type	theLength2 = nodeset2.getLength();
   
   	if (theLength1 == 0 || theLength2 == 0)
   	{
  
  
  

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