cvs commit: xml-xalan/c/src/XalanTransformer XalanDefaultParsedSource.cpp XercesDOMParsedSource.cpp

[dbertoni]

dbertoni    2002/08/14 21:56:52

  Modified:    c/src/XalanTransformer XalanDefaultParsedSource.cpp
                        XercesDOMParsedSource.cpp
  Log:
  May sure we don't set null locations.
  
  Revision  Changes    Path
  1.14      +10 -2     
xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp
  
  Index: XalanDefaultParsedSource.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XalanDefaultParsedSource.cpp      15 Aug 2002 04:40:51 -0000      1.13
  +++ XalanDefaultParsedSource.cpp      15 Aug 2002 04:56:52 -0000      1.14
  @@ -184,8 +184,16 @@
        m_parserLiaison.setUseValidation(fValidate);
        m_parserLiaison.setEntityResolver(theEntityResolver);
        m_parserLiaison.setErrorHandler(theErrorHandler);
  -     m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
  -     
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
  +
  +     if (theExternalSchemaLocation != 0)
  +     {
  +             
m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
  +     }
  +
  +     if (theExternalNoNamespaceSchemaLocation != 0)
  +     {
  +             
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
  +     }
   
        m_parsedSource = 
m_parserLiaison.mapDocument(m_parserLiaison.parseXMLStream(theInputSource));
        assert(m_parsedSource != 0);
  
  
  
  1.12      +10 -2     
xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.cpp
  
  Index: XercesDOMParsedSource.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XercesDOMParsedSource.cpp 15 Aug 2002 04:40:52 -0000      1.11
  +++ XercesDOMParsedSource.cpp 15 Aug 2002 04:56:52 -0000      1.12
  @@ -114,8 +114,16 @@
        m_parserLiaison.setUseValidation(fValidate);
        m_parserLiaison.setEntityResolver(theEntityResolver);
        m_parserLiaison.setErrorHandler(theErrorHandler);
  -     m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
  -     
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
  +
  +     if (theExternalSchemaLocation != 0)
  +     {
  +             
m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
  +     }
  +
  +     if (theExternalNoNamespaceSchemaLocation != 0)
  +     {
  +             
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
  +     }
   
        m_parsedSource = m_parserLiaison.parseXMLStream(theInputSource);
        assert(m_parsedSource != 0);
  
  
  

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