зеркало из https://github.com/mozilla/pjs.git
fix for bug #43085. r=waterson, a=waterson
This commit is contained in:
scc%mozilla.org
Родитель
aea055ddcd
Коммит
58b0747a46
|
|
@ -895,13 +895,24 @@ class NS_COM NS_ConvertUCS2toUTF8
|
|||
{
|
||||
public:
|
||||
NS_ConvertUCS2toUTF8( const PRUnichar* aString )
|
||||
{ Init( aString, ~PRUint32(0) /* MAXINT */); }
|
||||
{
|
||||
Init( aString, ~PRUint32(0) /* MAXINT */);
|
||||
}
|
||||
|
||||
NS_ConvertUCS2toUTF8( const PRUnichar* aString, PRUint32 aLength )
|
||||
{ Init( aString, aLength ); }
|
||||
{
|
||||
Init( aString, aLength );
|
||||
}
|
||||
|
||||
NS_ConvertUCS2toUTF8( PRUnichar aChar )
|
||||
{ Init( &aChar, 1 ); }
|
||||
{
|
||||
Init( &aChar, 1 );
|
||||
}
|
||||
|
||||
operator const char*() const
|
||||
{
|
||||
return GetBuffer();
|
||||
}
|
||||
|
||||
protected:
|
||||
void Init( const PRUnichar* aString, PRUint32 aLength );
|
||||
|
|
|
|||
|
|
@ -990,6 +990,11 @@ class NS_COM NS_ConvertASCIItoUCS2
|
|||
#endif
|
||||
|
||||
#ifdef NEW_STRING_APIS
|
||||
operator const PRUnichar*() const
|
||||
{
|
||||
return GetUnicode();
|
||||
}
|
||||
|
||||
operator nsLiteralString() const
|
||||
{
|
||||
return nsLiteralString(mUStr, mLength);
|
||||
|
|
@ -1029,13 +1034,24 @@ class NS_COM NS_ConvertUTF8toUCS2
|
|||
{
|
||||
public:
|
||||
NS_ConvertUTF8toUCS2( const char* aCString )
|
||||
{ Init( aCString, ~PRUint32(0) /* MAXINT */ ); }
|
||||
{
|
||||
Init( aCString, ~PRUint32(0) /* MAXINT */ );
|
||||
}
|
||||
|
||||
NS_ConvertUTF8toUCS2( const char* aCString, PRUint32 aLength )
|
||||
{ Init( aCString, aLength ); }
|
||||
{
|
||||
Init( aCString, aLength );
|
||||
}
|
||||
|
||||
NS_ConvertUTF8toUCS2( char aChar )
|
||||
{ Init( &aChar, 1 ); }
|
||||
{
|
||||
Init( &aChar, 1 );
|
||||
}
|
||||
|
||||
operator const PRUnichar*() const
|
||||
{
|
||||
return GetUnicode();
|
||||
}
|
||||
|
||||
protected:
|
||||
void Init( const char* aCString, PRUint32 aLength );
|
||||
|
|
|
|||
|
|
@ -895,13 +895,24 @@ class NS_COM NS_ConvertUCS2toUTF8
|
|||
{
|
||||
public:
|
||||
NS_ConvertUCS2toUTF8( const PRUnichar* aString )
|
||||
{ Init( aString, ~PRUint32(0) /* MAXINT */); }
|
||||
{
|
||||
Init( aString, ~PRUint32(0) /* MAXINT */);
|
||||
}
|
||||
|
||||
NS_ConvertUCS2toUTF8( const PRUnichar* aString, PRUint32 aLength )
|
||||
{ Init( aString, aLength ); }
|
||||
{
|
||||
Init( aString, aLength );
|
||||
}
|
||||
|
||||
NS_ConvertUCS2toUTF8( PRUnichar aChar )
|
||||
{ Init( &aChar, 1 ); }
|
||||
{
|
||||
Init( &aChar, 1 );
|
||||
}
|
||||
|
||||
operator const char*() const
|
||||
{
|
||||
return GetBuffer();
|
||||
}
|
||||
|
||||
protected:
|
||||
void Init( const PRUnichar* aString, PRUint32 aLength );
|
||||
|
|
|
|||
|
|
@ -990,6 +990,11 @@ class NS_COM NS_ConvertASCIItoUCS2
|
|||
#endif
|
||||
|
||||
#ifdef NEW_STRING_APIS
|
||||
operator const PRUnichar*() const
|
||||
{
|
||||
return GetUnicode();
|
||||
}
|
||||
|
||||
operator nsLiteralString() const
|
||||
{
|
||||
return nsLiteralString(mUStr, mLength);
|
||||
|
|
@ -1029,13 +1034,24 @@ class NS_COM NS_ConvertUTF8toUCS2
|
|||
{
|
||||
public:
|
||||
NS_ConvertUTF8toUCS2( const char* aCString )
|
||||
{ Init( aCString, ~PRUint32(0) /* MAXINT */ ); }
|
||||
{
|
||||
Init( aCString, ~PRUint32(0) /* MAXINT */ );
|
||||
}
|
||||
|
||||
NS_ConvertUTF8toUCS2( const char* aCString, PRUint32 aLength )
|
||||
{ Init( aCString, aLength ); }
|
||||
{
|
||||
Init( aCString, aLength );
|
||||
}
|
||||
|
||||
NS_ConvertUTF8toUCS2( char aChar )
|
||||
{ Init( &aChar, 1 ); }
|
||||
{
|
||||
Init( &aChar, 1 );
|
||||
}
|
||||
|
||||
operator const PRUnichar*() const
|
||||
{
|
||||
return GetUnicode();
|
||||
}
|
||||
|
||||
protected:
|
||||
void Init( const char* aCString, PRUint32 aLength );
|
||||
|
|
|
|||
|
|
@ -895,13 +895,24 @@ class NS_COM NS_ConvertUCS2toUTF8
|
|||
{
|
||||
public:
|
||||
NS_ConvertUCS2toUTF8( const PRUnichar* aString )
|
||||
{ Init( aString, ~PRUint32(0) /* MAXINT */); }
|
||||
{
|
||||
Init( aString, ~PRUint32(0) /* MAXINT */);
|
||||
}
|
||||
|
||||
NS_ConvertUCS2toUTF8( const PRUnichar* aString, PRUint32 aLength )
|
||||
{ Init( aString, aLength ); }
|
||||
{
|
||||
Init( aString, aLength );
|
||||
}
|
||||
|
||||
NS_ConvertUCS2toUTF8( PRUnichar aChar )
|
||||
{ Init( &aChar, 1 ); }
|
||||
{
|
||||
Init( &aChar, 1 );
|
||||
}
|
||||
|
||||
operator const char*() const
|
||||
{
|
||||
return GetBuffer();
|
||||
}
|
||||
|
||||
protected:
|
||||
void Init( const PRUnichar* aString, PRUint32 aLength );
|
||||
|
|
|
|||
|
|
@ -990,6 +990,11 @@ class NS_COM NS_ConvertASCIItoUCS2
|
|||
#endif
|
||||
|
||||
#ifdef NEW_STRING_APIS
|
||||
operator const PRUnichar*() const
|
||||
{
|
||||
return GetUnicode();
|
||||
}
|
||||
|
||||
operator nsLiteralString() const
|
||||
{
|
||||
return nsLiteralString(mUStr, mLength);
|
||||
|
|
@ -1029,13 +1034,24 @@ class NS_COM NS_ConvertUTF8toUCS2
|
|||
{
|
||||
public:
|
||||
NS_ConvertUTF8toUCS2( const char* aCString )
|
||||
{ Init( aCString, ~PRUint32(0) /* MAXINT */ ); }
|
||||
{
|
||||
Init( aCString, ~PRUint32(0) /* MAXINT */ );
|
||||
}
|
||||
|
||||
NS_ConvertUTF8toUCS2( const char* aCString, PRUint32 aLength )
|
||||
{ Init( aCString, aLength ); }
|
||||
{
|
||||
Init( aCString, aLength );
|
||||
}
|
||||
|
||||
NS_ConvertUTF8toUCS2( char aChar )
|
||||
{ Init( &aChar, 1 ); }
|
||||
{
|
||||
Init( &aChar, 1 );
|
||||
}
|
||||
|
||||
operator const PRUnichar*() const
|
||||
{
|
||||
return GetUnicode();
|
||||
}
|
||||
|
||||
protected:
|
||||
void Init( const char* aCString, PRUint32 aLength );
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче