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

Правка с выставлением высоты для строки.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54001 954022d7-b5bf-4e40-9824-e11837661b57
parent 5e62a00d
...@@ -9951,7 +9951,7 @@ ...@@ -9951,7 +9951,7 @@
if (t.width_1px > t.cols[c].width) {continue;} if (t.width_1px > t.cols[c].width) {continue;}
c = t._addCellTextToCache(c, r, canChangeColWidth); // may change member 'this.isChanged' c = t._addCellTextToCache(c, r, canChangeColWidth); // may change member 'this.isChanged'
} }
for (h = -1, d = t.defaultRowDescender, c = 0; c < t.cols.length; ++c) { for (h = t.defaultRowHeight, d = t.defaultRowDescender, c = 0; c < t.cols.length; ++c) {
ct = t._getCellTextCache(c, r, true); ct = t._getCellTextCache(c, r, true);
if (!ct) {continue;} if (!ct) {continue;}
...@@ -9981,14 +9981,12 @@ ...@@ -9981,14 +9981,12 @@
d = Math.max(d, ct.metrics.height - ct.metrics.baseline); d = Math.max(d, ct.metrics.height - ct.metrics.baseline);
} }
} }
if (-1 === h)
h = t.defaultRowHeight;
if (Math.abs(h - t.rows[r].height) > 0.000001 && !t.rows[r].isCustomHeight) { if (Math.abs(h - t.rows[r].height) > 0.000001 && !t.rows[r].isCustomHeight) {
t.rows[r].heightReal = t.rows[r].height = Math.min(h, t.maxRowHeight);
if (!t.rows[r].isDefaultHeight) { if (!t.rows[r].isDefaultHeight) {
t.rows[r].heightReal = t.rows[r].height = Math.min(h, t.maxRowHeight);
t.model.setRowHeight(t.rows[r].height + this.height_1px, r, r); t.model.setRowHeight(t.rows[r].height + this.height_1px, r, r);
t.isChanged = true;
} }
t.isChanged = true;
} }
if (Math.abs(d - t.rows[r].descender) > 0.000001) { if (Math.abs(d - t.rows[r].descender) > 0.000001) {
t.rows[r].descender = d; t.rows[r].descender = d;
......
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