Commit 97d9554b authored by konovalovsergey's avatar konovalovsergey

add g_nRowFlag_СalcHeight

parent ac60f77c
...@@ -4531,6 +4531,7 @@ Woorksheet.prototype.setRowHeight=function(height, start, stop, isCustom){ ...@@ -4531,6 +4531,7 @@ Woorksheet.prototype.setRowHeight=function(height, start, stop, isCustom){
if (isCustom) { if (isCustom) {
row.flags |= AscCommonExcel.g_nRowFlag_CustomHeight; row.flags |= AscCommonExcel.g_nRowFlag_CustomHeight;
} }
row.flags |= AscCommonExcel.g_nRowFlag_СalcHeight;
row.flags &= ~AscCommonExcel.g_nRowFlag_hd; row.flags &= ~AscCommonExcel.g_nRowFlag_hd;
var oNewProps = row.getHeightProp(); var oNewProps = row.getHeightProp();
if(false === oOldProps.isEqual(oNewProps)) if(false === oOldProps.isEqual(oNewProps))
...@@ -4622,6 +4623,7 @@ Woorksheet.prototype.setRowBestFit=function(bBestFit, height, start, stop){ ...@@ -4622,6 +4623,7 @@ Woorksheet.prototype.setRowBestFit=function(bBestFit, height, start, stop){
row.flags &= ~AscCommonExcel.g_nRowFlag_CustomHeight; row.flags &= ~AscCommonExcel.g_nRowFlag_CustomHeight;
else else
row.flags |= AscCommonExcel.g_nRowFlag_CustomHeight; row.flags |= AscCommonExcel.g_nRowFlag_CustomHeight;
row.flags |= AscCommonExcel.g_nRowFlag_СalcHeight;
row.h = height; row.h = height;
var oNewProps = row.getHeightProp(); var oNewProps = row.getHeightProp();
if(false == oOldProps.isEqual(oNewProps)) if(false == oOldProps.isEqual(oNewProps))
......
...@@ -2687,6 +2687,7 @@ Col.prototype = ...@@ -2687,6 +2687,7 @@ Col.prototype =
var g_nRowFlag_empty = 0; var g_nRowFlag_empty = 0;
var g_nRowFlag_hd = 1; var g_nRowFlag_hd = 1;
var g_nRowFlag_CustomHeight = 2; var g_nRowFlag_CustomHeight = 2;
var g_nRowFlag_СalcHeight = 4;
/** /**
* @constructor * @constructor
*/ */
...@@ -7689,6 +7690,7 @@ function getCurrencyFormat(opt_cultureInfo, opt_fraction, opt_currency, opt_curr ...@@ -7689,6 +7690,7 @@ function getCurrencyFormat(opt_cultureInfo, opt_fraction, opt_currency, opt_curr
window['AscCommonExcel'].g_nRowFlag_empty = g_nRowFlag_empty; window['AscCommonExcel'].g_nRowFlag_empty = g_nRowFlag_empty;
window['AscCommonExcel'].g_nRowFlag_hd = g_nRowFlag_hd; window['AscCommonExcel'].g_nRowFlag_hd = g_nRowFlag_hd;
window['AscCommonExcel'].g_nRowFlag_CustomHeight = g_nRowFlag_CustomHeight; window['AscCommonExcel'].g_nRowFlag_CustomHeight = g_nRowFlag_CustomHeight;
window['AscCommonExcel'].g_nRowFlag_СalcHeight = g_nRowFlag_СalcHeight;
window['AscCommonExcel'].Row = Row; window['AscCommonExcel'].Row = Row;
window['AscCommonExcel'].CCellValueMultiText = CCellValueMultiText; window['AscCommonExcel'].CCellValueMultiText = CCellValueMultiText;
window['AscCommonExcel'].CCellValue = CCellValue; window['AscCommonExcel'].CCellValue = CCellValue;
......
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