diff --git a/extensions/transformiix/source/xslt/XSLTProcessor.cpp b/extensions/transformiix/source/xslt/XSLTProcessor.cpp index b61557eec4b9..c78a1d41c05d 100644 --- a/extensions/transformiix/source/xslt/XSLTProcessor.cpp +++ b/extensions/transformiix/source/xslt/XSLTProcessor.cpp @@ -35,7 +35,7 @@ * Nathan Pride, npride@wavo.com * -- fixed a document base issue * - * $Id: XSLTProcessor.cpp,v 1.8 2000/04/20 10:14:05 kvisco%ziplink.net Exp $ + * $Id: XSLTProcessor.cpp,v 1.9 2000/04/20 22:10:03 Peter.VanderBeken%pandora.be Exp $ */ #include "XSLTProcessor.h" @@ -48,7 +48,7 @@ /** * XSLTProcessor is a class for Processing XSL styelsheets * @author Keith Visco - * @version $Revision: 1.8 $ $Date: 2000/04/20 10:14:05 $ + * @version $Revision: 1.9 $ $Date: 2000/04/20 22:10:03 $ **/ /** @@ -1006,7 +1006,7 @@ void XSLTProcessor::processAction ps->getNodeStack()->push(dfrag); processTemplate(node, actionElement, ps); ps->getNodeStack()->pop(); - String value; + DOMString value; if (!getText(dfrag, value, MB_FALSE,MB_TRUE)) { String warning(NON_TEXT_TEMPLATE_WARNING); warning.append(COMMENT); @@ -1184,7 +1184,7 @@ void XSLTProcessor::processAction ps->getNodeStack()->push(dfrag); processTemplate(node, actionElement, ps); ps->getNodeStack()->pop(); - String value; + DOMString value; if (!getText(dfrag, value, MB_FALSE,MB_TRUE)) { String warning(NON_TEXT_TEMPLATE_WARNING); warning.append(PI); @@ -1216,7 +1216,7 @@ void XSLTProcessor::processAction DOMString exprAtt = actionElement->getAttribute(EXPR_ATTR); Expr* expr = ps->getExpr(exprAtt); ExprResult* exprResult = expr->evaluate(node, ps); - String data("expr debug: "); + DOMString data("expr debug: "); expr->toString(data); cout << data << endl; data.clear(); @@ -1243,7 +1243,7 @@ void XSLTProcessor::processAction Expr* expr = ps->getExpr(selectAtt); ExprResult* exprResult = expr->evaluate(node, ps); - String value; + DOMString value; if ( !exprResult ) { notifyError("null ExprResult"); break; @@ -1370,7 +1370,7 @@ void XSLTProcessor::processAttributeSets * @param ps the current ProcessorState **/ void XSLTProcessor::processAttrValueTemplate - (const String& attValue, String& result, Node* context, ProcessorState* ps) + (const String& attValue, DOMString& result, Node* context, ProcessorState* ps) { AttributeValueTemplate* avt = 0; avt = exprParser.createAttributeValueTemplate(attValue); @@ -1574,7 +1574,7 @@ void XSLTProcessor::xslCopyOf(ExprResult* exprResult, ProcessorState* ps) { } default: { - String value; + DOMString value; exprResult->stringValue(value); ps->addToResultTree(resultDoc->createTextNode(value)); break; diff --git a/extensions/transformiix/source/xslt/XSLTProcessor.h b/extensions/transformiix/source/xslt/XSLTProcessor.h index 164f25d3486b..ffdb5f139361 100644 --- a/extensions/transformiix/source/xslt/XSLTProcessor.h +++ b/extensions/transformiix/source/xslt/XSLTProcessor.h @@ -21,7 +21,7 @@ * Keith Visco, kvisco@ziplink.net * -- original author. * - * $Id: XSLTProcessor.h,v 1.6 2000/04/12 22:33:43 nisheeth%netscape.com Exp $ + * $Id: XSLTProcessor.h,v 1.7 2000/04/20 22:10:16 Peter.VanderBeken%pandora.be Exp $ */ @@ -75,7 +75,7 @@ /** * A class for Processing XSL Stylesheets * @author Keith Visco - * @version $Revision: 1.6 $ $Date: 2000/04/12 22:33:43 $ + * @version $Revision: 1.7 $ $Date: 2000/04/20 22:10:16 $ **/ class XSLTProcessor #ifdef MOZILLA @@ -337,7 +337,7 @@ private: * @param ps the current ProcessorState **/ void processAttrValueTemplate - (const String& attValue, String& result, Node* context, ProcessorState* ps); + (const String& attValue, DOMString& result, Node* context, ProcessorState* ps); void processTemplate(Node* node, Node* xslTemplate, ProcessorState* ps); void processTemplateParams(Node* xslTemplate, Node* context, ProcessorState* ps);