Commit 20ba3a7e authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix #32269

parent d011f67e
...@@ -2519,11 +2519,11 @@ ...@@ -2519,11 +2519,11 @@
/** Рисует фон ячеек в строке */ /** Рисует фон ячеек в строке */
WorksheetView.prototype._drawRowBG = function ( drawingCtx, row, colStart, colEnd, offsetX, offsetY, oMergedCell ) { WorksheetView.prototype._drawRowBG = function ( drawingCtx, row, colStart, colEnd, offsetX, offsetY, oMergedCell ) {
var mergedCells = [];
if ( this.rows[row].height < this.height_1px && null === oMergedCell ) { if ( this.rows[row].height < this.height_1px && null === oMergedCell ) {
return {}; return mergedCells;
} }
var mergedCells = [];
var ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx; var ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx;
for ( var col = colStart; col <= colEnd; ++col ) { for ( var col = colStart; col <= colEnd; ++col ) {
if ( this.cols[col].width < this.width_1px && null === oMergedCell ) { if ( this.cols[col].width < this.width_1px && null === oMergedCell ) {
...@@ -2599,11 +2599,12 @@ ...@@ -2599,11 +2599,12 @@
/** Рисует текст ячеек в строке */ /** Рисует текст ячеек в строке */
WorksheetView.prototype._drawRowText = function ( drawingCtx, row, colStart, colEnd, offsetX, offsetY ) { WorksheetView.prototype._drawRowText = function ( drawingCtx, row, colStart, colEnd, offsetX, offsetY ) {
var mergedCells = [];
if ( this.rows[row].height < this.height_1px ) { if ( this.rows[row].height < this.height_1px ) {
return {}; return mergedCells;
} }
var dependentCells = {}, mergedCells = [], i, mc, col; var dependentCells = {}, i, mc, col;
// draw cells' text // draw cells' text
for ( col = colStart; col <= colEnd; ++col ) { for ( col = colStart; col <= colEnd; ++col ) {
if ( this.cols[col].width < this.width_1px ) { if ( this.cols[col].width < this.width_1px ) {
......
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