mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix warnings. submitted by jeroen@vangelderen.org, r=karnaze

This commit is contained in:
karnaze%netscape.com 2000-03-15 04:50:25 +00:00
Родитель f903c2a88c
Коммит 6314b604b5
2 изменённых файлов: 8 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
layout/html/table/src/nsCellMap.cpp
Просмотреть файл

@ -409,7 +409,7 @@ nsTableCellMap::Dump() const
printf("***** START TABLE CELL MAP DUMP ***** %p\n", this); printf("***** START TABLE CELL MAP DUMP ***** %p\n", this);
// output col info // output col info
PRInt32 colCount = mCols.Count(); PRInt32 colCount = mCols.Count();
printf ("cols array orig/span-> ", this); printf ("cols array orig/span-> %p", this);
for (PRInt32 colX = 0; colX < colCount; colX++) { for (PRInt32 colX = 0; colX < colCount; colX++) {
nsColInfo* colInfo = (nsColInfo *)mCols.ElementAt(colX); nsColInfo* colInfo = (nsColInfo *)mCols.ElementAt(colX);
printf ("%d=%d/%d ", colX, colInfo->mNumCellsOrig, colInfo->mNumCellsSpan); printf ("%d=%d/%d ", colX, colInfo->mNumCellsOrig, colInfo->mNumCellsSpan);
@ -532,7 +532,7 @@ void nsTableCellMap::SizeOf(nsISizeOfHandler* aHandler,
// nsCellMap // nsCellMap
nsCellMap::nsCellMap(nsTableRowGroupFrame& aRowGroup) nsCellMap::nsCellMap(nsTableRowGroupFrame& aRowGroup)
: mRowCount(0), mNextSibling(nsnull), mRowGroupFrame(&aRowGroup) : mRowCount(0), mRowGroupFrame(&aRowGroup), mNextSibling(nsnull)
{ {
MOZ_COUNT_CTOR(nsCellMap); MOZ_COUNT_CTOR(nsCellMap);
} }
@ -923,7 +923,6 @@ nsCellMap::ExpandWithRows(nsIPresContext* aPresContext,
PRInt32 aStartRowIndex) PRInt32 aStartRowIndex)
{ {
PRInt32 numNewRows = aRowFrames.Count(); PRInt32 numNewRows = aRowFrames.Count();
PRInt32 origNumCols = aMap.GetColCount();
PRInt32 endRowIndex = aStartRowIndex + numNewRows - 1; PRInt32 endRowIndex = aStartRowIndex + numNewRows - 1;
// create the new rows first // create the new rows first
@ -1177,7 +1176,6 @@ PRInt32 nsCellMap::GetRowSpan(nsTableCellMap& aMap,
PRInt32 rowCount = (aGetEffective) ? mRowCount : mRows.Count(); PRInt32 rowCount = (aGetEffective) ? mRowCount : mRows.Count();
PRInt32 rowX; PRInt32 rowX;
for (rowX = aRowIndex + 1; rowX < rowCount; rowX++) { for (rowX = aRowIndex + 1; rowX < rowCount; rowX++) {
nsVoidArray* row = (nsVoidArray *)(mRows.ElementAt(rowX));
CellData* data = GetMapCellAt(aMap, rowX, aColIndex, PR_TRUE); CellData* data = GetMapCellAt(aMap, rowX, aColIndex, PR_TRUE);
if (data) { if (data) {
if (data->IsRowSpan()) { if (data->IsRowSpan()) {
@ -1615,8 +1613,8 @@ nsCellMap::AdjustForZeroSpan(nsTableCellMap& aMap,
PRBool cellsOrig = PR_FALSE; PRBool cellsOrig = PR_FALSE;
if (colX >= aColIndex + MIN_NUM_COLS_FOR_ZERO_COLSPAN - 1) { if (colX >= aColIndex + MIN_NUM_COLS_FOR_ZERO_COLSPAN - 1) {
for (rowX = aRowIndex; rowX <= endRowIndex; rowX++) { for (rowX = aRowIndex; rowX <= endRowIndex; rowX++) {
CellData* data = GetMapCellAt(aMap, rowX, colX, PR_FALSE); CellData* cellData = GetMapCellAt(aMap, rowX, colX, PR_FALSE);
if (data && data->IsOrig()) { if (cellData && cellData->IsOrig()) {
cellsOrig = PR_TRUE; cellsOrig = PR_TRUE;
break; // there are cells in this col, so don't consider it break; // there are cells in this col, so don't consider it
} }
@ -1669,7 +1667,6 @@ nsCellMap::GetMapCellAt(nsTableCellMap& aMap,
nsVoidArray* prevRow = (nsVoidArray *)(mRows.ElementAt(prevRowX)); nsVoidArray* prevRow = (nsVoidArray *)(mRows.ElementAt(prevRowX));
CellData* prevData = (CellData *)(prevRow->ElementAt(aColIndex)); CellData* prevData = (CellData *)(prevRow->ElementAt(aColIndex));
if (prevData) { if (prevData) {
nsTableCellFrame* origCell = nsnull;
if (prevData->IsZeroRowSpan()) { if (prevData->IsZeroRowSpan()) {
PRInt32 rowIndex = prevRowX - prevData->GetRowSpanOffset(); PRInt32 rowIndex = prevRowX - prevData->GetRowSpanOffset();
PRInt32 colIndex = 0; PRInt32 colIndex = 0;

11
layout/tables/nsCellMap.cpp
Просмотреть файл

@ -409,7 +409,7 @@ nsTableCellMap::Dump() const
printf("***** START TABLE CELL MAP DUMP ***** %p\n", this); printf("***** START TABLE CELL MAP DUMP ***** %p\n", this);
// output col info // output col info
PRInt32 colCount = mCols.Count(); PRInt32 colCount = mCols.Count();
printf ("cols array orig/span-> ", this); printf ("cols array orig/span-> %p", this);
for (PRInt32 colX = 0; colX < colCount; colX++) { for (PRInt32 colX = 0; colX < colCount; colX++) {
nsColInfo* colInfo = (nsColInfo *)mCols.ElementAt(colX); nsColInfo* colInfo = (nsColInfo *)mCols.ElementAt(colX);
printf ("%d=%d/%d ", colX, colInfo->mNumCellsOrig, colInfo->mNumCellsSpan); printf ("%d=%d/%d ", colX, colInfo->mNumCellsOrig, colInfo->mNumCellsSpan);
@ -532,7 +532,7 @@ void nsTableCellMap::SizeOf(nsISizeOfHandler* aHandler,
// nsCellMap // nsCellMap
nsCellMap::nsCellMap(nsTableRowGroupFrame& aRowGroup) nsCellMap::nsCellMap(nsTableRowGroupFrame& aRowGroup)
: mRowCount(0), mNextSibling(nsnull), mRowGroupFrame(&aRowGroup) : mRowCount(0), mRowGroupFrame(&aRowGroup), mNextSibling(nsnull)
{ {
MOZ_COUNT_CTOR(nsCellMap); MOZ_COUNT_CTOR(nsCellMap);
} }
@ -923,7 +923,6 @@ nsCellMap::ExpandWithRows(nsIPresContext* aPresContext,
PRInt32 aStartRowIndex) PRInt32 aStartRowIndex)
{ {
PRInt32 numNewRows = aRowFrames.Count(); PRInt32 numNewRows = aRowFrames.Count();
PRInt32 origNumCols = aMap.GetColCount();
PRInt32 endRowIndex = aStartRowIndex + numNewRows - 1; PRInt32 endRowIndex = aStartRowIndex + numNewRows - 1;
// create the new rows first // create the new rows first
@ -1177,7 +1176,6 @@ PRInt32 nsCellMap::GetRowSpan(nsTableCellMap& aMap,
PRInt32 rowCount = (aGetEffective) ? mRowCount : mRows.Count(); PRInt32 rowCount = (aGetEffective) ? mRowCount : mRows.Count();
PRInt32 rowX; PRInt32 rowX;
for (rowX = aRowIndex + 1; rowX < rowCount; rowX++) { for (rowX = aRowIndex + 1; rowX < rowCount; rowX++) {
nsVoidArray* row = (nsVoidArray *)(mRows.ElementAt(rowX));
CellData* data = GetMapCellAt(aMap, rowX, aColIndex, PR_TRUE); CellData* data = GetMapCellAt(aMap, rowX, aColIndex, PR_TRUE);
if (data) { if (data) {
if (data->IsRowSpan()) { if (data->IsRowSpan()) {
@ -1615,8 +1613,8 @@ nsCellMap::AdjustForZeroSpan(nsTableCellMap& aMap,
PRBool cellsOrig = PR_FALSE; PRBool cellsOrig = PR_FALSE;
if (colX >= aColIndex + MIN_NUM_COLS_FOR_ZERO_COLSPAN - 1) { if (colX >= aColIndex + MIN_NUM_COLS_FOR_ZERO_COLSPAN - 1) {
for (rowX = aRowIndex; rowX <= endRowIndex; rowX++) { for (rowX = aRowIndex; rowX <= endRowIndex; rowX++) {
CellData* data = GetMapCellAt(aMap, rowX, colX, PR_FALSE); CellData* cellData = GetMapCellAt(aMap, rowX, colX, PR_FALSE);
if (data && data->IsOrig()) { if (cellData && cellData->IsOrig()) {
cellsOrig = PR_TRUE; cellsOrig = PR_TRUE;
break; // there are cells in this col, so don't consider it break; // there are cells in this col, so don't consider it
} }
@ -1669,7 +1667,6 @@ nsCellMap::GetMapCellAt(nsTableCellMap& aMap,
nsVoidArray* prevRow = (nsVoidArray *)(mRows.ElementAt(prevRowX)); nsVoidArray* prevRow = (nsVoidArray *)(mRows.ElementAt(prevRowX));
CellData* prevData = (CellData *)(prevRow->ElementAt(aColIndex)); CellData* prevData = (CellData *)(prevRow->ElementAt(aColIndex));
if (prevData) { if (prevData) {
nsTableCellFrame* origCell = nsnull;
if (prevData->IsZeroRowSpan()) { if (prevData->IsZeroRowSpan()) {
PRInt32 rowIndex = prevRowX - prevData->GetRowSpanOffset(); PRInt32 rowIndex = prevRowX - prevData->GetRowSpanOffset();
PRInt32 colIndex = 0; PRInt32 colIndex = 0;