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

CImageShape.setStyle

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59995 954022d7-b5bf-4e40-9824-e11837661b57
parent b6aeb74b
...@@ -550,6 +550,7 @@ var historyitem_ImageShapeSetSpPr = 2536; ...@@ -550,6 +550,7 @@ var historyitem_ImageShapeSetSpPr = 2536;
var historyitem_ImageShapeSetBlipFill = 2537; var historyitem_ImageShapeSetBlipFill = 2537;
var historyitem_ImageShapeSetParent = 2538; var historyitem_ImageShapeSetParent = 2538;
var historyitem_ImageShapeSetGroup = 2539; var historyitem_ImageShapeSetGroup = 2539;
var historyitem_ImageShapeSetStyle = 2540;
var historyitem_GeometrySetParent = 2540; var historyitem_GeometrySetParent = 2540;
var historyitem_GeometryAddAdj = 2541; var historyitem_GeometryAddAdj = 2541;
var historyitem_GeometryAddGuide = 2542; var historyitem_GeometryAddGuide = 2542;
......
...@@ -94,6 +94,12 @@ CImageShape.prototype = ...@@ -94,6 +94,12 @@ CImageShape.prototype =
this.group = pr; this.group = pr;
}, },
setStyle: function(pr)
{
History.Add(this, {Type: historyitem_ImageShapeSetStyle, oldPr: this.style, newPr: pr});
this.style = pr;
},
copy: function() copy: function()
{ {
var copy = new CImageShape(); var copy = new CImageShape();
...@@ -111,6 +117,10 @@ CImageShape.prototype = ...@@ -111,6 +117,10 @@ CImageShape.prototype =
{ {
copy.setBlipFill(this.blipFill.createDuplicate()); copy.setBlipFill(this.blipFill.createDuplicate());
} }
if(this.style)
{
copy.setStyle(this.style.createDuplicate());
}
copy.setBDeleted(this.bDeleted); copy.setBDeleted(this.bDeleted);
copy.cachedImage = this.getBase64Img(); copy.cachedImage = this.getBase64Img();
return copy; return copy;
...@@ -745,6 +755,11 @@ CImageShape.prototype = ...@@ -745,6 +755,11 @@ CImageShape.prototype =
this.group = data.oldPr; this.group = data.oldPr;
break; break;
} }
case historyitem_ImageShapeSetStyle:
{
this.style = data.oldPr;
break;
}
} }
}, },
...@@ -797,6 +812,11 @@ CImageShape.prototype = ...@@ -797,6 +812,11 @@ CImageShape.prototype =
this.group = data.newPr; this.group = data.newPr;
break; break;
} }
case historyitem_ImageShapeSetStyle:
{
this.style = data.newPr;
break;
}
} }
}, },
...@@ -846,6 +866,7 @@ CImageShape.prototype = ...@@ -846,6 +866,7 @@ CImageShape.prototype =
case historyitem_ImageShapeSetSpPr: case historyitem_ImageShapeSetSpPr:
case historyitem_ImageShapeSetParent: case historyitem_ImageShapeSetParent:
case historyitem_ImageShapeSetGroup: case historyitem_ImageShapeSetGroup:
case historyitem_ImageShapeSetStyle:
{ {
writeObject(w, data.newPr); writeObject(w, data.newPr);
break; break;
...@@ -986,6 +1007,11 @@ CImageShape.prototype = ...@@ -986,6 +1007,11 @@ CImageShape.prototype =
this.group = readObject(r); this.group = readObject(r);
break; break;
} }
case historyitem_ImageShapeSetStyle:
{
this.style = readObject(r);
break;
}
} }
}, },
......
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