dbertoni 2004/03/10 13:15:47
Modified: c/src/xalanc/XSLT StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
Log:
Fixed a bug where reset() did not reset everything. Also removed some
extraneous code that we no longer support.
Revision Changes Path
1.21 +7 -14
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StylesheetExecutionContextDefault.cpp 26 Feb 2004 22:58:58 -0000
1.20
+++ StylesheetExecutionContextDefault.cpp 10 Mar 2004 21:15:47 -0000
1.21
@@ -113,7 +113,6 @@
m_xsltProcessor(&xsltProcessor),
m_rootDocument(0),
m_elementRecursionStack(),
- m_prefixResolver(0),
m_stylesheetRoot(0),
m_formatterListeners(),
m_printWriters(),
@@ -125,7 +124,6 @@
m_keyTables(),
m_keyDeclarationSet(),
m_countersTable(),
- m_ignoreHTMLElementNamespaces(false),
m_sourceTreeResultTreeFactory(),
m_mode(0),
m_currentTemplateStack(),
@@ -156,7 +154,6 @@
m_xsltProcessor(0),
m_rootDocument(0),
m_elementRecursionStack(),
- m_prefixResolver(0),
m_stylesheetRoot(0),
m_formatterListeners(),
m_printWriters(),
@@ -168,7 +165,6 @@
m_keyTables(),
m_keyDeclarationSet(),
m_countersTable(),
- m_ignoreHTMLElementNamespaces(false),
m_sourceTreeResultTreeFactory(),
m_mode(0),
m_currentTemplateStack(),
@@ -1310,16 +1306,10 @@
escapeURLs,
omitMetaTag);
- // Check to see if the user has asked us to ignore
- // namespaces in HTML output.
- if (m_ignoreHTMLElementNamespaces == false)
- {
- // Nope, so give the formatter a prefix resolver...
- theFormatter->setPrefixResolver(m_xsltProcessor);
- }
-
m_formatterListeners.push_back(theFormatter);
+ theFormatter->setPrefixResolver(m_xsltProcessor);
+
return theFormatter;
}
@@ -1736,6 +1726,8 @@
m_xsltProcessor->reset();
}
+ m_rootDocument = 0;
+ m_stylesheetRoot = 0;
m_mode = 0;
m_currentTemplateStack.clear();
@@ -1743,9 +1735,10 @@
m_formatterToTextCache.reset();
m_formatterToSourceTreeCache.reset();
m_nodeSorterCache.reset();
- m_documentAllocator.reset();
- m_documentFragmentAllocator.reset();
+
m_xresultTreeFragAllocator.reset();
+ m_documentFragmentAllocator.reset();
+ m_documentAllocator.reset();
// Just in case endDocument() was not called,
// clean things up...
1.16 +0 -36
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StylesheetExecutionContextDefault.hpp 26 Feb 2004 22:58:58 -0000
1.15
+++ StylesheetExecutionContextDefault.hpp 10 Mar 2004 21:15:47 -0000
1.16
@@ -151,35 +151,6 @@
/**
- * Set the value of the flag that controls whether HTML output will
- * check for namespace declarations on HTML elements.
- *
- * Set this to true if you want the HTML output formatter to skip
- * checking for namespaces on elements. This makes HTML output more
- * efficient, but can result in non-conforming behavior, since the XSLT
- * recommendation requires XML output for elements with namespaces.
- *
- * @param theValue The boolean value
- */
- bool
- setIgnoreHTMLElementNamespaces() const
- {
- return m_ignoreHTMLElementNamespaces;
- }
-
- /**
- * Set the value of the flag that controls whether HTML output will
- * check for namespace declarations on HTML elements.
- *
- * @return The value
- */
- void
- setIgnoreHTMLElementNamespaces(bool theValue)
- {
- m_ignoreHTMLElementNamespaces = theValue;
- }
-
- /**
* Set the XPathEnvSupport instance.
*
* @param theSupport a reference to the instance to use.
@@ -1080,8 +1051,6 @@
ElementTemplateElementStackType m_elementRecursionStack;
- const PrefixResolver* m_prefixResolver;
-
const StylesheetRoot* m_stylesheetRoot;
FormatterListenerVectorType m_formatterListeners;
@@ -1108,11 +1077,6 @@
KeyDeclarationSetType m_keyDeclarationSet;
CountersTable m_countersTable;
-
- // If true, we will not check HTML output for elements with
- // namespaces. This is an optimization which can lead to
- // non-conforming behavior.
- bool
m_ignoreHTMLElementNamespaces;
/**
* The factory that will be used to create result tree fragments based
on our
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
