1. self.替换成{self.}

2. 修复table表格绘画失败问题

ware/TSDocxComponentsWare.tsf

@@ -0,0 +1,52 @@
+type TSDocxComponentsWare = class(Components)
+public
+    function Create();
+    function GetStyles(): Styles;
+    function GetStylesAdapter(): StylesAdapter;
+    function GetDocumentRelsAdapter(): RelationShipsAdapter;
+    function GetNumberingWare(): TSNumberingWare;
+
+private
+    styles_deserialize_flag_;
+    styles_adapter_;
+    document_rels_adapter_;
+    numbering_ware_;
+end;
+
+function TSDocxComponentsWare.Create();
+begin
+    class(Components).Create();
+end;
+
+function TSDocxComponentsWare.GetStyles(): Styles;
+begin
+    if styles_deserialize_flag_ then return {self.}Styles;
+    {self.}Styles.Deserialize();
+    styles_deserialize_flag_ := true;
+    return {self.}Styles;
+end;
+
+function TSDocxComponentsWare.GetStylesAdapter(): StylesAdapter;
+begin
+    if styles_adapter_ then return styles_adapter_;
+    styles_adapter_ := new StylesAdapter({self.}GetStyles());
+    return styles_adapter_;
+end;
+
+function TSDocxComponentsWare.GetDocumentRelsAdapter(): RelationShipsAdapter;
+begin
+    if document_rels_adapter_ then return document_rels_adapter_;
+    {self.}DocumentRels.Deserialize();
+    document_rels_adapter_ := new RelationShipsAdapter({self.}DocumentRels);
+    return document_rels_adapter_;
+end;
+
+function TSDocxComponentsWare.GetNumberingWare(): TSNumberingWare;
+begin
+    if numbering_ware_ then return numbering_ware_;
+    if not {self.}Numbering then return nil;
+    {self.}Numbering.Deserialize();
+    numbering_ware_ := new TSNumberingWare({self.}Numbering);
+    return numbering_ware_;
+end;
+

ware/TSFontWare.tsf

@@ -65,7 +65,7 @@ end;
 
 function TSFontWare.GetFont(name: string; bold: boolean; italic: boolean);
 begin
-    return use_built_in_font_ ? self.GetBuiltInFont(name, bold, italic) : self.GetExternalFont(name, bold, italic);
+    return use_built_in_font_ ? {self.}GetBuiltInFont(name, bold, italic) : {self.}GetExternalFont(name, bold, italic);
 end;
 
 function TSFontWare.GetBuiltInFont(name: string; bold: boolean; italic: boolean);

ware/TSSectWare.tsf

@@ -13,19 +13,19 @@ end;
 
 function TSSectWare.Create();
 begin
-    self.Elements := array();
-    self.SectPr := nil;
-    self.BaseSize := 0;
+    {self.}Elements := array();
+    {self.}SectPr := nil;
+    {self.}BaseSize := 0;
 end;
 
 function TSSectWare.Do();
 begin
-    if ifObj(self.SectPr) then
-        self.BaseSize := round(self.SectPr.DocGrid.LinePitch * 0.75);
-    // println("LinePitch = {}, Type = {}", self.SectPr.DocGrid.LinePitch, self.SectPr.DocGrid.Type);
-    // println("Width = {}, Height = {}", self.SectPr.PgSz.W, self.SectPr.PgSz.H);
+    if ifObj({self.}SectPr) then
+        {self.}BaseSize := round({self.}SectPr.DocGrid.LinePitch * 0.75);
+    // println("LinePitch = {}, Type = {}", {self.}SectPr.DocGrid.LinePitch, {self.}SectPr.DocGrid.Type);
+    // println("Width = {}, Height = {}", {self.}SectPr.PgSz.W, {self.}SectPr.PgSz.H);
     // println("Top = {}, Right = {}, Bottom = {}, Left = {}, Header = {}, Footer = {}\n",
-    //     self.SectPr.PgMar.Top, self.SectPr.PgMar.Right, self.SectPr.PgMar.Bottom, self.SectPr.PgMar.Left, self.SectPr.PgMar.Header, self.SectPr.PgMar.Footer);
+    //     {self.}SectPr.PgMar.Top, {self.}SectPr.PgMar.Right, {self.}SectPr.PgMar.Bottom, {self.}SectPr.PgMar.Left, {self.}SectPr.PgMar.Header, {self.}SectPr.PgMar.Footer);
 end;
 
 function TSSectWare.AddElement(element: tslobj);