diff --git a/docx/font/TSDocxFont.tsf b/docx/font/TSDocxFont.tsf index ef37b6a..eed1197 100644 --- a/docx/font/TSDocxFont.tsf +++ b/docx/font/TSDocxFont.tsf @@ -450,7 +450,7 @@ End; Function TSDocxFont.ReadName();virtual; Begin - return pr_.rFont.Value("EastAsia"); + return pr_.rFont.EastAsia; End; Function TSDocxFont.WriteNameAscii(value);virtual; @@ -459,7 +459,7 @@ Begin End; Function TSDocxFont.ReadNameAscii();virtual; Begin - return pr_.rFont.Value("Ascii"); + return pr_.rFont.Ascii; End; Function TSDocxFont.WriteNameBi(value);virtual; @@ -468,7 +468,7 @@ Begin End; Function TSDocxFont.ReadNameBi();virtual; Begin - return pr_.rFont.Value("Cs"); + return pr_.rFont.Cs; End; Function TSDocxFont.WriteNameFarEast(value);virtual; @@ -477,8 +477,8 @@ Begin End; Function TSDocxFont.ReadNameFarEast();virtual; Begin - ret := pr_.rFont.Value("EastAsia"); - return ret ? ret : "宋体"; + ret := pr_.rFont.EastAsia; + return ret ? ret : class(TSXml).Utf8ToCurCodePage("宋体"); End; Function TSDocxFont.WriteNameOther(value);virtual; @@ -488,7 +488,7 @@ End; Function TSDocxFont.ReadNameOther();virtual; Begin - return pr_.rFont.Value("HAnsi"); + return pr_.rFont.HAnsi; End; Function TSDocxFont.WriteNumberForm(value);virtual;