Commit cc1e4ef4 authored by GoshaZotov's avatar GoshaZotov

+ merge from develop

parent fa1beb31
......@@ -9408,7 +9408,7 @@
}
//apply props by cell
var formulaProps = {firstRange: firstRange, arrFormula: arrFormula, tablesMap: tablesMap, newVal: newVal, isOneMerge: isOneMerge};
var formulaProps = {firstRange: firstRange, arrFormula: arrFormula, tablesMap: tablesMap, newVal: newVal, isOneMerge: isOneMerge, val: val};
t._setPastedDataByCurrentRange(range, pastedRangeProps, formulaProps, specialPasteProps);
};
......@@ -9460,7 +9460,7 @@
{
var t = this;
var firstRange, arrFormula, tablesMap, newVal, isOneMerge;
var firstRange, arrFormula, tablesMap, newVal, isOneMerge, val;
if(formulaProps)
{
//TODO firstRange возможно стоит убрать(добавлено было для правки бага 27745)
......@@ -9468,7 +9468,8 @@
arrFormula = formulaProps.arrFormula;
tablesMap = formulaProps.tablesMap;
newVal = formulaProps.newVal;
isOneMerge = formulaProps.isOneMerge;
isOneMerge = formulaProps.isOneMerge;
val = formulaProps.val;
}
//set formula - for paste from binary
......@@ -9505,7 +9506,7 @@
//formula
if (newVal.getFormula() && !isOneMerge) {
var offset = range.getCells()[numFormula].getOffset2(value2[numFormula].sId);
var assemb, _p_ = new AscCommonExcel.parserFormula(value2[numFormula].sFormula, null, range.worksheet);
var assemb, _p_ = new AscCommonExcel.parserFormula(value2[numFormula].sFormula, null, val);
if (_p_.parse()) {
if(null !== tablesMap)
......
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