зеркало из https://github.com/mozilla/pjs.git
Fix part of bug 226124 (Cleanup transformiix walkers). r/sr=sicking.
This commit is contained in:
Родитель
bff6a6d46b
Коммит
68f9404988
|
@ -154,7 +154,7 @@ void URIUtils::getDocumentBase(const nsAFlatString& href, nsAString& dest)
|
||||||
PRUint32 iter = href.Length();
|
PRUint32 iter = href.Length();
|
||||||
while (iter > 0) {
|
while (iter > 0) {
|
||||||
if (temp[--iter] == HREF_PATH_SEP) {
|
if (temp[--iter] == HREF_PATH_SEP) {
|
||||||
dest.Append(Substring(href, 0, iter));
|
dest.Append(StringHead(href, iter));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,7 +116,7 @@ nsXPath1SchemeNSResolver::LookupNamespaceURI(const nsAString &aPrefix,
|
||||||
mContext->GetSchemeData(i, scheme, data);
|
mContext->GetSchemeData(i, scheme, data);
|
||||||
if (scheme.Equals(xmlns)) {
|
if (scheme.Equals(xmlns)) {
|
||||||
PRInt32 sep = data.FindChar('=');
|
PRInt32 sep = data.FindChar('=');
|
||||||
if (sep > 0 && aPrefix.Equals(Substring(data, 0, sep))) {
|
if (sep > 0 && aPrefix.Equals(StringHead(data, sep))) {
|
||||||
aURI.Assign(Substring(data, sep + 1, data.Length() - sep - 1));
|
aURI.Assign(Substring(data, sep + 1, data.Length() - sep - 1));
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -662,10 +662,11 @@ txCoreFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
|
||||||
nsresult rv = param->evaluateToString(aContext, arg);
|
nsresult rv = param->evaluateToString(aContext, arg);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
PRBool result = arg.Equals(Substring(lang, 0, arg.Length()),
|
PRBool result =
|
||||||
txCaseInsensitiveStringComparator()) &&
|
StringBeginsWith(lang, arg,
|
||||||
(lang.Length() == arg.Length() ||
|
txCaseInsensitiveStringComparator()) &&
|
||||||
lang.CharAt(arg.Length()) == '-');
|
(lang.Length() == arg.Length() ||
|
||||||
|
lang.CharAt(arg.Length()) == '-');
|
||||||
|
|
||||||
aContext->recycler()->getBoolResult(result, aResult);
|
aContext->recycler()->getBoolResult(result, aResult);
|
||||||
|
|
||||||
|
|
|
@ -916,7 +916,7 @@ txExprParser::resolveQName(const nsAString& aQName,
|
||||||
aNamespace = kNameSpaceID_None;
|
aNamespace = kNameSpaceID_None;
|
||||||
PRInt32 idx = aQName.FindChar(':');
|
PRInt32 idx = aQName.FindChar(':');
|
||||||
if (idx > 0) {
|
if (idx > 0) {
|
||||||
*aPrefix = NS_NewAtom(Substring(aQName, 0, (PRUint32)idx));
|
*aPrefix = NS_NewAtom(StringHead(aQName, (PRUint32)idx));
|
||||||
if (!*aPrefix) {
|
if (!*aPrefix) {
|
||||||
return NS_ERROR_OUT_OF_MEMORY;
|
return NS_ERROR_OUT_OF_MEMORY;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1079,7 +1079,7 @@ txFnStartStripSpace(PRInt32 aNamespaceID,
|
||||||
if (c[length-2] != ':') {
|
if (c[length-2] != ':') {
|
||||||
return NS_ERROR_XSLT_PARSE_FAILURE;
|
return NS_ERROR_XSLT_PARSE_FAILURE;
|
||||||
}
|
}
|
||||||
rv = XMLUtils::splitQName(Substring(name, 0, length-2),
|
rv = XMLUtils::splitQName(StringHead(name, length - 2),
|
||||||
getter_AddRefs(prefix),
|
getter_AddRefs(prefix),
|
||||||
getter_AddRefs(localName));
|
getter_AddRefs(localName));
|
||||||
if (NS_FAILED(rv) || prefix) {
|
if (NS_FAILED(rv) || prefix) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче