From 6815c29fd9a9df2caca72d16be76b8bee2fa1191 Mon Sep 17 00:00:00 2001 From: "cata%netscape.com" Date: Wed, 24 Mar 1999 00:52:19 +0000 Subject: [PATCH] Length() moved in support class. In preparation for the big interface change. git-svn-id: svn://10.0.0.236/trunk@24935 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp | 7 +++---- mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h | 3 +-- mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp | 7 +++---- mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.h | 3 +-- mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp | 8 ++++++++ mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h | 5 +++++ mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.cpp | 7 +++---- mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.h | 3 +-- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp index 5c4aead7055..74b03726995 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp @@ -49,10 +49,9 @@ nsresult nsISO88597ToUnicode::CreateInstance(nsISupports ** aResult) //---------------------------------------------------------------------- // Subclassing of nsTableDecoderSupport class [implementation] -NS_IMETHODIMP nsISO88597ToUnicode::Length(const char * aSrc, - PRInt32 aSrcOffset, - PRInt32 aSrcLength, - PRInt32 * aDestLength) +NS_IMETHODIMP nsISO88597ToUnicode::GetMaxLength(const char * aSrc, + PRInt32 aSrcLength, + PRInt32 * aDestLength) { // we are a single byte to Unicode converter, so... *aDestLength = aSrcLength; diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h index 2d212ce7edd..ae1f35e2325 100644 --- a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h +++ b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h @@ -50,9 +50,8 @@ protected: //-------------------------------------------------------------------- // Subclassing of nsDecoderSupport class [declaration] - NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, PRInt32 aSrcLength, + NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, PRInt32 * aDestLength); - }; #endif /* nsISO88597ToUnicode_h___ */ diff --git a/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp index 55165802afe..c058f8e0b1a 100644 --- a/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp @@ -49,10 +49,9 @@ nsresult nsLatin1ToUnicode::CreateInstance(nsISupports ** aResult) //---------------------------------------------------------------------- // Subclassing of nsTableDecoderSupport class [implementation] -NS_IMETHODIMP nsLatin1ToUnicode::Length(const char * aSrc, - PRInt32 aSrcOffset, - PRInt32 aSrcLength, - PRInt32 * aDestLength) +NS_IMETHODIMP nsLatin1ToUnicode::GetMaxLength(const char * aSrc, + PRInt32 aSrcLength, + PRInt32 * aDestLength) { // we are a single byte to Unicode converter, so... *aDestLength = aSrcLength; diff --git a/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.h b/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.h index 96516fdd12e..053b6d69fe1 100644 --- a/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.h +++ b/mozilla/intl/uconv/ucvlatin/nsLatin1ToUnicode.h @@ -50,9 +50,8 @@ protected: //-------------------------------------------------------------------- // Subclassing of nsDecoderSupport class [declaration] - NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, PRInt32 aSrcLength, + NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, PRInt32 * aDestLength); - }; #endif /* nsLatin1ToUnicode_h___ */ diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp index 4ef06653296..290ba93a7d7 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp @@ -505,6 +505,14 @@ NS_IMETHODIMP nsDecoderSupport::Finish(PRUnichar * aDest, PRInt32 aDestOffset, return NS_OK; } +NS_IMETHODIMP nsDecoderSupport::Length(const char * aSrc, PRInt32 aSrcOffset, + PRInt32 aSrcLength, PRInt32 * aDestLength) +{ + // XXX this will silently go away when interface will change and the right + // method will be called because it's already there!!! + return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength); +} + NS_IMETHODIMP nsDecoderSupport::Reset() { mBufferLength = 0; diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h index 170ce5c287f..bbf1cb2b89d 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h +++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h @@ -234,6 +234,9 @@ public: */ virtual ~nsDecoderSupport(); + NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, + PRInt32 * aDestLength) = 0; + //-------------------------------------------------------------------- // Interface nsIUnicodeDecoder [declaration] @@ -242,6 +245,8 @@ public: PRInt32 * aSrcLength); NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, PRInt32 * aDestLength); + NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, + PRInt32 aSrcLength, PRInt32 * aDestLength); NS_IMETHOD Reset(); NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior); }; diff --git a/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.cpp index 9dae5509f2e..2c267771e86 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.cpp @@ -51,10 +51,9 @@ nsresult nsUTF8ToUnicode::CreateInstance(nsISupports ** aResult) //---------------------------------------------------------------------- // Subclassing of nsTableDecoderSupport class [implementation] -NS_IMETHODIMP nsUTF8ToUnicode::Length(const char * aSrc, - PRInt32 aSrcOffset, - PRInt32 aSrcLength, - PRInt32 * aDestLength) +NS_IMETHODIMP nsUTF8ToUnicode::GetMaxLength(const char * aSrc, + PRInt32 aSrcLength, + PRInt32 * aDestLength) { // we are a single byte to Unicode converter, so... *aDestLength = aSrcLength; diff --git a/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.h b/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.h index b0e0093cad7..cd12af36ee6 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.h +++ b/mozilla/intl/uconv/ucvlatin/nsUTF8ToUnicode.h @@ -50,9 +50,8 @@ protected: //-------------------------------------------------------------------- // Subclassing of nsDecoderSupport class [declaration] - NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, PRInt32 aSrcLength, + NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, PRInt32 * aDestLength); - }; #endif /* nsUTF8ToUnicode_h___ */