Commit f6acd148 authored by SergeyLuzyanin's avatar SergeyLuzyanin

for bug 35058

parent 023e72ec
......@@ -1212,13 +1212,13 @@ CShape.prototype.getHierarchy = function()
case AscFormat.TYPE_KIND.SLIDE:
{
hierarchy.push(this.parent.Layout.getMatchingShape(ph_type, ph_index, b_is_single_body));
hierarchy.push(this.parent.Layout.Master.getMatchingShape(ph_type, ph_index, b_is_single_body));
hierarchy.push(this.parent.Layout.Master.getMatchingShape(ph_type, ph_index, true));
break;
}
case AscFormat.TYPE_KIND.LAYOUT:
{
hierarchy.push(this.parent.Master.getMatchingShape(ph_type, ph_index, b_is_single_body));
hierarchy.push(this.parent.Master.getMatchingShape(ph_type, ph_index, true));
break;
}
}
......
......@@ -751,7 +751,7 @@ CShape.prototype.getIsSingleBody = function(x, y)
if(!this.isPlaceholder())
return false;
var ph_type = this.getPlaceholderType();
if(this.getPlaceholderType() !== AscFormat.phType_body && ph_type !== null)
if(ph_type !== AscFormat.phType_body && ph_type !== null)
return false;
if(this.parent && this.parent.cSld && Array.isArray(this.parent.cSld.spTree))
{
......
......@@ -10099,7 +10099,7 @@ CParaPr.prototype =
Bullet.m_dSize = this.Bullet.bulletSize.val/100000.0;
break;
}
case AscFormat.BULLET_TYPE_SIZE_PCT:{
case AscFormat.BULLET_TYPE_SIZE_PTS:{
Bullet.m_bSizeTx = false;
Bullet.m_bSizePct = false;
Bullet.m_dSize = this.Bullet.bulletSize.val/100000.0;
......
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