Commit ee36eccb 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@64357 954022d7-b5bf-4e40-9824-e11837661b57
parent 63bb85ca
......@@ -834,6 +834,8 @@ TextArtPreviewManager.prototype.getWordArtPreview = function(prst)
TextArtPreviewManager.prototype.generateTextArtStyles = function()
{
ExecuteNoHistory(function(){
if(this.aStylesByIndex.length === 0)
{
this.initStyles();
......@@ -877,6 +879,7 @@ TextArtPreviewManager.prototype.generateTextArtStyles = function()
{
editor.ShowParaMarks = oldShowParaMarks;
}
}, this, []);
};
......
......@@ -998,6 +998,7 @@ var historyitem_SetWrapPolygon = 14;
var historyitem_Drawing_SetLocked = 15;// Устанавливаем привязку к конкретному параграфу]
var historyitem_Drawing_SetRelativeHeight = 16;// Устанавливаем Z-Index
var historyitem_Drawing_SetEffectExtent = 17;// Устанавливаем EffectExtent
var historyitem_Drawing_SetParent = 18;// Устанавливаем Parent
......
......@@ -119,7 +119,7 @@ CShape.prototype.recalcTxBoxContent = function()
{
this.recalcInfo.recalculateTxBoxContent = true;
this.recalcInfo.AllDrawings = [];
if(this.checkAutofit && this.checkAutofit())
if(this.checkAutofit && this.checkAutofit() && (!editor || !editor.noCreatePoint || editor.exucuteHistory))
{
this.recalcTransform();
}
......
......@@ -5732,7 +5732,7 @@ ParaDrawing.prototype =
case historyitem_Drawing_SetParent:
{
writeObject(w, data.newPr);
writeObject(Writer, Data.newPr);
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