Commit e9bff7e8 authored by Sergey Luzyanin's avatar Sergey Luzyanin Committed by Alexander.Trofimov

Мержим в начале с дефолтовыми свойствами

parent fef20266
...@@ -502,6 +502,9 @@ CShape.prototype.recalculateShapeStyleForParagraph = function() ...@@ -502,6 +502,9 @@ CShape.prototype.recalculateShapeStyleForParagraph = function()
this.textStyleForParagraph = {TextPr: styles.Default.TextPr.Copy(), ParaPr: styles.Default.ParaPr.Copy()}; this.textStyleForParagraph = {TextPr: styles.Default.TextPr.Copy(), ParaPr: styles.Default.ParaPr.Copy()};
var DefId = styles.Default.Paragraph; var DefId = styles.Default.Paragraph;
var DefaultStyle = styles.Style[DefId]; var DefaultStyle = styles.Style[DefId];
this.textStyleForParagraph.ParaPr.Merge( g_oDocumentDefaultParaPr );
this.textStyleForParagraph.TextPr.Merge( g_oDocumentDefaultTextPr );
if(DefaultStyle) if(DefaultStyle)
{ {
this.textStyleForParagraph.ParaPr.Merge( DefaultStyle.ParaPr ); this.textStyleForParagraph.ParaPr.Merge( DefaultStyle.ParaPr );
......
...@@ -4184,6 +4184,7 @@ function TEST_BUILDER() ...@@ -4184,6 +4184,7 @@ function TEST_BUILDER()
var oRun2 = oParagraph2.AddText("HAYDEN MANAGEMENT"); var oRun2 = oParagraph2.AddText("HAYDEN MANAGEMENT");
oRun2.SetFontSize(64); oRun2.SetFontSize(64);
oRun2.SetColor(255, 255, 255); oRun2.SetColor(255, 255, 255);
oRun2.SetFontFamily("Calibri Light");
oParagraph2.SetBottomBorder("single", 1, 0, 255, 104, 0); oParagraph2.SetBottomBorder("single", 1, 0, 255, 104, 0);
oDocContent.Push(oParagraph2); oDocContent.Push(oParagraph2);
oParagraph2 = Api.CreateParagraph(); oParagraph2 = Api.CreateParagraph();
......
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