Commit 77cee633 authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 33375

parent 8df5bb2b
...@@ -9344,8 +9344,10 @@ CBarSeries.prototype = ...@@ -9344,8 +9344,10 @@ CBarSeries.prototype =
this.setPictureOptions(o.pictureOptions); this.setPictureOptions(o.pictureOptions);
if(o.shape) if(o.shape)
this.setShape(o.shape); this.setShape(o.shape);
if(o.spPr) if(o.spPr){
this.setSpPr(o.spPr); this.setSpPr(o.spPr);
}
if(o.trendline) if(o.trendline)
this.setTrendline(o.trendline); this.setTrendline(o.trendline);
if(o.tx) if(o.tx)
...@@ -23095,7 +23097,8 @@ function CTitle() ...@@ -23095,7 +23097,8 @@ function CTitle()
recalculateBrush: true, recalculateBrush: true,
recalculatePen: true, recalculatePen: true,
recalcStyle: true, recalcStyle: true,
recalculateContent: true recalculateContent: true,
recalculateGeometry: true
}; };
...@@ -23143,6 +23146,7 @@ CTitle.prototype = ...@@ -23143,6 +23146,7 @@ CTitle.prototype =
this.recalcInfo.recalcTransformText = true; this.recalcInfo.recalcTransformText = true;
this.recalcInfo.recalcContent = true; this.recalcInfo.recalcContent = true;
this.recalcInfo.recalculateContent = true; this.recalcInfo.recalculateContent = true;
this.recalcInfo.recalculateGeometry = true;
this.parent && this.parent.Refresh_RecalcData2 && this.parent.Refresh_RecalcData2(pageIndex, this); this.parent && this.parent.Refresh_RecalcData2 && this.parent.Refresh_RecalcData2(pageIndex, this);
}, },
...@@ -23154,6 +23158,7 @@ CTitle.prototype = ...@@ -23154,6 +23158,7 @@ CTitle.prototype =
this.recalcInfo.recalcTransformText = true; this.recalcInfo.recalcTransformText = true;
this.recalcInfo.recalcContent = true; this.recalcInfo.recalcContent = true;
this.recalcInfo.recalculateContent = true; this.recalcInfo.recalculateContent = true;
this.recalcInfo.recalculateGeometry = true;
if(this.tx && this.tx.rich && this.tx.rich.content) if(this.tx && this.tx.rich && this.tx.rich.content)
{ {
this.tx.rich.content.Recalc_AllParagraphs_CompiledPr(); this.tx.rich.content.Recalc_AllParagraphs_CompiledPr();
...@@ -23320,6 +23325,8 @@ CTitle.prototype = ...@@ -23320,6 +23325,8 @@ CTitle.prototype =
hitInBoundingRect: CShape.prototype.hitInBoundingRect, hitInBoundingRect: CShape.prototype.hitInBoundingRect,
hitInTextRect: CShape.prototype.hitInTextRect, hitInTextRect: CShape.prototype.hitInTextRect,
recalculateGeometry: CShape.prototype.recalculateGeometry,
getTransform : CShape.prototype.getTransform ,
checkHitToBounds: function(x, y) checkHitToBounds: function(x, y)
{ {
...@@ -23587,6 +23594,10 @@ CTitle.prototype = ...@@ -23587,6 +23594,10 @@ CTitle.prototype =
this.recalculateTransformText(); this.recalculateTransformText();
this.recalcInfo.recalcTransformText = false; this.recalcInfo.recalcTransformText = false;
} }
if(this.recalcInfo.recalculateGeometry){
this.recalculateGeometry && this.recalculateGeometry();
this.recalcInfo.recalculateGeometry = false;
}
if(this.chart) if(this.chart)
{ {
this.chart.addToSetPosition(this); this.chart.addToSetPosition(this);
......
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