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

Пересчет подписей в редакторе документов.

Поправлен баг с картинками на второй странице колонтитула (Bug #32005)
Баг со свойствами текста в еще не отредактированном заголовке диаграмм.
parent 47cd63a0
......@@ -1228,6 +1228,10 @@ DrawingObjectsController.prototype =
else if(this.selection.chartSelection)
{
this.selection.chartSelection.applyTextFunction(docContentFunction, tableFunction, args);
if(this.document)
{
this.document.Recalculate();
}
}
else
{
......
......@@ -874,13 +874,25 @@ CChartSpace.prototype =
this.selection.textSelection.paragraphAdd(paraItem, bRecalculate);
return;
}
if(this.selection.title)
{
this.selection.title.checkDocContent();
CheckObjectTextPr(this.selection.title, _paraItem.Value, this.getDrawingDocument(), 18);
if(this.selection.title.tx && this.selection.title.tx.rich && this.selection.title.tx.rich.content)
{
this.selection.title.tx.rich.content.Set_ApplyToAll(true);
this.selection.title.tx.rich.content.Paragraph_Add(_paraItem);
this.selection.title.tx.rich.content.Set_ApplyToAll(false);
}
return;
}
this.applyLabelsFunction(CheckObjectTextPr, _paraItem.Value);
}
},
applyTextFunction: function(docContentFunction, tableFunction, args)
{
if(docContentFunction === CDocumentContent.prototype.Paragraph_Add)
if(docContentFunction === CDocumentContent.prototype.Paragraph_Add && !this.selection.textSelection)
{
this.paragraphAdd(args[0], args[1]);
return;
......
......@@ -909,7 +909,7 @@ CGraphicObjects.prototype =
for(i = 0; i < drawings.length; ++i)
{
var array_type = drawings[i].getDrawingArrayType();
if(!drawings[i].bNoNeedToAdd)
if(!drawings[i].bNoNeedToAdd && drawings[i].PageNum === pageIndex)
{
var drawing_array = null;
switch(array_type)
......
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