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 2001/06/15 23:46:52 UTC

cvs commit: xml-xalan/c/src/ICUBridge FunctionICUFormatNumber.hpp FunctionICUFormatNumber.cpp

dbertoni    01/06/15 14:46:52

  Modified:    c/src/ICUBridge FunctionICUFormatNumber.hpp
                        FunctionICUFormatNumber.cpp
  Log:
  Changes for new signature.
  
  Revision  Changes    Path
  1.2       +3 -2      xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.hpp
  
  Index: FunctionICUFormatNumber.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FunctionICUFormatNumber.hpp	2000/05/08 17:13:13	1.1
  +++ FunctionICUFormatNumber.hpp	2001/06/15 21:46:52	1.2
  @@ -99,13 +99,14 @@
   
   protected:
   
  -	virtual XalanDOMString
  +	virtual void
   	doFormat(
   			XPathExecutionContext&				executionContext,
   			XalanNode*							context,
   			double								theNumber,
   			const XalanDOMString&				thePattern,
  -			const XalanDecimalFormatSymbols*	theDFS);
  +			const XalanDecimalFormatSymbols*	theDFS,
  +			XalanDOMString&						theResult);
   
   private:
   
  
  
  
  1.6       +11 -16    xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.cpp
  
  Index: FunctionICUFormatNumber.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FunctionICUFormatNumber.cpp	2000/11/02 01:45:32	1.5
  +++ FunctionICUFormatNumber.cpp	2001/06/15 21:46:52	1.6
  @@ -116,41 +116,36 @@
   
   
   
  -XalanDOMString
  +void
   FunctionICUFormatNumber::doFormat(
   			XPathExecutionContext&				executionContext,
   			XalanNode*							context,
   			double								theNumber,
   			const XalanDOMString&				thePattern,
  -			const XalanDecimalFormatSymbols*	theDFS)
  +			const XalanDecimalFormatSymbols*	theDFS,
  +			XalanDOMString&						theResult)
   {
  -	XalanDOMString	theResultString;
  -
  -	unsigned long	theResult = 0;
  -
  -	theResult = ICUBridge::FormatNumber(
  +	unsigned long	theResultCode =
  +		ICUBridge::FormatNumber(
   					thePattern,
   					theNumber,
   					theDFS,
  -					theResultString);
  +					theResult);
   
  -	if (theResult != 0)
  +	if (theResultCode != 0)
   	{
   		executionContext.warn(
   			XALAN_STATIC_UCODE_STRING("Warning!  ICUBridge::FormatNumber failed. (") +
  -				UnsignedLongToDOMString(theResult) +
  +				UnsignedLongToDOMString(theResultCode) +
   				XALAN_STATIC_UCODE_STRING(")."),
   			context);
   
  -		return FunctionFormatNumber::doFormat(
  +		FunctionFormatNumber::doFormat(
   						executionContext,
   						context,
   						theNumber,
   						thePattern,
  -						theDFS);
  -	}
  -	else
  -	{
  -		return theResultString;
  +						theDFS,
  +						theResult);
   	}
   }
  
  
  

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