[NOT PART OF THE DEFAULT BUILD] Fix compilation problems on Linux. The code now compiles there as well.

This commit is contained in:
rbs%maths.uq.edu.au 2000-03-29 08:39:50 +00:00
Родитель a64976a213
Коммит 524bc6ea75
4 изменённых файлов: 6 добавлений и 10 удалений

Просмотреть файл

@ -486,7 +486,7 @@ nsMathMLContainerFrame::GetReflowAndBoundingMetricsFor(nsIFrame* aFra
aBoundingMetrics.descent = aReflowMetrics.descent;
aBoundingMetrics.ascent = aReflowMetrics.ascent;
aBoundingMetrics.width = aReflowMetrics.width;
#if 1
#if 0
printf("GetBoundingMetrics() failed for: "); /* getchar(); */
nsFrame::ListTag(stdout, aFrame);
printf("\n");
@ -711,8 +711,7 @@ nsMathMLContainerFrame::EmbellishOperator()
mEmbellishData.firstChild = firstChild;
// Cache also the inner-most embellished frame at the core of the hierarchy
nsIMathMLFrame* aMathMLFrame = nsnull;
nsresult rv = firstChild->QueryInterface(NS_GET_IID(nsIMathMLFrame), (void**)&aMathMLFrame);
NS_ASSERTION(NS_SUCCEEDED(rv) && aMathMLFrame, "Mystery!");
firstChild->QueryInterface(NS_GET_IID(nsIMathMLFrame), (void**)&aMathMLFrame);
nsEmbellishData embellishData;
aMathMLFrame->GetEmbellishData(embellishData);
mEmbellishData.core = embellishData.core;
@ -985,7 +984,7 @@ nsMathMLContainerFrame::InsertScriptLevelStyleContext(nsIPresContext* aPresConte
PRBool isSmaller = PR_TRUE;
if (0 > gap) { isSmaller = PR_FALSE; gap = -gap; } // absolute value
PRInt32 smallestFontSize, smallestFontIndex;
PRInt32 smallestFontIndex, smallestFontSize = 0;
if (isSmaller) {
// find the smallest font-size in this subtree
smallestFontSize = FindSmallestFontSizeFor(aPresContext, childFrame);

Просмотреть файл

@ -110,7 +110,6 @@ nsMathMLmactionFrame::Init(nsIPresContext* aPresContext,
nsIStyleContext* aContext,
nsIFrame* aPrevInFlow)
{
nsresult rv = NS_OK;
nsAutoString value, prefix;
// Init our local attributes

Просмотреть файл

@ -319,7 +319,7 @@ nsMathMLmoFrame::InitData(nsIPresContext* aPresContext)
else {
// Get our outermost embellished container and its parent
nsIFrame* aParent = this;
nsIFrame* embellishAncestor = this;
embellishAncestor = this;
do {
embellishAncestor = aParent;
aParent->GetParent(&aParent);
@ -704,8 +704,6 @@ nsMathMLmoFrame::Stretch(nsIPresContext* aPresContext,
if (!NS_MATHML_OPERATOR_HAS_EMBELLISH_ANCESTOR(mFlags)) {
// Get the value of 'em'
nsStyleFont font;
mStyleContext->GetStyle(eStyleStruct_Font, font);
nscoord em = NSToCoordRound(float(font.mFont.size));
// Account the spacing

Просмотреть файл

@ -110,8 +110,8 @@ nsMathMLmsubFrame::Place(nsIPresContext* aPresContext,
PRInt32 count = 0;
nsHTMLReflowMetrics baseSize (nsnull);
nsHTMLReflowMetrics subScriptSize (nsnull);
nsIFrame* baseFrame;
nsIFrame* subScriptFrame;
nsIFrame* baseFrame = nsnull;
nsIFrame* subScriptFrame = nsnull;
// parameter v, Rule 18a, Appendix G of the TeXbook
nscoord minSubScriptShift = 0;