Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#151536

Browse Source 
r=pedemont, sr=blizzard
OS/2 only - display Euro using current font, not Unicode font


git-svn-id: svn://10.0.0.236/trunk@124228 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2002-06-27 22:16:22 +00:00
parent 12d6686d3a
commit 4acd61aeec
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
View File

@@ -1610,7 +1610,7 @@ nsFontMetricsOS2::ResolveForwards(HPS aPS,
{
while( running && firstChar < lastChar )
{
if( *currChar > 0x00FF )
if(( *currChar > 0x00FF ) && (*currChar != 0x20AC))
{
fh = GetUnicodeFont(aPS);
fontSwitch.mFont = fh;
@@ -1630,7 +1630,7 @@ nsFontMetricsOS2::ResolveForwards(HPS aPS,
fontSwitch.mFont = fh;
while( ++currChar < lastChar )
{
if( *currChar > 0x00FF )
if( (*currChar > 0x00FF) && (*currChar != 0x20AC) )
break;
}
@@ -1644,7 +1644,7 @@ nsFontMetricsOS2::ResolveForwards(HPS aPS,
{
while( running && firstChar < lastChar )
{
if( *currChar >= 0x0080 && *currChar <= 0x00FF )
if( (*currChar >= 0x0080 && *currChar <= 0x00FF) || (*currChar == 0x20AC) )
{
fh = new nsFontOS2();
*fh = *mFontHandle;
@@ -1652,7 +1652,7 @@ nsFontMetricsOS2::ResolveForwards(HPS aPS,
fontSwitch.mFont = fh;
while( ++currChar < lastChar )
{
if( *currChar < 0x0080 || *currChar > 0x00FF )
if(( *currChar < 0x0080 || *currChar > 0x00FF) && (*currChar != 0x20AC) )
break;
}
@@ -1666,7 +1666,7 @@ nsFontMetricsOS2::ResolveForwards(HPS aPS,
fontSwitch.mFont = fh;
while( ++currChar < lastChar )
{
if( *currChar >= 0x0080 && *currChar <= 0x00FF )
if( (*currChar >= 0x0080 && *currChar <= 0x00FF) || (*currChar == 0x20AC) )
break;
}
@@ -1701,7 +1701,7 @@ nsFontMetricsOS2::ResolveBackwards(HPS aPS,
{
while( running && firstChar > lastChar )
{
if( *currChar > 0x00FF )
if(( *currChar > 0x00FF ) && (*currChar != 0x20AC))
{
fh = GetUnicodeFont(aPS);
fontSwitch.mFont = fh;
@@ -1721,7 +1721,7 @@ nsFontMetricsOS2::ResolveBackwards(HPS aPS,
fontSwitch.mFont = fh;
while( --currChar > lastChar )
{
if( *currChar > 0x00FF )
if(( *currChar > 0x00FF ) && (*currChar != 0x20AC))
break;
}
@@ -1735,7 +1735,7 @@ nsFontMetricsOS2::ResolveBackwards(HPS aPS,
{
while( running && firstChar > lastChar )
{
if( *currChar >= 0x0080 && *currChar <= 0x00FF )
if( (*currChar >= 0x0080 && *currChar <= 0x00FF) || (*currChar == 0x20AC) )
{
fh = new nsFontOS2();
*fh = *mFontHandle;
@@ -1743,7 +1743,7 @@ nsFontMetricsOS2::ResolveBackwards(HPS aPS,
fontSwitch.mFont = fh;
while( --currChar > lastChar )
{
if( *currChar < 0x0080 || *currChar > 0x00FF )
if(( *currChar < 0x0080 || *currChar > 0x00FF) && (*currChar != 0x20AC) )
break;
}
@@ -1757,7 +1757,7 @@ nsFontMetricsOS2::ResolveBackwards(HPS aPS,
fontSwitch.mFont = fh;
while( --currChar > lastChar )
{
if( *currChar >= 0x0080 && *currChar <= 0x00FF )
if( (*currChar >= 0x0080 && *currChar <= 0x00FF) || (*currChar == 0x20AC) )
break;
}