Commit f05aad1d authored by Ilya Kirillov's avatar Ilya Kirillov

Исправлен баг с получением текстовых настроек в сноске.

parent 2c6a6f3c
...@@ -4186,7 +4186,7 @@ CDocument.prototype.Set_ParagraphTabs = function(Tabs) ...@@ -4186,7 +4186,7 @@ CDocument.prototype.Set_ParagraphTabs = function(Tabs)
this.Recalculate(); this.Recalculate();
this.Document_UpdateSelectionState(); this.Document_UpdateSelectionState();
this.Document_UpdateInterfaceState(); this.Document_UpdateInterfaceState();
editor.Update_ParaTab(Default_Tab_Stop, Tabs); this.Api.Update_ParaTab(Default_Tab_Stop, Tabs);
}; };
CDocument.prototype.Set_ParagraphIndent = function(Ind) CDocument.prototype.Set_ParagraphIndent = function(Ind)
{ {
...@@ -4569,21 +4569,20 @@ CDocument.prototype.Interface_Update_TextPr = function() ...@@ -4569,21 +4569,20 @@ CDocument.prototype.Interface_Update_TextPr = function()
*/ */
CDocument.prototype.Interface_Update_DrawingPr = function(Flag) CDocument.prototype.Interface_Update_DrawingPr = function(Flag)
{ {
// if(!(this.DrawingObjects.curState.id === STATES_ID_TEXT_ADD || this.DrawingObjects.curState.id === STATES_ID_TEXT_ADD_IN_GROUP)) var DrawingPr = this.DrawingObjects.Get_Props();
{
var DrawingPr = this.DrawingObjects.Get_Props();
if (true === Flag)
return DrawingPr;
else
{
for (var i = 0; i < DrawingPr.length; ++i) if (true === Flag)
editor.sync_ImgPropCallback(DrawingPr[i]); return DrawingPr;
} else
} {
if (Flag) if (this.Api)
return null; {
for (var i = 0; i < DrawingPr.length; ++i)
this.Api.sync_ImgPropCallback(DrawingPr[i]);
}
}
if (Flag)
return null;
}; };
/** /**
* Обновляем данные в интерфейсе о свойствах таблицы. * Обновляем данные в интерфейсе о свойствах таблицы.
...@@ -4592,30 +4591,32 @@ CDocument.prototype.Interface_Update_DrawingPr = function(Flag) ...@@ -4592,30 +4591,32 @@ CDocument.prototype.Interface_Update_DrawingPr = function(Flag)
*/ */
CDocument.prototype.Interface_Update_TablePr = function(Flag) CDocument.prototype.Interface_Update_TablePr = function(Flag)
{ {
var TablePr = null; var TablePr = null;
if (docpostype_Content == this.CurPos.Type && ( ( true === this.Selection.Use && this.Selection.StartPos == this.Selection.EndPos && type_Table == this.Content[this.Selection.StartPos].GetType() ) || ( false == this.Selection.Use && type_Table == this.Content[this.CurPos.ContentPos].GetType() ) )) if (docpostype_Content == this.Get_DocPosType()
{ && ((true === this.Selection.Use && this.Selection.StartPos == this.Selection.EndPos && type_Table == this.Content[this.Selection.StartPos].GetType())
if (true == this.Selection.Use) || (false == this.Selection.Use && type_Table == this.Content[this.CurPos.ContentPos].GetType())))
TablePr = this.Content[this.Selection.StartPos].Get_Props(); {
else if (true == this.Selection.Use)
TablePr = this.Content[this.CurPos.ContentPos].Get_Props(); TablePr = this.Content[this.Selection.StartPos].Get_Props();
} else
TablePr.CanBeFlow = true; TablePr = this.Content[this.CurPos.ContentPos].Get_Props();
}
TablePr.CanBeFlow = true;
if (true === Flag) if (true === Flag)
return TablePr; return TablePr;
else if (null != TablePr) else if (null != TablePr)
editor.sync_TblPropCallback(TablePr); this.Api.sync_TblPropCallback(TablePr);
}; };
/** /**
* Обновляем данные в интерфейсе о свойствах колонотитулов. * Обновляем данные в интерфейсе о свойствах колонотитулов.
*/ */
CDocument.prototype.Interface_Update_HdrFtrPr = function() CDocument.prototype.Interface_Update_HdrFtrPr = function()
{ {
if (docpostype_HdrFtr === this.CurPos.Type) if (docpostype_HdrFtr === this.Get_DocPosType())
{ {
editor.sync_HeadersAndFootersPropCallback(this.HdrFtr.Get_Props()); this.Api.sync_HeadersAndFootersPropCallback(this.HdrFtr.Get_Props());
} }
}; };
CDocument.prototype.Internal_GetContentPosByXY = function(X, Y, PageNum, ColumnsInfo) CDocument.prototype.Internal_GetContentPosByXY = function(X, Y, PageNum, ColumnsInfo)
{ {
......
...@@ -762,7 +762,7 @@ CFootnotesController.prototype.GetCurrentTextPr = function() ...@@ -762,7 +762,7 @@ CFootnotesController.prototype.GetCurrentTextPr = function()
else else
{ {
if (null !== this.CurFootnote) if (null !== this.CurFootnote)
return this.CurFootnote.Get_Paragraph_ParaPr(); return this.CurFootnote.Get_Paragraph_TextPr();
} }
return null; return null;
......
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