Commit 326d50b3 authored by GoshaZotov's avatar GoshaZotov

Merge branch 'release/v4.1.0' into develop

parents 8784300a eca32e0c
......@@ -2521,7 +2521,7 @@
//настройки параграфа
paragraph.elem.CompiledPr.NeedRecalc = true;
var paraPr = paragraph.elem.Get_CompiledPr();
var paragraphFontFamily = paraPr.TextPr.FontFamily.Name;
//var paragraphFontFamily = paraPr.TextPr.FontFamily.Name;
//горизонтальное выравнивание
var horisonalAlign = this._getAlignHorisontal(paraPr);
......@@ -2540,7 +2540,7 @@
//Numbering
var LvlPr = null;
var Lvl = null;
var oNumPr = paragraph.elem.Numbering_Get();
var oNumPr = paragraph.elem.Numbering_Get ? paragraph.elem.Numbering_Get() : null;
var numberingText = null;
var formatText;
if(oNumPr != null)
......
......@@ -9646,7 +9646,7 @@
r1: range.first.row, r2: range.last.row, c1: range.first.col, c2: range.last.col
};
n++;
if ( currentObj[0] == undefined )
if ( contentCurrentObj[0] == undefined )
{
range.setValue( '' );
}
......
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