Commit a6c474f3 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@63701 954022d7-b5bf-4e40-9824-e11837661b57
parent b23eed12
...@@ -1153,8 +1153,8 @@ CShape.prototype = ...@@ -1153,8 +1153,8 @@ CShape.prototype =
this.clipRect2 = this.checkTransformTextMatrix(this.transformText2, this.txBody.content2, oBodyPr, false); this.clipRect2 = this.checkTransformTextMatrix(this.transformText2, this.txBody.content2, oBodyPr, false);
this.invertTransformText2 = global_MatrixTransformer.Invert(this.transformText); this.invertTransformText2 = global_MatrixTransformer.Invert(this.transformText);
} }
if (oBodyPr.prstTxWarp) { //if (oBodyPr.prstTxWarp) {
var bNoTextNoShape = oBodyPr.prstTxWarp.preset !== "textNoShape"; var bNoTextNoShape = oBodyPr.prstTxWarp && oBodyPr.prstTxWarp.preset !== "textNoShape";
/*if (this.bWordShape) { /*if (this.bWordShape) {
this.transformTextWordArt = this.transformText; this.transformTextWordArt = this.transformText;
this.invertTransformTextWordArt = this.invertTransformText; this.invertTransformTextWordArt = this.invertTransformText;
...@@ -1170,7 +1170,7 @@ CShape.prototype = ...@@ -1170,7 +1170,7 @@ CShape.prototype =
this.transformTextWordArt2 = new CMatrix(); this.transformTextWordArt2 = new CMatrix();
this.checkTransformTextMatrix(this.transformTextWordArt2, this.txBody.content2, oBodyPr, bNoTextNoShape, !this.bWordShape && bNoTextNoShape); this.checkTransformTextMatrix(this.transformTextWordArt2, this.txBody.content2, oBodyPr, bNoTextNoShape, !this.bWordShape && bNoTextNoShape);
} }
} // }
if (this.checkPosTransformText) { if (this.checkPosTransformText) {
this.checkPosTransformText(); this.checkPosTransformText();
......
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