Commit 31d8417c authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

добавил проверки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51776 954022d7-b5bf-4e40-9824-e11837661b57
parent 3252d5a6
...@@ -716,10 +716,10 @@ ...@@ -716,10 +716,10 @@
var idCellNext = new CellAddress(mainAdjacentCells.r2, col, 0); var idCellNext = new CellAddress(mainAdjacentCells.r2, col, 0);
curCell = ws.model.getCell( idCell ).getCells(); curCell = ws.model.getCell( idCell ).getCells();
result[n] = { result[n] = {
x: ws.cols[col].left, x: ws.cols[col] ? ws.cols[col].left : null,
y: ws.rows[mainAdjacentCells.r1].top, y: ws.rows[mainAdjacentCells.r1] ? ws.rows[mainAdjacentCells.r1].top : null,
width: ws.cols[col].width, width: ws.cols[col] ? ws.cols[col].width : null,
height: ws.rows[mainAdjacentCells.r1].height, height: ws.rows[mainAdjacentCells.r1] ? ws.rows[mainAdjacentCells.r1].height : null,
id: idCell.getID(), id: idCell.getID(),
idNext: idCellNext.getID() idNext: idCellNext.getID()
}; };
...@@ -731,10 +731,10 @@ ...@@ -731,10 +731,10 @@
var idCell = new CellAddress(activeCells.r1, activeCells.c1, 0); var idCell = new CellAddress(activeCells.r1, activeCells.c1, 0);
var idCellNext = new CellAddress(activeCells.r2, activeCells.c2, 0); var idCellNext = new CellAddress(activeCells.r2, activeCells.c2, 0);
result[0] = { result[0] = {
x: ws.cols[activeCells.c1].left, x: ws.cols[activeCells.c1] ? ws.cols[activeCells.c1].left : null,
y: ws.rows[activeCells.r1].top, y: ws.rows[activeCells.r1] ? ws.rows[activeCells.r1].top : null,
width: ws.cols[activeCells.c1].width, width: ws.cols[activeCells.c1] ? ws.cols[activeCells.c1].width : null,
height: ws.rows[activeCells.c1].height, height: ws.rows[activeCells.c1] ? ws.rows[activeCells.c1].height : null,
id: idCell.getID(), id: idCell.getID(),
idNext: idCellNext.getID() idNext: idCellNext.getID()
} }
...@@ -746,10 +746,10 @@ ...@@ -746,10 +746,10 @@
var idCell = new CellAddress(activeCells.r1, activeCells.c1, 0); var idCell = new CellAddress(activeCells.r1, activeCells.c1, 0);
var idCellNext = new CellAddress(activeCells.r2 + 1, activeCells.c2, 0); var idCellNext = new CellAddress(activeCells.r2 + 1, activeCells.c2, 0);
result[0] = { result[0] = {
x: ws.cols[activeCells.c1].left, x: ws.cols[activeCells.c1] ? ws.cols[activeCells.c1].left : null,
y: ws.rows[activeCells.r1].top, y: ws.rows[activeCells.r1] ? ws.rows[activeCells.r1].top : null,
width: ws.cols[activeCells.c1].width, width: ws.cols[activeCells.c1] ? ws.cols[activeCells.c1].width : null,
height: ws.rows[activeCells.c1].height, height: ws.rows[activeCells.c1] ? ws.rows[activeCells.c1].height : null,
id: idCell.getID(), id: idCell.getID(),
idNext: idCellNext.getID() idNext: idCellNext.getID()
} }
...@@ -779,10 +779,10 @@ ...@@ -779,10 +779,10 @@
var idCell = new CellAddress(activeCells.r1, col, 0); var idCell = new CellAddress(activeCells.r1, col, 0);
var idCellNext = new CellAddress(activeCells.r2, col, 0); var idCellNext = new CellAddress(activeCells.r2, col, 0);
result[n] = { result[n] = {
x: ws.cols[col].left, x: ws.cols[col] ? ws.cols[col].left : null,
y: ws.rows[activeCells.r1].top, y: ws.rows[activeCells.r1] ? ws.rows[activeCells.r1].top : null,
width: ws.cols[col].width, width: ws.cols[col] ? ws.cols[col].width : null,
height: ws.rows[activeCells.r1].height, height: ws.rows[activeCells.r1] ? ws.rows[activeCells.r1].height : null,
id: idCell.getID(), id: idCell.getID(),
idNext: idCellNext.getID() idNext: idCellNext.getID()
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment