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

баг с клипом

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63561 954022d7-b5bf-4e40-9824-e11837661b57
parent 7e7abda2
......@@ -3537,7 +3537,7 @@ CShape.prototype =
else
{
var bNeedRestoreState = false;
if(this.bWordShape && this.clipRect)
if(this.bWordShape && this.clipRect && (!this.bodyPr.prstTxWarp || this.bodyPr.prstTxWarp.preset === "textNoShape"))
{
bNeedRestoreState = true;
var clip_rect = this.clipRect;
......@@ -3801,6 +3801,23 @@ CShape.prototype =
return oRet;
},
applyTextArtForm: function(sPreset)
{
var oBodyPr = this.getBodyPr().createDuplicate();
oBodyPr.prstTxWarp = ExecuteNoHistory(function(){return CreatePrstTxWarpGeometry(sPreset)}, this, []);
if(this.bWordShape)
{
this.setBodyPr(oBodyPr);
}
else
{
if(this.txBody)
{
this.txBody.setBodyPr(oBodyPr);
}
}
},
getParagraphParaPr: function () {
if (this.txBody && this.txBody.content) {
var _result;
......
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