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

Fixing linux build bustage, added missing .get()'s on nsCOMPtr's. r=kin@netscape.com

This commit is contained in:
jst%citec.fi 2000-02-03 15:41:04 +00:00
Родитель 36b0bc876c
Коммит afc8cdb035
2 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -565,7 +565,7 @@ AllocateSpecialHeight(nsIPresContext* aPresContext,
while (cellFrame) { while (cellFrame) {
nsCOMPtr<nsIAtom> cellType; nsCOMPtr<nsIAtom> cellType;
cellFrame->GetFrameType(getter_AddRefs(cellType)); cellFrame->GetFrameType(getter_AddRefs(cellType));
if (nsLayoutAtoms::tableCellFrame == cellType) { if (nsLayoutAtoms::tableCellFrame == cellType.get()) {
PRInt32 rowSpan = aTableFrame->GetEffectiveRowSpan((nsTableCellFrame&)*cellFrame); PRInt32 rowSpan = aTableFrame->GetEffectiveRowSpan((nsTableCellFrame&)*cellFrame);
if (rowSpan > 1) { if (rowSpan > 1) {
// use a simple average to allocate the special row. This is not exact, // use a simple average to allocate the special row. This is not exact,
@ -623,7 +623,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
while (rowFrame) { while (rowFrame) {
nsCOMPtr<nsIAtom> frameType; nsCOMPtr<nsIAtom> frameType;
rowFrame->GetFrameType(getter_AddRefs(frameType)); rowFrame->GetFrameType(getter_AddRefs(frameType));
if (nsLayoutAtoms::tableRowFrame == frameType) { if (nsLayoutAtoms::tableRowFrame == frameType.get()) {
if (startRowIndex == -1) { if (startRowIndex == -1) {
startRowIndex = ((nsTableRowFrame*)rowFrame)->GetRowIndex(); startRowIndex = ((nsTableRowFrame*)rowFrame)->GetRowIndex();
} }
@ -667,14 +667,14 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
while (rowFrame) { while (rowFrame) {
nsCOMPtr<nsIAtom> rowType; nsCOMPtr<nsIAtom> rowType;
rowFrame->GetFrameType(getter_AddRefs(rowType)); rowFrame->GetFrameType(getter_AddRefs(rowType));
if (nsLayoutAtoms::tableRowFrame == rowType) { if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
// check this row for a cell with rowspans // check this row for a cell with rowspans
nsIFrame* cellFrame; nsIFrame* cellFrame;
rowFrame->FirstChild(aPresContext, nsnull, &cellFrame); rowFrame->FirstChild(aPresContext, nsnull, &cellFrame);
while (cellFrame) { while (cellFrame) {
nsCOMPtr<nsIAtom> cellType; nsCOMPtr<nsIAtom> cellType;
cellFrame->GetFrameType(getter_AddRefs(cellType)); cellFrame->GetFrameType(getter_AddRefs(cellType));
if (nsLayoutAtoms::tableCellFrame == cellType) { if (nsLayoutAtoms::tableCellFrame == cellType.get()) {
PRInt32 rowSpan = tableFrame->GetEffectiveRowSpan(rowIndex + startRowIndex, PRInt32 rowSpan = tableFrame->GetEffectiveRowSpan(rowIndex + startRowIndex,
(nsTableCellFrame&)*cellFrame); (nsTableCellFrame&)*cellFrame);
if (rowSpan > 1) { // found a cell with rowspan > 1, determine the height if (rowSpan > 1) { // found a cell with rowspan > 1, determine the height
@ -803,7 +803,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
while (rowFrame) { while (rowFrame) {
nsCOMPtr<nsIAtom> rowType; nsCOMPtr<nsIAtom> rowType;
rowFrame->GetFrameType(getter_AddRefs(rowType)); rowFrame->GetFrameType(getter_AddRefs(rowType));
if (nsLayoutAtoms::tableRowFrame == rowType) { if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
// Notify the row of the new size // Notify the row of the new size
((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState); ((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState);
} }

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

@ -565,7 +565,7 @@ AllocateSpecialHeight(nsIPresContext* aPresContext,
while (cellFrame) { while (cellFrame) {
nsCOMPtr<nsIAtom> cellType; nsCOMPtr<nsIAtom> cellType;
cellFrame->GetFrameType(getter_AddRefs(cellType)); cellFrame->GetFrameType(getter_AddRefs(cellType));
if (nsLayoutAtoms::tableCellFrame == cellType) { if (nsLayoutAtoms::tableCellFrame == cellType.get()) {
PRInt32 rowSpan = aTableFrame->GetEffectiveRowSpan((nsTableCellFrame&)*cellFrame); PRInt32 rowSpan = aTableFrame->GetEffectiveRowSpan((nsTableCellFrame&)*cellFrame);
if (rowSpan > 1) { if (rowSpan > 1) {
// use a simple average to allocate the special row. This is not exact, // use a simple average to allocate the special row. This is not exact,
@ -623,7 +623,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
while (rowFrame) { while (rowFrame) {
nsCOMPtr<nsIAtom> frameType; nsCOMPtr<nsIAtom> frameType;
rowFrame->GetFrameType(getter_AddRefs(frameType)); rowFrame->GetFrameType(getter_AddRefs(frameType));
if (nsLayoutAtoms::tableRowFrame == frameType) { if (nsLayoutAtoms::tableRowFrame == frameType.get()) {
if (startRowIndex == -1) { if (startRowIndex == -1) {
startRowIndex = ((nsTableRowFrame*)rowFrame)->GetRowIndex(); startRowIndex = ((nsTableRowFrame*)rowFrame)->GetRowIndex();
} }
@ -667,14 +667,14 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
while (rowFrame) { while (rowFrame) {
nsCOMPtr<nsIAtom> rowType; nsCOMPtr<nsIAtom> rowType;
rowFrame->GetFrameType(getter_AddRefs(rowType)); rowFrame->GetFrameType(getter_AddRefs(rowType));
if (nsLayoutAtoms::tableRowFrame == rowType) { if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
// check this row for a cell with rowspans // check this row for a cell with rowspans
nsIFrame* cellFrame; nsIFrame* cellFrame;
rowFrame->FirstChild(aPresContext, nsnull, &cellFrame); rowFrame->FirstChild(aPresContext, nsnull, &cellFrame);
while (cellFrame) { while (cellFrame) {
nsCOMPtr<nsIAtom> cellType; nsCOMPtr<nsIAtom> cellType;
cellFrame->GetFrameType(getter_AddRefs(cellType)); cellFrame->GetFrameType(getter_AddRefs(cellType));
if (nsLayoutAtoms::tableCellFrame == cellType) { if (nsLayoutAtoms::tableCellFrame == cellType.get()) {
PRInt32 rowSpan = tableFrame->GetEffectiveRowSpan(rowIndex + startRowIndex, PRInt32 rowSpan = tableFrame->GetEffectiveRowSpan(rowIndex + startRowIndex,
(nsTableCellFrame&)*cellFrame); (nsTableCellFrame&)*cellFrame);
if (rowSpan > 1) { // found a cell with rowspan > 1, determine the height if (rowSpan > 1) { // found a cell with rowspan > 1, determine the height
@ -803,7 +803,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
while (rowFrame) { while (rowFrame) {
nsCOMPtr<nsIAtom> rowType; nsCOMPtr<nsIAtom> rowType;
rowFrame->GetFrameType(getter_AddRefs(rowType)); rowFrame->GetFrameType(getter_AddRefs(rowType));
if (nsLayoutAtoms::tableRowFrame == rowType) { if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
// Notify the row of the new size // Notify the row of the new size
((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState); ((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState);
} }