Commit 6e1f4d94 authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 35074

parent fe4aedf1
...@@ -1530,7 +1530,7 @@ CShape.prototype.recalculateTransformText = function () { ...@@ -1530,7 +1530,7 @@ CShape.prototype.recalculateTransformText = function () {
if (this.txBody && this.txBody.content2) { if (this.txBody && this.txBody.content2) {
this.transformText2 = new CMatrix(); this.transformText2 = new CMatrix();
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.transformText2);
} }
//if (oBodyPr.prstTxWarp) { //if (oBodyPr.prstTxWarp) {
var bNoTextNoShape = oBodyPr.prstTxWarp && oBodyPr.prstTxWarp.preset !== "textNoShape"; var bNoTextNoShape = oBodyPr.prstTxWarp && oBodyPr.prstTxWarp.preset !== "textNoShape";
...@@ -4221,7 +4221,7 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex) ...@@ -4221,7 +4221,7 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex)
if(!(oController && (AscFormat.getTargetTextObject(oController) === this))) if(!(oController && (AscFormat.getTargetTextObject(oController) === this)))
this.clipTextRect(graphics); this.clipTextRect(graphics);
} }
graphics.transform3(this.transformText, true); graphics.transform3(transform_text, true);
if (graphics.CheckUseFonts2 !== undefined) if (graphics.CheckUseFonts2 !== undefined)
graphics.CheckUseFonts2(transform_text); graphics.CheckUseFonts2(transform_text);
......
...@@ -405,7 +405,9 @@ CTextBody.prototype = ...@@ -405,7 +405,9 @@ CTextBody.prototype =
this.parent.recalcInfo.recalcTransformText = true; this.parent.recalcInfo.recalcTransformText = true;
this.parent.recalcInfo.recalculateContent = true; this.parent.recalcInfo.recalculateContent = true;
this.parent.recalcInfo.recalculateContent2 = true;
this.parent.recalcInfo.recalculateTransformText = true; this.parent.recalcInfo.recalculateTransformText = true;
if(this.parent.addToRecalculate) if(this.parent.addToRecalculate)
{ {
this.parent.addToRecalculate(); this.parent.addToRecalculate();
......
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