From 368a6b77c82faaa7ffb53801681af516043e111b Mon Sep 17 00:00:00 2001 From: "sdv%sparc.spb.su" Date: Thu, 10 Feb 2000 01:13:57 +0000 Subject: [PATCH] fix for bug 24723 git-svn-id: svn://10.0.0.236/trunk@60268 18797224-902f-48f8-a5cc-f745e15eee43 --- .../jni/org_mozilla_dom_CharacterDataImpl.cpp | 31 ++++++++--------- .../dom/jni/org_mozilla_dom_DocumentImpl.cpp | 33 +++++++++---------- .../dom/jni/org_mozilla_dom_ElementImpl.cpp | 17 +++++----- .../jni/org_mozilla_dom_NamedNodeMapImpl.cpp | 9 +++-- .../java/dom/jni/org_mozilla_dom_NodeImpl.cpp | 32 +++++++++--------- ..._mozilla_dom_ProcessingInstructionImpl.cpp | 3 +- .../java/dom/jni/org_mozilla_dom_TextImpl.cpp | 6 ++-- 7 files changed, 60 insertions(+), 71 deletions(-) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp index cd1012da906..4f84b701bbf 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp @@ -57,8 +57,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_appendData env->ReleaseStringUTFChars(jvalue, value); if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { + if (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -77,7 +76,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_deleteData { if (offset < 0 || offset > JavaDOMGlobals::javaMaxInt || count < 0 || count > JavaDOMGlobals::javaMaxInt) { - JavaDOMGlobals::ThrowException(env, "", + JavaDOMGlobals::ThrowException(env, "CharacterData.deleteData: failed", NS_ERROR_DOM_INDEX_SIZE_ERR, JavaDOMGlobals::EXCEPTION_DOM); return; @@ -95,8 +94,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_deleteData if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INDEX_SIZE_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { + (rv == NS_ERROR_DOM_INDEX_SIZE_ERR || + rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -125,8 +124,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_getData nsresult rv = data->GetData(ret); if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_DOMSTRING_SIZE_ERR) { + if (rv == NS_ERROR_DOM_DOMSTRING_SIZE_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -203,8 +201,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_insertData if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INDEX_SIZE_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { + (rv == NS_ERROR_DOM_INDEX_SIZE_ERR || + rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -223,7 +221,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_replaceData { if (offset < 0 || offset > JavaDOMGlobals::javaMaxInt || count < 0 || count > JavaDOMGlobals::javaMaxInt) { - JavaDOMGlobals::ThrowException(env, "", + JavaDOMGlobals::ThrowException(env, "CharacterData.replaceData: failed", NS_ERROR_DOM_INDEX_SIZE_ERR, JavaDOMGlobals::EXCEPTION_DOM); return; @@ -254,8 +252,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_replaceData if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INDEX_SIZE_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { + (rv == NS_ERROR_DOM_INDEX_SIZE_ERR || + rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -296,8 +294,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_setData env->ReleaseStringUTFChars(jvalue, value); if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { + if (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -316,7 +313,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_substringData { if (offset < 0 || offset > JavaDOMGlobals::javaMaxInt || count < 0 || count > JavaDOMGlobals::javaMaxInt) { - JavaDOMGlobals::ThrowException(env, "", + JavaDOMGlobals::ThrowException(env, "CharacterData.substringData: failed", NS_ERROR_DOM_INDEX_SIZE_ERR, JavaDOMGlobals::EXCEPTION_DOM); return NULL; @@ -335,8 +332,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_substringData if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INDEX_SIZE_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_DOMSTRING_SIZE_ERR)) { + (rv == NS_ERROR_DOM_INDEX_SIZE_ERR || + rv == NS_ERROR_DOM_DOMSTRING_SIZE_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp index 56ce07d6b8a..8c265aebbdc 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp @@ -81,10 +81,9 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createAttribute nsresult rv = doc->CreateAttribute(name, &ret); if (iscopy == JNI_TRUE) env->ReleaseStringUTFChars(jname, name); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INVALID_CHARACTER_ERR) { + if (rv == NS_ERROR_DOM_INVALID_CHARACTER_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -142,10 +141,9 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createCDATASection nsresult rv = doc->CreateCDATASection(data, &ret); if (iscopy == JNI_TRUE) env->ReleaseStringUTFChars(jdata, data); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { + if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -202,7 +200,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createComment nsresult rv = doc->CreateComment(data, &ret); if (iscopy == JNI_TRUE) env->ReleaseStringUTFChars(jdata, data); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ThrowException(env, "Document.createComment: failed", rv); return NULL; @@ -244,7 +242,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createDocumentFragme nsIDOMDocumentFragment* ret = nsnull; nsresult rv = doc->CreateDocumentFragment(&ret); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ThrowException(env, "Document.createDocumentFragment: failed", rv); return NULL; @@ -299,10 +297,9 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createElement nsresult rv = doc->CreateElement(tagName, &ret); if (iscopy == JNI_TRUE) env->ReleaseStringUTFChars(jtagName, tagName); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INVALID_CHARACTER_ERR) { + if (rv == NS_ERROR_DOM_INVALID_CHARACTER_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -360,11 +357,11 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createEntityReferenc nsresult rv = doc->CreateEntityReference(name, &ret); if (iscopy == JNI_TRUE) env->ReleaseStringUTFChars(jname, name); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INVALID_CHARACTER_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_SUPPORTED_ERR)) { + (rv == NS_ERROR_DOM_INVALID_CHARACTER_ERR || + rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -434,11 +431,11 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createProcessingInst env->ReleaseStringUTFChars(jdata, data); if (iscopy == JNI_TRUE) env->ReleaseStringUTFChars(jtarget, target); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_SUPPORTED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INVALID_CHARACTER_ERR)) { + (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR || + rv == NS_ERROR_DOM_INVALID_CHARACTER_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -495,7 +492,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createTextNode nsresult rv = doc->CreateTextNode(data, &ret); if (iscopy == JNI_TRUE) env->ReleaseStringUTFChars(jdata, data); - if (NS_FAILED(rv) || !ret) { + if (NS_FAILED(rv)) { JavaDOMGlobals::ThrowException(env, "Document.createTextNode failed", rv); return NULL; diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp index dccb778e446..44d2f5f3d6b 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp @@ -274,8 +274,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_removeAttribute env->ReleaseStringUTFChars(jname, name); if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { + if (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -313,8 +312,8 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_removeAttributeNode if (NS_FAILED(rv) || !ret) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_FOUND_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_NOT_FOUND_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -386,8 +385,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_setAttribute if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INVALID_CHARACTER_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { + (rv == NS_ERROR_DOM_INVALID_CHARACTER_ERR || + rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -425,9 +424,9 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_setAttributeNode if (NS_FAILED(rv) || !ret) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INUSE_ATTRIBUTE_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || + rv == NS_ERROR_DOM_INUSE_ATTRIBUTE_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp index b1c67820589..015884ae35f 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp @@ -154,8 +154,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_removeNamedItem env->ReleaseStringUTFChars(jname, name); if (NS_FAILED(rv) || !node) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_FOUND_ERR) { + if (rv == NS_ERROR_DOM_NOT_FOUND_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -195,9 +194,9 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_setNamedItem if (NS_FAILED(rv) || !node) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INUSE_ATTRIBUTE_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || + rv == NS_ERROR_DOM_INUSE_ATTRIBUTE_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp index 5931579c293..b4ac3ffe758 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp @@ -162,9 +162,9 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_appendChild if (NS_FAILED(rv) || !ret) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_HIERARCHY_REQUEST_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || + rv == NS_ERROR_DOM_HIERARCHY_REQUEST_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -520,8 +520,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue nsresult rv = node->GetNodeValue(ret); if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_DOMSTRING_SIZE_ERR) { + if (rv == NS_ERROR_DOM_DOMSTRING_SIZE_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -701,10 +700,10 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_insertBefore if (NS_FAILED(rv) || !ret) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_FOUND_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_HIERARCHY_REQUEST_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || + rv == NS_ERROR_DOM_NOT_FOUND_ERR || + rv == NS_ERROR_DOM_HIERARCHY_REQUEST_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -747,8 +746,8 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_removeChild if (NS_FAILED(rv) || !ret) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_FOUND_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_NOT_FOUND_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -802,10 +801,10 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_replaceChild if (NS_FAILED(rv) || !ret) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_HIERARCHY_REQUEST_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NOT_FOUND_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_WRONG_DOCUMENT_ERR || + rv == NS_ERROR_DOM_HIERARCHY_REQUEST_ERR || + rv == NS_ERROR_DOM_NOT_FOUND_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, @@ -848,8 +847,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_setNodeValue env->ReleaseStringUTFChars(jvalue, value); if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { + if (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp index 5669ba433fd..efe4254a62b 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp @@ -126,8 +126,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_setData env->ReleaseStringUTFChars(jdata, data); if (NS_FAILED(rv)) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; - if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { + if (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env, diff --git a/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp index 3351327be51..007c720d1d7 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp @@ -35,7 +35,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_TextImpl_splitText (JNIEnv *env, jobject jthis, jint joffset) { if (joffset < 0 || joffset > JavaDOMGlobals::javaMaxInt) { - JavaDOMGlobals::ThrowException(env, "", + JavaDOMGlobals::ThrowException(env, "Text.splitText: failed", NS_ERROR_DOM_INDEX_SIZE_ERR, JavaDOMGlobals::EXCEPTION_DOM); return NULL; @@ -54,8 +54,8 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_TextImpl_splitText if (NS_FAILED(rv) || !ret) { JavaDOMGlobals::ExceptionType exceptionType = JavaDOMGlobals::EXCEPTION_RUNTIME; if (NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_DOM && - (NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || - NS_ERROR_GET_CODE(rv) == NS_ERROR_DOM_INDEX_SIZE_ERR)) { + (rv == NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR || + rv == NS_ERROR_DOM_INDEX_SIZE_ERR)) { exceptionType = JavaDOMGlobals::EXCEPTION_DOM; } JavaDOMGlobals::ThrowException(env,