Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt at fixing bustage for Mac OS X

Browse Source
This commit is contained in:
jaggernaut%netscape.com 2001-10-24 09:03:09 +00:00
parent b80e4721ee
commit fd3b251e94
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
intl/locale/src/mac/nsCollationMacUC.cpp
View File

@ -168,7 +168,7 @@ NS_IMETHODIMP nsCollationMacUC::Initialize(
NS_IMETHODIMP nsCollationMacUC::GetSortKeyLen(
const nsCollationStrength strength,
const nsString& stringIn,
const nsAString& stringIn,
PRUint32* outLen)
{
NS_ENSURE_ARG_POINTER(outLen);
@ -181,7 +181,7 @@ NS_IMETHODIMP nsCollationMacUC::GetSortKeyLen(
NS_IMETHODIMP nsCollationMacUC::CreateRawSortKey(
const nsCollationStrength strength,
const nsString& stringIn,
const nsAString& stringIn,
PRUint8* key,
PRUint32* outLen)
{
@ -201,7 +201,7 @@ NS_IMETHODIMP nsCollationMacUC::CreateRawSortKey(
NS_ENSURE_SUCCESS(res, res);
ItemCount actual;
err = ::UCGetCollationKey(mCollator, (const UniChar*) stringIn.get(),
err = ::UCGetCollationKey(mCollator, (const UniChar*) PromiseFlatString(stringIn).get(),
(UniCharCount) stringIn.Length(),
(ItemCount) (keyLength / sizeof(UCCollationValue)),
&actual, (UCCollationValue *)key);
@ -216,8 +216,8 @@ NS_IMETHODIMP nsCollationMacUC::CreateRawSortKey(
NS_IMETHODIMP nsCollationMacUC::CompareString(
const nsCollationStrength strength,
const nsString& string1,
const nsString& string2,
const nsAString& string1,
const nsAString& string2,
PRInt32* result)
{
NS_ENSURE_TRUE(mInit, NS_ERROR_NOT_INITIALIZED);
@ -231,8 +231,8 @@ NS_IMETHODIMP nsCollationMacUC::CompareString(
OSStatus err;
err = ::UCCompareText(mCollator,
(const UniChar *) string1.get(), (UniCharCount) string1.Length(),
(const UniChar *) string2.get(), (UniCharCount) string2.Length(),
(const UniChar *) PromiseFlatString(string1).get(), (UniCharCount) string1.Length(),
(const UniChar *) PromiseFlatString(string2).get(), (UniCharCount) string2.Length(),
NULL, &order);
NS_ENSURE_TRUE((err == noErr), NS_ERROR_FAILURE);
@ -269,4 +269,4 @@ NS_IMETHODIMP nsCollationMacUC::CompareRawSortKey(
}
#endif
#endif

8
intl/locale/src/mac/nsCollationMacUC.h
View File

@ -54,16 +54,16 @@ public:
virtual ~nsCollationMacUC();
NS_IMETHOD CompareString(const nsCollationStrength strength,
const nsString& string1,
const nsString& string2,
const nsAString& string1,
const nsAString& string2,
PRInt32* result) ;
NS_IMETHOD GetSortKeyLen(const nsCollationStrength strength,
const nsString& stringIn,
const nsAString& stringIn,
PRUint32* outLen);
NS_IMETHOD CreateRawSortKey(const nsCollationStrength strength,
const nsString& stringIn,
const nsAString& stringIn,
PRUint8* key, PRUint32* outLen);
NS_IMETHOD CompareRawSortKey(const PRUint8* key1, const PRUint32 len1,