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

a name change outside the IBMBIDI ifdef caused the ifdeffed code to break;

Browse Source 
this change fixes that; no bug number, r, sr


git-svn-id: svn://10.0.0.236/trunk@91513 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
erik%netscape.com
2001-04-05 23:50:10 +00:00
parent a9c46eb554
commit 4a52b9dc76
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/generic/nsBulletFrame.cpp
View File

@@ -185,12 +185,12 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext,
case NS_STYLE_LIST_STYLE_OLD_DECIMAL:
case NS_STYLE_LIST_STYLE_DECIMAL_LEADING_ZERO:
#ifdef IBMBIDI
GetListItemText(aCX, *myList, text);
GetListItemText(aPresContext, *myList, text);
charType = eCharType_EuropeanNumber;
break;
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
GetListItemText(aCX, *myList, text);
GetListItemText(aPresContext, *myList, text);
charType = eCharType_ArabicNumber;
break;
@@ -200,7 +200,7 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext,
if (!isBidiSystem) {
charType = eCharType_RightToLeft;
level = 1;
GetListItemText(aCX, *myList, text);
GetListItemText(aPresContext, *myList, text);
if (NS_STYLE_DIRECTION_RTL == disp->mDirection) {
nsStr::Delete(text, 0, 1);
@@ -264,23 +264,23 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext,
}
#ifdef IBMBIDI
if (charType != eCharType_LeftToRight) {
aCX->GetMetricsFor(myFont->mFont, getter_AddRefs(fm));
aPresContext->GetMetricsFor(myFont->mFont, getter_AddRefs(fm));
aRenderingContext.SetFont(fm);
nsBidiPresUtils* bidiUtils;
aCX->GetBidiUtils(&bidiUtils);
aPresContext->GetBidiUtils(&bidiUtils);
if (bidiUtils) {
const PRUnichar* buffer = text.GetUnicode();
PRInt32 textLength = text.Length();
if (eCharType_RightToLeft == charType) {
bidiUtils->FormatUnicodeText(aCX, (PRUnichar*)buffer, textLength,
bidiUtils->FormatUnicodeText(aPresContext, (PRUnichar*)buffer, textLength,
charType, level, PR_FALSE);
}
else {
//Mohamed
aRenderingContext.GetHints(hints);
isBidiSystem = (hints & NS_RENDERING_HINT_ARABIC_SHAPING);
bidiUtils->FormatUnicodeText(aCX, (PRUnichar*)buffer, textLength,
bidiUtils->FormatUnicodeText(aPresContext, (PRUnichar*)buffer, textLength,
charType, level, isBidiSystem);//Mohamed
}
}