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

[dbertoni]

dbertoni    00/08/28 14:49:27

  Modified:    c/src/XSLT StylesheetHandler.cpp XSLTEngineImpl.cpp
  Log:
  Fixes bug where stylesheet was entered in the source documents table.  
(mdocs12, mdocs13)
  
  Revision  Changes    Path
  1.41      +2 -2      xml-xalan/c/src/XSLT/StylesheetHandler.cpp
  
  Index: StylesheetHandler.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.cpp,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- StylesheetHandler.cpp     2000/08/28 01:19:41     1.40
  +++ StylesheetHandler.cpp     2000/08/28 21:49:25     1.41
  @@ -1189,7 +1189,7 @@
   
                        StylesheetHandler tp(*importedStylesheet.get(), 
m_constructionContext);
   
  -                     m_constructionContext.parseXML(hrefUrl, &tp, 
importedStylesheet.get());
  +                     m_constructionContext.parseXML(hrefUrl, &tp, 0);
   
                        importedStylesheet->postConstruction();
   
  @@ -1248,7 +1248,7 @@
   
                        m_stylesheet.getIncludeStack().push_back(hrefUrl);
   
  -                     m_constructionContext.parseXML(hrefUrl, this, 
&m_stylesheet);
  +                     m_constructionContext.parseXML(hrefUrl, this, 0);
   
                        assert(equals(m_stylesheet.getIncludeStack().back(), 
hrefUrl));
                        m_stylesheet.getIncludeStack().pop_back();
  
  
  
  1.60      +4 -1      xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
  
  Index: XSLTEngineImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- XSLTEngineImpl.cpp        2000/08/28 01:19:41     1.59
  +++ XSLTEngineImpl.cpp        2000/08/28 21:49:26     1.60
  @@ -702,7 +702,10 @@
                        doc = m_parserLiaison.parseXMLStream(inputSource);
                }
   
  -             m_xpathEnvSupport.setSourceDocument(urlString, doc);
  +             if (doc != 0)
  +             {
  +                     m_xpathEnvSupport.setSourceDocument(urlString, doc);
  +             }
        }
   
        return doc;