Commit 681fc30d authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

delete unused variable pad

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57983 954022d7-b5bf-4e40-9824-e11837661b57
parent 79e651a7
...@@ -1165,7 +1165,7 @@ ...@@ -1165,7 +1165,7 @@
*/ */
WorksheetView.prototype._modelColWidthToColWidth = function (mcw) { WorksheetView.prototype._modelColWidthToColWidth = function (mcw) {
var px = asc_floor(((256 * mcw + asc_floor(128 / this.maxDigitWidth)) / 256) * this.maxDigitWidth); var px = asc_floor(((256 * mcw + asc_floor(128 / this.maxDigitWidth)) / 256) * this.maxDigitWidth);
return px * asc_getcvt( 0/*px*/, 1/*pt*/, 96 ); return px * asc_getcvt(0/*px*/, 1/*pt*/, 96);
}; };
/** /**
...@@ -1174,8 +1174,8 @@ ...@@ -1174,8 +1174,8 @@
* @returns {Number} Количество символов * @returns {Number} Количество символов
*/ */
WorksheetView.prototype._colWidthToCharCount = function (w) { WorksheetView.prototype._colWidthToCharCount = function (w) {
var px = w * asc_getcvt( 1/*pt*/, 0/*px*/, 96 ); var px = w * asc_getcvt(1/*pt*/, 0/*px*/, 96);
return px <= this.settings.cells.paddingPlusBorder ? 0 : asc_floor( (px - this.settings.cells.paddingPlusBorder) / this.maxDigitWidth * 100 + 0.5 ) / 100; return px <= this.settings.cells.paddingPlusBorder ? 0 : asc_floor((px - this.settings.cells.paddingPlusBorder) / this.maxDigitWidth * 100 + 0.5) / 100;
}; };
/** /**
...@@ -9273,7 +9273,7 @@ ...@@ -9273,7 +9273,7 @@
var range; var range;
var fullRecalc = undefined; var fullRecalc = undefined;
var pad, cw; var cw;
var isUpdateCols = false, isUpdateRows = false; var isUpdateCols = false, isUpdateRows = false;
var cleanCacheCols = false, cleanCacheRows = false; var cleanCacheCols = false, cleanCacheRows = false;
var _updateRangeIns, _updateRangeDel, bUndoRedo; var _updateRangeIns, _updateRangeDel, bUndoRedo;
...@@ -9310,7 +9310,6 @@ ...@@ -9310,7 +9310,6 @@
switch (prop) { switch (prop) {
case "colWidth": case "colWidth":
functionModelAction = function () { functionModelAction = function () {
pad = t.width_padding * 2 + t.width_1px;
cw = t._charCountToModelColWidth(val); cw = t._charCountToModelColWidth(val);
t.model.setColWidth(cw, checkRange.c1, checkRange.c2); t.model.setColWidth(cw, checkRange.c1, checkRange.c2);
isUpdateCols = true; isUpdateCols = true;
......
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