jdonohue 00/03/20 09:34:54
Modified: c/src/XSLT StylesheetRoot.cpp XSLTEngineImpl.hpp
Log:
Minor cleanup
Revision Changes Path
1.6 +6 -7 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StylesheetRoot.cpp 2000/03/01 20:43:44 1.5
+++ StylesheetRoot.cpp 2000/03/20 17:34:54 1.6
@@ -216,9 +216,8 @@
if(0 != outputTarget.getDocumentHandler())
{
// Stuff a DocumentHandler into a FormatterListener
- FormatterListener* pFL = dynamic_cast<FormatterListener
*>(outputTarget.getDocumentHandler());
- executionContext.setFormatterListener(pFL);
- flistener = executionContext.getFormatterListener();
+ flistener =
+ dynamic_cast<FormatterListener
*>(outputTarget.getDocumentHandler());
}
/*
* Output target has a character or byte stream or file
@@ -285,11 +284,13 @@
newPW = true;
}
}
- /*
- */
int indentAmount = executionContext.getIndent();
bool doIndent = (indentAmount > -1) ? true :
m_indentResult;
+ // Make sure we don't have a negative indent amount if
we're
+ // indenting
+ if (m_indentResult && (indentAmount < 0))
+ indentAmount = 0;
switch(m_outputmethod)
{
@@ -313,9 +314,7 @@
newListener = true;
break;
}
- executionContext.setFormatterListener(flistener);
}
-
/*
* Output target has a node
*/
1.19 +1 -7 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XSLTEngineImpl.hpp 2000/03/10 15:18:50 1.18
+++ XSLTEngineImpl.hpp 2000/03/20 17:34:54 1.19
@@ -59,7 +59,7 @@
/**
*
- * $Id: XSLTEngineImpl.hpp,v 1.18 2000/03/10 15:18:50 jdonohue Exp $
+ * $Id: XSLTEngineImpl.hpp,v 1.19 2000/03/20 17:34:54 jdonohue Exp $
*
* $State: Exp $
*
@@ -1337,12 +1337,6 @@
m_stripWhiteSpace = fStrip;
}
- /*
- * indent-result is by default no, which means an XSL processor must not
- * change the whitespace on output.
- */
- //bool m_indentResult;
-
/**
* Conditionally trim all leading and trailing whitespace in the
specified
* String. All strings of white space are replaced by a single space
