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

Bug 29858 - [TextArt] Перестает отображаться textart после применения "no fill" или "no line"

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63730 954022d7-b5bf-4e40-9824-e11837661b57
parent 00b0a86f
...@@ -6100,18 +6100,7 @@ DrawingObjectsController.prototype = ...@@ -6100,18 +6100,7 @@ DrawingObjectsController.prototype =
oSpPr.setParent(oShape); oSpPr.setParent(oShape);
var oContent = oShape.getDocContent(); var oContent = oShape.getDocContent();
var sText = oShape.getTextArtTranslate().DefaultText; var sText = oShape.getTextArtTranslate().DefaultText;
var oParagraph = oContent.Content[0]; AddToContentFromString(oContent, sText);
for(var i = 0; i < sText.length; ++i)
{
if (sText[i] != ' ')
{
oParagraph.Add(new ParaText(sText[i]));
}
else
{
oParagraph.Add(new ParaSpace());
}
}
var oTextPr = oShape.getTextArtPreviewManager().getStylesToApply()[nStyle].Copy(); var oTextPr = oShape.getTextArtPreviewManager().getStylesToApply()[nStyle].Copy();
oTextPr.FontSize = nFontSize; oTextPr.FontSize = nFontSize;
oTextPr.RFonts.Ascii = undefined; oTextPr.RFonts.Ascii = undefined;
......
...@@ -252,6 +252,10 @@ ObjectToDraw.prototype = ...@@ -252,6 +252,10 @@ ObjectToDraw.prototype =
graphics.transform3(oTransform, false); graphics.transform3(oTransform, false);
var shape_drawer = new CShapeDrawer(); var shape_drawer = new CShapeDrawer();
shape_drawer.fromShape2(this, graphics, this.geometry); shape_drawer.fromShape2(this, graphics, this.geometry);
if(graphics.IsSlideBoundsCheckerType)
{
shape_drawer.bIsNoStrokeAttack = false;
}
shape_drawer.draw(this.geometry); shape_drawer.draw(this.geometry);
graphics.RestoreGrState(); graphics.RestoreGrState();
}, },
......
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