Commit ed5bd13b authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Правка проблемы с удалением скрытых строк (не перетиралась информация о том,...

Правка проблемы с удалением скрытых строк (не перетиралась информация о том, что строки скрыты). Часть бага http://bugzserver/show_bug.cgi?id=20397

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49736 954022d7-b5bf-4e40-9824-e11837661b57
parent 058ad986
...@@ -2571,7 +2571,7 @@ Woorksheet.prototype.getRowsCount=function(){ ...@@ -2571,7 +2571,7 @@ Woorksheet.prototype.getRowsCount=function(){
Woorksheet.prototype.removeRows=function(start, stop){ Woorksheet.prototype.removeRows=function(start, stop){
var oRange = this.getRange(new CellAddress(start, 0, 0), new CellAddress(stop, gc_nMaxCol0, 0)); var oRange = this.getRange(new CellAddress(start, 0, 0), new CellAddress(stop, gc_nMaxCol0, 0));
oRange.deleteCellsShiftUp(); oRange.deleteCellsShiftUp();
} };
Woorksheet.prototype._removeRows=function(start, stop){ Woorksheet.prototype._removeRows=function(start, stop){
lockDraw(this.workbook); lockDraw(this.workbook);
History.Create_NewPoint(); History.Create_NewPoint();
...@@ -2626,7 +2626,7 @@ Woorksheet.prototype._removeRows=function(start, stop){ ...@@ -2626,7 +2626,7 @@ Woorksheet.prototype._removeRows=function(start, stop){
Woorksheet.prototype.insertRowsBefore=function(index, count){ Woorksheet.prototype.insertRowsBefore=function(index, count){
var oRange = this.getRange(new CellAddress(index, 0, 0), new CellAddress(index + count - 1, gc_nMaxCol0, 0)); var oRange = this.getRange(new CellAddress(index, 0, 0), new CellAddress(index + count - 1, gc_nMaxCol0, 0));
oRange.addCellsShiftBottom(); oRange.addCellsShiftBottom();
} };
Woorksheet.prototype._insertRowsBefore=function(index, count){ Woorksheet.prototype._insertRowsBefore=function(index, count){
lockDraw(this.workbook); lockDraw(this.workbook);
var oActualRange = {r1: index, c1: 0, r2: index + count - 1, c2: gc_nMaxCol0}; var oActualRange = {r1: index, c1: 0, r2: index + count - 1, c2: gc_nMaxCol0};
......
...@@ -2271,11 +2271,10 @@ Row.prototype = ...@@ -2271,11 +2271,10 @@ Row.prototype =
{ {
if(null != otherRow.xfs) if(null != otherRow.xfs)
this.xfs = otherRow.xfs.clone(); this.xfs = otherRow.xfs.clone();
if(null != otherRow.h) else
this.xfs = null;
this.h = otherRow.h; this.h = otherRow.h;
if(null != otherRow.CustomHeight)
this.CustomHeight = otherRow.CustomHeight; this.CustomHeight = otherRow.CustomHeight;
if(null != otherRow.hd)
this.hd = otherRow.hd; this.hd = otherRow.hd;
}, },
getMerged : function() getMerged : function()
......
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