dbertoni    02/02/06 12:05:25

  Modified:    c/src/XalanDOM XalanDOMString.cpp
  Log:
  Fixed bug in append().  See Bugzilla bug #6270.
  
  Revision  Changes    Path
  1.17      +6 -5      xml-xalan/c/src/XalanDOM/XalanDOMString.cpp
  
  Index: XalanDOMString.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanDOM/XalanDOMString.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XalanDOMString.cpp        25 Sep 2001 21:13:55 -0000      1.16
  +++ XalanDOMString.cpp        6 Feb 2002 20:05:25 -0000       1.17
  @@ -291,20 +291,21 @@
   doTranscode(
                        const char*                                     theString,
                        XalanDOMString::size_type       theCount,
  -                     XalanDOMCharVectorType&         theVector)
  +                     XalanDOMCharVectorType&         theVector,
  +                     bool                                            fTerminate)
   {
        assert(theString != 0);
   
        if (theCount == XalanDOMString::size_type(XalanDOMString::npos))
        {
  -             if (TranscodeFromLocalCodePage(theString, theVector, true) == false)
  +             if (TranscodeFromLocalCodePage(theString, theVector, fTerminate) == 
false)
                {
                        throw XalanDOMString::TranscodingError();
                }
        }
        else
        {
  -             if (TranscodeFromLocalCodePage(theString, theCount, theVector, true) 
== false)
  +             if (TranscodeFromLocalCodePage(theString, theCount, theVector, 
fTerminate) == false)
                {
                        throw XalanDOMString::TranscodingError();
                }
  @@ -327,13 +328,13 @@
        {
                if (size() == 0)
                {
  -                     doTranscode(theString, theLength, m_data);
  +                     doTranscode(theString, theLength, m_data, true);
                }
                else
                {
                        XalanDOMCharVectorType  theTempVector;
   
  -                     doTranscode(theString, theLength, theTempVector);
  +                     doTranscode(theString, theLength, theTempVector, false);
   
                        append(&*theTempVector.begin(), 
size_type(theTempVector.size()));
                }
  
  
  

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

Reply via email to