Commit 43aa5859 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

неотрисовка плейсхолдеров при печати

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68448 954022d7-b5bf-4e40-9824-e11837661b57
parent 5e69d0ef
...@@ -3910,14 +3910,17 @@ CShape.prototype = ...@@ -3910,14 +3910,17 @@ CShape.prototype =
var oColorMap = this.Get_ColorMap(); var oColorMap = this.Get_ColorMap();
if(!this.bWordShape && (!this.txBody.content || this.txBody.content.Is_Empty()) && this.txBody.content2 != null && !this.txBody.checkCurrentPlaceholder() && (this.isEmptyPlaceholder ? this.isEmptyPlaceholder() : false)) if(!this.bWordShape && (!this.txBody.content || this.txBody.content.Is_Empty()) && this.txBody.content2 != null && !this.txBody.checkCurrentPlaceholder() && (this.isEmptyPlaceholder ? this.isEmptyPlaceholder() : false))
{ {
if(editor && editor.ShowParaMarks) if (graphics.IsNoDrawingEmptyPlaceholder !== true && graphics.IsNoDrawingEmptyPlaceholderText !== true)
{ {
this.txWarpStructParamarks2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap); if(editor && editor.ShowParaMarks)
} {
else this.txWarpStructParamarks2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap);
{ }
this.txWarpStruct2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap); else
} {
this.txWarpStruct2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap);
}
}
} }
else else
{ {
......
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