Commit cafe4823 authored by Ilya Kirillov's avatar Ilya Kirillov

Исправлен баг с работой текстовых настроек и настроек параграфа у нумерации.

parent 7c068b38
...@@ -146,9 +146,8 @@ ...@@ -146,9 +146,8 @@
*/ */
function ApiNumberingLevel(Num, Lvl) function ApiNumberingLevel(Num, Lvl)
{ {
this.Num = Num; this.Num = Num;
this.Lvl = Math.max(0, Math.min(8, Lvl)); this.Lvl = Math.max(0, Math.min(8, Lvl));
this.NumLvl = this.Num.Lvl[this.Lvl];
} }
/** /**
...@@ -2111,7 +2110,7 @@ ...@@ -2111,7 +2110,7 @@
*/ */
ApiNumberingLevel.prototype.GetTextPr = function() ApiNumberingLevel.prototype.GetTextPr = function()
{ {
return new ApiTextPr(this.NumLvl.TextPr.Copy()); return new ApiTextPr(this, this.Num.Lvl[this.Lvl].TextPr.Copy());
}; };
/** /**
* This paragraph properties are applied to any numbered paragraph that references the given numbering definition * This paragraph properties are applied to any numbered paragraph that references the given numbering definition
...@@ -2120,7 +2119,7 @@ ...@@ -2120,7 +2119,7 @@
*/ */
ApiNumberingLevel.prototype.GetParaPr = function() ApiNumberingLevel.prototype.GetParaPr = function()
{ {
return new ApiParaPr(this.NumPr.ParaPr.Copy()); return new ApiParaPr(this, this.Num.Lvl[this.Lvl].ParaPr.Copy());
}; };
/** /**
* Set one of the predefined numbering templates. * Set one of the predefined numbering templates.
...@@ -3286,6 +3285,8 @@ function TEST_BUILDER2() ...@@ -3286,6 +3285,8 @@ function TEST_BUILDER2()
var sSymbolCharCode = 'a'.charCodeAt(0) + nLvl; var sSymbolCharCode = 'a'.charCodeAt(0) + nLvl;
oNumLvl.SetTemplateType("bullet", String.fromCharCode(sSymbolCharCode)); oNumLvl.SetTemplateType("bullet", String.fromCharCode(sSymbolCharCode));
oNumLvl.SetSuff("none"); oNumLvl.SetSuff("none");
oNumLvl.GetTextPr().SetBold(true);
oNumLvl.GetParaPr().SetJc("center");
oParagraph = Api.CreateParagraph(); oParagraph = Api.CreateParagraph();
oParagraph.AddText("Template bullet lvl " + (nLvl + 1)); oParagraph.AddText("Template bullet lvl " + (nLvl + 1));
...@@ -3297,6 +3298,7 @@ function TEST_BUILDER2() ...@@ -3297,6 +3298,7 @@ function TEST_BUILDER2()
oParagraph.AddText("Template bullet lvl " + (nLvl + 1)); oParagraph.AddText("Template bullet lvl " + (nLvl + 1));
oParagraph.SetNumbering(oNumLvl); oParagraph.SetNumbering(oNumLvl);
oParagraph.SetContextualSpacing(true); oParagraph.SetContextualSpacing(true);
oDocument.Push(oParagraph); oDocument.Push(oParagraph);
} }
......
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