Commit a85f07e4 authored by konovalovsergey's avatar konovalovsergey

_foreachNoEmpty;_promoteFromTo

parent 209bc7b0
...@@ -7067,7 +7067,9 @@ ...@@ -7067,7 +7067,9 @@
oRes = actionRow(tempRow, excludedCount); oRes = actionRow(tempRow, excludedCount);
tempRow.saveContent(true); tempRow.saveContent(true);
if (null != oRes) { if (null != oRes) {
if (actionCell) {
wb.loadCells.pop(); wb.loadCells.pop();
}
return oRes; return oRes;
} }
} else if (bExcludeHiddenRows && allRowHidden) { } else if (bExcludeHiddenRows && allRowHidden) {
...@@ -7099,7 +7101,9 @@ ...@@ -7099,7 +7101,9 @@
oRes = actionCell(targetCell, i, nCol, oBBox.r1, oBBox.c1, excludedCount); oRes = actionCell(targetCell, i, nCol, oBBox.r1, oBBox.c1, excludedCount);
} }
if (null != oRes) { if (null != oRes) {
if (actionCell) {
wb.loadCells.pop(); wb.loadCells.pop();
}
return oRes; return oRes;
} }
} else { } else {
...@@ -7133,8 +7137,8 @@ ...@@ -7133,8 +7137,8 @@
return this._foreachNoEmpty(actionCell); return this._foreachNoEmpty(actionCell);
} }
}; };
Range.prototype._foreachRowNoEmpty = function(actionRow, actionCell) { Range.prototype._foreachRowNoEmpty = function(actionRow, actionCell, excludeHiddenRows) {
return this._foreachNoEmpty(actionCell, actionRow); return this._foreachNoEmpty(actionCell, actionRow, excludeHiddenRows);
}; };
Range.prototype._foreachCol = function(actionCol, actionCell){ Range.prototype._foreachCol = function(actionCol, actionCell){
var oBBox = this.bbox; var oBBox = this.bbox;
...@@ -7276,12 +7280,6 @@ ...@@ -7276,12 +7280,6 @@
Range.prototype.getName=function(){ Range.prototype.getName=function(){
return this.bbox.getName(); return this.bbox.getName();
}; };
Range.prototype.getLeftTopCell = function(fAction) {
return this.worksheet._getCell(this.bbox.r1, this.bbox.c1, fAction);
};
Range.prototype.getLeftTopCellNoEmpty = function(fAction) {
return this.worksheet._getCellNoEmpty(this.bbox.r1, this.bbox.c1, fAction);
};
Range.prototype.setValue=function(val,callback, isCopyPaste){ Range.prototype.setValue=function(val,callback, isCopyPaste){
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
...@@ -10050,11 +10048,7 @@ ...@@ -10050,11 +10048,7 @@
{ {
//копируем полностью //копируем полностью
if(!oFromCell.formulaParsed){ if(!oFromCell.formulaParsed){
var DataOld = oCopyCell.getValueData();
oCopyCell.setValueData(oFromCell.getValueData()); oCopyCell.setValueData(oFromCell.getValueData());
var DataNew = oCopyCell.getValueData();
if(false == DataOld.isEqual(DataNew))
History.Add(AscCommonExcel.g_oUndoRedoCell, AscCH.historyitem_Cell_ChangeValue, wsTo.getId(), new Asc.Range(oCopyCell.nCol, oCopyCell.nRow, oCopyCell.nCol, oCopyCell.nRow), new UndoRedoData_CellSimpleData(oCopyCell.nRow, oCopyCell.nCol, DataOld, DataNew));
//todo //todo
// if(oCopyCell.isEmptyTextString()) // if(oCopyCell.isEmptyTextString())
// wsTo._getHyperlink().remove({r1: oCopyCell.nRow, c1: oCopyCell.nCol, r2: oCopyCell.nRow, c2: oCopyCell.nCol}); // wsTo._getHyperlink().remove({r1: oCopyCell.nRow, c1: oCopyCell.nCol, r2: oCopyCell.nRow, c2: oCopyCell.nCol});
......
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