Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 07:34:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Part of fix for nested tables bug 53733. r=brade, a=sfraser

Browse Source
This commit is contained in:
cmanske%netscape.com 2000-09-27 22:23:03 +00:00
parent 10c8273bb8
commit 13ec38e669
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/base/nsTableEditor.cpp
View File

@ -2104,13 +2104,17 @@ nsHTMLEditor::JoinTableCells(PRBool aMergeNonContiguousContents)
// 2nd pass: Do the joining and merging
for (rowIndex = 0; rowIndex < rowCount; rowIndex++)
{
for (colIndex = 0; colIndex < colCount; colIndex+= actualColSpan2)
for (colIndex = 0; colIndex < colCount; colIndex+=actualColSpan2)
{
res = GetCellDataAt(table, rowIndex, colIndex, *getter_AddRefs(cell2),
startRowIndex2, startColIndex2, rowSpan2, colSpan2,
actualRowSpan2, actualColSpan2, isSelected2);
if (NS_FAILED(res)) return res;
// If this is 0, we are past last cell in row, so exit the loop
if (actualColSpan2 == 0)
break;
// Merge only selected cells (skip cell we're merging into, of course)
if (isSelected2 && cell2 != firstCell)
{

8
editor/libeditor/html/nsTableEditor.cpp
View File

@ -2104,13 +2104,17 @@ nsHTMLEditor::JoinTableCells(PRBool aMergeNonContiguousContents)
// 2nd pass: Do the joining and merging
for (rowIndex = 0; rowIndex < rowCount; rowIndex++)
{
for (colIndex = 0; colIndex < colCount; colIndex+= actualColSpan2)
for (colIndex = 0; colIndex < colCount; colIndex+=actualColSpan2)
{
res = GetCellDataAt(table, rowIndex, colIndex, *getter_AddRefs(cell2),
startRowIndex2, startColIndex2, rowSpan2, colSpan2,
actualRowSpan2, actualColSpan2, isSelected2);
if (NS_FAILED(res)) return res;
// If this is 0, we are past last cell in row, so exit the loop
if (actualColSpan2 == 0)
break;
// Merge only selected cells (skip cell we're merging into, of course)
if (isSelected2 && cell2 != firstCell)
{