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...@locus.apache.org on 2000/08/15 17:17:09 UTC

cvs commit: xml-xalan/c/src/XSLT ElemTemplateElement.cpp

dbertoni    00/08/15 08:17:09

  Modified:    c/src/XSLT ElemTemplateElement.cpp
  Log:
  Set context node list before sorting.
  
  Revision  Changes    Path
  1.29      +8 -4      xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
  
  Index: ElemTemplateElement.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ElemTemplateElement.cpp	2000/08/10 18:43:04	1.28
  +++ ElemTemplateElement.cpp	2000/08/15 15:17:09	1.29
  @@ -752,11 +752,11 @@
   			const NodeRefListBase&						sourceNodes,
   			unsigned int								sourceNodesCount) const
   {
  -	typedef StylesheetExecutionContext::SetAndRestoreCurrentStackFrameIndex		SetAndRestoreCurrentStackFrameIndex;
  -
   	if (keys.size() > 0)
   	{
  -		typedef StylesheetExecutionContext::BorrowReturnMutableNodeRefList	BorrowReturnMutableNodeRefList;
  +		typedef StylesheetExecutionContext::SetAndRestoreCurrentStackFrameIndex		SetAndRestoreCurrentStackFrameIndex;
  +		typedef StylesheetExecutionContext::ContextNodeListSetAndRestore			ContextNodeListSetAndRestore;
  +		typedef StylesheetExecutionContext::BorrowReturnMutableNodeRefList			BorrowReturnMutableNodeRefList;
   
   		BorrowReturnMutableNodeRefList	sortedSourceNodes(executionContext);
   
  @@ -765,9 +765,13 @@
   		{
   			NodeSorter	sorter;
   
  -			SetAndRestoreCurrentStackFrameIndex		theSetAndRestore(
  +			SetAndRestoreCurrentStackFrameIndex		theStackFrameSetAndRestore(
   					executionContext,
   					selectStackFrameIndex);
  +
  +			ContextNodeListSetAndRestore			theContextNodeListSetAndRestore(
  +					executionContext,
  +					sourceNodes);
   
   			sorter.sort(executionContext, *sortedSourceNodes, keys);
   		}