mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
fix bug 96530. delay loading of unicharutil dll till we really need it.
r=dp sr=waterson
This commit is contained in:
parent
6ef80c3db6
commit
049abf1f66
@ -100,6 +100,11 @@ static nsICaseConversion* gCaseConv = nsnull;
|
||||
|
||||
nsresult
|
||||
nsTextTransformer::Initialize()
|
||||
{
|
||||
nsresult res = NS_OK;
|
||||
return res;
|
||||
}
|
||||
static nsresult EnsureCaseConv()
|
||||
{
|
||||
nsresult res = NS_OK;
|
||||
if (!gCaseConv) {
|
||||
@ -880,7 +885,8 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
|
||||
if (!isWhitespace) {
|
||||
switch (mTextTransform) {
|
||||
case NS_STYLE_TEXT_TRANSFORM_CAPITALIZE:
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
// if the first character is szlig
|
||||
if(kSzlig == *result)
|
||||
{
|
||||
@ -900,11 +906,13 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
|
||||
}
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_LOWERCASE:
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_UPPERCASE:
|
||||
{
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
|
||||
// first we search for German Szlig
|
||||
PRInt32 szligCnt = CountGermanSzlig(result, wordLen);
|
||||
@ -1248,13 +1256,16 @@ nsTextTransformer::GetPrevWord(PRBool aInWord,
|
||||
if (!isWhitespace) {
|
||||
switch (mTextTransform) {
|
||||
case NS_STYLE_TEXT_TRANSFORM_CAPITALIZE:
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_LOWERCASE:
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_UPPERCASE:
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -100,6 +100,11 @@ static nsICaseConversion* gCaseConv = nsnull;
|
||||
|
||||
nsresult
|
||||
nsTextTransformer::Initialize()
|
||||
{
|
||||
nsresult res = NS_OK;
|
||||
return res;
|
||||
}
|
||||
static nsresult EnsureCaseConv()
|
||||
{
|
||||
nsresult res = NS_OK;
|
||||
if (!gCaseConv) {
|
||||
@ -880,7 +885,8 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
|
||||
if (!isWhitespace) {
|
||||
switch (mTextTransform) {
|
||||
case NS_STYLE_TEXT_TRANSFORM_CAPITALIZE:
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
// if the first character is szlig
|
||||
if(kSzlig == *result)
|
||||
{
|
||||
@ -900,11 +906,13 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
|
||||
}
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_LOWERCASE:
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_UPPERCASE:
|
||||
{
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
|
||||
// first we search for German Szlig
|
||||
PRInt32 szligCnt = CountGermanSzlig(result, wordLen);
|
||||
@ -1248,13 +1256,16 @@ nsTextTransformer::GetPrevWord(PRBool aInWord,
|
||||
if (!isWhitespace) {
|
||||
switch (mTextTransform) {
|
||||
case NS_STYLE_TEXT_TRANSFORM_CAPITALIZE:
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToTitle(result, result, wordLen, !aInWord);
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_LOWERCASE:
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToLower(result, result, wordLen);
|
||||
break;
|
||||
case NS_STYLE_TEXT_TRANSFORM_UPPERCASE:
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
if(NS_SUCCEEDED(EnsureCaseConv()))
|
||||
gCaseConv->ToUpper(result, result, wordLen);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user