Commit da5c151f authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Сделана обработка выставления цвета текста auto.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57472 954022d7-b5bf-4e40-9824-e11837661b57
parent 2a96dd8a
......@@ -4855,8 +4855,11 @@ ParaRun.prototype =
if ( undefined != TextPr.FontSize )
this.Set_FontSize( null === TextPr.FontSize ? undefined : TextPr.FontSize );
if ( undefined !== TextPr.Color )
if ( undefined !== TextPr.Color && undefined === TextPr.Unifill )
{
this.Set_Color( null === TextPr.Color ? undefined : TextPr.Color );
this.Set_Unifill( undefined );
}
if ( undefined !== TextPr.Unifill )
this.Set_Unifill( null === TextPr.Unifill ? undefined : TextPr.Unifill );
......
......@@ -4008,10 +4008,18 @@ asc_docs_api.prototype.put_TextColor = function(color)
if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content) )
{
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
var Unifill = new CUniFill();
Unifill.fill = new CSolidFill();
Unifill.fill.color = CorrectUniColor(color, Unifill.fill.color, 1);
this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { Unifill : Unifill} ) );
if ( true === color.Auto )
{
this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { Color : { Auto : true, r : 0, g : 0, b : 0 }, Unifill : undefined } ) );
}
else
{
var Unifill = new CUniFill();
Unifill.fill = new CSolidFill();
Unifill.fill.color = CorrectUniColor(color, Unifill.fill.color, 1);
this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { Unifill : Unifill} ) );
}
if ( true === this.isMarkerFormat )
this.sync_MarkerFormatCallback( 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