diff --git a/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp b/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp
index 37aa1fd0ea8..dbf7f399eb9 100644
--- a/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp
@@ -21,13 +21,13 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
- * $Id: BooleanResult.cpp,v 1.1 2000-04-06 07:45:19 kvisco%ziplink.net Exp $
+ * $Id: BooleanResult.cpp,v 1.2 2000-04-07 22:57:06 Peter.VanderBeken%pandora.be Exp $
*/
/**
* Boolean Expression result
* @author Keith Visco
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:19 $
+ * @version $Revision: 1.2 $ $Date: 2000-04-07 22:57:06 $
**/
#include "ExprResult.h"
@@ -83,7 +83,7 @@ short BooleanResult::getResultType() {
return ExprResult::BOOLEAN;
} //-- getResultType
-void BooleanResult::stringValue(String& str) {
+void BooleanResult::stringValue(DOMString& str) {
if ( value ) str.append("true");
else str.append("false");
} //-- toString
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprResult.h b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
index d5d210fb2c7..6eb463b0ee5 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprResult.h
+++ b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
@@ -23,12 +23,11 @@
* Larry Fitzpatrick, OpenText, lef@opentext.com
* -- changed constant short result types to enum
*
- * $Id: ExprResult.h,v 1.1 2000-04-06 07:45:30 kvisco%ziplink.net Exp $
+ * $Id: ExprResult.h,v 1.2 2000-04-07 22:57:17 Peter.VanderBeken%pandora.be Exp $
*/
#include "MITREObject.h"
-#include "String.h"
-#include "baseutils.h"
+#include "dom.h"
#include "primitives.h"
#ifndef MITREXSL_EXPRRESULT_H
@@ -43,7 +42,7 @@
*
* Note: for NodeSet, see NodeSet.h
* @author Keith Visco
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:30 $
+ * @version $Revision: 1.2 $ $Date: 2000-04-07 22:57:17 $
*/
class ExprResult : public MITREObject {
@@ -70,7 +69,7 @@ public:
* Creates a String representation of this ExprResult
* @param str the destination string to append the String representation to.
**/
- virtual void stringValue(String& str) = 0;
+ virtual void stringValue(DOMString& str) = 0;
/**
* Converts this ExprResult to a Boolean (MBool) value
@@ -101,7 +100,7 @@ public:
void setValue(const BooleanResult& boolResult);
virtual short getResultType();
- virtual void stringValue(String& str);
+ virtual void stringValue(DOMString& str);
virtual MBool booleanValue();
virtual double numberValue();
@@ -126,7 +125,7 @@ public:
MBool isNaN() const;
virtual short getResultType();
- virtual void stringValue(String& str);
+ virtual void stringValue(DOMString& str);
virtual MBool booleanValue();
virtual double numberValue();
@@ -149,7 +148,7 @@ public:
void setValue(const String& str);
virtual short getResultType();
- virtual void stringValue(String& str);
+ virtual void stringValue(DOMString& str);
virtual MBool booleanValue();
virtual double numberValue();
diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp b/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp
index 571f7346954..7e98ba106ce 100644
--- a/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp
@@ -27,7 +27,7 @@
* Olivier Gerardin, ogerardin@vo.lu
* -- fixed numberValue()
*
- * $Id: NodeSet.cpp,v 1.1 2000-04-06 07:45:32 kvisco%ziplink.net Exp $
+ * $Id: NodeSet.cpp,v 1.2 2000-04-07 22:57:32 Peter.VanderBeken%pandora.be Exp $
*/
#include "NodeSet.h"
@@ -36,7 +36,7 @@
* NodeSet
* This class was ported from XSL:P.
* @author Keith Visco
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:32 $
+ * @version $Revision: 1.2 $ $Date: 2000-04-07 22:57:32 $
**/
@@ -344,7 +344,7 @@ double NodeSet::numberValue() {
* Creates a String representation of this ExprResult
* @param str the destination string to append the String representation to.
**/
-void NodeSet::stringValue(String& str) {
+void NodeSet::stringValue(DOMString& str) {
if ( size()>0) {
XMLDOMUtils::getNodeValue(get(0), &str);
}
diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSet.h b/mozilla/extensions/transformiix/source/xpath/NodeSet.h
index a5676d0a76a..841f74bc335 100644
--- a/mozilla/extensions/transformiix/source/xpath/NodeSet.h
+++ b/mozilla/extensions/transformiix/source/xpath/NodeSet.h
@@ -24,13 +24,13 @@
* Larry Fitzpatrick, OpenText, lef@opentext.com
* -- moved initialization of DEFAULT_SIZE to NodeSet.cpp
*
- * $Id: NodeSet.h,v 1.1 2000-04-06 07:45:33 kvisco%ziplink.net Exp $
+ * $Id: NodeSet.h,v 1.2 2000-04-07 22:57:48 Peter.VanderBeken%pandora.be Exp $
*/
/**
* NodeSet
* @author Keith Visco
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:33 $
+ * @version $Revision: 1.2 $ $Date: 2000-04-07 22:57:48 $
**/
#ifndef TRANSFRMX_NODESET_H
@@ -191,7 +191,7 @@ public:
* Creates a String representation of this ExprResult
* @param str the destination string to append the String representation to.
**/
- virtual void stringValue(String& str);
+ virtual void stringValue(DOMString& str);
private:
diff --git a/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp
index 11de08d466e..1ab7103f83b 100644
--- a/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp
@@ -123,7 +123,7 @@ ExprResult* NumberFunctionCall::evaluate(Node* context, ContextState* cs) {
}
else {
String resultStr;
- String temp;
+ DOMString temp;
XMLDOMUtils::getNodeValue(context, &temp);
if ( cs->isStripSpaceAllowed(context) ) {
XMLUtils::stripSpace(temp, resultStr);
diff --git a/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp b/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp
index 834f4f720a2..88361d48a0f 100644
--- a/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp
@@ -21,14 +21,14 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
- * $Id: NumberResult.cpp,v 1.1 2000-04-06 07:45:35 kvisco%ziplink.net Exp $
+ * $Id: NumberResult.cpp,v 1.2 2000-04-07 22:58:06 Peter.VanderBeken%pandora.be Exp $
*/
/**
* NumberResult
* Represents the a number as the result of evaluating an Expr
* @author Keith Visco
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:35 $
+ * @version $Revision: 1.2 $ $Date: 2000-04-07 22:58:06 $
**/
#include "ExprResult.h"
@@ -90,7 +90,7 @@ short NumberResult::getResultType() {
return ExprResult::NUMBER;
} //-- getResultType
-void NumberResult::stringValue(String& str) {
+void NumberResult::stringValue(DOMString& str) {
int intVal = (int)value;
if (intVal == value) { //-- no fraction
Integer::toString(intVal, str);
diff --git a/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp b/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp
index be40ac9e66e..ac8919ccb82 100644
--- a/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp
@@ -21,7 +21,7 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
- * $Id: RelationalExpr.cpp,v 1.1 2000-04-06 07:45:38 kvisco%ziplink.net Exp $
+ * $Id: RelationalExpr.cpp,v 1.2 2000-04-07 22:58:10 Peter.VanderBeken%pandora.be Exp $
*/
#include "Expr.h"
@@ -62,7 +62,7 @@ MBool RelationalExpr::compareResults(ExprResult* left, ExprResult* right) {
if (ltype == ExprResult::NODESET) {
NodeSet* nodeSet = (NodeSet*)left;
for ( int i = 0; i < nodeSet->size(); i++) {
- String str;
+ DOMString str;
Node* node = nodeSet->get(i);
XMLDOMUtils::getNodeValue(node, &str);
StringResult strResult(str);
@@ -74,7 +74,7 @@ MBool RelationalExpr::compareResults(ExprResult* left, ExprResult* right) {
else if ( rtype == ExprResult::NODESET) {
NodeSet* nodeSet = (NodeSet*)right;
for ( int i = 0; i < nodeSet->size(); i++) {
- String str;
+ DOMString str;
Node* node = nodeSet->get(i);
XMLDOMUtils::getNodeValue(node, &str);
StringResult strResult(str);
diff --git a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp
index 4111018e1db..fc3db4f4860 100644
--- a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp
@@ -21,14 +21,14 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
- * $Id: StringFunctionCall.cpp,v 1.1 2000-04-06 07:45:41 kvisco%ziplink.net Exp $
+ * $Id: StringFunctionCall.cpp,v 1.2 2000-04-07 22:58:25 Peter.VanderBeken%pandora.be Exp $
*/
/**
* StringFunctionCall
* A representation of the XPath String funtions
* @author Keith Visco
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:41 $
+ * @version $Revision: 1.2 $ $Date: 2000-04-07 22:58:25 $
**/
#include "FunctionLib.h"
@@ -121,7 +121,7 @@ ExprResult* StringFunctionCall::evaluate(Node* context, ContextState* cs) {
break;
case STRING_LENGTH:
if ( requireParams(0, 1, cs) ) {
- String resultStr;
+ DOMString resultStr;
if ( argc == 1) {
evaluateToString((Expr*)iter->next(),context, cs, resultStr);
}
@@ -225,7 +225,7 @@ ExprResult* StringFunctionCall::evaluate(Node* context, ContextState* cs) {
evaluateToString((Expr*)iter->next(),context, cs, resultStr);
}
else {
- String temp;
+ DOMString temp;
XMLDOMUtils::getNodeValue(context, &temp);
if ( cs->isStripSpaceAllowed(context) ) {
XMLUtils::stripSpace(temp, resultStr);
diff --git a/mozilla/extensions/transformiix/source/xpath/StringResult.cpp b/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
index 043018c386b..3a64a5565e8 100644
--- a/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
@@ -21,14 +21,14 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
- * $Id: StringResult.cpp,v 1.1 2000-04-06 07:45:44 kvisco%ziplink.net Exp $
+ * $Id: StringResult.cpp,v 1.2 2000-04-07 22:58:41 Peter.VanderBeken%pandora.be Exp $
*/
/**
* StringResult
* Represents a String as a Result of evaluating an Expr
* @author Keith Visco
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:44 $
+ * @version $Revision: 1.2 $ $Date: 2000-04-07 22:58:41 $
**/
#include "ExprResult.h"
@@ -81,7 +81,7 @@ short StringResult::getResultType() {
return ExprResult::STRING;
} //-- getResultType
-void StringResult::stringValue(String& str) {
+void StringResult::stringValue(DOMString& str) {
str.append(this->value);
} //-- stringValue
diff --git a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp
index b7713a1da3d..723a0dfe31f 100644
--- a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp
@@ -25,7 +25,7 @@
* Pierre Phaneuf, pp@ludusdesign.com
* -- fixed some XPCOM usage.
*
- * $Id: XSLTProcessor.cpp,v 1.2 2000-04-07 10:34:18 Peter.VanderBeken%pandora.be Exp $
+ * $Id: XSLTProcessor.cpp,v 1.3 2000-04-07 22:59:04 Peter.VanderBeken%pandora.be Exp $
*/
#include "XSLTProcessor.h"
@@ -38,7 +38,7 @@
/**
* XSLTProcessor is a class for Processing XSL styelsheets
* @author Keith Visco
- * @version $Revision: 1.2 $ $Date: 2000-04-07 10:34:18 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-07 22:59:04 $
**/
/**
@@ -733,7 +733,7 @@ short XSLTProcessor::getElementType(String& name, ProcessorState* ps) {
* @param allowOnlyTextNodes
**/
MBool XSLTProcessor::getText
- (DocumentFragment* dfrag, String& dest, MBool deep, MBool allowOnlyTextNodes)
+ (DocumentFragment* dfrag, DOMString& dest, MBool deep, MBool allowOnlyTextNodes)
{
if ( !dfrag ) return MB_TRUE;
@@ -906,7 +906,7 @@ void XSLTProcessor::processAction
ps->getNodeStack()->push(dfrag);
processTemplate(node, actionElement, ps);
ps->getNodeStack()->pop();
- String value;
+ DOMString value;
XMLDOMUtils::getNodeValue(dfrag, &value);
XMLUtils::normalizeAttributeValue(value);
newAttr->setValue(value);
@@ -1084,7 +1084,7 @@ void XSLTProcessor::processAction
//-- xsl:message
case XSLType::MESSAGE :
{
- String message;
+ DOMString message;
DocumentFragment* dfrag = resultDoc->createDocumentFragment();
ps->getNodeStack()->push(dfrag);
@@ -1153,7 +1153,7 @@ void XSLTProcessor::processAction
//-- xsl:text
case XSLType::TEXT :
{
- String data;
+ DOMString data;
//-- get Node value, and do not perform whitespace stripping
XMLDOMUtils::getNodeValue(actionElement, &data);
Text* text = resultDoc->createTextNode(data);
diff --git a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h
index 79dca4cf289..3a4c6183502 100644
--- a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h
+++ b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h
@@ -21,7 +21,7 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
- * $Id: XSLTProcessor.h,v 1.2 2000-04-07 10:34:35 Peter.VanderBeken%pandora.be Exp $
+ * $Id: XSLTProcessor.h,v 1.3 2000-04-07 22:59:18 Peter.VanderBeken%pandora.be Exp $
*/
@@ -41,11 +41,11 @@
#else
#include "CommandLineUtils.h"
#include "printers.h"
-#include "URIUtils.h"
-#include "XMLParser.h"
#include "XMLDOMUtils.h"
#endif
+#include "URIUtils.h"
+#include "XMLParser.h"
#include "dom.h"
#include "ExprParser.h"
#include "MITREObject.h"
@@ -75,7 +75,7 @@
/**
* A class for Processing XSL Stylesheets
* @author Keith Visco
- * @version $Revision: 1.2 $ $Date: 2000-04-07 10:34:35 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-07 22:59:18 $
**/
class XSLTProcessor
#ifdef MOZILLA
@@ -295,7 +295,7 @@ private:
* their value. If this value is true, the allowOnlyTextNodes flag is ignored.
**/
MBool getText
- (DocumentFragment* dfrag, String& dest, MBool deep, MBool allowOnlyTextNodes);
+ (DocumentFragment* dfrag, DOMString& dest, MBool deep, MBool allowOnlyTextNodes);
/**
* Notifies all registered ErrorObservers of the given error