From dd5c2ad9223109352d7c825eada41495ac4a37bb Mon Sep 17 00:00:00 2001 From: "nhotta%netscape.com" Date: Tue, 28 Mar 2000 00:36:41 +0000 Subject: [PATCH] Changed NS_ERROR_UENC_NOMAPPING to non serious error and return it to clients of nsISaveAsCharset, r=cata. --- intl/uconv/public/nsIUnicodeEncoder.h | 2 +- intl/unicharutil/src/nsSaveAsCharset.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intl/uconv/public/nsIUnicodeEncoder.h b/intl/uconv/public/nsIUnicodeEncoder.h index e004ce5a9f7..7b4747dede7 100644 --- a/intl/uconv/public/nsIUnicodeEncoder.h +++ b/intl/uconv/public/nsIUnicodeEncoder.h @@ -48,7 +48,7 @@ static NS_DEFINE_IID(kIUnicharEncoderIID, NS_IUNICHARENCODER_IID); NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x22) #define NS_ERROR_UENC_NOMAPPING \ - NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_UCONV, 0x23) + NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x23) #define NS_UNICODEENCODER_PROGID_BASE "component://netscape/intl/unicode/encoder?charset=" diff --git a/intl/unicharutil/src/nsSaveAsCharset.cpp b/intl/unicharutil/src/nsSaveAsCharset.cpp index 650308348a4..e7b25d20381 100644 --- a/intl/unicharutil/src/nsSaveAsCharset.cpp +++ b/intl/unicharutil/src/nsSaveAsCharset.cpp @@ -246,7 +246,7 @@ nsSaveAsCharset::DoCharsetConversion(const PRUnichar *inString, char **outString *outString = dstPtr; // set the result string // set error code so that the caller can do own fall back - if ((NS_ERROR_UENC_NOMAPPING == saveResult) && ATTR_NO_FALLBACK(mAttribute)) { + if (NS_ERROR_UENC_NOMAPPING == saveResult) { rv = NS_ERROR_UENC_NOMAPPING; }