Commit 1f051174 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@57228 954022d7-b5bf-4e40-9824-e11837661b57
parent 7b5b648e
...@@ -6587,6 +6587,11 @@ function BinaryPPTYLoader() ...@@ -6587,6 +6587,11 @@ function BinaryPPTYLoader()
if(r_pr) if(r_pr)
{ {
para_pr.DefaultRunPr = new CTextPr(); para_pr.DefaultRunPr = new CTextPr();
if(r_pr.Unifill && !r_pr.Unifill.fill)
{
r_pr.Unifill = undefined;
}
para_pr.DefaultRunPr.Set_FromObject(r_pr); para_pr.DefaultRunPr.Set_FromObject(r_pr);
} }
} }
...@@ -6860,6 +6865,10 @@ function BinaryPPTYLoader() ...@@ -6860,6 +6865,10 @@ function BinaryPPTYLoader()
{ {
var endRunPr = this.ReadRunProperties(); var endRunPr = this.ReadRunProperties();
var _value_text_pr = new CTextPr(); var _value_text_pr = new CTextPr();
if(endRunPr.Unifill && !endRunPr.Unifill.fill)
{
endRunPr.Unifill = undefined;
}
_value_text_pr.Set_FromObject(endRunPr); _value_text_pr.Set_FromObject(endRunPr);
par.TextPr.Apply_TextPr(_value_text_pr);//endRunProperties par.TextPr.Apply_TextPr(_value_text_pr);//endRunProperties
break; break;
...@@ -6916,6 +6925,10 @@ function BinaryPPTYLoader() ...@@ -6916,6 +6925,10 @@ function BinaryPPTYLoader()
hyperlink.Set_Value(_run.hlink.url); hyperlink.Set_Value(_run.hlink.url);
} }
var text_pr = new CTextPr(); var text_pr = new CTextPr();
if(_run.Unifill && !_run.Unifill.fill)
{
_run.Unifill = undefined;
}
text_pr.Set_FromObject(_run); text_pr.Set_FromObject(_run);
new_run.Set_Pr(text_pr) new_run.Set_Pr(text_pr)
} }
...@@ -7007,6 +7020,10 @@ function BinaryPPTYLoader() ...@@ -7007,6 +7020,10 @@ function BinaryPPTYLoader()
hyperlink.Set_Value(_run.hlink.url); hyperlink.Set_Value(_run.hlink.url);
} }
var text_pr = new CTextPr(); var text_pr = new CTextPr();
if(_run.Unifill && !_run.Unifill.fill)
{
_run.Unifill = undefined;
}
text_pr.Set_FromObject(_run); text_pr.Set_FromObject(_run);
new_run.Set_Pr(text_pr); new_run.Set_Pr(text_pr);
} }
......
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