Commit 19ea8cb2 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

цвет текста в колонтитуле, баг с определением размера секции

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61510 954022d7-b5bf-4e40-9824-e11837661b57
parent 5a8a3688
...@@ -4131,7 +4131,12 @@ asc_docs_api.prototype.UpdateTextPr = function(TextPr) ...@@ -4131,7 +4131,12 @@ asc_docs_api.prototype.UpdateTextPr = function(TextPr)
_stream["WriteDouble2"](TextPr.FontSize); _stream["WriteDouble2"](TextPr.FontSize);
} }
if (TextPr.Color !== undefined) if(TextPr.Unifill && TextPr.Unifill.fill && TextPr.Unifill.fill.type === FILL_TYPE_SOLID && TextPr.Unifill.fill.color)
{
var _color = CreateAscColor(TextPr.Unifill.fill.color);
asc_menu_WriteColor(6, CreateAscColorCustom(_color.r, _color.g, _color.b, false), _stream);
}
else if (TextPr.Color !== undefined)
{ {
asc_menu_WriteColor(6, CreateAscColorCustom(TextPr.Color.r, TextPr.Color.g, TextPr.Color.b, TextPr.Color.Auto), _stream); asc_menu_WriteColor(6, CreateAscColorCustom(TextPr.Color.r, TextPr.Color.g, TextPr.Color.b, TextPr.Color.Auto), _stream);
} }
......
...@@ -7371,6 +7371,10 @@ window["asc_docs_api"].prototype["asc_nativeCalculateFile"] = function() ...@@ -7371,6 +7371,10 @@ window["asc_docs_api"].prototype["asc_nativeCalculateFile"] = function()
Document.Recalculate(false, false, RecalculateData); Document.Recalculate(false, false, RecalculateData);
Document.Document_UpdateInterfaceState();
//Document.Document_UpdateRulersState();
Document.Document_UpdateSelectionState();
this.ShowParaMarks = false; this.ShowParaMarks = false;
}; };
......
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