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

TextOutline

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62599 954022d7-b5bf-4e40-9824-e11837661b57
parent bf9df7da
...@@ -642,7 +642,7 @@ CTextDrawer.prototype = ...@@ -642,7 +642,7 @@ CTextDrawer.prototype =
{ {
if(oLastCommand.m_aContent.length === 0) if(oLastCommand.m_aContent.length === 0)
{ {
oLastCommand.m_aContent.push(new ObjectToDraw(this.m_oTextPr.Unifill, this.m_oTextPr.Outline, this.Width, this.Height, new Geometry(), this.m_oTransform, this)); oLastCommand.m_aContent.push(new ObjectToDraw(this.m_oTextPr.Unifill, this.m_oTextPr.TextOutline, this.Width, this.Height, new Geometry(), this.m_oTransform, this));
} }
oLastObjectToDraw = oLastCommand.m_aContent[oLastCommand.m_aContent.length - 1]; oLastObjectToDraw = oLastCommand.m_aContent[oLastCommand.m_aContent.length - 1];
...@@ -650,11 +650,11 @@ CTextDrawer.prototype = ...@@ -650,11 +650,11 @@ CTextDrawer.prototype =
{ {
if(oLastObjectToDraw.geometry.pathLst.length === 0 || (oLastObjectToDraw.geometry.pathLst.length === 1 && oLastObjectToDraw.geometry.pathLst[0].ArrPathCommandInfo.length === 0)) if(oLastObjectToDraw.geometry.pathLst.length === 0 || (oLastObjectToDraw.geometry.pathLst.length === 1 && oLastObjectToDraw.geometry.pathLst[0].ArrPathCommandInfo.length === 0))
{ {
oLastObjectToDraw.resetBrushPen(this.m_oTextPr.Unifill, this.m_oTextPr.Outline) oLastObjectToDraw.resetBrushPen(this.m_oTextPr.Unifill, this.m_oTextPr.TextOutline)
} }
else else
{ {
oLastCommand.m_aContent.push(new ObjectToDraw(this.m_oTextPr.Unifill, this.m_oTextPr.Outline, this.Width, this.Height, new Geometry(), this.m_oTransform, this)); oLastCommand.m_aContent.push(new ObjectToDraw(this.m_oTextPr.Unifill, this.m_oTextPr.TextOutline, this.Width, this.Height, new Geometry(), this.m_oTransform, this));
oLastObjectToDraw = oLastCommand.m_aContent[oLastCommand.m_aContent.length - 1]; oLastObjectToDraw = oLastCommand.m_aContent[oLastCommand.m_aContent.length - 1];
} }
} }
......
...@@ -6053,7 +6053,7 @@ function BinaryPPTYLoader() ...@@ -6053,7 +6053,7 @@ function BinaryPPTYLoader()
{ {
case 0: case 0:
{ {
s.SkipRecord(); rPr.TextOutline = this.ReadLn();
break; break;
} }
case 1: case 1:
......
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