Commit 59a18996 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Переделана работа с настроками параграфа в меню интерфейса с учетом нового параграфа (баг 23929).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55872 954022d7-b5bf-4e40-9824-e11837661b57
parent 3fd5b13f
...@@ -4957,18 +4957,20 @@ function CDrawingDocument() ...@@ -4957,18 +4957,20 @@ function CDrawingDocument()
_textPr.Spacing = this.GuiLastTextProps.TextSpacing; _textPr.Spacing = this.GuiLastTextProps.TextSpacing;
_textPr.Position = this.GuiLastTextProps.Position; _textPr.Position = this.GuiLastTextProps.Position;
par.Add(new ParaTextPr(_textPr)); var parRun = new ParaRun(par); var Pos = 0;
par.Add(new ParaText("H")); parRun.Set_Pr(_textPr);
par.Add(new ParaText("e")); parRun.Add_ToContent(Pos++,new ParaText("H"), false);
par.Add(new ParaText("l")); parRun.Add_ToContent(Pos++,new ParaText("e"), false);
par.Add(new ParaText("l")); parRun.Add_ToContent(Pos++,new ParaText("l"), false);
par.Add(new ParaText("o")); parRun.Add_ToContent(Pos++,new ParaText("l"), false);
par.Add(new ParaSpace(1)); parRun.Add_ToContent(Pos++,new ParaText("o"), false);
par.Add(new ParaText("W")); parRun.Add_ToContent(Pos++,new ParaSpace(1), false);
par.Add(new ParaText("o")); parRun.Add_ToContent(Pos++, new ParaText("W"), false);
par.Add(new ParaText("r")); parRun.Add_ToContent(Pos++, new ParaText("o"), false);
par.Add(new ParaText("l")); parRun.Add_ToContent(Pos++, new ParaText("r"), false);
par.Add(new ParaText("d")); parRun.Add_ToContent(Pos++, new ParaText("l"), false);
parRun.Add_ToContent(Pos++, new ParaText("d"), false);
par.Add_ToContent(0, parRun);
par.Recalculate_Page(0); par.Recalculate_Page(0);
...@@ -4985,7 +4987,7 @@ function CDrawingDocument() ...@@ -4985,7 +4987,7 @@ function CDrawingDocument()
ctx.fillStyle = "#FFFFFF"; ctx.fillStyle = "#FFFFFF";
ctx.fillRect(0, 0, _wPx, _hPx); ctx.fillRect(0, 0, _wPx, _hPx);
var _pxBoundsW = par.Lines[0].W * g_dKoef_mm_to_pix;//(_bounds.Right - _bounds.Left) * g_dKoef_mm_to_pix; var _pxBoundsW = par.Lines[0].Ranges[0].W * g_dKoef_mm_to_pix;//(_bounds.Right - _bounds.Left) * g_dKoef_mm_to_pix;
var _pxBoundsH = (_bounds.Bottom - _bounds.Top) * g_dKoef_mm_to_pix; var _pxBoundsH = (_bounds.Bottom - _bounds.Top) * g_dKoef_mm_to_pix;
if (this.GuiLastTextProps.Position !== undefined && this.GuiLastTextProps.Position != null && this.GuiLastTextProps.Position != 0) if (this.GuiLastTextProps.Position !== undefined && this.GuiLastTextProps.Position != null && this.GuiLastTextProps.Position != 0)
......
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