Commit a39c5429 authored by GoshaZotov's avatar GoshaZotov

(this.TotalsRowCount > 0) -> (this.TotalsRowCount)

parent 9f4b78c0
...@@ -4704,7 +4704,7 @@ TablePart.prototype.changeRef = function(col, row, bIsFirst) { ...@@ -4704,7 +4704,7 @@ TablePart.prototype.changeRef = function(col, row, bIsFirst) {
this.Ref = ref; this.Ref = ref;
//event //event
var endRow = this.TotalsRowCount && this.TotalsRowCount >= 1 ? this.Ref.r2 - 1 : this.Ref.r2; var endRow = this.TotalsRowCount ? this.Ref.r2 - 1 : this.Ref.r2;
var refNamedRanges = Asc.Range(this.Ref.c1, this.Ref.r1, this.Ref.c2, endRow); var refNamedRanges = Asc.Range(this.Ref.c1, this.Ref.r1, this.Ref.c2, endRow);
this.handlers.trigger("changeRefTablePart", this.DisplayName, refNamedRanges); this.handlers.trigger("changeRefTablePart", this.DisplayName, refNamedRanges);
...@@ -4867,7 +4867,7 @@ TablePart.prototype.getTableRangeForFormula = function(objectParam) ...@@ -4867,7 +4867,7 @@ TablePart.prototype.getTableRangeForFormula = function(objectParam)
} }
case FormulaTablePartInfo.totals: case FormulaTablePartInfo.totals:
{ {
if(this.TotalsRowCount && this.TotalsRowCount >= 1) if(this.TotalsRowCount)
{ {
res = new Asc.Range(this.Ref.c1, this.Ref.r2, this.Ref.c2, this.Ref.r2); res = new Asc.Range(this.Ref.c1, this.Ref.r2, this.Ref.c2, this.Ref.r2);
} }
...@@ -4892,7 +4892,7 @@ TablePart.prototype.getTableRangeForFormula = function(objectParam) ...@@ -4892,7 +4892,7 @@ TablePart.prototype.getTableRangeForFormula = function(objectParam)
endCol = startCol; endCol = startCol;
var startRow = this.HeaderRowCount === null ? this.Ref.r1 + 1 : this.Ref.r1; var startRow = this.HeaderRowCount === null ? this.Ref.r1 + 1 : this.Ref.r1;
var endRow = this.TotalsRowCount > 0 ? this.Ref.r2 - 1 : this.Ref.r2; var endRow = this.TotalsRowCount ? this.Ref.r2 - 1 : this.Ref.r2;
res = new Asc.Range(this.Ref.c1 + startCol, startRow, this.Ref.c1 + endCol, endRow); res = new Asc.Range(this.Ref.c1 + startCol, startRow, this.Ref.c1 + endCol, endRow);
break; break;
...@@ -4993,7 +4993,7 @@ TablePart.prototype.changeDisplayName = function(newName) ...@@ -4993,7 +4993,7 @@ TablePart.prototype.changeDisplayName = function(newName)
TablePart.prototype.getRangeWithoutHeaderFooter = function() TablePart.prototype.getRangeWithoutHeaderFooter = function()
{ {
var startRow = this.HeaderRowCount === null ? this.Ref.r1 + 1 : this.Ref.r1; var startRow = this.HeaderRowCount === null ? this.Ref.r1 + 1 : this.Ref.r1;
var endRow = this.TotalsRowCount > 0 ? this.Ref.r2 - 1 : this.Ref.r2; var endRow = this.TotalsRowCount ? this.Ref.r2 - 1 : this.Ref.r2;
return Asc.Range(this.Ref.c1, startRow, this.Ref.c2, endRow); return Asc.Range(this.Ref.c1, startRow, this.Ref.c2, endRow);
}; };
......
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