diff --git a/autoclass/adapter/docx/NumberingAdapter@DOCX.tsf b/autoclass/adapter/docx/NumberingAdapter@DOCX.tsf index 3aa7289..9cf45cd 100644 --- a/autoclass/adapter/docx/NumberingAdapter@DOCX.tsf +++ b/autoclass/adapter/docx/NumberingAdapter@DOCX.tsf @@ -21,7 +21,7 @@ begin object_ := _obj; abstractnum_hash_ := array(); num_hash_ := array(); - self.Init(); + {self.}Init(); end; function NumberingAdapter.Init(); diff --git a/autoclass/adapter/docx/RelationshipsAdapter@DOCX.tsf b/autoclass/adapter/docx/RelationshipsAdapter@DOCX.tsf index 261493a..a9ba9fc 100644 --- a/autoclass/adapter/docx/RelationshipsAdapter@DOCX.tsf +++ b/autoclass/adapter/docx/RelationshipsAdapter@DOCX.tsf @@ -16,7 +16,7 @@ function RelationshipsAdapter.Create(_obj: Relationships); begin object_ := _obj; relationship_hash_ := array(); - self.Init(); + {self.}Init(); end; function RelationshipsAdapter.Init(); diff --git a/autoclass/adapter/docx/StylesAdapter@DOCX.tsf b/autoclass/adapter/docx/StylesAdapter@DOCX.tsf index f42337c..79603b7 100644 --- a/autoclass/adapter/docx/StylesAdapter@DOCX.tsf +++ b/autoclass/adapter/docx/StylesAdapter@DOCX.tsf @@ -16,7 +16,7 @@ function StylesAdapter.Create(_obj: Styles); begin object_ := _obj; style_hash_ := array(); - self.Init(); + {self.}Init(); end; function StylesAdapter.Init(); diff --git a/autoclass/decorator/docx/APPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/APPrUnitDecorator@DOCX.tsf index 470e919..357ffdf 100644 --- a/autoclass/decorator/docx/APPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/APPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type APPrUnitDecorator = class(APPr) uses TSSafeUnitConverter; public function Create(_obj: APPr); - function Converte(); + function Convert(); private object_: APPr; end; @@ -11,10 +11,10 @@ function APPrUnitDecorator.Create(_obj: APPr); begin class(APPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function APPrUnitDecorator.Converte(); +function APPrUnitDecorator.Convert(); begin - self.DefRPr := new ARPrUnitDecorator(object_.DefRPr); + {self.}DefRPr := new ARPrUnitDecorator(object_.DefRPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ARPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ARPrUnitDecorator@DOCX.tsf index fe6eaaa..8ef964d 100644 --- a/autoclass/decorator/docx/ARPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ARPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ARPrUnitDecorator = class(ARPr) uses TSSafeUnitConverter; public function Create(_obj: ARPr); - function Converte(); + function Convert(); private object_: ARPr; end; @@ -11,23 +11,23 @@ function ARPrUnitDecorator.Create(_obj: ARPr); begin class(ARPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ARPrUnitDecorator.Converte(); +function ARPrUnitDecorator.Convert(); begin - self.XmlAttrLang.Value := object_.XmlAttrLang.Value; - self.XmlAttrAltLang.Value := object_.XmlAttrAltLang.Value; - self.XmlAttrB.Value := object_.XmlAttrB.Value; - self.XmlAttrBaseline.Value := object_.XmlAttrBaseline.Value; - self.XmlAttrI.Value := object_.XmlAttrI.Value; - self.XmlAttrKern.Value := object_.XmlAttrKern.Value; - self.XmlAttrSpc.Value := object_.XmlAttrSpc.Value; - self.XmlAttrStrike.Value := object_.XmlAttrStrike.Value; - self.XmlAttrSz.Value := object_.XmlAttrSz.Value; - self.XmlAttrU.Value := object_.XmlAttrU.Value; - self.SolidFill := new SolidFillUnitDecorator(object_.SolidFill); - self.Latin := new LatinUnitDecorator(object_.Latin); - self.Ea := new LatinUnitDecorator(object_.Ea); - self.Cs := new LatinUnitDecorator(object_.Cs); + {self.}XmlAttrLang.Value := object_.XmlAttrLang.Value; + {self.}XmlAttrAltLang.Value := object_.XmlAttrAltLang.Value; + {self.}XmlAttrB.Value := object_.XmlAttrB.Value; + {self.}XmlAttrBaseline.Value := object_.XmlAttrBaseline.Value; + {self.}XmlAttrI.Value := object_.XmlAttrI.Value; + {self.}XmlAttrKern.Value := object_.XmlAttrKern.Value; + {self.}XmlAttrSpc.Value := object_.XmlAttrSpc.Value; + {self.}XmlAttrStrike.Value := object_.XmlAttrStrike.Value; + {self.}XmlAttrSz.Value := object_.XmlAttrSz.Value; + {self.}XmlAttrU.Value := object_.XmlAttrU.Value; + {self.}SolidFill := new SolidFillUnitDecorator(object_.SolidFill); + {self.}Latin := new LatinUnitDecorator(object_.Latin); + {self.}Ea := new LatinUnitDecorator(object_.Ea); + {self.}Cs := new LatinUnitDecorator(object_.Cs); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ARUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ARUnitDecorator@DOCX.tsf index 41c26f3..913b09e 100644 --- a/autoclass/decorator/docx/ARUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ARUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ARUnitDecorator = class(AR) uses TSSafeUnitConverter; public function Create(_obj: AR); - function Converte(); + function Convert(); private object_: AR; end; @@ -11,11 +11,11 @@ function ARUnitDecorator.Create(_obj: AR); begin class(AR).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ARUnitDecorator.Converte(); +function ARUnitDecorator.Convert(); begin - self.RPr := new ARPrUnitDecorator(object_.RPr); - self.T := new TUnitDecorator(object_.T); + {self.}RPr := new ARPrUnitDecorator(object_.RPr); + {self.}T := new TUnitDecorator(object_.T); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/AbstractNumUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/AbstractNumUnitDecorator@DOCX.tsf index 8b8c985..3a2217e 100644 --- a/autoclass/decorator/docx/AbstractNumUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/AbstractNumUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type AbstractNumUnitDecorator = class(AbstractNum) uses TSSafeUnitConverter; public function Create(_obj: AbstractNum); - function Converte(); + function Convert(); private object_: AbstractNum; end; @@ -11,14 +11,14 @@ function AbstractNumUnitDecorator.Create(_obj: AbstractNum); begin class(AbstractNum).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function AbstractNumUnitDecorator.Converte(); +function AbstractNumUnitDecorator.Convert(); begin - self.XmlAttrAbstractNumId.Value := object_.XmlAttrAbstractNumId.Value; - self.XmlAttrRestartNumberingAfterBreak.Value := object_.XmlAttrRestartNumberingAfterBreak.Value; - self.Nsid := new PureWValUnitDecorator(object_.Nsid); - self.MultiLevelType := new PureWValUnitDecorator(object_.MultiLevelType); - self.Tmpl := new PureWValUnitDecorator(object_.Tmpl); + {self.}XmlAttrAbstractNumId.Value := object_.XmlAttrAbstractNumId.Value; + {self.}XmlAttrRestartNumberingAfterBreak.Value := object_.XmlAttrRestartNumberingAfterBreak.Value; + {self.}Nsid := new PureWValUnitDecorator(object_.Nsid); + {self.}MultiLevelType := new PureWValUnitDecorator(object_.MultiLevelType); + {self.}Tmpl := new PureWValUnitDecorator(object_.Tmpl); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/AlternateContentUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/AlternateContentUnitDecorator@DOCX.tsf index 14ace73..e1621b6 100644 --- a/autoclass/decorator/docx/AlternateContentUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/AlternateContentUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type AlternateContentUnitDecorator = class(AlternateContent) uses TSSafeUnitConverter; public function Create(_obj: AlternateContent); - function Converte(); + function Convert(); private object_: AlternateContent; end; @@ -11,12 +11,12 @@ function AlternateContentUnitDecorator.Create(_obj: AlternateContent); begin class(AlternateContent).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function AlternateContentUnitDecorator.Converte(); +function AlternateContentUnitDecorator.Convert(); begin - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.Choice := new ChoiceUnitDecorator(object_.Choice); - self.Fallback := new FallbackUnitDecorator(object_.Fallback); + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}Choice := new ChoiceUnitDecorator(object_.Choice); + {self.}Fallback := new FallbackUnitDecorator(object_.Fallback); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ApUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ApUnitDecorator@DOCX.tsf index 3c4e517..4da8ca7 100644 --- a/autoclass/decorator/docx/ApUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ApUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ApUnitDecorator = class(Ap) uses TSSafeUnitConverter; public function Create(_obj: Ap); - function Converte(); + function Convert(); private object_: Ap; end; @@ -11,11 +11,11 @@ function ApUnitDecorator.Create(_obj: Ap); begin class(Ap).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ApUnitDecorator.Converte(); +function ApUnitDecorator.Convert(); begin - self.PPr := new APPrUnitDecorator(object_.PPr); - self.EndParaRPr := new ARPrUnitDecorator(object_.EndParaRPr); + {self.}PPr := new APPrUnitDecorator(object_.PPr); + {self.}EndParaRPr := new ARPrUnitDecorator(object_.EndParaRPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/AxUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/AxUnitDecorator@DOCX.tsf index 2329740..07ad590 100644 --- a/autoclass/decorator/docx/AxUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/AxUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type AxUnitDecorator = class(Ax) uses TSSafeUnitConverter; public function Create(_obj: Ax); - function Converte(); + function Convert(); private object_: Ax; end; @@ -11,26 +11,26 @@ function AxUnitDecorator.Create(_obj: Ax); begin class(Ax).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function AxUnitDecorator.Converte(); +function AxUnitDecorator.Convert(); begin - self.AxId := new PureValUnitDecorator(object_.AxId); - self.Scaling := new ScalingUnitDecorator(object_.Scaling); - self._Delete := new PureValUnitDecorator(object_._Delete); - self.AxPos := new PureValUnitDecorator(object_.AxPos); - self.NumFmt := new NumFmtUnitDecorator(object_.NumFmt); - self.MajorTickMark := new PureValUnitDecorator(object_.MajorTickMark); - self.MinorTickMark := new PureValUnitDecorator(object_.MinorTickMark); - self.TickLblPos := new PureValUnitDecorator(object_.TickLblPos); - self.SpPr := new SpPrUnitDecorator(object_.SpPr); - self.TxPr := new TxPrUnitDecorator(object_.TxPr); - self.CrossAx := new PureValUnitDecorator(object_.CrossAx); - self.Crosses := new PureValUnitDecorator(object_.Crosses); - self.CrossBetween := new PureValUnitDecorator(object_.CrossBetween); - self.Auto := new PureValUnitDecorator(object_.Auto); - self.LblAlgn := new PureValUnitDecorator(object_.LblAlgn); - self.LblOffset := new PureValUnitDecorator(object_.LblOffset); - self.NoMultiLvlLbl := new PureValUnitDecorator(object_.NoMultiLvlLbl); + {self.}AxId := new PureValUnitDecorator(object_.AxId); + {self.}Scaling := new ScalingUnitDecorator(object_.Scaling); + {self.}_Delete := new PureValUnitDecorator(object_._Delete); + {self.}AxPos := new PureValUnitDecorator(object_.AxPos); + {self.}NumFmt := new NumFmtUnitDecorator(object_.NumFmt); + {self.}MajorTickMark := new PureValUnitDecorator(object_.MajorTickMark); + {self.}MinorTickMark := new PureValUnitDecorator(object_.MinorTickMark); + {self.}TickLblPos := new PureValUnitDecorator(object_.TickLblPos); + {self.}SpPr := new SpPrUnitDecorator(object_.SpPr); + {self.}TxPr := new TxPrUnitDecorator(object_.TxPr); + {self.}CrossAx := new PureValUnitDecorator(object_.CrossAx); + {self.}Crosses := new PureValUnitDecorator(object_.Crosses); + {self.}CrossBetween := new PureValUnitDecorator(object_.CrossBetween); + {self.}Auto := new PureValUnitDecorator(object_.Auto); + {self.}LblAlgn := new PureValUnitDecorator(object_.LblAlgn); + {self.}LblOffset := new PureValUnitDecorator(object_.LblOffset); + {self.}NoMultiLvlLbl := new PureValUnitDecorator(object_.NoMultiLvlLbl); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/BarChartUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/BarChartUnitDecorator@DOCX.tsf index 95b71d6..782beaf 100644 --- a/autoclass/decorator/docx/BarChartUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/BarChartUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type BarChartUnitDecorator = class(BarChart) uses TSSafeUnitConverter; public function Create(_obj: BarChart); - function Converte(); + function Convert(); private object_: BarChart; end; @@ -11,13 +11,13 @@ function BarChartUnitDecorator.Create(_obj: BarChart); begin class(BarChart).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function BarChartUnitDecorator.Converte(); +function BarChartUnitDecorator.Convert(); begin - self.BarDir := new PureValUnitDecorator(object_.BarDir); - self.Grouping := new PureValUnitDecorator(object_.Grouping); - self.VaryColors := new PureValUnitDecorator(object_.VaryColors); - self.GapWidth := new PureValUnitDecorator(object_.GapWidth); + {self.}BarDir := new PureValUnitDecorator(object_.BarDir); + {self.}Grouping := new PureValUnitDecorator(object_.Grouping); + {self.}VaryColors := new PureValUnitDecorator(object_.VaryColors); + {self.}GapWidth := new PureValUnitDecorator(object_.GapWidth); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/BlipFillUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/BlipFillUnitDecorator@DOCX.tsf index ac5397f..4ba2049 100644 --- a/autoclass/decorator/docx/BlipFillUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/BlipFillUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type BlipFillUnitDecorator = class(BlipFill) uses TSSafeUnitConverter; public function Create(_obj: BlipFill); - function Converte(); + function Convert(); private object_: BlipFill; end; @@ -11,11 +11,11 @@ function BlipFillUnitDecorator.Create(_obj: BlipFill); begin class(BlipFill).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function BlipFillUnitDecorator.Converte(); +function BlipFillUnitDecorator.Convert(); begin - self.Blip := new BlipUnitDecorator(object_.Blip); - self.Stretch := new StretchUnitDecorator(object_.Stretch); + {self.}Blip := new BlipUnitDecorator(object_.Blip); + {self.}Stretch := new StretchUnitDecorator(object_.Stretch); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/BlipUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/BlipUnitDecorator@DOCX.tsf index a455087..5954010 100644 --- a/autoclass/decorator/docx/BlipUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/BlipUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type BlipUnitDecorator = class(Blip) uses TSSafeUnitConverter; public function Create(_obj: Blip); - function Converte(); + function Convert(); private object_: Blip; end; @@ -11,11 +11,11 @@ function BlipUnitDecorator.Create(_obj: Blip); begin class(Blip).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function BlipUnitDecorator.Converte(); +function BlipUnitDecorator.Convert(); begin - self.XmlAttrEmbed.Value := object_.XmlAttrEmbed.Value; - self.XmlAttrCstate.Value := object_.XmlAttrCstate.Value; + {self.}XmlAttrEmbed.Value := object_.XmlAttrEmbed.Value; + {self.}XmlAttrCstate.Value := object_.XmlAttrCstate.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/BodyPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/BodyPrUnitDecorator@DOCX.tsf index 9f4b420..0c6f8ce 100644 --- a/autoclass/decorator/docx/BodyPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/BodyPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type BodyPrUnitDecorator = class(BodyPr) uses TSSafeUnitConverter; public function Create(_obj: BodyPr); - function Converte(); + function Convert(); private object_: BodyPr; end; @@ -11,16 +11,16 @@ function BodyPrUnitDecorator.Create(_obj: BodyPr); begin class(BodyPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function BodyPrUnitDecorator.Converte(); +function BodyPrUnitDecorator.Convert(); begin - self.XmlAttrRot.Value := object_.XmlAttrRot.Value; - self.XmlAttrSpcFirstLastPara.Value := object_.XmlAttrSpcFirstLastPara.Value; - self.XmlAttrVertOverflow.Value := object_.XmlAttrVertOverflow.Value; - self.XmlAttrVert.Value := object_.XmlAttrVert.Value; - self.XmlAttrWrap.Value := object_.XmlAttrWrap.Value; - self.XmlAttrAnchor.Value := object_.XmlAttrAnchor.Value; - self.XmlAttrAnchorCtr.Value := object_.XmlAttrAnchorCtr.Value; + {self.}XmlAttrRot.Value := object_.XmlAttrRot.Value; + {self.}XmlAttrSpcFirstLastPara.Value := object_.XmlAttrSpcFirstLastPara.Value; + {self.}XmlAttrVertOverflow.Value := object_.XmlAttrVertOverflow.Value; + {self.}XmlAttrVert.Value := object_.XmlAttrVert.Value; + {self.}XmlAttrWrap.Value := object_.XmlAttrWrap.Value; + {self.}XmlAttrAnchor.Value := object_.XmlAttrAnchor.Value; + {self.}XmlAttrAnchorCtr.Value := object_.XmlAttrAnchorCtr.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/BodyUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/BodyUnitDecorator@DOCX.tsf index f592a2b..75c7778 100644 --- a/autoclass/decorator/docx/BodyUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/BodyUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type BodyUnitDecorator = class(Body) uses TSSafeUnitConverter; public function Create(_obj: Body); - function Converte(); + function Convert(); private object_: Body; end; @@ -11,10 +11,10 @@ function BodyUnitDecorator.Create(_obj: Body); begin class(Body).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function BodyUnitDecorator.Converte(); +function BodyUnitDecorator.Convert(); begin - self.SectPr := new SectPrUnitDecorator(object_.SectPr); + {self.}SectPr := new SectPrUnitDecorator(object_.SectPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/BookmarkUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/BookmarkUnitDecorator@DOCX.tsf index c39d0ee..6872b0f 100644 --- a/autoclass/decorator/docx/BookmarkUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/BookmarkUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type BookmarkUnitDecorator = class(Bookmark) uses TSSafeUnitConverter; public function Create(_obj: Bookmark); - function Converte(); + function Convert(); private object_: Bookmark; end; @@ -11,11 +11,11 @@ function BookmarkUnitDecorator.Create(_obj: Bookmark); begin class(Bookmark).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function BookmarkUnitDecorator.Converte(); +function BookmarkUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/BrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/BrUnitDecorator@DOCX.tsf index 918fb92..7163774 100644 --- a/autoclass/decorator/docx/BrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/BrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type BrUnitDecorator = class(Br) uses TSSafeUnitConverter; public function Create(_obj: Br); - function Converte(); + function Convert(); private object_: Br; end; @@ -11,10 +11,10 @@ function BrUnitDecorator.Create(_obj: Br); begin class(Br).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function BrUnitDecorator.Converte(); +function BrUnitDecorator.Convert(); begin - self.XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CNvGraphicFramePrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CNvGraphicFramePrUnitDecorator@DOCX.tsf index f18ee4c..2fd76d7 100644 --- a/autoclass/decorator/docx/CNvGraphicFramePrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CNvGraphicFramePrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CNvGraphicFramePrUnitDecorator = class(CNvGraphicFramePr) uses TSSafeUnitConverter; public function Create(_obj: CNvGraphicFramePr); - function Converte(); + function Convert(); private object_: CNvGraphicFramePr; end; @@ -11,10 +11,10 @@ function CNvGraphicFramePrUnitDecorator.Create(_obj: CNvGraphicFramePr); begin class(CNvGraphicFramePr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CNvGraphicFramePrUnitDecorator.Converte(); +function CNvGraphicFramePrUnitDecorator.Convert(); begin - self.GraphicFrameLocks := new GraphicFrameLocksUnitDecorator(object_.GraphicFrameLocks); + {self.}GraphicFrameLocks := new GraphicFrameLocksUnitDecorator(object_.GraphicFrameLocks); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CNvPicPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CNvPicPrUnitDecorator@DOCX.tsf index 0e59b85..36c08e3 100644 --- a/autoclass/decorator/docx/CNvPicPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CNvPicPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CNvPicPrUnitDecorator = class(CNvPicPr) uses TSSafeUnitConverter; public function Create(_obj: CNvPicPr); - function Converte(); + function Convert(); private object_: CNvPicPr; end; @@ -11,10 +11,10 @@ function CNvPicPrUnitDecorator.Create(_obj: CNvPicPr); begin class(CNvPicPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CNvPicPrUnitDecorator.Converte(); +function CNvPicPrUnitDecorator.Convert(); begin - self.PicLocks := new PicLocksUnitDecorator(object_.PicLocks); + {self.}PicLocks := new PicLocksUnitDecorator(object_.PicLocks); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CNvPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CNvPrUnitDecorator@DOCX.tsf index 6b42b0d..bca6db5 100644 --- a/autoclass/decorator/docx/CNvPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CNvPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CNvPrUnitDecorator = class(CNvPr) uses TSSafeUnitConverter; public function Create(_obj: CNvPr); - function Converte(); + function Convert(); private object_: CNvPr; end; @@ -11,12 +11,12 @@ function CNvPrUnitDecorator.Create(_obj: CNvPr); begin class(CNvPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CNvPrUnitDecorator.Converte(); +function CNvPrUnitDecorator.Convert(); begin - self.XmlAttrId.Value := object_.XmlAttrId.Value; - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.XmlAttrDescr.Value := object_.XmlAttrDescr.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}XmlAttrDescr.Value := object_.XmlAttrDescr.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CXYUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CXYUnitDecorator@DOCX.tsf index 1b1b531..ea1a33b 100644 --- a/autoclass/decorator/docx/CXYUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CXYUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CXYUnitDecorator = class(CXY) uses TSSafeUnitConverter; public function Create(_obj: CXY); - function Converte(); + function Convert(); private object_: CXY; end; @@ -11,11 +11,11 @@ function CXYUnitDecorator.Create(_obj: CXY); begin class(CXY).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CXYUnitDecorator.Converte(); +function CXYUnitDecorator.Convert(); begin - self.XmlAttrCx.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrCx.Value); - self.XmlAttrCy.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrCy.Value); + {self.}XmlAttrCx.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrCx.Value); + {self.}XmlAttrCy.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrCy.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CacheUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CacheUnitDecorator@DOCX.tsf index 91542c2..f44c4da 100644 --- a/autoclass/decorator/docx/CacheUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CacheUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CacheUnitDecorator = class(Cache) uses TSSafeUnitConverter; public function Create(_obj: Cache); - function Converte(); + function Convert(); private object_: Cache; end; @@ -11,10 +11,10 @@ function CacheUnitDecorator.Create(_obj: Cache); begin class(Cache).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CacheUnitDecorator.Converte(); +function CacheUnitDecorator.Convert(); begin - self.PtCount := new PureValUnitDecorator(object_.PtCount); + {self.}PtCount := new PureValUnitDecorator(object_.PtCount); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CatUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CatUnitDecorator@DOCX.tsf index 20c4fac..93221f8 100644 --- a/autoclass/decorator/docx/CatUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CatUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CatUnitDecorator = class(Cat) uses TSSafeUnitConverter; public function Create(_obj: Cat); - function Converte(); + function Convert(); private object_: Cat; end; @@ -11,10 +11,10 @@ function CatUnitDecorator.Create(_obj: Cat); begin class(Cat).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CatUnitDecorator.Converte(); +function CatUnitDecorator.Convert(); begin - self.StrRef := new StrRefUnitDecorator(object_.StrRef); + {self.}StrRef := new StrRefUnitDecorator(object_.StrRef); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ChartSpaceUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ChartSpaceUnitDecorator@DOCX.tsf index 6780394..b34f6ef 100644 --- a/autoclass/decorator/docx/ChartSpaceUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ChartSpaceUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ChartSpaceUnitDecorator = class(ChartSpace) uses TSSafeUnitConverter; public function Create(_obj: ChartSpace); - function Converte(); + function Convert(); private object_: ChartSpace; end; @@ -11,19 +11,19 @@ function ChartSpaceUnitDecorator.Create(_obj: ChartSpace); begin class(ChartSpace).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ChartSpaceUnitDecorator.Converte(); +function ChartSpaceUnitDecorator.Convert(); begin - self.XmlAttrXmlnsC.Value := object_.XmlAttrXmlnsC.Value; - self.XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.Date1904 := new PureValUnitDecorator(object_.Date1904); - self.Lang := new PureValUnitDecorator(object_.Lang); - if not ifnil(object_.XmlChildLang.Value) then self.XmlChildLang.Value := object_.XmlChildLang.Value; - self.AlternateContent := new AlternateContentUnitDecorator(object_.AlternateContent); - self.Chart := new ChartUnitDecorator(object_.Chart); - self.SpPr := new SpPrUnitDecorator(object_.SpPr); - self.ExternalData := new ExternalDataUnitDecorator(object_.ExternalData); + {self.}XmlAttrXmlnsC.Value := object_.XmlAttrXmlnsC.Value; + {self.}XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}Date1904 := new PureValUnitDecorator(object_.Date1904); + {self.}Lang := new PureValUnitDecorator(object_.Lang); + if not ifnil(object_.XmlChildLang.Value) then {self.}XmlChildLang.Value := object_.XmlChildLang.Value; + {self.}AlternateContent := new AlternateContentUnitDecorator(object_.AlternateContent); + {self.}Chart := new ChartUnitDecorator(object_.Chart); + {self.}SpPr := new SpPrUnitDecorator(object_.SpPr); + {self.}ExternalData := new ExternalDataUnitDecorator(object_.ExternalData); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ChartUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ChartUnitDecorator@DOCX.tsf index c691a34..0315f72 100644 --- a/autoclass/decorator/docx/ChartUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ChartUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ChartUnitDecorator = class(Chart) uses TSSafeUnitConverter; public function Create(_obj: Chart); - function Converte(); + function Convert(); private object_: Chart; end; @@ -11,17 +11,17 @@ function ChartUnitDecorator.Create(_obj: Chart); begin class(Chart).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ChartUnitDecorator.Converte(); +function ChartUnitDecorator.Convert(); begin - self.Title := new TitleUnitDecorator(object_.Title); - self.AutoTitleDeleted := new PureValUnitDecorator(object_.AutoTitleDeleted); - self.View3D := new View3DUnitDecorator(object_.View3D); - self.PlotArea := new PlotAreaUnitDecorator(object_.PlotArea); - self.Legend := new LegendUnitDecorator(object_.Legend); - self.PlotVisOnly := new PureValUnitDecorator(object_.PlotVisOnly); - self.DispBlanksAs := new PureValUnitDecorator(object_.DispBlanksAs); - self.ShowDLblsOverMax := new PureValUnitDecorator(object_.ShowDLblsOverMax); + {self.}Title := new TitleUnitDecorator(object_.Title); + {self.}AutoTitleDeleted := new PureValUnitDecorator(object_.AutoTitleDeleted); + {self.}View3D := new View3DUnitDecorator(object_.View3D); + {self.}PlotArea := new PlotAreaUnitDecorator(object_.PlotArea); + {self.}Legend := new LegendUnitDecorator(object_.Legend); + {self.}PlotVisOnly := new PureValUnitDecorator(object_.PlotVisOnly); + {self.}DispBlanksAs := new PureValUnitDecorator(object_.DispBlanksAs); + {self.}ShowDLblsOverMax := new PureValUnitDecorator(object_.ShowDLblsOverMax); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ChoiceUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ChoiceUnitDecorator@DOCX.tsf index 1700c06..d36dab9 100644 --- a/autoclass/decorator/docx/ChoiceUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ChoiceUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ChoiceUnitDecorator = class(Choice) uses TSSafeUnitConverter; public function Create(_obj: Choice); - function Converte(); + function Convert(); private object_: Choice; end; @@ -11,12 +11,12 @@ function ChoiceUnitDecorator.Create(_obj: Choice); begin class(Choice).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ChoiceUnitDecorator.Converte(); +function ChoiceUnitDecorator.Convert(); begin - self.XmlAttrRequires.Value := object_.XmlAttrRequires.Value; - self.XmlAttrXmlnsC14.Value := object_.XmlAttrXmlnsC14.Value; - self.Style := new PureValUnitDecorator(object_.Style); + {self.}XmlAttrRequires.Value := object_.XmlAttrRequires.Value; + {self.}XmlAttrXmlnsC14.Value := object_.XmlAttrXmlnsC14.Value; + {self.}Style := new PureValUnitDecorator(object_.Style); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/Clr1UnitDecorator@DOCX.tsf b/autoclass/decorator/docx/Clr1UnitDecorator@DOCX.tsf index dbbca49..128ce48 100644 --- a/autoclass/decorator/docx/Clr1UnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/Clr1UnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type Clr1UnitDecorator = class(Clr1) uses TSSafeUnitConverter; public function Create(_obj: Clr1); - function Converte(); + function Convert(); private object_: Clr1; end; @@ -11,10 +11,10 @@ function Clr1UnitDecorator.Create(_obj: Clr1); begin class(Clr1).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function Clr1UnitDecorator.Converte(); +function Clr1UnitDecorator.Convert(); begin - self.SysClr := new SysClrUnitDecorator(object_.SysClr); + {self.}SysClr := new SysClrUnitDecorator(object_.SysClr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/Clr2UnitDecorator@DOCX.tsf b/autoclass/decorator/docx/Clr2UnitDecorator@DOCX.tsf index 63fa632..43d577b 100644 --- a/autoclass/decorator/docx/Clr2UnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/Clr2UnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type Clr2UnitDecorator = class(Clr2) uses TSSafeUnitConverter; public function Create(_obj: Clr2); - function Converte(); + function Convert(); private object_: Clr2; end; @@ -11,10 +11,10 @@ function Clr2UnitDecorator.Create(_obj: Clr2); begin class(Clr2).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function Clr2UnitDecorator.Converte(); +function Clr2UnitDecorator.Convert(); begin - self.SrgbClr := new SrgbClrUnitDecorator(object_.SrgbClr); + {self.}SrgbClr := new SrgbClrUnitDecorator(object_.SrgbClr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ClrSchemeUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ClrSchemeUnitDecorator@DOCX.tsf index e817bce..50fdd90 100644 --- a/autoclass/decorator/docx/ClrSchemeUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ClrSchemeUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ClrSchemeUnitDecorator = class(ClrScheme) uses TSSafeUnitConverter; public function Create(_obj: ClrScheme); - function Converte(); + function Convert(); private object_: ClrScheme; end; @@ -11,22 +11,22 @@ function ClrSchemeUnitDecorator.Create(_obj: ClrScheme); begin class(ClrScheme).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ClrSchemeUnitDecorator.Converte(); +function ClrSchemeUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.Dk1 := new Clr1UnitDecorator(object_.Dk1); - self.Lt1 := new Clr1UnitDecorator(object_.Lt1); - self.Dk2 := new Clr2UnitDecorator(object_.Dk2); - self.Lt2 := new Clr2UnitDecorator(object_.Lt2); - self.Accent1 := new Clr2UnitDecorator(object_.Accent1); - self.Accent2 := new Clr2UnitDecorator(object_.Accent2); - self.Accent3 := new Clr2UnitDecorator(object_.Accent3); - self.Accent4 := new Clr2UnitDecorator(object_.Accent4); - self.Accent5 := new Clr2UnitDecorator(object_.Accent5); - self.Accent6 := new Clr2UnitDecorator(object_.Accent6); - self.Hlink := new Clr2UnitDecorator(object_.Hlink); - self.FolHlink := new Clr2UnitDecorator(object_.FolHlink); + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}Dk1 := new Clr1UnitDecorator(object_.Dk1); + {self.}Lt1 := new Clr1UnitDecorator(object_.Lt1); + {self.}Dk2 := new Clr2UnitDecorator(object_.Dk2); + {self.}Lt2 := new Clr2UnitDecorator(object_.Lt2); + {self.}Accent1 := new Clr2UnitDecorator(object_.Accent1); + {self.}Accent2 := new Clr2UnitDecorator(object_.Accent2); + {self.}Accent3 := new Clr2UnitDecorator(object_.Accent3); + {self.}Accent4 := new Clr2UnitDecorator(object_.Accent4); + {self.}Accent5 := new Clr2UnitDecorator(object_.Accent5); + {self.}Accent6 := new Clr2UnitDecorator(object_.Accent6); + {self.}Hlink := new Clr2UnitDecorator(object_.Hlink); + {self.}FolHlink := new Clr2UnitDecorator(object_.FolHlink); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ColorUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ColorUnitDecorator@DOCX.tsf index 69a79e6..583e7de 100644 --- a/autoclass/decorator/docx/ColorUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ColorUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ColorUnitDecorator = class(Color) uses TSSafeUnitConverter; public function Create(_obj: Color); - function Converte(); + function Convert(); private object_: Color; end; @@ -11,11 +11,11 @@ function ColorUnitDecorator.Create(_obj: Color); begin class(Color).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ColorUnitDecorator.Converte(); +function ColorUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.XmlAttrThemeColor.Value := object_.XmlAttrThemeColor.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrThemeColor.Value := object_.XmlAttrThemeColor.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ColsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ColsUnitDecorator@DOCX.tsf index 7940d7c..d93c60d 100644 --- a/autoclass/decorator/docx/ColsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ColsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ColsUnitDecorator = class(Cols) uses TSSafeUnitConverter; public function Create(_obj: Cols); - function Converte(); + function Convert(); private object_: Cols; end; @@ -11,10 +11,10 @@ function ColsUnitDecorator.Create(_obj: Cols); begin class(Cols).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ColsUnitDecorator.Converte(); +function ColsUnitDecorator.Convert(); begin - self.XmlAttrSpace.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrSpace.Value); + {self.}XmlAttrSpace.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrSpace.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CommentRangeUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CommentRangeUnitDecorator@DOCX.tsf index af14ec8..571f818 100644 --- a/autoclass/decorator/docx/CommentRangeUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CommentRangeUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CommentRangeUnitDecorator = class(CommentRange) uses TSSafeUnitConverter; public function Create(_obj: CommentRange); - function Converte(); + function Convert(); private object_: CommentRange; end; @@ -11,10 +11,10 @@ function CommentRangeUnitDecorator.Create(_obj: CommentRange); begin class(CommentRange).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CommentRangeUnitDecorator.Converte(); +function CommentRangeUnitDecorator.Convert(); begin - self.XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CommentUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CommentUnitDecorator@DOCX.tsf index 333c311..aec6014 100644 --- a/autoclass/decorator/docx/CommentUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CommentUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CommentUnitDecorator = class(Comment) uses TSSafeUnitConverter; public function Create(_obj: Comment); - function Converte(); + function Convert(); private object_: Comment; end; @@ -11,12 +11,12 @@ function CommentUnitDecorator.Create(_obj: Comment); begin class(Comment).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CommentUnitDecorator.Converte(); +function CommentUnitDecorator.Convert(); begin - self.XmlAttrAuthor.Value := object_.XmlAttrAuthor.Value; - self.XmlAttrDate.Value := object_.XmlAttrDate.Value; - self.XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrAuthor.Value := object_.XmlAttrAuthor.Value; + {self.}XmlAttrDate.Value := object_.XmlAttrDate.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CommentsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CommentsUnitDecorator@DOCX.tsf index 6d25562..03d1b87 100644 --- a/autoclass/decorator/docx/CommentsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CommentsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CommentsUnitDecorator = class(Comments) uses TSSafeUnitConverter; public function Create(_obj: Comments); - function Converte(); + function Convert(); private object_: Comments; end; @@ -11,27 +11,27 @@ function CommentsUnitDecorator.Create(_obj: Comments); begin class(Comments).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CommentsUnitDecorator.Converte(); +function CommentsUnitDecorator.Convert(); begin - self.XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; - self.XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; - self.XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; - self.XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW10.Value := object_.XmlAttrXmlnsW10.Value; - self.XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; - self.XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; - self.XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; - self.XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; - self.XmlAttrXmlnsWpsCustomData.Value := object_.XmlAttrXmlnsWpsCustomData.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW10.Value := object_.XmlAttrXmlnsW10.Value; + {self.}XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWpsCustomData.Value := object_.XmlAttrXmlnsWpsCustomData.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CompatSettingUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CompatSettingUnitDecorator@DOCX.tsf index c08673b..09829ff 100644 --- a/autoclass/decorator/docx/CompatSettingUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CompatSettingUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CompatSettingUnitDecorator = class(CompatSetting) uses TSSafeUnitConverter; public function Create(_obj: CompatSetting); - function Converte(); + function Convert(); private object_: CompatSetting; end; @@ -11,12 +11,12 @@ function CompatSettingUnitDecorator.Create(_obj: CompatSetting); begin class(CompatSetting).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CompatSettingUnitDecorator.Converte(); +function CompatSettingUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.XmlAttrUri.Value := object_.XmlAttrUri.Value; - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}XmlAttrUri.Value := object_.XmlAttrUri.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CompatUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CompatUnitDecorator@DOCX.tsf index eb34e71..a3eb9cc 100644 --- a/autoclass/decorator/docx/CompatUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CompatUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CompatUnitDecorator = class(Compat) uses TSSafeUnitConverter; public function Create(_obj: Compat); - function Converte(); + function Convert(); private object_: Compat; end; @@ -11,16 +11,16 @@ function CompatUnitDecorator.Create(_obj: Compat); begin class(Compat).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CompatUnitDecorator.Converte(); +function CompatUnitDecorator.Convert(); begin - if not ifnil(object_.XmlChildSpaceForUL.Value) then self.XmlChildSpaceForUL.Value := object_.XmlChildSpaceForUL.Value; - if not ifnil(object_.XmlChildBalanceSingleByteDoubleByteWidth.Value) then self.XmlChildBalanceSingleByteDoubleByteWidth.Value := object_.XmlChildBalanceSingleByteDoubleByteWidth.Value; - if not ifnil(object_.XmlChildDoNotLeaveBackslashAlone.Value) then self.XmlChildDoNotLeaveBackslashAlone.Value := object_.XmlChildDoNotLeaveBackslashAlone.Value; - if not ifnil(object_.XmlChildUlTrailSpace.Value) then self.XmlChildUlTrailSpace.Value := object_.XmlChildUlTrailSpace.Value; - if not ifnil(object_.XmlChildDoNotExpandShiftReturn.Value) then self.XmlChildDoNotExpandShiftReturn.Value := object_.XmlChildDoNotExpandShiftReturn.Value; - if not ifnil(object_.XmlChildAdjustLineHeightInTable.Value) then self.XmlChildAdjustLineHeightInTable.Value := object_.XmlChildAdjustLineHeightInTable.Value; - if not ifnil(object_.XmlChildUseFELayout.Value) then self.XmlChildUseFELayout.Value := object_.XmlChildUseFELayout.Value; + if not ifnil(object_.XmlChildSpaceForUL.Value) then {self.}XmlChildSpaceForUL.Value := object_.XmlChildSpaceForUL.Value; + if not ifnil(object_.XmlChildBalanceSingleByteDoubleByteWidth.Value) then {self.}XmlChildBalanceSingleByteDoubleByteWidth.Value := object_.XmlChildBalanceSingleByteDoubleByteWidth.Value; + if not ifnil(object_.XmlChildDoNotLeaveBackslashAlone.Value) then {self.}XmlChildDoNotLeaveBackslashAlone.Value := object_.XmlChildDoNotLeaveBackslashAlone.Value; + if not ifnil(object_.XmlChildUlTrailSpace.Value) then {self.}XmlChildUlTrailSpace.Value := object_.XmlChildUlTrailSpace.Value; + if not ifnil(object_.XmlChildDoNotExpandShiftReturn.Value) then {self.}XmlChildDoNotExpandShiftReturn.Value := object_.XmlChildDoNotExpandShiftReturn.Value; + if not ifnil(object_.XmlChildAdjustLineHeightInTable.Value) then {self.}XmlChildAdjustLineHeightInTable.Value := object_.XmlChildAdjustLineHeightInTable.Value; + if not ifnil(object_.XmlChildUseFELayout.Value) then {self.}XmlChildUseFELayout.Value := object_.XmlChildUseFELayout.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CorePropertiesUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CorePropertiesUnitDecorator@DOCX.tsf index da81f4f..515a577 100644 --- a/autoclass/decorator/docx/CorePropertiesUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CorePropertiesUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CorePropertiesUnitDecorator = class(CoreProperties) uses TSSafeUnitConverter; public function Create(_obj: CoreProperties); - function Converte(); + function Convert(); private object_: CoreProperties; end; @@ -11,16 +11,16 @@ function CorePropertiesUnitDecorator.Create(_obj: CoreProperties); begin class(CoreProperties).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CorePropertiesUnitDecorator.Converte(); +function CorePropertiesUnitDecorator.Convert(); begin - self.XmlAttrXmlnsCp.Value := object_.XmlAttrXmlnsCp.Value; - self.XmlAttrXmlnsDc.Value := object_.XmlAttrXmlnsDc.Value; - self.XmlAttrXmlnsDcterms.Value := object_.XmlAttrXmlnsDcterms.Value; - self.XmlAttrXmlnsDcmitype.Value := object_.XmlAttrXmlnsDcmitype.Value; - self.XmlAttrXmlnsXsi.Value := object_.XmlAttrXmlnsXsi.Value; - self.Created := new CreatedUnitDecorator(object_.Created); - self.Modified := new ModifiedUnitDecorator(object_.Modified); + {self.}XmlAttrXmlnsCp.Value := object_.XmlAttrXmlnsCp.Value; + {self.}XmlAttrXmlnsDc.Value := object_.XmlAttrXmlnsDc.Value; + {self.}XmlAttrXmlnsDcterms.Value := object_.XmlAttrXmlnsDcterms.Value; + {self.}XmlAttrXmlnsDcmitype.Value := object_.XmlAttrXmlnsDcmitype.Value; + {self.}XmlAttrXmlnsXsi.Value := object_.XmlAttrXmlnsXsi.Value; + {self.}Created := new CreatedUnitDecorator(object_.Created); + {self.}Modified := new ModifiedUnitDecorator(object_.Modified); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/CreatedUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/CreatedUnitDecorator@DOCX.tsf index 69eb27a..93adb0c 100644 --- a/autoclass/decorator/docx/CreatedUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/CreatedUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type CreatedUnitDecorator = class(Created) uses TSSafeUnitConverter; public function Create(_obj: Created); - function Converte(); + function Convert(); private object_: Created; end; @@ -11,10 +11,10 @@ function CreatedUnitDecorator.Create(_obj: Created); begin class(Created).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function CreatedUnitDecorator.Converte(); +function CreatedUnitDecorator.Convert(); begin - self.XmlAttrXsiType.Value := object_.XmlAttrXsiType.Value; + {self.}XmlAttrXsiType.Value := object_.XmlAttrXsiType.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DLblsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DLblsUnitDecorator@DOCX.tsf index 7fc121e..a5a9f1c 100644 --- a/autoclass/decorator/docx/DLblsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DLblsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DLblsUnitDecorator = class(DLbls) uses TSSafeUnitConverter; public function Create(_obj: DLbls); - function Converte(); + function Convert(); private object_: DLbls; end; @@ -11,18 +11,18 @@ function DLblsUnitDecorator.Create(_obj: DLbls); begin class(DLbls).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DLblsUnitDecorator.Converte(); +function DLblsUnitDecorator.Convert(); begin - self.SpPr := new SpPrUnitDecorator(object_.SpPr); - self.ShowLegendKey := new PureValUnitDecorator(object_.ShowLegendKey); - self.ShowVal := new PureValUnitDecorator(object_.ShowVal); - self.ShowCatName := new PureValUnitDecorator(object_.ShowCatName); - self.ShowSerName := new PureValUnitDecorator(object_.ShowSerName); - self.ShowPercent := new PureValUnitDecorator(object_.ShowPercent); - self.ShowBubbleSize := new PureValUnitDecorator(object_.ShowBubbleSize); - self.ShowLeaderLines := new PureValUnitDecorator(object_.ShowLeaderLines); - self.ExtLst := new ExtLstUnitDecorator(object_.ExtLst); + {self.}SpPr := new SpPrUnitDecorator(object_.SpPr); + {self.}ShowLegendKey := new PureValUnitDecorator(object_.ShowLegendKey); + {self.}ShowVal := new PureValUnitDecorator(object_.ShowVal); + {self.}ShowCatName := new PureValUnitDecorator(object_.ShowCatName); + {self.}ShowSerName := new PureValUnitDecorator(object_.ShowSerName); + {self.}ShowPercent := new PureValUnitDecorator(object_.ShowPercent); + {self.}ShowBubbleSize := new PureValUnitDecorator(object_.ShowBubbleSize); + {self.}ShowLeaderLines := new PureValUnitDecorator(object_.ShowLeaderLines); + {self.}ExtLst := new ExtLstUnitDecorator(object_.ExtLst); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DTableUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DTableUnitDecorator@DOCX.tsf index 47432fd..52f192d 100644 --- a/autoclass/decorator/docx/DTableUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DTableUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DTableUnitDecorator = class(DTable) uses TSSafeUnitConverter; public function Create(_obj: DTable); - function Converte(); + function Convert(); private object_: DTable; end; @@ -11,14 +11,14 @@ function DTableUnitDecorator.Create(_obj: DTable); begin class(DTable).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DTableUnitDecorator.Converte(); +function DTableUnitDecorator.Convert(); begin - self.ShowHorzBorder := new PureValUnitDecorator(object_.ShowHorzBorder); - self.ShowVertBorder := new PureValUnitDecorator(object_.ShowVertBorder); - self.ShowOutline := new PureValUnitDecorator(object_.ShowOutline); - self.ShowKeys := new PureValUnitDecorator(object_.ShowKeys); - self.TxPr := new TxPrUnitDecorator(object_.TxPr); + {self.}ShowHorzBorder := new PureValUnitDecorator(object_.ShowHorzBorder); + {self.}ShowVertBorder := new PureValUnitDecorator(object_.ShowVertBorder); + {self.}ShowOutline := new PureValUnitDecorator(object_.ShowOutline); + {self.}ShowKeys := new PureValUnitDecorator(object_.ShowKeys); + {self.}TxPr := new TxPrUnitDecorator(object_.TxPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DefaultUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DefaultUnitDecorator@DOCX.tsf index 0879a96..3459c0a 100644 --- a/autoclass/decorator/docx/DefaultUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DefaultUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DefaultUnitDecorator = class(Default) uses TSSafeUnitConverter; public function Create(_obj: Default); - function Converte(); + function Convert(); private object_: Default; end; @@ -11,11 +11,11 @@ function DefaultUnitDecorator.Create(_obj: Default); begin class(Default).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DefaultUnitDecorator.Converte(); +function DefaultUnitDecorator.Convert(); begin - self.XmlAttrExtension.Value := object_.XmlAttrExtension.Value; - self.XmlAttrContentType.Value := object_.XmlAttrContentType.Value; + {self.}XmlAttrExtension.Value := object_.XmlAttrExtension.Value; + {self.}XmlAttrContentType.Value := object_.XmlAttrContentType.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DocDefaultsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DocDefaultsUnitDecorator@DOCX.tsf index 9d6c92e..8eb6733 100644 --- a/autoclass/decorator/docx/DocDefaultsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DocDefaultsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DocDefaultsUnitDecorator = class(DocDefaults) uses TSSafeUnitConverter; public function Create(_obj: DocDefaults); - function Converte(); + function Convert(); private object_: DocDefaults; end; @@ -11,11 +11,11 @@ function DocDefaultsUnitDecorator.Create(_obj: DocDefaults); begin class(DocDefaults).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DocDefaultsUnitDecorator.Converte(); +function DocDefaultsUnitDecorator.Convert(); begin - self.RPrDefault := new RPrDefaultUnitDecorator(object_.RPrDefault); - self.PPrDefault := new PPrDefaultUnitDecorator(object_.PPrDefault); + {self.}RPrDefault := new RPrDefaultUnitDecorator(object_.RPrDefault); + {self.}PPrDefault := new PPrDefaultUnitDecorator(object_.PPrDefault); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DocGridUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DocGridUnitDecorator@DOCX.tsf index e47329f..0534582 100644 --- a/autoclass/decorator/docx/DocGridUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DocGridUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DocGridUnitDecorator = class(DocGrid) uses TSSafeUnitConverter; public function Create(_obj: DocGrid); - function Converte(); + function Convert(); private object_: DocGrid; end; @@ -11,11 +11,11 @@ function DocGridUnitDecorator.Create(_obj: DocGrid); begin class(DocGrid).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DocGridUnitDecorator.Converte(); +function DocGridUnitDecorator.Convert(); begin - self.XmlAttrType.Value := object_.XmlAttrType.Value; - self.XmlAttrLinePitch.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLinePitch.Value); + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrLinePitch.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLinePitch.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DocPartObjUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DocPartObjUnitDecorator@DOCX.tsf index 75ee2e2..c38554b 100644 --- a/autoclass/decorator/docx/DocPartObjUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DocPartObjUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DocPartObjUnitDecorator = class(DocPartObj) uses TSSafeUnitConverter; public function Create(_obj: DocPartObj); - function Converte(); + function Convert(); private object_: DocPartObj; end; @@ -11,11 +11,11 @@ function DocPartObjUnitDecorator.Create(_obj: DocPartObj); begin class(DocPartObj).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DocPartObjUnitDecorator.Converte(); +function DocPartObjUnitDecorator.Convert(); begin - self.DocPartGallery := new PureWValUnitDecorator(object_.DocPartGallery); - self.DocPartUnique := new PureValUnitDecorator(object_.DocPartUnique); + {self.}DocPartGallery := new PureWValUnitDecorator(object_.DocPartGallery); + {self.}DocPartUnique := new PureValUnitDecorator(object_.DocPartUnique); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DocPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DocPrUnitDecorator@DOCX.tsf index 6549009..a173926 100644 --- a/autoclass/decorator/docx/DocPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DocPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DocPrUnitDecorator = class(DocPr) uses TSSafeUnitConverter; public function Create(_obj: DocPr); - function Converte(); + function Convert(); private object_: DocPr; end; @@ -11,12 +11,12 @@ function DocPrUnitDecorator.Create(_obj: DocPr); begin class(DocPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DocPrUnitDecorator.Converte(); +function DocPrUnitDecorator.Convert(); begin - self.XmlAttrId.Value := object_.XmlAttrId.Value; - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.XmlAttrDescr.Value := object_.XmlAttrDescr.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}XmlAttrDescr.Value := object_.XmlAttrDescr.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DocumentUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DocumentUnitDecorator@DOCX.tsf index 4c6bb79..093494d 100644 --- a/autoclass/decorator/docx/DocumentUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DocumentUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DocumentUnitDecorator = class(Document) uses TSSafeUnitConverter; public function Create(_obj: Document); - function Converte(); + function Convert(); private object_: Document; end; @@ -11,23 +11,23 @@ function DocumentUnitDecorator.Create(_obj: Document); begin class(Document).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DocumentUnitDecorator.Converte(); +function DocumentUnitDecorator.Convert(); begin - self.XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; - self.XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; - self.XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; - self.XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; - self.Body := new BodyUnitDecorator(object_.Body); + {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}Body := new BodyUnitDecorator(object_.Body); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/DrawingUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/DrawingUnitDecorator@DOCX.tsf index cb64ed7..c187b7a 100644 --- a/autoclass/decorator/docx/DrawingUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/DrawingUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type DrawingUnitDecorator = class(Drawing) uses TSSafeUnitConverter; public function Create(_obj: Drawing); - function Converte(); + function Convert(); private object_: Drawing; end; @@ -11,10 +11,10 @@ function DrawingUnitDecorator.Create(_obj: Drawing); begin class(Drawing).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function DrawingUnitDecorator.Converte(); +function DrawingUnitDecorator.Convert(); begin - self._Inline := new _InlineUnitDecorator(object_._Inline); + {self.}_Inline := new _InlineUnitDecorator(object_._Inline); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/EffectExtentUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/EffectExtentUnitDecorator@DOCX.tsf index bf0f0b9..c6cbbb6 100644 --- a/autoclass/decorator/docx/EffectExtentUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/EffectExtentUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type EffectExtentUnitDecorator = class(EffectExtent) uses TSSafeUnitConverter; public function Create(_obj: EffectExtent); - function Converte(); + function Convert(); private object_: EffectExtent; end; @@ -11,13 +11,13 @@ function EffectExtentUnitDecorator.Create(_obj: EffectExtent); begin class(EffectExtent).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function EffectExtentUnitDecorator.Converte(); +function EffectExtentUnitDecorator.Convert(); begin - self.XmlAttrL.Value := object_.XmlAttrL.Value; - self.XmlAttrT.Value := object_.XmlAttrT.Value; - self.XmlAttrR.Value := object_.XmlAttrR.Value; - self.XmlAttrB.Value := object_.XmlAttrB.Value; + {self.}XmlAttrL.Value := object_.XmlAttrL.Value; + {self.}XmlAttrT.Value := object_.XmlAttrT.Value; + {self.}XmlAttrR.Value := object_.XmlAttrR.Value; + {self.}XmlAttrB.Value := object_.XmlAttrB.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/EffectLstUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/EffectLstUnitDecorator@DOCX.tsf index aff4155..9929dc1 100644 --- a/autoclass/decorator/docx/EffectLstUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/EffectLstUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type EffectLstUnitDecorator = class(EffectLst) uses TSSafeUnitConverter; public function Create(_obj: EffectLst); - function Converte(); + function Convert(); private object_: EffectLst; end; @@ -11,10 +11,10 @@ function EffectLstUnitDecorator.Create(_obj: EffectLst); begin class(EffectLst).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function EffectLstUnitDecorator.Converte(); +function EffectLstUnitDecorator.Convert(); begin - self.OuterShdw := new OuterShdwUnitDecorator(object_.OuterShdw); + {self.}OuterShdw := new OuterShdwUnitDecorator(object_.OuterShdw); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/EffectStyleLstUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/EffectStyleLstUnitDecorator@DOCX.tsf index 4e1bf17..0f83df8 100644 --- a/autoclass/decorator/docx/EffectStyleLstUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/EffectStyleLstUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type EffectStyleLstUnitDecorator = class(EffectStyleLst) uses TSSafeUnitConverter; public function Create(_obj: EffectStyleLst); - function Converte(); + function Convert(); private object_: EffectStyleLst; end; @@ -11,9 +11,9 @@ function EffectStyleLstUnitDecorator.Create(_obj: EffectStyleLst); begin class(EffectStyleLst).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function EffectStyleLstUnitDecorator.Converte(); +function EffectStyleLstUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/EffectStyleUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/EffectStyleUnitDecorator@DOCX.tsf index 2df0f1d..3ac9384 100644 --- a/autoclass/decorator/docx/EffectStyleUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/EffectStyleUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type EffectStyleUnitDecorator = class(EffectStyle) uses TSSafeUnitConverter; public function Create(_obj: EffectStyle); - function Converte(); + function Convert(); private object_: EffectStyle; end; @@ -11,10 +11,10 @@ function EffectStyleUnitDecorator.Create(_obj: EffectStyle); begin class(EffectStyle).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function EffectStyleUnitDecorator.Converte(); +function EffectStyleUnitDecorator.Convert(); begin - self.EffectLst := new EffectLstUnitDecorator(object_.EffectLst); + {self.}EffectLst := new EffectLstUnitDecorator(object_.EffectLst); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/EndnotePrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/EndnotePrUnitDecorator@DOCX.tsf index 8997465..e41bc1f 100644 --- a/autoclass/decorator/docx/EndnotePrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/EndnotePrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type EndnotePrUnitDecorator = class(EndnotePr) uses TSSafeUnitConverter; public function Create(_obj: EndnotePr); - function Converte(); + function Convert(); private object_: EndnotePr; end; @@ -11,9 +11,9 @@ function EndnotePrUnitDecorator.Create(_obj: EndnotePr); begin class(EndnotePr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function EndnotePrUnitDecorator.Converte(); +function EndnotePrUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/EndnoteUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/EndnoteUnitDecorator@DOCX.tsf index adcf13d..11728a7 100644 --- a/autoclass/decorator/docx/EndnoteUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/EndnoteUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type EndnoteUnitDecorator = class(Endnote) uses TSSafeUnitConverter; public function Create(_obj: Endnote); - function Converte(); + function Convert(); private object_: Endnote; end; @@ -11,11 +11,11 @@ function EndnoteUnitDecorator.Create(_obj: Endnote); begin class(Endnote).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function EndnoteUnitDecorator.Converte(); +function EndnoteUnitDecorator.Convert(); begin - self.XmlAttrType.Value := object_.XmlAttrType.Value; - self.XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/EndnotesUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/EndnotesUnitDecorator@DOCX.tsf index 437ab56..3559dae 100644 --- a/autoclass/decorator/docx/EndnotesUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/EndnotesUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type EndnotesUnitDecorator = class(Endnotes) uses TSSafeUnitConverter; public function Create(_obj: Endnotes); - function Converte(); + function Convert(); private object_: Endnotes; end; @@ -11,42 +11,42 @@ function EndnotesUnitDecorator.Create(_obj: Endnotes); begin class(Endnotes).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function EndnotesUnitDecorator.Converte(); +function EndnotesUnitDecorator.Convert(); begin - self.XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; - self.XmlAttrXmlnsCx.Value := object_.XmlAttrXmlnsCx.Value; - self.XmlAttrXmlnsCx1.Value := object_.XmlAttrXmlnsCx1.Value; - self.XmlAttrXmlnsCx2.Value := object_.XmlAttrXmlnsCx2.Value; - self.XmlAttrXmlnsCx3.Value := object_.XmlAttrXmlnsCx3.Value; - self.XmlAttrXmlnsCx4.Value := object_.XmlAttrXmlnsCx4.Value; - self.XmlAttrXmlnsCx5.Value := object_.XmlAttrXmlnsCx5.Value; - self.XmlAttrXmlnsCx6.Value := object_.XmlAttrXmlnsCx6.Value; - self.XmlAttrXmlnsCx7.Value := object_.XmlAttrXmlnsCx7.Value; - self.XmlAttrXmlnsCx8.Value := object_.XmlAttrXmlnsCx8.Value; - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsAink.Value := object_.XmlAttrXmlnsAink.Value; - self.XmlAttrXmlnsAm3d.Value := object_.XmlAttrXmlnsAm3d.Value; - self.XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; - self.XmlAttrXmlnsOel.Value := object_.XmlAttrXmlnsOel.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; - self.XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; - self.XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; - self.XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; - self.XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; - self.XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; - self.XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsCx.Value := object_.XmlAttrXmlnsCx.Value; + {self.}XmlAttrXmlnsCx1.Value := object_.XmlAttrXmlnsCx1.Value; + {self.}XmlAttrXmlnsCx2.Value := object_.XmlAttrXmlnsCx2.Value; + {self.}XmlAttrXmlnsCx3.Value := object_.XmlAttrXmlnsCx3.Value; + {self.}XmlAttrXmlnsCx4.Value := object_.XmlAttrXmlnsCx4.Value; + {self.}XmlAttrXmlnsCx5.Value := object_.XmlAttrXmlnsCx5.Value; + {self.}XmlAttrXmlnsCx6.Value := object_.XmlAttrXmlnsCx6.Value; + {self.}XmlAttrXmlnsCx7.Value := object_.XmlAttrXmlnsCx7.Value; + {self.}XmlAttrXmlnsCx8.Value := object_.XmlAttrXmlnsCx8.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsAink.Value := object_.XmlAttrXmlnsAink.Value; + {self.}XmlAttrXmlnsAm3d.Value := object_.XmlAttrXmlnsAm3d.Value; + {self.}XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsOel.Value := object_.XmlAttrXmlnsOel.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ExtLstUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ExtLstUnitDecorator@DOCX.tsf index 046a7bf..8cc5244 100644 --- a/autoclass/decorator/docx/ExtLstUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ExtLstUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ExtLstUnitDecorator = class(ExtLst) uses TSSafeUnitConverter; public function Create(_obj: ExtLst); - function Converte(); + function Convert(); private object_: ExtLst; end; @@ -11,9 +11,9 @@ function ExtLstUnitDecorator.Create(_obj: ExtLst); begin class(ExtLst).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ExtLstUnitDecorator.Converte(); +function ExtLstUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ExtUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ExtUnitDecorator@DOCX.tsf index 44e01a7..6922e19 100644 --- a/autoclass/decorator/docx/ExtUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ExtUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ExtUnitDecorator = class(Ext) uses TSSafeUnitConverter; public function Create(_obj: Ext); - function Converte(); + function Convert(); private object_: Ext; end; @@ -11,13 +11,13 @@ function ExtUnitDecorator.Create(_obj: Ext); begin class(Ext).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ExtUnitDecorator.Converte(); +function ExtUnitDecorator.Convert(); begin - self.XmlAttrUri.Value := object_.XmlAttrUri.Value; - self.XmlAttrXmlnsC16.Value := object_.XmlAttrXmlnsC16.Value; - self.Thm15ThemeFamily := new ThemeFamilyUnitDecorator(object_.Thm15ThemeFamily); - self.UniqueId := new PureValUnitDecorator(object_.UniqueId); + {self.}XmlAttrUri.Value := object_.XmlAttrUri.Value; + {self.}XmlAttrXmlnsC16.Value := object_.XmlAttrXmlnsC16.Value; + {self.}Thm15ThemeFamily := new ThemeFamilyUnitDecorator(object_.Thm15ThemeFamily); + {self.}UniqueId := new PureValUnitDecorator(object_.UniqueId); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ExternalDataUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ExternalDataUnitDecorator@DOCX.tsf index f0909bb..51f87e9 100644 --- a/autoclass/decorator/docx/ExternalDataUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ExternalDataUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ExternalDataUnitDecorator = class(ExternalData) uses TSSafeUnitConverter; public function Create(_obj: ExternalData); - function Converte(); + function Convert(); private object_: ExternalData; end; @@ -11,11 +11,11 @@ function ExternalDataUnitDecorator.Create(_obj: ExternalData); begin class(ExternalData).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ExternalDataUnitDecorator.Converte(); +function ExternalDataUnitDecorator.Convert(); begin - self.XmlAttrId.Value := object_.XmlAttrId.Value; - self.AutoUpdate := new PureValUnitDecorator(object_.AutoUpdate); + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}AutoUpdate := new PureValUnitDecorator(object_.AutoUpdate); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FallbackUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FallbackUnitDecorator@DOCX.tsf index 42cde3f..a99b67b 100644 --- a/autoclass/decorator/docx/FallbackUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FallbackUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FallbackUnitDecorator = class(Fallback) uses TSSafeUnitConverter; public function Create(_obj: Fallback); - function Converte(); + function Convert(); private object_: Fallback; end; @@ -11,10 +11,10 @@ function FallbackUnitDecorator.Create(_obj: Fallback); begin class(Fallback).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FallbackUnitDecorator.Converte(); +function FallbackUnitDecorator.Convert(); begin - self.Style := new PureValUnitDecorator(object_.Style); + {self.}Style := new PureValUnitDecorator(object_.Style); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FillStyleLstUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FillStyleLstUnitDecorator@DOCX.tsf index 2dc0552..d708237 100644 --- a/autoclass/decorator/docx/FillStyleLstUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FillStyleLstUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FillStyleLstUnitDecorator = class(FillStyleLst) uses TSSafeUnitConverter; public function Create(_obj: FillStyleLst); - function Converte(); + function Convert(); private object_: FillStyleLst; end; @@ -11,9 +11,9 @@ function FillStyleLstUnitDecorator.Create(_obj: FillStyleLst); begin class(FillStyleLst).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FillStyleLstUnitDecorator.Converte(); +function FillStyleLstUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FldCharUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FldCharUnitDecorator@DOCX.tsf index fb6d141..1efc054 100644 --- a/autoclass/decorator/docx/FldCharUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FldCharUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FldCharUnitDecorator = class(FldChar) uses TSSafeUnitConverter; public function Create(_obj: FldChar); - function Converte(); + function Convert(); private object_: FldChar; end; @@ -11,11 +11,11 @@ function FldCharUnitDecorator.Create(_obj: FldChar); begin class(FldChar).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FldCharUnitDecorator.Converte(); +function FldCharUnitDecorator.Convert(); begin - self.XmlAttrFldCharType.Value := object_.XmlAttrFldCharType.Value; - self.XmlAttrDirty.Value := object_.XmlAttrDirty.Value; + {self.}XmlAttrFldCharType.Value := object_.XmlAttrFldCharType.Value; + {self.}XmlAttrDirty.Value := object_.XmlAttrDirty.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FmtSchemeUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FmtSchemeUnitDecorator@DOCX.tsf index 96e1477..37b6d5a 100644 --- a/autoclass/decorator/docx/FmtSchemeUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FmtSchemeUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FmtSchemeUnitDecorator = class(FmtScheme) uses TSSafeUnitConverter; public function Create(_obj: FmtScheme); - function Converte(); + function Convert(); private object_: FmtScheme; end; @@ -11,14 +11,14 @@ function FmtSchemeUnitDecorator.Create(_obj: FmtScheme); begin class(FmtScheme).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FmtSchemeUnitDecorator.Converte(); +function FmtSchemeUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.FillStyleLst := new FillStyleLstUnitDecorator(object_.FillStyleLst); - self.LnStyleLst := new LnStyleLstUnitDecorator(object_.LnStyleLst); - self.EffectStyleLst := new EffectStyleLstUnitDecorator(object_.EffectStyleLst); - self.BgFillStyleLst := new FillStyleLstUnitDecorator(object_.BgFillStyleLst); + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}FillStyleLst := new FillStyleLstUnitDecorator(object_.FillStyleLst); + {self.}LnStyleLst := new LnStyleLstUnitDecorator(object_.LnStyleLst); + {self.}EffectStyleLst := new EffectStyleLstUnitDecorator(object_.EffectStyleLst); + {self.}BgFillStyleLst := new FillStyleLstUnitDecorator(object_.BgFillStyleLst); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FontSchemeUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FontSchemeUnitDecorator@DOCX.tsf index b562acb..29f42f6 100644 --- a/autoclass/decorator/docx/FontSchemeUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FontSchemeUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FontSchemeUnitDecorator = class(FontScheme) uses TSSafeUnitConverter; public function Create(_obj: FontScheme); - function Converte(); + function Convert(); private object_: FontScheme; end; @@ -11,12 +11,12 @@ function FontSchemeUnitDecorator.Create(_obj: FontScheme); begin class(FontScheme).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FontSchemeUnitDecorator.Converte(); +function FontSchemeUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.Majorfont := new MfontUnitDecorator(object_.Majorfont); - self.Minorfont := new MfontUnitDecorator(object_.Minorfont); + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}Majorfont := new MfontUnitDecorator(object_.Majorfont); + {self.}Minorfont := new MfontUnitDecorator(object_.Minorfont); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FontUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FontUnitDecorator@DOCX.tsf index 120adf1..2ded217 100644 --- a/autoclass/decorator/docx/FontUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FontUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FontUnitDecorator = class(Font) uses TSSafeUnitConverter; public function Create(_obj: Font); - function Converte(); + function Convert(); private object_: Font; end; @@ -11,16 +11,16 @@ function FontUnitDecorator.Create(_obj: Font); begin class(Font).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FontUnitDecorator.Converte(); +function FontUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.AltName := new PureWValUnitDecorator(object_.AltName); - self.Panosel := new PureWValUnitDecorator(object_.Panosel); - self.Charset := new PureWValUnitDecorator(object_.Charset); - self.Family := new PureWValUnitDecorator(object_.Family); - self.Pitch := new PureWValUnitDecorator(object_.Pitch); - self.Sig := new SigUnitDecorator(object_.Sig); + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}AltName := new PureWValUnitDecorator(object_.AltName); + {self.}Panosel := new PureWValUnitDecorator(object_.Panosel); + {self.}Charset := new PureWValUnitDecorator(object_.Charset); + {self.}Family := new PureWValUnitDecorator(object_.Family); + {self.}Pitch := new PureWValUnitDecorator(object_.Pitch); + {self.}Sig := new SigUnitDecorator(object_.Sig); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FontsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FontsUnitDecorator@DOCX.tsf index 17967c0..871c388 100644 --- a/autoclass/decorator/docx/FontsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FontsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FontsUnitDecorator = class(Fonts) uses TSSafeUnitConverter; public function Create(_obj: Fonts); - function Converte(); + function Convert(); private object_: Fonts; end; @@ -11,21 +11,21 @@ function FontsUnitDecorator.Create(_obj: Fonts); begin class(Fonts).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FontsUnitDecorator.Converte(); +function FontsUnitDecorator.Convert(); begin - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FootnotePrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FootnotePrUnitDecorator@DOCX.tsf index 6422e42..b0ef831 100644 --- a/autoclass/decorator/docx/FootnotePrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FootnotePrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FootnotePrUnitDecorator = class(FootnotePr) uses TSSafeUnitConverter; public function Create(_obj: FootnotePr); - function Converte(); + function Convert(); private object_: FootnotePr; end; @@ -11,9 +11,9 @@ function FootnotePrUnitDecorator.Create(_obj: FootnotePr); begin class(FootnotePr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FootnotePrUnitDecorator.Converte(); +function FootnotePrUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FootnoteUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FootnoteUnitDecorator@DOCX.tsf index 8438e51..7a2aca7 100644 --- a/autoclass/decorator/docx/FootnoteUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FootnoteUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FootnoteUnitDecorator = class(Footnote) uses TSSafeUnitConverter; public function Create(_obj: Footnote); - function Converte(); + function Convert(); private object_: Footnote; end; @@ -11,11 +11,11 @@ function FootnoteUnitDecorator.Create(_obj: Footnote); begin class(Footnote).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FootnoteUnitDecorator.Converte(); +function FootnoteUnitDecorator.Convert(); begin - self.XmlAttrType.Value := object_.XmlAttrType.Value; - self.XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FootnotesUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FootnotesUnitDecorator@DOCX.tsf index e2d7a53..f6c5d2b 100644 --- a/autoclass/decorator/docx/FootnotesUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FootnotesUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FootnotesUnitDecorator = class(Footnotes) uses TSSafeUnitConverter; public function Create(_obj: Footnotes); - function Converte(); + function Convert(); private object_: Footnotes; end; @@ -11,42 +11,42 @@ function FootnotesUnitDecorator.Create(_obj: Footnotes); begin class(Footnotes).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FootnotesUnitDecorator.Converte(); +function FootnotesUnitDecorator.Convert(); begin - self.XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; - self.XmlAttrXmlnsCx.Value := object_.XmlAttrXmlnsCx.Value; - self.XmlAttrXmlnsCx1.Value := object_.XmlAttrXmlnsCx1.Value; - self.XmlAttrXmlnsCx2.Value := object_.XmlAttrXmlnsCx2.Value; - self.XmlAttrXmlnsCx3.Value := object_.XmlAttrXmlnsCx3.Value; - self.XmlAttrXmlnsCx4.Value := object_.XmlAttrXmlnsCx4.Value; - self.XmlAttrXmlnsCx5.Value := object_.XmlAttrXmlnsCx5.Value; - self.XmlAttrXmlnsCx6.Value := object_.XmlAttrXmlnsCx6.Value; - self.XmlAttrXmlnsCx7.Value := object_.XmlAttrXmlnsCx7.Value; - self.XmlAttrXmlnsCx8.Value := object_.XmlAttrXmlnsCx8.Value; - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsAink.Value := object_.XmlAttrXmlnsAink.Value; - self.XmlAttrXmlnsAm3d.Value := object_.XmlAttrXmlnsAm3d.Value; - self.XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; - self.XmlAttrXmlnsOel.Value := object_.XmlAttrXmlnsOel.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; - self.XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; - self.XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; - self.XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; - self.XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; - self.XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; - self.XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsCx.Value := object_.XmlAttrXmlnsCx.Value; + {self.}XmlAttrXmlnsCx1.Value := object_.XmlAttrXmlnsCx1.Value; + {self.}XmlAttrXmlnsCx2.Value := object_.XmlAttrXmlnsCx2.Value; + {self.}XmlAttrXmlnsCx3.Value := object_.XmlAttrXmlnsCx3.Value; + {self.}XmlAttrXmlnsCx4.Value := object_.XmlAttrXmlnsCx4.Value; + {self.}XmlAttrXmlnsCx5.Value := object_.XmlAttrXmlnsCx5.Value; + {self.}XmlAttrXmlnsCx6.Value := object_.XmlAttrXmlnsCx6.Value; + {self.}XmlAttrXmlnsCx7.Value := object_.XmlAttrXmlnsCx7.Value; + {self.}XmlAttrXmlnsCx8.Value := object_.XmlAttrXmlnsCx8.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsAink.Value := object_.XmlAttrXmlnsAink.Value; + {self.}XmlAttrXmlnsAm3d.Value := object_.XmlAttrXmlnsAm3d.Value; + {self.}XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsOel.Value := object_.XmlAttrXmlnsOel.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/FtrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/FtrUnitDecorator@DOCX.tsf index e69a82e..8bc82b6 100644 --- a/autoclass/decorator/docx/FtrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/FtrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type FtrUnitDecorator = class(Ftr) uses TSSafeUnitConverter; public function Create(_obj: Ftr); - function Converte(); + function Convert(); private object_: Ftr; end; @@ -11,24 +11,24 @@ function FtrUnitDecorator.Create(_obj: Ftr); begin class(Ftr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function FtrUnitDecorator.Converte(); +function FtrUnitDecorator.Convert(); begin - self.XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsMo.Value := object_.XmlAttrXmlnsMo.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; - self.XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; - self.XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; - self.XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; - self.XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; - self.XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; - self.XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMo.Value := object_.XmlAttrXmlnsMo.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/GradFillUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/GradFillUnitDecorator@DOCX.tsf index 8835891..037b4cb 100644 --- a/autoclass/decorator/docx/GradFillUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/GradFillUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type GradFillUnitDecorator = class(GradFill) uses TSSafeUnitConverter; public function Create(_obj: GradFill); - function Converte(); + function Convert(); private object_: GradFill; end; @@ -11,12 +11,12 @@ function GradFillUnitDecorator.Create(_obj: GradFill); begin class(GradFill).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function GradFillUnitDecorator.Converte(); +function GradFillUnitDecorator.Convert(); begin - self.XmlAttrRotWithShape.Value := object_.XmlAttrRotWithShape.Value; - self.GsLst := new GsLstUnitDecorator(object_.GsLst); - self.Lin := new LinUnitDecorator(object_.Lin); + {self.}XmlAttrRotWithShape.Value := object_.XmlAttrRotWithShape.Value; + {self.}GsLst := new GsLstUnitDecorator(object_.GsLst); + {self.}Lin := new LinUnitDecorator(object_.Lin); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/GraphicDataUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/GraphicDataUnitDecorator@DOCX.tsf index 87fbb00..392acf3 100644 --- a/autoclass/decorator/docx/GraphicDataUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/GraphicDataUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type GraphicDataUnitDecorator = class(GraphicData) uses TSSafeUnitConverter; public function Create(_obj: GraphicData); - function Converte(); + function Convert(); private object_: GraphicData; end; @@ -11,12 +11,12 @@ function GraphicDataUnitDecorator.Create(_obj: GraphicData); begin class(GraphicData).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function GraphicDataUnitDecorator.Converte(); +function GraphicDataUnitDecorator.Convert(); begin - self.XmlAttrUri.Value := object_.XmlAttrUri.Value; - self.Pic := new PicUnitDecorator(object_.Pic); - self.Chart := new ChartUnitDecorator(object_.Chart); + {self.}XmlAttrUri.Value := object_.XmlAttrUri.Value; + {self.}Pic := new PicUnitDecorator(object_.Pic); + {self.}Chart := new ChartUnitDecorator(object_.Chart); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/GraphicFrameLocksUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/GraphicFrameLocksUnitDecorator@DOCX.tsf index 5ae766a..27518fa 100644 --- a/autoclass/decorator/docx/GraphicFrameLocksUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/GraphicFrameLocksUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type GraphicFrameLocksUnitDecorator = class(GraphicFrameLocks) uses TSSafeUnitConverter; public function Create(_obj: GraphicFrameLocks); - function Converte(); + function Convert(); private object_: GraphicFrameLocks; end; @@ -11,11 +11,11 @@ function GraphicFrameLocksUnitDecorator.Create(_obj: GraphicFrameLocks); begin class(GraphicFrameLocks).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function GraphicFrameLocksUnitDecorator.Converte(); +function GraphicFrameLocksUnitDecorator.Convert(); begin - self.XmlAttrNoChangeAspect.Value := object_.XmlAttrNoChangeAspect.Value; - self.XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; + {self.}XmlAttrNoChangeAspect.Value := object_.XmlAttrNoChangeAspect.Value; + {self.}XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/GraphicUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/GraphicUnitDecorator@DOCX.tsf index 42fbf8b..a26012b 100644 --- a/autoclass/decorator/docx/GraphicUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/GraphicUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type GraphicUnitDecorator = class(Graphic) uses TSSafeUnitConverter; public function Create(_obj: Graphic); - function Converte(); + function Convert(); private object_: Graphic; end; @@ -11,11 +11,11 @@ function GraphicUnitDecorator.Create(_obj: Graphic); begin class(Graphic).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function GraphicUnitDecorator.Converte(); +function GraphicUnitDecorator.Convert(); begin - self.XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; - self.GraphicData := new GraphicDataUnitDecorator(object_.GraphicData); + {self.}XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; + {self.}GraphicData := new GraphicDataUnitDecorator(object_.GraphicData); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/GridColUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/GridColUnitDecorator@DOCX.tsf index f5e6277..e9c5f0b 100644 --- a/autoclass/decorator/docx/GridColUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/GridColUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type GridColUnitDecorator = class(GridCol) uses TSSafeUnitConverter; public function Create(_obj: GridCol); - function Converte(); + function Convert(); private object_: GridCol; end; @@ -11,10 +11,10 @@ function GridColUnitDecorator.Create(_obj: GridCol); begin class(GridCol).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function GridColUnitDecorator.Converte(); +function GridColUnitDecorator.Convert(); begin - self.XmlAttrw.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrw.Value); + {self.}XmlAttrw.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrw.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/GsLstUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/GsLstUnitDecorator@DOCX.tsf index a0d8618..8765538 100644 --- a/autoclass/decorator/docx/GsLstUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/GsLstUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type GsLstUnitDecorator = class(GsLst) uses TSSafeUnitConverter; public function Create(_obj: GsLst); - function Converte(); + function Convert(); private object_: GsLst; end; @@ -11,9 +11,9 @@ function GsLstUnitDecorator.Create(_obj: GsLst); begin class(GsLst).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function GsLstUnitDecorator.Converte(); +function GsLstUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/GsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/GsUnitDecorator@DOCX.tsf index f83ba10..57063c3 100644 --- a/autoclass/decorator/docx/GsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/GsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type GsUnitDecorator = class(Gs) uses TSSafeUnitConverter; public function Create(_obj: Gs); - function Converte(); + function Convert(); private object_: Gs; end; @@ -11,11 +11,11 @@ function GsUnitDecorator.Create(_obj: Gs); begin class(Gs).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function GsUnitDecorator.Converte(); +function GsUnitDecorator.Convert(); begin - self.XmlAttrPos.Value := object_.XmlAttrPos.Value; - self.SchemeClr := new SchemeClrUnitDecorator(object_.SchemeClr); + {self.}XmlAttrPos.Value := object_.XmlAttrPos.Value; + {self.}SchemeClr := new SchemeClrUnitDecorator(object_.SchemeClr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/HdrShapeDefaultsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/HdrShapeDefaultsUnitDecorator@DOCX.tsf index 7c3b944..f078dc6 100644 --- a/autoclass/decorator/docx/HdrShapeDefaultsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/HdrShapeDefaultsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type HdrShapeDefaultsUnitDecorator = class(HdrShapeDefaults) uses TSSafeUnitConverter; public function Create(_obj: HdrShapeDefaults); - function Converte(); + function Convert(); private object_: HdrShapeDefaults; end; @@ -11,10 +11,10 @@ function HdrShapeDefaultsUnitDecorator.Create(_obj: HdrShapeDefaults); begin class(HdrShapeDefaults).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function HdrShapeDefaultsUnitDecorator.Converte(); +function HdrShapeDefaultsUnitDecorator.Convert(); begin - self.ShapeDefaults := new ShapeDefaultsUnitDecorator(object_.ShapeDefaults); + {self.}ShapeDefaults := new ShapeDefaultsUnitDecorator(object_.ShapeDefaults); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/HdrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/HdrUnitDecorator@DOCX.tsf index 9646d7b..10f97b5 100644 --- a/autoclass/decorator/docx/HdrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/HdrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type HdrUnitDecorator = class(Hdr) uses TSSafeUnitConverter; public function Create(_obj: Hdr); - function Converte(); + function Convert(); private object_: Hdr; end; @@ -11,24 +11,24 @@ function HdrUnitDecorator.Create(_obj: Hdr); begin class(Hdr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function HdrUnitDecorator.Converte(); +function HdrUnitDecorator.Convert(); begin - self.XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsMo.Value := object_.XmlAttrXmlnsMo.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; - self.XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; - self.XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; - self.XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; - self.XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; - self.XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; - self.XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMo.Value := object_.XmlAttrXmlnsMo.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/HyperLinkUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/HyperLinkUnitDecorator@DOCX.tsf index fe2f9a0..f033828 100644 --- a/autoclass/decorator/docx/HyperLinkUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/HyperLinkUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type HyperLinkUnitDecorator = class(HyperLink) uses TSSafeUnitConverter; public function Create(_obj: HyperLink); - function Converte(); + function Convert(); private object_: HyperLink; end; @@ -11,11 +11,11 @@ function HyperLinkUnitDecorator.Create(_obj: HyperLink); begin class(HyperLink).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function HyperLinkUnitDecorator.Converte(); +function HyperLinkUnitDecorator.Convert(); begin - self.XmlAttrId.Value := object_.XmlAttrId.Value; - self.XmlAttrHistory.Value := object_.XmlAttrHistory.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrHistory.Value := object_.XmlAttrHistory.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/IdMapUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/IdMapUnitDecorator@DOCX.tsf index e6d66d7..5583174 100644 --- a/autoclass/decorator/docx/IdMapUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/IdMapUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type IdMapUnitDecorator = class(IdMap) uses TSSafeUnitConverter; public function Create(_obj: IdMap); - function Converte(); + function Convert(); private object_: IdMap; end; @@ -11,11 +11,11 @@ function IdMapUnitDecorator.Create(_obj: IdMap); begin class(IdMap).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function IdMapUnitDecorator.Converte(); +function IdMapUnitDecorator.Convert(); begin - self.XmlAttrExt.Value := object_.XmlAttrExt.Value; - self.XmlAttrData.Value := object_.XmlAttrData.Value; + {self.}XmlAttrExt.Value := object_.XmlAttrExt.Value; + {self.}XmlAttrData.Value := object_.XmlAttrData.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/IndUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/IndUnitDecorator@DOCX.tsf index 3946191..38303b4 100644 --- a/autoclass/decorator/docx/IndUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/IndUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type IndUnitDecorator = class(Ind) uses TSSafeUnitConverter; public function Create(_obj: Ind); - function Converte(); + function Convert(); private object_: Ind; end; @@ -11,17 +11,17 @@ function IndUnitDecorator.Create(_obj: Ind); begin class(Ind).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function IndUnitDecorator.Converte(); +function IndUnitDecorator.Convert(); begin - self.XmlAttrFirstLineChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrFirstLineChars.Value); - self.XmlAttrFirstLine.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrFirstLine.Value); - self.XmlAttrRightChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrRightChars.Value); - self.XmlAttrRight.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrRight.Value); - self.XmlAttrLeftChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrLeftChars.Value); - self.XmlAttrLeft.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLeft.Value); - self.XmlAttrHanging.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrHanging.Value); - self.XmlAttrHangingChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrHangingChars.Value); + {self.}XmlAttrFirstLineChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrFirstLineChars.Value); + {self.}XmlAttrFirstLine.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrFirstLine.Value); + {self.}XmlAttrRightChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrRightChars.Value); + {self.}XmlAttrRight.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrRight.Value); + {self.}XmlAttrLeftChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrLeftChars.Value); + {self.}XmlAttrLeft.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLeft.Value); + {self.}XmlAttrHanging.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrHanging.Value); + {self.}XmlAttrHangingChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrHangingChars.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/InstrTextUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/InstrTextUnitDecorator@DOCX.tsf index 9de01f1..0d29652 100644 --- a/autoclass/decorator/docx/InstrTextUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/InstrTextUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type InstrTextUnitDecorator = class(InstrText) uses TSSafeUnitConverter; public function Create(_obj: InstrText); - function Converte(); + function Convert(); private object_: InstrText; end; @@ -11,10 +11,10 @@ function InstrTextUnitDecorator.Create(_obj: InstrText); begin class(InstrText).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function InstrTextUnitDecorator.Converte(); +function InstrTextUnitDecorator.Convert(); begin - self.XmlAttrSpace.Value := object_.XmlAttrSpace.Value; + {self.}XmlAttrSpace.Value := object_.XmlAttrSpace.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LangUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LangUnitDecorator@DOCX.tsf index d700e78..32d8383 100644 --- a/autoclass/decorator/docx/LangUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LangUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LangUnitDecorator = class(Lang) uses TSSafeUnitConverter; public function Create(_obj: Lang); - function Converte(); + function Convert(); private object_: Lang; end; @@ -11,12 +11,12 @@ function LangUnitDecorator.Create(_obj: Lang); begin class(Lang).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LangUnitDecorator.Converte(); +function LangUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.XmlAttrEastAsia.Value := object_.XmlAttrEastAsia.Value; - self.XmlAttrBidi.Value := object_.XmlAttrBidi.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrEastAsia.Value := object_.XmlAttrEastAsia.Value; + {self.}XmlAttrBidi.Value := object_.XmlAttrBidi.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LatenStylesUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LatenStylesUnitDecorator@DOCX.tsf index 9848d20..34065e0 100644 --- a/autoclass/decorator/docx/LatenStylesUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LatenStylesUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LatenStylesUnitDecorator = class(LatenStyles) uses TSSafeUnitConverter; public function Create(_obj: LatenStyles); - function Converte(); + function Convert(); private object_: LatenStyles; end; @@ -11,15 +11,15 @@ function LatenStylesUnitDecorator.Create(_obj: LatenStyles); begin class(LatenStyles).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LatenStylesUnitDecorator.Converte(); +function LatenStylesUnitDecorator.Convert(); begin - self.XmlAttrDefLickedState.Value := object_.XmlAttrDefLickedState.Value; - self.XmlAttrDefUIPriority.Value := object_.XmlAttrDefUIPriority.Value; - self.XmlAttrDefSemiHidden.Value := object_.XmlAttrDefSemiHidden.Value; - self.XmlAttrDefUnhideWhenUsed.Value := object_.XmlAttrDefUnhideWhenUsed.Value; - self.XmlAttrDefQFormat.Value := object_.XmlAttrDefQFormat.Value; - self.XmlAttrCount.Value := object_.XmlAttrCount.Value; + {self.}XmlAttrDefLickedState.Value := object_.XmlAttrDefLickedState.Value; + {self.}XmlAttrDefUIPriority.Value := object_.XmlAttrDefUIPriority.Value; + {self.}XmlAttrDefSemiHidden.Value := object_.XmlAttrDefSemiHidden.Value; + {self.}XmlAttrDefUnhideWhenUsed.Value := object_.XmlAttrDefUnhideWhenUsed.Value; + {self.}XmlAttrDefQFormat.Value := object_.XmlAttrDefQFormat.Value; + {self.}XmlAttrCount.Value := object_.XmlAttrCount.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LatinUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LatinUnitDecorator@DOCX.tsf index 26243df..095446d 100644 --- a/autoclass/decorator/docx/LatinUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LatinUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LatinUnitDecorator = class(Latin) uses TSSafeUnitConverter; public function Create(_obj: Latin); - function Converte(); + function Convert(); private object_: Latin; end; @@ -11,11 +11,11 @@ function LatinUnitDecorator.Create(_obj: Latin); begin class(Latin).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LatinUnitDecorator.Converte(); +function LatinUnitDecorator.Convert(); begin - self.XmlAttrTypeface.Value := object_.XmlAttrTypeface.Value; - self.XmlAttrPanose.Value := object_.XmlAttrPanose.Value; + {self.}XmlAttrTypeface.Value := object_.XmlAttrTypeface.Value; + {self.}XmlAttrPanose.Value := object_.XmlAttrPanose.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LegendUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LegendUnitDecorator@DOCX.tsf index 0005538..5c05bb9 100644 --- a/autoclass/decorator/docx/LegendUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LegendUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LegendUnitDecorator = class(Legend) uses TSSafeUnitConverter; public function Create(_obj: Legend); - function Converte(); + function Convert(); private object_: Legend; end; @@ -11,13 +11,13 @@ function LegendUnitDecorator.Create(_obj: Legend); begin class(Legend).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LegendUnitDecorator.Converte(); +function LegendUnitDecorator.Convert(); begin - self.LegendPos := new PureValUnitDecorator(object_.LegendPos); - if not ifnil(object_.XmlChildLayout.Value) then self.XmlChildLayout.Value := object_.XmlChildLayout.Value; - self.Overlay := new PureValUnitDecorator(object_.Overlay); - self.TxPr := new TxPrUnitDecorator(object_.TxPr); + {self.}LegendPos := new PureValUnitDecorator(object_.LegendPos); + if not ifnil(object_.XmlChildLayout.Value) then {self.}XmlChildLayout.Value := object_.XmlChildLayout.Value; + {self.}Overlay := new PureValUnitDecorator(object_.Overlay); + {self.}TxPr := new TxPrUnitDecorator(object_.TxPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LinUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LinUnitDecorator@DOCX.tsf index 0a218a9..8ee5ced 100644 --- a/autoclass/decorator/docx/LinUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LinUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LinUnitDecorator = class(Lin) uses TSSafeUnitConverter; public function Create(_obj: Lin); - function Converte(); + function Convert(); private object_: Lin; end; @@ -11,11 +11,11 @@ function LinUnitDecorator.Create(_obj: Lin); begin class(Lin).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LinUnitDecorator.Converte(); +function LinUnitDecorator.Convert(); begin - self.XmlAttrAng.Value := object_.XmlAttrAng.Value; - self.XmlAttrScaled.Value := object_.XmlAttrScaled.Value; + {self.}XmlAttrAng.Value := object_.XmlAttrAng.Value; + {self.}XmlAttrScaled.Value := object_.XmlAttrScaled.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LnStyleLstUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LnStyleLstUnitDecorator@DOCX.tsf index 2a9d32c..489406b 100644 --- a/autoclass/decorator/docx/LnStyleLstUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LnStyleLstUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LnStyleLstUnitDecorator = class(LnStyleLst) uses TSSafeUnitConverter; public function Create(_obj: LnStyleLst); - function Converte(); + function Convert(); private object_: LnStyleLst; end; @@ -11,9 +11,9 @@ function LnStyleLstUnitDecorator.Create(_obj: LnStyleLst); begin class(LnStyleLst).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LnStyleLstUnitDecorator.Converte(); +function LnStyleLstUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LnUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LnUnitDecorator@DOCX.tsf index 8c19732..dc36031 100644 --- a/autoclass/decorator/docx/LnUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LnUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LnUnitDecorator = class(Ln) uses TSSafeUnitConverter; public function Create(_obj: Ln); - function Converte(); + function Convert(); private object_: Ln; end; @@ -11,16 +11,16 @@ function LnUnitDecorator.Create(_obj: Ln); begin class(Ln).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LnUnitDecorator.Converte(); +function LnUnitDecorator.Convert(); begin - self.XmlAttrW.Value := object_.XmlAttrW.Value; - self.XmlAttrCap.Value := object_.XmlAttrCap.Value; - self.XmlAttrCmpd.Value := object_.XmlAttrCmpd.Value; - self.XmlAttrAlgn.Value := object_.XmlAttrAlgn.Value; - self.SolidFill := new SolidFillUnitDecorator(object_.SolidFill); - self.PrstDash := new PureValUnitDecorator(object_.PrstDash); - self.Miter := new MiterUnitDecorator(object_.Miter); + {self.}XmlAttrW.Value := object_.XmlAttrW.Value; + {self.}XmlAttrCap.Value := object_.XmlAttrCap.Value; + {self.}XmlAttrCmpd.Value := object_.XmlAttrCmpd.Value; + {self.}XmlAttrAlgn.Value := object_.XmlAttrAlgn.Value; + {self.}SolidFill := new SolidFillUnitDecorator(object_.SolidFill); + {self.}PrstDash := new PureValUnitDecorator(object_.PrstDash); + {self.}Miter := new MiterUnitDecorator(object_.Miter); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LsdExceptionUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LsdExceptionUnitDecorator@DOCX.tsf index ca9b381..5c76f24 100644 --- a/autoclass/decorator/docx/LsdExceptionUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LsdExceptionUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LsdExceptionUnitDecorator = class(LsdException) uses TSSafeUnitConverter; public function Create(_obj: LsdException); - function Converte(); + function Convert(); private object_: LsdException; end; @@ -11,14 +11,14 @@ function LsdExceptionUnitDecorator.Create(_obj: LsdException); begin class(LsdException).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LsdExceptionUnitDecorator.Converte(); +function LsdExceptionUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.XmlAttrUIPriority.Value := object_.XmlAttrUIPriority.Value; - self.XmlAttrSemiHidden.Value := object_.XmlAttrSemiHidden.Value; - self.XmlAttrUnhideWhenUsed.Value := object_.XmlAttrUnhideWhenUsed.Value; - self.XmlAttrQFormat.Value := object_.XmlAttrQFormat.Value; + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}XmlAttrUIPriority.Value := object_.XmlAttrUIPriority.Value; + {self.}XmlAttrSemiHidden.Value := object_.XmlAttrSemiHidden.Value; + {self.}XmlAttrUnhideWhenUsed.Value := object_.XmlAttrUnhideWhenUsed.Value; + {self.}XmlAttrQFormat.Value := object_.XmlAttrQFormat.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/LvlUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/LvlUnitDecorator@DOCX.tsf index 2fa765d..5ccf35c 100644 --- a/autoclass/decorator/docx/LvlUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/LvlUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type LvlUnitDecorator = class(Lvl) uses TSSafeUnitConverter; public function Create(_obj: Lvl); - function Converte(); + function Convert(); private object_: Lvl; end; @@ -11,19 +11,19 @@ function LvlUnitDecorator.Create(_obj: Lvl); begin class(Lvl).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function LvlUnitDecorator.Converte(); +function LvlUnitDecorator.Convert(); begin - self.XmlAttrIlvl.Value := object_.XmlAttrIlvl.Value; - self.XmlAttrTentative.Value := object_.XmlAttrTentative.Value; - self.Start := new PureWValUnitDecorator(object_.Start); - self.NumFmt := new PureWValUnitDecorator(object_.NumFmt); - self.PStyle := new PureWValUnitDecorator(object_.PStyle); - self.Suff := new PureWValUnitDecorator(object_.Suff); - self.LvlText := new PureWValUnitDecorator(object_.LvlText); - self.LvlJc := new PureWValUnitDecorator(object_.LvlJc); - self.PPr := new PPrUnitDecorator(object_.PPr); - self.RPr := new RPrUnitDecorator(object_.RPr); + {self.}XmlAttrIlvl.Value := object_.XmlAttrIlvl.Value; + {self.}XmlAttrTentative.Value := object_.XmlAttrTentative.Value; + {self.}Start := new PureWValUnitDecorator(object_.Start); + {self.}NumFmt := new PureWValUnitDecorator(object_.NumFmt); + {self.}PStyle := new PureWValUnitDecorator(object_.PStyle); + {self.}Suff := new PureWValUnitDecorator(object_.Suff); + {self.}LvlText := new PureWValUnitDecorator(object_.LvlText); + {self.}LvlJc := new PureWValUnitDecorator(object_.LvlJc); + {self.}PPr := new PPrUnitDecorator(object_.PPr); + {self.}RPr := new RPrUnitDecorator(object_.RPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/MFontFontUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/MFontFontUnitDecorator@DOCX.tsf index f69614b..668db24 100644 --- a/autoclass/decorator/docx/MFontFontUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/MFontFontUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type MFontFontUnitDecorator = class(MFontFont) uses TSSafeUnitConverter; public function Create(_obj: MFontFont); - function Converte(); + function Convert(); private object_: MFontFont; end; @@ -11,11 +11,11 @@ function MFontFontUnitDecorator.Create(_obj: MFontFont); begin class(MFontFont).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function MFontFontUnitDecorator.Converte(); +function MFontFontUnitDecorator.Convert(); begin - self.XmlAttrScript.Value := object_.XmlAttrScript.Value; - self.XmlAttrTypeface.Value := object_.XmlAttrTypeface.Value; + {self.}XmlAttrScript.Value := object_.XmlAttrScript.Value; + {self.}XmlAttrTypeface.Value := object_.XmlAttrTypeface.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/MFontUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/MFontUnitDecorator@DOCX.tsf index 40d0dab..7f0d905 100644 --- a/autoclass/decorator/docx/MFontUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/MFontUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type MFontUnitDecorator = class(MFont) uses TSSafeUnitConverter; public function Create(_obj: MFont); - function Converte(); + function Convert(); private object_: MFont; end; @@ -11,12 +11,12 @@ function MFontUnitDecorator.Create(_obj: MFont); begin class(MFont).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function MFontUnitDecorator.Converte(); +function MFontUnitDecorator.Convert(); begin - self.Latin := new LatinUnitDecorator(object_.Latin); - self.Ea := new LatinUnitDecorator(object_.Ea); - self.Cs := new LatinUnitDecorator(object_.Cs); + {self.}Latin := new LatinUnitDecorator(object_.Latin); + {self.}Ea := new LatinUnitDecorator(object_.Ea); + {self.}Cs := new LatinUnitDecorator(object_.Cs); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/MathPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/MathPrUnitDecorator@DOCX.tsf index ba53c5d..115fb5f 100644 --- a/autoclass/decorator/docx/MathPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/MathPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type MathPrUnitDecorator = class(MathPr) uses TSSafeUnitConverter; public function Create(_obj: MathPr); - function Converte(); + function Convert(); private object_: MathPr; end; @@ -11,20 +11,20 @@ function MathPrUnitDecorator.Create(_obj: MathPr); begin class(MathPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function MathPrUnitDecorator.Converte(); +function MathPrUnitDecorator.Convert(); begin - self.MathFont := new PureWValUnitDecorator(object_.MathFont); - self.BrkBin := new PureWValUnitDecorator(object_.BrkBin); - self.BrkBinSub := new PureWValUnitDecorator(object_.BrkBinSub); - self.SmallFrac := new PureWValUnitDecorator(object_.SmallFrac); - if not ifnil(object_.XmlChildDispDef.Value) then self.XmlChildDispDef.Value := object_.XmlChildDispDef.Value; - self.LMargin := new PureWValUnitDecorator(object_.LMargin); - self.RMargin := new PureWValUnitDecorator(object_.RMargin); - self.DefJc := new PureWValUnitDecorator(object_.DefJc); - self.WrapIndent := new PureWValUnitDecorator(object_.WrapIndent); - self.IntLim := new PureWValUnitDecorator(object_.IntLim); - self.NaryLim := new PureWValUnitDecorator(object_.NaryLim); + {self.}MathFont := new PureWValUnitDecorator(object_.MathFont); + {self.}BrkBin := new PureWValUnitDecorator(object_.BrkBin); + {self.}BrkBinSub := new PureWValUnitDecorator(object_.BrkBinSub); + {self.}SmallFrac := new PureWValUnitDecorator(object_.SmallFrac); + if not ifnil(object_.XmlChildDispDef.Value) then {self.}XmlChildDispDef.Value := object_.XmlChildDispDef.Value; + {self.}LMargin := new PureWValUnitDecorator(object_.LMargin); + {self.}RMargin := new PureWValUnitDecorator(object_.RMargin); + {self.}DefJc := new PureWValUnitDecorator(object_.DefJc); + {self.}WrapIndent := new PureWValUnitDecorator(object_.WrapIndent); + {self.}IntLim := new PureWValUnitDecorator(object_.IntLim); + {self.}NaryLim := new PureWValUnitDecorator(object_.NaryLim); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/MiterUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/MiterUnitDecorator@DOCX.tsf index 4e67042..e1f974e 100644 --- a/autoclass/decorator/docx/MiterUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/MiterUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type MiterUnitDecorator = class(Miter) uses TSSafeUnitConverter; public function Create(_obj: Miter); - function Converte(); + function Convert(); private object_: Miter; end; @@ -11,10 +11,10 @@ function MiterUnitDecorator.Create(_obj: Miter); begin class(Miter).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function MiterUnitDecorator.Converte(); +function MiterUnitDecorator.Convert(); begin - self.XmlAttrLim.Value := object_.XmlAttrLim.Value; + {self.}XmlAttrLim.Value := object_.XmlAttrLim.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ModifiedUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ModifiedUnitDecorator@DOCX.tsf index 8e0faaa..ff9ff57 100644 --- a/autoclass/decorator/docx/ModifiedUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ModifiedUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ModifiedUnitDecorator = class(Modified) uses TSSafeUnitConverter; public function Create(_obj: Modified); - function Converte(); + function Convert(); private object_: Modified; end; @@ -11,10 +11,10 @@ function ModifiedUnitDecorator.Create(_obj: Modified); begin class(Modified).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ModifiedUnitDecorator.Converte(); +function ModifiedUnitDecorator.Convert(); begin - self.XmlAttrXsiType.Value := object_.XmlAttrXsiType.Value; + {self.}XmlAttrXsiType.Value := object_.XmlAttrXsiType.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/NumFmtUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/NumFmtUnitDecorator@DOCX.tsf index a58a3c9..a2b09dc 100644 --- a/autoclass/decorator/docx/NumFmtUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/NumFmtUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type NumFmtUnitDecorator = class(NumFmt) uses TSSafeUnitConverter; public function Create(_obj: NumFmt); - function Converte(); + function Convert(); private object_: NumFmt; end; @@ -11,11 +11,11 @@ function NumFmtUnitDecorator.Create(_obj: NumFmt); begin class(NumFmt).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function NumFmtUnitDecorator.Converte(); +function NumFmtUnitDecorator.Convert(); begin - self.XmlAttrFormatCode.Value := object_.XmlAttrFormatCode.Value; - self.XmlAttrSourceLinked.Value := object_.XmlAttrSourceLinked.Value; + {self.}XmlAttrFormatCode.Value := object_.XmlAttrFormatCode.Value; + {self.}XmlAttrSourceLinked.Value := object_.XmlAttrSourceLinked.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/NumPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/NumPrUnitDecorator@DOCX.tsf index 1628ec8..05b57aa 100644 --- a/autoclass/decorator/docx/NumPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/NumPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type NumPrUnitDecorator = class(NumPr) uses TSSafeUnitConverter; public function Create(_obj: NumPr); - function Converte(); + function Convert(); private object_: NumPr; end; @@ -11,11 +11,11 @@ function NumPrUnitDecorator.Create(_obj: NumPr); begin class(NumPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function NumPrUnitDecorator.Converte(); +function NumPrUnitDecorator.Convert(); begin - self.Ilvl := new PureWValUnitDecorator(object_.Ilvl); - self.NumId := new PureWValUnitDecorator(object_.NumId); + {self.}Ilvl := new PureWValUnitDecorator(object_.Ilvl); + {self.}NumId := new PureWValUnitDecorator(object_.NumId); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/NumRefUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/NumRefUnitDecorator@DOCX.tsf index 8cf2c2e..108ce77 100644 --- a/autoclass/decorator/docx/NumRefUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/NumRefUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type NumRefUnitDecorator = class(NumRef) uses TSSafeUnitConverter; public function Create(_obj: NumRef); - function Converte(); + function Convert(); private object_: NumRef; end; @@ -11,10 +11,10 @@ function NumRefUnitDecorator.Create(_obj: NumRef); begin class(NumRef).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function NumRefUnitDecorator.Converte(); +function NumRefUnitDecorator.Convert(); begin - self.NumCache := new CacheUnitDecorator(object_.NumCache); + {self.}NumCache := new CacheUnitDecorator(object_.NumCache); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/NumUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/NumUnitDecorator@DOCX.tsf index 6d4babf..9234204 100644 --- a/autoclass/decorator/docx/NumUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/NumUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type NumUnitDecorator = class(Num) uses TSSafeUnitConverter; public function Create(_obj: Num); - function Converte(); + function Convert(); private object_: Num; end; @@ -11,11 +11,11 @@ function NumUnitDecorator.Create(_obj: Num); begin class(Num).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function NumUnitDecorator.Converte(); +function NumUnitDecorator.Convert(); begin - self.XmlAttrNumId.Value := object_.XmlAttrNumId.Value; - self.AbstractNumId := new PureWValUnitDecorator(object_.AbstractNumId); + {self.}XmlAttrNumId.Value := object_.XmlAttrNumId.Value; + {self.}AbstractNumId := new PureWValUnitDecorator(object_.AbstractNumId); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/NumberingUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/NumberingUnitDecorator@DOCX.tsf index 0d52fba..b3973c9 100644 --- a/autoclass/decorator/docx/NumberingUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/NumberingUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type NumberingUnitDecorator = class(Numbering) uses TSSafeUnitConverter; public function Create(_obj: Numbering); - function Converte(); + function Convert(); private object_: Numbering; end; @@ -11,44 +11,44 @@ function NumberingUnitDecorator.Create(_obj: Numbering); begin class(Numbering).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function NumberingUnitDecorator.Converte(); +function NumberingUnitDecorator.Convert(); begin - self.XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; - self.XmlAttrXmlnsCx.Value := object_.XmlAttrXmlnsCx.Value; - self.XmlAttrXmlnsCx1.Value := object_.XmlAttrXmlnsCx1.Value; - self.XmlAttrXmlnsCx2.Value := object_.XmlAttrXmlnsCx2.Value; - self.XmlAttrXmlnsCx3.Value := object_.XmlAttrXmlnsCx3.Value; - self.XmlAttrXmlnsCx4.Value := object_.XmlAttrXmlnsCx4.Value; - self.XmlAttrXmlnsCx5.Value := object_.XmlAttrXmlnsCx5.Value; - self.XmlAttrXmlnsCx6.Value := object_.XmlAttrXmlnsCx6.Value; - self.XmlAttrXmlnsCx7.Value := object_.XmlAttrXmlnsCx7.Value; - self.XmlAttrXmlnsCx8.Value := object_.XmlAttrXmlnsCx8.Value; - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsAink.Value := object_.XmlAttrXmlnsAink.Value; - self.XmlAttrXmlnsAm3d.Value := object_.XmlAttrXmlnsAm3d.Value; - self.XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; - self.XmlAttrXmlnsOel.Value := object_.XmlAttrXmlnsOel.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; - self.XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; - self.XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; - self.XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; - self.XmlAttrXmlnsW10.Value := object_.XmlAttrXmlnsW10.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; - self.XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; - self.XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; - self.XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsCx.Value := object_.XmlAttrXmlnsCx.Value; + {self.}XmlAttrXmlnsCx1.Value := object_.XmlAttrXmlnsCx1.Value; + {self.}XmlAttrXmlnsCx2.Value := object_.XmlAttrXmlnsCx2.Value; + {self.}XmlAttrXmlnsCx3.Value := object_.XmlAttrXmlnsCx3.Value; + {self.}XmlAttrXmlnsCx4.Value := object_.XmlAttrXmlnsCx4.Value; + {self.}XmlAttrXmlnsCx5.Value := object_.XmlAttrXmlnsCx5.Value; + {self.}XmlAttrXmlnsCx6.Value := object_.XmlAttrXmlnsCx6.Value; + {self.}XmlAttrXmlnsCx7.Value := object_.XmlAttrXmlnsCx7.Value; + {self.}XmlAttrXmlnsCx8.Value := object_.XmlAttrXmlnsCx8.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsAink.Value := object_.XmlAttrXmlnsAink.Value; + {self.}XmlAttrXmlnsAm3d.Value := object_.XmlAttrXmlnsAm3d.Value; + {self.}XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsOel.Value := object_.XmlAttrXmlnsOel.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsWp14.Value := object_.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp.Value := object_.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsW10.Value := object_.XmlAttrXmlnsW10.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsWpg.Value := object_.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpi.Value := object_.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWne.Value := object_.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWps.Value := object_.XmlAttrXmlnsWps.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/NvPicPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/NvPicPrUnitDecorator@DOCX.tsf index 4674014..7adf9d0 100644 --- a/autoclass/decorator/docx/NvPicPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/NvPicPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type NvPicPrUnitDecorator = class(NvPicPr) uses TSSafeUnitConverter; public function Create(_obj: NvPicPr); - function Converte(); + function Convert(); private object_: NvPicPr; end; @@ -11,11 +11,11 @@ function NvPicPrUnitDecorator.Create(_obj: NvPicPr); begin class(NvPicPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function NvPicPrUnitDecorator.Converte(); +function NvPicPrUnitDecorator.Convert(); begin - self.CNvPr := new CNvPrUnitDecorator(object_.CNvPr); - self.CNvPicPr := new CNvPicPrUnitDecorator(object_.CNvPicPr); + {self.}CNvPr := new CNvPrUnitDecorator(object_.CNvPr); + {self.}CNvPicPr := new CNvPicPrUnitDecorator(object_.CNvPicPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/OuterShdwUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/OuterShdwUnitDecorator@DOCX.tsf index 024416d..69ae790 100644 --- a/autoclass/decorator/docx/OuterShdwUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/OuterShdwUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type OuterShdwUnitDecorator = class(OuterShdw) uses TSSafeUnitConverter; public function Create(_obj: OuterShdw); - function Converte(); + function Convert(); private object_: OuterShdw; end; @@ -11,15 +11,15 @@ function OuterShdwUnitDecorator.Create(_obj: OuterShdw); begin class(OuterShdw).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function OuterShdwUnitDecorator.Converte(); +function OuterShdwUnitDecorator.Convert(); begin - self.XmlAttrBlurRad.Value := object_.XmlAttrBlurRad.Value; - self.XmlAttrDist.Value := object_.XmlAttrDist.Value; - self.XmlAttrDir.Value := object_.XmlAttrDir.Value; - self.XmlAttrAlgn.Value := object_.XmlAttrAlgn.Value; - self.XmlAttrRotWithShape.Value := object_.XmlAttrRotWithShape.Value; - self.SrgbClr := new SrgbClrUnitDecorator(object_.SrgbClr); + {self.}XmlAttrBlurRad.Value := object_.XmlAttrBlurRad.Value; + {self.}XmlAttrDist.Value := object_.XmlAttrDist.Value; + {self.}XmlAttrDir.Value := object_.XmlAttrDir.Value; + {self.}XmlAttrAlgn.Value := object_.XmlAttrAlgn.Value; + {self.}XmlAttrRotWithShape.Value := object_.XmlAttrRotWithShape.Value; + {self.}SrgbClr := new SrgbClrUnitDecorator(object_.SrgbClr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PBdrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PBdrUnitDecorator@DOCX.tsf index 03bf401..f814e4e 100644 --- a/autoclass/decorator/docx/PBdrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PBdrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PBdrUnitDecorator = class(PBdr) uses TSSafeUnitConverter; public function Create(_obj: PBdr); - function Converte(); + function Convert(); private object_: PBdr; end; @@ -11,10 +11,10 @@ function PBdrUnitDecorator.Create(_obj: PBdr); begin class(PBdr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PBdrUnitDecorator.Converte(); +function PBdrUnitDecorator.Convert(); begin - self.Top := new PureValUnitDecorator(object_.Top); + {self.}Top := new PureValUnitDecorator(object_.Top); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PPrDefaultUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PPrDefaultUnitDecorator@DOCX.tsf index bcf5c6f..d0436dd 100644 --- a/autoclass/decorator/docx/PPrDefaultUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PPrDefaultUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PPrDefaultUnitDecorator = class(PPrDefault) uses TSSafeUnitConverter; public function Create(_obj: PPrDefault); - function Converte(); + function Convert(); private object_: PPrDefault; end; @@ -11,10 +11,10 @@ function PPrDefaultUnitDecorator.Create(_obj: PPrDefault); begin class(PPrDefault).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PPrDefaultUnitDecorator.Converte(); +function PPrDefaultUnitDecorator.Convert(); begin - self.PPr := new PPrUnitDecorator(object_.PPr); + {self.}PPr := new PPrUnitDecorator(object_.PPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PPrUnitDecorator@DOCX.tsf index f9fa279..0f5d532 100644 --- a/autoclass/decorator/docx/PPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PPrUnitDecorator = class(PPr) uses TSSafeUnitConverter; public function Create(_obj: PPr); - function Converte(); + function Convert(); private object_: PPr; end; @@ -11,27 +11,27 @@ function PPrUnitDecorator.Create(_obj: PPr); begin class(PPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PPrUnitDecorator.Converte(); +function PPrUnitDecorator.Convert(); begin - self.SectPr := new SectPrUnitDecorator(object_.SectPr); - self.Tabs := new TabsUnitDecorator(object_.Tabs); - if not ifnil(object_.XmlChildWidowControl.Value) then self.XmlChildWidowControl.Value := object_.XmlChildWidowControl.Value; - self.SnapToGrid := new PureWValUnitDecorator(object_.SnapToGrid); - self.PStyle := new PureWValUnitDecorator(object_.PStyle); - self.NumPr := new NumPrUnitDecorator(object_.NumPr); - self.Jc := new PureWValUnitDecorator(object_.Jc); - self.Ind := new IndUnitDecorator(object_.Ind); - if not ifnil(object_.XmlChildKeepNext.Value) then self.XmlChildKeepNext.Value := object_.XmlChildKeepNext.Value; - if not ifnil(object_.XmlChildKeepLines.Value) then self.XmlChildKeepLines.Value := object_.XmlChildKeepLines.Value; - self.AdjustRightInd := new PureWValUnitDecorator(object_.AdjustRightInd); - self.Spacing := new SpacingUnitDecorator(object_.Spacing); - self.OutlineLvl := new PureWValUnitDecorator(object_.OutlineLvl); - self.AutoSpaceDE := new PureWValUnitDecorator(object_.AutoSpaceDE); - self.AutoSpaceDN := new PureWValUnitDecorator(object_.AutoSpaceDN); - self.RPr := new RPrUnitDecorator(object_.RPr); - self.PBdr := new PBdrUnitDecorator(object_.PBdr); - if not ifnil(object_.XmlChildContextualSpacing.Value) then self.XmlChildContextualSpacing.Value := object_.XmlChildContextualSpacing.Value; + {self.}SectPr := new SectPrUnitDecorator(object_.SectPr); + {self.}Tabs := new TabsUnitDecorator(object_.Tabs); + if not ifnil(object_.XmlChildWidowControl.Value) then {self.}XmlChildWidowControl.Value := object_.XmlChildWidowControl.Value; + {self.}SnapToGrid := new PureWValUnitDecorator(object_.SnapToGrid); + {self.}PStyle := new PureWValUnitDecorator(object_.PStyle); + {self.}NumPr := new NumPrUnitDecorator(object_.NumPr); + {self.}Jc := new PureWValUnitDecorator(object_.Jc); + {self.}Ind := new IndUnitDecorator(object_.Ind); + if not ifnil(object_.XmlChildKeepNext.Value) then {self.}XmlChildKeepNext.Value := object_.XmlChildKeepNext.Value; + if not ifnil(object_.XmlChildKeepLines.Value) then {self.}XmlChildKeepLines.Value := object_.XmlChildKeepLines.Value; + {self.}AdjustRightInd := new PureWValUnitDecorator(object_.AdjustRightInd); + {self.}Spacing := new SpacingUnitDecorator(object_.Spacing); + {self.}OutlineLvl := new PureWValUnitDecorator(object_.OutlineLvl); + {self.}AutoSpaceDE := new PureWValUnitDecorator(object_.AutoSpaceDE); + {self.}AutoSpaceDN := new PureWValUnitDecorator(object_.AutoSpaceDN); + {self.}RPr := new RPrUnitDecorator(object_.RPr); + {self.}PBdr := new PBdrUnitDecorator(object_.PBdr); + if not ifnil(object_.XmlChildContextualSpacing.Value) then {self.}XmlChildContextualSpacing.Value := object_.XmlChildContextualSpacing.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PUnitDecorator@DOCX.tsf index 3ec8213..7dfec7f 100644 --- a/autoclass/decorator/docx/PUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PUnitDecorator = class(P) uses TSSafeUnitConverter; public function Create(_obj: P); - function Converte(); + function Convert(); private object_: P; end; @@ -11,16 +11,16 @@ function PUnitDecorator.Create(_obj: P); begin class(P).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PUnitDecorator.Converte(); +function PUnitDecorator.Convert(); begin - self.XmlAttrW14ParaId.Value := object_.XmlAttrW14ParaId.Value; - self.XmlAttrW14TextId.Value := object_.XmlAttrW14TextId.Value; - self.XmlAttrWRsidR.Value := object_.XmlAttrWRsidR.Value; - self.XmlAttrWRsidRPr.Value := object_.XmlAttrWRsidRPr.Value; - self.XmlAttrWRsidRDefault.Value := object_.XmlAttrWRsidRDefault.Value; - self.XmlAttrWRsidP.Value := object_.XmlAttrWRsidP.Value; - self.PPr := new PPrUnitDecorator(object_.PPr); + {self.}XmlAttrW14ParaId.Value := object_.XmlAttrW14ParaId.Value; + {self.}XmlAttrW14TextId.Value := object_.XmlAttrW14TextId.Value; + {self.}XmlAttrWRsidR.Value := object_.XmlAttrWRsidR.Value; + {self.}XmlAttrWRsidRPr.Value := object_.XmlAttrWRsidRPr.Value; + {self.}XmlAttrWRsidRDefault.Value := object_.XmlAttrWRsidRDefault.Value; + {self.}XmlAttrWRsidP.Value := object_.XmlAttrWRsidP.Value; + {self.}PPr := new PPrUnitDecorator(object_.PPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PgMarUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PgMarUnitDecorator@DOCX.tsf index f64040f..2021518 100644 --- a/autoclass/decorator/docx/PgMarUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PgMarUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PgMarUnitDecorator = class(PgMar) uses TSSafeUnitConverter; public function Create(_obj: PgMar); - function Converte(); + function Convert(); private object_: PgMar; end; @@ -11,16 +11,16 @@ function PgMarUnitDecorator.Create(_obj: PgMar); begin class(PgMar).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PgMarUnitDecorator.Converte(); +function PgMarUnitDecorator.Convert(); begin - self.XmlAttrTop.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrTop.Value); - self.XmlAttrRight.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrRight.Value); - self.XmlAttrBottom.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrBottom.Value); - self.XmlAttrLeft.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLeft.Value); - self.XmlAttrHeader.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrHeader.Value); - self.XmlAttrFooter.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrFooter.Value); - self.XmlAttrGutter.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrGutter.Value); + {self.}XmlAttrTop.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrTop.Value); + {self.}XmlAttrRight.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrRight.Value); + {self.}XmlAttrBottom.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrBottom.Value); + {self.}XmlAttrLeft.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLeft.Value); + {self.}XmlAttrHeader.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrHeader.Value); + {self.}XmlAttrFooter.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrFooter.Value); + {self.}XmlAttrGutter.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrGutter.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PgNumTypeUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PgNumTypeUnitDecorator@DOCX.tsf index 9acd1f5..78ca0ae 100644 --- a/autoclass/decorator/docx/PgNumTypeUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PgNumTypeUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PgNumTypeUnitDecorator = class(PgNumType) uses TSSafeUnitConverter; public function Create(_obj: PgNumType); - function Converte(); + function Convert(); private object_: PgNumType; end; @@ -11,10 +11,10 @@ function PgNumTypeUnitDecorator.Create(_obj: PgNumType); begin class(PgNumType).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PgNumTypeUnitDecorator.Converte(); +function PgNumTypeUnitDecorator.Convert(); begin - self.XmlAttrStart.Value := object_.XmlAttrStart.Value; + {self.}XmlAttrStart.Value := object_.XmlAttrStart.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PgSzUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PgSzUnitDecorator@DOCX.tsf index 80617ae..a4ec058 100644 --- a/autoclass/decorator/docx/PgSzUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PgSzUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PgSzUnitDecorator = class(PgSz) uses TSSafeUnitConverter; public function Create(_obj: PgSz); - function Converte(); + function Convert(); private object_: PgSz; end; @@ -11,12 +11,12 @@ function PgSzUnitDecorator.Create(_obj: PgSz); begin class(PgSz).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PgSzUnitDecorator.Converte(); +function PgSzUnitDecorator.Convert(); begin - self.XmlAttrW.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrW.Value); - self.XmlAttrH.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrH.Value); - self.XmlAttrOrient.Value := object_.XmlAttrOrient.Value; + {self.}XmlAttrW.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrW.Value); + {self.}XmlAttrH.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrH.Value); + {self.}XmlAttrOrient.Value := object_.XmlAttrOrient.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PicLocksUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PicLocksUnitDecorator@DOCX.tsf index 62176a1..85d1415 100644 --- a/autoclass/decorator/docx/PicLocksUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PicLocksUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PicLocksUnitDecorator = class(PicLocks) uses TSSafeUnitConverter; public function Create(_obj: PicLocks); - function Converte(); + function Convert(); private object_: PicLocks; end; @@ -11,10 +11,10 @@ function PicLocksUnitDecorator.Create(_obj: PicLocks); begin class(PicLocks).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PicLocksUnitDecorator.Converte(); +function PicLocksUnitDecorator.Convert(); begin - self.XmlAttrNoChangeAspect.Value := object_.XmlAttrNoChangeAspect.Value; + {self.}XmlAttrNoChangeAspect.Value := object_.XmlAttrNoChangeAspect.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PicUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PicUnitDecorator@DOCX.tsf index 7f9bcc2..13a4bc8 100644 --- a/autoclass/decorator/docx/PicUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PicUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PicUnitDecorator = class(Pic) uses TSSafeUnitConverter; public function Create(_obj: Pic); - function Converte(); + function Convert(); private object_: Pic; end; @@ -11,13 +11,13 @@ function PicUnitDecorator.Create(_obj: Pic); begin class(Pic).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PicUnitDecorator.Converte(); +function PicUnitDecorator.Convert(); begin - self.XmlAttrXmlnsPic.Value := object_.XmlAttrXmlnsPic.Value; - self.NvPicPr := new NvPicPrUnitDecorator(object_.NvPicPr); - self.BlipFill := new BlipFillUnitDecorator(object_.BlipFill); - self.SpPr := new SpPrUnitDecorator(object_.SpPr); + {self.}XmlAttrXmlnsPic.Value := object_.XmlAttrXmlnsPic.Value; + {self.}NvPicPr := new NvPicPrUnitDecorator(object_.NvPicPr); + {self.}BlipFill := new BlipFillUnitDecorator(object_.BlipFill); + {self.}SpPr := new SpPrUnitDecorator(object_.SpPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PlotAreaUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PlotAreaUnitDecorator@DOCX.tsf index 2fbdf5c..b85a04e 100644 --- a/autoclass/decorator/docx/PlotAreaUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PlotAreaUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PlotAreaUnitDecorator = class(PlotArea) uses TSSafeUnitConverter; public function Create(_obj: PlotArea); - function Converte(); + function Convert(); private object_: PlotArea; end; @@ -11,15 +11,15 @@ function PlotAreaUnitDecorator.Create(_obj: PlotArea); begin class(PlotArea).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PlotAreaUnitDecorator.Converte(); +function PlotAreaUnitDecorator.Convert(); begin - if not ifnil(object_.XmlChildLayout.Value) then self.XmlChildLayout.Value := object_.XmlChildLayout.Value; - self.BarChart := new BarChartUnitDecorator(object_.BarChart); - self.CatAx := new AxUnitDecorator(object_.CatAx); - self.ValAx := new AxUnitDecorator(object_.ValAx); - self.DTable := new DTableUnitDecorator(object_.DTable); - self.SpPr := new SpPrUnitDecorator(object_.SpPr); + if not ifnil(object_.XmlChildLayout.Value) then {self.}XmlChildLayout.Value := object_.XmlChildLayout.Value; + {self.}BarChart := new BarChartUnitDecorator(object_.BarChart); + {self.}CatAx := new AxUnitDecorator(object_.CatAx); + {self.}ValAx := new AxUnitDecorator(object_.ValAx); + {self.}DTable := new DTableUnitDecorator(object_.DTable); + {self.}SpPr := new SpPrUnitDecorator(object_.SpPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PropertiesUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PropertiesUnitDecorator@DOCX.tsf index 655b833..960f8e5 100644 --- a/autoclass/decorator/docx/PropertiesUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PropertiesUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PropertiesUnitDecorator = class(Properties) uses TSSafeUnitConverter; public function Create(_obj: Properties); - function Converte(); + function Convert(); private object_: Properties; end; @@ -11,11 +11,11 @@ function PropertiesUnitDecorator.Create(_obj: Properties); begin class(Properties).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PropertiesUnitDecorator.Converte(); +function PropertiesUnitDecorator.Convert(); begin - self.XmlAttrXmlns.Value := object_.XmlAttrXmlns.Value; - self.XmlAttrXmlnsVt.Value := object_.XmlAttrXmlnsVt.Value; + {self.}XmlAttrXmlns.Value := object_.XmlAttrXmlns.Value; + {self.}XmlAttrXmlnsVt.Value := object_.XmlAttrXmlnsVt.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PrstGeomUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PrstGeomUnitDecorator@DOCX.tsf index b79818d..51407bf 100644 --- a/autoclass/decorator/docx/PrstGeomUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PrstGeomUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PrstGeomUnitDecorator = class(PrstGeom) uses TSSafeUnitConverter; public function Create(_obj: PrstGeom); - function Converte(); + function Convert(); private object_: PrstGeom; end; @@ -11,11 +11,11 @@ function PrstGeomUnitDecorator.Create(_obj: PrstGeom); begin class(PrstGeom).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PrstGeomUnitDecorator.Converte(); +function PrstGeomUnitDecorator.Convert(); begin - self.XmlAttrPrst.Value := object_.XmlAttrPrst.Value; - self.AvLst := new PureValUnitDecorator(object_.AvLst); + {self.}XmlAttrPrst.Value := object_.XmlAttrPrst.Value; + {self.}AvLst := new PureValUnitDecorator(object_.AvLst); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PtUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PtUnitDecorator@DOCX.tsf index f2e5013..28eb36a 100644 --- a/autoclass/decorator/docx/PtUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PtUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PtUnitDecorator = class(Pt) uses TSSafeUnitConverter; public function Create(_obj: Pt); - function Converte(); + function Convert(); private object_: Pt; end; @@ -11,10 +11,10 @@ function PtUnitDecorator.Create(_obj: Pt); begin class(Pt).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PtUnitDecorator.Converte(); +function PtUnitDecorator.Convert(); begin - self.XmlAttrIdx.Value := object_.XmlAttrIdx.Value; + {self.}XmlAttrIdx.Value := object_.XmlAttrIdx.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PureValUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PureValUnitDecorator@DOCX.tsf index e105d50..f41f41e 100644 --- a/autoclass/decorator/docx/PureValUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PureValUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PureValUnitDecorator = class(PureVal) uses TSSafeUnitConverter; public function Create(_obj: PureVal); - function Converte(); + function Convert(); private object_: PureVal; end; @@ -11,10 +11,10 @@ function PureValUnitDecorator.Create(_obj: PureVal); begin class(PureVal).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PureValUnitDecorator.Converte(); +function PureValUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/PureWValUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/PureWValUnitDecorator@DOCX.tsf index 7ab3266..73a55dd 100644 --- a/autoclass/decorator/docx/PureWValUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/PureWValUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type PureWValUnitDecorator = class(PureWVal) uses TSSafeUnitConverter; public function Create(_obj: PureWVal); - function Converte(); + function Convert(); private object_: PureWVal; end; @@ -11,10 +11,10 @@ function PureWValUnitDecorator.Create(_obj: PureWVal); begin class(PureWVal).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function PureWValUnitDecorator.Converte(); +function PureWValUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RFontsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RFontsUnitDecorator@DOCX.tsf index 324f901..01b2c9f 100644 --- a/autoclass/decorator/docx/RFontsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RFontsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RFontsUnitDecorator = class(RFonts) uses TSSafeUnitConverter; public function Create(_obj: RFonts); - function Converte(); + function Convert(); private object_: RFonts; end; @@ -11,17 +11,17 @@ function RFontsUnitDecorator.Create(_obj: RFonts); begin class(RFonts).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RFontsUnitDecorator.Converte(); +function RFontsUnitDecorator.Convert(); begin - self.XmlAttrAscii.Value := object_.XmlAttrAscii.Value; - self.XmlAttrAsciiTheme.Value := object_.XmlAttrAsciiTheme.Value; - self.XmlAttrEastAsia.Value := object_.XmlAttrEastAsia.Value; - self.XmlAttrEastAsiaTheme.Value := object_.XmlAttrEastAsiaTheme.Value; - self.XmlAttrHAnsi.Value := object_.XmlAttrHAnsi.Value; - self.XmlAttrHAnsiTheme.Value := object_.XmlAttrHAnsiTheme.Value; - self.XmlAttrHint.Value := object_.XmlAttrHint.Value; - self.XmlAttrCsTheme.Value := object_.XmlAttrCsTheme.Value; + {self.}XmlAttrAscii.Value := object_.XmlAttrAscii.Value; + {self.}XmlAttrAsciiTheme.Value := object_.XmlAttrAsciiTheme.Value; + {self.}XmlAttrEastAsia.Value := object_.XmlAttrEastAsia.Value; + {self.}XmlAttrEastAsiaTheme.Value := object_.XmlAttrEastAsiaTheme.Value; + {self.}XmlAttrHAnsi.Value := object_.XmlAttrHAnsi.Value; + {self.}XmlAttrHAnsiTheme.Value := object_.XmlAttrHAnsiTheme.Value; + {self.}XmlAttrHint.Value := object_.XmlAttrHint.Value; + {self.}XmlAttrCsTheme.Value := object_.XmlAttrCsTheme.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RPrDefaultUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RPrDefaultUnitDecorator@DOCX.tsf index 5e4cad7..a183ad8 100644 --- a/autoclass/decorator/docx/RPrDefaultUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RPrDefaultUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RPrDefaultUnitDecorator = class(RPrDefault) uses TSSafeUnitConverter; public function Create(_obj: RPrDefault); - function Converte(); + function Convert(); private object_: RPrDefault; end; @@ -11,10 +11,10 @@ function RPrDefaultUnitDecorator.Create(_obj: RPrDefault); begin class(RPrDefault).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RPrDefaultUnitDecorator.Converte(); +function RPrDefaultUnitDecorator.Convert(); begin - self.RPr := new RPrUnitDecorator(object_.RPr); + {self.}RPr := new RPrUnitDecorator(object_.RPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RPrUnitDecorator@DOCX.tsf index 2057968..10ef6c5 100644 --- a/autoclass/decorator/docx/RPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RPrUnitDecorator = class(RPr) uses TSSafeUnitConverter; public function Create(_obj: RPr); - function Converte(); + function Convert(); private object_: RPr; end; @@ -11,25 +11,25 @@ function RPrUnitDecorator.Create(_obj: RPr); begin class(RPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RPrUnitDecorator.Converte(); +function RPrUnitDecorator.Convert(); begin - self.NoProof := new PureValUnitDecorator(object_.NoProof); - self.WebHidden := new PureWValUnitDecorator(object_.WebHidden); - self.RStyle := new PureWValUnitDecorator(object_.RStyle); - self.RFonts := new RFontsUnitDecorator(object_.RFonts); - self.Kern := new PureWValUnitDecorator(object_.Kern); - if not ifnil(object_.XmlChildI.Value) then self.XmlChildI.Value := object_.XmlChildI.Value; - if not ifnil(object_.XmlChildICs.Value) then self.XmlChildICs.Value := object_.XmlChildICs.Value; - if not ifnil(object_.XmlChildB.Value) then self.XmlChildB.Value := object_.XmlChildB.Value; - if not ifnil(object_.XmlChildBCs.Value) then self.XmlChildBCs.Value := object_.XmlChildBCs.Value; - if not ifnil(object_.XmlChildStrike.Value) then self.XmlChildStrike.Value := object_.XmlChildStrike.Value; - self.Color := new ColorUnitDecorator(object_.Color); - self.Sz := new SzUnitDecorator(object_.Sz); - self.SzCs := new SzCsUnitDecorator(object_.SzCs); - if not ifnil(object_.XmlChildU.Value) then self.XmlChildU.Value := object_.XmlChildU.Value; - self.Lang := new LangUnitDecorator(object_.Lang); - self.W14Ligatures := new PureWValUnitDecorator(object_.W14Ligatures); + {self.}NoProof := new PureValUnitDecorator(object_.NoProof); + {self.}WebHidden := new PureWValUnitDecorator(object_.WebHidden); + {self.}RStyle := new PureWValUnitDecorator(object_.RStyle); + {self.}RFonts := new RFontsUnitDecorator(object_.RFonts); + {self.}Kern := new PureWValUnitDecorator(object_.Kern); + if not ifnil(object_.XmlChildI.Value) then {self.}XmlChildI.Value := object_.XmlChildI.Value; + if not ifnil(object_.XmlChildICs.Value) then {self.}XmlChildICs.Value := object_.XmlChildICs.Value; + if not ifnil(object_.XmlChildB.Value) then {self.}XmlChildB.Value := object_.XmlChildB.Value; + if not ifnil(object_.XmlChildBCs.Value) then {self.}XmlChildBCs.Value := object_.XmlChildBCs.Value; + if not ifnil(object_.XmlChildStrike.Value) then {self.}XmlChildStrike.Value := object_.XmlChildStrike.Value; + {self.}Color := new ColorUnitDecorator(object_.Color); + {self.}Sz := new SzUnitDecorator(object_.Sz); + {self.}SzCs := new SzCsUnitDecorator(object_.SzCs); + if not ifnil(object_.XmlChildU.Value) then {self.}XmlChildU.Value := object_.XmlChildU.Value; + {self.}Lang := new LangUnitDecorator(object_.Lang); + {self.}W14Ligatures := new PureWValUnitDecorator(object_.W14Ligatures); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RUnitDecorator@DOCX.tsf index 8a6f529..754e99b 100644 --- a/autoclass/decorator/docx/RUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RUnitDecorator = class(R) uses TSSafeUnitConverter; public function Create(_obj: R); - function Converte(); + function Convert(); private object_: R; end; @@ -11,21 +11,21 @@ function RUnitDecorator.Create(_obj: R); begin class(R).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RUnitDecorator.Converte(); +function RUnitDecorator.Convert(); begin - self.XmlAttrWRsidRPr.Value := object_.XmlAttrWRsidRPr.Value; - self.XmlAttrAnchor.Value := object_.XmlAttrAnchor.Value; - self.XmlAttrHistory.Value := object_.XmlAttrHistory.Value; - self.RPr := new RPrUnitDecorator(object_.RPr); - self.Br := new BrUnitDecorator(object_.Br); - self.FldChar := new FldCharUnitDecorator(object_.FldChar); - self.InstrText := new InstrTextUnitDecorator(object_.InstrText); - if not ifnil(object_.XmlChildSeparator.Value) then self.XmlChildSeparator.Value := object_.XmlChildSeparator.Value; - if not ifnil(object_.XmlChildContinuationSeparator.Value) then self.XmlChildContinuationSeparator.Value := object_.XmlChildContinuationSeparator.Value; - if not ifnil(object_.XmlChildLastRenderedPageBreak.Value) then self.XmlChildLastRenderedPageBreak.Value := object_.XmlChildLastRenderedPageBreak.Value; - self.Drawing := new DrawingUnitDecorator(object_.Drawing); - self.T := new TUnitDecorator(object_.T); + {self.}XmlAttrWRsidRPr.Value := object_.XmlAttrWRsidRPr.Value; + {self.}XmlAttrAnchor.Value := object_.XmlAttrAnchor.Value; + {self.}XmlAttrHistory.Value := object_.XmlAttrHistory.Value; + {self.}RPr := new RPrUnitDecorator(object_.RPr); + {self.}Br := new BrUnitDecorator(object_.Br); + {self.}FldChar := new FldCharUnitDecorator(object_.FldChar); + {self.}InstrText := new InstrTextUnitDecorator(object_.InstrText); + if not ifnil(object_.XmlChildSeparator.Value) then {self.}XmlChildSeparator.Value := object_.XmlChildSeparator.Value; + if not ifnil(object_.XmlChildContinuationSeparator.Value) then {self.}XmlChildContinuationSeparator.Value := object_.XmlChildContinuationSeparator.Value; + if not ifnil(object_.XmlChildLastRenderedPageBreak.Value) then {self.}XmlChildLastRenderedPageBreak.Value := object_.XmlChildLastRenderedPageBreak.Value; + {self.}Drawing := new DrawingUnitDecorator(object_.Drawing); + {self.}T := new TUnitDecorator(object_.T); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ReferenceUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ReferenceUnitDecorator@DOCX.tsf index 17caef0..30528ba 100644 --- a/autoclass/decorator/docx/ReferenceUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ReferenceUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ReferenceUnitDecorator = class(Reference) uses TSSafeUnitConverter; public function Create(_obj: Reference); - function Converte(); + function Convert(); private object_: Reference; end; @@ -11,11 +11,11 @@ function ReferenceUnitDecorator.Create(_obj: Reference); begin class(Reference).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ReferenceUnitDecorator.Converte(); +function ReferenceUnitDecorator.Convert(); begin - self.XmlAttrType.Value := object_.XmlAttrType.Value; - self.XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RelationshipUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RelationshipUnitDecorator@DOCX.tsf index 37acd63..70e02be 100644 --- a/autoclass/decorator/docx/RelationshipUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RelationshipUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RelationshipUnitDecorator = class(Relationship) uses TSSafeUnitConverter; public function Create(_obj: Relationship); - function Converte(); + function Convert(); private object_: Relationship; end; @@ -11,12 +11,12 @@ function RelationshipUnitDecorator.Create(_obj: Relationship); begin class(Relationship).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RelationshipUnitDecorator.Converte(); +function RelationshipUnitDecorator.Convert(); begin - self.XmlAttrId.Value := object_.XmlAttrId.Value; - self.XmlAttrType.Value := object_.XmlAttrType.Value; - self.XmlAttrTarget.Value := object_.XmlAttrTarget.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrTarget.Value := object_.XmlAttrTarget.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RelationshipsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RelationshipsUnitDecorator@DOCX.tsf index d06304d..2857a56 100644 --- a/autoclass/decorator/docx/RelationshipsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RelationshipsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RelationshipsUnitDecorator = class(Relationships) uses TSSafeUnitConverter; public function Create(_obj: Relationships); - function Converte(); + function Convert(); private object_: Relationships; end; @@ -11,10 +11,10 @@ function RelationshipsUnitDecorator.Create(_obj: Relationships); begin class(Relationships).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RelationshipsUnitDecorator.Converte(); +function RelationshipsUnitDecorator.Convert(); begin - self.XmlAttrxmlns.Value := object_.XmlAttrxmlns.Value; + {self.}XmlAttrxmlns.Value := object_.XmlAttrxmlns.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RichUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RichUnitDecorator@DOCX.tsf index e062796..bdf4e05 100644 --- a/autoclass/decorator/docx/RichUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RichUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RichUnitDecorator = class(Rich) uses TSSafeUnitConverter; public function Create(_obj: Rich); - function Converte(); + function Convert(); private object_: Rich; end; @@ -11,11 +11,11 @@ function RichUnitDecorator.Create(_obj: Rich); begin class(Rich).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RichUnitDecorator.Converte(); +function RichUnitDecorator.Convert(); begin - self.BodyPr := new BodyPrUnitDecorator(object_.BodyPr); - if not ifnil(object_.XmlChildLstStyle.Value) then self.XmlChildLstStyle.Value := object_.XmlChildLstStyle.Value; + {self.}BodyPr := new BodyPrUnitDecorator(object_.BodyPr); + if not ifnil(object_.XmlChildLstStyle.Value) then {self.}XmlChildLstStyle.Value := object_.XmlChildLstStyle.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/RsidsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/RsidsUnitDecorator@DOCX.tsf index 5c54dbc..c7f964a 100644 --- a/autoclass/decorator/docx/RsidsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/RsidsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type RsidsUnitDecorator = class(Rsids) uses TSSafeUnitConverter; public function Create(_obj: Rsids); - function Converte(); + function Convert(); private object_: Rsids; end; @@ -11,10 +11,10 @@ function RsidsUnitDecorator.Create(_obj: Rsids); begin class(Rsids).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function RsidsUnitDecorator.Converte(); +function RsidsUnitDecorator.Convert(); begin - self.RsidRoot := new PureWValUnitDecorator(object_.RsidRoot); + {self.}RsidRoot := new PureWValUnitDecorator(object_.RsidRoot); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ScalingUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ScalingUnitDecorator@DOCX.tsf index eda1a32..21dcbf0 100644 --- a/autoclass/decorator/docx/ScalingUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ScalingUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ScalingUnitDecorator = class(Scaling) uses TSSafeUnitConverter; public function Create(_obj: Scaling); - function Converte(); + function Convert(); private object_: Scaling; end; @@ -11,11 +11,11 @@ function ScalingUnitDecorator.Create(_obj: Scaling); begin class(Scaling).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ScalingUnitDecorator.Converte(); +function ScalingUnitDecorator.Convert(); begin - self.Orientation := new PureValUnitDecorator(object_.Orientation); - if not ifnil(object_.XmlChildOrientation.Value) then self.XmlChildOrientation.Value := object_.XmlChildOrientation.Value; + {self.}Orientation := new PureValUnitDecorator(object_.Orientation); + if not ifnil(object_.XmlChildOrientation.Value) then {self.}XmlChildOrientation.Value := object_.XmlChildOrientation.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SchemeClrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SchemeClrUnitDecorator@DOCX.tsf index 4e893ff..19cd079 100644 --- a/autoclass/decorator/docx/SchemeClrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SchemeClrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SchemeClrUnitDecorator = class(SchemeClr) uses TSSafeUnitConverter; public function Create(_obj: SchemeClr); - function Converte(); + function Convert(); private object_: SchemeClr; end; @@ -11,13 +11,13 @@ function SchemeClrUnitDecorator.Create(_obj: SchemeClr); begin class(SchemeClr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SchemeClrUnitDecorator.Converte(); +function SchemeClrUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.LumMod := new PureValUnitDecorator(object_.LumMod); - self.SatMod := new PureValUnitDecorator(object_.SatMod); - self.Tint := new PureValUnitDecorator(object_.Tint); + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}LumMod := new PureValUnitDecorator(object_.LumMod); + {self.}SatMod := new PureValUnitDecorator(object_.SatMod); + {self.}Tint := new PureValUnitDecorator(object_.Tint); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SdtContentUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SdtContentUnitDecorator@DOCX.tsf index f5453b6..935cf30 100644 --- a/autoclass/decorator/docx/SdtContentUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SdtContentUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SdtContentUnitDecorator = class(SdtContent) uses TSSafeUnitConverter; public function Create(_obj: SdtContent); - function Converte(); + function Convert(); private object_: SdtContent; end; @@ -11,9 +11,9 @@ function SdtContentUnitDecorator.Create(_obj: SdtContent); begin class(SdtContent).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SdtContentUnitDecorator.Converte(); +function SdtContentUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SdtEndPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SdtEndPrUnitDecorator@DOCX.tsf index 9e364e6..5900d50 100644 --- a/autoclass/decorator/docx/SdtEndPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SdtEndPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SdtEndPrUnitDecorator = class(SdtEndPr) uses TSSafeUnitConverter; public function Create(_obj: SdtEndPr); - function Converte(); + function Convert(); private object_: SdtEndPr; end; @@ -11,10 +11,10 @@ function SdtEndPrUnitDecorator.Create(_obj: SdtEndPr); begin class(SdtEndPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SdtEndPrUnitDecorator.Converte(); +function SdtEndPrUnitDecorator.Convert(); begin - self.RPr := new RPrUnitDecorator(object_.RPr); + {self.}RPr := new RPrUnitDecorator(object_.RPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SdtPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SdtPrUnitDecorator@DOCX.tsf index 70fc1cb..036cc75 100644 --- a/autoclass/decorator/docx/SdtPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SdtPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SdtPrUnitDecorator = class(SdtPr) uses TSSafeUnitConverter; public function Create(_obj: SdtPr); - function Converte(); + function Convert(); private object_: SdtPr; end; @@ -11,12 +11,12 @@ function SdtPrUnitDecorator.Create(_obj: SdtPr); begin class(SdtPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SdtPrUnitDecorator.Converte(); +function SdtPrUnitDecorator.Convert(); begin - self.RPr := new RPrUnitDecorator(object_.RPr); - self.Id := new PureWValUnitDecorator(object_.Id); - self.DocPartObj := new DocPartObjUnitDecorator(object_.DocPartObj); + {self.}RPr := new RPrUnitDecorator(object_.RPr); + {self.}Id := new PureWValUnitDecorator(object_.Id); + {self.}DocPartObj := new DocPartObjUnitDecorator(object_.DocPartObj); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SdtUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SdtUnitDecorator@DOCX.tsf index a86bb90..751b256 100644 --- a/autoclass/decorator/docx/SdtUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SdtUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SdtUnitDecorator = class(Sdt) uses TSSafeUnitConverter; public function Create(_obj: Sdt); - function Converte(); + function Convert(); private object_: Sdt; end; @@ -11,12 +11,12 @@ function SdtUnitDecorator.Create(_obj: Sdt); begin class(Sdt).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SdtUnitDecorator.Converte(); +function SdtUnitDecorator.Convert(); begin - self.SdtPr := new SdtPrUnitDecorator(object_.SdtPr); - self.SdtEndPr := new SdtEndPrUnitDecorator(object_.SdtEndPr); - self.SdtContent := new SdtContentUnitDecorator(object_.SdtContent); + {self.}SdtPr := new SdtPrUnitDecorator(object_.SdtPr); + {self.}SdtEndPr := new SdtEndPrUnitDecorator(object_.SdtEndPr); + {self.}SdtContent := new SdtContentUnitDecorator(object_.SdtContent); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SectPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SectPrUnitDecorator@DOCX.tsf index e50ddf7..ff7eae1 100644 --- a/autoclass/decorator/docx/SectPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SectPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SectPrUnitDecorator = class(SectPr) uses TSSafeUnitConverter; public function Create(_obj: SectPr); - function Converte(); + function Convert(); private object_: SectPr; end; @@ -11,17 +11,17 @@ function SectPrUnitDecorator.Create(_obj: SectPr); begin class(SectPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SectPrUnitDecorator.Converte(); +function SectPrUnitDecorator.Convert(); begin - self.XmlAttrWRsidR.Value := object_.XmlAttrWRsidR.Value; - self.XmlAttrWRsidSect.Value := object_.XmlAttrWRsidSect.Value; - self.Type := new PureWValUnitDecorator(object_.Type); - self.PgSz := new PgSzUnitDecorator(object_.PgSz); - self.PgMar := new PgMarUnitDecorator(object_.PgMar); - self.PgNumType := new PgNumTypeUnitDecorator(object_.PgNumType); - self.Cols := new ColsUnitDecorator(object_.Cols); - self.DocGrid := new docGridUnitDecorator(object_.DocGrid); + {self.}XmlAttrWRsidR.Value := object_.XmlAttrWRsidR.Value; + {self.}XmlAttrWRsidSect.Value := object_.XmlAttrWRsidSect.Value; + {self.}Type := new PureWValUnitDecorator(object_.Type); + {self.}PgSz := new PgSzUnitDecorator(object_.PgSz); + {self.}PgMar := new PgMarUnitDecorator(object_.PgMar); + {self.}PgNumType := new PgNumTypeUnitDecorator(object_.PgNumType); + {self.}Cols := new ColsUnitDecorator(object_.Cols); + {self.}DocGrid := new docGridUnitDecorator(object_.DocGrid); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SerUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SerUnitDecorator@DOCX.tsf index 99f25dd..d71ab5b 100644 --- a/autoclass/decorator/docx/SerUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SerUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SerUnitDecorator = class(Ser) uses TSSafeUnitConverter; public function Create(_obj: Ser); - function Converte(); + function Convert(); private object_: Ser; end; @@ -11,17 +11,17 @@ function SerUnitDecorator.Create(_obj: Ser); begin class(Ser).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SerUnitDecorator.Converte(); +function SerUnitDecorator.Convert(); begin - self.Idx := new PureValUnitDecorator(object_.Idx); - self.Order := new PureValUnitDecorator(object_.Order); - self.Tx := new TxUnitDecorator(object_.Tx); - self.InvertIfNegative := new PureValUnitDecorator(object_.InvertIfNegative); - self.DLbls := new DLblsUnitDecorator(object_.DLbls); - self.Cat := new CatUnitDecorator(object_.Cat); - self.Val := new ValUnitDecorator(object_.Val); - self.ExtLst := new ExtLstUnitDecorator(object_.ExtLst); + {self.}Idx := new PureValUnitDecorator(object_.Idx); + {self.}Order := new PureValUnitDecorator(object_.Order); + {self.}Tx := new TxUnitDecorator(object_.Tx); + {self.}InvertIfNegative := new PureValUnitDecorator(object_.InvertIfNegative); + {self.}DLbls := new DLblsUnitDecorator(object_.DLbls); + {self.}Cat := new CatUnitDecorator(object_.Cat); + {self.}Val := new ValUnitDecorator(object_.Val); + {self.}ExtLst := new ExtLstUnitDecorator(object_.ExtLst); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SettingsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SettingsUnitDecorator@DOCX.tsf index fda7f78..d708e26 100644 --- a/autoclass/decorator/docx/SettingsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SettingsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SettingsUnitDecorator = class(Settings) uses TSSafeUnitConverter; public function Create(_obj: Settings); - function Converte(); + function Convert(); private object_: Settings; end; @@ -11,46 +11,46 @@ function SettingsUnitDecorator.Create(_obj: Settings); begin class(Settings).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SettingsUnitDecorator.Converte(); +function SettingsUnitDecorator.Convert(); begin - self.XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; - self.XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrXmlnsSl.Value := object_.XmlAttrXmlnsSl.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; - self.Zoom := new ZoomUnitDecorator(object_.Zoom); - if not ifnil(object_.XmlChildBordersDoNotSurroundHeader.Value) then self.XmlChildBordersDoNotSurroundHeader.Value := object_.XmlChildBordersDoNotSurroundHeader.Value; - if not ifnil(object_.XmlChildBordersDoNotSurroundFooter.Value) then self.XmlChildBordersDoNotSurroundFooter.Value := object_.XmlChildBordersDoNotSurroundFooter.Value; - self.DefaultTabStop := new PureWValUnitDecorator(object_.DefaultTabStop); - self.DrawingGridVerticalSpacing := new PureWValUnitDecorator(object_.DrawingGridVerticalSpacing); - self.DisplayHorizontalDrawingGridEvery := new PureWValUnitDecorator(object_.DisplayHorizontalDrawingGridEvery); - self.DisplayVerticalDrawingGridEvery := new PureWValUnitDecorator(object_.DisplayVerticalDrawingGridEvery); - self.CharacterSpacingControl := new PureWValUnitDecorator(object_.CharacterSpacingControl); - self.HdrShapeDefaults := new HdrShapeDefaultsUnitDecorator(object_.HdrShapeDefaults); - self.FootnotePr := new FootnotePrUnitDecorator(object_.FootnotePr); - self.EndnotePr := new EndnotePrUnitDecorator(object_.EndnotePr); - self.Compat := new CompatUnitDecorator(object_.Compat); - self.Rsids := new RsidsUnitDecorator(object_.Rsids); - self.MathPr := new MathPrUnitDecorator(object_.MathPr); - self.ThemeFontLang := new ThemeFontLangUnitDecorator(object_.ThemeFontLang); - self.ClrSchemeMapping := new ClrSchemeMappingUnitDecorator(object_.ClrSchemeMapping); - if not ifnil(object_.XmlChildDoNotIncludeSubdocsInStats.Value) then self.XmlChildDoNotIncludeSubdocsInStats.Value := object_.XmlChildDoNotIncludeSubdocsInStats.Value; - self.ShapeDefaults := new ShapeDefaults2UnitDecorator(object_.ShapeDefaults); - self.DecimalSymbol := new PureWValUnitDecorator(object_.DecimalSymbol); - self.ListSeparator := new PureWValUnitDecorator(object_.ListSeparator); - self.W14DocId := new PureWValUnitDecorator(object_.W14DocId); - if not ifnil(object_.XmlChildW15ChartTrackingRefBased.Value) then self.XmlChildW15ChartTrackingRefBased.Value := object_.XmlChildW15ChartTrackingRefBased.Value; - self.W15DocId := new PureWValUnitDecorator(object_.W15DocId); + {self.}XmlAttrXmlnsO.Value := object_.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsV.Value := object_.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsSl.Value := object_.XmlAttrXmlnsSl.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}Zoom := new ZoomUnitDecorator(object_.Zoom); + if not ifnil(object_.XmlChildBordersDoNotSurroundHeader.Value) then {self.}XmlChildBordersDoNotSurroundHeader.Value := object_.XmlChildBordersDoNotSurroundHeader.Value; + if not ifnil(object_.XmlChildBordersDoNotSurroundFooter.Value) then {self.}XmlChildBordersDoNotSurroundFooter.Value := object_.XmlChildBordersDoNotSurroundFooter.Value; + {self.}DefaultTabStop := new PureWValUnitDecorator(object_.DefaultTabStop); + {self.}DrawingGridVerticalSpacing := new PureWValUnitDecorator(object_.DrawingGridVerticalSpacing); + {self.}DisplayHorizontalDrawingGridEvery := new PureWValUnitDecorator(object_.DisplayHorizontalDrawingGridEvery); + {self.}DisplayVerticalDrawingGridEvery := new PureWValUnitDecorator(object_.DisplayVerticalDrawingGridEvery); + {self.}CharacterSpacingControl := new PureWValUnitDecorator(object_.CharacterSpacingControl); + {self.}HdrShapeDefaults := new HdrShapeDefaultsUnitDecorator(object_.HdrShapeDefaults); + {self.}FootnotePr := new FootnotePrUnitDecorator(object_.FootnotePr); + {self.}EndnotePr := new EndnotePrUnitDecorator(object_.EndnotePr); + {self.}Compat := new CompatUnitDecorator(object_.Compat); + {self.}Rsids := new RsidsUnitDecorator(object_.Rsids); + {self.}MathPr := new MathPrUnitDecorator(object_.MathPr); + {self.}ThemeFontLang := new ThemeFontLangUnitDecorator(object_.ThemeFontLang); + {self.}ClrSchemeMapping := new ClrSchemeMappingUnitDecorator(object_.ClrSchemeMapping); + if not ifnil(object_.XmlChildDoNotIncludeSubdocsInStats.Value) then {self.}XmlChildDoNotIncludeSubdocsInStats.Value := object_.XmlChildDoNotIncludeSubdocsInStats.Value; + {self.}ShapeDefaults := new ShapeDefaults2UnitDecorator(object_.ShapeDefaults); + {self.}DecimalSymbol := new PureWValUnitDecorator(object_.DecimalSymbol); + {self.}ListSeparator := new PureWValUnitDecorator(object_.ListSeparator); + {self.}W14DocId := new PureWValUnitDecorator(object_.W14DocId); + if not ifnil(object_.XmlChildW15ChartTrackingRefBased.Value) then {self.}XmlChildW15ChartTrackingRefBased.Value := object_.XmlChildW15ChartTrackingRefBased.Value; + {self.}W15DocId := new PureWValUnitDecorator(object_.W15DocId); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ShapeDefaults2UnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ShapeDefaults2UnitDecorator@DOCX.tsf index 0272026..627cb49 100644 --- a/autoclass/decorator/docx/ShapeDefaults2UnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ShapeDefaults2UnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ShapeDefaults2UnitDecorator = class(ShapeDefaults2) uses TSSafeUnitConverter; public function Create(_obj: ShapeDefaults2); - function Converte(); + function Convert(); private object_: ShapeDefaults2; end; @@ -11,11 +11,11 @@ function ShapeDefaults2UnitDecorator.Create(_obj: ShapeDefaults2); begin class(ShapeDefaults2).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ShapeDefaults2UnitDecorator.Converte(); +function ShapeDefaults2UnitDecorator.Convert(); begin - self.ShapeDefaults := new ShapeDefaultsUnitDecorator(object_.ShapeDefaults); - self.ShapeLayout := new ShapeLayoutUnitDecorator(object_.ShapeLayout); + {self.}ShapeDefaults := new ShapeDefaultsUnitDecorator(object_.ShapeDefaults); + {self.}ShapeLayout := new ShapeLayoutUnitDecorator(object_.ShapeLayout); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ShapeDefaultsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ShapeDefaultsUnitDecorator@DOCX.tsf index 0ccc082..01cdb74 100644 --- a/autoclass/decorator/docx/ShapeDefaultsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ShapeDefaultsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ShapeDefaultsUnitDecorator = class(ShapeDefaults) uses TSSafeUnitConverter; public function Create(_obj: ShapeDefaults); - function Converte(); + function Convert(); private object_: ShapeDefaults; end; @@ -11,11 +11,11 @@ function ShapeDefaultsUnitDecorator.Create(_obj: ShapeDefaults); begin class(ShapeDefaults).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ShapeDefaultsUnitDecorator.Converte(); +function ShapeDefaultsUnitDecorator.Convert(); begin - self.XmlAttrExt.Value := object_.XmlAttrExt.Value; - self.XmlAttrSpidmax.Value := object_.XmlAttrSpidmax.Value; + {self.}XmlAttrExt.Value := object_.XmlAttrExt.Value; + {self.}XmlAttrSpidmax.Value := object_.XmlAttrSpidmax.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ShapeLayoutUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ShapeLayoutUnitDecorator@DOCX.tsf index 7744122..5a4e525 100644 --- a/autoclass/decorator/docx/ShapeLayoutUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ShapeLayoutUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ShapeLayoutUnitDecorator = class(ShapeLayout) uses TSSafeUnitConverter; public function Create(_obj: ShapeLayout); - function Converte(); + function Convert(); private object_: ShapeLayout; end; @@ -11,11 +11,11 @@ function ShapeLayoutUnitDecorator.Create(_obj: ShapeLayout); begin class(ShapeLayout).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ShapeLayoutUnitDecorator.Converte(); +function ShapeLayoutUnitDecorator.Convert(); begin - self.XmlAttrExt.Value := object_.XmlAttrExt.Value; - self.IdMap := new IdMapUnitDecorator(object_.IdMap); + {self.}XmlAttrExt.Value := object_.XmlAttrExt.Value; + {self.}IdMap := new IdMapUnitDecorator(object_.IdMap); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ShdUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ShdUnitDecorator@DOCX.tsf index 60aa9ce..247b5c9 100644 --- a/autoclass/decorator/docx/ShdUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ShdUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ShdUnitDecorator = class(Shd) uses TSSafeUnitConverter; public function Create(_obj: Shd); - function Converte(); + function Convert(); private object_: Shd; end; @@ -11,14 +11,14 @@ function ShdUnitDecorator.Create(_obj: Shd); begin class(Shd).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ShdUnitDecorator.Converte(); +function ShdUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.XmlAttrColor.Value := object_.XmlAttrColor.Value; - self.XmlAttrFill.Value := object_.XmlAttrFill.Value; - self.XmlAttrThemeFill.Value := object_.XmlAttrThemeFill.Value; - self.XmlAttrThemeFillTint.Value := object_.XmlAttrThemeFillTint.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrColor.Value := object_.XmlAttrColor.Value; + {self.}XmlAttrFill.Value := object_.XmlAttrFill.Value; + {self.}XmlAttrThemeFill.Value := object_.XmlAttrThemeFill.Value; + {self.}XmlAttrThemeFillTint.Value := object_.XmlAttrThemeFillTint.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SigUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SigUnitDecorator@DOCX.tsf index 51d106c..41bda78 100644 --- a/autoclass/decorator/docx/SigUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SigUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SigUnitDecorator = class(Sig) uses TSSafeUnitConverter; public function Create(_obj: Sig); - function Converte(); + function Convert(); private object_: Sig; end; @@ -11,15 +11,15 @@ function SigUnitDecorator.Create(_obj: Sig); begin class(Sig).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SigUnitDecorator.Converte(); +function SigUnitDecorator.Convert(); begin - self.XmlAttrUsb0.Value := object_.XmlAttrUsb0.Value; - self.XmlAttrUsb1.Value := object_.XmlAttrUsb1.Value; - self.XmlAttrUsb2.Value := object_.XmlAttrUsb2.Value; - self.XmlAttrUsb3.Value := object_.XmlAttrUsb3.Value; - self.XmlAttrcsb0.Value := object_.XmlAttrcsb0.Value; - self.XmlAttrcsb1.Value := object_.XmlAttrcsb1.Value; + {self.}XmlAttrUsb0.Value := object_.XmlAttrUsb0.Value; + {self.}XmlAttrUsb1.Value := object_.XmlAttrUsb1.Value; + {self.}XmlAttrUsb2.Value := object_.XmlAttrUsb2.Value; + {self.}XmlAttrUsb3.Value := object_.XmlAttrUsb3.Value; + {self.}XmlAttrcsb0.Value := object_.XmlAttrcsb0.Value; + {self.}XmlAttrcsb1.Value := object_.XmlAttrcsb1.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SolidFillUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SolidFillUnitDecorator@DOCX.tsf index 63557af..6f877fa 100644 --- a/autoclass/decorator/docx/SolidFillUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SolidFillUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SolidFillUnitDecorator = class(SolidFill) uses TSSafeUnitConverter; public function Create(_obj: SolidFill); - function Converte(); + function Convert(); private object_: SolidFill; end; @@ -11,10 +11,10 @@ function SolidFillUnitDecorator.Create(_obj: SolidFill); begin class(SolidFill).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SolidFillUnitDecorator.Converte(); +function SolidFillUnitDecorator.Convert(); begin - self.SchemeClr := new SchemeClrUnitDecorator(object_.SchemeClr); + {self.}SchemeClr := new SchemeClrUnitDecorator(object_.SchemeClr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SpPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SpPrUnitDecorator@DOCX.tsf index 4173a77..1b065a8 100644 --- a/autoclass/decorator/docx/SpPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SpPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SpPrUnitDecorator = class(SpPr) uses TSSafeUnitConverter; public function Create(_obj: SpPr); - function Converte(); + function Convert(); private object_: SpPr; end; @@ -11,15 +11,15 @@ function SpPrUnitDecorator.Create(_obj: SpPr); begin class(SpPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SpPrUnitDecorator.Converte(); +function SpPrUnitDecorator.Convert(); begin - self.Xfrm := new XfrmUnitDecorator(object_.Xfrm); - self.PrstGeom := new PrstGeomUnitDecorator(object_.PrstGeom); - if not ifnil(object_.XmlChildNoFill.Value) then self.XmlChildNoFill.Value := object_.XmlChildNoFill.Value; - self.SolidFill := new SolidFillUnitDecorator(object_.SolidFill); - self.Ln := new LnUnitDecorator(object_.Ln); - self.EffectLst := new EffectLstUnitDecorator(object_.EffectLst); + {self.}Xfrm := new XfrmUnitDecorator(object_.Xfrm); + {self.}PrstGeom := new PrstGeomUnitDecorator(object_.PrstGeom); + if not ifnil(object_.XmlChildNoFill.Value) then {self.}XmlChildNoFill.Value := object_.XmlChildNoFill.Value; + {self.}SolidFill := new SolidFillUnitDecorator(object_.SolidFill); + {self.}Ln := new LnUnitDecorator(object_.Ln); + {self.}EffectLst := new EffectLstUnitDecorator(object_.EffectLst); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SpacingUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SpacingUnitDecorator@DOCX.tsf index 7faf5ea..aa32ae3 100644 --- a/autoclass/decorator/docx/SpacingUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SpacingUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SpacingUnitDecorator = class(Spacing) uses TSSafeUnitConverter; public function Create(_obj: Spacing); - function Converte(); + function Convert(); private object_: Spacing; end; @@ -11,17 +11,17 @@ function SpacingUnitDecorator.Create(_obj: Spacing); begin class(Spacing).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SpacingUnitDecorator.Converte(); +function SpacingUnitDecorator.Convert(); begin - self.XmlAttrBefore.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrBefore.Value); - self.XmlAttrBeforeLines.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrBeforeLines.Value); - self.XmlAttrBeforeAutospacing.Value := object_.XmlAttrBeforeAutospacing.Value; - self.XmlAttrAfter.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrAfter.Value); - self.XmlAttrAfterLines.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrAfterLines.Value); - self.XmlAttrAfterAutospacing.Value := object_.XmlAttrAfterAutospacing.Value; - self.XmlAttrLine.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLine.Value); - self.XmlAttrLineRule.Value := object_.XmlAttrLineRule.Value; + {self.}XmlAttrBefore.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrBefore.Value); + {self.}XmlAttrBeforeLines.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrBeforeLines.Value); + {self.}XmlAttrBeforeAutospacing.Value := object_.XmlAttrBeforeAutospacing.Value; + {self.}XmlAttrAfter.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrAfter.Value); + {self.}XmlAttrAfterLines.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrAfterLines.Value); + {self.}XmlAttrAfterAutospacing.Value := object_.XmlAttrAfterAutospacing.Value; + {self.}XmlAttrLine.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrLine.Value); + {self.}XmlAttrLineRule.Value := object_.XmlAttrLineRule.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SrgbClrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SrgbClrUnitDecorator@DOCX.tsf index 82798fc..fdea7de 100644 --- a/autoclass/decorator/docx/SrgbClrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SrgbClrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SrgbClrUnitDecorator = class(SrgbClr) uses TSSafeUnitConverter; public function Create(_obj: SrgbClr); - function Converte(); + function Convert(); private object_: SrgbClr; end; @@ -11,11 +11,11 @@ function SrgbClrUnitDecorator.Create(_obj: SrgbClr); begin class(SrgbClr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SrgbClrUnitDecorator.Converte(); +function SrgbClrUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.Alpha := new PureValUnitDecorator(object_.Alpha); + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}Alpha := new PureValUnitDecorator(object_.Alpha); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/StrRefUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/StrRefUnitDecorator@DOCX.tsf index 98fdde3..5c9bcfd 100644 --- a/autoclass/decorator/docx/StrRefUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/StrRefUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type StrRefUnitDecorator = class(StrRef) uses TSSafeUnitConverter; public function Create(_obj: StrRef); - function Converte(); + function Convert(); private object_: StrRef; end; @@ -11,10 +11,10 @@ function StrRefUnitDecorator.Create(_obj: StrRef); begin class(StrRef).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function StrRefUnitDecorator.Converte(); +function StrRefUnitDecorator.Convert(); begin - self.StrCache := new CacheUnitDecorator(object_.StrCache); + {self.}StrCache := new CacheUnitDecorator(object_.StrCache); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/StretchUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/StretchUnitDecorator@DOCX.tsf index 1120ce5..356a4d0 100644 --- a/autoclass/decorator/docx/StretchUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/StretchUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type StretchUnitDecorator = class(Stretch) uses TSSafeUnitConverter; public function Create(_obj: Stretch); - function Converte(); + function Convert(); private object_: Stretch; end; @@ -11,10 +11,10 @@ function StretchUnitDecorator.Create(_obj: Stretch); begin class(Stretch).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function StretchUnitDecorator.Converte(); +function StretchUnitDecorator.Convert(); begin - self.FillRect := new PureValUnitDecorator(object_.FillRect); + {self.}FillRect := new PureValUnitDecorator(object_.FillRect); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/StyleUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/StyleUnitDecorator@DOCX.tsf index 30f0f10..5f61ebb 100644 --- a/autoclass/decorator/docx/StyleUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/StyleUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type StyleUnitDecorator = class(Style) uses TSSafeUnitConverter; public function Create(_obj: Style); - function Converte(); + function Convert(); private object_: Style; end; @@ -11,29 +11,29 @@ function StyleUnitDecorator.Create(_obj: Style); begin class(Style).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function StyleUnitDecorator.Converte(); +function StyleUnitDecorator.Convert(); begin - self.XmlAttrType.Value := object_.XmlAttrType.Value; - self.XmlAttrDefault.Value := object_.XmlAttrDefault.Value; - self.XmlAttrStyleId.Value := object_.XmlAttrStyleId.Value; - self.Name := new PureWValUnitDecorator(object_.Name); - self.BasedOn := new PureWValUnitDecorator(object_.BasedOn); - self.Next := new PureWValUnitDecorator(object_.Next); - self.AutoRedefine := new PureWValUnitDecorator(object_.AutoRedefine); - self.Link := new PureWValUnitDecorator(object_.Link); - self.UIPriority := new PureWValUnitDecorator(object_.UIPriority); - if not ifnil(object_.XmlChildSemiHidden.Value) then self.XmlChildSemiHidden.Value := object_.XmlChildSemiHidden.Value; - if not ifnil(object_.XmlChildUnhideWhenUsed.Value) then self.XmlChildUnhideWhenUsed.Value := object_.XmlChildUnhideWhenUsed.Value; - if not ifnil(object_.XmlChildQFormat.Value) then self.XmlChildQFormat.Value := object_.XmlChildQFormat.Value; - self.Rsid := new PureWValUnitDecorator(object_.Rsid); - if not ifnil(object_.XmlChildRsid.Value) then self.XmlChildRsid.Value := object_.XmlChildRsid.Value; - self.PPr := new PPrUnitDecorator(object_.PPr); - self.RPr := new RPrUnitDecorator(object_.RPr); - self.TblPr := new TblPrUnitDecorator(object_.TblPr); - self.TrPr := new TrPrUnitDecorator(object_.TrPr); - self.TcPr := new TcPrUnitDecorator(object_.TcPr); - self.TblStylePr := new TblStylePrUnitDecorator(object_.TblStylePr); + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrDefault.Value := object_.XmlAttrDefault.Value; + {self.}XmlAttrStyleId.Value := object_.XmlAttrStyleId.Value; + {self.}Name := new PureWValUnitDecorator(object_.Name); + {self.}BasedOn := new PureWValUnitDecorator(object_.BasedOn); + {self.}Next := new PureWValUnitDecorator(object_.Next); + {self.}AutoRedefine := new PureWValUnitDecorator(object_.AutoRedefine); + {self.}Link := new PureWValUnitDecorator(object_.Link); + {self.}UIPriority := new PureWValUnitDecorator(object_.UIPriority); + if not ifnil(object_.XmlChildSemiHidden.Value) then {self.}XmlChildSemiHidden.Value := object_.XmlChildSemiHidden.Value; + if not ifnil(object_.XmlChildUnhideWhenUsed.Value) then {self.}XmlChildUnhideWhenUsed.Value := object_.XmlChildUnhideWhenUsed.Value; + if not ifnil(object_.XmlChildQFormat.Value) then {self.}XmlChildQFormat.Value := object_.XmlChildQFormat.Value; + {self.}Rsid := new PureWValUnitDecorator(object_.Rsid); + if not ifnil(object_.XmlChildRsid.Value) then {self.}XmlChildRsid.Value := object_.XmlChildRsid.Value; + {self.}PPr := new PPrUnitDecorator(object_.PPr); + {self.}RPr := new RPrUnitDecorator(object_.RPr); + {self.}TblPr := new TblPrUnitDecorator(object_.TblPr); + {self.}TrPr := new TrPrUnitDecorator(object_.TrPr); + {self.}TcPr := new TcPrUnitDecorator(object_.TcPr); + {self.}TblStylePr := new TblStylePrUnitDecorator(object_.TblStylePr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/StylesUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/StylesUnitDecorator@DOCX.tsf index 6bc9e4a..570eba7 100644 --- a/autoclass/decorator/docx/StylesUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/StylesUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type StylesUnitDecorator = class(Styles) uses TSSafeUnitConverter; public function Create(_obj: Styles); - function Converte(); + function Convert(); private object_: Styles; end; @@ -11,23 +11,23 @@ function StylesUnitDecorator.Create(_obj: Styles); begin class(Styles).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function StylesUnitDecorator.Converte(); +function StylesUnitDecorator.Convert(); begin - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; - self.DocDefaults := new DocDefaultsUnitDecorator(object_.DocDefaults); - self.LatenStyles := new LatenStylesUnitDecorator(object_.LatenStyles); + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + {self.}DocDefaults := new DocDefaultsUnitDecorator(object_.DocDefaults); + {self.}LatenStyles := new LatenStylesUnitDecorator(object_.LatenStyles); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SysClrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SysClrUnitDecorator@DOCX.tsf index be10da4..dd56b83 100644 --- a/autoclass/decorator/docx/SysClrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SysClrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SysClrUnitDecorator = class(SysClr) uses TSSafeUnitConverter; public function Create(_obj: SysClr); - function Converte(); + function Convert(); private object_: SysClr; end; @@ -11,11 +11,11 @@ function SysClrUnitDecorator.Create(_obj: SysClr); begin class(SysClr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SysClrUnitDecorator.Converte(); +function SysClrUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.XmlAttrLastClr.Value := object_.XmlAttrLastClr.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrLastClr.Value := object_.XmlAttrLastClr.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SzCsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SzCsUnitDecorator@DOCX.tsf index 7fcafff..b9fc357 100644 --- a/autoclass/decorator/docx/SzCsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SzCsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SzCsUnitDecorator = class(SzCs) uses TSSafeUnitConverter; public function Create(_obj: SzCs); - function Converte(); + function Convert(); private object_: SzCs; end; @@ -11,10 +11,10 @@ function SzCsUnitDecorator.Create(_obj: SzCs); begin class(SzCs).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SzCsUnitDecorator.Converte(); +function SzCsUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := TSSafeUnitConverter.HalfPointToPoints(object_.XmlAttrVal.Value); + {self.}XmlAttrVal.Value := TSSafeUnitConverter.HalfPointToPoints(object_.XmlAttrVal.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/SzUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/SzUnitDecorator@DOCX.tsf index 787c20c..0304bb4 100644 --- a/autoclass/decorator/docx/SzUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/SzUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type SzUnitDecorator = class(Sz) uses TSSafeUnitConverter; public function Create(_obj: Sz); - function Converte(); + function Convert(); private object_: Sz; end; @@ -11,10 +11,10 @@ function SzUnitDecorator.Create(_obj: Sz); begin class(Sz).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function SzUnitDecorator.Converte(); +function SzUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := TSSafeUnitConverter.HalfPointToPoints(object_.XmlAttrVal.Value); + {self.}XmlAttrVal.Value := TSSafeUnitConverter.HalfPointToPoints(object_.XmlAttrVal.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TUnitDecorator@DOCX.tsf index 3d3f017..a01fbff 100644 --- a/autoclass/decorator/docx/TUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TUnitDecorator = class(T) uses TSSafeUnitConverter; public function Create(_obj: T); - function Converte(); + function Convert(); private object_: T; end; @@ -11,10 +11,10 @@ function TUnitDecorator.Create(_obj: T); begin class(T).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TUnitDecorator.Converte(); +function TUnitDecorator.Convert(); begin - self.XmlAttrSpace.Value := object_.XmlAttrSpace.Value; + {self.}XmlAttrSpace.Value := object_.XmlAttrSpace.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TabUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TabUnitDecorator@DOCX.tsf index d37ff8f..3de3132 100644 --- a/autoclass/decorator/docx/TabUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TabUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TabUnitDecorator = class(Tab) uses TSSafeUnitConverter; public function Create(_obj: Tab); - function Converte(); + function Convert(); private object_: Tab; end; @@ -11,12 +11,12 @@ function TabUnitDecorator.Create(_obj: Tab); begin class(Tab).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TabUnitDecorator.Converte(); +function TabUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.XmlAttrLeader.Value := object_.XmlAttrLeader.Value; - self.XmlAttrPos.Value := object_.XmlAttrPos.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrLeader.Value := object_.XmlAttrLeader.Value; + {self.}XmlAttrPos.Value := object_.XmlAttrPos.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TabsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TabsUnitDecorator@DOCX.tsf index 3238560..e596531 100644 --- a/autoclass/decorator/docx/TabsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TabsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TabsUnitDecorator = class(Tabs) uses TSSafeUnitConverter; public function Create(_obj: Tabs); - function Converte(); + function Convert(); private object_: Tabs; end; @@ -11,9 +11,9 @@ function TabsUnitDecorator.Create(_obj: Tabs); begin class(Tabs).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TabsUnitDecorator.Converte(); +function TabsUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblBorderUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblBorderUnitDecorator@DOCX.tsf index 37830ff..c4c0af4 100644 --- a/autoclass/decorator/docx/TblBorderUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblBorderUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblBorderUnitDecorator = class(TblBorder) uses TSSafeUnitConverter; public function Create(_obj: TblBorder); - function Converte(); + function Convert(); private object_: TblBorder; end; @@ -11,15 +11,15 @@ function TblBorderUnitDecorator.Create(_obj: TblBorder); begin class(TblBorder).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblBorderUnitDecorator.Converte(); +function TblBorderUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.XmlAttrColor.Value := object_.XmlAttrColor.Value; - self.XmlAttrSpce.Value := object_.XmlAttrSpce.Value; - self.XmlAttrThemeColor.Value := object_.XmlAttrThemeColor.Value; - self.XmlAttrThemeTint.Value := object_.XmlAttrThemeTint.Value; - self.XmlAttrSz.Value := TSSafeUnitConverter.HalfPointToPoints(object_.XmlAttrSz.Value); + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrColor.Value := object_.XmlAttrColor.Value; + {self.}XmlAttrSpce.Value := object_.XmlAttrSpce.Value; + {self.}XmlAttrThemeColor.Value := object_.XmlAttrThemeColor.Value; + {self.}XmlAttrThemeTint.Value := object_.XmlAttrThemeTint.Value; + {self.}XmlAttrSz.Value := TSSafeUnitConverter.HalfPointToPoints(object_.XmlAttrSz.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblBordersUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblBordersUnitDecorator@DOCX.tsf index a66f42f..4b560a8 100644 --- a/autoclass/decorator/docx/TblBordersUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblBordersUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblBordersUnitDecorator = class(TblBorders) uses TSSafeUnitConverter; public function Create(_obj: TblBorders); - function Converte(); + function Convert(); private object_: TblBorders; end; @@ -11,15 +11,15 @@ function TblBordersUnitDecorator.Create(_obj: TblBorders); begin class(TblBorders).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblBordersUnitDecorator.Converte(); +function TblBordersUnitDecorator.Convert(); begin - self.Top := new tblBorderUnitDecorator(object_.Top); - self.Left := new tblBorderUnitDecorator(object_.Left); - self.Bottom := new tblBorderUnitDecorator(object_.Bottom); - self.Right := new tblBorderUnitDecorator(object_.Right); - self.InsideH := new PureWValUnitDecorator(object_.InsideH); - self.InsideV := new PureWValUnitDecorator(object_.InsideV); + {self.}Top := new tblBorderUnitDecorator(object_.Top); + {self.}Left := new tblBorderUnitDecorator(object_.Left); + {self.}Bottom := new tblBorderUnitDecorator(object_.Bottom); + {self.}Right := new tblBorderUnitDecorator(object_.Right); + {self.}InsideH := new PureWValUnitDecorator(object_.InsideH); + {self.}InsideV := new PureWValUnitDecorator(object_.InsideV); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblCellMarUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblCellMarUnitDecorator@DOCX.tsf index 261deae..eabcfce 100644 --- a/autoclass/decorator/docx/TblCellMarUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblCellMarUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblCellMarUnitDecorator = class(TblCellMar) uses TSSafeUnitConverter; public function Create(_obj: TblCellMar); - function Converte(); + function Convert(); private object_: TblCellMar; end; @@ -11,13 +11,13 @@ function TblCellMarUnitDecorator.Create(_obj: TblCellMar); begin class(TblCellMar).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblCellMarUnitDecorator.Converte(); +function TblCellMarUnitDecorator.Convert(); begin - self.Top := new TblIndUnitDecorator(object_.Top); - self.Left := new TblIndUnitDecorator(object_.Left); - self.Bottom := new TblIndUnitDecorator(object_.Bottom); - self.Right := new TblIndUnitDecorator(object_.Right); + {self.}Top := new TblIndUnitDecorator(object_.Top); + {self.}Left := new TblIndUnitDecorator(object_.Left); + {self.}Bottom := new TblIndUnitDecorator(object_.Bottom); + {self.}Right := new TblIndUnitDecorator(object_.Right); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblGridUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblGridUnitDecorator@DOCX.tsf index d6c84e9..350142c 100644 --- a/autoclass/decorator/docx/TblGridUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblGridUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblGridUnitDecorator = class(TblGrid) uses TSSafeUnitConverter; public function Create(_obj: TblGrid); - function Converte(); + function Convert(); private object_: TblGrid; end; @@ -11,9 +11,9 @@ function TblGridUnitDecorator.Create(_obj: TblGrid); begin class(TblGrid).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblGridUnitDecorator.Converte(); +function TblGridUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblIndUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblIndUnitDecorator@DOCX.tsf index 4cff3f8..5645390 100644 --- a/autoclass/decorator/docx/TblIndUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblIndUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblIndUnitDecorator = class(TblInd) uses TSSafeUnitConverter; public function Create(_obj: TblInd); - function Converte(); + function Convert(); private object_: TblInd; end; @@ -11,11 +11,11 @@ function TblIndUnitDecorator.Create(_obj: TblInd); begin class(TblInd).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblIndUnitDecorator.Converte(); +function TblIndUnitDecorator.Convert(); begin - self.XmlAttrW.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrW.Value); - self.XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrW.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrW.Value); + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblLayoutUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblLayoutUnitDecorator@DOCX.tsf index ca47d82..0029cca 100644 --- a/autoclass/decorator/docx/TblLayoutUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblLayoutUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblLayoutUnitDecorator = class(TblLayout) uses TSSafeUnitConverter; public function Create(_obj: TblLayout); - function Converte(); + function Convert(); private object_: TblLayout; end; @@ -11,10 +11,10 @@ function TblLayoutUnitDecorator.Create(_obj: TblLayout); begin class(TblLayout).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblLayoutUnitDecorator.Converte(); +function TblLayoutUnitDecorator.Convert(); begin - self.XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblLookUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblLookUnitDecorator@DOCX.tsf index ffd6e93..f65b971 100644 --- a/autoclass/decorator/docx/TblLookUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblLookUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblLookUnitDecorator = class(TblLook) uses TSSafeUnitConverter; public function Create(_obj: TblLook); - function Converte(); + function Convert(); private object_: TblLook; end; @@ -11,16 +11,16 @@ function TblLookUnitDecorator.Create(_obj: TblLook); begin class(TblLook).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblLookUnitDecorator.Converte(); +function TblLookUnitDecorator.Convert(); begin - self.XmlAttrVal.Value := object_.XmlAttrVal.Value; - self.XmlAttrFirstRow.Value := object_.XmlAttrFirstRow.Value; - self.XmlAttrLastRow.Value := object_.XmlAttrLastRow.Value; - self.XmlAttrFirstColumn.Value := object_.XmlAttrFirstColumn.Value; - self.XmlAttrLastColumn.Value := object_.XmlAttrLastColumn.Value; - self.XmlAttrNoHBand.Value := object_.XmlAttrNoHBand.Value; - self.XmlAttrNoVBand.Value := object_.XmlAttrNoVBand.Value; + {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value; + {self.}XmlAttrFirstRow.Value := object_.XmlAttrFirstRow.Value; + {self.}XmlAttrLastRow.Value := object_.XmlAttrLastRow.Value; + {self.}XmlAttrFirstColumn.Value := object_.XmlAttrFirstColumn.Value; + {self.}XmlAttrLastColumn.Value := object_.XmlAttrLastColumn.Value; + {self.}XmlAttrNoHBand.Value := object_.XmlAttrNoHBand.Value; + {self.}XmlAttrNoVBand.Value := object_.XmlAttrNoVBand.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblPrUnitDecorator@DOCX.tsf index 64a73f5..e60fe37 100644 --- a/autoclass/decorator/docx/TblPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblPrUnitDecorator = class(TblPr) uses TSSafeUnitConverter; public function Create(_obj: TblPr); - function Converte(); + function Convert(); private object_: TblPr; end; @@ -11,17 +11,17 @@ function TblPrUnitDecorator.Create(_obj: TblPr); begin class(TblPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblPrUnitDecorator.Converte(); +function TblPrUnitDecorator.Convert(); begin - self.Jc := new PureWValUnitDecorator(object_.Jc); - self.TblStyle := new PureWValUnitDecorator(object_.TblStyle); - self.TblW := new TblWUnitDecorator(object_.TblW); - self.TblInd := new TblWUnitDecorator(object_.TblInd); - self.TblLayout := new TblLayoutUnitDecorator(object_.TblLayout); - self.TblLook := new TblLookUnitDecorator(object_.TblLook); - self.TblBorders := new TblBordersUnitDecorator(object_.TblBorders); - self.TblCellMar := new TblCellMarUnitDecorator(object_.TblCellMar); + {self.}Jc := new PureWValUnitDecorator(object_.Jc); + {self.}TblStyle := new PureWValUnitDecorator(object_.TblStyle); + {self.}TblW := new TblWUnitDecorator(object_.TblW); + {self.}TblInd := new TblWUnitDecorator(object_.TblInd); + {self.}TblLayout := new TblLayoutUnitDecorator(object_.TblLayout); + {self.}TblLook := new TblLookUnitDecorator(object_.TblLook); + {self.}TblBorders := new TblBordersUnitDecorator(object_.TblBorders); + {self.}TblCellMar := new TblCellMarUnitDecorator(object_.TblCellMar); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblStylePrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblStylePrUnitDecorator@DOCX.tsf index fe7a8dc..e135732 100644 --- a/autoclass/decorator/docx/TblStylePrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblStylePrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblStylePrUnitDecorator = class(TblStylePr) uses TSSafeUnitConverter; public function Create(_obj: TblStylePr); - function Converte(); + function Convert(); private object_: TblStylePr; end; @@ -11,13 +11,13 @@ function TblStylePrUnitDecorator.Create(_obj: TblStylePr); begin class(TblStylePr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblStylePrUnitDecorator.Converte(); +function TblStylePrUnitDecorator.Convert(); begin - self.PPr := new PPrUnitDecorator(object_.PPr); - self.TblPr := new TblPrUnitDecorator(object_.TblPr); - self.TrPr := new TrPrUnitDecorator(object_.TrPr); - self.TcPr := new TcPrUnitDecorator(object_.TcPr); + {self.}PPr := new PPrUnitDecorator(object_.PPr); + {self.}TblPr := new TblPrUnitDecorator(object_.TblPr); + {self.}TrPr := new TrPrUnitDecorator(object_.TrPr); + {self.}TcPr := new TcPrUnitDecorator(object_.TcPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblUnitDecorator@DOCX.tsf index bf88e72..0d8bbf0 100644 --- a/autoclass/decorator/docx/TblUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblUnitDecorator = class(Tbl) uses TSSafeUnitConverter; public function Create(_obj: Tbl); - function Converte(); + function Convert(); private object_: Tbl; end; @@ -11,11 +11,11 @@ function TblUnitDecorator.Create(_obj: Tbl); begin class(Tbl).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblUnitDecorator.Converte(); +function TblUnitDecorator.Convert(); begin - self.TblPr := new TblPrUnitDecorator(object_.TblPr); - self.TblGrid := new TblGridUnitDecorator(object_.TblGrid); + {self.}TblPr := new TblPrUnitDecorator(object_.TblPr); + {self.}TblGrid := new TblGridUnitDecorator(object_.TblGrid); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TblWUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TblWUnitDecorator@DOCX.tsf index cc667b9..3e19fcb 100644 --- a/autoclass/decorator/docx/TblWUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TblWUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TblWUnitDecorator = class(TblW) uses TSSafeUnitConverter; public function Create(_obj: TblW); - function Converte(); + function Convert(); private object_: TblW; end; @@ -11,11 +11,11 @@ function TblWUnitDecorator.Create(_obj: TblW); begin class(TblW).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TblWUnitDecorator.Converte(); +function TblWUnitDecorator.Convert(); begin - self.XmlAttrW.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrW.Value); - self.XmlAttrType.Value := object_.XmlAttrType.Value; + {self.}XmlAttrW.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrW.Value); + {self.}XmlAttrType.Value := object_.XmlAttrType.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TcPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TcPrUnitDecorator@DOCX.tsf index 3e6f8e4..535eb4c 100644 --- a/autoclass/decorator/docx/TcPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TcPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TcPrUnitDecorator = class(TcPr) uses TSSafeUnitConverter; public function Create(_obj: TcPr); - function Converte(); + function Convert(); private object_: TcPr; end; @@ -11,14 +11,14 @@ function TcPrUnitDecorator.Create(_obj: TcPr); begin class(TcPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TcPrUnitDecorator.Converte(); +function TcPrUnitDecorator.Convert(); begin - self.TcW := new TblWUnitDecorator(object_.TcW); - self.GridSpan := new PureWValUnitDecorator(object_.GridSpan); - self.VMerge := new PureWValUnitDecorator(object_.VMerge); - self.VAlign := new PureWValUnitDecorator(object_.VAlign); - self.Shd := new ShdUnitDecorator(object_.Shd); + {self.}TcW := new TblWUnitDecorator(object_.TcW); + {self.}GridSpan := new PureWValUnitDecorator(object_.GridSpan); + {self.}VMerge := new PureWValUnitDecorator(object_.VMerge); + {self.}VAlign := new PureWValUnitDecorator(object_.VAlign); + {self.}Shd := new ShdUnitDecorator(object_.Shd); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TcUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TcUnitDecorator@DOCX.tsf index feab69b..f6816fd 100644 --- a/autoclass/decorator/docx/TcUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TcUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TcUnitDecorator = class(Tc) uses TSSafeUnitConverter; public function Create(_obj: Tc); - function Converte(); + function Convert(); private object_: Tc; end; @@ -11,10 +11,10 @@ function TcUnitDecorator.Create(_obj: Tc); begin class(Tc).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TcUnitDecorator.Converte(); +function TcUnitDecorator.Convert(); begin - self.TcPr := new TcPrUnitDecorator(object_.TcPr); + {self.}TcPr := new TcPrUnitDecorator(object_.TcPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ThemeElementsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ThemeElementsUnitDecorator@DOCX.tsf index c92f5a5..467b47c 100644 --- a/autoclass/decorator/docx/ThemeElementsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ThemeElementsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ThemeElementsUnitDecorator = class(ThemeElements) uses TSSafeUnitConverter; public function Create(_obj: ThemeElements); - function Converte(); + function Convert(); private object_: ThemeElements; end; @@ -11,13 +11,13 @@ function ThemeElementsUnitDecorator.Create(_obj: ThemeElements); begin class(ThemeElements).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ThemeElementsUnitDecorator.Converte(); +function ThemeElementsUnitDecorator.Convert(); begin - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.ClrScheme := new ClrSchemeUnitDecorator(object_.ClrScheme); - self.FontScheme := new FontSchemeUnitDecorator(object_.FontScheme); - self.FmtScheme := new FmtSchemeUnitDecorator(object_.FmtScheme); + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}ClrScheme := new ClrSchemeUnitDecorator(object_.ClrScheme); + {self.}FontScheme := new FontSchemeUnitDecorator(object_.FontScheme); + {self.}FmtScheme := new FmtSchemeUnitDecorator(object_.FmtScheme); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ThemeFamilyUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ThemeFamilyUnitDecorator@DOCX.tsf index 290d5b5..41df1ad 100644 --- a/autoclass/decorator/docx/ThemeFamilyUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ThemeFamilyUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ThemeFamilyUnitDecorator = class(ThemeFamily) uses TSSafeUnitConverter; public function Create(_obj: ThemeFamily); - function Converte(); + function Convert(); private object_: ThemeFamily; end; @@ -11,13 +11,13 @@ function ThemeFamilyUnitDecorator.Create(_obj: ThemeFamily); begin class(ThemeFamily).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ThemeFamilyUnitDecorator.Converte(); +function ThemeFamilyUnitDecorator.Convert(); begin - self.XmlAttrXmlnsThm15.Value := object_.XmlAttrXmlnsThm15.Value; - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.XmlAttrId.Value := object_.XmlAttrId.Value; - self.XmlAttrVid.Value := object_.XmlAttrVid.Value; + {self.}XmlAttrXmlnsThm15.Value := object_.XmlAttrXmlnsThm15.Value; + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}XmlAttrId.Value := object_.XmlAttrId.Value; + {self.}XmlAttrVid.Value := object_.XmlAttrVid.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ThemeUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ThemeUnitDecorator@DOCX.tsf index c442f98..17e002b 100644 --- a/autoclass/decorator/docx/ThemeUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ThemeUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ThemeUnitDecorator = class(Theme) uses TSSafeUnitConverter; public function Create(_obj: Theme); - function Converte(); + function Convert(); private object_: Theme; end; @@ -11,15 +11,15 @@ function ThemeUnitDecorator.Create(_obj: Theme); begin class(Theme).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ThemeUnitDecorator.Converte(); +function ThemeUnitDecorator.Convert(); begin - self.XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; - self.XmlAttrName.Value := object_.XmlAttrName.Value; - self.ThemeElements := new ThemeElementsUnitDecorator(object_.ThemeElements); - if not ifnil(object_.XmlChildObjectDefaults.Value) then self.XmlChildObjectDefaults.Value := object_.XmlChildObjectDefaults.Value; - if not ifnil(object_.XmlChildExtraClrSchemeLst.Value) then self.XmlChildExtraClrSchemeLst.Value := object_.XmlChildExtraClrSchemeLst.Value; - self.ExtLst := new ExtLstUnitDecorator(object_.ExtLst); + {self.}XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value; + {self.}XmlAttrName.Value := object_.XmlAttrName.Value; + {self.}ThemeElements := new ThemeElementsUnitDecorator(object_.ThemeElements); + if not ifnil(object_.XmlChildObjectDefaults.Value) then {self.}XmlChildObjectDefaults.Value := object_.XmlChildObjectDefaults.Value; + if not ifnil(object_.XmlChildExtraClrSchemeLst.Value) then {self.}XmlChildExtraClrSchemeLst.Value := object_.XmlChildExtraClrSchemeLst.Value; + {self.}ExtLst := new ExtLstUnitDecorator(object_.ExtLst); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TitleUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TitleUnitDecorator@DOCX.tsf index 8fba55f..800b477 100644 --- a/autoclass/decorator/docx/TitleUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TitleUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TitleUnitDecorator = class(Title) uses TSSafeUnitConverter; public function Create(_obj: Title); - function Converte(); + function Convert(); private object_: Title; end; @@ -11,12 +11,12 @@ function TitleUnitDecorator.Create(_obj: Title); begin class(Title).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TitleUnitDecorator.Converte(); +function TitleUnitDecorator.Convert(); begin - self.Tx := new TxUnitDecorator(object_.Tx); - if not ifnil(object_.XmlChildLayout.Value) then self.XmlChildLayout.Value := object_.XmlChildLayout.Value; - self.Overlay := new PureValUnitDecorator(object_.Overlay); + {self.}Tx := new TxUnitDecorator(object_.Tx); + if not ifnil(object_.XmlChildLayout.Value) then {self.}XmlChildLayout.Value := object_.XmlChildLayout.Value; + {self.}Overlay := new PureValUnitDecorator(object_.Overlay); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TrHeightUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TrHeightUnitDecorator@DOCX.tsf index 838997f..cffc64a 100644 --- a/autoclass/decorator/docx/TrHeightUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TrHeightUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TrHeightUnitDecorator = class(TrHeight) uses TSSafeUnitConverter; public function Create(_obj: TrHeight); - function Converte(); + function Convert(); private object_: TrHeight; end; @@ -11,10 +11,10 @@ function TrHeightUnitDecorator.Create(_obj: TrHeight); begin class(TrHeight).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TrHeightUnitDecorator.Converte(); +function TrHeightUnitDecorator.Convert(); begin - self.XmlAttrval.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrval.Value); + {self.}XmlAttrval.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrval.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TrPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TrPrUnitDecorator@DOCX.tsf index 09057b1..7688f17 100644 --- a/autoclass/decorator/docx/TrPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TrPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TrPrUnitDecorator = class(TrPr) uses TSSafeUnitConverter; public function Create(_obj: TrPr); - function Converte(); + function Convert(); private object_: TrPr; end; @@ -11,12 +11,12 @@ function TrPrUnitDecorator.Create(_obj: TrPr); begin class(TrPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TrPrUnitDecorator.Converte(); +function TrPrUnitDecorator.Convert(); begin - self.TrHeight := new TrHeightUnitDecorator(object_.TrHeight); - self.Jc := new PureWValUnitDecorator(object_.Jc); - if not ifnil(object_.XmlChildCantSplit.Value) then self.XmlChildCantSplit.Value := object_.XmlChildCantSplit.Value; + {self.}TrHeight := new TrHeightUnitDecorator(object_.TrHeight); + {self.}Jc := new PureWValUnitDecorator(object_.Jc); + if not ifnil(object_.XmlChildCantSplit.Value) then {self.}XmlChildCantSplit.Value := object_.XmlChildCantSplit.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TrUnitDecorator@DOCX.tsf index fdfe7b9..8096303 100644 --- a/autoclass/decorator/docx/TrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TrUnitDecorator = class(Tr) uses TSSafeUnitConverter; public function Create(_obj: Tr); - function Converte(); + function Convert(); private object_: Tr; end; @@ -11,14 +11,14 @@ function TrUnitDecorator.Create(_obj: Tr); begin class(Tr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TrUnitDecorator.Converte(); +function TrUnitDecorator.Convert(); begin - self.XmlAttrWRsidR.Value := object_.XmlAttrWRsidR.Value; - self.XmlAttrW14ParaId.Value := object_.XmlAttrW14ParaId.Value; - self.XmlAttrW14TextId.Value := object_.XmlAttrW14TextId.Value; - self.XmlAttrWRsidTr.Value := object_.XmlAttrWRsidTr.Value; - self.TrPr := new TrPrUnitDecorator(object_.TrPr); + {self.}XmlAttrWRsidR.Value := object_.XmlAttrWRsidR.Value; + {self.}XmlAttrW14ParaId.Value := object_.XmlAttrW14ParaId.Value; + {self.}XmlAttrW14TextId.Value := object_.XmlAttrW14TextId.Value; + {self.}XmlAttrWRsidTr.Value := object_.XmlAttrWRsidTr.Value; + {self.}TrPr := new TrPrUnitDecorator(object_.TrPr); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TxPrUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TxPrUnitDecorator@DOCX.tsf index 5c2c983..854649f 100644 --- a/autoclass/decorator/docx/TxPrUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TxPrUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TxPrUnitDecorator = class(TxPr) uses TSSafeUnitConverter; public function Create(_obj: TxPr); - function Converte(); + function Convert(); private object_: TxPr; end; @@ -11,11 +11,11 @@ function TxPrUnitDecorator.Create(_obj: TxPr); begin class(TxPr).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TxPrUnitDecorator.Converte(); +function TxPrUnitDecorator.Convert(); begin - self.BodyPr := new BodyPrUnitDecorator(object_.BodyPr); - if not ifnil(object_.XmlChildLstStyle.Value) then self.XmlChildLstStyle.Value := object_.XmlChildLstStyle.Value; + {self.}BodyPr := new BodyPrUnitDecorator(object_.BodyPr); + if not ifnil(object_.XmlChildLstStyle.Value) then {self.}XmlChildLstStyle.Value := object_.XmlChildLstStyle.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TxUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TxUnitDecorator@DOCX.tsf index 915fe07..6313af5 100644 --- a/autoclass/decorator/docx/TxUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TxUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TxUnitDecorator = class(Tx) uses TSSafeUnitConverter; public function Create(_obj: Tx); - function Converte(); + function Convert(); private object_: Tx; end; @@ -11,11 +11,11 @@ function TxUnitDecorator.Create(_obj: Tx); begin class(Tx).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TxUnitDecorator.Converte(); +function TxUnitDecorator.Convert(); begin - self.StrRef := new StrRefUnitDecorator(object_.StrRef); - self.Rich := new RichUnitDecorator(object_.Rich); + {self.}StrRef := new StrRefUnitDecorator(object_.StrRef); + {self.}Rich := new RichUnitDecorator(object_.Rich); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/TypesUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/TypesUnitDecorator@DOCX.tsf index 1a35e0c..4b3ba48 100644 --- a/autoclass/decorator/docx/TypesUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/TypesUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type TypesUnitDecorator = class(Types) uses TSSafeUnitConverter; public function Create(_obj: Types); - function Converte(); + function Convert(); private object_: Types; end; @@ -11,9 +11,9 @@ function TypesUnitDecorator.Create(_obj: Types); begin class(Types).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function TypesUnitDecorator.Converte(); +function TypesUnitDecorator.Convert(); begin end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ValUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ValUnitDecorator@DOCX.tsf index a735f36..80d685d 100644 --- a/autoclass/decorator/docx/ValUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ValUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ValUnitDecorator = class(Val) uses TSSafeUnitConverter; public function Create(_obj: Val); - function Converte(); + function Convert(); private object_: Val; end; @@ -11,10 +11,10 @@ function ValUnitDecorator.Create(_obj: Val); begin class(Val).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ValUnitDecorator.Converte(); +function ValUnitDecorator.Convert(); begin - self.NumRef := new NumRefUnitDecorator(object_.NumRef); + {self.}NumRef := new NumRefUnitDecorator(object_.NumRef); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/View3DUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/View3DUnitDecorator@DOCX.tsf index 38efe5e..3b08484 100644 --- a/autoclass/decorator/docx/View3DUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/View3DUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type View3DUnitDecorator = class(View3D) uses TSSafeUnitConverter; public function Create(_obj: View3D); - function Converte(); + function Convert(); private object_: View3D; end; @@ -11,12 +11,12 @@ function View3DUnitDecorator.Create(_obj: View3D); begin class(View3D).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function View3DUnitDecorator.Converte(); +function View3DUnitDecorator.Convert(); begin - self.RotX := new PureValUnitDecorator(object_.RotX); - self.RotY := new PureValUnitDecorator(object_.RotY); - self.RAngAx := new PureValUnitDecorator(object_.RAngAx); + {self.}RotX := new PureValUnitDecorator(object_.RotX); + {self.}RotY := new PureValUnitDecorator(object_.RotY); + {self.}RAngAx := new PureValUnitDecorator(object_.RAngAx); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/WebSettingsUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/WebSettingsUnitDecorator@DOCX.tsf index f7213ed..6301233 100644 --- a/autoclass/decorator/docx/WebSettingsUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/WebSettingsUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type WebSettingsUnitDecorator = class(WebSettings) uses TSSafeUnitConverter; public function Create(_obj: WebSettings); - function Converte(); + function Convert(); private object_: WebSettings; end; @@ -11,23 +11,23 @@ function WebSettingsUnitDecorator.Create(_obj: WebSettings); begin class(WebSettings).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function WebSettingsUnitDecorator.Converte(); +function WebSettingsUnitDecorator.Convert(); begin - self.XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; - self.XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; - self.XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; - self.XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; - self.XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; - self.XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; - self.XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; - self.XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; - self.XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; - self.XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; - self.XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; - self.XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; - if not ifnil(object_.XmlChildOptimizeForBrowser.Value) then self.XmlChildOptimizeForBrowser.Value := object_.XmlChildOptimizeForBrowser.Value; - if not ifnil(object_.XmlChildAllowPNG.Value) then self.XmlChildAllowPNG.Value := object_.XmlChildAllowPNG.Value; + {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsR.Value := object_.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsW.Value := object_.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW14.Value := object_.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW15.Value := object_.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW16Cex.Value := object_.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cid.Value := object_.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16.Value := object_.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16Du.Value := object_.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := object_.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16se.Value := object_.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrMcIgnorable.Value := object_.XmlAttrMcIgnorable.Value; + if not ifnil(object_.XmlChildOptimizeForBrowser.Value) then {self.}XmlChildOptimizeForBrowser.Value := object_.XmlChildOptimizeForBrowser.Value; + if not ifnil(object_.XmlChildAllowPNG.Value) then {self.}XmlChildAllowPNG.Value := object_.XmlChildAllowPNG.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/XYUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/XYUnitDecorator@DOCX.tsf index 5ea5755..4fda687 100644 --- a/autoclass/decorator/docx/XYUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/XYUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type XYUnitDecorator = class(XY) uses TSSafeUnitConverter; public function Create(_obj: XY); - function Converte(); + function Convert(); private object_: XY; end; @@ -11,11 +11,11 @@ function XYUnitDecorator.Create(_obj: XY); begin class(XY).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function XYUnitDecorator.Converte(); +function XYUnitDecorator.Convert(); begin - self.XmlAttrX.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrX.Value); - self.XmlAttrY.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrY.Value); + {self.}XmlAttrX.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrX.Value); + {self.}XmlAttrY.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrY.Value); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/XfrmUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/XfrmUnitDecorator@DOCX.tsf index f6ecca3..0d80fe1 100644 --- a/autoclass/decorator/docx/XfrmUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/XfrmUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type XfrmUnitDecorator = class(Xfrm) uses TSSafeUnitConverter; public function Create(_obj: Xfrm); - function Converte(); + function Convert(); private object_: Xfrm; end; @@ -11,11 +11,11 @@ function XfrmUnitDecorator.Create(_obj: Xfrm); begin class(Xfrm).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function XfrmUnitDecorator.Converte(); +function XfrmUnitDecorator.Convert(); begin - self.Off := new XYUnitDecorator(object_.Off); - self.Ext := new CXYUnitDecorator(object_.Ext); + {self.}Off := new XYUnitDecorator(object_.Off); + {self.}Ext := new CXYUnitDecorator(object_.Ext); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/ZoomUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/ZoomUnitDecorator@DOCX.tsf index 0e99200..1954ee6 100644 --- a/autoclass/decorator/docx/ZoomUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/ZoomUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type ZoomUnitDecorator = class(Zoom) uses TSSafeUnitConverter; public function Create(_obj: Zoom); - function Converte(); + function Convert(); private object_: Zoom; end; @@ -11,10 +11,10 @@ function ZoomUnitDecorator.Create(_obj: Zoom); begin class(Zoom).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function ZoomUnitDecorator.Converte(); +function ZoomUnitDecorator.Convert(); begin - self.XmlAttrPercent.Value := object_.XmlAttrPercent.Value; + {self.}XmlAttrPercent.Value := object_.XmlAttrPercent.Value; end; \ No newline at end of file diff --git a/autoclass/decorator/docx/_InlineUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/_InlineUnitDecorator@DOCX.tsf index c680ba3..8b14d9f 100644 --- a/autoclass/decorator/docx/_InlineUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/_InlineUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type _InlineUnitDecorator = class(_Inline) uses TSSafeUnitConverter; public function Create(_obj: _Inline); - function Converte(); + function Convert(); private object_: _Inline; end; @@ -11,20 +11,20 @@ function _InlineUnitDecorator.Create(_obj: _Inline); begin class(_Inline).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function _InlineUnitDecorator.Converte(); +function _InlineUnitDecorator.Convert(); begin - self.XmlAttrDistT.Value := object_.XmlAttrDistT.Value; - self.XmlAttrDistB.Value := object_.XmlAttrDistB.Value; - self.XmlAttrDistL.Value := object_.XmlAttrDistL.Value; - self.XmlAttrDistR.Value := object_.XmlAttrDistR.Value; - self.XmlAttrAnchorId.Value := object_.XmlAttrAnchorId.Value; - self.XmlAttrEditId.Value := object_.XmlAttrEditId.Value; - self.Extent := new CXYUnitDecorator(object_.Extent); - self.EffectExtent := new EffectExtentUnitDecorator(object_.EffectExtent); - self.DocPr := new DocPrUnitDecorator(object_.DocPr); - self.CNvGraphicFramePr := new CNvGraphicFramePrUnitDecorator(object_.CNvGraphicFramePr); - self.Graphic := new GraphicUnitDecorator(object_.Graphic); + {self.}XmlAttrDistT.Value := object_.XmlAttrDistT.Value; + {self.}XmlAttrDistB.Value := object_.XmlAttrDistB.Value; + {self.}XmlAttrDistL.Value := object_.XmlAttrDistL.Value; + {self.}XmlAttrDistR.Value := object_.XmlAttrDistR.Value; + {self.}XmlAttrAnchorId.Value := object_.XmlAttrAnchorId.Value; + {self.}XmlAttrEditId.Value := object_.XmlAttrEditId.Value; + {self.}Extent := new CXYUnitDecorator(object_.Extent); + {self.}EffectExtent := new EffectExtentUnitDecorator(object_.EffectExtent); + {self.}DocPr := new DocPrUnitDecorator(object_.DocPr); + {self.}CNvGraphicFramePr := new CNvGraphicFramePrUnitDecorator(object_.CNvGraphicFramePr); + {self.}Graphic := new GraphicUnitDecorator(object_.Graphic); end; \ No newline at end of file diff --git a/autoclass/decorator/docx/_OverrideUnitDecorator@DOCX.tsf b/autoclass/decorator/docx/_OverrideUnitDecorator@DOCX.tsf index 3493e9f..236e9e4 100644 --- a/autoclass/decorator/docx/_OverrideUnitDecorator@DOCX.tsf +++ b/autoclass/decorator/docx/_OverrideUnitDecorator@DOCX.tsf @@ -2,7 +2,7 @@ type _OverrideUnitDecorator = class(_Override) uses TSSafeUnitConverter; public function Create(_obj: _Override); - function Converte(); + function Convert(); private object_: _Override; end; @@ -11,11 +11,11 @@ function _OverrideUnitDecorator.Create(_obj: _Override); begin class(_Override).Create(); object_ := _obj; - self.Converte(); + {self.}Convert(); end; -function _OverrideUnitDecorator.Converte(); +function _OverrideUnitDecorator.Convert(); begin - self.XmlAttrPartName.Value := object_.XmlAttrPartName.Value; - self.XmlAttrContentType.Value := object_.XmlAttrContentType.Value; + {self.}XmlAttrPartName.Value := object_.XmlAttrPartName.Value; + {self.}XmlAttrContentType.Value := object_.XmlAttrContentType.Value; end; \ No newline at end of file diff --git a/autoclass/docx/APPr@DOCX.tsf b/autoclass/docx/APPr@DOCX.tsf index 75e20f0..954c80a 100644 --- a/autoclass/docx/APPr@DOCX.tsf +++ b/autoclass/docx/APPr@DOCX.tsf @@ -19,7 +19,7 @@ end; function APPr.Create();overload; begin - self.Create(nil, "a", "pPr"); + {self.}Create(nil, "a", "pPr"); end; function APPr.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function APPr.Init();override; begin - self.DefRPr := new ARPr(self, self.Prefix, "defRPr"); + {self.}DefRPr := new ARPr(self, {self.}Prefix, "defRPr"); end; function APPr.InitAttributes();override; @@ -46,19 +46,19 @@ end; function APPr.InitChildren();override; begin child_elements_ := array( - 0: self.DefRPr, + 0: {self.}DefRPr, ); sorted_child_ := array( "": -1, - self.DefRPr.ElementName: 0, + {self.}DefRPr.ElementName: 0, ); end; function APPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function APPr.Copy(_obj: APPr);override; begin - self.DefRPr.Copy(_obj.DefRPr); + {self.}DefRPr.Copy(_obj.DefRPr); end; diff --git a/autoclass/docx/AR@DOCX.tsf b/autoclass/docx/AR@DOCX.tsf index 15d2f6f..cd87fd4 100644 --- a/autoclass/docx/AR@DOCX.tsf +++ b/autoclass/docx/AR@DOCX.tsf @@ -20,7 +20,7 @@ end; function AR.Create();overload; begin - self.Create(nil, "a", "r"); + {self.}Create(nil, "a", "r"); end; function AR.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function AR.Init();override; begin - self.RPr := new ARPr(self, self.Prefix, "rPr"); - self.T := new T(self, self.Prefix, "t"); + {self.}RPr := new ARPr(self, {self.}Prefix, "rPr"); + {self.}T := new T(self, {self.}Prefix, "t"); end; function AR.InitAttributes();override; @@ -48,21 +48,21 @@ end; function AR.InitChildren();override; begin child_elements_ := array( - 0: self.RPr, - 1: self.T, + 0: {self.}RPr, + 1: {self.}T, ); sorted_child_ := array( "": -1, - self.RPr.ElementName: 0, - self.T.ElementName: 1, + {self.}RPr.ElementName: 0, + {self.}T.ElementName: 1, ); end; function AR.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function AR.Copy(_obj: AR);override; begin - self.RPr.Copy(_obj.RPr); - self.T.Copy(_obj.T); + {self.}RPr.Copy(_obj.RPr); + {self.}T.Copy(_obj.T); end; diff --git a/autoclass/docx/ARPr@DOCX.tsf b/autoclass/docx/ARPr@DOCX.tsf index 75cc6ab..c38d2a2 100644 --- a/autoclass/docx/ARPr@DOCX.tsf +++ b/autoclass/docx/ARPr@DOCX.tsf @@ -63,7 +63,7 @@ end; function ARPr.Create();overload; begin - self.Create(nil, "a", "rPr"); + {self.}Create(nil, "a", "rPr"); end; function ARPr.Create(_node: XmlNode);overload; @@ -78,60 +78,60 @@ end; function ARPr.Init();override; begin - self.XmlAttrLang := new OpenXmlAttribute(nil, "lang", nil); - self.XmlAttrAltLang := new OpenXmlAttribute(nil, "altLang", nil); - self.XmlAttrB := new OpenXmlAttribute(nil, "b", nil); - self.XmlAttrBaseline := new OpenXmlAttribute(nil, "baseline", nil); - self.XmlAttrI := new OpenXmlAttribute(nil, "i", nil); - self.XmlAttrKern := new OpenXmlAttribute(nil, "kern", nil); - self.XmlAttrSpc := new OpenXmlAttribute(nil, "spc", nil); - self.XmlAttrStrike := new OpenXmlAttribute(nil, "strike", nil); - self.XmlAttrSz := new OpenXmlAttribute(nil, "sz", nil); - self.XmlAttrU := new OpenXmlAttribute(nil, "u", nil); - self.SolidFill := new SolidFill(self, self.Prefix, "solidFill"); - self.Latin := new Latin(self, self.Prefix, "latin"); - self.Ea := new Latin(self, self.Prefix, "ea"); - self.Cs := new Latin(self, self.Prefix, "cs"); + {self.}XmlAttrLang := new OpenXmlAttribute(nil, "lang", nil); + {self.}XmlAttrAltLang := new OpenXmlAttribute(nil, "altLang", nil); + {self.}XmlAttrB := new OpenXmlAttribute(nil, "b", nil); + {self.}XmlAttrBaseline := new OpenXmlAttribute(nil, "baseline", nil); + {self.}XmlAttrI := new OpenXmlAttribute(nil, "i", nil); + {self.}XmlAttrKern := new OpenXmlAttribute(nil, "kern", nil); + {self.}XmlAttrSpc := new OpenXmlAttribute(nil, "spc", nil); + {self.}XmlAttrStrike := new OpenXmlAttribute(nil, "strike", nil); + {self.}XmlAttrSz := new OpenXmlAttribute(nil, "sz", nil); + {self.}XmlAttrU := new OpenXmlAttribute(nil, "u", nil); + {self.}SolidFill := new SolidFill(self, {self.}Prefix, "solidFill"); + {self.}Latin := new Latin(self, {self.}Prefix, "latin"); + {self.}Ea := new Latin(self, {self.}Prefix, "ea"); + {self.}Cs := new Latin(self, {self.}Prefix, "cs"); end; function ARPr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrLang, - self.XmlAttrAltLang, - self.XmlAttrB, - self.XmlAttrBaseline, - self.XmlAttrI, - self.XmlAttrKern, - self.XmlAttrSpc, - self.XmlAttrStrike, - self.XmlAttrSz, - self.XmlAttrU, + {self.}XmlAttrLang, + {self.}XmlAttrAltLang, + {self.}XmlAttrB, + {self.}XmlAttrBaseline, + {self.}XmlAttrI, + {self.}XmlAttrKern, + {self.}XmlAttrSpc, + {self.}XmlAttrStrike, + {self.}XmlAttrSz, + {self.}XmlAttrU, ); end; function ARPr.InitChildren();override; begin child_elements_ := array( - 0: self.SolidFill, - 1: self.Latin, - 2: self.Ea, - 3: self.Cs, + 0: {self.}SolidFill, + 1: {self.}Latin, + 2: {self.}Ea, + 3: {self.}Cs, ); sorted_child_ := array( "": -1, - self.SolidFill.ElementName: 0, - self.Latin.ElementName: 1, - self.Ea.ElementName: 2, - self.Cs.ElementName: 3, + {self.}SolidFill.ElementName: 0, + {self.}Latin.ElementName: 1, + {self.}Ea.ElementName: 2, + {self.}Cs.ElementName: 3, ); end; function ARPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -140,7 +140,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -168,127 +168,127 @@ end; function ARPr.Copy(_obj: ARPr);override; begin if not ifnil(_obj.XmlAttrLang.Value) then - self.XmlAttrLang.Value := _obj.XmlAttrLang.Value; + {self.}XmlAttrLang.Value := _obj.XmlAttrLang.Value; if not ifnil(_obj.XmlAttrAltLang.Value) then - self.XmlAttrAltLang.Value := _obj.XmlAttrAltLang.Value; + {self.}XmlAttrAltLang.Value := _obj.XmlAttrAltLang.Value; if not ifnil(_obj.XmlAttrB.Value) then - self.XmlAttrB.Value := _obj.XmlAttrB.Value; + {self.}XmlAttrB.Value := _obj.XmlAttrB.Value; if not ifnil(_obj.XmlAttrBaseline.Value) then - self.XmlAttrBaseline.Value := _obj.XmlAttrBaseline.Value; + {self.}XmlAttrBaseline.Value := _obj.XmlAttrBaseline.Value; if not ifnil(_obj.XmlAttrI.Value) then - self.XmlAttrI.Value := _obj.XmlAttrI.Value; + {self.}XmlAttrI.Value := _obj.XmlAttrI.Value; if not ifnil(_obj.XmlAttrKern.Value) then - self.XmlAttrKern.Value := _obj.XmlAttrKern.Value; + {self.}XmlAttrKern.Value := _obj.XmlAttrKern.Value; if not ifnil(_obj.XmlAttrSpc.Value) then - self.XmlAttrSpc.Value := _obj.XmlAttrSpc.Value; + {self.}XmlAttrSpc.Value := _obj.XmlAttrSpc.Value; if not ifnil(_obj.XmlAttrStrike.Value) then - self.XmlAttrStrike.Value := _obj.XmlAttrStrike.Value; + {self.}XmlAttrStrike.Value := _obj.XmlAttrStrike.Value; if not ifnil(_obj.XmlAttrSz.Value) then - self.XmlAttrSz.Value := _obj.XmlAttrSz.Value; + {self.}XmlAttrSz.Value := _obj.XmlAttrSz.Value; if not ifnil(_obj.XmlAttrU.Value) then - self.XmlAttrU.Value := _obj.XmlAttrU.Value; - self.SolidFill.Copy(_obj.SolidFill); - self.Latin.Copy(_obj.Latin); - self.Ea.Copy(_obj.Ea); - self.Cs.Copy(_obj.Cs); + {self.}XmlAttrU.Value := _obj.XmlAttrU.Value; + {self.}SolidFill.Copy(_obj.SolidFill); + {self.}Latin.Copy(_obj.Latin); + {self.}Ea.Copy(_obj.Ea); + {self.}Cs.Copy(_obj.Cs); end; function ARPr.ReadXmlAttrLang(); begin - return self.XmlAttrLang.Value; + return {self.}XmlAttrLang.Value; end; function ARPr.WriteXmlAttrLang(_value); begin - self.XmlAttrLang.Value := _value; + {self.}XmlAttrLang.Value := _value; end; function ARPr.ReadXmlAttrAltLang(); begin - return self.XmlAttrAltLang.Value; + return {self.}XmlAttrAltLang.Value; end; function ARPr.WriteXmlAttrAltLang(_value); begin - self.XmlAttrAltLang.Value := _value; + {self.}XmlAttrAltLang.Value := _value; end; function ARPr.ReadXmlAttrB(); begin - return self.XmlAttrB.Value; + return {self.}XmlAttrB.Value; end; function ARPr.WriteXmlAttrB(_value); begin - self.XmlAttrB.Value := _value; + {self.}XmlAttrB.Value := _value; end; function ARPr.ReadXmlAttrBaseline(); begin - return self.XmlAttrBaseline.Value; + return {self.}XmlAttrBaseline.Value; end; function ARPr.WriteXmlAttrBaseline(_value); begin - self.XmlAttrBaseline.Value := _value; + {self.}XmlAttrBaseline.Value := _value; end; function ARPr.ReadXmlAttrI(); begin - return self.XmlAttrI.Value; + return {self.}XmlAttrI.Value; end; function ARPr.WriteXmlAttrI(_value); begin - self.XmlAttrI.Value := _value; + {self.}XmlAttrI.Value := _value; end; function ARPr.ReadXmlAttrKern(); begin - return self.XmlAttrKern.Value; + return {self.}XmlAttrKern.Value; end; function ARPr.WriteXmlAttrKern(_value); begin - self.XmlAttrKern.Value := _value; + {self.}XmlAttrKern.Value := _value; end; function ARPr.ReadXmlAttrSpc(); begin - return self.XmlAttrSpc.Value; + return {self.}XmlAttrSpc.Value; end; function ARPr.WriteXmlAttrSpc(_value); begin - self.XmlAttrSpc.Value := _value; + {self.}XmlAttrSpc.Value := _value; end; function ARPr.ReadXmlAttrStrike(); begin - return self.XmlAttrStrike.Value; + return {self.}XmlAttrStrike.Value; end; function ARPr.WriteXmlAttrStrike(_value); begin - self.XmlAttrStrike.Value := _value; + {self.}XmlAttrStrike.Value := _value; end; function ARPr.ReadXmlAttrSz(); begin - return self.XmlAttrSz.Value; + return {self.}XmlAttrSz.Value; end; function ARPr.WriteXmlAttrSz(_value); begin - self.XmlAttrSz.Value := _value; + {self.}XmlAttrSz.Value := _value; end; function ARPr.ReadXmlAttrU(); begin - return self.XmlAttrU.Value; + return {self.}XmlAttrU.Value; end; function ARPr.WriteXmlAttrU(_value); begin - self.XmlAttrU.Value := _value; + {self.}XmlAttrU.Value := _value; end; diff --git a/autoclass/docx/AbstractNum@DOCX.tsf b/autoclass/docx/AbstractNum@DOCX.tsf index df6d3cb..c245cf0 100644 --- a/autoclass/docx/AbstractNum@DOCX.tsf +++ b/autoclass/docx/AbstractNum@DOCX.tsf @@ -35,7 +35,7 @@ end; function AbstractNum.Create();overload; begin - self.Create(nil, "w", "abstractNum"); + {self.}Create(nil, "w", "abstractNum"); end; function AbstractNum.Create(_node: XmlNode);overload; @@ -50,41 +50,41 @@ end; function AbstractNum.Init();override; begin - self.XmlAttrAbstractNumId := new OpenXmlAttribute(self.Prefix, "abstractNumId", nil); - self.XmlAttrRestartNumberingAfterBreak := new OpenXmlAttribute(self.Prefix, "restartNumberingAfterBreak", nil); - self.Nsid := new PureWVal(self, self.Prefix, "nsid"); - self.MultiLevelType := new PureWVal(self, self.Prefix, "multiLevelType"); - self.Tmpl := new PureWVal(self, self.Prefix, "tmpl"); + {self.}XmlAttrAbstractNumId := new OpenXmlAttribute({self.}Prefix, "abstractNumId", nil); + {self.}XmlAttrRestartNumberingAfterBreak := new OpenXmlAttribute({self.}Prefix, "restartNumberingAfterBreak", nil); + {self.}Nsid := new PureWVal(self, {self.}Prefix, "nsid"); + {self.}MultiLevelType := new PureWVal(self, {self.}Prefix, "multiLevelType"); + {self.}Tmpl := new PureWVal(self, {self.}Prefix, "tmpl"); end; function AbstractNum.InitAttributes();override; begin attributes_ := array( - self.XmlAttrAbstractNumId, - self.XmlAttrRestartNumberingAfterBreak, + {self.}XmlAttrAbstractNumId, + {self.}XmlAttrRestartNumberingAfterBreak, ); end; function AbstractNum.InitChildren();override; begin child_elements_ := array( - 0: self.Nsid, - 1: self.MultiLevelType, - 2: self.Tmpl, + 0: {self.}Nsid, + 1: {self.}MultiLevelType, + 2: {self.}Tmpl, ); sorted_child_ := array( "": -1, - self.Nsid.ElementName: 0, - self.MultiLevelType.ElementName: 1, - self.Tmpl.ElementName: 2, + {self.}Nsid.ElementName: 0, + {self.}MultiLevelType.ElementName: 1, + {self.}Tmpl.ElementName: 2, ); end; function AbstractNum.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -93,7 +93,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,7 +102,7 @@ begin begin obj := nil; case node_name of - pre + "lvl": obj := self.AppendLvl(); + pre + "lvl": obj := {self.}AppendLvl(); end; if ifObj(obj) then obj.InitNode(node); end @@ -122,12 +122,12 @@ end; function AbstractNum.Copy(_obj: AbstractNum);override; begin if not ifnil(_obj.XmlAttrAbstractNumId.Value) then - self.XmlAttrAbstractNumId.Value := _obj.XmlAttrAbstractNumId.Value; + {self.}XmlAttrAbstractNumId.Value := _obj.XmlAttrAbstractNumId.Value; if not ifnil(_obj.XmlAttrRestartNumberingAfterBreak.Value) then - self.XmlAttrRestartNumberingAfterBreak.Value := _obj.XmlAttrRestartNumberingAfterBreak.Value; - self.Nsid.Copy(_obj.Nsid); - self.MultiLevelType.Copy(_obj.MultiLevelType); - self.Tmpl.Copy(_obj.Tmpl); + {self.}XmlAttrRestartNumberingAfterBreak.Value := _obj.XmlAttrRestartNumberingAfterBreak.Value; + {self.}Nsid.Copy(_obj.Nsid); + {self.}MultiLevelType.Copy(_obj.MultiLevelType); + {self.}Tmpl.Copy(_obj.Tmpl); end; function AbstractNum.AddLvl(): Lvl; @@ -138,14 +138,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "lvl" then break; end - obj := new Lvl(self, self.Prefix, "lvl"); - self.InsertChild(obj, i+1); + obj := new Lvl(self, {self.}Prefix, "lvl"); + {self.}InsertChild(obj, i+1); return obj; end; function AbstractNum.AppendLvl(): Lvl; begin - obj := new Lvl(self, self.Prefix, "lvl"); + obj := new Lvl(self, {self.}Prefix, "lvl"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -168,20 +168,20 @@ end; function AbstractNum.ReadXmlAttrAbstractNumId(); begin - return self.XmlAttrAbstractNumId.Value; + return {self.}XmlAttrAbstractNumId.Value; end; function AbstractNum.WriteXmlAttrAbstractNumId(_value); begin - self.XmlAttrAbstractNumId.Value := _value; + {self.}XmlAttrAbstractNumId.Value := _value; end; function AbstractNum.ReadXmlAttrRestartNumberingAfterBreak(); begin - return self.XmlAttrRestartNumberingAfterBreak.Value; + return {self.}XmlAttrRestartNumberingAfterBreak.Value; end; function AbstractNum.WriteXmlAttrRestartNumberingAfterBreak(_value); begin - self.XmlAttrRestartNumberingAfterBreak.Value := _value; + {self.}XmlAttrRestartNumberingAfterBreak.Value := _value; end; diff --git a/autoclass/docx/AlternateContent@DOCX.tsf b/autoclass/docx/AlternateContent@DOCX.tsf index 6372050..87adf07 100644 --- a/autoclass/docx/AlternateContent@DOCX.tsf +++ b/autoclass/docx/AlternateContent@DOCX.tsf @@ -25,7 +25,7 @@ end; function AlternateContent.Create();overload; begin - self.Create(nil, "mc", "alternateContent"); + {self.}Create(nil, "mc", "alternateContent"); end; function AlternateContent.Create(_node: XmlNode);overload; @@ -40,36 +40,36 @@ end; function AlternateContent.Init();override; begin - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", "http://schemas.openxmlformats.org/markup-compatibility/2006"); - self.Choice := new Choice(self, self.Prefix, "Choice"); - self.Fallback := new Fallback(self, self.Prefix, "Fallback"); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", "http://schemas.openxmlformats.org/markup-compatibility/2006"); + {self.}Choice := new Choice(self, {self.}Prefix, "Choice"); + {self.}Fallback := new Fallback(self, {self.}Prefix, "Fallback"); end; function AlternateContent.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsMc, ); end; function AlternateContent.InitChildren();override; begin child_elements_ := array( - 0: self.Choice, - 1: self.Fallback, + 0: {self.}Choice, + 1: {self.}Fallback, ); sorted_child_ := array( "": -1, - self.Choice.ElementName: 0, - self.Fallback.ElementName: 1, + {self.}Choice.ElementName: 0, + {self.}Fallback.ElementName: 1, ); end; function AlternateContent.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -78,7 +78,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,17 +106,17 @@ end; function AlternateContent.Copy(_obj: AlternateContent);override; begin if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; - self.Choice.Copy(_obj.Choice); - self.Fallback.Copy(_obj.Fallback); + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}Choice.Copy(_obj.Choice); + {self.}Fallback.Copy(_obj.Fallback); end; function AlternateContent.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function AlternateContent.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; diff --git a/autoclass/docx/Ap@DOCX.tsf b/autoclass/docx/Ap@DOCX.tsf index 8643f48..c395fe5 100644 --- a/autoclass/docx/Ap@DOCX.tsf +++ b/autoclass/docx/Ap@DOCX.tsf @@ -25,7 +25,7 @@ end; function Ap.Create();overload; begin - self.Create(nil, "a", "p"); + {self.}Create(nil, "a", "p"); end; function Ap.Create(_node: XmlNode);overload; @@ -40,8 +40,8 @@ end; function Ap.Init();override; begin - self.PPr := new APPr(self, self.Prefix, "pPr"); - self.EndParaRPr := new ARPr(self, self.Prefix, "endParaRPr"); + {self.}PPr := new APPr(self, {self.}Prefix, "pPr"); + {self.}EndParaRPr := new ARPr(self, {self.}Prefix, "endParaRPr"); end; function Ap.InitAttributes();override; @@ -53,21 +53,21 @@ end; function Ap.InitChildren();override; begin child_elements_ := array( - 0: self.PPr, - 1: self.EndParaRPr, + 0: {self.}PPr, + 1: {self.}EndParaRPr, ); sorted_child_ := array( "": -1, - self.PPr.ElementName: 0, - self.EndParaRPr.ElementName: 1, + {self.}PPr.ElementName: 0, + {self.}EndParaRPr.ElementName: 1, ); end; function Ap.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -76,7 +76,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -85,7 +85,7 @@ begin begin obj := nil; case node_name of - pre + "r": obj := self.AppendR(); + pre + "r": obj := {self.}AppendR(); end; if ifObj(obj) then obj.InitNode(node); end @@ -104,8 +104,8 @@ end; function Ap.Copy(_obj: Ap);override; begin - self.PPr.Copy(_obj.PPr); - self.EndParaRPr.Copy(_obj.EndParaRPr); + {self.}PPr.Copy(_obj.PPr); + {self.}EndParaRPr.Copy(_obj.EndParaRPr); end; function Ap.AddR(): AR; @@ -116,14 +116,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "r" then break; end - obj := new AR(self, self.Prefix, "r"); - self.InsertChild(obj, i+1); + obj := new AR(self, {self.}Prefix, "r"); + {self.}InsertChild(obj, i+1); return obj; end; function Ap.AppendR(): AR; begin - obj := new AR(self, self.Prefix, "r"); + obj := new AR(self, {self.}Prefix, "r"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Ax@DOCX.tsf b/autoclass/docx/Ax@DOCX.tsf index 47eadb8..e55b04b 100644 --- a/autoclass/docx/Ax@DOCX.tsf +++ b/autoclass/docx/Ax@DOCX.tsf @@ -35,7 +35,7 @@ end; function Ax.Create();overload; begin - self.Create(nil, "c", ""); + {self.}Create(nil, "c", ""); end; function Ax.Create(_node: XmlNode);overload; @@ -50,23 +50,23 @@ end; function Ax.Init();override; begin - self.AxId := new PureVal(self, self.Prefix, "axId"); - self.Scaling := new Scaling(self, self.Prefix, "scaling"); - self._Delete := new PureVal(self, self.Prefix, "delete"); - self.AxPos := new PureVal(self, self.Prefix, "axPos"); - self.NumFmt := new NumFmt(self, self.Prefix, "numFmt"); - self.MajorTickMark := new PureVal(self, self.Prefix, "majorTickMark"); - self.MinorTickMark := new PureVal(self, self.Prefix, "minorTickMark"); - self.TickLblPos := new PureVal(self, self.Prefix, "tickLblPos"); - self.SpPr := new SpPr(self, self.Prefix, "spPr"); - self.TxPr := new TxPr(self, self.Prefix, "txPr"); - self.CrossAx := new PureVal(self, self.Prefix, "crossAx"); - self.Crosses := new PureVal(self, self.Prefix, "crosses"); - self.CrossBetween := new PureVal(self, self.Prefix, "crossBetween"); - self.Auto := new PureVal(self, self.Prefix, "auto"); - self.LblAlgn := new PureVal(self, self.Prefix, "lblAlgn"); - self.LblOffset := new PureVal(self, self.Prefix, "lblOffset"); - self.NoMultiLvlLbl := new PureVal(self, self.Prefix, "noMultiLvlLbl"); + {self.}AxId := new PureVal(self, {self.}Prefix, "axId"); + {self.}Scaling := new Scaling(self, {self.}Prefix, "scaling"); + {self.}_Delete := new PureVal(self, {self.}Prefix, "delete"); + {self.}AxPos := new PureVal(self, {self.}Prefix, "axPos"); + {self.}NumFmt := new NumFmt(self, {self.}Prefix, "numFmt"); + {self.}MajorTickMark := new PureVal(self, {self.}Prefix, "majorTickMark"); + {self.}MinorTickMark := new PureVal(self, {self.}Prefix, "minorTickMark"); + {self.}TickLblPos := new PureVal(self, {self.}Prefix, "tickLblPos"); + {self.}SpPr := new SpPr(self, {self.}Prefix, "spPr"); + {self.}TxPr := new TxPr(self, {self.}Prefix, "txPr"); + {self.}CrossAx := new PureVal(self, {self.}Prefix, "crossAx"); + {self.}Crosses := new PureVal(self, {self.}Prefix, "crosses"); + {self.}CrossBetween := new PureVal(self, {self.}Prefix, "crossBetween"); + {self.}Auto := new PureVal(self, {self.}Prefix, "auto"); + {self.}LblAlgn := new PureVal(self, {self.}Prefix, "lblAlgn"); + {self.}LblOffset := new PureVal(self, {self.}Prefix, "lblOffset"); + {self.}NoMultiLvlLbl := new PureVal(self, {self.}Prefix, "noMultiLvlLbl"); end; function Ax.InitAttributes();override; @@ -78,51 +78,51 @@ end; function Ax.InitChildren();override; begin child_elements_ := array( - 0: self.AxId, - 1: self.Scaling, - 2: self._Delete, - 3: self.AxPos, - 4: self.NumFmt, - 5: self.MajorTickMark, - 6: self.MinorTickMark, - 7: self.TickLblPos, - 8: self.SpPr, - 9: self.TxPr, - 10: self.CrossAx, - 11: self.Crosses, - 12: self.CrossBetween, - 13: self.Auto, - 14: self.LblAlgn, - 15: self.LblOffset, - 16: self.NoMultiLvlLbl, + 0: {self.}AxId, + 1: {self.}Scaling, + 2: {self.}_Delete, + 3: {self.}AxPos, + 4: {self.}NumFmt, + 5: {self.}MajorTickMark, + 6: {self.}MinorTickMark, + 7: {self.}TickLblPos, + 8: {self.}SpPr, + 9: {self.}TxPr, + 10: {self.}CrossAx, + 11: {self.}Crosses, + 12: {self.}CrossBetween, + 13: {self.}Auto, + 14: {self.}LblAlgn, + 15: {self.}LblOffset, + 16: {self.}NoMultiLvlLbl, ); sorted_child_ := array( "": -1, - self.AxId.ElementName: 0, - self.Scaling.ElementName: 1, - self._Delete.ElementName: 2, - self.AxPos.ElementName: 3, - self.NumFmt.ElementName: 4, - self.MajorTickMark.ElementName: 5, - self.MinorTickMark.ElementName: 6, - self.TickLblPos.ElementName: 7, - self.SpPr.ElementName: 8, - self.TxPr.ElementName: 9, - self.CrossAx.ElementName: 10, - self.Crosses.ElementName: 11, - self.CrossBetween.ElementName: 12, - self.Auto.ElementName: 13, - self.LblAlgn.ElementName: 14, - self.LblOffset.ElementName: 15, - self.NoMultiLvlLbl.ElementName: 16, + {self.}AxId.ElementName: 0, + {self.}Scaling.ElementName: 1, + {self.}_Delete.ElementName: 2, + {self.}AxPos.ElementName: 3, + {self.}NumFmt.ElementName: 4, + {self.}MajorTickMark.ElementName: 5, + {self.}MinorTickMark.ElementName: 6, + {self.}TickLblPos.ElementName: 7, + {self.}SpPr.ElementName: 8, + {self.}TxPr.ElementName: 9, + {self.}CrossAx.ElementName: 10, + {self.}Crosses.ElementName: 11, + {self.}CrossBetween.ElementName: 12, + {self.}Auto.ElementName: 13, + {self.}LblAlgn.ElementName: 14, + {self.}LblOffset.ElementName: 15, + {self.}NoMultiLvlLbl.ElementName: 16, ); end; function Ax.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -131,7 +131,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -158,21 +158,21 @@ end; function Ax.Copy(_obj: Ax);override; begin - self.AxId.Copy(_obj.AxId); - self.Scaling.Copy(_obj.Scaling); - self._Delete.Copy(_obj._Delete); - self.AxPos.Copy(_obj.AxPos); - self.NumFmt.Copy(_obj.NumFmt); - self.MajorTickMark.Copy(_obj.MajorTickMark); - self.MinorTickMark.Copy(_obj.MinorTickMark); - self.TickLblPos.Copy(_obj.TickLblPos); - self.SpPr.Copy(_obj.SpPr); - self.TxPr.Copy(_obj.TxPr); - self.CrossAx.Copy(_obj.CrossAx); - self.Crosses.Copy(_obj.Crosses); - self.CrossBetween.Copy(_obj.CrossBetween); - self.Auto.Copy(_obj.Auto); - self.LblAlgn.Copy(_obj.LblAlgn); - self.LblOffset.Copy(_obj.LblOffset); - self.NoMultiLvlLbl.Copy(_obj.NoMultiLvlLbl); + {self.}AxId.Copy(_obj.AxId); + {self.}Scaling.Copy(_obj.Scaling); + {self.}_Delete.Copy(_obj._Delete); + {self.}AxPos.Copy(_obj.AxPos); + {self.}NumFmt.Copy(_obj.NumFmt); + {self.}MajorTickMark.Copy(_obj.MajorTickMark); + {self.}MinorTickMark.Copy(_obj.MinorTickMark); + {self.}TickLblPos.Copy(_obj.TickLblPos); + {self.}SpPr.Copy(_obj.SpPr); + {self.}TxPr.Copy(_obj.TxPr); + {self.}CrossAx.Copy(_obj.CrossAx); + {self.}Crosses.Copy(_obj.Crosses); + {self.}CrossBetween.Copy(_obj.CrossBetween); + {self.}Auto.Copy(_obj.Auto); + {self.}LblAlgn.Copy(_obj.LblAlgn); + {self.}LblOffset.Copy(_obj.LblOffset); + {self.}NoMultiLvlLbl.Copy(_obj.NoMultiLvlLbl); end; diff --git a/autoclass/docx/BarChart@DOCX.tsf b/autoclass/docx/BarChart@DOCX.tsf index 3b5d3a2..e11640a 100644 --- a/autoclass/docx/BarChart@DOCX.tsf +++ b/autoclass/docx/BarChart@DOCX.tsf @@ -31,7 +31,7 @@ end; function BarChart.Create();overload; begin - self.Create(nil, "c", "barChart"); + {self.}Create(nil, "c", "barChart"); end; function BarChart.Create(_node: XmlNode);overload; @@ -46,10 +46,10 @@ end; function BarChart.Init();override; begin - self.BarDir := new PureVal(self, self.Prefix, "barDir"); - self.Grouping := new PureVal(self, self.Prefix, "grouping"); - self.VaryColors := new PureVal(self, self.Prefix, "varyColors"); - self.GapWidth := new PureVal(self, self.Prefix, "gapWidth"); + {self.}BarDir := new PureVal(self, {self.}Prefix, "barDir"); + {self.}Grouping := new PureVal(self, {self.}Prefix, "grouping"); + {self.}VaryColors := new PureVal(self, {self.}Prefix, "varyColors"); + {self.}GapWidth := new PureVal(self, {self.}Prefix, "gapWidth"); end; function BarChart.InitAttributes();override; @@ -61,25 +61,25 @@ end; function BarChart.InitChildren();override; begin child_elements_ := array( - 0: self.BarDir, - 1: self.Grouping, - 2: self.VaryColors, - 4: self.GapWidth, + 0: {self.}BarDir, + 1: {self.}Grouping, + 2: {self.}VaryColors, + 4: {self.}GapWidth, ); sorted_child_ := array( "": -1, - self.BarDir.ElementName: 0, - self.Grouping.ElementName: 1, - self.VaryColors.ElementName: 2, - self.GapWidth.ElementName: 4, + {self.}BarDir.ElementName: 0, + {self.}Grouping.ElementName: 1, + {self.}VaryColors.ElementName: 2, + {self.}GapWidth.ElementName: 4, ); end; function BarChart.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -88,7 +88,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -97,8 +97,8 @@ begin begin obj := nil; case node_name of - pre + "ser": obj := self.AppendSer(); - pre + "axId": obj := self.AppendAxId(); + pre + "ser": obj := {self.}AppendSer(); + pre + "axId": obj := {self.}AppendAxId(); end; if ifObj(obj) then obj.InitNode(node); end @@ -117,10 +117,10 @@ end; function BarChart.Copy(_obj: BarChart);override; begin - self.BarDir.Copy(_obj.BarDir); - self.Grouping.Copy(_obj.Grouping); - self.VaryColors.Copy(_obj.VaryColors); - self.GapWidth.Copy(_obj.GapWidth); + {self.}BarDir.Copy(_obj.BarDir); + {self.}Grouping.Copy(_obj.Grouping); + {self.}VaryColors.Copy(_obj.VaryColors); + {self.}GapWidth.Copy(_obj.GapWidth); end; function BarChart.AddSer(): Ser; @@ -131,8 +131,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "ser" then break; end - obj := new Ser(self, self.Prefix, "ser"); - self.InsertChild(obj, i+1); + obj := new Ser(self, {self.}Prefix, "ser"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -144,21 +144,21 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "axId" then break; end - obj := new PureVal(self, self.Prefix, "axId"); - self.InsertChild(obj, i+1); + obj := new PureVal(self, {self.}Prefix, "axId"); + {self.}InsertChild(obj, i+1); return obj; end; function BarChart.AppendSer(): Ser; begin - obj := new Ser(self, self.Prefix, "ser"); + obj := new Ser(self, {self.}Prefix, "ser"); child_elements_[length(child_elements_)] := obj; return obj; end; function BarChart.AppendAxId(): PureVal; begin - obj := new PureVal(self, self.Prefix, "axId"); + obj := new PureVal(self, {self.}Prefix, "axId"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Blip@DOCX.tsf b/autoclass/docx/Blip@DOCX.tsf index 91e6add..e536982 100644 --- a/autoclass/docx/Blip@DOCX.tsf +++ b/autoclass/docx/Blip@DOCX.tsf @@ -27,7 +27,7 @@ end; function Blip.Create();overload; begin - self.Create(nil, "a", "blip"); + {self.}Create(nil, "a", "blip"); end; function Blip.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function Blip.Init();override; begin - self.XmlAttrEmbed := new OpenXmlAttribute("r", "embed", nil); - self.XmlAttrCstate := new OpenXmlAttribute(nil, "cstate", nil); + {self.}XmlAttrEmbed := new OpenXmlAttribute("r", "embed", nil); + {self.}XmlAttrCstate := new OpenXmlAttribute(nil, "cstate", nil); end; function Blip.InitAttributes();override; begin attributes_ := array( - self.XmlAttrEmbed, - self.XmlAttrCstate, + {self.}XmlAttrEmbed, + {self.}XmlAttrCstate, ); end; @@ -65,35 +65,35 @@ end; function Blip.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Blip.Copy(_obj: Blip);override; begin if not ifnil(_obj.XmlAttrEmbed.Value) then - self.XmlAttrEmbed.Value := _obj.XmlAttrEmbed.Value; + {self.}XmlAttrEmbed.Value := _obj.XmlAttrEmbed.Value; if not ifnil(_obj.XmlAttrCstate.Value) then - self.XmlAttrCstate.Value := _obj.XmlAttrCstate.Value; + {self.}XmlAttrCstate.Value := _obj.XmlAttrCstate.Value; end; function Blip.ReadXmlAttrEmbed(); begin - return self.XmlAttrEmbed.Value; + return {self.}XmlAttrEmbed.Value; end; function Blip.WriteXmlAttrEmbed(_value); begin - self.XmlAttrEmbed.Value := _value; + {self.}XmlAttrEmbed.Value := _value; end; function Blip.ReadXmlAttrCstate(); begin - return self.XmlAttrCstate.Value; + return {self.}XmlAttrCstate.Value; end; function Blip.WriteXmlAttrCstate(_value); begin - self.XmlAttrCstate.Value := _value; + {self.}XmlAttrCstate.Value := _value; end; diff --git a/autoclass/docx/BlipFill@DOCX.tsf b/autoclass/docx/BlipFill@DOCX.tsf index f02bae7..30ed16c 100644 --- a/autoclass/docx/BlipFill@DOCX.tsf +++ b/autoclass/docx/BlipFill@DOCX.tsf @@ -20,7 +20,7 @@ end; function BlipFill.Create();overload; begin - self.Create(nil, "pic", "blipFill"); + {self.}Create(nil, "pic", "blipFill"); end; function BlipFill.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function BlipFill.Init();override; begin - self.Blip := new Blip(self, "a", "blip"); - self.Stretch := new Stretch(self, "a", "stretch"); + {self.}Blip := new Blip(self, "a", "blip"); + {self.}Stretch := new Stretch(self, "a", "stretch"); end; function BlipFill.InitAttributes();override; @@ -48,21 +48,21 @@ end; function BlipFill.InitChildren();override; begin child_elements_ := array( - 0: self.Blip, - 1: self.Stretch, + 0: {self.}Blip, + 1: {self.}Stretch, ); sorted_child_ := array( "": -1, - self.Blip.ElementName: 0, - self.Stretch.ElementName: 1, + {self.}Blip.ElementName: 0, + {self.}Stretch.ElementName: 1, ); end; function BlipFill.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function BlipFill.Copy(_obj: BlipFill);override; begin - self.Blip.Copy(_obj.Blip); - self.Stretch.Copy(_obj.Stretch); + {self.}Blip.Copy(_obj.Blip); + {self.}Stretch.Copy(_obj.Stretch); end; diff --git a/autoclass/docx/Body@DOCX.tsf b/autoclass/docx/Body@DOCX.tsf index 00b1232..b37997c 100644 --- a/autoclass/docx/Body@DOCX.tsf +++ b/autoclass/docx/Body@DOCX.tsf @@ -32,7 +32,7 @@ end; function Body.Create();overload; begin - self.Create(nil, "w", "body"); + {self.}Create(nil, "w", "body"); end; function Body.Create(_node: XmlNode);overload; @@ -47,7 +47,7 @@ end; function Body.Init();override; begin - self.SectPr := new SectPr(self, self.Prefix, "sectPr"); + {self.}SectPr := new SectPr(self, {self.}Prefix, "sectPr"); end; function Body.InitAttributes();override; @@ -59,19 +59,19 @@ end; function Body.InitChildren();override; begin child_elements_ := array( - 3: self.SectPr, + 3: {self.}SectPr, ); sorted_child_ := array( "": -1, - self.SectPr.ElementName: 3, + {self.}SectPr.ElementName: 3, ); end; function Body.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -80,7 +80,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -89,9 +89,9 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); - pre + "tbl": obj := self.AppendTbl(); - pre + "sdt": obj := self.AppendSdt(); + pre + "p": obj := {self.}AppendP(); + pre + "tbl": obj := {self.}AppendTbl(); + pre + "sdt": obj := {self.}AppendSdt(); end; if ifObj(obj) then obj.InitNode(node); end @@ -110,7 +110,7 @@ end; function Body.Copy(_obj: Body);override; begin - self.SectPr.Copy(_obj.SectPr); + {self.}SectPr.Copy(_obj.SectPr); end; function Body.AddP(): P; @@ -121,8 +121,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -134,8 +134,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "tbl" then break; end - obj := new Tbl(self, self.Prefix, "tbl"); - self.InsertChild(obj, i+1); + obj := new Tbl(self, {self.}Prefix, "tbl"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -147,28 +147,28 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "sdt" then break; end - obj := new Sdt(self, self.Prefix, "sdt"); - self.InsertChild(obj, i+1); + obj := new Sdt(self, {self.}Prefix, "sdt"); + {self.}InsertChild(obj, i+1); return obj; end; function Body.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; function Body.AppendTbl(): Tbl; begin - obj := new Tbl(self, self.Prefix, "tbl"); + obj := new Tbl(self, {self.}Prefix, "tbl"); child_elements_[length(child_elements_)] := obj; return obj; end; function Body.AppendSdt(): Sdt; begin - obj := new Sdt(self, self.Prefix, "sdt"); + obj := new Sdt(self, {self.}Prefix, "sdt"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/BodyPr@DOCX.tsf b/autoclass/docx/BodyPr@DOCX.tsf index 4393722..466ee86 100644 --- a/autoclass/docx/BodyPr@DOCX.tsf +++ b/autoclass/docx/BodyPr@DOCX.tsf @@ -47,7 +47,7 @@ end; function BodyPr.Create();overload; begin - self.Create(nil, "a", "bodyPr"); + {self.}Create(nil, "a", "bodyPr"); end; function BodyPr.Create(_node: XmlNode);overload; @@ -62,25 +62,25 @@ end; function BodyPr.Init();override; begin - self.XmlAttrRot := new OpenXmlAttribute(nil, "rot", nil); - self.XmlAttrSpcFirstLastPara := new OpenXmlAttribute(nil, "spcFirstLastPara", nil); - self.XmlAttrVertOverflow := new OpenXmlAttribute(nil, "vertOverflow", nil); - self.XmlAttrVert := new OpenXmlAttribute(nil, "vert", nil); - self.XmlAttrWrap := new OpenXmlAttribute(nil, "Wrap", nil); - self.XmlAttrAnchor := new OpenXmlAttribute(nil, "anchor", nil); - self.XmlAttrAnchorCtr := new OpenXmlAttribute(nil, "anchorCtr", nil); + {self.}XmlAttrRot := new OpenXmlAttribute(nil, "rot", nil); + {self.}XmlAttrSpcFirstLastPara := new OpenXmlAttribute(nil, "spcFirstLastPara", nil); + {self.}XmlAttrVertOverflow := new OpenXmlAttribute(nil, "vertOverflow", nil); + {self.}XmlAttrVert := new OpenXmlAttribute(nil, "vert", nil); + {self.}XmlAttrWrap := new OpenXmlAttribute(nil, "Wrap", nil); + {self.}XmlAttrAnchor := new OpenXmlAttribute(nil, "anchor", nil); + {self.}XmlAttrAnchorCtr := new OpenXmlAttribute(nil, "anchorCtr", nil); end; function BodyPr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrRot, - self.XmlAttrSpcFirstLastPara, - self.XmlAttrVertOverflow, - self.XmlAttrVert, - self.XmlAttrWrap, - self.XmlAttrAnchor, - self.XmlAttrAnchorCtr, + {self.}XmlAttrRot, + {self.}XmlAttrSpcFirstLastPara, + {self.}XmlAttrVertOverflow, + {self.}XmlAttrVert, + {self.}XmlAttrWrap, + {self.}XmlAttrAnchor, + {self.}XmlAttrAnchorCtr, ); end; @@ -95,95 +95,95 @@ end; function BodyPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function BodyPr.Copy(_obj: BodyPr);override; begin if not ifnil(_obj.XmlAttrRot.Value) then - self.XmlAttrRot.Value := _obj.XmlAttrRot.Value; + {self.}XmlAttrRot.Value := _obj.XmlAttrRot.Value; if not ifnil(_obj.XmlAttrSpcFirstLastPara.Value) then - self.XmlAttrSpcFirstLastPara.Value := _obj.XmlAttrSpcFirstLastPara.Value; + {self.}XmlAttrSpcFirstLastPara.Value := _obj.XmlAttrSpcFirstLastPara.Value; if not ifnil(_obj.XmlAttrVertOverflow.Value) then - self.XmlAttrVertOverflow.Value := _obj.XmlAttrVertOverflow.Value; + {self.}XmlAttrVertOverflow.Value := _obj.XmlAttrVertOverflow.Value; if not ifnil(_obj.XmlAttrVert.Value) then - self.XmlAttrVert.Value := _obj.XmlAttrVert.Value; + {self.}XmlAttrVert.Value := _obj.XmlAttrVert.Value; if not ifnil(_obj.XmlAttrWrap.Value) then - self.XmlAttrWrap.Value := _obj.XmlAttrWrap.Value; + {self.}XmlAttrWrap.Value := _obj.XmlAttrWrap.Value; if not ifnil(_obj.XmlAttrAnchor.Value) then - self.XmlAttrAnchor.Value := _obj.XmlAttrAnchor.Value; + {self.}XmlAttrAnchor.Value := _obj.XmlAttrAnchor.Value; if not ifnil(_obj.XmlAttrAnchorCtr.Value) then - self.XmlAttrAnchorCtr.Value := _obj.XmlAttrAnchorCtr.Value; + {self.}XmlAttrAnchorCtr.Value := _obj.XmlAttrAnchorCtr.Value; end; function BodyPr.ReadXmlAttrRot(); begin - return self.XmlAttrRot.Value; + return {self.}XmlAttrRot.Value; end; function BodyPr.WriteXmlAttrRot(_value); begin - self.XmlAttrRot.Value := _value; + {self.}XmlAttrRot.Value := _value; end; function BodyPr.ReadXmlAttrSpcFirstLastPara(); begin - return self.XmlAttrSpcFirstLastPara.Value; + return {self.}XmlAttrSpcFirstLastPara.Value; end; function BodyPr.WriteXmlAttrSpcFirstLastPara(_value); begin - self.XmlAttrSpcFirstLastPara.Value := _value; + {self.}XmlAttrSpcFirstLastPara.Value := _value; end; function BodyPr.ReadXmlAttrVertOverflow(); begin - return self.XmlAttrVertOverflow.Value; + return {self.}XmlAttrVertOverflow.Value; end; function BodyPr.WriteXmlAttrVertOverflow(_value); begin - self.XmlAttrVertOverflow.Value := _value; + {self.}XmlAttrVertOverflow.Value := _value; end; function BodyPr.ReadXmlAttrVert(); begin - return self.XmlAttrVert.Value; + return {self.}XmlAttrVert.Value; end; function BodyPr.WriteXmlAttrVert(_value); begin - self.XmlAttrVert.Value := _value; + {self.}XmlAttrVert.Value := _value; end; function BodyPr.ReadXmlAttrWrap(); begin - return self.XmlAttrWrap.Value; + return {self.}XmlAttrWrap.Value; end; function BodyPr.WriteXmlAttrWrap(_value); begin - self.XmlAttrWrap.Value := _value; + {self.}XmlAttrWrap.Value := _value; end; function BodyPr.ReadXmlAttrAnchor(); begin - return self.XmlAttrAnchor.Value; + return {self.}XmlAttrAnchor.Value; end; function BodyPr.WriteXmlAttrAnchor(_value); begin - self.XmlAttrAnchor.Value := _value; + {self.}XmlAttrAnchor.Value := _value; end; function BodyPr.ReadXmlAttrAnchorCtr(); begin - return self.XmlAttrAnchorCtr.Value; + return {self.}XmlAttrAnchorCtr.Value; end; function BodyPr.WriteXmlAttrAnchorCtr(_value); begin - self.XmlAttrAnchorCtr.Value := _value; + {self.}XmlAttrAnchorCtr.Value := _value; end; diff --git a/autoclass/docx/Bookmark@DOCX.tsf b/autoclass/docx/Bookmark@DOCX.tsf index 56f40ae..50da815 100644 --- a/autoclass/docx/Bookmark@DOCX.tsf +++ b/autoclass/docx/Bookmark@DOCX.tsf @@ -27,7 +27,7 @@ end; function Bookmark.Create();overload; begin - self.Create(nil, "w", ""); + {self.}Create(nil, "w", ""); end; function Bookmark.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function Bookmark.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(self.Prefix, "name", nil); - self.XmlAttrId := new OpenXmlAttribute(self.Prefix, "id", nil); + {self.}XmlAttrName := new OpenXmlAttribute({self.}Prefix, "name", nil); + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); end; function Bookmark.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, - self.XmlAttrId, + {self.}XmlAttrName, + {self.}XmlAttrId, ); end; @@ -65,35 +65,35 @@ end; function Bookmark.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Bookmark.Copy(_obj: Bookmark);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; end; function Bookmark.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function Bookmark.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; function Bookmark.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function Bookmark.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; diff --git a/autoclass/docx/Br@DOCX.tsf b/autoclass/docx/Br@DOCX.tsf index 42b574d..11e2622 100644 --- a/autoclass/docx/Br@DOCX.tsf +++ b/autoclass/docx/Br@DOCX.tsf @@ -1,13 +1,13 @@ type Br = class(OpenXmlElement) public function Create();overload; - function Create(_node);overload; - function Create(_parent, _prefix, _local_name);overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; function Init();override; function InitAttributes();override; function InitChildren();override; - function InitNode(_node);override; - function Copy(_obj);override; + function InitNode(_node: XmlNode);override; + function Copy(_obj: Br);override; property Type read ReadXmlAttrType write WriteXmlAttrType; function ReadXmlAttrType(); @@ -15,7 +15,7 @@ public public // Attributes - XmlAttrType; + XmlAttrType: OpenXmlAttribute; // Children @@ -23,28 +23,28 @@ end; function Br.Create();overload; begin - self.Create(nil, "w", "br"); + {self.}Create(nil, "w", "br"); end; -function Br.Create(_node);overload; +function Br.Create(_node: XmlNode);overload; begin - class(OpenXmlElement).Create(_node); + class(OpenXmlElement).Create(_node: XmlNode); end; -function Br.Create(_parent, _prefix, _local_name);overload; +function Br.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; begin class(OpenXmlElement).Create(_parent, _prefix, _local_name); end; function Br.Init();override; begin - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); end; function Br.InitAttributes();override; begin attributes_ := array( - self.XmlAttrType, + {self.}XmlAttrType, ); end; @@ -57,25 +57,25 @@ begin ); end; -function Br.InitNode(_node);override; +function Br.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; -function Br.Copy(_obj);override; +function Br.Copy(_obj: Br);override; begin if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; end; function Br.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function Br.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; diff --git a/autoclass/docx/CNvGraphicFramePr@DOCX.tsf b/autoclass/docx/CNvGraphicFramePr@DOCX.tsf index 7f6801b..13bf2fa 100644 --- a/autoclass/docx/CNvGraphicFramePr@DOCX.tsf +++ b/autoclass/docx/CNvGraphicFramePr@DOCX.tsf @@ -19,7 +19,7 @@ end; function CNvGraphicFramePr.Create();overload; begin - self.Create(nil, "w", "cNvGraphicFramePr"); + {self.}Create(nil, "w", "cNvGraphicFramePr"); end; function CNvGraphicFramePr.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function CNvGraphicFramePr.Init();override; begin - self.GraphicFrameLocks := new GraphicFrameLocks(self, self.Prefix, "graphicFrameLocks"); + {self.}GraphicFrameLocks := new GraphicFrameLocks(self, {self.}Prefix, "graphicFrameLocks"); end; function CNvGraphicFramePr.InitAttributes();override; @@ -46,19 +46,19 @@ end; function CNvGraphicFramePr.InitChildren();override; begin child_elements_ := array( - 0: self.GraphicFrameLocks, + 0: {self.}GraphicFrameLocks, ); sorted_child_ := array( "": -1, - self.GraphicFrameLocks.ElementName: 0, + {self.}GraphicFrameLocks.ElementName: 0, ); end; function CNvGraphicFramePr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function CNvGraphicFramePr.Copy(_obj: CNvGraphicFramePr);override; begin - self.GraphicFrameLocks.Copy(_obj.GraphicFrameLocks); + {self.}GraphicFrameLocks.Copy(_obj.GraphicFrameLocks); end; diff --git a/autoclass/docx/CNvPicPr@DOCX.tsf b/autoclass/docx/CNvPicPr@DOCX.tsf index c6f89ec..80946ed 100644 --- a/autoclass/docx/CNvPicPr@DOCX.tsf +++ b/autoclass/docx/CNvPicPr@DOCX.tsf @@ -19,7 +19,7 @@ end; function CNvPicPr.Create();overload; begin - self.Create(nil, "pic", "cNvPicPr"); + {self.}Create(nil, "pic", "cNvPicPr"); end; function CNvPicPr.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function CNvPicPr.Init();override; begin - self.PicLocks := new PicLocks(self, "a", "picLocks"); + {self.}PicLocks := new PicLocks(self, "a", "picLocks"); end; function CNvPicPr.InitAttributes();override; @@ -46,19 +46,19 @@ end; function CNvPicPr.InitChildren();override; begin child_elements_ := array( - 0: self.PicLocks, + 0: {self.}PicLocks, ); sorted_child_ := array( "": -1, - self.PicLocks.ElementName: 0, + {self.}PicLocks.ElementName: 0, ); end; function CNvPicPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function CNvPicPr.Copy(_obj: CNvPicPr);override; begin - self.PicLocks.Copy(_obj.PicLocks); + {self.}PicLocks.Copy(_obj.PicLocks); end; diff --git a/autoclass/docx/CNvPr@DOCX.tsf b/autoclass/docx/CNvPr@DOCX.tsf index c04e61b..edfae12 100644 --- a/autoclass/docx/CNvPr@DOCX.tsf +++ b/autoclass/docx/CNvPr@DOCX.tsf @@ -31,7 +31,7 @@ end; function CNvPr.Create();overload; begin - self.Create(nil, "pic", "cNvPr"); + {self.}Create(nil, "pic", "cNvPr"); end; function CNvPr.Create(_node: XmlNode);overload; @@ -46,17 +46,17 @@ end; function CNvPr.Init();override; begin - self.XmlAttrId := new OpenXmlAttribute(nil, "id", nil); - self.XmlAttrName := new OpenXmlAttribute(nil, "name", nil); - self.XmlAttrDescr := new OpenXmlAttribute(nil, "descr", nil); + {self.}XmlAttrId := new OpenXmlAttribute(nil, "id", nil); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil); + {self.}XmlAttrDescr := new OpenXmlAttribute(nil, "descr", nil); end; function CNvPr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrId, - self.XmlAttrName, - self.XmlAttrDescr, + {self.}XmlAttrId, + {self.}XmlAttrName, + {self.}XmlAttrDescr, ); end; @@ -71,47 +71,47 @@ end; function CNvPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function CNvPr.Copy(_obj: CNvPr);override; begin if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; if not ifnil(_obj.XmlAttrDescr.Value) then - self.XmlAttrDescr.Value := _obj.XmlAttrDescr.Value; + {self.}XmlAttrDescr.Value := _obj.XmlAttrDescr.Value; end; function CNvPr.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function CNvPr.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; function CNvPr.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function CNvPr.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; function CNvPr.ReadXmlAttrDescr(); begin - return self.XmlAttrDescr.Value; + return {self.}XmlAttrDescr.Value; end; function CNvPr.WriteXmlAttrDescr(_value); begin - self.XmlAttrDescr.Value := _value; + {self.}XmlAttrDescr.Value := _value; end; diff --git a/autoclass/docx/CXY@DOCX.tsf b/autoclass/docx/CXY@DOCX.tsf index 44adbf4..339cbfe 100644 --- a/autoclass/docx/CXY@DOCX.tsf +++ b/autoclass/docx/CXY@DOCX.tsf @@ -27,7 +27,7 @@ end; function CXY.Create();overload; begin - self.Create(nil, nil, ""); + {self.}Create(nil, nil, ""); end; function CXY.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function CXY.Init();override; begin - self.XmlAttrCx := new OpenXmlAttribute(nil, "cx", nil); - self.XmlAttrCy := new OpenXmlAttribute(nil, "cy", nil); + {self.}XmlAttrCx := new OpenXmlAttribute(nil, "cx", nil); + {self.}XmlAttrCy := new OpenXmlAttribute(nil, "cy", nil); end; function CXY.InitAttributes();override; begin attributes_ := array( - self.XmlAttrCx, - self.XmlAttrCy, + {self.}XmlAttrCx, + {self.}XmlAttrCy, ); end; @@ -65,35 +65,35 @@ end; function CXY.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function CXY.Copy(_obj: CXY);override; begin if not ifnil(_obj.XmlAttrCx.Value) then - self.XmlAttrCx.Value := _obj.XmlAttrCx.Value; + {self.}XmlAttrCx.Value := _obj.XmlAttrCx.Value; if not ifnil(_obj.XmlAttrCy.Value) then - self.XmlAttrCy.Value := _obj.XmlAttrCy.Value; + {self.}XmlAttrCy.Value := _obj.XmlAttrCy.Value; end; function CXY.ReadXmlAttrCx(); begin - return self.XmlAttrCx.Value; + return {self.}XmlAttrCx.Value; end; function CXY.WriteXmlAttrCx(_value); begin - self.XmlAttrCx.Value := _value; + {self.}XmlAttrCx.Value := _value; end; function CXY.ReadXmlAttrCy(); begin - return self.XmlAttrCy.Value; + return {self.}XmlAttrCy.Value; end; function CXY.WriteXmlAttrCy(_value); begin - self.XmlAttrCy.Value := _value; + {self.}XmlAttrCy.Value := _value; end; diff --git a/autoclass/docx/Cache@DOCX.tsf b/autoclass/docx/Cache@DOCX.tsf index 6f30ba4..4c2cb5d 100644 --- a/autoclass/docx/Cache@DOCX.tsf +++ b/autoclass/docx/Cache@DOCX.tsf @@ -25,7 +25,7 @@ end; function Cache.Create();overload; begin - self.Create(nil, "c", ""); + {self.}Create(nil, "c", ""); end; function Cache.Create(_node: XmlNode);overload; @@ -40,8 +40,8 @@ end; function Cache.Init();override; begin - self.FormatCode := new OpenXmlPcdata(self, self.Prefix, "formatCode"); - self.PtCount := new PureVal(self, self.Prefix, "ptCount"); + {self.}FormatCode := new OpenXmlPcdata(self, {self.}Prefix, "formatCode"); + {self.}PtCount := new PureVal(self, {self.}Prefix, "ptCount"); end; function Cache.InitAttributes();override; @@ -53,21 +53,21 @@ end; function Cache.InitChildren();override; begin child_elements_ := array( - 0: self.FormatCode, - 1: self.PtCount, + 0: {self.}FormatCode, + 1: {self.}PtCount, ); sorted_child_ := array( "": -1, - self.FormatCode.ElementName: 0, - self.PtCount.ElementName: 1, + {self.}FormatCode.ElementName: 0, + {self.}PtCount.ElementName: 1, ); end; function Cache.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -76,7 +76,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -85,7 +85,7 @@ begin begin obj := nil; case node_name of - pre + "pt": obj := self.AppendPt(); + pre + "pt": obj := {self.}AppendPt(); end; if ifObj(obj) then obj.InitNode(node); end @@ -104,8 +104,8 @@ end; function Cache.Copy(_obj: Cache);override; begin - self.FormatCode.Copy(_obj.FormatCode); - self.PtCount.Copy(_obj.PtCount); + {self.}FormatCode.Copy(_obj.FormatCode); + {self.}PtCount.Copy(_obj.PtCount); end; function Cache.AddPt(): Pt; @@ -116,14 +116,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "pt" then break; end - obj := new Pt(self, self.Prefix, "pt"); - self.InsertChild(obj, i+1); + obj := new Pt(self, {self.}Prefix, "pt"); + {self.}InsertChild(obj, i+1); return obj; end; function Cache.AppendPt(): Pt; begin - obj := new Pt(self, self.Prefix, "pt"); + obj := new Pt(self, {self.}Prefix, "pt"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Cat@DOCX.tsf b/autoclass/docx/Cat@DOCX.tsf index 5db9ddc..7088108 100644 --- a/autoclass/docx/Cat@DOCX.tsf +++ b/autoclass/docx/Cat@DOCX.tsf @@ -19,7 +19,7 @@ end; function Cat.Create();overload; begin - self.Create(nil, "c", "cat"); + {self.}Create(nil, "c", "cat"); end; function Cat.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function Cat.Init();override; begin - self.StrRef := new StrRef(self, self.Prefix, "strRef"); + {self.}StrRef := new StrRef(self, {self.}Prefix, "strRef"); end; function Cat.InitAttributes();override; @@ -46,19 +46,19 @@ end; function Cat.InitChildren();override; begin child_elements_ := array( - 0: self.StrRef, + 0: {self.}StrRef, ); sorted_child_ := array( "": -1, - self.StrRef.ElementName: 0, + {self.}StrRef.ElementName: 0, ); end; function Cat.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function Cat.Copy(_obj: Cat);override; begin - self.StrRef.Copy(_obj.StrRef); + {self.}StrRef.Copy(_obj.StrRef); end; diff --git a/autoclass/docx/Chart@DOCX.tsf b/autoclass/docx/Chart@DOCX.tsf index c46b578..09800aa 100644 --- a/autoclass/docx/Chart@DOCX.tsf +++ b/autoclass/docx/Chart@DOCX.tsf @@ -26,7 +26,7 @@ end; function Chart.Create();overload; begin - self.Create(nil, "c", "chart"); + {self.}Create(nil, "c", "chart"); end; function Chart.Create(_node: XmlNode);overload; @@ -41,14 +41,14 @@ end; function Chart.Init();override; begin - self.Title := new Title(self, self.Prefix, "title"); - self.AutoTitleDeleted := new PureVal(self, self.Prefix, "autoTitleDeleted"); - self.View3D := new View3D(self, self.Prefix, "view3D"); - self.PlotArea := new PlotArea(self, self.Prefix, "plotArea"); - self.Legend := new Legend(self, self.Prefix, "legend"); - self.PlotVisOnly := new PureVal(self, self.Prefix, "plotVisOnly"); - self.DispBlanksAs := new PureVal(self, self.Prefix, "dispBlanksAs"); - self.ShowDLblsOverMax := new PureVal(self, self.Prefix, "showDLblsOverMax"); + {self.}Title := new Title(self, {self.}Prefix, "title"); + {self.}AutoTitleDeleted := new PureVal(self, {self.}Prefix, "autoTitleDeleted"); + {self.}View3D := new View3D(self, {self.}Prefix, "view3D"); + {self.}PlotArea := new PlotArea(self, {self.}Prefix, "plotArea"); + {self.}Legend := new Legend(self, {self.}Prefix, "legend"); + {self.}PlotVisOnly := new PureVal(self, {self.}Prefix, "plotVisOnly"); + {self.}DispBlanksAs := new PureVal(self, {self.}Prefix, "dispBlanksAs"); + {self.}ShowDLblsOverMax := new PureVal(self, {self.}Prefix, "showDLblsOverMax"); end; function Chart.InitAttributes();override; @@ -60,33 +60,33 @@ end; function Chart.InitChildren();override; begin child_elements_ := array( - 0: self.Title, - 1: self.AutoTitleDeleted, - 2: self.View3D, - 3: self.PlotArea, - 4: self.Legend, - 5: self.PlotVisOnly, - 6: self.DispBlanksAs, - 7: self.ShowDLblsOverMax, + 0: {self.}Title, + 1: {self.}AutoTitleDeleted, + 2: {self.}View3D, + 3: {self.}PlotArea, + 4: {self.}Legend, + 5: {self.}PlotVisOnly, + 6: {self.}DispBlanksAs, + 7: {self.}ShowDLblsOverMax, ); sorted_child_ := array( "": -1, - self.Title.ElementName: 0, - self.AutoTitleDeleted.ElementName: 1, - self.View3D.ElementName: 2, - self.PlotArea.ElementName: 3, - self.Legend.ElementName: 4, - self.PlotVisOnly.ElementName: 5, - self.DispBlanksAs.ElementName: 6, - self.ShowDLblsOverMax.ElementName: 7, + {self.}Title.ElementName: 0, + {self.}AutoTitleDeleted.ElementName: 1, + {self.}View3D.ElementName: 2, + {self.}PlotArea.ElementName: 3, + {self.}Legend.ElementName: 4, + {self.}PlotVisOnly.ElementName: 5, + {self.}DispBlanksAs.ElementName: 6, + {self.}ShowDLblsOverMax.ElementName: 7, ); end; function Chart.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -95,7 +95,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -122,12 +122,12 @@ end; function Chart.Copy(_obj: Chart);override; begin - self.Title.Copy(_obj.Title); - self.AutoTitleDeleted.Copy(_obj.AutoTitleDeleted); - self.View3D.Copy(_obj.View3D); - self.PlotArea.Copy(_obj.PlotArea); - self.Legend.Copy(_obj.Legend); - self.PlotVisOnly.Copy(_obj.PlotVisOnly); - self.DispBlanksAs.Copy(_obj.DispBlanksAs); - self.ShowDLblsOverMax.Copy(_obj.ShowDLblsOverMax); + {self.}Title.Copy(_obj.Title); + {self.}AutoTitleDeleted.Copy(_obj.AutoTitleDeleted); + {self.}View3D.Copy(_obj.View3D); + {self.}PlotArea.Copy(_obj.PlotArea); + {self.}Legend.Copy(_obj.Legend); + {self.}PlotVisOnly.Copy(_obj.PlotVisOnly); + {self.}DispBlanksAs.Copy(_obj.DispBlanksAs); + {self.}ShowDLblsOverMax.Copy(_obj.ShowDLblsOverMax); end; diff --git a/autoclass/docx/ChartSpace@DOCX.tsf b/autoclass/docx/ChartSpace@DOCX.tsf index 7ff1ece..8cc5333 100644 --- a/autoclass/docx/ChartSpace@DOCX.tsf +++ b/autoclass/docx/ChartSpace@DOCX.tsf @@ -41,7 +41,7 @@ end; function ChartSpace.Create();overload; begin - self.Create(nil, "c", "chartSpace"); + {self.}Create(nil, "c", "chartSpace"); end; function ChartSpace.Create(_node: XmlNode);overload; @@ -56,52 +56,52 @@ end; function ChartSpace.Init();override; begin - self.XmlAttrXmlnsC := new OpenXmlAttribute("xmlns", "c", "http://schemas.openxmlformats.org/drawingml/2006/chart"); - self.XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "c", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"); - self.Date1904 := new PureVal(self, self.Prefix, "date1904"); - self.XmlChildLang := new PureVal(self, self.Prefix, "lang"); - self.AlternateContent := new AlternateContent(self, "mc", "alternateContent"); - self.Chart := new Chart(self, self.Prefix, "chart"); - self.SpPr := new SpPr(self, self.Prefix, "spPr"); - self.ExternalData := new ExternalData(self, self.Prefix, "externalData"); + {self.}XmlAttrXmlnsC := new OpenXmlAttribute("xmlns", "c", "http://schemas.openxmlformats.org/drawingml/2006/chart"); + {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "c", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"); + {self.}Date1904 := new PureVal(self, {self.}Prefix, "date1904"); + {self.}XmlChildLang := new PureVal(self, {self.}Prefix, "lang"); + {self.}AlternateContent := new AlternateContent(self, "mc", "alternateContent"); + {self.}Chart := new Chart(self, {self.}Prefix, "chart"); + {self.}SpPr := new SpPr(self, {self.}Prefix, "spPr"); + {self.}ExternalData := new ExternalData(self, {self.}Prefix, "externalData"); end; function ChartSpace.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsC, - self.XmlAttrXmlnsA, - self.XmlAttrXmlnsR, + {self.}XmlAttrXmlnsC, + {self.}XmlAttrXmlnsA, + {self.}XmlAttrXmlnsR, ); end; function ChartSpace.InitChildren();override; begin child_elements_ := array( - 0: self.Date1904, - 1: self.XmlChildLang, - 2: self.AlternateContent, - 3: self.Chart, - 4: self.SpPr, - 5: self.ExternalData, + 0: {self.}Date1904, + 1: {self.}XmlChildLang, + 2: {self.}AlternateContent, + 3: {self.}Chart, + 4: {self.}SpPr, + 5: {self.}ExternalData, ); sorted_child_ := array( "": -1, - self.Date1904.ElementName: 0, - self.XmlChildLang.ElementName: 1, - self.AlternateContent.ElementName: 2, - self.Chart.ElementName: 3, - self.SpPr.ElementName: 4, - self.ExternalData.ElementName: 5, + {self.}Date1904.ElementName: 0, + {self.}XmlChildLang.ElementName: 1, + {self.}AlternateContent.ElementName: 2, + {self.}Chart.ElementName: 3, + {self.}SpPr.ElementName: 4, + {self.}ExternalData.ElementName: 5, ); end; function ChartSpace.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -110,7 +110,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -138,55 +138,55 @@ end; function ChartSpace.Copy(_obj: ChartSpace);override; begin if not ifnil(_obj.XmlAttrXmlnsC.Value) then - self.XmlAttrXmlnsC.Value := _obj.XmlAttrXmlnsC.Value; + {self.}XmlAttrXmlnsC.Value := _obj.XmlAttrXmlnsC.Value; if not ifnil(_obj.XmlAttrXmlnsA.Value) then - self.XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; + {self.}XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; - self.Date1904.Copy(_obj.Date1904); - self.XmlChildLang.Copy(_obj.XmlChildLang); - self.AlternateContent.Copy(_obj.AlternateContent); - self.Chart.Copy(_obj.Chart); - self.SpPr.Copy(_obj.SpPr); - self.ExternalData.Copy(_obj.ExternalData); + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}Date1904.Copy(_obj.Date1904); + {self.}XmlChildLang.Copy(_obj.XmlChildLang); + {self.}AlternateContent.Copy(_obj.AlternateContent); + {self.}Chart.Copy(_obj.Chart); + {self.}SpPr.Copy(_obj.SpPr); + {self.}ExternalData.Copy(_obj.ExternalData); end; function ChartSpace.ReadXmlAttrXmlnsC(); begin - return self.XmlAttrXmlnsC.Value; + return {self.}XmlAttrXmlnsC.Value; end; function ChartSpace.WriteXmlAttrXmlnsC(_value); begin - self.XmlAttrXmlnsC.Value := _value; + {self.}XmlAttrXmlnsC.Value := _value; end; function ChartSpace.ReadXmlAttrXmlnsA(); begin - return self.XmlAttrXmlnsA.Value; + return {self.}XmlAttrXmlnsA.Value; end; function ChartSpace.WriteXmlAttrXmlnsA(_value); begin - self.XmlAttrXmlnsA.Value := _value; + {self.}XmlAttrXmlnsA.Value := _value; end; function ChartSpace.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function ChartSpace.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function ChartSpace.ReadXmlChildLang(); begin - return ifnil(self.XmlChildLang.Value) ? false : true; + return ifnil({self.}XmlChildLang.Value) ? false : true; end; function ChartSpace.WriteXmlChildLang(_value); begin - self.XmlChildLang.Value := _value; + {self.}XmlChildLang.Value := _value; end; diff --git a/autoclass/docx/Choice@DOCX.tsf b/autoclass/docx/Choice@DOCX.tsf index c289f88..f65cc19 100644 --- a/autoclass/docx/Choice@DOCX.tsf +++ b/autoclass/docx/Choice@DOCX.tsf @@ -28,7 +28,7 @@ end; function Choice.Create();overload; begin - self.Create(nil, "mc", "Choice"); + {self.}Create(nil, "mc", "Choice"); end; function Choice.Create(_node: XmlNode);overload; @@ -43,35 +43,35 @@ end; function Choice.Init();override; begin - self.XmlAttrRequires := new OpenXmlAttribute(nil, "Requires", nil); - self.XmlAttrXmlnsC14 := new OpenXmlAttribute("xmlns", "c14", "http://schemas.microsoft.com/office/drawing/2007/8/2/chart"); - self.Style := new PureVal(self, "c14", "style"); + {self.}XmlAttrRequires := new OpenXmlAttribute(nil, "Requires", nil); + {self.}XmlAttrXmlnsC14 := new OpenXmlAttribute("xmlns", "c14", "http://schemas.microsoft.com/office/drawing/2007/8/2/chart"); + {self.}Style := new PureVal(self, "c14", "style"); end; function Choice.InitAttributes();override; begin attributes_ := array( - self.XmlAttrRequires, - self.XmlAttrXmlnsC14, + {self.}XmlAttrRequires, + {self.}XmlAttrXmlnsC14, ); end; function Choice.InitChildren();override; begin child_elements_ := array( - 0: self.Style, + 0: {self.}Style, ); sorted_child_ := array( "": -1, - self.Style.ElementName: 0, + {self.}Style.ElementName: 0, ); end; function Choice.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -80,7 +80,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -108,28 +108,28 @@ end; function Choice.Copy(_obj: Choice);override; begin if not ifnil(_obj.XmlAttrRequires.Value) then - self.XmlAttrRequires.Value := _obj.XmlAttrRequires.Value; + {self.}XmlAttrRequires.Value := _obj.XmlAttrRequires.Value; if not ifnil(_obj.XmlAttrXmlnsC14.Value) then - self.XmlAttrXmlnsC14.Value := _obj.XmlAttrXmlnsC14.Value; - self.Style.Copy(_obj.Style); + {self.}XmlAttrXmlnsC14.Value := _obj.XmlAttrXmlnsC14.Value; + {self.}Style.Copy(_obj.Style); end; function Choice.ReadXmlAttrRequires(); begin - return self.XmlAttrRequires.Value; + return {self.}XmlAttrRequires.Value; end; function Choice.WriteXmlAttrRequires(_value); begin - self.XmlAttrRequires.Value := _value; + {self.}XmlAttrRequires.Value := _value; end; function Choice.ReadXmlAttrXmlnsC14(); begin - return self.XmlAttrXmlnsC14.Value; + return {self.}XmlAttrXmlnsC14.Value; end; function Choice.WriteXmlAttrXmlnsC14(_value); begin - self.XmlAttrXmlnsC14.Value := _value; + {self.}XmlAttrXmlnsC14.Value := _value; end; diff --git a/autoclass/docx/Clr1@DOCX.tsf b/autoclass/docx/Clr1@DOCX.tsf index 262ddda..e350752 100644 --- a/autoclass/docx/Clr1@DOCX.tsf +++ b/autoclass/docx/Clr1@DOCX.tsf @@ -19,7 +19,7 @@ end; function Clr1.Create();overload; begin - self.Create(nil, "a", ""); + {self.}Create(nil, "a", ""); end; function Clr1.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function Clr1.Init();override; begin - self.SysClr := new SysClr(self, self.Prefix, "sysClr"); + {self.}SysClr := new SysClr(self, {self.}Prefix, "sysClr"); end; function Clr1.InitAttributes();override; @@ -46,19 +46,19 @@ end; function Clr1.InitChildren();override; begin child_elements_ := array( - 0: self.SysClr, + 0: {self.}SysClr, ); sorted_child_ := array( "": -1, - self.SysClr.ElementName: 0, + {self.}SysClr.ElementName: 0, ); end; function Clr1.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function Clr1.Copy(_obj: Clr1);override; begin - self.SysClr.Copy(_obj.SysClr); + {self.}SysClr.Copy(_obj.SysClr); end; diff --git a/autoclass/docx/Clr2@DOCX.tsf b/autoclass/docx/Clr2@DOCX.tsf index e219927..8c6c142 100644 --- a/autoclass/docx/Clr2@DOCX.tsf +++ b/autoclass/docx/Clr2@DOCX.tsf @@ -19,7 +19,7 @@ end; function Clr2.Create();overload; begin - self.Create(nil, "a", ""); + {self.}Create(nil, "a", ""); end; function Clr2.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function Clr2.Init();override; begin - self.SrgbClr := new SrgbClr(self, self.Prefix, "srgbClr"); + {self.}SrgbClr := new SrgbClr(self, {self.}Prefix, "srgbClr"); end; function Clr2.InitAttributes();override; @@ -46,19 +46,19 @@ end; function Clr2.InitChildren();override; begin child_elements_ := array( - 0: self.SrgbClr, + 0: {self.}SrgbClr, ); sorted_child_ := array( "": -1, - self.SrgbClr.ElementName: 0, + {self.}SrgbClr.ElementName: 0, ); end; function Clr2.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function Clr2.Copy(_obj: Clr2);override; begin - self.SrgbClr.Copy(_obj.SrgbClr); + {self.}SrgbClr.Copy(_obj.SrgbClr); end; diff --git a/autoclass/docx/ClrScheme@DOCX.tsf b/autoclass/docx/ClrScheme@DOCX.tsf index 8d04824..a3d98bb 100644 --- a/autoclass/docx/ClrScheme@DOCX.tsf +++ b/autoclass/docx/ClrScheme@DOCX.tsf @@ -35,7 +35,7 @@ end; function ClrScheme.Create();overload; begin - self.Create(nil, "a", "clrsCheme"); + {self.}Create(nil, "a", "clrsCheme"); end; function ClrScheme.Create(_node: XmlNode);overload; @@ -50,66 +50,66 @@ end; function ClrScheme.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(nil, "name", nil); - self.Dk1 := new Clr1(self, self.Prefix, "dk1"); - self.Lt1 := new Clr1(self, self.Prefix, "lt1"); - self.Dk2 := new Clr2(self, self.Prefix, "dk2"); - self.Lt2 := new Clr2(self, self.Prefix, "lt2"); - self.Accent1 := new Clr2(self, self.Prefix, "accent1"); - self.Accent2 := new Clr2(self, self.Prefix, "accent2"); - self.Accent3 := new Clr2(self, self.Prefix, "accent3"); - self.Accent4 := new Clr2(self, self.Prefix, "accent4"); - self.Accent5 := new Clr2(self, self.Prefix, "accent5"); - self.Accent6 := new Clr2(self, self.Prefix, "accent6"); - self.Hlink := new Clr2(self, self.Prefix, "hlink"); - self.FolHlink := new Clr2(self, self.Prefix, "folHlink"); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil); + {self.}Dk1 := new Clr1(self, {self.}Prefix, "dk1"); + {self.}Lt1 := new Clr1(self, {self.}Prefix, "lt1"); + {self.}Dk2 := new Clr2(self, {self.}Prefix, "dk2"); + {self.}Lt2 := new Clr2(self, {self.}Prefix, "lt2"); + {self.}Accent1 := new Clr2(self, {self.}Prefix, "accent1"); + {self.}Accent2 := new Clr2(self, {self.}Prefix, "accent2"); + {self.}Accent3 := new Clr2(self, {self.}Prefix, "accent3"); + {self.}Accent4 := new Clr2(self, {self.}Prefix, "accent4"); + {self.}Accent5 := new Clr2(self, {self.}Prefix, "accent5"); + {self.}Accent6 := new Clr2(self, {self.}Prefix, "accent6"); + {self.}Hlink := new Clr2(self, {self.}Prefix, "hlink"); + {self.}FolHlink := new Clr2(self, {self.}Prefix, "folHlink"); end; function ClrScheme.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, + {self.}XmlAttrName, ); end; function ClrScheme.InitChildren();override; begin child_elements_ := array( - 0: self.Dk1, - 1: self.Lt1, - 2: self.Dk2, - 3: self.Lt2, - 4: self.Accent1, - 5: self.Accent2, - 6: self.Accent3, - 7: self.Accent4, - 8: self.Accent5, - 9: self.Accent6, - 10: self.Hlink, - 11: self.FolHlink, + 0: {self.}Dk1, + 1: {self.}Lt1, + 2: {self.}Dk2, + 3: {self.}Lt2, + 4: {self.}Accent1, + 5: {self.}Accent2, + 6: {self.}Accent3, + 7: {self.}Accent4, + 8: {self.}Accent5, + 9: {self.}Accent6, + 10: {self.}Hlink, + 11: {self.}FolHlink, ); sorted_child_ := array( "": -1, - self.Dk1.ElementName: 0, - self.Lt1.ElementName: 1, - self.Dk2.ElementName: 2, - self.Lt2.ElementName: 3, - self.Accent1.ElementName: 4, - self.Accent2.ElementName: 5, - self.Accent3.ElementName: 6, - self.Accent4.ElementName: 7, - self.Accent5.ElementName: 8, - self.Accent6.ElementName: 9, - self.Hlink.ElementName: 10, - self.FolHlink.ElementName: 11, + {self.}Dk1.ElementName: 0, + {self.}Lt1.ElementName: 1, + {self.}Dk2.ElementName: 2, + {self.}Lt2.ElementName: 3, + {self.}Accent1.ElementName: 4, + {self.}Accent2.ElementName: 5, + {self.}Accent3.ElementName: 6, + {self.}Accent4.ElementName: 7, + {self.}Accent5.ElementName: 8, + {self.}Accent6.ElementName: 9, + {self.}Hlink.ElementName: 10, + {self.}FolHlink.ElementName: 11, ); end; function ClrScheme.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -118,7 +118,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -146,27 +146,27 @@ end; function ClrScheme.Copy(_obj: ClrScheme);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; - self.Dk1.Copy(_obj.Dk1); - self.Lt1.Copy(_obj.Lt1); - self.Dk2.Copy(_obj.Dk2); - self.Lt2.Copy(_obj.Lt2); - self.Accent1.Copy(_obj.Accent1); - self.Accent2.Copy(_obj.Accent2); - self.Accent3.Copy(_obj.Accent3); - self.Accent4.Copy(_obj.Accent4); - self.Accent5.Copy(_obj.Accent5); - self.Accent6.Copy(_obj.Accent6); - self.Hlink.Copy(_obj.Hlink); - self.FolHlink.Copy(_obj.FolHlink); + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}Dk1.Copy(_obj.Dk1); + {self.}Lt1.Copy(_obj.Lt1); + {self.}Dk2.Copy(_obj.Dk2); + {self.}Lt2.Copy(_obj.Lt2); + {self.}Accent1.Copy(_obj.Accent1); + {self.}Accent2.Copy(_obj.Accent2); + {self.}Accent3.Copy(_obj.Accent3); + {self.}Accent4.Copy(_obj.Accent4); + {self.}Accent5.Copy(_obj.Accent5); + {self.}Accent6.Copy(_obj.Accent6); + {self.}Hlink.Copy(_obj.Hlink); + {self.}FolHlink.Copy(_obj.FolHlink); end; function ClrScheme.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function ClrScheme.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; diff --git a/autoclass/docx/Color@DOCX.tsf b/autoclass/docx/Color@DOCX.tsf index 32f7ddd..cd59e02 100644 --- a/autoclass/docx/Color@DOCX.tsf +++ b/autoclass/docx/Color@DOCX.tsf @@ -27,7 +27,7 @@ end; function Color.Create();overload; begin - self.Create(nil, "w", "color"); + {self.}Create(nil, "w", "color"); end; function Color.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function Color.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(self.Prefix, "val", nil); - self.XmlAttrThemeColor := new OpenXmlAttribute(self.Prefix, "themeColor", nil); + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + {self.}XmlAttrThemeColor := new OpenXmlAttribute({self.}Prefix, "themeColor", nil); end; function Color.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, - self.XmlAttrThemeColor, + {self.}XmlAttrVal, + {self.}XmlAttrThemeColor, ); end; @@ -65,35 +65,35 @@ end; function Color.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Color.Copy(_obj: Color);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; if not ifnil(_obj.XmlAttrThemeColor.Value) then - self.XmlAttrThemeColor.Value := _obj.XmlAttrThemeColor.Value; + {self.}XmlAttrThemeColor.Value := _obj.XmlAttrThemeColor.Value; end; function Color.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function Color.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; function Color.ReadXmlAttrThemeColor(); begin - return self.XmlAttrThemeColor.Value; + return {self.}XmlAttrThemeColor.Value; end; function Color.WriteXmlAttrThemeColor(_value); begin - self.XmlAttrThemeColor.Value := _value; + {self.}XmlAttrThemeColor.Value := _value; end; diff --git a/autoclass/docx/Cols@DOCX.tsf b/autoclass/docx/Cols@DOCX.tsf index 0878222..a3bd8b0 100644 --- a/autoclass/docx/Cols@DOCX.tsf +++ b/autoclass/docx/Cols@DOCX.tsf @@ -23,7 +23,7 @@ end; function Cols.Create();overload; begin - self.Create(nil, "w", "cols"); + {self.}Create(nil, "w", "cols"); end; function Cols.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function Cols.Init();override; begin - self.XmlAttrSpace := new OpenXmlAttribute(self.Prefix, "space", nil); + {self.}XmlAttrSpace := new OpenXmlAttribute({self.}Prefix, "space", nil); end; function Cols.InitAttributes();override; begin attributes_ := array( - self.XmlAttrSpace, + {self.}XmlAttrSpace, ); end; @@ -59,23 +59,23 @@ end; function Cols.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Cols.Copy(_obj: Cols);override; begin if not ifnil(_obj.XmlAttrSpace.Value) then - self.XmlAttrSpace.Value := _obj.XmlAttrSpace.Value; + {self.}XmlAttrSpace.Value := _obj.XmlAttrSpace.Value; end; function Cols.ReadXmlAttrSpace(); begin - return self.XmlAttrSpace.Value; + return {self.}XmlAttrSpace.Value; end; function Cols.WriteXmlAttrSpace(_value); begin - self.XmlAttrSpace.Value := _value; + {self.}XmlAttrSpace.Value := _value; end; diff --git a/autoclass/docx/Comment@DOCX.tsf b/autoclass/docx/Comment@DOCX.tsf index 7ed2687..bd2a7d2 100644 --- a/autoclass/docx/Comment@DOCX.tsf +++ b/autoclass/docx/Comment@DOCX.tsf @@ -36,7 +36,7 @@ end; function Comment.Create();overload; begin - self.Create(nil, "w", "comment"); + {self.}Create(nil, "w", "comment"); end; function Comment.Create(_node: XmlNode);overload; @@ -51,17 +51,17 @@ end; function Comment.Init();override; begin - self.XmlAttrAuthor := new OpenXmlAttribute(self.Prefix, "author", nil); - self.XmlAttrDate := new OpenXmlAttribute(self.Prefix, "date", nil); - self.XmlAttrId := new OpenXmlAttribute(self.Prefix, "id", nil); + {self.}XmlAttrAuthor := new OpenXmlAttribute({self.}Prefix, "author", nil); + {self.}XmlAttrDate := new OpenXmlAttribute({self.}Prefix, "date", nil); + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); end; function Comment.InitAttributes();override; begin attributes_ := array( - self.XmlAttrAuthor, - self.XmlAttrDate, - self.XmlAttrId, + {self.}XmlAttrAuthor, + {self.}XmlAttrDate, + {self.}XmlAttrId, ); end; @@ -76,9 +76,9 @@ end; function Comment.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -87,7 +87,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -96,7 +96,7 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); + pre + "p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -116,11 +116,11 @@ end; function Comment.Copy(_obj: Comment);override; begin if not ifnil(_obj.XmlAttrAuthor.Value) then - self.XmlAttrAuthor.Value := _obj.XmlAttrAuthor.Value; + {self.}XmlAttrAuthor.Value := _obj.XmlAttrAuthor.Value; if not ifnil(_obj.XmlAttrDate.Value) then - self.XmlAttrDate.Value := _obj.XmlAttrDate.Value; + {self.}XmlAttrDate.Value := _obj.XmlAttrDate.Value; if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; end; function Comment.AddP(): P; @@ -131,14 +131,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; function Comment.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -161,30 +161,30 @@ end; function Comment.ReadXmlAttrAuthor(); begin - return self.XmlAttrAuthor.Value; + return {self.}XmlAttrAuthor.Value; end; function Comment.WriteXmlAttrAuthor(_value); begin - self.XmlAttrAuthor.Value := _value; + {self.}XmlAttrAuthor.Value := _value; end; function Comment.ReadXmlAttrDate(); begin - return self.XmlAttrDate.Value; + return {self.}XmlAttrDate.Value; end; function Comment.WriteXmlAttrDate(_value); begin - self.XmlAttrDate.Value := _value; + {self.}XmlAttrDate.Value := _value; end; function Comment.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function Comment.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; diff --git a/autoclass/docx/CommentRange@DOCX.tsf b/autoclass/docx/CommentRange@DOCX.tsf index 0eea566..6b2fc4f 100644 --- a/autoclass/docx/CommentRange@DOCX.tsf +++ b/autoclass/docx/CommentRange@DOCX.tsf @@ -23,7 +23,7 @@ end; function CommentRange.Create();overload; begin - self.Create(nil, "w", ""); + {self.}Create(nil, "w", ""); end; function CommentRange.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function CommentRange.Init();override; begin - self.XmlAttrId := new OpenXmlAttribute(self.Prefix, "id", nil); + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); end; function CommentRange.InitAttributes();override; begin attributes_ := array( - self.XmlAttrId, + {self.}XmlAttrId, ); end; @@ -59,23 +59,23 @@ end; function CommentRange.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function CommentRange.Copy(_obj: CommentRange);override; begin if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; end; function CommentRange.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function CommentRange.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; diff --git a/autoclass/docx/Comments@DOCX.tsf b/autoclass/docx/Comments@DOCX.tsf index aeafbe2..b6a556e 100644 --- a/autoclass/docx/Comments@DOCX.tsf +++ b/autoclass/docx/Comments@DOCX.tsf @@ -96,7 +96,7 @@ end; function Comments.Create();overload; begin - self.Create(nil, "w", "comments"); + {self.}Create(nil, "w", "comments"); end; function Comments.Create(_node: XmlNode);overload; @@ -111,47 +111,47 @@ end; function Comments.Init();override; begin - self.XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); - self.XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); - self.XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); - self.XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW10 := new OpenXmlAttribute("xmlns", "w10", nil); - self.XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); - self.XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); - self.XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); - self.XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); - self.XmlAttrXmlnsWpsCustomData := new OpenXmlAttribute("xmlns", "wpsCustomData", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); + {self.}XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); + {self.}XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); + {self.}XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW10 := new OpenXmlAttribute("xmlns", "w10", nil); + {self.}XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); + {self.}XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); + {self.}XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); + {self.}XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); + {self.}XmlAttrXmlnsWpsCustomData := new OpenXmlAttribute("xmlns", "wpsCustomData", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); end; function Comments.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsWpc, - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsO, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsM, - self.XmlAttrXmlnsV, - self.XmlAttrXmlnsWp14, - self.XmlAttrXmlnsWp, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW10, - self.XmlAttrXmlnsWpg, - self.XmlAttrXmlnsWpi, - self.XmlAttrXmlnsWne, - self.XmlAttrXmlnsWps, - self.XmlAttrXmlnsWpsCustomData, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsWpc, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsO, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsM, + {self.}XmlAttrXmlnsV, + {self.}XmlAttrXmlnsWp14, + {self.}XmlAttrXmlnsWp, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW10, + {self.}XmlAttrXmlnsWpg, + {self.}XmlAttrXmlnsWpi, + {self.}XmlAttrXmlnsWne, + {self.}XmlAttrXmlnsWps, + {self.}XmlAttrXmlnsWpsCustomData, + {self.}XmlAttrMcIgnorable, ); end; @@ -166,9 +166,9 @@ end; function Comments.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -177,7 +177,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -186,7 +186,7 @@ begin begin obj := nil; case node_name of - pre + "comment": obj := self.AppendComment(); + pre + "comment": obj := {self.}AppendComment(); end; if ifObj(obj) then obj.InitNode(node); end @@ -206,41 +206,41 @@ end; function Comments.Copy(_obj: Comments);override; begin if not ifnil(_obj.XmlAttrXmlnsWpc.Value) then - self.XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsO.Value) then - self.XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsM.Value) then - self.XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; if not ifnil(_obj.XmlAttrXmlnsV.Value) then - self.XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; if not ifnil(_obj.XmlAttrXmlnsWp14.Value) then - self.XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; if not ifnil(_obj.XmlAttrXmlnsWp.Value) then - self.XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW10.Value) then - self.XmlAttrXmlnsW10.Value := _obj.XmlAttrXmlnsW10.Value; + {self.}XmlAttrXmlnsW10.Value := _obj.XmlAttrXmlnsW10.Value; if not ifnil(_obj.XmlAttrXmlnsWpg.Value) then - self.XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; if not ifnil(_obj.XmlAttrXmlnsWpi.Value) then - self.XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; if not ifnil(_obj.XmlAttrXmlnsWne.Value) then - self.XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; if not ifnil(_obj.XmlAttrXmlnsWps.Value) then - self.XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; if not ifnil(_obj.XmlAttrXmlnsWpsCustomData.Value) then - self.XmlAttrXmlnsWpsCustomData.Value := _obj.XmlAttrXmlnsWpsCustomData.Value; + {self.}XmlAttrXmlnsWpsCustomData.Value := _obj.XmlAttrXmlnsWpsCustomData.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; end; function Comments.AddComment(): Comment; @@ -251,14 +251,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "comment" then break; end - obj := new Comment(self, self.Prefix, "comment"); - self.InsertChild(obj, i+1); + obj := new Comment(self, {self.}Prefix, "comment"); + {self.}InsertChild(obj, i+1); return obj; end; function Comments.AppendComment(): Comment; begin - obj := new Comment(self, self.Prefix, "comment"); + obj := new Comment(self, {self.}Prefix, "comment"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -281,180 +281,180 @@ end; function Comments.ReadXmlAttrXmlnsWpc(); begin - return self.XmlAttrXmlnsWpc.Value; + return {self.}XmlAttrXmlnsWpc.Value; end; function Comments.WriteXmlAttrXmlnsWpc(_value); begin - self.XmlAttrXmlnsWpc.Value := _value; + {self.}XmlAttrXmlnsWpc.Value := _value; end; function Comments.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Comments.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Comments.ReadXmlAttrXmlnsO(); begin - return self.XmlAttrXmlnsO.Value; + return {self.}XmlAttrXmlnsO.Value; end; function Comments.WriteXmlAttrXmlnsO(_value); begin - self.XmlAttrXmlnsO.Value := _value; + {self.}XmlAttrXmlnsO.Value := _value; end; function Comments.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Comments.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Comments.ReadXmlAttrXmlnsM(); begin - return self.XmlAttrXmlnsM.Value; + return {self.}XmlAttrXmlnsM.Value; end; function Comments.WriteXmlAttrXmlnsM(_value); begin - self.XmlAttrXmlnsM.Value := _value; + {self.}XmlAttrXmlnsM.Value := _value; end; function Comments.ReadXmlAttrXmlnsV(); begin - return self.XmlAttrXmlnsV.Value; + return {self.}XmlAttrXmlnsV.Value; end; function Comments.WriteXmlAttrXmlnsV(_value); begin - self.XmlAttrXmlnsV.Value := _value; + {self.}XmlAttrXmlnsV.Value := _value; end; function Comments.ReadXmlAttrXmlnsWp14(); begin - return self.XmlAttrXmlnsWp14.Value; + return {self.}XmlAttrXmlnsWp14.Value; end; function Comments.WriteXmlAttrXmlnsWp14(_value); begin - self.XmlAttrXmlnsWp14.Value := _value; + {self.}XmlAttrXmlnsWp14.Value := _value; end; function Comments.ReadXmlAttrXmlnsWp(); begin - return self.XmlAttrXmlnsWp.Value; + return {self.}XmlAttrXmlnsWp.Value; end; function Comments.WriteXmlAttrXmlnsWp(_value); begin - self.XmlAttrXmlnsWp.Value := _value; + {self.}XmlAttrXmlnsWp.Value := _value; end; function Comments.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function Comments.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function Comments.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Comments.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Comments.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Comments.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Comments.ReadXmlAttrXmlnsW10(); begin - return self.XmlAttrXmlnsW10.Value; + return {self.}XmlAttrXmlnsW10.Value; end; function Comments.WriteXmlAttrXmlnsW10(_value); begin - self.XmlAttrXmlnsW10.Value := _value; + {self.}XmlAttrXmlnsW10.Value := _value; end; function Comments.ReadXmlAttrXmlnsWpg(); begin - return self.XmlAttrXmlnsWpg.Value; + return {self.}XmlAttrXmlnsWpg.Value; end; function Comments.WriteXmlAttrXmlnsWpg(_value); begin - self.XmlAttrXmlnsWpg.Value := _value; + {self.}XmlAttrXmlnsWpg.Value := _value; end; function Comments.ReadXmlAttrXmlnsWpi(); begin - return self.XmlAttrXmlnsWpi.Value; + return {self.}XmlAttrXmlnsWpi.Value; end; function Comments.WriteXmlAttrXmlnsWpi(_value); begin - self.XmlAttrXmlnsWpi.Value := _value; + {self.}XmlAttrXmlnsWpi.Value := _value; end; function Comments.ReadXmlAttrXmlnsWne(); begin - return self.XmlAttrXmlnsWne.Value; + return {self.}XmlAttrXmlnsWne.Value; end; function Comments.WriteXmlAttrXmlnsWne(_value); begin - self.XmlAttrXmlnsWne.Value := _value; + {self.}XmlAttrXmlnsWne.Value := _value; end; function Comments.ReadXmlAttrXmlnsWps(); begin - return self.XmlAttrXmlnsWps.Value; + return {self.}XmlAttrXmlnsWps.Value; end; function Comments.WriteXmlAttrXmlnsWps(_value); begin - self.XmlAttrXmlnsWps.Value := _value; + {self.}XmlAttrXmlnsWps.Value := _value; end; function Comments.ReadXmlAttrXmlnsWpsCustomData(); begin - return self.XmlAttrXmlnsWpsCustomData.Value; + return {self.}XmlAttrXmlnsWpsCustomData.Value; end; function Comments.WriteXmlAttrXmlnsWpsCustomData(_value); begin - self.XmlAttrXmlnsWpsCustomData.Value := _value; + {self.}XmlAttrXmlnsWpsCustomData.Value := _value; end; function Comments.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Comments.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/Compat@DOCX.tsf b/autoclass/docx/Compat@DOCX.tsf index 36e1190..66779d9 100644 --- a/autoclass/docx/Compat@DOCX.tsf +++ b/autoclass/docx/Compat@DOCX.tsf @@ -55,7 +55,7 @@ end; function Compat.Create();overload; begin - self.Create(nil, "w", "compat"); + {self.}Create(nil, "w", "compat"); end; function Compat.Create(_node: XmlNode);overload; @@ -70,13 +70,13 @@ end; function Compat.Init();override; begin - self.XmlChildSpaceForUL := new OpenXmlEmpty(self, self.Prefix, "spaceForUL"); - self.XmlChildBalanceSingleByteDoubleByteWidth := new OpenXmlEmpty(self, self.Prefix, "balanceSingleByteDoubleByteWidth"); - self.XmlChildDoNotLeaveBackslashAlone := new OpenXmlEmpty(self, self.Prefix, "doNotLeaveBackslashAlone"); - self.XmlChildUlTrailSpace := new OpenXmlEmpty(self, self.Prefix, "ulTrailSpace"); - self.XmlChildDoNotExpandShiftReturn := new OpenXmlEmpty(self, self.Prefix, "doNotExpandShiftReturn"); - self.XmlChildAdjustLineHeightInTable := new OpenXmlEmpty(self, self.Prefix, "adjustLineHeightInTable"); - self.XmlChildUseFELayout := new OpenXmlEmpty(self, self.Prefix, "useFELayout"); + {self.}XmlChildSpaceForUL := new OpenXmlEmpty(self, {self.}Prefix, "spaceForUL"); + {self.}XmlChildBalanceSingleByteDoubleByteWidth := new OpenXmlEmpty(self, {self.}Prefix, "balanceSingleByteDoubleByteWidth"); + {self.}XmlChildDoNotLeaveBackslashAlone := new OpenXmlEmpty(self, {self.}Prefix, "doNotLeaveBackslashAlone"); + {self.}XmlChildUlTrailSpace := new OpenXmlEmpty(self, {self.}Prefix, "ulTrailSpace"); + {self.}XmlChildDoNotExpandShiftReturn := new OpenXmlEmpty(self, {self.}Prefix, "doNotExpandShiftReturn"); + {self.}XmlChildAdjustLineHeightInTable := new OpenXmlEmpty(self, {self.}Prefix, "adjustLineHeightInTable"); + {self.}XmlChildUseFELayout := new OpenXmlEmpty(self, {self.}Prefix, "useFELayout"); end; function Compat.InitAttributes();override; @@ -88,31 +88,31 @@ end; function Compat.InitChildren();override; begin child_elements_ := array( - 0: self.XmlChildSpaceForUL, - 1: self.XmlChildBalanceSingleByteDoubleByteWidth, - 2: self.XmlChildDoNotLeaveBackslashAlone, - 3: self.XmlChildUlTrailSpace, - 4: self.XmlChildDoNotExpandShiftReturn, - 5: self.XmlChildAdjustLineHeightInTable, - 6: self.XmlChildUseFELayout, + 0: {self.}XmlChildSpaceForUL, + 1: {self.}XmlChildBalanceSingleByteDoubleByteWidth, + 2: {self.}XmlChildDoNotLeaveBackslashAlone, + 3: {self.}XmlChildUlTrailSpace, + 4: {self.}XmlChildDoNotExpandShiftReturn, + 5: {self.}XmlChildAdjustLineHeightInTable, + 6: {self.}XmlChildUseFELayout, ); sorted_child_ := array( "": -1, - self.XmlChildSpaceForUL.ElementName: 0, - self.XmlChildBalanceSingleByteDoubleByteWidth.ElementName: 1, - self.XmlChildDoNotLeaveBackslashAlone.ElementName: 2, - self.XmlChildUlTrailSpace.ElementName: 3, - self.XmlChildDoNotExpandShiftReturn.ElementName: 4, - self.XmlChildAdjustLineHeightInTable.ElementName: 5, - self.XmlChildUseFELayout.ElementName: 6, + {self.}XmlChildSpaceForUL.ElementName: 0, + {self.}XmlChildBalanceSingleByteDoubleByteWidth.ElementName: 1, + {self.}XmlChildDoNotLeaveBackslashAlone.ElementName: 2, + {self.}XmlChildUlTrailSpace.ElementName: 3, + {self.}XmlChildDoNotExpandShiftReturn.ElementName: 4, + {self.}XmlChildAdjustLineHeightInTable.ElementName: 5, + {self.}XmlChildUseFELayout.ElementName: 6, ); end; function Compat.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -121,7 +121,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -130,7 +130,7 @@ begin begin obj := nil; case node_name of - pre + "compatSetting": obj := self.AppendCompatSetting(); + pre + "compatSetting": obj := {self.}AppendCompatSetting(); end; if ifObj(obj) then obj.InitNode(node); end @@ -149,13 +149,13 @@ end; function Compat.Copy(_obj: Compat);override; begin - self.XmlChildSpaceForUL.Copy(_obj.XmlChildSpaceForUL); - self.XmlChildBalanceSingleByteDoubleByteWidth.Copy(_obj.XmlChildBalanceSingleByteDoubleByteWidth); - self.XmlChildDoNotLeaveBackslashAlone.Copy(_obj.XmlChildDoNotLeaveBackslashAlone); - self.XmlChildUlTrailSpace.Copy(_obj.XmlChildUlTrailSpace); - self.XmlChildDoNotExpandShiftReturn.Copy(_obj.XmlChildDoNotExpandShiftReturn); - self.XmlChildAdjustLineHeightInTable.Copy(_obj.XmlChildAdjustLineHeightInTable); - self.XmlChildUseFELayout.Copy(_obj.XmlChildUseFELayout); + {self.}XmlChildSpaceForUL.Copy(_obj.XmlChildSpaceForUL); + {self.}XmlChildBalanceSingleByteDoubleByteWidth.Copy(_obj.XmlChildBalanceSingleByteDoubleByteWidth); + {self.}XmlChildDoNotLeaveBackslashAlone.Copy(_obj.XmlChildDoNotLeaveBackslashAlone); + {self.}XmlChildUlTrailSpace.Copy(_obj.XmlChildUlTrailSpace); + {self.}XmlChildDoNotExpandShiftReturn.Copy(_obj.XmlChildDoNotExpandShiftReturn); + {self.}XmlChildAdjustLineHeightInTable.Copy(_obj.XmlChildAdjustLineHeightInTable); + {self.}XmlChildUseFELayout.Copy(_obj.XmlChildUseFELayout); end; function Compat.AddCompatSetting(): CompatSetting; @@ -166,14 +166,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "compatSetting" then break; end - obj := new CompatSetting(self, self.Prefix, "compatSetting"); - self.InsertChild(obj, i+1); + obj := new CompatSetting(self, {self.}Prefix, "compatSetting"); + {self.}InsertChild(obj, i+1); return obj; end; function Compat.AppendCompatSetting(): CompatSetting; begin - obj := new CompatSetting(self, self.Prefix, "compatSetting"); + obj := new CompatSetting(self, {self.}Prefix, "compatSetting"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -196,80 +196,80 @@ end; function Compat.ReadXmlChildSpaceForUL(); begin - return ifnil(self.XmlChildSpaceForUL.Value) ? false : true; + return ifnil({self.}XmlChildSpaceForUL.Value) ? false : true; end; function Compat.WriteXmlChildSpaceForUL(_value); begin - self.XmlChildSpaceForUL.Value := _value; + {self.}XmlChildSpaceForUL.Value := _value; end; function Compat.ReadXmlChildBalanceSingleByteDoubleByteWidth(); begin - return ifnil(self.XmlChildBalanceSingleByteDoubleByteWidth.Value) ? false : true; + return ifnil({self.}XmlChildBalanceSingleByteDoubleByteWidth.Value) ? false : true; end; function Compat.WriteXmlChildBalanceSingleByteDoubleByteWidth(_value); begin - self.XmlChildBalanceSingleByteDoubleByteWidth.Value := _value; + {self.}XmlChildBalanceSingleByteDoubleByteWidth.Value := _value; end; function Compat.ReadXmlChildDoNotLeaveBackslashAlone(); begin - return ifnil(self.XmlChildDoNotLeaveBackslashAlone.Value) ? false : true; + return ifnil({self.}XmlChildDoNotLeaveBackslashAlone.Value) ? false : true; end; function Compat.WriteXmlChildDoNotLeaveBackslashAlone(_value); begin - self.XmlChildDoNotLeaveBackslashAlone.Value := _value; + {self.}XmlChildDoNotLeaveBackslashAlone.Value := _value; end; function Compat.ReadXmlChildUlTrailSpace(); begin - return ifnil(self.XmlChildUlTrailSpace.Value) ? false : true; + return ifnil({self.}XmlChildUlTrailSpace.Value) ? false : true; end; function Compat.WriteXmlChildUlTrailSpace(_value); begin - self.XmlChildUlTrailSpace.Value := _value; + {self.}XmlChildUlTrailSpace.Value := _value; end; function Compat.ReadXmlChildDoNotExpandShiftReturn(); begin - return ifnil(self.XmlChildDoNotExpandShiftReturn.Value) ? false : true; + return ifnil({self.}XmlChildDoNotExpandShiftReturn.Value) ? false : true; end; function Compat.WriteXmlChildDoNotExpandShiftReturn(_value); begin - self.XmlChildDoNotExpandShiftReturn.Value := _value; + {self.}XmlChildDoNotExpandShiftReturn.Value := _value; end; function Compat.ReadXmlChildAdjustLineHeightInTable(); begin - return ifnil(self.XmlChildAdjustLineHeightInTable.Value) ? false : true; + return ifnil({self.}XmlChildAdjustLineHeightInTable.Value) ? false : true; end; function Compat.WriteXmlChildAdjustLineHeightInTable(_value); begin - self.XmlChildAdjustLineHeightInTable.Value := _value; + {self.}XmlChildAdjustLineHeightInTable.Value := _value; end; function Compat.ReadXmlChildUseFELayout(); begin - return ifnil(self.XmlChildUseFELayout.Value) ? false : true; + return ifnil({self.}XmlChildUseFELayout.Value) ? false : true; end; function Compat.WriteXmlChildUseFELayout(_value); begin - self.XmlChildUseFELayout.Value := _value; + {self.}XmlChildUseFELayout.Value := _value; end; function Compat.ReadXmlChildCompatSetting(); begin - return ifnil(self.XmlChildCompatSetting.Value) ? false : true; + return ifnil({self.}XmlChildCompatSetting.Value) ? false : true; end; function Compat.WriteXmlChildCompatSetting(_value); begin - self.XmlChildCompatSetting.Value := _value; + {self.}XmlChildCompatSetting.Value := _value; end; diff --git a/autoclass/docx/CompatSetting@DOCX.tsf b/autoclass/docx/CompatSetting@DOCX.tsf index f39f5d2..7a55848 100644 --- a/autoclass/docx/CompatSetting@DOCX.tsf +++ b/autoclass/docx/CompatSetting@DOCX.tsf @@ -31,7 +31,7 @@ end; function CompatSetting.Create();overload; begin - self.Create(nil, "w", "compatSetting"); + {self.}Create(nil, "w", "compatSetting"); end; function CompatSetting.Create(_node: XmlNode);overload; @@ -46,17 +46,17 @@ end; function CompatSetting.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(self.Prefix, "name", nil); - self.XmlAttrUri := new OpenXmlAttribute(self.Prefix, "uri", nil); - self.XmlAttrVal := new OpenXmlAttribute(self.Prefix, "val", nil); + {self.}XmlAttrName := new OpenXmlAttribute({self.}Prefix, "name", nil); + {self.}XmlAttrUri := new OpenXmlAttribute({self.}Prefix, "uri", nil); + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); end; function CompatSetting.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, - self.XmlAttrUri, - self.XmlAttrVal, + {self.}XmlAttrName, + {self.}XmlAttrUri, + {self.}XmlAttrVal, ); end; @@ -71,47 +71,47 @@ end; function CompatSetting.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function CompatSetting.Copy(_obj: CompatSetting);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; if not ifnil(_obj.XmlAttrUri.Value) then - self.XmlAttrUri.Value := _obj.XmlAttrUri.Value; + {self.}XmlAttrUri.Value := _obj.XmlAttrUri.Value; if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; end; function CompatSetting.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function CompatSetting.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; function CompatSetting.ReadXmlAttrUri(); begin - return self.XmlAttrUri.Value; + return {self.}XmlAttrUri.Value; end; function CompatSetting.WriteXmlAttrUri(_value); begin - self.XmlAttrUri.Value := _value; + {self.}XmlAttrUri.Value := _value; end; function CompatSetting.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function CompatSetting.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/autoclass/docx/CoreProperties@DOCX.tsf b/autoclass/docx/CoreProperties@DOCX.tsf index f7a6ac9..bf176f1 100644 --- a/autoclass/docx/CoreProperties@DOCX.tsf +++ b/autoclass/docx/CoreProperties@DOCX.tsf @@ -49,7 +49,7 @@ end; function CoreProperties.Create();overload; begin - self.Create(nil, "cp", "coreProperties"); + {self.}Create(nil, "cp", "coreProperties"); end; function CoreProperties.Create(_node: XmlNode);overload; @@ -64,68 +64,68 @@ end; function CoreProperties.Init();override; begin - self.XmlAttrXmlnsCp := new OpenXmlAttribute("xmlns", "cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"); - self.XmlAttrXmlnsDc := new OpenXmlAttribute("xmlns", "dc", "http://purl.org/dc/elements/1.1/"); - self.XmlAttrXmlnsDcterms := new OpenXmlAttribute("xmlns", "dcterms", "http://purl.org/dc/terms/"); - self.XmlAttrXmlnsDcmitype := new OpenXmlAttribute("xmlns", "dcmitype", "http://purl.org/dc/dcmitype/"); - self.XmlAttrXmlnsXsi := new OpenXmlAttribute("xmlns", "xsi", "http://www.w3.org/2001/XMLSchema-instance"); - self.Title := new OpenXmlPcdata(self, "dc", "title"); - self.Subject := new OpenXmlPcdata(self, "dc", "subject"); - self.Creator := new OpenXmlPcdata(self, "dc", "creator"); - self.Keywords := new OpenXmlPcdata(self, "cp", "keywords"); - self.Description := new OpenXmlPcdata(self, "cp", "description"); - self.LastModifiedBy := new OpenXmlPcdata(self, "cp", "lastModifiedBy"); - self.Revision := new OpenXmlPcdata(self, "cp", "revision"); - self.LastPrinted := new OpenXmlPcdata(self, "cp", "lastPrinted"); - self.Created := new Created(self, "dcterms", "created"); - self.Modified := new Modified(self, "dcterms", "modified"); + {self.}XmlAttrXmlnsCp := new OpenXmlAttribute("xmlns", "cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"); + {self.}XmlAttrXmlnsDc := new OpenXmlAttribute("xmlns", "dc", "http://purl.org/dc/elements/1.1/"); + {self.}XmlAttrXmlnsDcterms := new OpenXmlAttribute("xmlns", "dcterms", "http://purl.org/dc/terms/"); + {self.}XmlAttrXmlnsDcmitype := new OpenXmlAttribute("xmlns", "dcmitype", "http://purl.org/dc/dcmitype/"); + {self.}XmlAttrXmlnsXsi := new OpenXmlAttribute("xmlns", "xsi", "http://www.w3.org/2001/XMLSchema-instance"); + {self.}Title := new OpenXmlPcdata(self, "dc", "title"); + {self.}Subject := new OpenXmlPcdata(self, "dc", "subject"); + {self.}Creator := new OpenXmlPcdata(self, "dc", "creator"); + {self.}Keywords := new OpenXmlPcdata(self, "cp", "keywords"); + {self.}Description := new OpenXmlPcdata(self, "cp", "description"); + {self.}LastModifiedBy := new OpenXmlPcdata(self, "cp", "lastModifiedBy"); + {self.}Revision := new OpenXmlPcdata(self, "cp", "revision"); + {self.}LastPrinted := new OpenXmlPcdata(self, "cp", "lastPrinted"); + {self.}Created := new Created(self, "dcterms", "created"); + {self.}Modified := new Modified(self, "dcterms", "modified"); end; function CoreProperties.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsCp, - self.XmlAttrXmlnsDc, - self.XmlAttrXmlnsDcterms, - self.XmlAttrXmlnsDcmitype, - self.XmlAttrXmlnsXsi, + {self.}XmlAttrXmlnsCp, + {self.}XmlAttrXmlnsDc, + {self.}XmlAttrXmlnsDcterms, + {self.}XmlAttrXmlnsDcmitype, + {self.}XmlAttrXmlnsXsi, ); end; function CoreProperties.InitChildren();override; begin child_elements_ := array( - 0: self.Title, - 1: self.Subject, - 2: self.Creator, - 3: self.Keywords, - 4: self.Description, - 5: self.LastModifiedBy, - 6: self.Revision, - 7: self.LastPrinted, - 8: self.Created, - 9: self.Modified, + 0: {self.}Title, + 1: {self.}Subject, + 2: {self.}Creator, + 3: {self.}Keywords, + 4: {self.}Description, + 5: {self.}LastModifiedBy, + 6: {self.}Revision, + 7: {self.}LastPrinted, + 8: {self.}Created, + 9: {self.}Modified, ); sorted_child_ := array( "": -1, - self.Title.ElementName: 0, - self.Subject.ElementName: 1, - self.Creator.ElementName: 2, - self.Keywords.ElementName: 3, - self.Description.ElementName: 4, - self.LastModifiedBy.ElementName: 5, - self.Revision.ElementName: 6, - self.LastPrinted.ElementName: 7, - self.Created.ElementName: 8, - self.Modified.ElementName: 9, + {self.}Title.ElementName: 0, + {self.}Subject.ElementName: 1, + {self.}Creator.ElementName: 2, + {self.}Keywords.ElementName: 3, + {self.}Description.ElementName: 4, + {self.}LastModifiedBy.ElementName: 5, + {self.}Revision.ElementName: 6, + {self.}LastPrinted.ElementName: 7, + {self.}Created.ElementName: 8, + {self.}Modified.ElementName: 9, ); end; function CoreProperties.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -134,7 +134,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -162,73 +162,73 @@ end; function CoreProperties.Copy(_obj: CoreProperties);override; begin if not ifnil(_obj.XmlAttrXmlnsCp.Value) then - self.XmlAttrXmlnsCp.Value := _obj.XmlAttrXmlnsCp.Value; + {self.}XmlAttrXmlnsCp.Value := _obj.XmlAttrXmlnsCp.Value; if not ifnil(_obj.XmlAttrXmlnsDc.Value) then - self.XmlAttrXmlnsDc.Value := _obj.XmlAttrXmlnsDc.Value; + {self.}XmlAttrXmlnsDc.Value := _obj.XmlAttrXmlnsDc.Value; if not ifnil(_obj.XmlAttrXmlnsDcterms.Value) then - self.XmlAttrXmlnsDcterms.Value := _obj.XmlAttrXmlnsDcterms.Value; + {self.}XmlAttrXmlnsDcterms.Value := _obj.XmlAttrXmlnsDcterms.Value; if not ifnil(_obj.XmlAttrXmlnsDcmitype.Value) then - self.XmlAttrXmlnsDcmitype.Value := _obj.XmlAttrXmlnsDcmitype.Value; + {self.}XmlAttrXmlnsDcmitype.Value := _obj.XmlAttrXmlnsDcmitype.Value; if not ifnil(_obj.XmlAttrXmlnsXsi.Value) then - self.XmlAttrXmlnsXsi.Value := _obj.XmlAttrXmlnsXsi.Value; - self.Title.Copy(_obj.Title); - self.Subject.Copy(_obj.Subject); - self.Creator.Copy(_obj.Creator); - self.Keywords.Copy(_obj.Keywords); - self.Description.Copy(_obj.Description); - self.LastModifiedBy.Copy(_obj.LastModifiedBy); - self.Revision.Copy(_obj.Revision); - self.LastPrinted.Copy(_obj.LastPrinted); - self.Created.Copy(_obj.Created); - self.Modified.Copy(_obj.Modified); + {self.}XmlAttrXmlnsXsi.Value := _obj.XmlAttrXmlnsXsi.Value; + {self.}Title.Copy(_obj.Title); + {self.}Subject.Copy(_obj.Subject); + {self.}Creator.Copy(_obj.Creator); + {self.}Keywords.Copy(_obj.Keywords); + {self.}Description.Copy(_obj.Description); + {self.}LastModifiedBy.Copy(_obj.LastModifiedBy); + {self.}Revision.Copy(_obj.Revision); + {self.}LastPrinted.Copy(_obj.LastPrinted); + {self.}Created.Copy(_obj.Created); + {self.}Modified.Copy(_obj.Modified); end; function CoreProperties.ReadXmlAttrXmlnsCp(); begin - return self.XmlAttrXmlnsCp.Value; + return {self.}XmlAttrXmlnsCp.Value; end; function CoreProperties.WriteXmlAttrXmlnsCp(_value); begin - self.XmlAttrXmlnsCp.Value := _value; + {self.}XmlAttrXmlnsCp.Value := _value; end; function CoreProperties.ReadXmlAttrXmlnsDc(); begin - return self.XmlAttrXmlnsDc.Value; + return {self.}XmlAttrXmlnsDc.Value; end; function CoreProperties.WriteXmlAttrXmlnsDc(_value); begin - self.XmlAttrXmlnsDc.Value := _value; + {self.}XmlAttrXmlnsDc.Value := _value; end; function CoreProperties.ReadXmlAttrXmlnsDcterms(); begin - return self.XmlAttrXmlnsDcterms.Value; + return {self.}XmlAttrXmlnsDcterms.Value; end; function CoreProperties.WriteXmlAttrXmlnsDcterms(_value); begin - self.XmlAttrXmlnsDcterms.Value := _value; + {self.}XmlAttrXmlnsDcterms.Value := _value; end; function CoreProperties.ReadXmlAttrXmlnsDcmitype(); begin - return self.XmlAttrXmlnsDcmitype.Value; + return {self.}XmlAttrXmlnsDcmitype.Value; end; function CoreProperties.WriteXmlAttrXmlnsDcmitype(_value); begin - self.XmlAttrXmlnsDcmitype.Value := _value; + {self.}XmlAttrXmlnsDcmitype.Value := _value; end; function CoreProperties.ReadXmlAttrXmlnsXsi(); begin - return self.XmlAttrXmlnsXsi.Value; + return {self.}XmlAttrXmlnsXsi.Value; end; function CoreProperties.WriteXmlAttrXmlnsXsi(_value); begin - self.XmlAttrXmlnsXsi.Value := _value; + {self.}XmlAttrXmlnsXsi.Value := _value; end; diff --git a/autoclass/docx/Created@DOCX.tsf b/autoclass/docx/Created@DOCX.tsf index 0c88613..cffa709 100644 --- a/autoclass/docx/Created@DOCX.tsf +++ b/autoclass/docx/Created@DOCX.tsf @@ -22,7 +22,7 @@ end; function Created.Create();overload; begin - self.Create(nil, "dcterms", "created"); + {self.}Create(nil, "dcterms", "created"); end; function Created.Create(_node: XmlNode);overload; @@ -37,35 +37,35 @@ end; function Created.Init();override; begin - self.XmlAttrXsiType := new OpenXmlAttribute("xsi", "type", nil); + {self.}XmlAttrXsiType := new OpenXmlAttribute("xsi", "type", nil); end; function Created.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXsiType, + {self.}XmlAttrXsiType, ); end; function Created.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Created.Copy(_obj: Created);override; begin if not ifnil(_obj.XmlAttrXsiType.Value) then - self.XmlAttrXsiType.Value := _obj.XmlAttrXsiType.Value; + {self.}XmlAttrXsiType.Value := _obj.XmlAttrXsiType.Value; end; function Created.ReadXmlAttrXsiType(); begin - return self.XmlAttrXsiType.Value; + return {self.}XmlAttrXsiType.Value; end; function Created.WriteXmlAttrXsiType(_value); begin - self.XmlAttrXsiType.Value := _value; + {self.}XmlAttrXsiType.Value := _value; end; diff --git a/autoclass/docx/DLbls@DOCX.tsf b/autoclass/docx/DLbls@DOCX.tsf index 4eef2f2..d8f6d74 100644 --- a/autoclass/docx/DLbls@DOCX.tsf +++ b/autoclass/docx/DLbls@DOCX.tsf @@ -27,7 +27,7 @@ end; function DLbls.Create();overload; begin - self.Create(nil, "c", "dLbls"); + {self.}Create(nil, "c", "dLbls"); end; function DLbls.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function DLbls.Init();override; begin - self.SpPr := new SpPr(self, self.Prefix, "spPr"); - self.ShowLegendKey := new PureVal(self, self.Prefix, "showLegendKey"); - self.ShowVal := new PureVal(self, self.Prefix, "showVal"); - self.ShowCatName := new PureVal(self, self.Prefix, "showCatName"); - self.ShowSerName := new PureVal(self, self.Prefix, "showSerName"); - self.ShowPercent := new PureVal(self, self.Prefix, "showPercent"); - self.ShowBubbleSize := new PureVal(self, self.Prefix, "showBubbleSize"); - self.ShowLeaderLines := new PureVal(self, self.Prefix, "showLeaderLines"); - self.ExtLst := new ExtLst(self, self.Prefix, "extLst"); + {self.}SpPr := new SpPr(self, {self.}Prefix, "spPr"); + {self.}ShowLegendKey := new PureVal(self, {self.}Prefix, "showLegendKey"); + {self.}ShowVal := new PureVal(self, {self.}Prefix, "showVal"); + {self.}ShowCatName := new PureVal(self, {self.}Prefix, "showCatName"); + {self.}ShowSerName := new PureVal(self, {self.}Prefix, "showSerName"); + {self.}ShowPercent := new PureVal(self, {self.}Prefix, "showPercent"); + {self.}ShowBubbleSize := new PureVal(self, {self.}Prefix, "showBubbleSize"); + {self.}ShowLeaderLines := new PureVal(self, {self.}Prefix, "showLeaderLines"); + {self.}ExtLst := new ExtLst(self, {self.}Prefix, "extLst"); end; function DLbls.InitAttributes();override; @@ -62,35 +62,35 @@ end; function DLbls.InitChildren();override; begin child_elements_ := array( - 0: self.SpPr, - 1: self.ShowLegendKey, - 2: self.ShowVal, - 3: self.ShowCatName, - 4: self.ShowSerName, - 5: self.ShowPercent, - 6: self.ShowBubbleSize, - 7: self.ShowLeaderLines, - 8: self.ExtLst, + 0: {self.}SpPr, + 1: {self.}ShowLegendKey, + 2: {self.}ShowVal, + 3: {self.}ShowCatName, + 4: {self.}ShowSerName, + 5: {self.}ShowPercent, + 6: {self.}ShowBubbleSize, + 7: {self.}ShowLeaderLines, + 8: {self.}ExtLst, ); sorted_child_ := array( "": -1, - self.SpPr.ElementName: 0, - self.ShowLegendKey.ElementName: 1, - self.ShowVal.ElementName: 2, - self.ShowCatName.ElementName: 3, - self.ShowSerName.ElementName: 4, - self.ShowPercent.ElementName: 5, - self.ShowBubbleSize.ElementName: 6, - self.ShowLeaderLines.ElementName: 7, - self.ExtLst.ElementName: 8, + {self.}SpPr.ElementName: 0, + {self.}ShowLegendKey.ElementName: 1, + {self.}ShowVal.ElementName: 2, + {self.}ShowCatName.ElementName: 3, + {self.}ShowSerName.ElementName: 4, + {self.}ShowPercent.ElementName: 5, + {self.}ShowBubbleSize.ElementName: 6, + {self.}ShowLeaderLines.ElementName: 7, + {self.}ExtLst.ElementName: 8, ); end; function DLbls.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -99,7 +99,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -126,13 +126,13 @@ end; function DLbls.Copy(_obj: DLbls);override; begin - self.SpPr.Copy(_obj.SpPr); - self.ShowLegendKey.Copy(_obj.ShowLegendKey); - self.ShowVal.Copy(_obj.ShowVal); - self.ShowCatName.Copy(_obj.ShowCatName); - self.ShowSerName.Copy(_obj.ShowSerName); - self.ShowPercent.Copy(_obj.ShowPercent); - self.ShowBubbleSize.Copy(_obj.ShowBubbleSize); - self.ShowLeaderLines.Copy(_obj.ShowLeaderLines); - self.ExtLst.Copy(_obj.ExtLst); + {self.}SpPr.Copy(_obj.SpPr); + {self.}ShowLegendKey.Copy(_obj.ShowLegendKey); + {self.}ShowVal.Copy(_obj.ShowVal); + {self.}ShowCatName.Copy(_obj.ShowCatName); + {self.}ShowSerName.Copy(_obj.ShowSerName); + {self.}ShowPercent.Copy(_obj.ShowPercent); + {self.}ShowBubbleSize.Copy(_obj.ShowBubbleSize); + {self.}ShowLeaderLines.Copy(_obj.ShowLeaderLines); + {self.}ExtLst.Copy(_obj.ExtLst); end; diff --git a/autoclass/docx/DTable@DOCX.tsf b/autoclass/docx/DTable@DOCX.tsf index 9350b23..2ddbbc1 100644 --- a/autoclass/docx/DTable@DOCX.tsf +++ b/autoclass/docx/DTable@DOCX.tsf @@ -23,7 +23,7 @@ end; function DTable.Create();overload; begin - self.Create(nil, "c", "dTable"); + {self.}Create(nil, "c", "dTable"); end; function DTable.Create(_node: XmlNode);overload; @@ -38,11 +38,11 @@ end; function DTable.Init();override; begin - self.ShowHorzBorder := new PureVal(self, self.Prefix, "showHorzBorder"); - self.ShowVertBorder := new PureVal(self, self.Prefix, "showVertBorder"); - self.ShowOutline := new PureVal(self, self.Prefix, "showOutline"); - self.ShowKeys := new PureVal(self, self.Prefix, "showKeys"); - self.TxPr := new TxPr(self, self.Prefix, "txPr"); + {self.}ShowHorzBorder := new PureVal(self, {self.}Prefix, "showHorzBorder"); + {self.}ShowVertBorder := new PureVal(self, {self.}Prefix, "showVertBorder"); + {self.}ShowOutline := new PureVal(self, {self.}Prefix, "showOutline"); + {self.}ShowKeys := new PureVal(self, {self.}Prefix, "showKeys"); + {self.}TxPr := new TxPr(self, {self.}Prefix, "txPr"); end; function DTable.InitAttributes();override; @@ -54,27 +54,27 @@ end; function DTable.InitChildren();override; begin child_elements_ := array( - 0: self.ShowHorzBorder, - 1: self.ShowVertBorder, - 2: self.ShowOutline, - 3: self.ShowKeys, - 4: self.TxPr, + 0: {self.}ShowHorzBorder, + 1: {self.}ShowVertBorder, + 2: {self.}ShowOutline, + 3: {self.}ShowKeys, + 4: {self.}TxPr, ); sorted_child_ := array( "": -1, - self.ShowHorzBorder.ElementName: 0, - self.ShowVertBorder.ElementName: 1, - self.ShowOutline.ElementName: 2, - self.ShowKeys.ElementName: 3, - self.TxPr.ElementName: 4, + {self.}ShowHorzBorder.ElementName: 0, + {self.}ShowVertBorder.ElementName: 1, + {self.}ShowOutline.ElementName: 2, + {self.}ShowKeys.ElementName: 3, + {self.}TxPr.ElementName: 4, ); end; function DTable.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -83,7 +83,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -110,9 +110,9 @@ end; function DTable.Copy(_obj: DTable);override; begin - self.ShowHorzBorder.Copy(_obj.ShowHorzBorder); - self.ShowVertBorder.Copy(_obj.ShowVertBorder); - self.ShowOutline.Copy(_obj.ShowOutline); - self.ShowKeys.Copy(_obj.ShowKeys); - self.TxPr.Copy(_obj.TxPr); + {self.}ShowHorzBorder.Copy(_obj.ShowHorzBorder); + {self.}ShowVertBorder.Copy(_obj.ShowVertBorder); + {self.}ShowOutline.Copy(_obj.ShowOutline); + {self.}ShowKeys.Copy(_obj.ShowKeys); + {self.}TxPr.Copy(_obj.TxPr); end; diff --git a/autoclass/docx/Default@DOCX.tsf b/autoclass/docx/Default@DOCX.tsf index 0f19ebc..5f8cad2 100644 --- a/autoclass/docx/Default@DOCX.tsf +++ b/autoclass/docx/Default@DOCX.tsf @@ -27,7 +27,7 @@ end; function Default.Create();overload; begin - self.Create(nil, nil, "Default"); + {self.}Create(nil, nil, "Default"); end; function Default.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function Default.Init();override; begin - self.XmlAttrExtension := new OpenXmlAttribute(nil, "Extension", nil); - self.XmlAttrContentType := new OpenXmlAttribute(nil, "ContentType", nil); + {self.}XmlAttrExtension := new OpenXmlAttribute(nil, "Extension", nil); + {self.}XmlAttrContentType := new OpenXmlAttribute(nil, "ContentType", nil); end; function Default.InitAttributes();override; begin attributes_ := array( - self.XmlAttrExtension, - self.XmlAttrContentType, + {self.}XmlAttrExtension, + {self.}XmlAttrContentType, ); end; @@ -65,35 +65,35 @@ end; function Default.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Default.Copy(_obj: Default);override; begin if not ifnil(_obj.XmlAttrExtension.Value) then - self.XmlAttrExtension.Value := _obj.XmlAttrExtension.Value; + {self.}XmlAttrExtension.Value := _obj.XmlAttrExtension.Value; if not ifnil(_obj.XmlAttrContentType.Value) then - self.XmlAttrContentType.Value := _obj.XmlAttrContentType.Value; + {self.}XmlAttrContentType.Value := _obj.XmlAttrContentType.Value; end; function Default.ReadXmlAttrExtension(); begin - return self.XmlAttrExtension.Value; + return {self.}XmlAttrExtension.Value; end; function Default.WriteXmlAttrExtension(_value); begin - self.XmlAttrExtension.Value := _value; + {self.}XmlAttrExtension.Value := _value; end; function Default.ReadXmlAttrContentType(); begin - return self.XmlAttrContentType.Value; + return {self.}XmlAttrContentType.Value; end; function Default.WriteXmlAttrContentType(_value); begin - self.XmlAttrContentType.Value := _value; + {self.}XmlAttrContentType.Value := _value; end; diff --git a/autoclass/docx/DocDefaults@DOCX.tsf b/autoclass/docx/DocDefaults@DOCX.tsf index 1012dbb..f8cc31c 100644 --- a/autoclass/docx/DocDefaults@DOCX.tsf +++ b/autoclass/docx/DocDefaults@DOCX.tsf @@ -20,7 +20,7 @@ end; function DocDefaults.Create();overload; begin - self.Create(nil, "w", "docDefaults"); + {self.}Create(nil, "w", "docDefaults"); end; function DocDefaults.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function DocDefaults.Init();override; begin - self.RPrDefault := new RPrDefault(self, self.Prefix, "rPrDefault"); - self.PPrDefault := new PPrDefault(self, self.Prefix, "pPrDefault"); + {self.}RPrDefault := new RPrDefault(self, {self.}Prefix, "rPrDefault"); + {self.}PPrDefault := new PPrDefault(self, {self.}Prefix, "pPrDefault"); end; function DocDefaults.InitAttributes();override; @@ -48,21 +48,21 @@ end; function DocDefaults.InitChildren();override; begin child_elements_ := array( - 0: self.RPrDefault, - 1: self.PPrDefault, + 0: {self.}RPrDefault, + 1: {self.}PPrDefault, ); sorted_child_ := array( "": -1, - self.RPrDefault.ElementName: 0, - self.PPrDefault.ElementName: 1, + {self.}RPrDefault.ElementName: 0, + {self.}PPrDefault.ElementName: 1, ); end; function DocDefaults.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function DocDefaults.Copy(_obj: DocDefaults);override; begin - self.RPrDefault.Copy(_obj.RPrDefault); - self.PPrDefault.Copy(_obj.PPrDefault); + {self.}RPrDefault.Copy(_obj.RPrDefault); + {self.}PPrDefault.Copy(_obj.PPrDefault); end; diff --git a/autoclass/docx/DocGrid@DOCX.tsf b/autoclass/docx/DocGrid@DOCX.tsf index eb0f023..9a9ae2b 100644 --- a/autoclass/docx/DocGrid@DOCX.tsf +++ b/autoclass/docx/DocGrid@DOCX.tsf @@ -27,7 +27,7 @@ end; function DocGrid.Create();overload; begin - self.Create(nil, "w", "docGrid"); + {self.}Create(nil, "w", "docGrid"); end; function DocGrid.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function DocGrid.Init();override; begin - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); - self.XmlAttrLinePitch := new OpenXmlAttribute(self.Prefix, "linePitch", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); + {self.}XmlAttrLinePitch := new OpenXmlAttribute({self.}Prefix, "linePitch", nil); end; function DocGrid.InitAttributes();override; begin attributes_ := array( - self.XmlAttrType, - self.XmlAttrLinePitch, + {self.}XmlAttrType, + {self.}XmlAttrLinePitch, ); end; @@ -65,35 +65,35 @@ end; function DocGrid.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function DocGrid.Copy(_obj: DocGrid);override; begin if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; if not ifnil(_obj.XmlAttrLinePitch.Value) then - self.XmlAttrLinePitch.Value := _obj.XmlAttrLinePitch.Value; + {self.}XmlAttrLinePitch.Value := _obj.XmlAttrLinePitch.Value; end; function DocGrid.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function DocGrid.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; function DocGrid.ReadXmlAttrLinePitch(); begin - return self.XmlAttrLinePitch.Value; + return {self.}XmlAttrLinePitch.Value; end; function DocGrid.WriteXmlAttrLinePitch(_value); begin - self.XmlAttrLinePitch.Value := _value; + {self.}XmlAttrLinePitch.Value := _value; end; diff --git a/autoclass/docx/DocPartObj@DOCX.tsf b/autoclass/docx/DocPartObj@DOCX.tsf index 0e2b9b3..8b511ad 100644 --- a/autoclass/docx/DocPartObj@DOCX.tsf +++ b/autoclass/docx/DocPartObj@DOCX.tsf @@ -20,7 +20,7 @@ end; function DocPartObj.Create();overload; begin - self.Create(nil, "w", "docPartObj"); + {self.}Create(nil, "w", "docPartObj"); end; function DocPartObj.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function DocPartObj.Init();override; begin - self.DocPartGallery := new PureWVal(self, self.Prefix, "docPartGallery"); - self.DocPartUnique := new PureVal(self, self.Prefix, "docPartUnique"); + {self.}DocPartGallery := new PureWVal(self, {self.}Prefix, "docPartGallery"); + {self.}DocPartUnique := new PureVal(self, {self.}Prefix, "docPartUnique"); end; function DocPartObj.InitAttributes();override; @@ -48,21 +48,21 @@ end; function DocPartObj.InitChildren();override; begin child_elements_ := array( - 0: self.DocPartGallery, - 1: self.DocPartUnique, + 0: {self.}DocPartGallery, + 1: {self.}DocPartUnique, ); sorted_child_ := array( "": -1, - self.DocPartGallery.ElementName: 0, - self.DocPartUnique.ElementName: 1, + {self.}DocPartGallery.ElementName: 0, + {self.}DocPartUnique.ElementName: 1, ); end; function DocPartObj.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function DocPartObj.Copy(_obj: DocPartObj);override; begin - self.DocPartGallery.Copy(_obj.DocPartGallery); - self.DocPartUnique.Copy(_obj.DocPartUnique); + {self.}DocPartGallery.Copy(_obj.DocPartGallery); + {self.}DocPartUnique.Copy(_obj.DocPartUnique); end; diff --git a/autoclass/docx/DocPr@DOCX.tsf b/autoclass/docx/DocPr@DOCX.tsf index 90aa0b9..e238b38 100644 --- a/autoclass/docx/DocPr@DOCX.tsf +++ b/autoclass/docx/DocPr@DOCX.tsf @@ -31,7 +31,7 @@ end; function DocPr.Create();overload; begin - self.Create(nil, "w", "docPr"); + {self.}Create(nil, "w", "docPr"); end; function DocPr.Create(_node: XmlNode);overload; @@ -46,17 +46,17 @@ end; function DocPr.Init();override; begin - self.XmlAttrId := new OpenXmlAttribute(nil, "id", nil); - self.XmlAttrName := new OpenXmlAttribute(nil, "name", nil); - self.XmlAttrDescr := new OpenXmlAttribute(nil, "descr", nil); + {self.}XmlAttrId := new OpenXmlAttribute(nil, "id", nil); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil); + {self.}XmlAttrDescr := new OpenXmlAttribute(nil, "descr", nil); end; function DocPr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrId, - self.XmlAttrName, - self.XmlAttrDescr, + {self.}XmlAttrId, + {self.}XmlAttrName, + {self.}XmlAttrDescr, ); end; @@ -71,47 +71,47 @@ end; function DocPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function DocPr.Copy(_obj: DocPr);override; begin if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; if not ifnil(_obj.XmlAttrDescr.Value) then - self.XmlAttrDescr.Value := _obj.XmlAttrDescr.Value; + {self.}XmlAttrDescr.Value := _obj.XmlAttrDescr.Value; end; function DocPr.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function DocPr.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; function DocPr.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function DocPr.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; function DocPr.ReadXmlAttrDescr(); begin - return self.XmlAttrDescr.Value; + return {self.}XmlAttrDescr.Value; end; function DocPr.WriteXmlAttrDescr(_value); begin - self.XmlAttrDescr.Value := _value; + {self.}XmlAttrDescr.Value := _value; end; diff --git a/autoclass/docx/Document@DOCX.tsf b/autoclass/docx/Document@DOCX.tsf index 322d9db..d7679f6 100644 --- a/autoclass/docx/Document@DOCX.tsf +++ b/autoclass/docx/Document@DOCX.tsf @@ -72,7 +72,7 @@ end; function Document.Create();overload; begin - self.Create(nil, "w", "document"); + {self.}Create(nil, "w", "document"); end; function Document.Create(_node: XmlNode);overload; @@ -87,57 +87,57 @@ end; function Document.Init();override; begin - self.XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); - self.XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); - self.XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); - self.XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); - self.Body := new Body(self, self.Prefix, "body"); + {self.}XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); + {self.}XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); + {self.}XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); + {self.}XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}Body := new Body(self, {self.}Prefix, "body"); end; function Document.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsWpc, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16sdtdh, - self.XmlAttrXmlnsW16se, - self.XmlAttrXmlnsWpg, - self.XmlAttrXmlnsWpi, - self.XmlAttrXmlnsWne, - self.XmlAttrXmlnsWps, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsWpc, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16sdtdh, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrXmlnsWpg, + {self.}XmlAttrXmlnsWpi, + {self.}XmlAttrXmlnsWne, + {self.}XmlAttrXmlnsWps, + {self.}XmlAttrMcIgnorable, ); end; function Document.InitChildren();override; begin child_elements_ := array( - 0: self.Body, + 0: {self.}Body, ); sorted_child_ := array( "": -1, - self.Body.ElementName: 0, + {self.}Body.ElementName: 0, ); end; function Document.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -146,7 +146,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -174,160 +174,160 @@ end; function Document.Copy(_obj: Document);override; begin if not ifnil(_obj.XmlAttrXmlnsWpc.Value) then - self.XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16sdtdh.Value) then - self.XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrXmlnsWpg.Value) then - self.XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; if not ifnil(_obj.XmlAttrXmlnsWpi.Value) then - self.XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; if not ifnil(_obj.XmlAttrXmlnsWne.Value) then - self.XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; if not ifnil(_obj.XmlAttrXmlnsWps.Value) then - self.XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; - self.Body.Copy(_obj.Body); + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}Body.Copy(_obj.Body); end; function Document.ReadXmlAttrXmlnsWpc(); begin - return self.XmlAttrXmlnsWpc.Value; + return {self.}XmlAttrXmlnsWpc.Value; end; function Document.WriteXmlAttrXmlnsWpc(_value); begin - self.XmlAttrXmlnsWpc.Value := _value; + {self.}XmlAttrXmlnsWpc.Value := _value; end; function Document.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Document.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Document.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function Document.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function Document.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function Document.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function Document.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function Document.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function Document.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function Document.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function Document.ReadXmlAttrXmlnsW16sdtdh(); begin - return self.XmlAttrXmlnsW16sdtdh.Value; + return {self.}XmlAttrXmlnsW16sdtdh.Value; end; function Document.WriteXmlAttrXmlnsW16sdtdh(_value); begin - self.XmlAttrXmlnsW16sdtdh.Value := _value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _value; end; function Document.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function Document.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function Document.ReadXmlAttrXmlnsWpg(); begin - return self.XmlAttrXmlnsWpg.Value; + return {self.}XmlAttrXmlnsWpg.Value; end; function Document.WriteXmlAttrXmlnsWpg(_value); begin - self.XmlAttrXmlnsWpg.Value := _value; + {self.}XmlAttrXmlnsWpg.Value := _value; end; function Document.ReadXmlAttrXmlnsWpi(); begin - return self.XmlAttrXmlnsWpi.Value; + return {self.}XmlAttrXmlnsWpi.Value; end; function Document.WriteXmlAttrXmlnsWpi(_value); begin - self.XmlAttrXmlnsWpi.Value := _value; + {self.}XmlAttrXmlnsWpi.Value := _value; end; function Document.ReadXmlAttrXmlnsWne(); begin - return self.XmlAttrXmlnsWne.Value; + return {self.}XmlAttrXmlnsWne.Value; end; function Document.WriteXmlAttrXmlnsWne(_value); begin - self.XmlAttrXmlnsWne.Value := _value; + {self.}XmlAttrXmlnsWne.Value := _value; end; function Document.ReadXmlAttrXmlnsWps(); begin - return self.XmlAttrXmlnsWps.Value; + return {self.}XmlAttrXmlnsWps.Value; end; function Document.WriteXmlAttrXmlnsWps(_value); begin - self.XmlAttrXmlnsWps.Value := _value; + {self.}XmlAttrXmlnsWps.Value := _value; end; function Document.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Document.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/Drawing@DOCX.tsf b/autoclass/docx/Drawing@DOCX.tsf index 55da700..5db9d93 100644 --- a/autoclass/docx/Drawing@DOCX.tsf +++ b/autoclass/docx/Drawing@DOCX.tsf @@ -19,7 +19,7 @@ end; function Drawing.Create();overload; begin - self.Create(nil, "w", "drawing"); + {self.}Create(nil, "w", "drawing"); end; function Drawing.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function Drawing.Init();override; begin - self._Inline := new _Inline(self, "wp", "inline"); + {self.}_Inline := new _Inline(self, "wp", "inline"); end; function Drawing.InitAttributes();override; @@ -46,19 +46,19 @@ end; function Drawing.InitChildren();override; begin child_elements_ := array( - 0: self._Inline, + 0: {self.}_Inline, ); sorted_child_ := array( "": -1, - self._Inline.ElementName: 0, + {self.}_Inline.ElementName: 0, ); end; function Drawing.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function Drawing.Copy(_obj: Drawing);override; begin - self._Inline.Copy(_obj._Inline); + {self.}_Inline.Copy(_obj._Inline); end; diff --git a/autoclass/docx/EffectExtent@DOCX.tsf b/autoclass/docx/EffectExtent@DOCX.tsf index f89fbf7..0467b9d 100644 --- a/autoclass/docx/EffectExtent@DOCX.tsf +++ b/autoclass/docx/EffectExtent@DOCX.tsf @@ -35,7 +35,7 @@ end; function EffectExtent.Create();overload; begin - self.Create(nil, "wp", "effectExtent"); + {self.}Create(nil, "wp", "effectExtent"); end; function EffectExtent.Create(_node: XmlNode);overload; @@ -50,19 +50,19 @@ end; function EffectExtent.Init();override; begin - self.XmlAttrL := new OpenXmlAttribute(nil, "l", nil); - self.XmlAttrT := new OpenXmlAttribute(nil, "t", nil); - self.XmlAttrR := new OpenXmlAttribute(nil, "r", nil); - self.XmlAttrB := new OpenXmlAttribute(nil, "b", nil); + {self.}XmlAttrL := new OpenXmlAttribute(nil, "l", nil); + {self.}XmlAttrT := new OpenXmlAttribute(nil, "t", nil); + {self.}XmlAttrR := new OpenXmlAttribute(nil, "r", nil); + {self.}XmlAttrB := new OpenXmlAttribute(nil, "b", nil); end; function EffectExtent.InitAttributes();override; begin attributes_ := array( - self.XmlAttrL, - self.XmlAttrT, - self.XmlAttrR, - self.XmlAttrB, + {self.}XmlAttrL, + {self.}XmlAttrT, + {self.}XmlAttrR, + {self.}XmlAttrB, ); end; @@ -77,59 +77,59 @@ end; function EffectExtent.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function EffectExtent.Copy(_obj: EffectExtent);override; begin if not ifnil(_obj.XmlAttrL.Value) then - self.XmlAttrL.Value := _obj.XmlAttrL.Value; + {self.}XmlAttrL.Value := _obj.XmlAttrL.Value; if not ifnil(_obj.XmlAttrT.Value) then - self.XmlAttrT.Value := _obj.XmlAttrT.Value; + {self.}XmlAttrT.Value := _obj.XmlAttrT.Value; if not ifnil(_obj.XmlAttrR.Value) then - self.XmlAttrR.Value := _obj.XmlAttrR.Value; + {self.}XmlAttrR.Value := _obj.XmlAttrR.Value; if not ifnil(_obj.XmlAttrB.Value) then - self.XmlAttrB.Value := _obj.XmlAttrB.Value; + {self.}XmlAttrB.Value := _obj.XmlAttrB.Value; end; function EffectExtent.ReadXmlAttrL(); begin - return self.XmlAttrL.Value; + return {self.}XmlAttrL.Value; end; function EffectExtent.WriteXmlAttrL(_value); begin - self.XmlAttrL.Value := _value; + {self.}XmlAttrL.Value := _value; end; function EffectExtent.ReadXmlAttrT(); begin - return self.XmlAttrT.Value; + return {self.}XmlAttrT.Value; end; function EffectExtent.WriteXmlAttrT(_value); begin - self.XmlAttrT.Value := _value; + {self.}XmlAttrT.Value := _value; end; function EffectExtent.ReadXmlAttrR(); begin - return self.XmlAttrR.Value; + return {self.}XmlAttrR.Value; end; function EffectExtent.WriteXmlAttrR(_value); begin - self.XmlAttrR.Value := _value; + {self.}XmlAttrR.Value := _value; end; function EffectExtent.ReadXmlAttrB(); begin - return self.XmlAttrB.Value; + return {self.}XmlAttrB.Value; end; function EffectExtent.WriteXmlAttrB(_value); begin - self.XmlAttrB.Value := _value; + {self.}XmlAttrB.Value := _value; end; diff --git a/autoclass/docx/EffectLst@DOCX.tsf b/autoclass/docx/EffectLst@DOCX.tsf index e93ea77..e50851c 100644 --- a/autoclass/docx/EffectLst@DOCX.tsf +++ b/autoclass/docx/EffectLst@DOCX.tsf @@ -19,7 +19,7 @@ end; function EffectLst.Create();overload; begin - self.Create(nil, "a", "effectLst"); + {self.}Create(nil, "a", "effectLst"); end; function EffectLst.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function EffectLst.Init();override; begin - self.OuterShdw := new OuterShdw(self, self.Prefix, "outerShdw"); + {self.}OuterShdw := new OuterShdw(self, {self.}Prefix, "outerShdw"); end; function EffectLst.InitAttributes();override; @@ -46,19 +46,19 @@ end; function EffectLst.InitChildren();override; begin child_elements_ := array( - 0: self.OuterShdw, + 0: {self.}OuterShdw, ); sorted_child_ := array( "": -1, - self.OuterShdw.ElementName: 0, + {self.}OuterShdw.ElementName: 0, ); end; function EffectLst.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function EffectLst.Copy(_obj: EffectLst);override; begin - self.OuterShdw.Copy(_obj.OuterShdw); + {self.}OuterShdw.Copy(_obj.OuterShdw); end; diff --git a/autoclass/docx/EffectStyle@DOCX.tsf b/autoclass/docx/EffectStyle@DOCX.tsf index cf6454c..2f728fc 100644 --- a/autoclass/docx/EffectStyle@DOCX.tsf +++ b/autoclass/docx/EffectStyle@DOCX.tsf @@ -19,7 +19,7 @@ end; function EffectStyle.Create();overload; begin - self.Create(nil, "a", "effectStyle"); + {self.}Create(nil, "a", "effectStyle"); end; function EffectStyle.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function EffectStyle.Init();override; begin - self.EffectLst := new EffectLst(self, self.Prefix, "effectLst"); + {self.}EffectLst := new EffectLst(self, {self.}Prefix, "effectLst"); end; function EffectStyle.InitAttributes();override; @@ -46,19 +46,19 @@ end; function EffectStyle.InitChildren();override; begin child_elements_ := array( - 0: self.EffectLst, + 0: {self.}EffectLst, ); sorted_child_ := array( "": -1, - self.EffectLst.ElementName: 0, + {self.}EffectLst.ElementName: 0, ); end; function EffectStyle.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function EffectStyle.Copy(_obj: EffectStyle);override; begin - self.EffectLst.Copy(_obj.EffectLst); + {self.}EffectLst.Copy(_obj.EffectLst); end; diff --git a/autoclass/docx/EffectStyleLst@DOCX.tsf b/autoclass/docx/EffectStyleLst@DOCX.tsf index 6967cce..9401945 100644 --- a/autoclass/docx/EffectStyleLst@DOCX.tsf +++ b/autoclass/docx/EffectStyleLst@DOCX.tsf @@ -23,7 +23,7 @@ end; function EffectStyleLst.Create();overload; begin - self.Create(nil, "a", "effectStyleLst"); + {self.}Create(nil, "a", "effectStyleLst"); end; function EffectStyleLst.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function EffectStyleLst.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "effectStyle": obj := self.AppendEffectStyle(); + pre + "effectStyle": obj := {self.}AppendEffectStyle(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "effectStyle" then break; end - obj := new EffectStyle(self, self.Prefix, "effectStyle"); - self.InsertChild(obj, i+1); + obj := new EffectStyle(self, {self.}Prefix, "effectStyle"); + {self.}InsertChild(obj, i+1); return obj; end; function EffectStyleLst.AppendEffectStyle(): EffectStyle; begin - obj := new EffectStyle(self, self.Prefix, "effectStyle"); + obj := new EffectStyle(self, {self.}Prefix, "effectStyle"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Endnote@DOCX.tsf b/autoclass/docx/Endnote@DOCX.tsf index f474bf0..ed927ec 100644 --- a/autoclass/docx/Endnote@DOCX.tsf +++ b/autoclass/docx/Endnote@DOCX.tsf @@ -32,7 +32,7 @@ end; function Endnote.Create();overload; begin - self.Create(nil, "w", "endnote"); + {self.}Create(nil, "w", "endnote"); end; function Endnote.Create(_node: XmlNode);overload; @@ -47,15 +47,15 @@ end; function Endnote.Init();override; begin - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); - self.XmlAttrId := new OpenXmlAttribute(self.Prefix, "id", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); end; function Endnote.InitAttributes();override; begin attributes_ := array( - self.XmlAttrType, - self.XmlAttrId, + {self.}XmlAttrType, + {self.}XmlAttrId, ); end; @@ -70,9 +70,9 @@ end; function Endnote.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -81,7 +81,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -90,7 +90,7 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); + pre + "p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -110,9 +110,9 @@ end; function Endnote.Copy(_obj: Endnote);override; begin if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; end; function Endnote.AddP(): P; @@ -123,14 +123,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; function Endnote.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -153,20 +153,20 @@ end; function Endnote.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function Endnote.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; function Endnote.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function Endnote.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; diff --git a/autoclass/docx/EndnotePr@DOCX.tsf b/autoclass/docx/EndnotePr@DOCX.tsf index ced5452..18f7e49 100644 --- a/autoclass/docx/EndnotePr@DOCX.tsf +++ b/autoclass/docx/EndnotePr@DOCX.tsf @@ -23,7 +23,7 @@ end; function EndnotePr.Create();overload; begin - self.Create(nil, "w", "endnotePr"); + {self.}Create(nil, "w", "endnotePr"); end; function EndnotePr.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function EndnotePr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "endnote": obj := self.AppendEndnote(); + pre + "endnote": obj := {self.}AppendEndnote(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "endnote" then break; end - obj := new Endnote(self, self.Prefix, "endnote"); - self.InsertChild(obj, i+1); + obj := new Endnote(self, {self.}Prefix, "endnote"); + {self.}InsertChild(obj, i+1); return obj; end; function EndnotePr.AppendEndnote(): Endnote; begin - obj := new Endnote(self, self.Prefix, "endnote"); + obj := new Endnote(self, {self.}Prefix, "endnote"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Endnotes@DOCX.tsf b/autoclass/docx/Endnotes@DOCX.tsf index a6818f0..510e2b5 100644 --- a/autoclass/docx/Endnotes@DOCX.tsf +++ b/autoclass/docx/Endnotes@DOCX.tsf @@ -156,7 +156,7 @@ end; function Endnotes.Create();overload; begin - self.Create(nil, "w", "endnotes"); + {self.}Create(nil, "w", "endnotes"); end; function Endnotes.Create(_node: XmlNode);overload; @@ -171,77 +171,77 @@ end; function Endnotes.Init();override; begin - self.XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); - self.XmlAttrXmlnsCx := new OpenXmlAttribute("xmlns", "cx", nil); - self.XmlAttrXmlnsCx1 := new OpenXmlAttribute("xmlns", "cx1", nil); - self.XmlAttrXmlnsCx2 := new OpenXmlAttribute("xmlns", "cx2", nil); - self.XmlAttrXmlnsCx3 := new OpenXmlAttribute("xmlns", "cx3", nil); - self.XmlAttrXmlnsCx4 := new OpenXmlAttribute("xmlns", "cx4", nil); - self.XmlAttrXmlnsCx5 := new OpenXmlAttribute("xmlns", "cx5", nil); - self.XmlAttrXmlnsCx6 := new OpenXmlAttribute("xmlns", "cx6", nil); - self.XmlAttrXmlnsCx7 := new OpenXmlAttribute("xmlns", "cx7", nil); - self.XmlAttrXmlnsCx8 := new OpenXmlAttribute("xmlns", "cx8", nil); - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsAink := new OpenXmlAttribute("xmlns", "aink", nil); - self.XmlAttrXmlnsAm3d := new OpenXmlAttribute("xmlns", "am3d", nil); - self.XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); - self.XmlAttrXmlnsOel := new OpenXmlAttribute("xmlns", "oel", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); - self.XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); - self.XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); - self.XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); - self.XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); - self.XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); - self.XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); + {self.}XmlAttrXmlnsCx := new OpenXmlAttribute("xmlns", "cx", nil); + {self.}XmlAttrXmlnsCx1 := new OpenXmlAttribute("xmlns", "cx1", nil); + {self.}XmlAttrXmlnsCx2 := new OpenXmlAttribute("xmlns", "cx2", nil); + {self.}XmlAttrXmlnsCx3 := new OpenXmlAttribute("xmlns", "cx3", nil); + {self.}XmlAttrXmlnsCx4 := new OpenXmlAttribute("xmlns", "cx4", nil); + {self.}XmlAttrXmlnsCx5 := new OpenXmlAttribute("xmlns", "cx5", nil); + {self.}XmlAttrXmlnsCx6 := new OpenXmlAttribute("xmlns", "cx6", nil); + {self.}XmlAttrXmlnsCx7 := new OpenXmlAttribute("xmlns", "cx7", nil); + {self.}XmlAttrXmlnsCx8 := new OpenXmlAttribute("xmlns", "cx8", nil); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsAink := new OpenXmlAttribute("xmlns", "aink", nil); + {self.}XmlAttrXmlnsAm3d := new OpenXmlAttribute("xmlns", "am3d", nil); + {self.}XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); + {self.}XmlAttrXmlnsOel := new OpenXmlAttribute("xmlns", "oel", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); + {self.}XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); + {self.}XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); + {self.}XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); + {self.}XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); + {self.}XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); + {self.}XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); end; function Endnotes.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsWpc, - self.XmlAttrXmlnsCx, - self.XmlAttrXmlnsCx1, - self.XmlAttrXmlnsCx2, - self.XmlAttrXmlnsCx3, - self.XmlAttrXmlnsCx4, - self.XmlAttrXmlnsCx5, - self.XmlAttrXmlnsCx6, - self.XmlAttrXmlnsCx7, - self.XmlAttrXmlnsCx8, - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsAink, - self.XmlAttrXmlnsAm3d, - self.XmlAttrXmlnsO, - self.XmlAttrXmlnsOel, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsM, - self.XmlAttrXmlnsV, - self.XmlAttrXmlnsWp14, - self.XmlAttrXmlnsWp, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16sdtdh, - self.XmlAttrXmlnsW16se, - self.XmlAttrXmlnsWpg, - self.XmlAttrXmlnsWpi, - self.XmlAttrXmlnsWne, - self.XmlAttrXmlnsWps, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsWpc, + {self.}XmlAttrXmlnsCx, + {self.}XmlAttrXmlnsCx1, + {self.}XmlAttrXmlnsCx2, + {self.}XmlAttrXmlnsCx3, + {self.}XmlAttrXmlnsCx4, + {self.}XmlAttrXmlnsCx5, + {self.}XmlAttrXmlnsCx6, + {self.}XmlAttrXmlnsCx7, + {self.}XmlAttrXmlnsCx8, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsAink, + {self.}XmlAttrXmlnsAm3d, + {self.}XmlAttrXmlnsO, + {self.}XmlAttrXmlnsOel, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsM, + {self.}XmlAttrXmlnsV, + {self.}XmlAttrXmlnsWp14, + {self.}XmlAttrXmlnsWp, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16sdtdh, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrXmlnsWpg, + {self.}XmlAttrXmlnsWpi, + {self.}XmlAttrXmlnsWne, + {self.}XmlAttrXmlnsWps, + {self.}XmlAttrMcIgnorable, ); end; @@ -256,9 +256,9 @@ end; function Endnotes.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -267,7 +267,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -276,7 +276,7 @@ begin begin obj := nil; case node_name of - pre + "endnote": obj := self.AppendEndnote(); + pre + "endnote": obj := {self.}AppendEndnote(); end; if ifObj(obj) then obj.InitNode(node); end @@ -296,71 +296,71 @@ end; function Endnotes.Copy(_obj: Endnotes);override; begin if not ifnil(_obj.XmlAttrXmlnsWpc.Value) then - self.XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; if not ifnil(_obj.XmlAttrXmlnsCx.Value) then - self.XmlAttrXmlnsCx.Value := _obj.XmlAttrXmlnsCx.Value; + {self.}XmlAttrXmlnsCx.Value := _obj.XmlAttrXmlnsCx.Value; if not ifnil(_obj.XmlAttrXmlnsCx1.Value) then - self.XmlAttrXmlnsCx1.Value := _obj.XmlAttrXmlnsCx1.Value; + {self.}XmlAttrXmlnsCx1.Value := _obj.XmlAttrXmlnsCx1.Value; if not ifnil(_obj.XmlAttrXmlnsCx2.Value) then - self.XmlAttrXmlnsCx2.Value := _obj.XmlAttrXmlnsCx2.Value; + {self.}XmlAttrXmlnsCx2.Value := _obj.XmlAttrXmlnsCx2.Value; if not ifnil(_obj.XmlAttrXmlnsCx3.Value) then - self.XmlAttrXmlnsCx3.Value := _obj.XmlAttrXmlnsCx3.Value; + {self.}XmlAttrXmlnsCx3.Value := _obj.XmlAttrXmlnsCx3.Value; if not ifnil(_obj.XmlAttrXmlnsCx4.Value) then - self.XmlAttrXmlnsCx4.Value := _obj.XmlAttrXmlnsCx4.Value; + {self.}XmlAttrXmlnsCx4.Value := _obj.XmlAttrXmlnsCx4.Value; if not ifnil(_obj.XmlAttrXmlnsCx5.Value) then - self.XmlAttrXmlnsCx5.Value := _obj.XmlAttrXmlnsCx5.Value; + {self.}XmlAttrXmlnsCx5.Value := _obj.XmlAttrXmlnsCx5.Value; if not ifnil(_obj.XmlAttrXmlnsCx6.Value) then - self.XmlAttrXmlnsCx6.Value := _obj.XmlAttrXmlnsCx6.Value; + {self.}XmlAttrXmlnsCx6.Value := _obj.XmlAttrXmlnsCx6.Value; if not ifnil(_obj.XmlAttrXmlnsCx7.Value) then - self.XmlAttrXmlnsCx7.Value := _obj.XmlAttrXmlnsCx7.Value; + {self.}XmlAttrXmlnsCx7.Value := _obj.XmlAttrXmlnsCx7.Value; if not ifnil(_obj.XmlAttrXmlnsCx8.Value) then - self.XmlAttrXmlnsCx8.Value := _obj.XmlAttrXmlnsCx8.Value; + {self.}XmlAttrXmlnsCx8.Value := _obj.XmlAttrXmlnsCx8.Value; if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsAink.Value) then - self.XmlAttrXmlnsAink.Value := _obj.XmlAttrXmlnsAink.Value; + {self.}XmlAttrXmlnsAink.Value := _obj.XmlAttrXmlnsAink.Value; if not ifnil(_obj.XmlAttrXmlnsAm3d.Value) then - self.XmlAttrXmlnsAm3d.Value := _obj.XmlAttrXmlnsAm3d.Value; + {self.}XmlAttrXmlnsAm3d.Value := _obj.XmlAttrXmlnsAm3d.Value; if not ifnil(_obj.XmlAttrXmlnsO.Value) then - self.XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; if not ifnil(_obj.XmlAttrXmlnsOel.Value) then - self.XmlAttrXmlnsOel.Value := _obj.XmlAttrXmlnsOel.Value; + {self.}XmlAttrXmlnsOel.Value := _obj.XmlAttrXmlnsOel.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsM.Value) then - self.XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; if not ifnil(_obj.XmlAttrXmlnsV.Value) then - self.XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; if not ifnil(_obj.XmlAttrXmlnsWp14.Value) then - self.XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; if not ifnil(_obj.XmlAttrXmlnsWp.Value) then - self.XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16sdtdh.Value) then - self.XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrXmlnsWpg.Value) then - self.XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; if not ifnil(_obj.XmlAttrXmlnsWpi.Value) then - self.XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; if not ifnil(_obj.XmlAttrXmlnsWne.Value) then - self.XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; if not ifnil(_obj.XmlAttrXmlnsWps.Value) then - self.XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; end; function Endnotes.AddEndnote(): Endnote; @@ -371,14 +371,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "endnote" then break; end - obj := new Endnote(self, self.Prefix, "endnote"); - self.InsertChild(obj, i+1); + obj := new Endnote(self, {self.}Prefix, "endnote"); + {self.}InsertChild(obj, i+1); return obj; end; function Endnotes.AppendEndnote(): Endnote; begin - obj := new Endnote(self, self.Prefix, "endnote"); + obj := new Endnote(self, {self.}Prefix, "endnote"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -401,330 +401,330 @@ end; function Endnotes.ReadXmlAttrXmlnsWpc(); begin - return self.XmlAttrXmlnsWpc.Value; + return {self.}XmlAttrXmlnsWpc.Value; end; function Endnotes.WriteXmlAttrXmlnsWpc(_value); begin - self.XmlAttrXmlnsWpc.Value := _value; + {self.}XmlAttrXmlnsWpc.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx(); begin - return self.XmlAttrXmlnsCx.Value; + return {self.}XmlAttrXmlnsCx.Value; end; function Endnotes.WriteXmlAttrXmlnsCx(_value); begin - self.XmlAttrXmlnsCx.Value := _value; + {self.}XmlAttrXmlnsCx.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx1(); begin - return self.XmlAttrXmlnsCx1.Value; + return {self.}XmlAttrXmlnsCx1.Value; end; function Endnotes.WriteXmlAttrXmlnsCx1(_value); begin - self.XmlAttrXmlnsCx1.Value := _value; + {self.}XmlAttrXmlnsCx1.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx2(); begin - return self.XmlAttrXmlnsCx2.Value; + return {self.}XmlAttrXmlnsCx2.Value; end; function Endnotes.WriteXmlAttrXmlnsCx2(_value); begin - self.XmlAttrXmlnsCx2.Value := _value; + {self.}XmlAttrXmlnsCx2.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx3(); begin - return self.XmlAttrXmlnsCx3.Value; + return {self.}XmlAttrXmlnsCx3.Value; end; function Endnotes.WriteXmlAttrXmlnsCx3(_value); begin - self.XmlAttrXmlnsCx3.Value := _value; + {self.}XmlAttrXmlnsCx3.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx4(); begin - return self.XmlAttrXmlnsCx4.Value; + return {self.}XmlAttrXmlnsCx4.Value; end; function Endnotes.WriteXmlAttrXmlnsCx4(_value); begin - self.XmlAttrXmlnsCx4.Value := _value; + {self.}XmlAttrXmlnsCx4.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx5(); begin - return self.XmlAttrXmlnsCx5.Value; + return {self.}XmlAttrXmlnsCx5.Value; end; function Endnotes.WriteXmlAttrXmlnsCx5(_value); begin - self.XmlAttrXmlnsCx5.Value := _value; + {self.}XmlAttrXmlnsCx5.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx6(); begin - return self.XmlAttrXmlnsCx6.Value; + return {self.}XmlAttrXmlnsCx6.Value; end; function Endnotes.WriteXmlAttrXmlnsCx6(_value); begin - self.XmlAttrXmlnsCx6.Value := _value; + {self.}XmlAttrXmlnsCx6.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx7(); begin - return self.XmlAttrXmlnsCx7.Value; + return {self.}XmlAttrXmlnsCx7.Value; end; function Endnotes.WriteXmlAttrXmlnsCx7(_value); begin - self.XmlAttrXmlnsCx7.Value := _value; + {self.}XmlAttrXmlnsCx7.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsCx8(); begin - return self.XmlAttrXmlnsCx8.Value; + return {self.}XmlAttrXmlnsCx8.Value; end; function Endnotes.WriteXmlAttrXmlnsCx8(_value); begin - self.XmlAttrXmlnsCx8.Value := _value; + {self.}XmlAttrXmlnsCx8.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Endnotes.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsAink(); begin - return self.XmlAttrXmlnsAink.Value; + return {self.}XmlAttrXmlnsAink.Value; end; function Endnotes.WriteXmlAttrXmlnsAink(_value); begin - self.XmlAttrXmlnsAink.Value := _value; + {self.}XmlAttrXmlnsAink.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsAm3d(); begin - return self.XmlAttrXmlnsAm3d.Value; + return {self.}XmlAttrXmlnsAm3d.Value; end; function Endnotes.WriteXmlAttrXmlnsAm3d(_value); begin - self.XmlAttrXmlnsAm3d.Value := _value; + {self.}XmlAttrXmlnsAm3d.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsO(); begin - return self.XmlAttrXmlnsO.Value; + return {self.}XmlAttrXmlnsO.Value; end; function Endnotes.WriteXmlAttrXmlnsO(_value); begin - self.XmlAttrXmlnsO.Value := _value; + {self.}XmlAttrXmlnsO.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsOel(); begin - return self.XmlAttrXmlnsOel.Value; + return {self.}XmlAttrXmlnsOel.Value; end; function Endnotes.WriteXmlAttrXmlnsOel(_value); begin - self.XmlAttrXmlnsOel.Value := _value; + {self.}XmlAttrXmlnsOel.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Endnotes.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsM(); begin - return self.XmlAttrXmlnsM.Value; + return {self.}XmlAttrXmlnsM.Value; end; function Endnotes.WriteXmlAttrXmlnsM(_value); begin - self.XmlAttrXmlnsM.Value := _value; + {self.}XmlAttrXmlnsM.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsV(); begin - return self.XmlAttrXmlnsV.Value; + return {self.}XmlAttrXmlnsV.Value; end; function Endnotes.WriteXmlAttrXmlnsV(_value); begin - self.XmlAttrXmlnsV.Value := _value; + {self.}XmlAttrXmlnsV.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsWp14(); begin - return self.XmlAttrXmlnsWp14.Value; + return {self.}XmlAttrXmlnsWp14.Value; end; function Endnotes.WriteXmlAttrXmlnsWp14(_value); begin - self.XmlAttrXmlnsWp14.Value := _value; + {self.}XmlAttrXmlnsWp14.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsWp(); begin - return self.XmlAttrXmlnsWp.Value; + return {self.}XmlAttrXmlnsWp.Value; end; function Endnotes.WriteXmlAttrXmlnsWp(_value); begin - self.XmlAttrXmlnsWp.Value := _value; + {self.}XmlAttrXmlnsWp.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Endnotes.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Endnotes.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function Endnotes.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function Endnotes.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function Endnotes.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function Endnotes.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW16sdtdh(); begin - return self.XmlAttrXmlnsW16sdtdh.Value; + return {self.}XmlAttrXmlnsW16sdtdh.Value; end; function Endnotes.WriteXmlAttrXmlnsW16sdtdh(_value); begin - self.XmlAttrXmlnsW16sdtdh.Value := _value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function Endnotes.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsWpg(); begin - return self.XmlAttrXmlnsWpg.Value; + return {self.}XmlAttrXmlnsWpg.Value; end; function Endnotes.WriteXmlAttrXmlnsWpg(_value); begin - self.XmlAttrXmlnsWpg.Value := _value; + {self.}XmlAttrXmlnsWpg.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsWpi(); begin - return self.XmlAttrXmlnsWpi.Value; + return {self.}XmlAttrXmlnsWpi.Value; end; function Endnotes.WriteXmlAttrXmlnsWpi(_value); begin - self.XmlAttrXmlnsWpi.Value := _value; + {self.}XmlAttrXmlnsWpi.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsWne(); begin - return self.XmlAttrXmlnsWne.Value; + return {self.}XmlAttrXmlnsWne.Value; end; function Endnotes.WriteXmlAttrXmlnsWne(_value); begin - self.XmlAttrXmlnsWne.Value := _value; + {self.}XmlAttrXmlnsWne.Value := _value; end; function Endnotes.ReadXmlAttrXmlnsWps(); begin - return self.XmlAttrXmlnsWps.Value; + return {self.}XmlAttrXmlnsWps.Value; end; function Endnotes.WriteXmlAttrXmlnsWps(_value); begin - self.XmlAttrXmlnsWps.Value := _value; + {self.}XmlAttrXmlnsWps.Value := _value; end; function Endnotes.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Endnotes.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/Ext@DOCX.tsf b/autoclass/docx/Ext@DOCX.tsf index 56c1872..1114429 100644 --- a/autoclass/docx/Ext@DOCX.tsf +++ b/autoclass/docx/Ext@DOCX.tsf @@ -29,7 +29,7 @@ end; function Ext.Create();overload; begin - self.Create(nil, "a", "ext"); + {self.}Create(nil, "a", "ext"); end; function Ext.Create(_node: XmlNode);overload; @@ -44,38 +44,38 @@ end; function Ext.Init();override; begin - self.XmlAttrUri := new OpenXmlAttribute(nil, "uri", nil); - self.XmlAttrXmlnsC16 := new OpenXmlAttribute("xmlns", "c16", nil); - self.Thm15ThemeFamily := new ThemeFamily(self, "thm15", "themeFamily"); - self.UniqueId := new PureVal(self, "c16", "uniquedId"); + {self.}XmlAttrUri := new OpenXmlAttribute(nil, "uri", nil); + {self.}XmlAttrXmlnsC16 := new OpenXmlAttribute("xmlns", "c16", nil); + {self.}Thm15ThemeFamily := new ThemeFamily(self, "thm15", "themeFamily"); + {self.}UniqueId := new PureVal(self, "c16", "uniquedId"); end; function Ext.InitAttributes();override; begin attributes_ := array( - self.XmlAttrUri, - self.XmlAttrXmlnsC16, + {self.}XmlAttrUri, + {self.}XmlAttrXmlnsC16, ); end; function Ext.InitChildren();override; begin child_elements_ := array( - 0: self.Thm15ThemeFamily, - 1: self.UniqueId, + 0: {self.}Thm15ThemeFamily, + 1: {self.}UniqueId, ); sorted_child_ := array( "": -1, - self.Thm15ThemeFamily.ElementName: 0, - self.UniqueId.ElementName: 1, + {self.}Thm15ThemeFamily.ElementName: 0, + {self.}UniqueId.ElementName: 1, ); end; function Ext.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -84,7 +84,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -112,29 +112,29 @@ end; function Ext.Copy(_obj: Ext);override; begin if not ifnil(_obj.XmlAttrUri.Value) then - self.XmlAttrUri.Value := _obj.XmlAttrUri.Value; + {self.}XmlAttrUri.Value := _obj.XmlAttrUri.Value; if not ifnil(_obj.XmlAttrXmlnsC16.Value) then - self.XmlAttrXmlnsC16.Value := _obj.XmlAttrXmlnsC16.Value; - self.Thm15ThemeFamily.Copy(_obj.Thm15ThemeFamily); - self.UniqueId.Copy(_obj.UniqueId); + {self.}XmlAttrXmlnsC16.Value := _obj.XmlAttrXmlnsC16.Value; + {self.}Thm15ThemeFamily.Copy(_obj.Thm15ThemeFamily); + {self.}UniqueId.Copy(_obj.UniqueId); end; function Ext.ReadXmlAttrUri(); begin - return self.XmlAttrUri.Value; + return {self.}XmlAttrUri.Value; end; function Ext.WriteXmlAttrUri(_value); begin - self.XmlAttrUri.Value := _value; + {self.}XmlAttrUri.Value := _value; end; function Ext.ReadXmlAttrXmlnsC16(); begin - return self.XmlAttrXmlnsC16.Value; + return {self.}XmlAttrXmlnsC16.Value; end; function Ext.WriteXmlAttrXmlnsC16(_value); begin - self.XmlAttrXmlnsC16.Value := _value; + {self.}XmlAttrXmlnsC16.Value := _value; end; diff --git a/autoclass/docx/ExtLst@DOCX.tsf b/autoclass/docx/ExtLst@DOCX.tsf index d0e61e1..57cc726 100644 --- a/autoclass/docx/ExtLst@DOCX.tsf +++ b/autoclass/docx/ExtLst@DOCX.tsf @@ -23,7 +23,7 @@ end; function ExtLst.Create();overload; begin - self.Create(nil, "a", "extLst"); + {self.}Create(nil, "a", "extLst"); end; function ExtLst.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function ExtLst.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "ext": obj := self.AppendExt(); + pre + "ext": obj := {self.}AppendExt(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "ext" then break; end - obj := new Ext(self, self.Prefix, "ext"); - self.InsertChild(obj, i+1); + obj := new Ext(self, {self.}Prefix, "ext"); + {self.}InsertChild(obj, i+1); return obj; end; function ExtLst.AppendExt(): Ext; begin - obj := new Ext(self, self.Prefix, "ext"); + obj := new Ext(self, {self.}Prefix, "ext"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/ExternalData@DOCX.tsf b/autoclass/docx/ExternalData@DOCX.tsf index 38a0cef..0680420 100644 --- a/autoclass/docx/ExternalData@DOCX.tsf +++ b/autoclass/docx/ExternalData@DOCX.tsf @@ -24,7 +24,7 @@ end; function ExternalData.Create();overload; begin - self.Create(nil, "c", "externalData"); + {self.}Create(nil, "c", "externalData"); end; function ExternalData.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function ExternalData.Init();override; begin - self.XmlAttrId := new OpenXmlAttribute("r", "id", nil); - self.AutoUpdate := new PureVal(self, self.Prefix, "autoUpdate"); + {self.}XmlAttrId := new OpenXmlAttribute("r", "id", nil); + {self.}AutoUpdate := new PureVal(self, {self.}Prefix, "autoUpdate"); end; function ExternalData.InitAttributes();override; begin attributes_ := array( - self.XmlAttrId, + {self.}XmlAttrId, ); end; function ExternalData.InitChildren();override; begin child_elements_ := array( - 0: self.AutoUpdate, + 0: {self.}AutoUpdate, ); sorted_child_ := array( "": -1, - self.AutoUpdate.ElementName: 0, + {self.}AutoUpdate.ElementName: 0, ); end; function ExternalData.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function ExternalData.Copy(_obj: ExternalData);override; begin if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; - self.AutoUpdate.Copy(_obj.AutoUpdate); + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}AutoUpdate.Copy(_obj.AutoUpdate); end; function ExternalData.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function ExternalData.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; diff --git a/autoclass/docx/Fallback@DOCX.tsf b/autoclass/docx/Fallback@DOCX.tsf index b377fd4..95fbe5c 100644 --- a/autoclass/docx/Fallback@DOCX.tsf +++ b/autoclass/docx/Fallback@DOCX.tsf @@ -19,7 +19,7 @@ end; function Fallback.Create();overload; begin - self.Create(nil, "mc", "Fallback"); + {self.}Create(nil, "mc", "Fallback"); end; function Fallback.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function Fallback.Init();override; begin - self.Style := new PureVal(self, "c", "style"); + {self.}Style := new PureVal(self, "c", "style"); end; function Fallback.InitAttributes();override; @@ -46,19 +46,19 @@ end; function Fallback.InitChildren();override; begin child_elements_ := array( - 0: self.Style, + 0: {self.}Style, ); sorted_child_ := array( "": -1, - self.Style.ElementName: 0, + {self.}Style.ElementName: 0, ); end; function Fallback.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function Fallback.Copy(_obj: Fallback);override; begin - self.Style.Copy(_obj.Style); + {self.}Style.Copy(_obj.Style); end; diff --git a/autoclass/docx/FillStyleLst@DOCX.tsf b/autoclass/docx/FillStyleLst@DOCX.tsf index 385441a..082e0b9 100644 --- a/autoclass/docx/FillStyleLst@DOCX.tsf +++ b/autoclass/docx/FillStyleLst@DOCX.tsf @@ -27,7 +27,7 @@ end; function FillStyleLst.Create();overload; begin - self.Create(nil, "a", "fillStyleLst"); + {self.}Create(nil, "a", "fillStyleLst"); end; function FillStyleLst.Create(_node: XmlNode);overload; @@ -62,9 +62,9 @@ end; function FillStyleLst.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -73,7 +73,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -82,8 +82,8 @@ begin begin obj := nil; case node_name of - pre + "solidFill": obj := self.AppendSolidFill(); - pre + "gradFill": obj := self.AppendGradFill(); + pre + "solidFill": obj := {self.}AppendSolidFill(); + pre + "gradFill": obj := {self.}AppendGradFill(); end; if ifObj(obj) then obj.InitNode(node); end @@ -113,8 +113,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "solidFill" then break; end - obj := new SolidFill(self, self.Prefix, "solidFill"); - self.InsertChild(obj, i+1); + obj := new SolidFill(self, {self.}Prefix, "solidFill"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -126,21 +126,21 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "gradFill" then break; end - obj := new GradFill(self, self.Prefix, "gradFill"); - self.InsertChild(obj, i+1); + obj := new GradFill(self, {self.}Prefix, "gradFill"); + {self.}InsertChild(obj, i+1); return obj; end; function FillStyleLst.AppendSolidFill(): SolidFill; begin - obj := new SolidFill(self, self.Prefix, "solidFill"); + obj := new SolidFill(self, {self.}Prefix, "solidFill"); child_elements_[length(child_elements_)] := obj; return obj; end; function FillStyleLst.AppendGradFill(): GradFill; begin - obj := new GradFill(self, self.Prefix, "gradFill"); + obj := new GradFill(self, {self.}Prefix, "gradFill"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/FldChar@DOCX.tsf b/autoclass/docx/FldChar@DOCX.tsf index fcfc13e..d2d197c 100644 --- a/autoclass/docx/FldChar@DOCX.tsf +++ b/autoclass/docx/FldChar@DOCX.tsf @@ -27,7 +27,7 @@ end; function FldChar.Create();overload; begin - self.Create(nil, "w", "fldChar"); + {self.}Create(nil, "w", "fldChar"); end; function FldChar.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function FldChar.Init();override; begin - self.XmlAttrFldCharType := new OpenXmlAttribute(self.Prefix, "fldCharType", nil); - self.XmlAttrDirty := new OpenXmlAttribute(self.Prefix, "dirty", nil); + {self.}XmlAttrFldCharType := new OpenXmlAttribute({self.}Prefix, "fldCharType", nil); + {self.}XmlAttrDirty := new OpenXmlAttribute({self.}Prefix, "dirty", nil); end; function FldChar.InitAttributes();override; begin attributes_ := array( - self.XmlAttrFldCharType, - self.XmlAttrDirty, + {self.}XmlAttrFldCharType, + {self.}XmlAttrDirty, ); end; @@ -65,35 +65,35 @@ end; function FldChar.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function FldChar.Copy(_obj: FldChar);override; begin if not ifnil(_obj.XmlAttrFldCharType.Value) then - self.XmlAttrFldCharType.Value := _obj.XmlAttrFldCharType.Value; + {self.}XmlAttrFldCharType.Value := _obj.XmlAttrFldCharType.Value; if not ifnil(_obj.XmlAttrDirty.Value) then - self.XmlAttrDirty.Value := _obj.XmlAttrDirty.Value; + {self.}XmlAttrDirty.Value := _obj.XmlAttrDirty.Value; end; function FldChar.ReadXmlAttrFldCharType(); begin - return self.XmlAttrFldCharType.Value; + return {self.}XmlAttrFldCharType.Value; end; function FldChar.WriteXmlAttrFldCharType(_value); begin - self.XmlAttrFldCharType.Value := _value; + {self.}XmlAttrFldCharType.Value := _value; end; function FldChar.ReadXmlAttrDirty(); begin - return self.XmlAttrDirty.Value; + return {self.}XmlAttrDirty.Value; end; function FldChar.WriteXmlAttrDirty(_value); begin - self.XmlAttrDirty.Value := _value; + {self.}XmlAttrDirty.Value := _value; end; diff --git a/autoclass/docx/FmtScheme@DOCX.tsf b/autoclass/docx/FmtScheme@DOCX.tsf index 6fb313f..2959534 100644 --- a/autoclass/docx/FmtScheme@DOCX.tsf +++ b/autoclass/docx/FmtScheme@DOCX.tsf @@ -27,7 +27,7 @@ end; function FmtScheme.Create();overload; begin - self.Create(nil, "a", "fmtScheme"); + {self.}Create(nil, "a", "fmtScheme"); end; function FmtScheme.Create(_node: XmlNode);overload; @@ -42,42 +42,42 @@ end; function FmtScheme.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(nil, "name", nil); - self.FillStyleLst := new FillStyleLst(self, self.Prefix, "fillStyleLst"); - self.LnStyleLst := new LnStyleLst(self, self.Prefix, "lnStyleLst"); - self.EffectStyleLst := new EffectStyleLst(self, self.Prefix, "effectStyleLst"); - self.BgFillStyleLst := new FillStyleLst(self, self.Prefix, "bgFillStyleLst"); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil); + {self.}FillStyleLst := new FillStyleLst(self, {self.}Prefix, "fillStyleLst"); + {self.}LnStyleLst := new LnStyleLst(self, {self.}Prefix, "lnStyleLst"); + {self.}EffectStyleLst := new EffectStyleLst(self, {self.}Prefix, "effectStyleLst"); + {self.}BgFillStyleLst := new FillStyleLst(self, {self.}Prefix, "bgFillStyleLst"); end; function FmtScheme.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, + {self.}XmlAttrName, ); end; function FmtScheme.InitChildren();override; begin child_elements_ := array( - 0: self.FillStyleLst, - 1: self.LnStyleLst, - 2: self.EffectStyleLst, - 3: self.BgFillStyleLst, + 0: {self.}FillStyleLst, + 1: {self.}LnStyleLst, + 2: {self.}EffectStyleLst, + 3: {self.}BgFillStyleLst, ); sorted_child_ := array( "": -1, - self.FillStyleLst.ElementName: 0, - self.LnStyleLst.ElementName: 1, - self.EffectStyleLst.ElementName: 2, - self.BgFillStyleLst.ElementName: 3, + {self.}FillStyleLst.ElementName: 0, + {self.}LnStyleLst.ElementName: 1, + {self.}EffectStyleLst.ElementName: 2, + {self.}BgFillStyleLst.ElementName: 3, ); end; function FmtScheme.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -86,7 +86,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -114,19 +114,19 @@ end; function FmtScheme.Copy(_obj: FmtScheme);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; - self.FillStyleLst.Copy(_obj.FillStyleLst); - self.LnStyleLst.Copy(_obj.LnStyleLst); - self.EffectStyleLst.Copy(_obj.EffectStyleLst); - self.BgFillStyleLst.Copy(_obj.BgFillStyleLst); + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}FillStyleLst.Copy(_obj.FillStyleLst); + {self.}LnStyleLst.Copy(_obj.LnStyleLst); + {self.}EffectStyleLst.Copy(_obj.EffectStyleLst); + {self.}BgFillStyleLst.Copy(_obj.BgFillStyleLst); end; function FmtScheme.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function FmtScheme.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; diff --git a/autoclass/docx/Font@DOCX.tsf b/autoclass/docx/Font@DOCX.tsf index d772386..8dfe7f8 100644 --- a/autoclass/docx/Font@DOCX.tsf +++ b/autoclass/docx/Font@DOCX.tsf @@ -29,7 +29,7 @@ end; function Font.Create();overload; begin - self.Create(nil, "w", "font"); + {self.}Create(nil, "w", "font"); end; function Font.Create(_node: XmlNode);overload; @@ -44,48 +44,48 @@ end; function Font.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(self.Prefix, "name", nil); - self.AltName := new PureWVal(self, self.Prefix, "altName"); - self.Panosel := new PureWVal(self, self.Prefix, "panosel"); - self.Charset := new PureWVal(self, self.Prefix, "charset"); - self.Family := new PureWVal(self, self.Prefix, "family"); - self.Pitch := new PureWVal(self, self.Prefix, "pitch"); - self.Sig := new Sig(self, self.Prefix, "sig"); + {self.}XmlAttrName := new OpenXmlAttribute({self.}Prefix, "name", nil); + {self.}AltName := new PureWVal(self, {self.}Prefix, "altName"); + {self.}Panosel := new PureWVal(self, {self.}Prefix, "panosel"); + {self.}Charset := new PureWVal(self, {self.}Prefix, "charset"); + {self.}Family := new PureWVal(self, {self.}Prefix, "family"); + {self.}Pitch := new PureWVal(self, {self.}Prefix, "pitch"); + {self.}Sig := new Sig(self, {self.}Prefix, "sig"); end; function Font.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, + {self.}XmlAttrName, ); end; function Font.InitChildren();override; begin child_elements_ := array( - 0: self.AltName, - 1: self.Panosel, - 2: self.Charset, - 3: self.Family, - 4: self.Pitch, - 5: self.Sig, + 0: {self.}AltName, + 1: {self.}Panosel, + 2: {self.}Charset, + 3: {self.}Family, + 4: {self.}Pitch, + 5: {self.}Sig, ); sorted_child_ := array( "": -1, - self.AltName.ElementName: 0, - self.Panosel.ElementName: 1, - self.Charset.ElementName: 2, - self.Family.ElementName: 3, - self.Pitch.ElementName: 4, - self.Sig.ElementName: 5, + {self.}AltName.ElementName: 0, + {self.}Panosel.ElementName: 1, + {self.}Charset.ElementName: 2, + {self.}Family.ElementName: 3, + {self.}Pitch.ElementName: 4, + {self.}Sig.ElementName: 5, ); end; function Font.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -94,7 +94,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -122,21 +122,21 @@ end; function Font.Copy(_obj: Font);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; - self.AltName.Copy(_obj.AltName); - self.Panosel.Copy(_obj.Panosel); - self.Charset.Copy(_obj.Charset); - self.Family.Copy(_obj.Family); - self.Pitch.Copy(_obj.Pitch); - self.Sig.Copy(_obj.Sig); + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}AltName.Copy(_obj.AltName); + {self.}Panosel.Copy(_obj.Panosel); + {self.}Charset.Copy(_obj.Charset); + {self.}Family.Copy(_obj.Family); + {self.}Pitch.Copy(_obj.Pitch); + {self.}Sig.Copy(_obj.Sig); end; function Font.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function Font.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; diff --git a/autoclass/docx/FontScheme@DOCX.tsf b/autoclass/docx/FontScheme@DOCX.tsf index af6f832..1683976 100644 --- a/autoclass/docx/FontScheme@DOCX.tsf +++ b/autoclass/docx/FontScheme@DOCX.tsf @@ -25,7 +25,7 @@ end; function FontScheme.Create();overload; begin - self.Create(nil, "a", "fontScheme"); + {self.}Create(nil, "a", "fontScheme"); end; function FontScheme.Create(_node: XmlNode);overload; @@ -40,36 +40,36 @@ end; function FontScheme.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(nil, "name", nil); - self.Majorfont := new Mfont(self, self.Prefix, "majorFont"); - self.Minorfont := new Mfont(self, self.Prefix, "minorFont"); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil); + {self.}Majorfont := new Mfont(self, {self.}Prefix, "majorFont"); + {self.}Minorfont := new Mfont(self, {self.}Prefix, "minorFont"); end; function FontScheme.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, + {self.}XmlAttrName, ); end; function FontScheme.InitChildren();override; begin child_elements_ := array( - 0: self.Majorfont, - 1: self.Minorfont, + 0: {self.}Majorfont, + 1: {self.}Minorfont, ); sorted_child_ := array( "": -1, - self.Majorfont.ElementName: 0, - self.Minorfont.ElementName: 1, + {self.}Majorfont.ElementName: 0, + {self.}Minorfont.ElementName: 1, ); end; function FontScheme.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -78,7 +78,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,17 +106,17 @@ end; function FontScheme.Copy(_obj: FontScheme);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; - self.Majorfont.Copy(_obj.Majorfont); - self.Minorfont.Copy(_obj.Minorfont); + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}Majorfont.Copy(_obj.Majorfont); + {self.}Minorfont.Copy(_obj.Minorfont); end; function FontScheme.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function FontScheme.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; diff --git a/autoclass/docx/Fonts@DOCX.tsf b/autoclass/docx/Fonts@DOCX.tsf index b33a860..ff3b239 100644 --- a/autoclass/docx/Fonts@DOCX.tsf +++ b/autoclass/docx/Fonts@DOCX.tsf @@ -72,7 +72,7 @@ end; function Fonts.Create();overload; begin - self.Create(nil, "w", "fonts"); + {self.}Create(nil, "w", "fonts"); end; function Fonts.Create(_node: XmlNode);overload; @@ -87,35 +87,35 @@ end; function Fonts.Init();override; begin - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); end; function Fonts.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16sdtdh, - self.XmlAttrXmlnsW16se, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16sdtdh, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrMcIgnorable, ); end; @@ -130,9 +130,9 @@ end; function Fonts.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -141,7 +141,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -150,7 +150,7 @@ begin begin obj := nil; case node_name of - pre + "font": obj := self.AppendFont(); + pre + "font": obj := {self.}AppendFont(); end; if ifObj(obj) then obj.InitNode(node); end @@ -170,29 +170,29 @@ end; function Fonts.Copy(_obj: Fonts);override; begin if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16sdtdh.Value) then - self.XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; end; function Fonts.AddFont(): Font; @@ -203,14 +203,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "font" then break; end - obj := new Font(self, self.Prefix, "font"); - self.InsertChild(obj, i+1); + obj := new Font(self, {self.}Prefix, "font"); + {self.}InsertChild(obj, i+1); return obj; end; function Fonts.AppendFont(): Font; begin - obj := new Font(self, self.Prefix, "font"); + obj := new Font(self, {self.}Prefix, "font"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -233,120 +233,120 @@ end; function Fonts.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Fonts.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Fonts.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Fonts.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function Fonts.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Fonts.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Fonts.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function Fonts.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function Fonts.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function Fonts.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function Fonts.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW16sdtdh(); begin - return self.XmlAttrXmlnsW16sdtdh.Value; + return {self.}XmlAttrXmlnsW16sdtdh.Value; end; function Fonts.WriteXmlAttrXmlnsW16sdtdh(_value); begin - self.XmlAttrXmlnsW16sdtdh.Value := _value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _value; end; function Fonts.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function Fonts.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function Fonts.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Fonts.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/Footnote@DOCX.tsf b/autoclass/docx/Footnote@DOCX.tsf index 2c6cc03..f6a6285 100644 --- a/autoclass/docx/Footnote@DOCX.tsf +++ b/autoclass/docx/Footnote@DOCX.tsf @@ -32,7 +32,7 @@ end; function Footnote.Create();overload; begin - self.Create(nil, "w", "footnote"); + {self.}Create(nil, "w", "footnote"); end; function Footnote.Create(_node: XmlNode);overload; @@ -47,15 +47,15 @@ end; function Footnote.Init();override; begin - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); - self.XmlAttrId := new OpenXmlAttribute(self.Prefix, "id", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); end; function Footnote.InitAttributes();override; begin attributes_ := array( - self.XmlAttrType, - self.XmlAttrId, + {self.}XmlAttrType, + {self.}XmlAttrId, ); end; @@ -70,9 +70,9 @@ end; function Footnote.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -81,7 +81,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -90,7 +90,7 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); + pre + "p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -110,9 +110,9 @@ end; function Footnote.Copy(_obj: Footnote);override; begin if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; end; function Footnote.AddP(): P; @@ -123,14 +123,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; function Footnote.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -153,20 +153,20 @@ end; function Footnote.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function Footnote.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; function Footnote.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function Footnote.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; diff --git a/autoclass/docx/FootnotePr@DOCX.tsf b/autoclass/docx/FootnotePr@DOCX.tsf index 4b9f812..2f3b451 100644 --- a/autoclass/docx/FootnotePr@DOCX.tsf +++ b/autoclass/docx/FootnotePr@DOCX.tsf @@ -23,7 +23,7 @@ end; function FootnotePr.Create();overload; begin - self.Create(nil, "w", "footnotePr"); + {self.}Create(nil, "w", "footnotePr"); end; function FootnotePr.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function FootnotePr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "footnote": obj := self.AppendFootnote(); + pre + "footnote": obj := {self.}AppendFootnote(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "footnote" then break; end - obj := new Footnote(self, self.Prefix, "footnote"); - self.InsertChild(obj, i+1); + obj := new Footnote(self, {self.}Prefix, "footnote"); + {self.}InsertChild(obj, i+1); return obj; end; function FootnotePr.AppendFootnote(): Footnote; begin - obj := new Footnote(self, self.Prefix, "footnote"); + obj := new Footnote(self, {self.}Prefix, "footnote"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Footnotes@DOCX.tsf b/autoclass/docx/Footnotes@DOCX.tsf index 25baa3c..0acd1f7 100644 --- a/autoclass/docx/Footnotes@DOCX.tsf +++ b/autoclass/docx/Footnotes@DOCX.tsf @@ -156,7 +156,7 @@ end; function Footnotes.Create();overload; begin - self.Create(nil, "w", "footnotes"); + {self.}Create(nil, "w", "footnotes"); end; function Footnotes.Create(_node: XmlNode);overload; @@ -171,77 +171,77 @@ end; function Footnotes.Init();override; begin - self.XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); - self.XmlAttrXmlnsCx := new OpenXmlAttribute("xmlns", "cx", nil); - self.XmlAttrXmlnsCx1 := new OpenXmlAttribute("xmlns", "cx1", nil); - self.XmlAttrXmlnsCx2 := new OpenXmlAttribute("xmlns", "cx2", nil); - self.XmlAttrXmlnsCx3 := new OpenXmlAttribute("xmlns", "cx3", nil); - self.XmlAttrXmlnsCx4 := new OpenXmlAttribute("xmlns", "cx4", nil); - self.XmlAttrXmlnsCx5 := new OpenXmlAttribute("xmlns", "cx5", nil); - self.XmlAttrXmlnsCx6 := new OpenXmlAttribute("xmlns", "cx6", nil); - self.XmlAttrXmlnsCx7 := new OpenXmlAttribute("xmlns", "cx7", nil); - self.XmlAttrXmlnsCx8 := new OpenXmlAttribute("xmlns", "cx8", nil); - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsAink := new OpenXmlAttribute("xmlns", "aink", nil); - self.XmlAttrXmlnsAm3d := new OpenXmlAttribute("xmlns", "am3d", nil); - self.XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); - self.XmlAttrXmlnsOel := new OpenXmlAttribute("xmlns", "oel", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); - self.XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); - self.XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); - self.XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); - self.XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); - self.XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); - self.XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); + {self.}XmlAttrXmlnsCx := new OpenXmlAttribute("xmlns", "cx", nil); + {self.}XmlAttrXmlnsCx1 := new OpenXmlAttribute("xmlns", "cx1", nil); + {self.}XmlAttrXmlnsCx2 := new OpenXmlAttribute("xmlns", "cx2", nil); + {self.}XmlAttrXmlnsCx3 := new OpenXmlAttribute("xmlns", "cx3", nil); + {self.}XmlAttrXmlnsCx4 := new OpenXmlAttribute("xmlns", "cx4", nil); + {self.}XmlAttrXmlnsCx5 := new OpenXmlAttribute("xmlns", "cx5", nil); + {self.}XmlAttrXmlnsCx6 := new OpenXmlAttribute("xmlns", "cx6", nil); + {self.}XmlAttrXmlnsCx7 := new OpenXmlAttribute("xmlns", "cx7", nil); + {self.}XmlAttrXmlnsCx8 := new OpenXmlAttribute("xmlns", "cx8", nil); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsAink := new OpenXmlAttribute("xmlns", "aink", nil); + {self.}XmlAttrXmlnsAm3d := new OpenXmlAttribute("xmlns", "am3d", nil); + {self.}XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); + {self.}XmlAttrXmlnsOel := new OpenXmlAttribute("xmlns", "oel", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); + {self.}XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); + {self.}XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); + {self.}XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); + {self.}XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); + {self.}XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); + {self.}XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); end; function Footnotes.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsWpc, - self.XmlAttrXmlnsCx, - self.XmlAttrXmlnsCx1, - self.XmlAttrXmlnsCx2, - self.XmlAttrXmlnsCx3, - self.XmlAttrXmlnsCx4, - self.XmlAttrXmlnsCx5, - self.XmlAttrXmlnsCx6, - self.XmlAttrXmlnsCx7, - self.XmlAttrXmlnsCx8, - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsAink, - self.XmlAttrXmlnsAm3d, - self.XmlAttrXmlnsO, - self.XmlAttrXmlnsOel, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsM, - self.XmlAttrXmlnsV, - self.XmlAttrXmlnsWp14, - self.XmlAttrXmlnsWp, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16sdtdh, - self.XmlAttrXmlnsW16se, - self.XmlAttrXmlnsWpg, - self.XmlAttrXmlnsWpi, - self.XmlAttrXmlnsWne, - self.XmlAttrXmlnsWps, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsWpc, + {self.}XmlAttrXmlnsCx, + {self.}XmlAttrXmlnsCx1, + {self.}XmlAttrXmlnsCx2, + {self.}XmlAttrXmlnsCx3, + {self.}XmlAttrXmlnsCx4, + {self.}XmlAttrXmlnsCx5, + {self.}XmlAttrXmlnsCx6, + {self.}XmlAttrXmlnsCx7, + {self.}XmlAttrXmlnsCx8, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsAink, + {self.}XmlAttrXmlnsAm3d, + {self.}XmlAttrXmlnsO, + {self.}XmlAttrXmlnsOel, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsM, + {self.}XmlAttrXmlnsV, + {self.}XmlAttrXmlnsWp14, + {self.}XmlAttrXmlnsWp, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16sdtdh, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrXmlnsWpg, + {self.}XmlAttrXmlnsWpi, + {self.}XmlAttrXmlnsWne, + {self.}XmlAttrXmlnsWps, + {self.}XmlAttrMcIgnorable, ); end; @@ -256,9 +256,9 @@ end; function Footnotes.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -267,7 +267,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -276,7 +276,7 @@ begin begin obj := nil; case node_name of - pre + "footnote": obj := self.AppendFootnote(); + pre + "footnote": obj := {self.}AppendFootnote(); end; if ifObj(obj) then obj.InitNode(node); end @@ -296,71 +296,71 @@ end; function Footnotes.Copy(_obj: Footnotes);override; begin if not ifnil(_obj.XmlAttrXmlnsWpc.Value) then - self.XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; if not ifnil(_obj.XmlAttrXmlnsCx.Value) then - self.XmlAttrXmlnsCx.Value := _obj.XmlAttrXmlnsCx.Value; + {self.}XmlAttrXmlnsCx.Value := _obj.XmlAttrXmlnsCx.Value; if not ifnil(_obj.XmlAttrXmlnsCx1.Value) then - self.XmlAttrXmlnsCx1.Value := _obj.XmlAttrXmlnsCx1.Value; + {self.}XmlAttrXmlnsCx1.Value := _obj.XmlAttrXmlnsCx1.Value; if not ifnil(_obj.XmlAttrXmlnsCx2.Value) then - self.XmlAttrXmlnsCx2.Value := _obj.XmlAttrXmlnsCx2.Value; + {self.}XmlAttrXmlnsCx2.Value := _obj.XmlAttrXmlnsCx2.Value; if not ifnil(_obj.XmlAttrXmlnsCx3.Value) then - self.XmlAttrXmlnsCx3.Value := _obj.XmlAttrXmlnsCx3.Value; + {self.}XmlAttrXmlnsCx3.Value := _obj.XmlAttrXmlnsCx3.Value; if not ifnil(_obj.XmlAttrXmlnsCx4.Value) then - self.XmlAttrXmlnsCx4.Value := _obj.XmlAttrXmlnsCx4.Value; + {self.}XmlAttrXmlnsCx4.Value := _obj.XmlAttrXmlnsCx4.Value; if not ifnil(_obj.XmlAttrXmlnsCx5.Value) then - self.XmlAttrXmlnsCx5.Value := _obj.XmlAttrXmlnsCx5.Value; + {self.}XmlAttrXmlnsCx5.Value := _obj.XmlAttrXmlnsCx5.Value; if not ifnil(_obj.XmlAttrXmlnsCx6.Value) then - self.XmlAttrXmlnsCx6.Value := _obj.XmlAttrXmlnsCx6.Value; + {self.}XmlAttrXmlnsCx6.Value := _obj.XmlAttrXmlnsCx6.Value; if not ifnil(_obj.XmlAttrXmlnsCx7.Value) then - self.XmlAttrXmlnsCx7.Value := _obj.XmlAttrXmlnsCx7.Value; + {self.}XmlAttrXmlnsCx7.Value := _obj.XmlAttrXmlnsCx7.Value; if not ifnil(_obj.XmlAttrXmlnsCx8.Value) then - self.XmlAttrXmlnsCx8.Value := _obj.XmlAttrXmlnsCx8.Value; + {self.}XmlAttrXmlnsCx8.Value := _obj.XmlAttrXmlnsCx8.Value; if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsAink.Value) then - self.XmlAttrXmlnsAink.Value := _obj.XmlAttrXmlnsAink.Value; + {self.}XmlAttrXmlnsAink.Value := _obj.XmlAttrXmlnsAink.Value; if not ifnil(_obj.XmlAttrXmlnsAm3d.Value) then - self.XmlAttrXmlnsAm3d.Value := _obj.XmlAttrXmlnsAm3d.Value; + {self.}XmlAttrXmlnsAm3d.Value := _obj.XmlAttrXmlnsAm3d.Value; if not ifnil(_obj.XmlAttrXmlnsO.Value) then - self.XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; if not ifnil(_obj.XmlAttrXmlnsOel.Value) then - self.XmlAttrXmlnsOel.Value := _obj.XmlAttrXmlnsOel.Value; + {self.}XmlAttrXmlnsOel.Value := _obj.XmlAttrXmlnsOel.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsM.Value) then - self.XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; if not ifnil(_obj.XmlAttrXmlnsV.Value) then - self.XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; if not ifnil(_obj.XmlAttrXmlnsWp14.Value) then - self.XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; if not ifnil(_obj.XmlAttrXmlnsWp.Value) then - self.XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16sdtdh.Value) then - self.XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrXmlnsWpg.Value) then - self.XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; if not ifnil(_obj.XmlAttrXmlnsWpi.Value) then - self.XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; if not ifnil(_obj.XmlAttrXmlnsWne.Value) then - self.XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; if not ifnil(_obj.XmlAttrXmlnsWps.Value) then - self.XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; end; function Footnotes.AddFootnote(): Footnote; @@ -371,14 +371,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "footnote" then break; end - obj := new Footnote(self, self.Prefix, "footnote"); - self.InsertChild(obj, i+1); + obj := new Footnote(self, {self.}Prefix, "footnote"); + {self.}InsertChild(obj, i+1); return obj; end; function Footnotes.AppendFootnote(): Footnote; begin - obj := new Footnote(self, self.Prefix, "footnote"); + obj := new Footnote(self, {self.}Prefix, "footnote"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -401,330 +401,330 @@ end; function Footnotes.ReadXmlAttrXmlnsWpc(); begin - return self.XmlAttrXmlnsWpc.Value; + return {self.}XmlAttrXmlnsWpc.Value; end; function Footnotes.WriteXmlAttrXmlnsWpc(_value); begin - self.XmlAttrXmlnsWpc.Value := _value; + {self.}XmlAttrXmlnsWpc.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx(); begin - return self.XmlAttrXmlnsCx.Value; + return {self.}XmlAttrXmlnsCx.Value; end; function Footnotes.WriteXmlAttrXmlnsCx(_value); begin - self.XmlAttrXmlnsCx.Value := _value; + {self.}XmlAttrXmlnsCx.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx1(); begin - return self.XmlAttrXmlnsCx1.Value; + return {self.}XmlAttrXmlnsCx1.Value; end; function Footnotes.WriteXmlAttrXmlnsCx1(_value); begin - self.XmlAttrXmlnsCx1.Value := _value; + {self.}XmlAttrXmlnsCx1.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx2(); begin - return self.XmlAttrXmlnsCx2.Value; + return {self.}XmlAttrXmlnsCx2.Value; end; function Footnotes.WriteXmlAttrXmlnsCx2(_value); begin - self.XmlAttrXmlnsCx2.Value := _value; + {self.}XmlAttrXmlnsCx2.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx3(); begin - return self.XmlAttrXmlnsCx3.Value; + return {self.}XmlAttrXmlnsCx3.Value; end; function Footnotes.WriteXmlAttrXmlnsCx3(_value); begin - self.XmlAttrXmlnsCx3.Value := _value; + {self.}XmlAttrXmlnsCx3.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx4(); begin - return self.XmlAttrXmlnsCx4.Value; + return {self.}XmlAttrXmlnsCx4.Value; end; function Footnotes.WriteXmlAttrXmlnsCx4(_value); begin - self.XmlAttrXmlnsCx4.Value := _value; + {self.}XmlAttrXmlnsCx4.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx5(); begin - return self.XmlAttrXmlnsCx5.Value; + return {self.}XmlAttrXmlnsCx5.Value; end; function Footnotes.WriteXmlAttrXmlnsCx5(_value); begin - self.XmlAttrXmlnsCx5.Value := _value; + {self.}XmlAttrXmlnsCx5.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx6(); begin - return self.XmlAttrXmlnsCx6.Value; + return {self.}XmlAttrXmlnsCx6.Value; end; function Footnotes.WriteXmlAttrXmlnsCx6(_value); begin - self.XmlAttrXmlnsCx6.Value := _value; + {self.}XmlAttrXmlnsCx6.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx7(); begin - return self.XmlAttrXmlnsCx7.Value; + return {self.}XmlAttrXmlnsCx7.Value; end; function Footnotes.WriteXmlAttrXmlnsCx7(_value); begin - self.XmlAttrXmlnsCx7.Value := _value; + {self.}XmlAttrXmlnsCx7.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsCx8(); begin - return self.XmlAttrXmlnsCx8.Value; + return {self.}XmlAttrXmlnsCx8.Value; end; function Footnotes.WriteXmlAttrXmlnsCx8(_value); begin - self.XmlAttrXmlnsCx8.Value := _value; + {self.}XmlAttrXmlnsCx8.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Footnotes.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsAink(); begin - return self.XmlAttrXmlnsAink.Value; + return {self.}XmlAttrXmlnsAink.Value; end; function Footnotes.WriteXmlAttrXmlnsAink(_value); begin - self.XmlAttrXmlnsAink.Value := _value; + {self.}XmlAttrXmlnsAink.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsAm3d(); begin - return self.XmlAttrXmlnsAm3d.Value; + return {self.}XmlAttrXmlnsAm3d.Value; end; function Footnotes.WriteXmlAttrXmlnsAm3d(_value); begin - self.XmlAttrXmlnsAm3d.Value := _value; + {self.}XmlAttrXmlnsAm3d.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsO(); begin - return self.XmlAttrXmlnsO.Value; + return {self.}XmlAttrXmlnsO.Value; end; function Footnotes.WriteXmlAttrXmlnsO(_value); begin - self.XmlAttrXmlnsO.Value := _value; + {self.}XmlAttrXmlnsO.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsOel(); begin - return self.XmlAttrXmlnsOel.Value; + return {self.}XmlAttrXmlnsOel.Value; end; function Footnotes.WriteXmlAttrXmlnsOel(_value); begin - self.XmlAttrXmlnsOel.Value := _value; + {self.}XmlAttrXmlnsOel.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Footnotes.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsM(); begin - return self.XmlAttrXmlnsM.Value; + return {self.}XmlAttrXmlnsM.Value; end; function Footnotes.WriteXmlAttrXmlnsM(_value); begin - self.XmlAttrXmlnsM.Value := _value; + {self.}XmlAttrXmlnsM.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsV(); begin - return self.XmlAttrXmlnsV.Value; + return {self.}XmlAttrXmlnsV.Value; end; function Footnotes.WriteXmlAttrXmlnsV(_value); begin - self.XmlAttrXmlnsV.Value := _value; + {self.}XmlAttrXmlnsV.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsWp14(); begin - return self.XmlAttrXmlnsWp14.Value; + return {self.}XmlAttrXmlnsWp14.Value; end; function Footnotes.WriteXmlAttrXmlnsWp14(_value); begin - self.XmlAttrXmlnsWp14.Value := _value; + {self.}XmlAttrXmlnsWp14.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsWp(); begin - return self.XmlAttrXmlnsWp.Value; + return {self.}XmlAttrXmlnsWp.Value; end; function Footnotes.WriteXmlAttrXmlnsWp(_value); begin - self.XmlAttrXmlnsWp.Value := _value; + {self.}XmlAttrXmlnsWp.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Footnotes.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Footnotes.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function Footnotes.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function Footnotes.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function Footnotes.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function Footnotes.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW16sdtdh(); begin - return self.XmlAttrXmlnsW16sdtdh.Value; + return {self.}XmlAttrXmlnsW16sdtdh.Value; end; function Footnotes.WriteXmlAttrXmlnsW16sdtdh(_value); begin - self.XmlAttrXmlnsW16sdtdh.Value := _value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function Footnotes.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsWpg(); begin - return self.XmlAttrXmlnsWpg.Value; + return {self.}XmlAttrXmlnsWpg.Value; end; function Footnotes.WriteXmlAttrXmlnsWpg(_value); begin - self.XmlAttrXmlnsWpg.Value := _value; + {self.}XmlAttrXmlnsWpg.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsWpi(); begin - return self.XmlAttrXmlnsWpi.Value; + return {self.}XmlAttrXmlnsWpi.Value; end; function Footnotes.WriteXmlAttrXmlnsWpi(_value); begin - self.XmlAttrXmlnsWpi.Value := _value; + {self.}XmlAttrXmlnsWpi.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsWne(); begin - return self.XmlAttrXmlnsWne.Value; + return {self.}XmlAttrXmlnsWne.Value; end; function Footnotes.WriteXmlAttrXmlnsWne(_value); begin - self.XmlAttrXmlnsWne.Value := _value; + {self.}XmlAttrXmlnsWne.Value := _value; end; function Footnotes.ReadXmlAttrXmlnsWps(); begin - return self.XmlAttrXmlnsWps.Value; + return {self.}XmlAttrXmlnsWps.Value; end; function Footnotes.WriteXmlAttrXmlnsWps(_value); begin - self.XmlAttrXmlnsWps.Value := _value; + {self.}XmlAttrXmlnsWps.Value := _value; end; function Footnotes.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Footnotes.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/Ftr@DOCX.tsf b/autoclass/docx/Ftr@DOCX.tsf index b136603..908c06c 100644 --- a/autoclass/docx/Ftr@DOCX.tsf +++ b/autoclass/docx/Ftr@DOCX.tsf @@ -84,7 +84,7 @@ end; function Ftr.Create();overload; begin - self.Create(nil, "w", "ftr"); + {self.}Create(nil, "w", "ftr"); end; function Ftr.Create(_node: XmlNode);overload; @@ -99,41 +99,41 @@ end; function Ftr.Init();override; begin - self.XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsMo := new OpenXmlAttribute("xmlns", "mo", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); - self.XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); - self.XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); - self.XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); - self.XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); - self.XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); - self.XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsMo := new OpenXmlAttribute("xmlns", "mo", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); + {self.}XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); + {self.}XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); + {self.}XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); + {self.}XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); + {self.}XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); + {self.}XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); end; function Ftr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsM, - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsMo, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsV, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsWne, - self.XmlAttrXmlnsWp14, - self.XmlAttrXmlnsWp, - self.XmlAttrXmlnsWpc, - self.XmlAttrXmlnsWpg, - self.XmlAttrXmlnsWpi, - self.XmlAttrXmlnsWps, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsM, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsMo, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsV, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsWne, + {self.}XmlAttrXmlnsWp14, + {self.}XmlAttrXmlnsWp, + {self.}XmlAttrXmlnsWpc, + {self.}XmlAttrXmlnsWpg, + {self.}XmlAttrXmlnsWpi, + {self.}XmlAttrXmlnsWps, + {self.}XmlAttrMcIgnorable, ); end; @@ -148,9 +148,9 @@ end; function Ftr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -159,7 +159,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -168,7 +168,7 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); + pre + "p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -188,35 +188,35 @@ end; function Ftr.Copy(_obj: Ftr);override; begin if not ifnil(_obj.XmlAttrXmlnsM.Value) then - self.XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsMo.Value) then - self.XmlAttrXmlnsMo.Value := _obj.XmlAttrXmlnsMo.Value; + {self.}XmlAttrXmlnsMo.Value := _obj.XmlAttrXmlnsMo.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsV.Value) then - self.XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsWne.Value) then - self.XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; if not ifnil(_obj.XmlAttrXmlnsWp14.Value) then - self.XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; if not ifnil(_obj.XmlAttrXmlnsWp.Value) then - self.XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; if not ifnil(_obj.XmlAttrXmlnsWpc.Value) then - self.XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; if not ifnil(_obj.XmlAttrXmlnsWpg.Value) then - self.XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; if not ifnil(_obj.XmlAttrXmlnsWpi.Value) then - self.XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; if not ifnil(_obj.XmlAttrXmlnsWps.Value) then - self.XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; end; function Ftr.AddP(): P; @@ -227,14 +227,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; function Ftr.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -257,150 +257,150 @@ end; function Ftr.ReadXmlAttrXmlnsM(); begin - return self.XmlAttrXmlnsM.Value; + return {self.}XmlAttrXmlnsM.Value; end; function Ftr.WriteXmlAttrXmlnsM(_value); begin - self.XmlAttrXmlnsM.Value := _value; + {self.}XmlAttrXmlnsM.Value := _value; end; function Ftr.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Ftr.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Ftr.ReadXmlAttrXmlnsMo(); begin - return self.XmlAttrXmlnsMo.Value; + return {self.}XmlAttrXmlnsMo.Value; end; function Ftr.WriteXmlAttrXmlnsMo(_value); begin - self.XmlAttrXmlnsMo.Value := _value; + {self.}XmlAttrXmlnsMo.Value := _value; end; function Ftr.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Ftr.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Ftr.ReadXmlAttrXmlnsV(); begin - return self.XmlAttrXmlnsV.Value; + return {self.}XmlAttrXmlnsV.Value; end; function Ftr.WriteXmlAttrXmlnsV(_value); begin - self.XmlAttrXmlnsV.Value := _value; + {self.}XmlAttrXmlnsV.Value := _value; end; function Ftr.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Ftr.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Ftr.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function Ftr.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function Ftr.ReadXmlAttrXmlnsWne(); begin - return self.XmlAttrXmlnsWne.Value; + return {self.}XmlAttrXmlnsWne.Value; end; function Ftr.WriteXmlAttrXmlnsWne(_value); begin - self.XmlAttrXmlnsWne.Value := _value; + {self.}XmlAttrXmlnsWne.Value := _value; end; function Ftr.ReadXmlAttrXmlnsWp14(); begin - return self.XmlAttrXmlnsWp14.Value; + return {self.}XmlAttrXmlnsWp14.Value; end; function Ftr.WriteXmlAttrXmlnsWp14(_value); begin - self.XmlAttrXmlnsWp14.Value := _value; + {self.}XmlAttrXmlnsWp14.Value := _value; end; function Ftr.ReadXmlAttrXmlnsWp(); begin - return self.XmlAttrXmlnsWp.Value; + return {self.}XmlAttrXmlnsWp.Value; end; function Ftr.WriteXmlAttrXmlnsWp(_value); begin - self.XmlAttrXmlnsWp.Value := _value; + {self.}XmlAttrXmlnsWp.Value := _value; end; function Ftr.ReadXmlAttrXmlnsWpc(); begin - return self.XmlAttrXmlnsWpc.Value; + return {self.}XmlAttrXmlnsWpc.Value; end; function Ftr.WriteXmlAttrXmlnsWpc(_value); begin - self.XmlAttrXmlnsWpc.Value := _value; + {self.}XmlAttrXmlnsWpc.Value := _value; end; function Ftr.ReadXmlAttrXmlnsWpg(); begin - return self.XmlAttrXmlnsWpg.Value; + return {self.}XmlAttrXmlnsWpg.Value; end; function Ftr.WriteXmlAttrXmlnsWpg(_value); begin - self.XmlAttrXmlnsWpg.Value := _value; + {self.}XmlAttrXmlnsWpg.Value := _value; end; function Ftr.ReadXmlAttrXmlnsWpi(); begin - return self.XmlAttrXmlnsWpi.Value; + return {self.}XmlAttrXmlnsWpi.Value; end; function Ftr.WriteXmlAttrXmlnsWpi(_value); begin - self.XmlAttrXmlnsWpi.Value := _value; + {self.}XmlAttrXmlnsWpi.Value := _value; end; function Ftr.ReadXmlAttrXmlnsWps(); begin - return self.XmlAttrXmlnsWps.Value; + return {self.}XmlAttrXmlnsWps.Value; end; function Ftr.WriteXmlAttrXmlnsWps(_value); begin - self.XmlAttrXmlnsWps.Value := _value; + {self.}XmlAttrXmlnsWps.Value := _value; end; function Ftr.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Ftr.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/GradFill@DOCX.tsf b/autoclass/docx/GradFill@DOCX.tsf index fe87c7c..050f310 100644 --- a/autoclass/docx/GradFill@DOCX.tsf +++ b/autoclass/docx/GradFill@DOCX.tsf @@ -25,7 +25,7 @@ end; function GradFill.Create();overload; begin - self.Create(nil, "a", "gradFill"); + {self.}Create(nil, "a", "gradFill"); end; function GradFill.Create(_node: XmlNode);overload; @@ -40,36 +40,36 @@ end; function GradFill.Init();override; begin - self.XmlAttrRotWithShape := new OpenXmlAttribute(nil, "rotWithShape", nil); - self.GsLst := new GsLst(self, self.Prefix, "gsLst"); - self.Lin := new Lin(self, self.Prefix, "lin"); + {self.}XmlAttrRotWithShape := new OpenXmlAttribute(nil, "rotWithShape", nil); + {self.}GsLst := new GsLst(self, {self.}Prefix, "gsLst"); + {self.}Lin := new Lin(self, {self.}Prefix, "lin"); end; function GradFill.InitAttributes();override; begin attributes_ := array( - self.XmlAttrRotWithShape, + {self.}XmlAttrRotWithShape, ); end; function GradFill.InitChildren();override; begin child_elements_ := array( - 0: self.GsLst, - 1: self.Lin, + 0: {self.}GsLst, + 1: {self.}Lin, ); sorted_child_ := array( "": -1, - self.GsLst.ElementName: 0, - self.Lin.ElementName: 1, + {self.}GsLst.ElementName: 0, + {self.}Lin.ElementName: 1, ); end; function GradFill.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -78,7 +78,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,17 +106,17 @@ end; function GradFill.Copy(_obj: GradFill);override; begin if not ifnil(_obj.XmlAttrRotWithShape.Value) then - self.XmlAttrRotWithShape.Value := _obj.XmlAttrRotWithShape.Value; - self.GsLst.Copy(_obj.GsLst); - self.Lin.Copy(_obj.Lin); + {self.}XmlAttrRotWithShape.Value := _obj.XmlAttrRotWithShape.Value; + {self.}GsLst.Copy(_obj.GsLst); + {self.}Lin.Copy(_obj.Lin); end; function GradFill.ReadXmlAttrRotWithShape(); begin - return self.XmlAttrRotWithShape.Value; + return {self.}XmlAttrRotWithShape.Value; end; function GradFill.WriteXmlAttrRotWithShape(_value); begin - self.XmlAttrRotWithShape.Value := _value; + {self.}XmlAttrRotWithShape.Value := _value; end; diff --git a/autoclass/docx/Graphic@DOCX.tsf b/autoclass/docx/Graphic@DOCX.tsf index 9509e8c..5a73b9e 100644 --- a/autoclass/docx/Graphic@DOCX.tsf +++ b/autoclass/docx/Graphic@DOCX.tsf @@ -24,7 +24,7 @@ end; function Graphic.Create();overload; begin - self.Create(nil, nil, ""); + {self.}Create(nil, nil, ""); end; function Graphic.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function Graphic.Init();override; begin - self.XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); - self.GraphicData := new GraphicData(self, "a", "graphicData"); + {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); + {self.}GraphicData := new GraphicData(self, "a", "graphicData"); end; function Graphic.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsA, + {self.}XmlAttrXmlnsA, ); end; function Graphic.InitChildren();override; begin child_elements_ := array( - 0: self.GraphicData, + 0: {self.}GraphicData, ); sorted_child_ := array( "": -1, - self.GraphicData.ElementName: 0, + {self.}GraphicData.ElementName: 0, ); end; function Graphic.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function Graphic.Copy(_obj: Graphic);override; begin if not ifnil(_obj.XmlAttrXmlnsA.Value) then - self.XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; - self.GraphicData.Copy(_obj.GraphicData); + {self.}XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; + {self.}GraphicData.Copy(_obj.GraphicData); end; function Graphic.ReadXmlAttrXmlnsA(); begin - return self.XmlAttrXmlnsA.Value; + return {self.}XmlAttrXmlnsA.Value; end; function Graphic.WriteXmlAttrXmlnsA(_value); begin - self.XmlAttrXmlnsA.Value := _value; + {self.}XmlAttrXmlnsA.Value := _value; end; diff --git a/autoclass/docx/GraphicData@DOCX.tsf b/autoclass/docx/GraphicData@DOCX.tsf index d408b97..de07730 100644 --- a/autoclass/docx/GraphicData@DOCX.tsf +++ b/autoclass/docx/GraphicData@DOCX.tsf @@ -25,7 +25,7 @@ end; function GraphicData.Create();overload; begin - self.Create(nil, "a", "graphicData"); + {self.}Create(nil, "a", "graphicData"); end; function GraphicData.Create(_node: XmlNode);overload; @@ -40,36 +40,36 @@ end; function GraphicData.Init();override; begin - self.XmlAttrUri := new OpenXmlAttribute(nil, "uri", "http://schemas.openxmlformats.org/drawingml/2006/picture"); - self.Pic := new Pic(self, "pic", "pic"); - self.Chart := new Chart(self, "c", "chart"); + {self.}XmlAttrUri := new OpenXmlAttribute(nil, "uri", "http://schemas.openxmlformats.org/drawingml/2006/picture"); + {self.}Pic := new Pic(self, "pic", "pic"); + {self.}Chart := new Chart(self, "c", "chart"); end; function GraphicData.InitAttributes();override; begin attributes_ := array( - self.XmlAttrUri, + {self.}XmlAttrUri, ); end; function GraphicData.InitChildren();override; begin child_elements_ := array( - 0: self.Pic, - 1: self.Chart, + 0: {self.}Pic, + 1: {self.}Chart, ); sorted_child_ := array( "": -1, - self.Pic.ElementName: 0, - self.Chart.ElementName: 1, + {self.}Pic.ElementName: 0, + {self.}Chart.ElementName: 1, ); end; function GraphicData.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -78,7 +78,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,17 +106,17 @@ end; function GraphicData.Copy(_obj: GraphicData);override; begin if not ifnil(_obj.XmlAttrUri.Value) then - self.XmlAttrUri.Value := _obj.XmlAttrUri.Value; - self.Pic.Copy(_obj.Pic); - self.Chart.Copy(_obj.Chart); + {self.}XmlAttrUri.Value := _obj.XmlAttrUri.Value; + {self.}Pic.Copy(_obj.Pic); + {self.}Chart.Copy(_obj.Chart); end; function GraphicData.ReadXmlAttrUri(); begin - return self.XmlAttrUri.Value; + return {self.}XmlAttrUri.Value; end; function GraphicData.WriteXmlAttrUri(_value); begin - self.XmlAttrUri.Value := _value; + {self.}XmlAttrUri.Value := _value; end; diff --git a/autoclass/docx/GraphicFrameLocks@DOCX.tsf b/autoclass/docx/GraphicFrameLocks@DOCX.tsf index 03b4a0b..9f81129 100644 --- a/autoclass/docx/GraphicFrameLocks@DOCX.tsf +++ b/autoclass/docx/GraphicFrameLocks@DOCX.tsf @@ -27,7 +27,7 @@ end; function GraphicFrameLocks.Create();overload; begin - self.Create(nil, nil, ""); + {self.}Create(nil, nil, ""); end; function GraphicFrameLocks.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function GraphicFrameLocks.Init();override; begin - self.XmlAttrNoChangeAspect := new OpenXmlAttribute(nil, "noChangeAspect", nil); - self.XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); + {self.}XmlAttrNoChangeAspect := new OpenXmlAttribute(nil, "noChangeAspect", nil); + {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); end; function GraphicFrameLocks.InitAttributes();override; begin attributes_ := array( - self.XmlAttrNoChangeAspect, - self.XmlAttrXmlnsA, + {self.}XmlAttrNoChangeAspect, + {self.}XmlAttrXmlnsA, ); end; @@ -65,35 +65,35 @@ end; function GraphicFrameLocks.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function GraphicFrameLocks.Copy(_obj: GraphicFrameLocks);override; begin if not ifnil(_obj.XmlAttrNoChangeAspect.Value) then - self.XmlAttrNoChangeAspect.Value := _obj.XmlAttrNoChangeAspect.Value; + {self.}XmlAttrNoChangeAspect.Value := _obj.XmlAttrNoChangeAspect.Value; if not ifnil(_obj.XmlAttrXmlnsA.Value) then - self.XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; + {self.}XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; end; function GraphicFrameLocks.ReadXmlAttrNoChangeAspect(); begin - return self.XmlAttrNoChangeAspect.Value; + return {self.}XmlAttrNoChangeAspect.Value; end; function GraphicFrameLocks.WriteXmlAttrNoChangeAspect(_value); begin - self.XmlAttrNoChangeAspect.Value := _value; + {self.}XmlAttrNoChangeAspect.Value := _value; end; function GraphicFrameLocks.ReadXmlAttrXmlnsA(); begin - return self.XmlAttrXmlnsA.Value; + return {self.}XmlAttrXmlnsA.Value; end; function GraphicFrameLocks.WriteXmlAttrXmlnsA(_value); begin - self.XmlAttrXmlnsA.Value := _value; + {self.}XmlAttrXmlnsA.Value := _value; end; diff --git a/autoclass/docx/GridCol@DOCX.tsf b/autoclass/docx/GridCol@DOCX.tsf index a301f06..b0c4067 100644 --- a/autoclass/docx/GridCol@DOCX.tsf +++ b/autoclass/docx/GridCol@DOCX.tsf @@ -23,7 +23,7 @@ end; function GridCol.Create();overload; begin - self.Create(nil, "w", "gridCol"); + {self.}Create(nil, "w", "gridCol"); end; function GridCol.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function GridCol.Init();override; begin - self.XmlAttrw := new OpenXmlAttribute(self.Prefix, "w", nil); + {self.}XmlAttrw := new OpenXmlAttribute({self.}Prefix, "w", nil); end; function GridCol.InitAttributes();override; begin attributes_ := array( - self.XmlAttrw, + {self.}XmlAttrw, ); end; @@ -59,23 +59,23 @@ end; function GridCol.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function GridCol.Copy(_obj: GridCol);override; begin if not ifnil(_obj.XmlAttrw.Value) then - self.XmlAttrw.Value := _obj.XmlAttrw.Value; + {self.}XmlAttrw.Value := _obj.XmlAttrw.Value; end; function GridCol.ReadXmlAttrw(); begin - return self.XmlAttrw.Value; + return {self.}XmlAttrw.Value; end; function GridCol.WriteXmlAttrw(_value); begin - self.XmlAttrw.Value := _value; + {self.}XmlAttrw.Value := _value; end; diff --git a/autoclass/docx/Gs@DOCX.tsf b/autoclass/docx/Gs@DOCX.tsf index d6898b4..1836c3b 100644 --- a/autoclass/docx/Gs@DOCX.tsf +++ b/autoclass/docx/Gs@DOCX.tsf @@ -24,7 +24,7 @@ end; function Gs.Create();overload; begin - self.Create(nil, "a", "gs"); + {self.}Create(nil, "a", "gs"); end; function Gs.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function Gs.Init();override; begin - self.XmlAttrPos := new OpenXmlAttribute(nil, "pos", nil); - self.SchemeClr := new SchemeClr(self, self.Prefix, "schemeClr"); + {self.}XmlAttrPos := new OpenXmlAttribute(nil, "pos", nil); + {self.}SchemeClr := new SchemeClr(self, {self.}Prefix, "schemeClr"); end; function Gs.InitAttributes();override; begin attributes_ := array( - self.XmlAttrPos, + {self.}XmlAttrPos, ); end; function Gs.InitChildren();override; begin child_elements_ := array( - 0: self.SchemeClr, + 0: {self.}SchemeClr, ); sorted_child_ := array( "": -1, - self.SchemeClr.ElementName: 0, + {self.}SchemeClr.ElementName: 0, ); end; function Gs.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function Gs.Copy(_obj: Gs);override; begin if not ifnil(_obj.XmlAttrPos.Value) then - self.XmlAttrPos.Value := _obj.XmlAttrPos.Value; - self.SchemeClr.Copy(_obj.SchemeClr); + {self.}XmlAttrPos.Value := _obj.XmlAttrPos.Value; + {self.}SchemeClr.Copy(_obj.SchemeClr); end; function Gs.ReadXmlAttrPos(); begin - return self.XmlAttrPos.Value; + return {self.}XmlAttrPos.Value; end; function Gs.WriteXmlAttrPos(_value); begin - self.XmlAttrPos.Value := _value; + {self.}XmlAttrPos.Value := _value; end; diff --git a/autoclass/docx/GsLst@DOCX.tsf b/autoclass/docx/GsLst@DOCX.tsf index 9a809a2..328f23a 100644 --- a/autoclass/docx/GsLst@DOCX.tsf +++ b/autoclass/docx/GsLst@DOCX.tsf @@ -23,7 +23,7 @@ end; function GsLst.Create();overload; begin - self.Create(nil, "a", "gsLst"); + {self.}Create(nil, "a", "gsLst"); end; function GsLst.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function GsLst.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "gs": obj := self.AppendGs(); + pre + "gs": obj := {self.}AppendGs(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "gs" then break; end - obj := new Gs(self, self.Prefix, "gs"); - self.InsertChild(obj, i+1); + obj := new Gs(self, {self.}Prefix, "gs"); + {self.}InsertChild(obj, i+1); return obj; end; function GsLst.AppendGs(): Gs; begin - obj := new Gs(self, self.Prefix, "gs"); + obj := new Gs(self, {self.}Prefix, "gs"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Hdr@DOCX.tsf b/autoclass/docx/Hdr@DOCX.tsf index 2354bd3..95b2b2d 100644 --- a/autoclass/docx/Hdr@DOCX.tsf +++ b/autoclass/docx/Hdr@DOCX.tsf @@ -84,7 +84,7 @@ end; function Hdr.Create();overload; begin - self.Create(nil, "w", "hdr"); + {self.}Create(nil, "w", "hdr"); end; function Hdr.Create(_node: XmlNode);overload; @@ -99,41 +99,41 @@ end; function Hdr.Init();override; begin - self.XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsMo := new OpenXmlAttribute("xmlns", "mo", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); - self.XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); - self.XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); - self.XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); - self.XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); - self.XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); - self.XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsMo := new OpenXmlAttribute("xmlns", "mo", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); + {self.}XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); + {self.}XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); + {self.}XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); + {self.}XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); + {self.}XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); + {self.}XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); end; function Hdr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsM, - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsMo, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsV, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsWne, - self.XmlAttrXmlnsWp14, - self.XmlAttrXmlnsWp, - self.XmlAttrXmlnsWpc, - self.XmlAttrXmlnsWpg, - self.XmlAttrXmlnsWpi, - self.XmlAttrXmlnsWps, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsM, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsMo, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsV, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsWne, + {self.}XmlAttrXmlnsWp14, + {self.}XmlAttrXmlnsWp, + {self.}XmlAttrXmlnsWpc, + {self.}XmlAttrXmlnsWpg, + {self.}XmlAttrXmlnsWpi, + {self.}XmlAttrXmlnsWps, + {self.}XmlAttrMcIgnorable, ); end; @@ -148,9 +148,9 @@ end; function Hdr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -159,7 +159,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -168,7 +168,7 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); + pre + "p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -188,35 +188,35 @@ end; function Hdr.Copy(_obj: Hdr);override; begin if not ifnil(_obj.XmlAttrXmlnsM.Value) then - self.XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsMo.Value) then - self.XmlAttrXmlnsMo.Value := _obj.XmlAttrXmlnsMo.Value; + {self.}XmlAttrXmlnsMo.Value := _obj.XmlAttrXmlnsMo.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsV.Value) then - self.XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsWne.Value) then - self.XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; if not ifnil(_obj.XmlAttrXmlnsWp14.Value) then - self.XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; if not ifnil(_obj.XmlAttrXmlnsWp.Value) then - self.XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; if not ifnil(_obj.XmlAttrXmlnsWpc.Value) then - self.XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; if not ifnil(_obj.XmlAttrXmlnsWpg.Value) then - self.XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; if not ifnil(_obj.XmlAttrXmlnsWpi.Value) then - self.XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; if not ifnil(_obj.XmlAttrXmlnsWps.Value) then - self.XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; end; function Hdr.AddP(): P; @@ -227,14 +227,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; function Hdr.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -257,150 +257,150 @@ end; function Hdr.ReadXmlAttrXmlnsM(); begin - return self.XmlAttrXmlnsM.Value; + return {self.}XmlAttrXmlnsM.Value; end; function Hdr.WriteXmlAttrXmlnsM(_value); begin - self.XmlAttrXmlnsM.Value := _value; + {self.}XmlAttrXmlnsM.Value := _value; end; function Hdr.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Hdr.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Hdr.ReadXmlAttrXmlnsMo(); begin - return self.XmlAttrXmlnsMo.Value; + return {self.}XmlAttrXmlnsMo.Value; end; function Hdr.WriteXmlAttrXmlnsMo(_value); begin - self.XmlAttrXmlnsMo.Value := _value; + {self.}XmlAttrXmlnsMo.Value := _value; end; function Hdr.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Hdr.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Hdr.ReadXmlAttrXmlnsV(); begin - return self.XmlAttrXmlnsV.Value; + return {self.}XmlAttrXmlnsV.Value; end; function Hdr.WriteXmlAttrXmlnsV(_value); begin - self.XmlAttrXmlnsV.Value := _value; + {self.}XmlAttrXmlnsV.Value := _value; end; function Hdr.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Hdr.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Hdr.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function Hdr.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function Hdr.ReadXmlAttrXmlnsWne(); begin - return self.XmlAttrXmlnsWne.Value; + return {self.}XmlAttrXmlnsWne.Value; end; function Hdr.WriteXmlAttrXmlnsWne(_value); begin - self.XmlAttrXmlnsWne.Value := _value; + {self.}XmlAttrXmlnsWne.Value := _value; end; function Hdr.ReadXmlAttrXmlnsWp14(); begin - return self.XmlAttrXmlnsWp14.Value; + return {self.}XmlAttrXmlnsWp14.Value; end; function Hdr.WriteXmlAttrXmlnsWp14(_value); begin - self.XmlAttrXmlnsWp14.Value := _value; + {self.}XmlAttrXmlnsWp14.Value := _value; end; function Hdr.ReadXmlAttrXmlnsWp(); begin - return self.XmlAttrXmlnsWp.Value; + return {self.}XmlAttrXmlnsWp.Value; end; function Hdr.WriteXmlAttrXmlnsWp(_value); begin - self.XmlAttrXmlnsWp.Value := _value; + {self.}XmlAttrXmlnsWp.Value := _value; end; function Hdr.ReadXmlAttrXmlnsWpc(); begin - return self.XmlAttrXmlnsWpc.Value; + return {self.}XmlAttrXmlnsWpc.Value; end; function Hdr.WriteXmlAttrXmlnsWpc(_value); begin - self.XmlAttrXmlnsWpc.Value := _value; + {self.}XmlAttrXmlnsWpc.Value := _value; end; function Hdr.ReadXmlAttrXmlnsWpg(); begin - return self.XmlAttrXmlnsWpg.Value; + return {self.}XmlAttrXmlnsWpg.Value; end; function Hdr.WriteXmlAttrXmlnsWpg(_value); begin - self.XmlAttrXmlnsWpg.Value := _value; + {self.}XmlAttrXmlnsWpg.Value := _value; end; function Hdr.ReadXmlAttrXmlnsWpi(); begin - return self.XmlAttrXmlnsWpi.Value; + return {self.}XmlAttrXmlnsWpi.Value; end; function Hdr.WriteXmlAttrXmlnsWpi(_value); begin - self.XmlAttrXmlnsWpi.Value := _value; + {self.}XmlAttrXmlnsWpi.Value := _value; end; function Hdr.ReadXmlAttrXmlnsWps(); begin - return self.XmlAttrXmlnsWps.Value; + return {self.}XmlAttrXmlnsWps.Value; end; function Hdr.WriteXmlAttrXmlnsWps(_value); begin - self.XmlAttrXmlnsWps.Value := _value; + {self.}XmlAttrXmlnsWps.Value := _value; end; function Hdr.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Hdr.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/HdrShapeDefaults@DOCX.tsf b/autoclass/docx/HdrShapeDefaults@DOCX.tsf index da14d5e..57365e7 100644 --- a/autoclass/docx/HdrShapeDefaults@DOCX.tsf +++ b/autoclass/docx/HdrShapeDefaults@DOCX.tsf @@ -19,7 +19,7 @@ end; function HdrShapeDefaults.Create();overload; begin - self.Create(nil, "w", "hdrShapeDefaults"); + {self.}Create(nil, "w", "hdrShapeDefaults"); end; function HdrShapeDefaults.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function HdrShapeDefaults.Init();override; begin - self.ShapeDefaults := new ShapeDefaults(self, "o", "shapeDefaults"); + {self.}ShapeDefaults := new ShapeDefaults(self, "o", "shapeDefaults"); end; function HdrShapeDefaults.InitAttributes();override; @@ -46,19 +46,19 @@ end; function HdrShapeDefaults.InitChildren();override; begin child_elements_ := array( - 0: self.ShapeDefaults, + 0: {self.}ShapeDefaults, ); sorted_child_ := array( "": -1, - self.ShapeDefaults.ElementName: 0, + {self.}ShapeDefaults.ElementName: 0, ); end; function HdrShapeDefaults.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function HdrShapeDefaults.Copy(_obj: HdrShapeDefaults);override; begin - self.ShapeDefaults.Copy(_obj.ShapeDefaults); + {self.}ShapeDefaults.Copy(_obj.ShapeDefaults); end; diff --git a/autoclass/docx/HyperLink@DOCX.tsf b/autoclass/docx/HyperLink@DOCX.tsf index d11b00e..a598240 100644 --- a/autoclass/docx/HyperLink@DOCX.tsf +++ b/autoclass/docx/HyperLink@DOCX.tsf @@ -32,7 +32,7 @@ end; function HyperLink.Create();overload; begin - self.Create(nil, "w", "hyperlink"); + {self.}Create(nil, "w", "hyperlink"); end; function HyperLink.Create(_node: XmlNode);overload; @@ -47,15 +47,15 @@ end; function HyperLink.Init();override; begin - self.XmlAttrId := new OpenXmlAttribute("r", "id", nil); - self.XmlAttrHistory := new OpenXmlAttribute(self.Prefix, "history", nil); + {self.}XmlAttrId := new OpenXmlAttribute("r", "id", nil); + {self.}XmlAttrHistory := new OpenXmlAttribute({self.}Prefix, "history", nil); end; function HyperLink.InitAttributes();override; begin attributes_ := array( - self.XmlAttrId, - self.XmlAttrHistory, + {self.}XmlAttrId, + {self.}XmlAttrHistory, ); end; @@ -70,9 +70,9 @@ end; function HyperLink.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -81,7 +81,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -90,7 +90,7 @@ begin begin obj := nil; case node_name of - pre + "r": obj := self.AppendR(); + pre + "r": obj := {self.}AppendR(); end; if ifObj(obj) then obj.InitNode(node); end @@ -110,9 +110,9 @@ end; function HyperLink.Copy(_obj: HyperLink);override; begin if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; if not ifnil(_obj.XmlAttrHistory.Value) then - self.XmlAttrHistory.Value := _obj.XmlAttrHistory.Value; + {self.}XmlAttrHistory.Value := _obj.XmlAttrHistory.Value; end; function HyperLink.AddR(): R; @@ -123,14 +123,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "r" then break; end - obj := new R(self, self.Prefix, "r"); - self.InsertChild(obj, i+1); + obj := new R(self, {self.}Prefix, "r"); + {self.}InsertChild(obj, i+1); return obj; end; function HyperLink.AppendR(): R; begin - obj := new R(self, self.Prefix, "r"); + obj := new R(self, {self.}Prefix, "r"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -153,20 +153,20 @@ end; function HyperLink.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function HyperLink.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; function HyperLink.ReadXmlAttrHistory(); begin - return self.XmlAttrHistory.Value; + return {self.}XmlAttrHistory.Value; end; function HyperLink.WriteXmlAttrHistory(_value); begin - self.XmlAttrHistory.Value := _value; + {self.}XmlAttrHistory.Value := _value; end; diff --git a/autoclass/docx/IdMap@DOCX.tsf b/autoclass/docx/IdMap@DOCX.tsf index e6c7162..d20641c 100644 --- a/autoclass/docx/IdMap@DOCX.tsf +++ b/autoclass/docx/IdMap@DOCX.tsf @@ -27,7 +27,7 @@ end; function IdMap.Create();overload; begin - self.Create(nil, "o", "idmap"); + {self.}Create(nil, "o", "idmap"); end; function IdMap.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function IdMap.Init();override; begin - self.XmlAttrExt := new OpenXmlAttribute("v", "ext", nil); - self.XmlAttrData := new OpenXmlAttribute(nil, "data", nil); + {self.}XmlAttrExt := new OpenXmlAttribute("v", "ext", nil); + {self.}XmlAttrData := new OpenXmlAttribute(nil, "data", nil); end; function IdMap.InitAttributes();override; begin attributes_ := array( - self.XmlAttrExt, - self.XmlAttrData, + {self.}XmlAttrExt, + {self.}XmlAttrData, ); end; @@ -65,35 +65,35 @@ end; function IdMap.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function IdMap.Copy(_obj: IdMap);override; begin if not ifnil(_obj.XmlAttrExt.Value) then - self.XmlAttrExt.Value := _obj.XmlAttrExt.Value; + {self.}XmlAttrExt.Value := _obj.XmlAttrExt.Value; if not ifnil(_obj.XmlAttrData.Value) then - self.XmlAttrData.Value := _obj.XmlAttrData.Value; + {self.}XmlAttrData.Value := _obj.XmlAttrData.Value; end; function IdMap.ReadXmlAttrExt(); begin - return self.XmlAttrExt.Value; + return {self.}XmlAttrExt.Value; end; function IdMap.WriteXmlAttrExt(_value); begin - self.XmlAttrExt.Value := _value; + {self.}XmlAttrExt.Value := _value; end; function IdMap.ReadXmlAttrData(); begin - return self.XmlAttrData.Value; + return {self.}XmlAttrData.Value; end; function IdMap.WriteXmlAttrData(_value); begin - self.XmlAttrData.Value := _value; + {self.}XmlAttrData.Value := _value; end; diff --git a/autoclass/docx/Ind@DOCX.tsf b/autoclass/docx/Ind@DOCX.tsf index 272c086..5ac7353 100644 --- a/autoclass/docx/Ind@DOCX.tsf +++ b/autoclass/docx/Ind@DOCX.tsf @@ -51,7 +51,7 @@ end; function Ind.Create();overload; begin - self.Create(nil, "w", "ind"); + {self.}Create(nil, "w", "ind"); end; function Ind.Create(_node: XmlNode);overload; @@ -66,27 +66,27 @@ end; function Ind.Init();override; begin - self.XmlAttrFirstLineChars := new OpenXmlAttribute(self.Prefix, "firstLineChars", nil); - self.XmlAttrFirstLine := new OpenXmlAttribute(self.Prefix, "firstLine", nil); - self.XmlAttrRightChars := new OpenXmlAttribute(self.Prefix, "rightChars", nil); - self.XmlAttrRight := new OpenXmlAttribute(self.Prefix, "right", nil); - self.XmlAttrLeftChars := new OpenXmlAttribute(self.Prefix, "leftChars", nil); - self.XmlAttrLeft := new OpenXmlAttribute(self.Prefix, "left", nil); - self.XmlAttrHanging := new OpenXmlAttribute(self.Prefix, "hainging", nil); - self.XmlAttrHangingChars := new OpenXmlAttribute(self.Prefix, "hangingChars", nil); + {self.}XmlAttrFirstLineChars := new OpenXmlAttribute({self.}Prefix, "firstLineChars", nil); + {self.}XmlAttrFirstLine := new OpenXmlAttribute({self.}Prefix, "firstLine", nil); + {self.}XmlAttrRightChars := new OpenXmlAttribute({self.}Prefix, "rightChars", nil); + {self.}XmlAttrRight := new OpenXmlAttribute({self.}Prefix, "right", nil); + {self.}XmlAttrLeftChars := new OpenXmlAttribute({self.}Prefix, "leftChars", nil); + {self.}XmlAttrLeft := new OpenXmlAttribute({self.}Prefix, "left", nil); + {self.}XmlAttrHanging := new OpenXmlAttribute({self.}Prefix, "hainging", nil); + {self.}XmlAttrHangingChars := new OpenXmlAttribute({self.}Prefix, "hangingChars", nil); end; function Ind.InitAttributes();override; begin attributes_ := array( - self.XmlAttrFirstLineChars, - self.XmlAttrFirstLine, - self.XmlAttrRightChars, - self.XmlAttrRight, - self.XmlAttrLeftChars, - self.XmlAttrLeft, - self.XmlAttrHanging, - self.XmlAttrHangingChars, + {self.}XmlAttrFirstLineChars, + {self.}XmlAttrFirstLine, + {self.}XmlAttrRightChars, + {self.}XmlAttrRight, + {self.}XmlAttrLeftChars, + {self.}XmlAttrLeft, + {self.}XmlAttrHanging, + {self.}XmlAttrHangingChars, ); end; @@ -101,107 +101,107 @@ end; function Ind.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Ind.Copy(_obj: Ind);override; begin if not ifnil(_obj.XmlAttrFirstLineChars.Value) then - self.XmlAttrFirstLineChars.Value := _obj.XmlAttrFirstLineChars.Value; + {self.}XmlAttrFirstLineChars.Value := _obj.XmlAttrFirstLineChars.Value; if not ifnil(_obj.XmlAttrFirstLine.Value) then - self.XmlAttrFirstLine.Value := _obj.XmlAttrFirstLine.Value; + {self.}XmlAttrFirstLine.Value := _obj.XmlAttrFirstLine.Value; if not ifnil(_obj.XmlAttrRightChars.Value) then - self.XmlAttrRightChars.Value := _obj.XmlAttrRightChars.Value; + {self.}XmlAttrRightChars.Value := _obj.XmlAttrRightChars.Value; if not ifnil(_obj.XmlAttrRight.Value) then - self.XmlAttrRight.Value := _obj.XmlAttrRight.Value; + {self.}XmlAttrRight.Value := _obj.XmlAttrRight.Value; if not ifnil(_obj.XmlAttrLeftChars.Value) then - self.XmlAttrLeftChars.Value := _obj.XmlAttrLeftChars.Value; + {self.}XmlAttrLeftChars.Value := _obj.XmlAttrLeftChars.Value; if not ifnil(_obj.XmlAttrLeft.Value) then - self.XmlAttrLeft.Value := _obj.XmlAttrLeft.Value; + {self.}XmlAttrLeft.Value := _obj.XmlAttrLeft.Value; if not ifnil(_obj.XmlAttrHanging.Value) then - self.XmlAttrHanging.Value := _obj.XmlAttrHanging.Value; + {self.}XmlAttrHanging.Value := _obj.XmlAttrHanging.Value; if not ifnil(_obj.XmlAttrHangingChars.Value) then - self.XmlAttrHangingChars.Value := _obj.XmlAttrHangingChars.Value; + {self.}XmlAttrHangingChars.Value := _obj.XmlAttrHangingChars.Value; end; function Ind.ReadXmlAttrFirstLineChars(); begin - return self.XmlAttrFirstLineChars.Value; + return {self.}XmlAttrFirstLineChars.Value; end; function Ind.WriteXmlAttrFirstLineChars(_value); begin - self.XmlAttrFirstLineChars.Value := _value; + {self.}XmlAttrFirstLineChars.Value := _value; end; function Ind.ReadXmlAttrFirstLine(); begin - return self.XmlAttrFirstLine.Value; + return {self.}XmlAttrFirstLine.Value; end; function Ind.WriteXmlAttrFirstLine(_value); begin - self.XmlAttrFirstLine.Value := _value; + {self.}XmlAttrFirstLine.Value := _value; end; function Ind.ReadXmlAttrRightChars(); begin - return self.XmlAttrRightChars.Value; + return {self.}XmlAttrRightChars.Value; end; function Ind.WriteXmlAttrRightChars(_value); begin - self.XmlAttrRightChars.Value := _value; + {self.}XmlAttrRightChars.Value := _value; end; function Ind.ReadXmlAttrRight(); begin - return self.XmlAttrRight.Value; + return {self.}XmlAttrRight.Value; end; function Ind.WriteXmlAttrRight(_value); begin - self.XmlAttrRight.Value := _value; + {self.}XmlAttrRight.Value := _value; end; function Ind.ReadXmlAttrLeftChars(); begin - return self.XmlAttrLeftChars.Value; + return {self.}XmlAttrLeftChars.Value; end; function Ind.WriteXmlAttrLeftChars(_value); begin - self.XmlAttrLeftChars.Value := _value; + {self.}XmlAttrLeftChars.Value := _value; end; function Ind.ReadXmlAttrLeft(); begin - return self.XmlAttrLeft.Value; + return {self.}XmlAttrLeft.Value; end; function Ind.WriteXmlAttrLeft(_value); begin - self.XmlAttrLeft.Value := _value; + {self.}XmlAttrLeft.Value := _value; end; function Ind.ReadXmlAttrHanging(); begin - return self.XmlAttrHanging.Value; + return {self.}XmlAttrHanging.Value; end; function Ind.WriteXmlAttrHanging(_value); begin - self.XmlAttrHanging.Value := _value; + {self.}XmlAttrHanging.Value := _value; end; function Ind.ReadXmlAttrHangingChars(); begin - return self.XmlAttrHangingChars.Value; + return {self.}XmlAttrHangingChars.Value; end; function Ind.WriteXmlAttrHangingChars(_value); begin - self.XmlAttrHangingChars.Value := _value; + {self.}XmlAttrHangingChars.Value := _value; end; diff --git a/autoclass/docx/InstrText@DOCX.tsf b/autoclass/docx/InstrText@DOCX.tsf index 205a5cf..ce041d7 100644 --- a/autoclass/docx/InstrText@DOCX.tsf +++ b/autoclass/docx/InstrText@DOCX.tsf @@ -22,7 +22,7 @@ end; function InstrText.Create();overload; begin - self.Create(nil, "w", "instrText"); + {self.}Create(nil, "w", "instrText"); end; function InstrText.Create(_node: XmlNode);overload; @@ -37,35 +37,35 @@ end; function InstrText.Init();override; begin - self.XmlAttrSpace := new OpenXmlAttribute("xml", "Space", nil); + {self.}XmlAttrSpace := new OpenXmlAttribute("xml", "Space", nil); end; function InstrText.InitAttributes();override; begin attributes_ := array( - self.XmlAttrSpace, + {self.}XmlAttrSpace, ); end; function InstrText.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function InstrText.Copy(_obj: InstrText);override; begin if not ifnil(_obj.XmlAttrSpace.Value) then - self.XmlAttrSpace.Value := _obj.XmlAttrSpace.Value; + {self.}XmlAttrSpace.Value := _obj.XmlAttrSpace.Value; end; function InstrText.ReadXmlAttrSpace(); begin - return self.XmlAttrSpace.Value; + return {self.}XmlAttrSpace.Value; end; function InstrText.WriteXmlAttrSpace(_value); begin - self.XmlAttrSpace.Value := _value; + {self.}XmlAttrSpace.Value := _value; end; diff --git a/autoclass/docx/Lang@DOCX.tsf b/autoclass/docx/Lang@DOCX.tsf index 33a8534..32b5d4c 100644 --- a/autoclass/docx/Lang@DOCX.tsf +++ b/autoclass/docx/Lang@DOCX.tsf @@ -31,7 +31,7 @@ end; function Lang.Create();overload; begin - self.Create(nil, "w", "lang"); + {self.}Create(nil, "w", "lang"); end; function Lang.Create(_node: XmlNode);overload; @@ -46,17 +46,17 @@ end; function Lang.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(self.Prefix, "val", nil); - self.XmlAttrEastAsia := new OpenXmlAttribute(self.Prefix, "eastAsia", nil); - self.XmlAttrBidi := new OpenXmlAttribute(self.Prefix, "bidi", nil); + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + {self.}XmlAttrEastAsia := new OpenXmlAttribute({self.}Prefix, "eastAsia", nil); + {self.}XmlAttrBidi := new OpenXmlAttribute({self.}Prefix, "bidi", nil); end; function Lang.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, - self.XmlAttrEastAsia, - self.XmlAttrBidi, + {self.}XmlAttrVal, + {self.}XmlAttrEastAsia, + {self.}XmlAttrBidi, ); end; @@ -71,47 +71,47 @@ end; function Lang.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Lang.Copy(_obj: Lang);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; if not ifnil(_obj.XmlAttrEastAsia.Value) then - self.XmlAttrEastAsia.Value := _obj.XmlAttrEastAsia.Value; + {self.}XmlAttrEastAsia.Value := _obj.XmlAttrEastAsia.Value; if not ifnil(_obj.XmlAttrBidi.Value) then - self.XmlAttrBidi.Value := _obj.XmlAttrBidi.Value; + {self.}XmlAttrBidi.Value := _obj.XmlAttrBidi.Value; end; function Lang.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function Lang.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; function Lang.ReadXmlAttrEastAsia(); begin - return self.XmlAttrEastAsia.Value; + return {self.}XmlAttrEastAsia.Value; end; function Lang.WriteXmlAttrEastAsia(_value); begin - self.XmlAttrEastAsia.Value := _value; + {self.}XmlAttrEastAsia.Value := _value; end; function Lang.ReadXmlAttrBidi(); begin - return self.XmlAttrBidi.Value; + return {self.}XmlAttrBidi.Value; end; function Lang.WriteXmlAttrBidi(_value); begin - self.XmlAttrBidi.Value := _value; + {self.}XmlAttrBidi.Value := _value; end; diff --git a/autoclass/docx/LatenStyles@DOCX.tsf b/autoclass/docx/LatenStyles@DOCX.tsf index 1ccf6a3..85617ad 100644 --- a/autoclass/docx/LatenStyles@DOCX.tsf +++ b/autoclass/docx/LatenStyles@DOCX.tsf @@ -48,7 +48,7 @@ end; function LatenStyles.Create();overload; begin - self.Create(nil, "w", "latenStyles"); + {self.}Create(nil, "w", "latenStyles"); end; function LatenStyles.Create(_node: XmlNode);overload; @@ -63,23 +63,23 @@ end; function LatenStyles.Init();override; begin - self.XmlAttrDefLickedState := new OpenXmlAttribute(self.Prefix, "defLickedState", nil); - self.XmlAttrDefUIPriority := new OpenXmlAttribute(self.Prefix, "defUIPriority", nil); - self.XmlAttrDefSemiHidden := new OpenXmlAttribute(self.Prefix, "defSemiHidden", nil); - self.XmlAttrDefUnhideWhenUsed := new OpenXmlAttribute(self.Prefix, "defUnhideWhenUsed", nil); - self.XmlAttrDefQFormat := new OpenXmlAttribute(self.Prefix, "defQFormat", nil); - self.XmlAttrCount := new OpenXmlAttribute(self.Prefix, "count", nil); + {self.}XmlAttrDefLickedState := new OpenXmlAttribute({self.}Prefix, "defLickedState", nil); + {self.}XmlAttrDefUIPriority := new OpenXmlAttribute({self.}Prefix, "defUIPriority", nil); + {self.}XmlAttrDefSemiHidden := new OpenXmlAttribute({self.}Prefix, "defSemiHidden", nil); + {self.}XmlAttrDefUnhideWhenUsed := new OpenXmlAttribute({self.}Prefix, "defUnhideWhenUsed", nil); + {self.}XmlAttrDefQFormat := new OpenXmlAttribute({self.}Prefix, "defQFormat", nil); + {self.}XmlAttrCount := new OpenXmlAttribute({self.}Prefix, "count", nil); end; function LatenStyles.InitAttributes();override; begin attributes_ := array( - self.XmlAttrDefLickedState, - self.XmlAttrDefUIPriority, - self.XmlAttrDefSemiHidden, - self.XmlAttrDefUnhideWhenUsed, - self.XmlAttrDefQFormat, - self.XmlAttrCount, + {self.}XmlAttrDefLickedState, + {self.}XmlAttrDefUIPriority, + {self.}XmlAttrDefSemiHidden, + {self.}XmlAttrDefUnhideWhenUsed, + {self.}XmlAttrDefQFormat, + {self.}XmlAttrCount, ); end; @@ -94,9 +94,9 @@ end; function LatenStyles.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -105,7 +105,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -114,7 +114,7 @@ begin begin obj := nil; case node_name of - pre + "lsdException": obj := self.AppendLsdException(); + pre + "lsdException": obj := {self.}AppendLsdException(); end; if ifObj(obj) then obj.InitNode(node); end @@ -134,17 +134,17 @@ end; function LatenStyles.Copy(_obj: LatenStyles);override; begin if not ifnil(_obj.XmlAttrDefLickedState.Value) then - self.XmlAttrDefLickedState.Value := _obj.XmlAttrDefLickedState.Value; + {self.}XmlAttrDefLickedState.Value := _obj.XmlAttrDefLickedState.Value; if not ifnil(_obj.XmlAttrDefUIPriority.Value) then - self.XmlAttrDefUIPriority.Value := _obj.XmlAttrDefUIPriority.Value; + {self.}XmlAttrDefUIPriority.Value := _obj.XmlAttrDefUIPriority.Value; if not ifnil(_obj.XmlAttrDefSemiHidden.Value) then - self.XmlAttrDefSemiHidden.Value := _obj.XmlAttrDefSemiHidden.Value; + {self.}XmlAttrDefSemiHidden.Value := _obj.XmlAttrDefSemiHidden.Value; if not ifnil(_obj.XmlAttrDefUnhideWhenUsed.Value) then - self.XmlAttrDefUnhideWhenUsed.Value := _obj.XmlAttrDefUnhideWhenUsed.Value; + {self.}XmlAttrDefUnhideWhenUsed.Value := _obj.XmlAttrDefUnhideWhenUsed.Value; if not ifnil(_obj.XmlAttrDefQFormat.Value) then - self.XmlAttrDefQFormat.Value := _obj.XmlAttrDefQFormat.Value; + {self.}XmlAttrDefQFormat.Value := _obj.XmlAttrDefQFormat.Value; if not ifnil(_obj.XmlAttrCount.Value) then - self.XmlAttrCount.Value := _obj.XmlAttrCount.Value; + {self.}XmlAttrCount.Value := _obj.XmlAttrCount.Value; end; function LatenStyles.AddLsdException(): LsdException; @@ -155,14 +155,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "lsdException" then break; end - obj := new LsdException(self, self.Prefix, "lsdException"); - self.InsertChild(obj, i+1); + obj := new LsdException(self, {self.}Prefix, "lsdException"); + {self.}InsertChild(obj, i+1); return obj; end; function LatenStyles.AppendLsdException(): LsdException; begin - obj := new LsdException(self, self.Prefix, "lsdException"); + obj := new LsdException(self, {self.}Prefix, "lsdException"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -185,60 +185,60 @@ end; function LatenStyles.ReadXmlAttrDefLickedState(); begin - return self.XmlAttrDefLickedState.Value; + return {self.}XmlAttrDefLickedState.Value; end; function LatenStyles.WriteXmlAttrDefLickedState(_value); begin - self.XmlAttrDefLickedState.Value := _value; + {self.}XmlAttrDefLickedState.Value := _value; end; function LatenStyles.ReadXmlAttrDefUIPriority(); begin - return self.XmlAttrDefUIPriority.Value; + return {self.}XmlAttrDefUIPriority.Value; end; function LatenStyles.WriteXmlAttrDefUIPriority(_value); begin - self.XmlAttrDefUIPriority.Value := _value; + {self.}XmlAttrDefUIPriority.Value := _value; end; function LatenStyles.ReadXmlAttrDefSemiHidden(); begin - return self.XmlAttrDefSemiHidden.Value; + return {self.}XmlAttrDefSemiHidden.Value; end; function LatenStyles.WriteXmlAttrDefSemiHidden(_value); begin - self.XmlAttrDefSemiHidden.Value := _value; + {self.}XmlAttrDefSemiHidden.Value := _value; end; function LatenStyles.ReadXmlAttrDefUnhideWhenUsed(); begin - return self.XmlAttrDefUnhideWhenUsed.Value; + return {self.}XmlAttrDefUnhideWhenUsed.Value; end; function LatenStyles.WriteXmlAttrDefUnhideWhenUsed(_value); begin - self.XmlAttrDefUnhideWhenUsed.Value := _value; + {self.}XmlAttrDefUnhideWhenUsed.Value := _value; end; function LatenStyles.ReadXmlAttrDefQFormat(); begin - return self.XmlAttrDefQFormat.Value; + return {self.}XmlAttrDefQFormat.Value; end; function LatenStyles.WriteXmlAttrDefQFormat(_value); begin - self.XmlAttrDefQFormat.Value := _value; + {self.}XmlAttrDefQFormat.Value := _value; end; function LatenStyles.ReadXmlAttrCount(); begin - return self.XmlAttrCount.Value; + return {self.}XmlAttrCount.Value; end; function LatenStyles.WriteXmlAttrCount(_value); begin - self.XmlAttrCount.Value := _value; + {self.}XmlAttrCount.Value := _value; end; diff --git a/autoclass/docx/Latin@DOCX.tsf b/autoclass/docx/Latin@DOCX.tsf index 82614b6..1d9e822 100644 --- a/autoclass/docx/Latin@DOCX.tsf +++ b/autoclass/docx/Latin@DOCX.tsf @@ -27,7 +27,7 @@ end; function Latin.Create();overload; begin - self.Create(nil, "a", "latin"); + {self.}Create(nil, "a", "latin"); end; function Latin.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function Latin.Init();override; begin - self.XmlAttrTypeface := new OpenXmlAttribute(nil, "typeface", nil); - self.XmlAttrPanose := new OpenXmlAttribute(nil, "panose", nil); + {self.}XmlAttrTypeface := new OpenXmlAttribute(nil, "typeface", nil); + {self.}XmlAttrPanose := new OpenXmlAttribute(nil, "panose", nil); end; function Latin.InitAttributes();override; begin attributes_ := array( - self.XmlAttrTypeface, - self.XmlAttrPanose, + {self.}XmlAttrTypeface, + {self.}XmlAttrPanose, ); end; @@ -65,35 +65,35 @@ end; function Latin.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Latin.Copy(_obj: Latin);override; begin if not ifnil(_obj.XmlAttrTypeface.Value) then - self.XmlAttrTypeface.Value := _obj.XmlAttrTypeface.Value; + {self.}XmlAttrTypeface.Value := _obj.XmlAttrTypeface.Value; if not ifnil(_obj.XmlAttrPanose.Value) then - self.XmlAttrPanose.Value := _obj.XmlAttrPanose.Value; + {self.}XmlAttrPanose.Value := _obj.XmlAttrPanose.Value; end; function Latin.ReadXmlAttrTypeface(); begin - return self.XmlAttrTypeface.Value; + return {self.}XmlAttrTypeface.Value; end; function Latin.WriteXmlAttrTypeface(_value); begin - self.XmlAttrTypeface.Value := _value; + {self.}XmlAttrTypeface.Value := _value; end; function Latin.ReadXmlAttrPanose(); begin - return self.XmlAttrPanose.Value; + return {self.}XmlAttrPanose.Value; end; function Latin.WriteXmlAttrPanose(_value); begin - self.XmlAttrPanose.Value := _value; + {self.}XmlAttrPanose.Value := _value; end; diff --git a/autoclass/docx/Legend@DOCX.tsf b/autoclass/docx/Legend@DOCX.tsf index 12c8aec..7b892a8 100644 --- a/autoclass/docx/Legend@DOCX.tsf +++ b/autoclass/docx/Legend@DOCX.tsf @@ -26,7 +26,7 @@ end; function Legend.Create();overload; begin - self.Create(nil, "c", "legend"); + {self.}Create(nil, "c", "legend"); end; function Legend.Create(_node: XmlNode);overload; @@ -41,10 +41,10 @@ end; function Legend.Init();override; begin - self.LegendPos := new PureVal(self, self.Prefix, "legendPos"); - self.XmlChildLayout := new OpenXmlEmpty(self, self.Prefix, "layout"); - self.Overlay := new PureVal(self, self.Prefix, "overlay"); - self.TxPr := new TxPr(self, self.Prefix, "txPr"); + {self.}LegendPos := new PureVal(self, {self.}Prefix, "legendPos"); + {self.}XmlChildLayout := new OpenXmlEmpty(self, {self.}Prefix, "layout"); + {self.}Overlay := new PureVal(self, {self.}Prefix, "overlay"); + {self.}TxPr := new TxPr(self, {self.}Prefix, "txPr"); end; function Legend.InitAttributes();override; @@ -56,25 +56,25 @@ end; function Legend.InitChildren();override; begin child_elements_ := array( - 0: self.LegendPos, - 1: self.XmlChildLayout, - 2: self.Overlay, - 3: self.TxPr, + 0: {self.}LegendPos, + 1: {self.}XmlChildLayout, + 2: {self.}Overlay, + 3: {self.}TxPr, ); sorted_child_ := array( "": -1, - self.LegendPos.ElementName: 0, - self.XmlChildLayout.ElementName: 1, - self.Overlay.ElementName: 2, - self.TxPr.ElementName: 3, + {self.}LegendPos.ElementName: 0, + {self.}XmlChildLayout.ElementName: 1, + {self.}Overlay.ElementName: 2, + {self.}TxPr.ElementName: 3, ); end; function Legend.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -83,7 +83,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -110,18 +110,18 @@ end; function Legend.Copy(_obj: Legend);override; begin - self.LegendPos.Copy(_obj.LegendPos); - self.XmlChildLayout.Copy(_obj.XmlChildLayout); - self.Overlay.Copy(_obj.Overlay); - self.TxPr.Copy(_obj.TxPr); + {self.}LegendPos.Copy(_obj.LegendPos); + {self.}XmlChildLayout.Copy(_obj.XmlChildLayout); + {self.}Overlay.Copy(_obj.Overlay); + {self.}TxPr.Copy(_obj.TxPr); end; function Legend.ReadXmlChildLayout(); begin - return ifnil(self.XmlChildLayout.Value) ? false : true; + return ifnil({self.}XmlChildLayout.Value) ? false : true; end; function Legend.WriteXmlChildLayout(_value); begin - self.XmlChildLayout.Value := _value; + {self.}XmlChildLayout.Value := _value; end; diff --git a/autoclass/docx/Lin@DOCX.tsf b/autoclass/docx/Lin@DOCX.tsf index 8d06d95..17130a6 100644 --- a/autoclass/docx/Lin@DOCX.tsf +++ b/autoclass/docx/Lin@DOCX.tsf @@ -27,7 +27,7 @@ end; function Lin.Create();overload; begin - self.Create(nil, "a", "lin"); + {self.}Create(nil, "a", "lin"); end; function Lin.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function Lin.Init();override; begin - self.XmlAttrAng := new OpenXmlAttribute(nil, "ang", nil); - self.XmlAttrScaled := new OpenXmlAttribute(nil, "scaled", nil); + {self.}XmlAttrAng := new OpenXmlAttribute(nil, "ang", nil); + {self.}XmlAttrScaled := new OpenXmlAttribute(nil, "scaled", nil); end; function Lin.InitAttributes();override; begin attributes_ := array( - self.XmlAttrAng, - self.XmlAttrScaled, + {self.}XmlAttrAng, + {self.}XmlAttrScaled, ); end; @@ -65,35 +65,35 @@ end; function Lin.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Lin.Copy(_obj: Lin);override; begin if not ifnil(_obj.XmlAttrAng.Value) then - self.XmlAttrAng.Value := _obj.XmlAttrAng.Value; + {self.}XmlAttrAng.Value := _obj.XmlAttrAng.Value; if not ifnil(_obj.XmlAttrScaled.Value) then - self.XmlAttrScaled.Value := _obj.XmlAttrScaled.Value; + {self.}XmlAttrScaled.Value := _obj.XmlAttrScaled.Value; end; function Lin.ReadXmlAttrAng(); begin - return self.XmlAttrAng.Value; + return {self.}XmlAttrAng.Value; end; function Lin.WriteXmlAttrAng(_value); begin - self.XmlAttrAng.Value := _value; + {self.}XmlAttrAng.Value := _value; end; function Lin.ReadXmlAttrScaled(); begin - return self.XmlAttrScaled.Value; + return {self.}XmlAttrScaled.Value; end; function Lin.WriteXmlAttrScaled(_value); begin - self.XmlAttrScaled.Value := _value; + {self.}XmlAttrScaled.Value := _value; end; diff --git a/autoclass/docx/Ln@DOCX.tsf b/autoclass/docx/Ln@DOCX.tsf index af90276..a74dec2 100644 --- a/autoclass/docx/Ln@DOCX.tsf +++ b/autoclass/docx/Ln@DOCX.tsf @@ -38,7 +38,7 @@ end; function Ln.Create();overload; begin - self.Create(nil, "a", "ln"); + {self.}Create(nil, "a", "ln"); end; function Ln.Create(_node: XmlNode);overload; @@ -53,45 +53,45 @@ end; function Ln.Init();override; begin - self.XmlAttrW := new OpenXmlAttribute(nil, "w", nil); - self.XmlAttrCap := new OpenXmlAttribute(nil, "cap", nil); - self.XmlAttrCmpd := new OpenXmlAttribute(nil, "cmpd", nil); - self.XmlAttrAlgn := new OpenXmlAttribute(nil, "algn", nil); - self.SolidFill := new SolidFill(self, self.Prefix, "solidFill"); - self.PrstDash := new PureVal(self, self.Prefix, "prstDash"); - self.Miter := new Miter(self, self.Prefix, "miter"); + {self.}XmlAttrW := new OpenXmlAttribute(nil, "w", nil); + {self.}XmlAttrCap := new OpenXmlAttribute(nil, "cap", nil); + {self.}XmlAttrCmpd := new OpenXmlAttribute(nil, "cmpd", nil); + {self.}XmlAttrAlgn := new OpenXmlAttribute(nil, "algn", nil); + {self.}SolidFill := new SolidFill(self, {self.}Prefix, "solidFill"); + {self.}PrstDash := new PureVal(self, {self.}Prefix, "prstDash"); + {self.}Miter := new Miter(self, {self.}Prefix, "miter"); end; function Ln.InitAttributes();override; begin attributes_ := array( - self.XmlAttrW, - self.XmlAttrCap, - self.XmlAttrCmpd, - self.XmlAttrAlgn, + {self.}XmlAttrW, + {self.}XmlAttrCap, + {self.}XmlAttrCmpd, + {self.}XmlAttrAlgn, ); end; function Ln.InitChildren();override; begin child_elements_ := array( - 0: self.SolidFill, - 1: self.PrstDash, - 2: self.Miter, + 0: {self.}SolidFill, + 1: {self.}PrstDash, + 2: {self.}Miter, ); sorted_child_ := array( "": -1, - self.SolidFill.ElementName: 0, - self.PrstDash.ElementName: 1, - self.Miter.ElementName: 2, + {self.}SolidFill.ElementName: 0, + {self.}PrstDash.ElementName: 1, + {self.}Miter.ElementName: 2, ); end; function Ln.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -100,7 +100,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -128,54 +128,54 @@ end; function Ln.Copy(_obj: Ln);override; begin if not ifnil(_obj.XmlAttrW.Value) then - self.XmlAttrW.Value := _obj.XmlAttrW.Value; + {self.}XmlAttrW.Value := _obj.XmlAttrW.Value; if not ifnil(_obj.XmlAttrCap.Value) then - self.XmlAttrCap.Value := _obj.XmlAttrCap.Value; + {self.}XmlAttrCap.Value := _obj.XmlAttrCap.Value; if not ifnil(_obj.XmlAttrCmpd.Value) then - self.XmlAttrCmpd.Value := _obj.XmlAttrCmpd.Value; + {self.}XmlAttrCmpd.Value := _obj.XmlAttrCmpd.Value; if not ifnil(_obj.XmlAttrAlgn.Value) then - self.XmlAttrAlgn.Value := _obj.XmlAttrAlgn.Value; - self.SolidFill.Copy(_obj.SolidFill); - self.PrstDash.Copy(_obj.PrstDash); - self.Miter.Copy(_obj.Miter); + {self.}XmlAttrAlgn.Value := _obj.XmlAttrAlgn.Value; + {self.}SolidFill.Copy(_obj.SolidFill); + {self.}PrstDash.Copy(_obj.PrstDash); + {self.}Miter.Copy(_obj.Miter); end; function Ln.ReadXmlAttrW(); begin - return self.XmlAttrW.Value; + return {self.}XmlAttrW.Value; end; function Ln.WriteXmlAttrW(_value); begin - self.XmlAttrW.Value := _value; + {self.}XmlAttrW.Value := _value; end; function Ln.ReadXmlAttrCap(); begin - return self.XmlAttrCap.Value; + return {self.}XmlAttrCap.Value; end; function Ln.WriteXmlAttrCap(_value); begin - self.XmlAttrCap.Value := _value; + {self.}XmlAttrCap.Value := _value; end; function Ln.ReadXmlAttrCmpd(); begin - return self.XmlAttrCmpd.Value; + return {self.}XmlAttrCmpd.Value; end; function Ln.WriteXmlAttrCmpd(_value); begin - self.XmlAttrCmpd.Value := _value; + {self.}XmlAttrCmpd.Value := _value; end; function Ln.ReadXmlAttrAlgn(); begin - return self.XmlAttrAlgn.Value; + return {self.}XmlAttrAlgn.Value; end; function Ln.WriteXmlAttrAlgn(_value); begin - self.XmlAttrAlgn.Value := _value; + {self.}XmlAttrAlgn.Value := _value; end; diff --git a/autoclass/docx/LnStyleLst@DOCX.tsf b/autoclass/docx/LnStyleLst@DOCX.tsf index b4b71a1..7b9c1b0 100644 --- a/autoclass/docx/LnStyleLst@DOCX.tsf +++ b/autoclass/docx/LnStyleLst@DOCX.tsf @@ -23,7 +23,7 @@ end; function LnStyleLst.Create();overload; begin - self.Create(nil, "a", "lnStyleLst"); + {self.}Create(nil, "a", "lnStyleLst"); end; function LnStyleLst.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function LnStyleLst.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "ln": obj := self.AppendLn(); + pre + "ln": obj := {self.}AppendLn(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "ln" then break; end - obj := new Ln(self, self.Prefix, "ln"); - self.InsertChild(obj, i+1); + obj := new Ln(self, {self.}Prefix, "ln"); + {self.}InsertChild(obj, i+1); return obj; end; function LnStyleLst.AppendLn(): Ln; begin - obj := new Ln(self, self.Prefix, "ln"); + obj := new Ln(self, {self.}Prefix, "ln"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/LsdException@DOCX.tsf b/autoclass/docx/LsdException@DOCX.tsf index 59d168b..734d33d 100644 --- a/autoclass/docx/LsdException@DOCX.tsf +++ b/autoclass/docx/LsdException@DOCX.tsf @@ -39,7 +39,7 @@ end; function LsdException.Create();overload; begin - self.Create(nil, "w", "lsdException"); + {self.}Create(nil, "w", "lsdException"); end; function LsdException.Create(_node: XmlNode);overload; @@ -54,21 +54,21 @@ end; function LsdException.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(self.Prefix, "name", nil); - self.XmlAttrUIPriority := new OpenXmlAttribute(self.Prefix, "uiPriority", nil); - self.XmlAttrSemiHidden := new OpenXmlAttribute(self.Prefix, "semiHidden", nil); - self.XmlAttrUnhideWhenUsed := new OpenXmlAttribute(self.Prefix, "unhideWhenUsed", nil); - self.XmlAttrQFormat := new OpenXmlAttribute(self.Prefix, "qFormat", nil); + {self.}XmlAttrName := new OpenXmlAttribute({self.}Prefix, "name", nil); + {self.}XmlAttrUIPriority := new OpenXmlAttribute({self.}Prefix, "uiPriority", nil); + {self.}XmlAttrSemiHidden := new OpenXmlAttribute({self.}Prefix, "semiHidden", nil); + {self.}XmlAttrUnhideWhenUsed := new OpenXmlAttribute({self.}Prefix, "unhideWhenUsed", nil); + {self.}XmlAttrQFormat := new OpenXmlAttribute({self.}Prefix, "qFormat", nil); end; function LsdException.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, - self.XmlAttrUIPriority, - self.XmlAttrSemiHidden, - self.XmlAttrUnhideWhenUsed, - self.XmlAttrQFormat, + {self.}XmlAttrName, + {self.}XmlAttrUIPriority, + {self.}XmlAttrSemiHidden, + {self.}XmlAttrUnhideWhenUsed, + {self.}XmlAttrQFormat, ); end; @@ -83,71 +83,71 @@ end; function LsdException.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function LsdException.Copy(_obj: LsdException);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; if not ifnil(_obj.XmlAttrUIPriority.Value) then - self.XmlAttrUIPriority.Value := _obj.XmlAttrUIPriority.Value; + {self.}XmlAttrUIPriority.Value := _obj.XmlAttrUIPriority.Value; if not ifnil(_obj.XmlAttrSemiHidden.Value) then - self.XmlAttrSemiHidden.Value := _obj.XmlAttrSemiHidden.Value; + {self.}XmlAttrSemiHidden.Value := _obj.XmlAttrSemiHidden.Value; if not ifnil(_obj.XmlAttrUnhideWhenUsed.Value) then - self.XmlAttrUnhideWhenUsed.Value := _obj.XmlAttrUnhideWhenUsed.Value; + {self.}XmlAttrUnhideWhenUsed.Value := _obj.XmlAttrUnhideWhenUsed.Value; if not ifnil(_obj.XmlAttrQFormat.Value) then - self.XmlAttrQFormat.Value := _obj.XmlAttrQFormat.Value; + {self.}XmlAttrQFormat.Value := _obj.XmlAttrQFormat.Value; end; function LsdException.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function LsdException.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; function LsdException.ReadXmlAttrUIPriority(); begin - return self.XmlAttrUIPriority.Value; + return {self.}XmlAttrUIPriority.Value; end; function LsdException.WriteXmlAttrUIPriority(_value); begin - self.XmlAttrUIPriority.Value := _value; + {self.}XmlAttrUIPriority.Value := _value; end; function LsdException.ReadXmlAttrSemiHidden(); begin - return self.XmlAttrSemiHidden.Value; + return {self.}XmlAttrSemiHidden.Value; end; function LsdException.WriteXmlAttrSemiHidden(_value); begin - self.XmlAttrSemiHidden.Value := _value; + {self.}XmlAttrSemiHidden.Value := _value; end; function LsdException.ReadXmlAttrUnhideWhenUsed(); begin - return self.XmlAttrUnhideWhenUsed.Value; + return {self.}XmlAttrUnhideWhenUsed.Value; end; function LsdException.WriteXmlAttrUnhideWhenUsed(_value); begin - self.XmlAttrUnhideWhenUsed.Value := _value; + {self.}XmlAttrUnhideWhenUsed.Value := _value; end; function LsdException.ReadXmlAttrQFormat(); begin - return self.XmlAttrQFormat.Value; + return {self.}XmlAttrQFormat.Value; end; function LsdException.WriteXmlAttrQFormat(_value); begin - self.XmlAttrQFormat.Value := _value; + {self.}XmlAttrQFormat.Value := _value; end; diff --git a/autoclass/docx/Lvl@DOCX.tsf b/autoclass/docx/Lvl@DOCX.tsf index 1be2798..56d70ef 100644 --- a/autoclass/docx/Lvl@DOCX.tsf +++ b/autoclass/docx/Lvl@DOCX.tsf @@ -35,7 +35,7 @@ end; function Lvl.Create();overload; begin - self.Create(nil, "w", "lvl"); + {self.}Create(nil, "w", "lvl"); end; function Lvl.Create(_node: XmlNode);overload; @@ -50,56 +50,56 @@ end; function Lvl.Init();override; begin - self.XmlAttrIlvl := new OpenXmlAttribute(self.Prefix, "ilvl", nil); - self.XmlAttrTentative := new OpenXmlAttribute(self.Prefix, "tentative", nil); - self.Start := new PureWVal(self, self.Prefix, "start"); - self.NumFmt := new PureWVal(self, self.Prefix, "numFmt"); - self.PStyle := new PureWVal(self, self.Prefix, "pStyle"); - self.Suff := new PureWVal(self, self.Prefix, "suff"); - self.LvlText := new PureWVal(self, self.Prefix, "lvlText"); - self.LvlJc := new PureWVal(self, self.Prefix, "lvlJc"); - self.PPr := new PPr(self, self.Prefix, "pPr"); - self.RPr := new RPr(self, self.Prefix, "rPr"); + {self.}XmlAttrIlvl := new OpenXmlAttribute({self.}Prefix, "ilvl", nil); + {self.}XmlAttrTentative := new OpenXmlAttribute({self.}Prefix, "tentative", nil); + {self.}Start := new PureWVal(self, {self.}Prefix, "start"); + {self.}NumFmt := new PureWVal(self, {self.}Prefix, "numFmt"); + {self.}PStyle := new PureWVal(self, {self.}Prefix, "pStyle"); + {self.}Suff := new PureWVal(self, {self.}Prefix, "suff"); + {self.}LvlText := new PureWVal(self, {self.}Prefix, "lvlText"); + {self.}LvlJc := new PureWVal(self, {self.}Prefix, "lvlJc"); + {self.}PPr := new PPr(self, {self.}Prefix, "pPr"); + {self.}RPr := new RPr(self, {self.}Prefix, "rPr"); end; function Lvl.InitAttributes();override; begin attributes_ := array( - self.XmlAttrIlvl, - self.XmlAttrTentative, + {self.}XmlAttrIlvl, + {self.}XmlAttrTentative, ); end; function Lvl.InitChildren();override; begin child_elements_ := array( - 0: self.Start, - 1: self.NumFmt, - 2: self.PStyle, - 3: self.Suff, - 4: self.LvlText, - 5: self.LvlJc, - 6: self.PPr, - 7: self.RPr, + 0: {self.}Start, + 1: {self.}NumFmt, + 2: {self.}PStyle, + 3: {self.}Suff, + 4: {self.}LvlText, + 5: {self.}LvlJc, + 6: {self.}PPr, + 7: {self.}RPr, ); sorted_child_ := array( "": -1, - self.Start.ElementName: 0, - self.NumFmt.ElementName: 1, - self.PStyle.ElementName: 2, - self.Suff.ElementName: 3, - self.LvlText.ElementName: 4, - self.LvlJc.ElementName: 5, - self.PPr.ElementName: 6, - self.RPr.ElementName: 7, + {self.}Start.ElementName: 0, + {self.}NumFmt.ElementName: 1, + {self.}PStyle.ElementName: 2, + {self.}Suff.ElementName: 3, + {self.}LvlText.ElementName: 4, + {self.}LvlJc.ElementName: 5, + {self.}PPr.ElementName: 6, + {self.}RPr.ElementName: 7, ); end; function Lvl.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -108,7 +108,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -136,35 +136,35 @@ end; function Lvl.Copy(_obj: Lvl);override; begin if not ifnil(_obj.XmlAttrIlvl.Value) then - self.XmlAttrIlvl.Value := _obj.XmlAttrIlvl.Value; + {self.}XmlAttrIlvl.Value := _obj.XmlAttrIlvl.Value; if not ifnil(_obj.XmlAttrTentative.Value) then - self.XmlAttrTentative.Value := _obj.XmlAttrTentative.Value; - self.Start.Copy(_obj.Start); - self.NumFmt.Copy(_obj.NumFmt); - self.PStyle.Copy(_obj.PStyle); - self.Suff.Copy(_obj.Suff); - self.LvlText.Copy(_obj.LvlText); - self.LvlJc.Copy(_obj.LvlJc); - self.PPr.Copy(_obj.PPr); - self.RPr.Copy(_obj.RPr); + {self.}XmlAttrTentative.Value := _obj.XmlAttrTentative.Value; + {self.}Start.Copy(_obj.Start); + {self.}NumFmt.Copy(_obj.NumFmt); + {self.}PStyle.Copy(_obj.PStyle); + {self.}Suff.Copy(_obj.Suff); + {self.}LvlText.Copy(_obj.LvlText); + {self.}LvlJc.Copy(_obj.LvlJc); + {self.}PPr.Copy(_obj.PPr); + {self.}RPr.Copy(_obj.RPr); end; function Lvl.ReadXmlAttrIlvl(); begin - return self.XmlAttrIlvl.Value; + return {self.}XmlAttrIlvl.Value; end; function Lvl.WriteXmlAttrIlvl(_value); begin - self.XmlAttrIlvl.Value := _value; + {self.}XmlAttrIlvl.Value := _value; end; function Lvl.ReadXmlAttrTentative(); begin - return self.XmlAttrTentative.Value; + return {self.}XmlAttrTentative.Value; end; function Lvl.WriteXmlAttrTentative(_value); begin - self.XmlAttrTentative.Value := _value; + {self.}XmlAttrTentative.Value := _value; end; diff --git a/autoclass/docx/MFont@DOCX.tsf b/autoclass/docx/MFont@DOCX.tsf index ec072e7..50a1ccc 100644 --- a/autoclass/docx/MFont@DOCX.tsf +++ b/autoclass/docx/MFont@DOCX.tsf @@ -26,7 +26,7 @@ end; function MFont.Create();overload; begin - self.Create(nil, "a", ""); + {self.}Create(nil, "a", ""); end; function MFont.Create(_node: XmlNode);overload; @@ -41,9 +41,9 @@ end; function MFont.Init();override; begin - self.Latin := new Latin(self, self.Prefix, "latin"); - self.Ea := new Latin(self, self.Prefix, "ea"); - self.Cs := new Latin(self, self.Prefix, "cs"); + {self.}Latin := new Latin(self, {self.}Prefix, "latin"); + {self.}Ea := new Latin(self, {self.}Prefix, "ea"); + {self.}Cs := new Latin(self, {self.}Prefix, "cs"); end; function MFont.InitAttributes();override; @@ -55,23 +55,23 @@ end; function MFont.InitChildren();override; begin child_elements_ := array( - 0: self.Latin, - 1: self.Ea, - 2: self.Cs, + 0: {self.}Latin, + 1: {self.}Ea, + 2: {self.}Cs, ); sorted_child_ := array( "": -1, - self.Latin.ElementName: 0, - self.Ea.ElementName: 1, - self.Cs.ElementName: 2, + {self.}Latin.ElementName: 0, + {self.}Ea.ElementName: 1, + {self.}Cs.ElementName: 2, ); end; function MFont.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -80,7 +80,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -89,7 +89,7 @@ begin begin obj := nil; case node_name of - pre + "font": obj := self.AppendFont(); + pre + "font": obj := {self.}AppendFont(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,9 +108,9 @@ end; function MFont.Copy(_obj: MFont);override; begin - self.Latin.Copy(_obj.Latin); - self.Ea.Copy(_obj.Ea); - self.Cs.Copy(_obj.Cs); + {self.}Latin.Copy(_obj.Latin); + {self.}Ea.Copy(_obj.Ea); + {self.}Cs.Copy(_obj.Cs); end; function MFont.AddFont(): MFontFont; @@ -121,14 +121,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "font" then break; end - obj := new MFontFont(self, self.Prefix, "font"); - self.InsertChild(obj, i+1); + obj := new MFontFont(self, {self.}Prefix, "font"); + {self.}InsertChild(obj, i+1); return obj; end; function MFont.AppendFont(): MFontFont; begin - obj := new MFontFont(self, self.Prefix, "font"); + obj := new MFontFont(self, {self.}Prefix, "font"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/MFontFont@DOCX.tsf b/autoclass/docx/MFontFont@DOCX.tsf index 81a92dd..c89e688 100644 --- a/autoclass/docx/MFontFont@DOCX.tsf +++ b/autoclass/docx/MFontFont@DOCX.tsf @@ -27,7 +27,7 @@ end; function MFontFont.Create();overload; begin - self.Create(nil, "a", "defRPr"); + {self.}Create(nil, "a", "defRPr"); end; function MFontFont.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function MFontFont.Init();override; begin - self.XmlAttrScript := new OpenXmlAttribute(nil, "script", nil); - self.XmlAttrTypeface := new OpenXmlAttribute(nil, "typeface", nil); + {self.}XmlAttrScript := new OpenXmlAttribute(nil, "script", nil); + {self.}XmlAttrTypeface := new OpenXmlAttribute(nil, "typeface", nil); end; function MFontFont.InitAttributes();override; begin attributes_ := array( - self.XmlAttrScript, - self.XmlAttrTypeface, + {self.}XmlAttrScript, + {self.}XmlAttrTypeface, ); end; @@ -65,35 +65,35 @@ end; function MFontFont.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function MFontFont.Copy(_obj: MFontFont);override; begin if not ifnil(_obj.XmlAttrScript.Value) then - self.XmlAttrScript.Value := _obj.XmlAttrScript.Value; + {self.}XmlAttrScript.Value := _obj.XmlAttrScript.Value; if not ifnil(_obj.XmlAttrTypeface.Value) then - self.XmlAttrTypeface.Value := _obj.XmlAttrTypeface.Value; + {self.}XmlAttrTypeface.Value := _obj.XmlAttrTypeface.Value; end; function MFontFont.ReadXmlAttrScript(); begin - return self.XmlAttrScript.Value; + return {self.}XmlAttrScript.Value; end; function MFontFont.WriteXmlAttrScript(_value); begin - self.XmlAttrScript.Value := _value; + {self.}XmlAttrScript.Value := _value; end; function MFontFont.ReadXmlAttrTypeface(); begin - return self.XmlAttrTypeface.Value; + return {self.}XmlAttrTypeface.Value; end; function MFontFont.WriteXmlAttrTypeface(_value); begin - self.XmlAttrTypeface.Value := _value; + {self.}XmlAttrTypeface.Value := _value; end; diff --git a/autoclass/docx/MathPr@DOCX.tsf b/autoclass/docx/MathPr@DOCX.tsf index 801f373..6f79567 100644 --- a/autoclass/docx/MathPr@DOCX.tsf +++ b/autoclass/docx/MathPr@DOCX.tsf @@ -33,7 +33,7 @@ end; function MathPr.Create();overload; begin - self.Create(nil, "m", "mathPr"); + {self.}Create(nil, "m", "mathPr"); end; function MathPr.Create(_node: XmlNode);overload; @@ -48,17 +48,17 @@ end; function MathPr.Init();override; begin - self.MathFont := new PureWVal(self, self.Prefix, "mathFont"); - self.BrkBin := new PureWVal(self, self.Prefix, "brkBin"); - self.BrkBinSub := new PureWVal(self, self.Prefix, "brkBinSub"); - self.SmallFrac := new PureWVal(self, self.Prefix, "smallFrac"); - self.XmlChildDispDef := new OpenXmlEmpty(self, self.Prefix, "dispDef"); - self.LMargin := new PureWVal(self, self.Prefix, "lMargin"); - self.RMargin := new PureWVal(self, self.Prefix, "rMargin"); - self.DefJc := new PureWVal(self, self.Prefix, "defJc"); - self.WrapIndent := new PureWVal(self, self.Prefix, "wrapIndent"); - self.IntLim := new PureWVal(self, self.Prefix, "intLim"); - self.NaryLim := new PureWVal(self, self.Prefix, "naryLim"); + {self.}MathFont := new PureWVal(self, {self.}Prefix, "mathFont"); + {self.}BrkBin := new PureWVal(self, {self.}Prefix, "brkBin"); + {self.}BrkBinSub := new PureWVal(self, {self.}Prefix, "brkBinSub"); + {self.}SmallFrac := new PureWVal(self, {self.}Prefix, "smallFrac"); + {self.}XmlChildDispDef := new OpenXmlEmpty(self, {self.}Prefix, "dispDef"); + {self.}LMargin := new PureWVal(self, {self.}Prefix, "lMargin"); + {self.}RMargin := new PureWVal(self, {self.}Prefix, "rMargin"); + {self.}DefJc := new PureWVal(self, {self.}Prefix, "defJc"); + {self.}WrapIndent := new PureWVal(self, {self.}Prefix, "wrapIndent"); + {self.}IntLim := new PureWVal(self, {self.}Prefix, "intLim"); + {self.}NaryLim := new PureWVal(self, {self.}Prefix, "naryLim"); end; function MathPr.InitAttributes();override; @@ -70,39 +70,39 @@ end; function MathPr.InitChildren();override; begin child_elements_ := array( - 0: self.MathFont, - 1: self.BrkBin, - 2: self.BrkBinSub, - 3: self.SmallFrac, - 4: self.XmlChildDispDef, - 5: self.LMargin, - 6: self.RMargin, - 7: self.DefJc, - 8: self.WrapIndent, - 9: self.IntLim, - 10: self.NaryLim, + 0: {self.}MathFont, + 1: {self.}BrkBin, + 2: {self.}BrkBinSub, + 3: {self.}SmallFrac, + 4: {self.}XmlChildDispDef, + 5: {self.}LMargin, + 6: {self.}RMargin, + 7: {self.}DefJc, + 8: {self.}WrapIndent, + 9: {self.}IntLim, + 10: {self.}NaryLim, ); sorted_child_ := array( "": -1, - self.MathFont.ElementName: 0, - self.BrkBin.ElementName: 1, - self.BrkBinSub.ElementName: 2, - self.SmallFrac.ElementName: 3, - self.XmlChildDispDef.ElementName: 4, - self.LMargin.ElementName: 5, - self.RMargin.ElementName: 6, - self.DefJc.ElementName: 7, - self.WrapIndent.ElementName: 8, - self.IntLim.ElementName: 9, - self.NaryLim.ElementName: 10, + {self.}MathFont.ElementName: 0, + {self.}BrkBin.ElementName: 1, + {self.}BrkBinSub.ElementName: 2, + {self.}SmallFrac.ElementName: 3, + {self.}XmlChildDispDef.ElementName: 4, + {self.}LMargin.ElementName: 5, + {self.}RMargin.ElementName: 6, + {self.}DefJc.ElementName: 7, + {self.}WrapIndent.ElementName: 8, + {self.}IntLim.ElementName: 9, + {self.}NaryLim.ElementName: 10, ); end; function MathPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -111,7 +111,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -138,25 +138,25 @@ end; function MathPr.Copy(_obj: MathPr);override; begin - self.MathFont.Copy(_obj.MathFont); - self.BrkBin.Copy(_obj.BrkBin); - self.BrkBinSub.Copy(_obj.BrkBinSub); - self.SmallFrac.Copy(_obj.SmallFrac); - self.XmlChildDispDef.Copy(_obj.XmlChildDispDef); - self.LMargin.Copy(_obj.LMargin); - self.RMargin.Copy(_obj.RMargin); - self.DefJc.Copy(_obj.DefJc); - self.WrapIndent.Copy(_obj.WrapIndent); - self.IntLim.Copy(_obj.IntLim); - self.NaryLim.Copy(_obj.NaryLim); + {self.}MathFont.Copy(_obj.MathFont); + {self.}BrkBin.Copy(_obj.BrkBin); + {self.}BrkBinSub.Copy(_obj.BrkBinSub); + {self.}SmallFrac.Copy(_obj.SmallFrac); + {self.}XmlChildDispDef.Copy(_obj.XmlChildDispDef); + {self.}LMargin.Copy(_obj.LMargin); + {self.}RMargin.Copy(_obj.RMargin); + {self.}DefJc.Copy(_obj.DefJc); + {self.}WrapIndent.Copy(_obj.WrapIndent); + {self.}IntLim.Copy(_obj.IntLim); + {self.}NaryLim.Copy(_obj.NaryLim); end; function MathPr.ReadXmlChildDispDef(); begin - return ifnil(self.XmlChildDispDef.Value) ? false : true; + return ifnil({self.}XmlChildDispDef.Value) ? false : true; end; function MathPr.WriteXmlChildDispDef(_value); begin - self.XmlChildDispDef.Value := _value; + {self.}XmlChildDispDef.Value := _value; end; diff --git a/autoclass/docx/Miter@DOCX.tsf b/autoclass/docx/Miter@DOCX.tsf index ac94705..d893263 100644 --- a/autoclass/docx/Miter@DOCX.tsf +++ b/autoclass/docx/Miter@DOCX.tsf @@ -23,7 +23,7 @@ end; function Miter.Create();overload; begin - self.Create(nil, "a", "miter"); + {self.}Create(nil, "a", "miter"); end; function Miter.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function Miter.Init();override; begin - self.XmlAttrLim := new OpenXmlAttribute(nil, "lim", nil); + {self.}XmlAttrLim := new OpenXmlAttribute(nil, "lim", nil); end; function Miter.InitAttributes();override; begin attributes_ := array( - self.XmlAttrLim, + {self.}XmlAttrLim, ); end; @@ -59,23 +59,23 @@ end; function Miter.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Miter.Copy(_obj: Miter);override; begin if not ifnil(_obj.XmlAttrLim.Value) then - self.XmlAttrLim.Value := _obj.XmlAttrLim.Value; + {self.}XmlAttrLim.Value := _obj.XmlAttrLim.Value; end; function Miter.ReadXmlAttrLim(); begin - return self.XmlAttrLim.Value; + return {self.}XmlAttrLim.Value; end; function Miter.WriteXmlAttrLim(_value); begin - self.XmlAttrLim.Value := _value; + {self.}XmlAttrLim.Value := _value; end; diff --git a/autoclass/docx/Modified@DOCX.tsf b/autoclass/docx/Modified@DOCX.tsf index e681047..0debb7c 100644 --- a/autoclass/docx/Modified@DOCX.tsf +++ b/autoclass/docx/Modified@DOCX.tsf @@ -22,7 +22,7 @@ end; function Modified.Create();overload; begin - self.Create(nil, "dcterms", "modified"); + {self.}Create(nil, "dcterms", "modified"); end; function Modified.Create(_node: XmlNode);overload; @@ -37,35 +37,35 @@ end; function Modified.Init();override; begin - self.XmlAttrXsiType := new OpenXmlAttribute("xsi", "type", nil); + {self.}XmlAttrXsiType := new OpenXmlAttribute("xsi", "type", nil); end; function Modified.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXsiType, + {self.}XmlAttrXsiType, ); end; function Modified.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Modified.Copy(_obj: Modified);override; begin if not ifnil(_obj.XmlAttrXsiType.Value) then - self.XmlAttrXsiType.Value := _obj.XmlAttrXsiType.Value; + {self.}XmlAttrXsiType.Value := _obj.XmlAttrXsiType.Value; end; function Modified.ReadXmlAttrXsiType(); begin - return self.XmlAttrXsiType.Value; + return {self.}XmlAttrXsiType.Value; end; function Modified.WriteXmlAttrXsiType(_value); begin - self.XmlAttrXsiType.Value := _value; + {self.}XmlAttrXsiType.Value := _value; end; diff --git a/autoclass/docx/Num@DOCX.tsf b/autoclass/docx/Num@DOCX.tsf index b1b0030..54757b4 100644 --- a/autoclass/docx/Num@DOCX.tsf +++ b/autoclass/docx/Num@DOCX.tsf @@ -24,7 +24,7 @@ end; function Num.Create();overload; begin - self.Create(nil, "w", "num"); + {self.}Create(nil, "w", "num"); end; function Num.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function Num.Init();override; begin - self.XmlAttrNumId := new OpenXmlAttribute(self.Prefix, "numId", nil); - self.AbstractNumId := new PureWVal(self, self.Prefix, "abstractNumId"); + {self.}XmlAttrNumId := new OpenXmlAttribute({self.}Prefix, "numId", nil); + {self.}AbstractNumId := new PureWVal(self, {self.}Prefix, "abstractNumId"); end; function Num.InitAttributes();override; begin attributes_ := array( - self.XmlAttrNumId, + {self.}XmlAttrNumId, ); end; function Num.InitChildren();override; begin child_elements_ := array( - 0: self.AbstractNumId, + 0: {self.}AbstractNumId, ); sorted_child_ := array( "": -1, - self.AbstractNumId.ElementName: 0, + {self.}AbstractNumId.ElementName: 0, ); end; function Num.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function Num.Copy(_obj: Num);override; begin if not ifnil(_obj.XmlAttrNumId.Value) then - self.XmlAttrNumId.Value := _obj.XmlAttrNumId.Value; - self.AbstractNumId.Copy(_obj.AbstractNumId); + {self.}XmlAttrNumId.Value := _obj.XmlAttrNumId.Value; + {self.}AbstractNumId.Copy(_obj.AbstractNumId); end; function Num.ReadXmlAttrNumId(); begin - return self.XmlAttrNumId.Value; + return {self.}XmlAttrNumId.Value; end; function Num.WriteXmlAttrNumId(_value); begin - self.XmlAttrNumId.Value := _value; + {self.}XmlAttrNumId.Value := _value; end; diff --git a/autoclass/docx/NumFmt@DOCX.tsf b/autoclass/docx/NumFmt@DOCX.tsf index 3416c44..262edc9 100644 --- a/autoclass/docx/NumFmt@DOCX.tsf +++ b/autoclass/docx/NumFmt@DOCX.tsf @@ -27,7 +27,7 @@ end; function NumFmt.Create();overload; begin - self.Create(nil, "c", "numFmt"); + {self.}Create(nil, "c", "numFmt"); end; function NumFmt.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function NumFmt.Init();override; begin - self.XmlAttrFormatCode := new OpenXmlAttribute(nil, "formatCode", nil); - self.XmlAttrSourceLinked := new OpenXmlAttribute(nil, "sourceLinked", nil); + {self.}XmlAttrFormatCode := new OpenXmlAttribute(nil, "formatCode", nil); + {self.}XmlAttrSourceLinked := new OpenXmlAttribute(nil, "sourceLinked", nil); end; function NumFmt.InitAttributes();override; begin attributes_ := array( - self.XmlAttrFormatCode, - self.XmlAttrSourceLinked, + {self.}XmlAttrFormatCode, + {self.}XmlAttrSourceLinked, ); end; @@ -65,35 +65,35 @@ end; function NumFmt.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function NumFmt.Copy(_obj: NumFmt);override; begin if not ifnil(_obj.XmlAttrFormatCode.Value) then - self.XmlAttrFormatCode.Value := _obj.XmlAttrFormatCode.Value; + {self.}XmlAttrFormatCode.Value := _obj.XmlAttrFormatCode.Value; if not ifnil(_obj.XmlAttrSourceLinked.Value) then - self.XmlAttrSourceLinked.Value := _obj.XmlAttrSourceLinked.Value; + {self.}XmlAttrSourceLinked.Value := _obj.XmlAttrSourceLinked.Value; end; function NumFmt.ReadXmlAttrFormatCode(); begin - return self.XmlAttrFormatCode.Value; + return {self.}XmlAttrFormatCode.Value; end; function NumFmt.WriteXmlAttrFormatCode(_value); begin - self.XmlAttrFormatCode.Value := _value; + {self.}XmlAttrFormatCode.Value := _value; end; function NumFmt.ReadXmlAttrSourceLinked(); begin - return self.XmlAttrSourceLinked.Value; + return {self.}XmlAttrSourceLinked.Value; end; function NumFmt.WriteXmlAttrSourceLinked(_value); begin - self.XmlAttrSourceLinked.Value := _value; + {self.}XmlAttrSourceLinked.Value := _value; end; diff --git a/autoclass/docx/NumPr@DOCX.tsf b/autoclass/docx/NumPr@DOCX.tsf index 0ba569b..8db28d3 100644 --- a/autoclass/docx/NumPr@DOCX.tsf +++ b/autoclass/docx/NumPr@DOCX.tsf @@ -20,7 +20,7 @@ end; function NumPr.Create();overload; begin - self.Create(nil, "w", "numPr"); + {self.}Create(nil, "w", "numPr"); end; function NumPr.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function NumPr.Init();override; begin - self.Ilvl := new PureWVal(self, self.Prefix, "ilvl"); - self.NumId := new PureWVal(self, self.Prefix, "numId"); + {self.}Ilvl := new PureWVal(self, {self.}Prefix, "ilvl"); + {self.}NumId := new PureWVal(self, {self.}Prefix, "numId"); end; function NumPr.InitAttributes();override; @@ -48,21 +48,21 @@ end; function NumPr.InitChildren();override; begin child_elements_ := array( - 0: self.Ilvl, - 1: self.NumId, + 0: {self.}Ilvl, + 1: {self.}NumId, ); sorted_child_ := array( "": -1, - self.Ilvl.ElementName: 0, - self.NumId.ElementName: 1, + {self.}Ilvl.ElementName: 0, + {self.}NumId.ElementName: 1, ); end; function NumPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function NumPr.Copy(_obj: NumPr);override; begin - self.Ilvl.Copy(_obj.Ilvl); - self.NumId.Copy(_obj.NumId); + {self.}Ilvl.Copy(_obj.Ilvl); + {self.}NumId.Copy(_obj.NumId); end; diff --git a/autoclass/docx/NumRef@DOCX.tsf b/autoclass/docx/NumRef@DOCX.tsf index 33d9c0c..c0e8630 100644 --- a/autoclass/docx/NumRef@DOCX.tsf +++ b/autoclass/docx/NumRef@DOCX.tsf @@ -20,7 +20,7 @@ end; function NumRef.Create();overload; begin - self.Create(nil, "c", "numRef"); + {self.}Create(nil, "c", "numRef"); end; function NumRef.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function NumRef.Init();override; begin - self.F := new OpenXmlPcdata(self, self.Prefix, "f"); - self.NumCache := new Cache(self, self.Prefix, "numCache"); + {self.}F := new OpenXmlPcdata(self, {self.}Prefix, "f"); + {self.}NumCache := new Cache(self, {self.}Prefix, "numCache"); end; function NumRef.InitAttributes();override; @@ -48,21 +48,21 @@ end; function NumRef.InitChildren();override; begin child_elements_ := array( - 0: self.F, - 1: self.NumCache, + 0: {self.}F, + 1: {self.}NumCache, ); sorted_child_ := array( "": -1, - self.F.ElementName: 0, - self.NumCache.ElementName: 1, + {self.}F.ElementName: 0, + {self.}NumCache.ElementName: 1, ); end; function NumRef.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function NumRef.Copy(_obj: NumRef);override; begin - self.F.Copy(_obj.F); - self.NumCache.Copy(_obj.NumCache); + {self.}F.Copy(_obj.F); + {self.}NumCache.Copy(_obj.NumCache); end; diff --git a/autoclass/docx/Numbering@DOCX.tsf b/autoclass/docx/Numbering@DOCX.tsf index f9c50ec..059da29 100644 --- a/autoclass/docx/Numbering@DOCX.tsf +++ b/autoclass/docx/Numbering@DOCX.tsf @@ -168,7 +168,7 @@ end; function Numbering.Create();overload; begin - self.Create(nil, "w", "numbering"); + {self.}Create(nil, "w", "numbering"); end; function Numbering.Create(_node: XmlNode);overload; @@ -183,81 +183,81 @@ end; function Numbering.Init();override; begin - self.XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); - self.XmlAttrXmlnsCx := new OpenXmlAttribute("xmlns", "cx", nil); - self.XmlAttrXmlnsCx1 := new OpenXmlAttribute("xmlns", "cx1", nil); - self.XmlAttrXmlnsCx2 := new OpenXmlAttribute("xmlns", "cx2", nil); - self.XmlAttrXmlnsCx3 := new OpenXmlAttribute("xmlns", "cx3", nil); - self.XmlAttrXmlnsCx4 := new OpenXmlAttribute("xmlns", "cx4", nil); - self.XmlAttrXmlnsCx5 := new OpenXmlAttribute("xmlns", "cx5", nil); - self.XmlAttrXmlnsCx6 := new OpenXmlAttribute("xmlns", "cx6", nil); - self.XmlAttrXmlnsCx7 := new OpenXmlAttribute("xmlns", "cx7", nil); - self.XmlAttrXmlnsCx8 := new OpenXmlAttribute("xmlns", "cx8", nil); - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsAink := new OpenXmlAttribute("xmlns", "aink", nil); - self.XmlAttrXmlnsAm3d := new OpenXmlAttribute("xmlns", "am3d", nil); - self.XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); - self.XmlAttrXmlnsOel := new OpenXmlAttribute("xmlns", "oel", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); - self.XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); - self.XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); - self.XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); - self.XmlAttrXmlnsW10 := new OpenXmlAttribute("xmlns", "w10", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); - self.XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); - self.XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); - self.XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlAttrXmlnsWpc := new OpenXmlAttribute("xmlns", "wpc", nil); + {self.}XmlAttrXmlnsCx := new OpenXmlAttribute("xmlns", "cx", nil); + {self.}XmlAttrXmlnsCx1 := new OpenXmlAttribute("xmlns", "cx1", nil); + {self.}XmlAttrXmlnsCx2 := new OpenXmlAttribute("xmlns", "cx2", nil); + {self.}XmlAttrXmlnsCx3 := new OpenXmlAttribute("xmlns", "cx3", nil); + {self.}XmlAttrXmlnsCx4 := new OpenXmlAttribute("xmlns", "cx4", nil); + {self.}XmlAttrXmlnsCx5 := new OpenXmlAttribute("xmlns", "cx5", nil); + {self.}XmlAttrXmlnsCx6 := new OpenXmlAttribute("xmlns", "cx6", nil); + {self.}XmlAttrXmlnsCx7 := new OpenXmlAttribute("xmlns", "cx7", nil); + {self.}XmlAttrXmlnsCx8 := new OpenXmlAttribute("xmlns", "cx8", nil); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsAink := new OpenXmlAttribute("xmlns", "aink", nil); + {self.}XmlAttrXmlnsAm3d := new OpenXmlAttribute("xmlns", "am3d", nil); + {self.}XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); + {self.}XmlAttrXmlnsOel := new OpenXmlAttribute("xmlns", "oel", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); + {self.}XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); + {self.}XmlAttrXmlnsWp14 := new OpenXmlAttribute("xmlns", "wp14", nil); + {self.}XmlAttrXmlnsWp := new OpenXmlAttribute("xmlns", "wp", nil); + {self.}XmlAttrXmlnsW10 := new OpenXmlAttribute("xmlns", "w10", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrXmlnsWpg := new OpenXmlAttribute("xmlns", "wpg", nil); + {self.}XmlAttrXmlnsWpi := new OpenXmlAttribute("xmlns", "wpi", nil); + {self.}XmlAttrXmlnsWne := new OpenXmlAttribute("xmlns", "wne", nil); + {self.}XmlAttrXmlnsWps := new OpenXmlAttribute("xmlns", "wps", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); end; function Numbering.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsWpc, - self.XmlAttrXmlnsCx, - self.XmlAttrXmlnsCx1, - self.XmlAttrXmlnsCx2, - self.XmlAttrXmlnsCx3, - self.XmlAttrXmlnsCx4, - self.XmlAttrXmlnsCx5, - self.XmlAttrXmlnsCx6, - self.XmlAttrXmlnsCx7, - self.XmlAttrXmlnsCx8, - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsAink, - self.XmlAttrXmlnsAm3d, - self.XmlAttrXmlnsO, - self.XmlAttrXmlnsOel, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsM, - self.XmlAttrXmlnsV, - self.XmlAttrXmlnsWp14, - self.XmlAttrXmlnsWp, - self.XmlAttrXmlnsW10, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16sdtdh, - self.XmlAttrXmlnsW16se, - self.XmlAttrXmlnsWpg, - self.XmlAttrXmlnsWpi, - self.XmlAttrXmlnsWne, - self.XmlAttrXmlnsWps, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsWpc, + {self.}XmlAttrXmlnsCx, + {self.}XmlAttrXmlnsCx1, + {self.}XmlAttrXmlnsCx2, + {self.}XmlAttrXmlnsCx3, + {self.}XmlAttrXmlnsCx4, + {self.}XmlAttrXmlnsCx5, + {self.}XmlAttrXmlnsCx6, + {self.}XmlAttrXmlnsCx7, + {self.}XmlAttrXmlnsCx8, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsAink, + {self.}XmlAttrXmlnsAm3d, + {self.}XmlAttrXmlnsO, + {self.}XmlAttrXmlnsOel, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsM, + {self.}XmlAttrXmlnsV, + {self.}XmlAttrXmlnsWp14, + {self.}XmlAttrXmlnsWp, + {self.}XmlAttrXmlnsW10, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16sdtdh, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrXmlnsWpg, + {self.}XmlAttrXmlnsWpi, + {self.}XmlAttrXmlnsWne, + {self.}XmlAttrXmlnsWps, + {self.}XmlAttrMcIgnorable, ); end; @@ -272,9 +272,9 @@ end; function Numbering.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -283,7 +283,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -292,8 +292,8 @@ begin begin obj := nil; case node_name of - pre + "abstractNum": obj := self.AppendAbstractNum(); - pre + "num": obj := self.AppendNum(); + pre + "abstractNum": obj := {self.}AppendAbstractNum(); + pre + "num": obj := {self.}AppendNum(); end; if ifObj(obj) then obj.InitNode(node); end @@ -313,75 +313,75 @@ end; function Numbering.Copy(_obj: Numbering);override; begin if not ifnil(_obj.XmlAttrXmlnsWpc.Value) then - self.XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; + {self.}XmlAttrXmlnsWpc.Value := _obj.XmlAttrXmlnsWpc.Value; if not ifnil(_obj.XmlAttrXmlnsCx.Value) then - self.XmlAttrXmlnsCx.Value := _obj.XmlAttrXmlnsCx.Value; + {self.}XmlAttrXmlnsCx.Value := _obj.XmlAttrXmlnsCx.Value; if not ifnil(_obj.XmlAttrXmlnsCx1.Value) then - self.XmlAttrXmlnsCx1.Value := _obj.XmlAttrXmlnsCx1.Value; + {self.}XmlAttrXmlnsCx1.Value := _obj.XmlAttrXmlnsCx1.Value; if not ifnil(_obj.XmlAttrXmlnsCx2.Value) then - self.XmlAttrXmlnsCx2.Value := _obj.XmlAttrXmlnsCx2.Value; + {self.}XmlAttrXmlnsCx2.Value := _obj.XmlAttrXmlnsCx2.Value; if not ifnil(_obj.XmlAttrXmlnsCx3.Value) then - self.XmlAttrXmlnsCx3.Value := _obj.XmlAttrXmlnsCx3.Value; + {self.}XmlAttrXmlnsCx3.Value := _obj.XmlAttrXmlnsCx3.Value; if not ifnil(_obj.XmlAttrXmlnsCx4.Value) then - self.XmlAttrXmlnsCx4.Value := _obj.XmlAttrXmlnsCx4.Value; + {self.}XmlAttrXmlnsCx4.Value := _obj.XmlAttrXmlnsCx4.Value; if not ifnil(_obj.XmlAttrXmlnsCx5.Value) then - self.XmlAttrXmlnsCx5.Value := _obj.XmlAttrXmlnsCx5.Value; + {self.}XmlAttrXmlnsCx5.Value := _obj.XmlAttrXmlnsCx5.Value; if not ifnil(_obj.XmlAttrXmlnsCx6.Value) then - self.XmlAttrXmlnsCx6.Value := _obj.XmlAttrXmlnsCx6.Value; + {self.}XmlAttrXmlnsCx6.Value := _obj.XmlAttrXmlnsCx6.Value; if not ifnil(_obj.XmlAttrXmlnsCx7.Value) then - self.XmlAttrXmlnsCx7.Value := _obj.XmlAttrXmlnsCx7.Value; + {self.}XmlAttrXmlnsCx7.Value := _obj.XmlAttrXmlnsCx7.Value; if not ifnil(_obj.XmlAttrXmlnsCx8.Value) then - self.XmlAttrXmlnsCx8.Value := _obj.XmlAttrXmlnsCx8.Value; + {self.}XmlAttrXmlnsCx8.Value := _obj.XmlAttrXmlnsCx8.Value; if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsAink.Value) then - self.XmlAttrXmlnsAink.Value := _obj.XmlAttrXmlnsAink.Value; + {self.}XmlAttrXmlnsAink.Value := _obj.XmlAttrXmlnsAink.Value; if not ifnil(_obj.XmlAttrXmlnsAm3d.Value) then - self.XmlAttrXmlnsAm3d.Value := _obj.XmlAttrXmlnsAm3d.Value; + {self.}XmlAttrXmlnsAm3d.Value := _obj.XmlAttrXmlnsAm3d.Value; if not ifnil(_obj.XmlAttrXmlnsO.Value) then - self.XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; if not ifnil(_obj.XmlAttrXmlnsOel.Value) then - self.XmlAttrXmlnsOel.Value := _obj.XmlAttrXmlnsOel.Value; + {self.}XmlAttrXmlnsOel.Value := _obj.XmlAttrXmlnsOel.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsM.Value) then - self.XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; if not ifnil(_obj.XmlAttrXmlnsV.Value) then - self.XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; if not ifnil(_obj.XmlAttrXmlnsWp14.Value) then - self.XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; + {self.}XmlAttrXmlnsWp14.Value := _obj.XmlAttrXmlnsWp14.Value; if not ifnil(_obj.XmlAttrXmlnsWp.Value) then - self.XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; + {self.}XmlAttrXmlnsWp.Value := _obj.XmlAttrXmlnsWp.Value; if not ifnil(_obj.XmlAttrXmlnsW10.Value) then - self.XmlAttrXmlnsW10.Value := _obj.XmlAttrXmlnsW10.Value; + {self.}XmlAttrXmlnsW10.Value := _obj.XmlAttrXmlnsW10.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16sdtdh.Value) then - self.XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrXmlnsWpg.Value) then - self.XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; + {self.}XmlAttrXmlnsWpg.Value := _obj.XmlAttrXmlnsWpg.Value; if not ifnil(_obj.XmlAttrXmlnsWpi.Value) then - self.XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; + {self.}XmlAttrXmlnsWpi.Value := _obj.XmlAttrXmlnsWpi.Value; if not ifnil(_obj.XmlAttrXmlnsWne.Value) then - self.XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; + {self.}XmlAttrXmlnsWne.Value := _obj.XmlAttrXmlnsWne.Value; if not ifnil(_obj.XmlAttrXmlnsWps.Value) then - self.XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; + {self.}XmlAttrXmlnsWps.Value := _obj.XmlAttrXmlnsWps.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; end; function Numbering.AddAbstractNum(): AbstractNum; @@ -392,8 +392,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "abstractNum" then break; end - obj := new AbstractNum(self, self.Prefix, "abstractNum"); - self.InsertChild(obj, i+1); + obj := new AbstractNum(self, {self.}Prefix, "abstractNum"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -405,21 +405,21 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "num" then break; end - obj := new Num(self, self.Prefix, "num"); - self.InsertChild(obj, i+1); + obj := new Num(self, {self.}Prefix, "num"); + {self.}InsertChild(obj, i+1); return obj; end; function Numbering.AppendAbstractNum(): AbstractNum; begin - obj := new AbstractNum(self, self.Prefix, "abstractNum"); + obj := new AbstractNum(self, {self.}Prefix, "abstractNum"); child_elements_[length(child_elements_)] := obj; return obj; end; function Numbering.AppendNum(): Num; begin - obj := new Num(self, self.Prefix, "num"); + obj := new Num(self, {self.}Prefix, "num"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -458,350 +458,350 @@ end; function Numbering.ReadXmlAttrXmlnsWpc(); begin - return self.XmlAttrXmlnsWpc.Value; + return {self.}XmlAttrXmlnsWpc.Value; end; function Numbering.WriteXmlAttrXmlnsWpc(_value); begin - self.XmlAttrXmlnsWpc.Value := _value; + {self.}XmlAttrXmlnsWpc.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx(); begin - return self.XmlAttrXmlnsCx.Value; + return {self.}XmlAttrXmlnsCx.Value; end; function Numbering.WriteXmlAttrXmlnsCx(_value); begin - self.XmlAttrXmlnsCx.Value := _value; + {self.}XmlAttrXmlnsCx.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx1(); begin - return self.XmlAttrXmlnsCx1.Value; + return {self.}XmlAttrXmlnsCx1.Value; end; function Numbering.WriteXmlAttrXmlnsCx1(_value); begin - self.XmlAttrXmlnsCx1.Value := _value; + {self.}XmlAttrXmlnsCx1.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx2(); begin - return self.XmlAttrXmlnsCx2.Value; + return {self.}XmlAttrXmlnsCx2.Value; end; function Numbering.WriteXmlAttrXmlnsCx2(_value); begin - self.XmlAttrXmlnsCx2.Value := _value; + {self.}XmlAttrXmlnsCx2.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx3(); begin - return self.XmlAttrXmlnsCx3.Value; + return {self.}XmlAttrXmlnsCx3.Value; end; function Numbering.WriteXmlAttrXmlnsCx3(_value); begin - self.XmlAttrXmlnsCx3.Value := _value; + {self.}XmlAttrXmlnsCx3.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx4(); begin - return self.XmlAttrXmlnsCx4.Value; + return {self.}XmlAttrXmlnsCx4.Value; end; function Numbering.WriteXmlAttrXmlnsCx4(_value); begin - self.XmlAttrXmlnsCx4.Value := _value; + {self.}XmlAttrXmlnsCx4.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx5(); begin - return self.XmlAttrXmlnsCx5.Value; + return {self.}XmlAttrXmlnsCx5.Value; end; function Numbering.WriteXmlAttrXmlnsCx5(_value); begin - self.XmlAttrXmlnsCx5.Value := _value; + {self.}XmlAttrXmlnsCx5.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx6(); begin - return self.XmlAttrXmlnsCx6.Value; + return {self.}XmlAttrXmlnsCx6.Value; end; function Numbering.WriteXmlAttrXmlnsCx6(_value); begin - self.XmlAttrXmlnsCx6.Value := _value; + {self.}XmlAttrXmlnsCx6.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx7(); begin - return self.XmlAttrXmlnsCx7.Value; + return {self.}XmlAttrXmlnsCx7.Value; end; function Numbering.WriteXmlAttrXmlnsCx7(_value); begin - self.XmlAttrXmlnsCx7.Value := _value; + {self.}XmlAttrXmlnsCx7.Value := _value; end; function Numbering.ReadXmlAttrXmlnsCx8(); begin - return self.XmlAttrXmlnsCx8.Value; + return {self.}XmlAttrXmlnsCx8.Value; end; function Numbering.WriteXmlAttrXmlnsCx8(_value); begin - self.XmlAttrXmlnsCx8.Value := _value; + {self.}XmlAttrXmlnsCx8.Value := _value; end; function Numbering.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Numbering.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Numbering.ReadXmlAttrXmlnsAink(); begin - return self.XmlAttrXmlnsAink.Value; + return {self.}XmlAttrXmlnsAink.Value; end; function Numbering.WriteXmlAttrXmlnsAink(_value); begin - self.XmlAttrXmlnsAink.Value := _value; + {self.}XmlAttrXmlnsAink.Value := _value; end; function Numbering.ReadXmlAttrXmlnsAm3d(); begin - return self.XmlAttrXmlnsAm3d.Value; + return {self.}XmlAttrXmlnsAm3d.Value; end; function Numbering.WriteXmlAttrXmlnsAm3d(_value); begin - self.XmlAttrXmlnsAm3d.Value := _value; + {self.}XmlAttrXmlnsAm3d.Value := _value; end; function Numbering.ReadXmlAttrXmlnsO(); begin - return self.XmlAttrXmlnsO.Value; + return {self.}XmlAttrXmlnsO.Value; end; function Numbering.WriteXmlAttrXmlnsO(_value); begin - self.XmlAttrXmlnsO.Value := _value; + {self.}XmlAttrXmlnsO.Value := _value; end; function Numbering.ReadXmlAttrXmlnsOel(); begin - return self.XmlAttrXmlnsOel.Value; + return {self.}XmlAttrXmlnsOel.Value; end; function Numbering.WriteXmlAttrXmlnsOel(_value); begin - self.XmlAttrXmlnsOel.Value := _value; + {self.}XmlAttrXmlnsOel.Value := _value; end; function Numbering.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Numbering.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Numbering.ReadXmlAttrXmlnsM(); begin - return self.XmlAttrXmlnsM.Value; + return {self.}XmlAttrXmlnsM.Value; end; function Numbering.WriteXmlAttrXmlnsM(_value); begin - self.XmlAttrXmlnsM.Value := _value; + {self.}XmlAttrXmlnsM.Value := _value; end; function Numbering.ReadXmlAttrXmlnsV(); begin - return self.XmlAttrXmlnsV.Value; + return {self.}XmlAttrXmlnsV.Value; end; function Numbering.WriteXmlAttrXmlnsV(_value); begin - self.XmlAttrXmlnsV.Value := _value; + {self.}XmlAttrXmlnsV.Value := _value; end; function Numbering.ReadXmlAttrXmlnsWp14(); begin - return self.XmlAttrXmlnsWp14.Value; + return {self.}XmlAttrXmlnsWp14.Value; end; function Numbering.WriteXmlAttrXmlnsWp14(_value); begin - self.XmlAttrXmlnsWp14.Value := _value; + {self.}XmlAttrXmlnsWp14.Value := _value; end; function Numbering.ReadXmlAttrXmlnsWp(); begin - return self.XmlAttrXmlnsWp.Value; + return {self.}XmlAttrXmlnsWp.Value; end; function Numbering.WriteXmlAttrXmlnsWp(_value); begin - self.XmlAttrXmlnsWp.Value := _value; + {self.}XmlAttrXmlnsWp.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW10(); begin - return self.XmlAttrXmlnsW10.Value; + return {self.}XmlAttrXmlnsW10.Value; end; function Numbering.WriteXmlAttrXmlnsW10(_value); begin - self.XmlAttrXmlnsW10.Value := _value; + {self.}XmlAttrXmlnsW10.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function Numbering.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Numbering.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Numbering.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function Numbering.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function Numbering.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function Numbering.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function Numbering.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW16sdtdh(); begin - return self.XmlAttrXmlnsW16sdtdh.Value; + return {self.}XmlAttrXmlnsW16sdtdh.Value; end; function Numbering.WriteXmlAttrXmlnsW16sdtdh(_value); begin - self.XmlAttrXmlnsW16sdtdh.Value := _value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _value; end; function Numbering.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function Numbering.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function Numbering.ReadXmlAttrXmlnsWpg(); begin - return self.XmlAttrXmlnsWpg.Value; + return {self.}XmlAttrXmlnsWpg.Value; end; function Numbering.WriteXmlAttrXmlnsWpg(_value); begin - self.XmlAttrXmlnsWpg.Value := _value; + {self.}XmlAttrXmlnsWpg.Value := _value; end; function Numbering.ReadXmlAttrXmlnsWpi(); begin - return self.XmlAttrXmlnsWpi.Value; + return {self.}XmlAttrXmlnsWpi.Value; end; function Numbering.WriteXmlAttrXmlnsWpi(_value); begin - self.XmlAttrXmlnsWpi.Value := _value; + {self.}XmlAttrXmlnsWpi.Value := _value; end; function Numbering.ReadXmlAttrXmlnsWne(); begin - return self.XmlAttrXmlnsWne.Value; + return {self.}XmlAttrXmlnsWne.Value; end; function Numbering.WriteXmlAttrXmlnsWne(_value); begin - self.XmlAttrXmlnsWne.Value := _value; + {self.}XmlAttrXmlnsWne.Value := _value; end; function Numbering.ReadXmlAttrXmlnsWps(); begin - return self.XmlAttrXmlnsWps.Value; + return {self.}XmlAttrXmlnsWps.Value; end; function Numbering.WriteXmlAttrXmlnsWps(_value); begin - self.XmlAttrXmlnsWps.Value := _value; + {self.}XmlAttrXmlnsWps.Value := _value; end; function Numbering.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Numbering.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/NvPicPr@DOCX.tsf b/autoclass/docx/NvPicPr@DOCX.tsf index 175011c..701781a 100644 --- a/autoclass/docx/NvPicPr@DOCX.tsf +++ b/autoclass/docx/NvPicPr@DOCX.tsf @@ -20,7 +20,7 @@ end; function NvPicPr.Create();overload; begin - self.Create(nil, "pic", "nvPicPr"); + {self.}Create(nil, "pic", "nvPicPr"); end; function NvPicPr.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function NvPicPr.Init();override; begin - self.CNvPr := new CNvPr(self, "pic", "cNvPr"); - self.CNvPicPr := new CNvPicPr(self, "pic", "cNvPicPr"); + {self.}CNvPr := new CNvPr(self, "pic", "cNvPr"); + {self.}CNvPicPr := new CNvPicPr(self, "pic", "cNvPicPr"); end; function NvPicPr.InitAttributes();override; @@ -48,21 +48,21 @@ end; function NvPicPr.InitChildren();override; begin child_elements_ := array( - 0: self.CNvPr, - 1: self.CNvPicPr, + 0: {self.}CNvPr, + 1: {self.}CNvPicPr, ); sorted_child_ := array( "": -1, - self.CNvPr.ElementName: 0, - self.CNvPicPr.ElementName: 1, + {self.}CNvPr.ElementName: 0, + {self.}CNvPicPr.ElementName: 1, ); end; function NvPicPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function NvPicPr.Copy(_obj: NvPicPr);override; begin - self.CNvPr.Copy(_obj.CNvPr); - self.CNvPicPr.Copy(_obj.CNvPicPr); + {self.}CNvPr.Copy(_obj.CNvPr); + {self.}CNvPicPr.Copy(_obj.CNvPicPr); end; diff --git a/autoclass/docx/OuterShdw@DOCX.tsf b/autoclass/docx/OuterShdw@DOCX.tsf index 6789556..7ee4b67 100644 --- a/autoclass/docx/OuterShdw@DOCX.tsf +++ b/autoclass/docx/OuterShdw@DOCX.tsf @@ -40,7 +40,7 @@ end; function OuterShdw.Create();overload; begin - self.Create(nil, "a", "outerShdw"); + {self.}Create(nil, "a", "outerShdw"); end; function OuterShdw.Create(_node: XmlNode);overload; @@ -55,41 +55,41 @@ end; function OuterShdw.Init();override; begin - self.XmlAttrBlurRad := new OpenXmlAttribute(nil, "blurRad", nil); - self.XmlAttrDist := new OpenXmlAttribute(nil, "dist", nil); - self.XmlAttrDir := new OpenXmlAttribute(nil, "dir", nil); - self.XmlAttrAlgn := new OpenXmlAttribute(nil, "algn", nil); - self.XmlAttrRotWithShape := new OpenXmlAttribute(nil, "rotWithShape", nil); - self.SrgbClr := new SrgbClr(self, self.Prefix, "srgbClr"); + {self.}XmlAttrBlurRad := new OpenXmlAttribute(nil, "blurRad", nil); + {self.}XmlAttrDist := new OpenXmlAttribute(nil, "dist", nil); + {self.}XmlAttrDir := new OpenXmlAttribute(nil, "dir", nil); + {self.}XmlAttrAlgn := new OpenXmlAttribute(nil, "algn", nil); + {self.}XmlAttrRotWithShape := new OpenXmlAttribute(nil, "rotWithShape", nil); + {self.}SrgbClr := new SrgbClr(self, {self.}Prefix, "srgbClr"); end; function OuterShdw.InitAttributes();override; begin attributes_ := array( - self.XmlAttrBlurRad, - self.XmlAttrDist, - self.XmlAttrDir, - self.XmlAttrAlgn, - self.XmlAttrRotWithShape, + {self.}XmlAttrBlurRad, + {self.}XmlAttrDist, + {self.}XmlAttrDir, + {self.}XmlAttrAlgn, + {self.}XmlAttrRotWithShape, ); end; function OuterShdw.InitChildren();override; begin child_elements_ := array( - 0: self.SrgbClr, + 0: {self.}SrgbClr, ); sorted_child_ := array( "": -1, - self.SrgbClr.ElementName: 0, + {self.}SrgbClr.ElementName: 0, ); end; function OuterShdw.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -98,7 +98,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -126,64 +126,64 @@ end; function OuterShdw.Copy(_obj: OuterShdw);override; begin if not ifnil(_obj.XmlAttrBlurRad.Value) then - self.XmlAttrBlurRad.Value := _obj.XmlAttrBlurRad.Value; + {self.}XmlAttrBlurRad.Value := _obj.XmlAttrBlurRad.Value; if not ifnil(_obj.XmlAttrDist.Value) then - self.XmlAttrDist.Value := _obj.XmlAttrDist.Value; + {self.}XmlAttrDist.Value := _obj.XmlAttrDist.Value; if not ifnil(_obj.XmlAttrDir.Value) then - self.XmlAttrDir.Value := _obj.XmlAttrDir.Value; + {self.}XmlAttrDir.Value := _obj.XmlAttrDir.Value; if not ifnil(_obj.XmlAttrAlgn.Value) then - self.XmlAttrAlgn.Value := _obj.XmlAttrAlgn.Value; + {self.}XmlAttrAlgn.Value := _obj.XmlAttrAlgn.Value; if not ifnil(_obj.XmlAttrRotWithShape.Value) then - self.XmlAttrRotWithShape.Value := _obj.XmlAttrRotWithShape.Value; - self.SrgbClr.Copy(_obj.SrgbClr); + {self.}XmlAttrRotWithShape.Value := _obj.XmlAttrRotWithShape.Value; + {self.}SrgbClr.Copy(_obj.SrgbClr); end; function OuterShdw.ReadXmlAttrBlurRad(); begin - return self.XmlAttrBlurRad.Value; + return {self.}XmlAttrBlurRad.Value; end; function OuterShdw.WriteXmlAttrBlurRad(_value); begin - self.XmlAttrBlurRad.Value := _value; + {self.}XmlAttrBlurRad.Value := _value; end; function OuterShdw.ReadXmlAttrDist(); begin - return self.XmlAttrDist.Value; + return {self.}XmlAttrDist.Value; end; function OuterShdw.WriteXmlAttrDist(_value); begin - self.XmlAttrDist.Value := _value; + {self.}XmlAttrDist.Value := _value; end; function OuterShdw.ReadXmlAttrDir(); begin - return self.XmlAttrDir.Value; + return {self.}XmlAttrDir.Value; end; function OuterShdw.WriteXmlAttrDir(_value); begin - self.XmlAttrDir.Value := _value; + {self.}XmlAttrDir.Value := _value; end; function OuterShdw.ReadXmlAttrAlgn(); begin - return self.XmlAttrAlgn.Value; + return {self.}XmlAttrAlgn.Value; end; function OuterShdw.WriteXmlAttrAlgn(_value); begin - self.XmlAttrAlgn.Value := _value; + {self.}XmlAttrAlgn.Value := _value; end; function OuterShdw.ReadXmlAttrRotWithShape(); begin - return self.XmlAttrRotWithShape.Value; + return {self.}XmlAttrRotWithShape.Value; end; function OuterShdw.WriteXmlAttrRotWithShape(_value); begin - self.XmlAttrRotWithShape.Value := _value; + {self.}XmlAttrRotWithShape.Value := _value; end; diff --git a/autoclass/docx/P@DOCX.tsf b/autoclass/docx/P@DOCX.tsf index ee18a00..26acbd0 100644 --- a/autoclass/docx/P@DOCX.tsf +++ b/autoclass/docx/P@DOCX.tsf @@ -69,7 +69,7 @@ end; function P.Create();overload; begin - self.Create(nil, "w", "p"); + {self.}Create(nil, "w", "p"); end; function P.Create(_node: XmlNode);overload; @@ -84,43 +84,43 @@ end; function P.Init();override; begin - self.XmlAttrW14ParaId := new OpenXmlAttribute("w14", "paraId", nil); - self.XmlAttrW14TextId := new OpenXmlAttribute("w14", "textId", nil); - self.XmlAttrWRsidR := new OpenXmlAttribute("w", "rsidR", nil); - self.XmlAttrWRsidRPr := new OpenXmlAttribute("w", "rsidRPr", nil); - self.XmlAttrWRsidRDefault := new OpenXmlAttribute("w", "rsidRDefault", nil); - self.XmlAttrWRsidP := new OpenXmlAttribute("w", "rsidP", nil); - self.PPr := new PPr(self, self.Prefix, "pPr"); + {self.}XmlAttrW14ParaId := new OpenXmlAttribute("w14", "paraId", nil); + {self.}XmlAttrW14TextId := new OpenXmlAttribute("w14", "textId", nil); + {self.}XmlAttrWRsidR := new OpenXmlAttribute("w", "rsidR", nil); + {self.}XmlAttrWRsidRPr := new OpenXmlAttribute("w", "rsidRPr", nil); + {self.}XmlAttrWRsidRDefault := new OpenXmlAttribute("w", "rsidRDefault", nil); + {self.}XmlAttrWRsidP := new OpenXmlAttribute("w", "rsidP", nil); + {self.}PPr := new PPr(self, {self.}Prefix, "pPr"); end; function P.InitAttributes();override; begin attributes_ := array( - self.XmlAttrW14ParaId, - self.XmlAttrW14TextId, - self.XmlAttrWRsidR, - self.XmlAttrWRsidRPr, - self.XmlAttrWRsidRDefault, - self.XmlAttrWRsidP, + {self.}XmlAttrW14ParaId, + {self.}XmlAttrW14TextId, + {self.}XmlAttrWRsidR, + {self.}XmlAttrWRsidRPr, + {self.}XmlAttrWRsidRDefault, + {self.}XmlAttrWRsidP, ); end; function P.InitChildren();override; begin child_elements_ := array( - 0: self.PPr, + 0: {self.}PPr, ); sorted_child_ := array( "": -1, - self.PPr.ElementName: 0, + {self.}PPr.ElementName: 0, ); end; function P.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -129,7 +129,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -138,12 +138,12 @@ begin begin obj := nil; case node_name of - pre + "r": obj := self.AppendR(); - pre + "commentRangeStart": obj := self.AppendCommentRangeStart(); - pre + "commentRangeEnd": obj := self.AppendCommentRangeEnd(); - pre + "hyperlink": obj := self.AppendHyperLink(); - pre + "bookmarkStart": obj := self.AppendBookmarkStart(); - pre + "bookmarkEnd": obj := self.AppendBookmarkEnd(); + pre + "r": obj := {self.}AppendR(); + pre + "commentRangeStart": obj := {self.}AppendCommentRangeStart(); + pre + "commentRangeEnd": obj := {self.}AppendCommentRangeEnd(); + pre + "hyperlink": obj := {self.}AppendHyperLink(); + pre + "bookmarkStart": obj := {self.}AppendBookmarkStart(); + pre + "bookmarkEnd": obj := {self.}AppendBookmarkEnd(); end; if ifObj(obj) then obj.InitNode(node); end @@ -163,18 +163,18 @@ end; function P.Copy(_obj: P);override; begin if not ifnil(_obj.XmlAttrW14ParaId.Value) then - self.XmlAttrW14ParaId.Value := _obj.XmlAttrW14ParaId.Value; + {self.}XmlAttrW14ParaId.Value := _obj.XmlAttrW14ParaId.Value; if not ifnil(_obj.XmlAttrW14TextId.Value) then - self.XmlAttrW14TextId.Value := _obj.XmlAttrW14TextId.Value; + {self.}XmlAttrW14TextId.Value := _obj.XmlAttrW14TextId.Value; if not ifnil(_obj.XmlAttrWRsidR.Value) then - self.XmlAttrWRsidR.Value := _obj.XmlAttrWRsidR.Value; + {self.}XmlAttrWRsidR.Value := _obj.XmlAttrWRsidR.Value; if not ifnil(_obj.XmlAttrWRsidRPr.Value) then - self.XmlAttrWRsidRPr.Value := _obj.XmlAttrWRsidRPr.Value; + {self.}XmlAttrWRsidRPr.Value := _obj.XmlAttrWRsidRPr.Value; if not ifnil(_obj.XmlAttrWRsidRDefault.Value) then - self.XmlAttrWRsidRDefault.Value := _obj.XmlAttrWRsidRDefault.Value; + {self.}XmlAttrWRsidRDefault.Value := _obj.XmlAttrWRsidRDefault.Value; if not ifnil(_obj.XmlAttrWRsidP.Value) then - self.XmlAttrWRsidP.Value := _obj.XmlAttrWRsidP.Value; - self.PPr.Copy(_obj.PPr); + {self.}XmlAttrWRsidP.Value := _obj.XmlAttrWRsidP.Value; + {self.}PPr.Copy(_obj.PPr); end; function P.AddR(): R; @@ -185,8 +185,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "r" then break; end - obj := new R(self, self.Prefix, "r"); - self.InsertChild(obj, i+1); + obj := new R(self, {self.}Prefix, "r"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -198,8 +198,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "commentRangeStart" then break; end - obj := new CommentRange(self, self.Prefix, "commentRangeStart"); - self.InsertChild(obj, i+1); + obj := new CommentRange(self, {self.}Prefix, "commentRangeStart"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -211,8 +211,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "commentRangeEnd" then break; end - obj := new CommentRange(self, self.Prefix, "commentRangeEnd"); - self.InsertChild(obj, i+1); + obj := new CommentRange(self, {self.}Prefix, "commentRangeEnd"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -224,8 +224,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "hyperlink" then break; end - obj := new HyperLink(self, self.Prefix, "hyperlink"); - self.InsertChild(obj, i+1); + obj := new HyperLink(self, {self.}Prefix, "hyperlink"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -237,8 +237,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "bookmarkStart" then break; end - obj := new Bookmark(self, self.Prefix, "bookmarkStart"); - self.InsertChild(obj, i+1); + obj := new Bookmark(self, {self.}Prefix, "bookmarkStart"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -250,49 +250,49 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "bookmarkEnd" then break; end - obj := new Bookmark(self, self.Prefix, "bookmarkEnd"); - self.InsertChild(obj, i+1); + obj := new Bookmark(self, {self.}Prefix, "bookmarkEnd"); + {self.}InsertChild(obj, i+1); return obj; end; function P.AppendR(): R; begin - obj := new R(self, self.Prefix, "r"); + obj := new R(self, {self.}Prefix, "r"); child_elements_[length(child_elements_)] := obj; return obj; end; function P.AppendCommentRangeStart(): CommentRange; begin - obj := new CommentRange(self, self.Prefix, "commentRangeStart"); + obj := new CommentRange(self, {self.}Prefix, "commentRangeStart"); child_elements_[length(child_elements_)] := obj; return obj; end; function P.AppendCommentRangeEnd(): CommentRange; begin - obj := new CommentRange(self, self.Prefix, "commentRangeEnd"); + obj := new CommentRange(self, {self.}Prefix, "commentRangeEnd"); child_elements_[length(child_elements_)] := obj; return obj; end; function P.AppendHyperLink(): HyperLink; begin - obj := new HyperLink(self, self.Prefix, "hyperlink"); + obj := new HyperLink(self, {self.}Prefix, "hyperlink"); child_elements_[length(child_elements_)] := obj; return obj; end; function P.AppendBookmarkStart(): Bookmark; begin - obj := new Bookmark(self, self.Prefix, "bookmarkStart"); + obj := new Bookmark(self, {self.}Prefix, "bookmarkStart"); child_elements_[length(child_elements_)] := obj; return obj; end; function P.AppendBookmarkEnd(): Bookmark; begin - obj := new Bookmark(self, self.Prefix, "bookmarkEnd"); + obj := new Bookmark(self, {self.}Prefix, "bookmarkEnd"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -395,60 +395,60 @@ end; function P.ReadXmlAttrW14ParaId(); begin - return self.XmlAttrW14ParaId.Value; + return {self.}XmlAttrW14ParaId.Value; end; function P.WriteXmlAttrW14ParaId(_value); begin - self.XmlAttrW14ParaId.Value := _value; + {self.}XmlAttrW14ParaId.Value := _value; end; function P.ReadXmlAttrW14TextId(); begin - return self.XmlAttrW14TextId.Value; + return {self.}XmlAttrW14TextId.Value; end; function P.WriteXmlAttrW14TextId(_value); begin - self.XmlAttrW14TextId.Value := _value; + {self.}XmlAttrW14TextId.Value := _value; end; function P.ReadXmlAttrWRsidR(); begin - return self.XmlAttrWRsidR.Value; + return {self.}XmlAttrWRsidR.Value; end; function P.WriteXmlAttrWRsidR(_value); begin - self.XmlAttrWRsidR.Value := _value; + {self.}XmlAttrWRsidR.Value := _value; end; function P.ReadXmlAttrWRsidRPr(); begin - return self.XmlAttrWRsidRPr.Value; + return {self.}XmlAttrWRsidRPr.Value; end; function P.WriteXmlAttrWRsidRPr(_value); begin - self.XmlAttrWRsidRPr.Value := _value; + {self.}XmlAttrWRsidRPr.Value := _value; end; function P.ReadXmlAttrWRsidRDefault(); begin - return self.XmlAttrWRsidRDefault.Value; + return {self.}XmlAttrWRsidRDefault.Value; end; function P.WriteXmlAttrWRsidRDefault(_value); begin - self.XmlAttrWRsidRDefault.Value := _value; + {self.}XmlAttrWRsidRDefault.Value := _value; end; function P.ReadXmlAttrWRsidP(); begin - return self.XmlAttrWRsidP.Value; + return {self.}XmlAttrWRsidP.Value; end; function P.WriteXmlAttrWRsidP(_value); begin - self.XmlAttrWRsidP.Value := _value; + {self.}XmlAttrWRsidP.Value := _value; end; diff --git a/autoclass/docx/PBdr@DOCX.tsf b/autoclass/docx/PBdr@DOCX.tsf index c16152e..e8f7ed7 100644 --- a/autoclass/docx/PBdr@DOCX.tsf +++ b/autoclass/docx/PBdr@DOCX.tsf @@ -19,7 +19,7 @@ end; function PBdr.Create();overload; begin - self.Create(nil, "w", "pBdr"); + {self.}Create(nil, "w", "pBdr"); end; function PBdr.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function PBdr.Init();override; begin - self.Top := new PureVal(self, self.Prefix, "top"); + {self.}Top := new PureVal(self, {self.}Prefix, "top"); end; function PBdr.InitAttributes();override; @@ -46,19 +46,19 @@ end; function PBdr.InitChildren();override; begin child_elements_ := array( - 0: self.Top, + 0: {self.}Top, ); sorted_child_ := array( "": -1, - self.Top.ElementName: 0, + {self.}Top.ElementName: 0, ); end; function PBdr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function PBdr.Copy(_obj: PBdr);override; begin - self.Top.Copy(_obj.Top); + {self.}Top.Copy(_obj.Top); end; diff --git a/autoclass/docx/PPr@DOCX.tsf b/autoclass/docx/PPr@DOCX.tsf index d4c84fa..c19b679 100644 --- a/autoclass/docx/PPr@DOCX.tsf +++ b/autoclass/docx/PPr@DOCX.tsf @@ -49,7 +49,7 @@ end; function PPr.Create();overload; begin - self.Create(nil, "w", "pPr"); + {self.}Create(nil, "w", "pPr"); end; function PPr.Create(_node: XmlNode);overload; @@ -64,24 +64,24 @@ end; function PPr.Init();override; begin - self.SectPr := new SectPr(self, self.Prefix, "sectPr"); - self.Tabs := new Tabs(self, self.Prefix, "tabs"); - self.XmlChildWidowControl := new OpenXmlEmpty(self, self.Prefix, "widowControl"); - self.SnapToGrid := new PureWVal(self, self.Prefix, "snapToGrid"); - self.PStyle := new PureWVal(self, self.Prefix, "pStyle"); - self.NumPr := new NumPr(self, self.Prefix, "numPr"); - self.Jc := new PureWVal(self, self.Prefix, "jc"); - self.Ind := new Ind(self, self.Prefix, "ind"); - self.XmlChildKeepNext := new OpenXmlEmpty(self, self.Prefix, "keepNext"); - self.XmlChildKeepLines := new OpenXmlEmpty(self, self.Prefix, "keepLines"); - self.AdjustRightInd := new PureWVal(self, self.Prefix, "adjustRightInd"); - self.Spacing := new Spacing(self, self.Prefix, "spacing"); - self.OutlineLvl := new PureWVal(self, self.Prefix, "outlineLvl"); - self.AutoSpaceDE := new PureWVal(self, self.Prefix, "autoSpaceDE"); - self.AutoSpaceDN := new PureWVal(self, self.Prefix, "autoSpaceDN"); - self.RPr := new RPr(self, self.Prefix, "rPr"); - self.PBdr := new PBdr(self, self.Prefix, "pBdr"); - self.XmlChildContextualSpacing := new OpenXmlEmpty(self, self.Prefix, "contextualSpacing"); + {self.}SectPr := new SectPr(self, {self.}Prefix, "sectPr"); + {self.}Tabs := new Tabs(self, {self.}Prefix, "tabs"); + {self.}XmlChildWidowControl := new OpenXmlEmpty(self, {self.}Prefix, "widowControl"); + {self.}SnapToGrid := new PureWVal(self, {self.}Prefix, "snapToGrid"); + {self.}PStyle := new PureWVal(self, {self.}Prefix, "pStyle"); + {self.}NumPr := new NumPr(self, {self.}Prefix, "numPr"); + {self.}Jc := new PureWVal(self, {self.}Prefix, "jc"); + {self.}Ind := new Ind(self, {self.}Prefix, "ind"); + {self.}XmlChildKeepNext := new OpenXmlEmpty(self, {self.}Prefix, "keepNext"); + {self.}XmlChildKeepLines := new OpenXmlEmpty(self, {self.}Prefix, "keepLines"); + {self.}AdjustRightInd := new PureWVal(self, {self.}Prefix, "adjustRightInd"); + {self.}Spacing := new Spacing(self, {self.}Prefix, "spacing"); + {self.}OutlineLvl := new PureWVal(self, {self.}Prefix, "outlineLvl"); + {self.}AutoSpaceDE := new PureWVal(self, {self.}Prefix, "autoSpaceDE"); + {self.}AutoSpaceDN := new PureWVal(self, {self.}Prefix, "autoSpaceDN"); + {self.}RPr := new RPr(self, {self.}Prefix, "rPr"); + {self.}PBdr := new PBdr(self, {self.}Prefix, "pBdr"); + {self.}XmlChildContextualSpacing := new OpenXmlEmpty(self, {self.}Prefix, "contextualSpacing"); end; function PPr.InitAttributes();override; @@ -93,53 +93,53 @@ end; function PPr.InitChildren();override; begin child_elements_ := array( - 0: self.SectPr, - 1: self.Tabs, - 2: self.XmlChildWidowControl, - 3: self.SnapToGrid, - 4: self.PStyle, - 5: self.NumPr, - 6: self.Jc, - 7: self.Ind, - 8: self.XmlChildKeepNext, - 9: self.XmlChildKeepLines, - 10: self.AdjustRightInd, - 11: self.Spacing, - 12: self.OutlineLvl, - 13: self.AutoSpaceDE, - 14: self.AutoSpaceDN, - 15: self.RPr, - 16: self.PBdr, - 17: self.XmlChildContextualSpacing, + 0: {self.}SectPr, + 1: {self.}Tabs, + 2: {self.}XmlChildWidowControl, + 3: {self.}SnapToGrid, + 4: {self.}PStyle, + 5: {self.}NumPr, + 6: {self.}Jc, + 7: {self.}Ind, + 8: {self.}XmlChildKeepNext, + 9: {self.}XmlChildKeepLines, + 10: {self.}AdjustRightInd, + 11: {self.}Spacing, + 12: {self.}OutlineLvl, + 13: {self.}AutoSpaceDE, + 14: {self.}AutoSpaceDN, + 15: {self.}RPr, + 16: {self.}PBdr, + 17: {self.}XmlChildContextualSpacing, ); sorted_child_ := array( "": -1, - self.SectPr.ElementName: 0, - self.Tabs.ElementName: 1, - self.XmlChildWidowControl.ElementName: 2, - self.SnapToGrid.ElementName: 3, - self.PStyle.ElementName: 4, - self.NumPr.ElementName: 5, - self.Jc.ElementName: 6, - self.Ind.ElementName: 7, - self.XmlChildKeepNext.ElementName: 8, - self.XmlChildKeepLines.ElementName: 9, - self.AdjustRightInd.ElementName: 10, - self.Spacing.ElementName: 11, - self.OutlineLvl.ElementName: 12, - self.AutoSpaceDE.ElementName: 13, - self.AutoSpaceDN.ElementName: 14, - self.RPr.ElementName: 15, - self.PBdr.ElementName: 16, - self.XmlChildContextualSpacing.ElementName: 17, + {self.}SectPr.ElementName: 0, + {self.}Tabs.ElementName: 1, + {self.}XmlChildWidowControl.ElementName: 2, + {self.}SnapToGrid.ElementName: 3, + {self.}PStyle.ElementName: 4, + {self.}NumPr.ElementName: 5, + {self.}Jc.ElementName: 6, + {self.}Ind.ElementName: 7, + {self.}XmlChildKeepNext.ElementName: 8, + {self.}XmlChildKeepLines.ElementName: 9, + {self.}AdjustRightInd.ElementName: 10, + {self.}Spacing.ElementName: 11, + {self.}OutlineLvl.ElementName: 12, + {self.}AutoSpaceDE.ElementName: 13, + {self.}AutoSpaceDN.ElementName: 14, + {self.}RPr.ElementName: 15, + {self.}PBdr.ElementName: 16, + {self.}XmlChildContextualSpacing.ElementName: 17, ); end; function PPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -148,7 +148,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -175,62 +175,62 @@ end; function PPr.Copy(_obj: PPr);override; begin - self.SectPr.Copy(_obj.SectPr); - self.Tabs.Copy(_obj.Tabs); - self.XmlChildWidowControl.Copy(_obj.XmlChildWidowControl); - self.SnapToGrid.Copy(_obj.SnapToGrid); - self.PStyle.Copy(_obj.PStyle); - self.NumPr.Copy(_obj.NumPr); - self.Jc.Copy(_obj.Jc); - self.Ind.Copy(_obj.Ind); - self.XmlChildKeepNext.Copy(_obj.XmlChildKeepNext); - self.XmlChildKeepLines.Copy(_obj.XmlChildKeepLines); - self.AdjustRightInd.Copy(_obj.AdjustRightInd); - self.Spacing.Copy(_obj.Spacing); - self.OutlineLvl.Copy(_obj.OutlineLvl); - self.AutoSpaceDE.Copy(_obj.AutoSpaceDE); - self.AutoSpaceDN.Copy(_obj.AutoSpaceDN); - self.RPr.Copy(_obj.RPr); - self.PBdr.Copy(_obj.PBdr); - self.XmlChildContextualSpacing.Copy(_obj.XmlChildContextualSpacing); + {self.}SectPr.Copy(_obj.SectPr); + {self.}Tabs.Copy(_obj.Tabs); + {self.}XmlChildWidowControl.Copy(_obj.XmlChildWidowControl); + {self.}SnapToGrid.Copy(_obj.SnapToGrid); + {self.}PStyle.Copy(_obj.PStyle); + {self.}NumPr.Copy(_obj.NumPr); + {self.}Jc.Copy(_obj.Jc); + {self.}Ind.Copy(_obj.Ind); + {self.}XmlChildKeepNext.Copy(_obj.XmlChildKeepNext); + {self.}XmlChildKeepLines.Copy(_obj.XmlChildKeepLines); + {self.}AdjustRightInd.Copy(_obj.AdjustRightInd); + {self.}Spacing.Copy(_obj.Spacing); + {self.}OutlineLvl.Copy(_obj.OutlineLvl); + {self.}AutoSpaceDE.Copy(_obj.AutoSpaceDE); + {self.}AutoSpaceDN.Copy(_obj.AutoSpaceDN); + {self.}RPr.Copy(_obj.RPr); + {self.}PBdr.Copy(_obj.PBdr); + {self.}XmlChildContextualSpacing.Copy(_obj.XmlChildContextualSpacing); end; function PPr.ReadXmlChildWidowControl(); begin - return ifnil(self.XmlChildWidowControl.Value) ? false : true; + return ifnil({self.}XmlChildWidowControl.Value) ? false : true; end; function PPr.WriteXmlChildWidowControl(_value); begin - self.XmlChildWidowControl.Value := _value; + {self.}XmlChildWidowControl.Value := _value; end; function PPr.ReadXmlChildKeepNext(); begin - return ifnil(self.XmlChildKeepNext.Value) ? false : true; + return ifnil({self.}XmlChildKeepNext.Value) ? false : true; end; function PPr.WriteXmlChildKeepNext(_value); begin - self.XmlChildKeepNext.Value := _value; + {self.}XmlChildKeepNext.Value := _value; end; function PPr.ReadXmlChildKeepLines(); begin - return ifnil(self.XmlChildKeepLines.Value) ? false : true; + return ifnil({self.}XmlChildKeepLines.Value) ? false : true; end; function PPr.WriteXmlChildKeepLines(_value); begin - self.XmlChildKeepLines.Value := _value; + {self.}XmlChildKeepLines.Value := _value; end; function PPr.ReadXmlChildContextualSpacing(); begin - return ifnil(self.XmlChildContextualSpacing.Value) ? false : true; + return ifnil({self.}XmlChildContextualSpacing.Value) ? false : true; end; function PPr.WriteXmlChildContextualSpacing(_value); begin - self.XmlChildContextualSpacing.Value := _value; + {self.}XmlChildContextualSpacing.Value := _value; end; diff --git a/autoclass/docx/PPrDefault@DOCX.tsf b/autoclass/docx/PPrDefault@DOCX.tsf index 200243f..e4f3df0 100644 --- a/autoclass/docx/PPrDefault@DOCX.tsf +++ b/autoclass/docx/PPrDefault@DOCX.tsf @@ -19,7 +19,7 @@ end; function PPrDefault.Create();overload; begin - self.Create(nil, "w", "pPrDefault"); + {self.}Create(nil, "w", "pPrDefault"); end; function PPrDefault.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function PPrDefault.Init();override; begin - self.PPr := new PPr(self, self.Prefix, "pPr"); + {self.}PPr := new PPr(self, {self.}Prefix, "pPr"); end; function PPrDefault.InitAttributes();override; @@ -46,19 +46,19 @@ end; function PPrDefault.InitChildren();override; begin child_elements_ := array( - 0: self.PPr, + 0: {self.}PPr, ); sorted_child_ := array( "": -1, - self.PPr.ElementName: 0, + {self.}PPr.ElementName: 0, ); end; function PPrDefault.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function PPrDefault.Copy(_obj: PPrDefault);override; begin - self.PPr.Copy(_obj.PPr); + {self.}PPr.Copy(_obj.PPr); end; diff --git a/autoclass/docx/PgMar@DOCX.tsf b/autoclass/docx/PgMar@DOCX.tsf index 7367cd4..d9668df 100644 --- a/autoclass/docx/PgMar@DOCX.tsf +++ b/autoclass/docx/PgMar@DOCX.tsf @@ -1,13 +1,13 @@ type PgMar = class(OpenXmlElement) public function Create();overload; - function Create(_node);overload; - function Create(_parent, _prefix, _local_name);overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; function Init();override; function InitAttributes();override; function InitChildren();override; - function InitNode(_node);override; - function Copy(_obj);override; + function InitNode(_node: XmlNode);override; + function Copy(_obj: PgMar);override; property Top read ReadXmlAttrTop write WriteXmlAttrTop; property Right read ReadXmlAttrRight write WriteXmlAttrRight; @@ -33,13 +33,13 @@ public public // Attributes - XmlAttrTop; - XmlAttrRight; - XmlAttrBottom; - XmlAttrLeft; - XmlAttrHeader; - XmlAttrFooter; - XmlAttrGutter; + XmlAttrTop: OpenXmlAttribute; + XmlAttrRight: OpenXmlAttribute; + XmlAttrBottom: OpenXmlAttribute; + XmlAttrLeft: OpenXmlAttribute; + XmlAttrHeader: OpenXmlAttribute; + XmlAttrFooter: OpenXmlAttribute; + XmlAttrGutter: OpenXmlAttribute; // Children @@ -47,40 +47,40 @@ end; function PgMar.Create();overload; begin - self.Create(nil, "w", "pgMar"); + {self.}Create(nil, "w", "pgMar"); end; -function PgMar.Create(_node);overload; +function PgMar.Create(_node: XmlNode);overload; begin - class(OpenXmlElement).Create(_node); + class(OpenXmlElement).Create(_node: XmlNode); end; -function PgMar.Create(_parent, _prefix, _local_name);overload; +function PgMar.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; begin class(OpenXmlElement).Create(_parent, _prefix, _local_name); end; function PgMar.Init();override; begin - self.XmlAttrTop := new OpenXmlAttribute(self.Prefix, "top", nil); - self.XmlAttrRight := new OpenXmlAttribute(self.Prefix, "right", nil); - self.XmlAttrBottom := new OpenXmlAttribute(self.Prefix, "bottom", nil); - self.XmlAttrLeft := new OpenXmlAttribute(self.Prefix, "left", nil); - self.XmlAttrHeader := new OpenXmlAttribute(self.Prefix, "header", nil); - self.XmlAttrFooter := new OpenXmlAttribute(self.Prefix, "footer", nil); - self.XmlAttrGutter := new OpenXmlAttribute(self.Prefix, "gutter", nil); + {self.}XmlAttrTop := new OpenXmlAttribute({self.}Prefix, "top", nil); + {self.}XmlAttrRight := new OpenXmlAttribute({self.}Prefix, "right", nil); + {self.}XmlAttrBottom := new OpenXmlAttribute({self.}Prefix, "bottom", nil); + {self.}XmlAttrLeft := new OpenXmlAttribute({self.}Prefix, "left", nil); + {self.}XmlAttrHeader := new OpenXmlAttribute({self.}Prefix, "header", nil); + {self.}XmlAttrFooter := new OpenXmlAttribute({self.}Prefix, "footer", nil); + {self.}XmlAttrGutter := new OpenXmlAttribute({self.}Prefix, "gutter", nil); end; function PgMar.InitAttributes();override; begin attributes_ := array( - self.XmlAttrTop, - self.XmlAttrRight, - self.XmlAttrBottom, - self.XmlAttrLeft, - self.XmlAttrHeader, - self.XmlAttrFooter, - self.XmlAttrGutter, + {self.}XmlAttrTop, + {self.}XmlAttrRight, + {self.}XmlAttrBottom, + {self.}XmlAttrLeft, + {self.}XmlAttrHeader, + {self.}XmlAttrFooter, + {self.}XmlAttrGutter, ); end; @@ -93,97 +93,97 @@ begin ); end; -function PgMar.InitNode(_node);override; +function PgMar.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; -function PgMar.Copy(_obj);override; +function PgMar.Copy(_obj: PgMar);override; begin if not ifnil(_obj.XmlAttrTop.Value) then - self.XmlAttrTop.Value := _obj.XmlAttrTop.Value; + {self.}XmlAttrTop.Value := _obj.XmlAttrTop.Value; if not ifnil(_obj.XmlAttrRight.Value) then - self.XmlAttrRight.Value := _obj.XmlAttrRight.Value; + {self.}XmlAttrRight.Value := _obj.XmlAttrRight.Value; if not ifnil(_obj.XmlAttrBottom.Value) then - self.XmlAttrBottom.Value := _obj.XmlAttrBottom.Value; + {self.}XmlAttrBottom.Value := _obj.XmlAttrBottom.Value; if not ifnil(_obj.XmlAttrLeft.Value) then - self.XmlAttrLeft.Value := _obj.XmlAttrLeft.Value; + {self.}XmlAttrLeft.Value := _obj.XmlAttrLeft.Value; if not ifnil(_obj.XmlAttrHeader.Value) then - self.XmlAttrHeader.Value := _obj.XmlAttrHeader.Value; + {self.}XmlAttrHeader.Value := _obj.XmlAttrHeader.Value; if not ifnil(_obj.XmlAttrFooter.Value) then - self.XmlAttrFooter.Value := _obj.XmlAttrFooter.Value; + {self.}XmlAttrFooter.Value := _obj.XmlAttrFooter.Value; if not ifnil(_obj.XmlAttrGutter.Value) then - self.XmlAttrGutter.Value := _obj.XmlAttrGutter.Value; + {self.}XmlAttrGutter.Value := _obj.XmlAttrGutter.Value; end; function PgMar.ReadXmlAttrTop(); begin - return self.XmlAttrTop.Value; + return {self.}XmlAttrTop.Value; end; function PgMar.WriteXmlAttrTop(_value); begin - self.XmlAttrTop.Value := _value; + {self.}XmlAttrTop.Value := _value; end; function PgMar.ReadXmlAttrRight(); begin - return self.XmlAttrRight.Value; + return {self.}XmlAttrRight.Value; end; function PgMar.WriteXmlAttrRight(_value); begin - self.XmlAttrRight.Value := _value; + {self.}XmlAttrRight.Value := _value; end; function PgMar.ReadXmlAttrBottom(); begin - return self.XmlAttrBottom.Value; + return {self.}XmlAttrBottom.Value; end; function PgMar.WriteXmlAttrBottom(_value); begin - self.XmlAttrBottom.Value := _value; + {self.}XmlAttrBottom.Value := _value; end; function PgMar.ReadXmlAttrLeft(); begin - return self.XmlAttrLeft.Value; + return {self.}XmlAttrLeft.Value; end; function PgMar.WriteXmlAttrLeft(_value); begin - self.XmlAttrLeft.Value := _value; + {self.}XmlAttrLeft.Value := _value; end; function PgMar.ReadXmlAttrHeader(); begin - return self.XmlAttrHeader.Value; + return {self.}XmlAttrHeader.Value; end; function PgMar.WriteXmlAttrHeader(_value); begin - self.XmlAttrHeader.Value := _value; + {self.}XmlAttrHeader.Value := _value; end; function PgMar.ReadXmlAttrFooter(); begin - return self.XmlAttrFooter.Value; + return {self.}XmlAttrFooter.Value; end; function PgMar.WriteXmlAttrFooter(_value); begin - self.XmlAttrFooter.Value := _value; + {self.}XmlAttrFooter.Value := _value; end; function PgMar.ReadXmlAttrGutter(); begin - return self.XmlAttrGutter.Value; + return {self.}XmlAttrGutter.Value; end; function PgMar.WriteXmlAttrGutter(_value); begin - self.XmlAttrGutter.Value := _value; + {self.}XmlAttrGutter.Value := _value; end; diff --git a/autoclass/docx/PgNumType@DOCX.tsf b/autoclass/docx/PgNumType@DOCX.tsf index 5e4d636..6020957 100644 --- a/autoclass/docx/PgNumType@DOCX.tsf +++ b/autoclass/docx/PgNumType@DOCX.tsf @@ -23,7 +23,7 @@ end; function PgNumType.Create();overload; begin - self.Create(nil, "w", "pgNumType"); + {self.}Create(nil, "w", "pgNumType"); end; function PgNumType.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function PgNumType.Init();override; begin - self.XmlAttrStart := new OpenXmlAttribute(self.Prefix, "start", nil); + {self.}XmlAttrStart := new OpenXmlAttribute({self.}Prefix, "start", nil); end; function PgNumType.InitAttributes();override; begin attributes_ := array( - self.XmlAttrStart, + {self.}XmlAttrStart, ); end; @@ -59,23 +59,23 @@ end; function PgNumType.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function PgNumType.Copy(_obj: PgNumType);override; begin if not ifnil(_obj.XmlAttrStart.Value) then - self.XmlAttrStart.Value := _obj.XmlAttrStart.Value; + {self.}XmlAttrStart.Value := _obj.XmlAttrStart.Value; end; function PgNumType.ReadXmlAttrStart(); begin - return self.XmlAttrStart.Value; + return {self.}XmlAttrStart.Value; end; function PgNumType.WriteXmlAttrStart(_value); begin - self.XmlAttrStart.Value := _value; + {self.}XmlAttrStart.Value := _value; end; diff --git a/autoclass/docx/PgSz@DOCX.tsf b/autoclass/docx/PgSz@DOCX.tsf index ddabfd5..79cfa69 100644 --- a/autoclass/docx/PgSz@DOCX.tsf +++ b/autoclass/docx/PgSz@DOCX.tsf @@ -1,13 +1,13 @@ type PgSz = class(OpenXmlElement) public function Create();overload; - function Create(_node);overload; - function Create(_parent, _prefix, _local_name);overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; function Init();override; function InitAttributes();override; function InitChildren();override; - function InitNode(_node);override; - function Copy(_obj);override; + function InitNode(_node: XmlNode);override; + function Copy(_obj: PgSz);override; property W read ReadXmlAttrW write WriteXmlAttrW; property H read ReadXmlAttrH write WriteXmlAttrH; @@ -21,9 +21,9 @@ public public // Attributes - XmlAttrW; - XmlAttrH; - XmlAttrOrient; + XmlAttrW: OpenXmlAttribute; + XmlAttrH: OpenXmlAttribute; + XmlAttrOrient: OpenXmlAttribute; // Children @@ -31,32 +31,32 @@ end; function PgSz.Create();overload; begin - self.Create(nil, "w", "pgSz"); + {self.}Create(nil, "w", "pgSz"); end; -function PgSz.Create(_node);overload; +function PgSz.Create(_node: XmlNode);overload; begin - class(OpenXmlElement).Create(_node); + class(OpenXmlElement).Create(_node: XmlNode); end; -function PgSz.Create(_parent, _prefix, _local_name);overload; +function PgSz.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; begin class(OpenXmlElement).Create(_parent, _prefix, _local_name); end; function PgSz.Init();override; begin - self.XmlAttrW := new OpenXmlAttribute(self.Prefix, "w", nil); - self.XmlAttrH := new OpenXmlAttribute(self.Prefix, "h", nil); - self.XmlAttrOrient := new OpenXmlAttribute(self.Prefix, "orient", nil); + {self.}XmlAttrW := new OpenXmlAttribute({self.}Prefix, "w", nil); + {self.}XmlAttrH := new OpenXmlAttribute({self.}Prefix, "h", nil); + {self.}XmlAttrOrient := new OpenXmlAttribute({self.}Prefix, "orient", nil); end; function PgSz.InitAttributes();override; begin attributes_ := array( - self.XmlAttrW, - self.XmlAttrH, - self.XmlAttrOrient, + {self.}XmlAttrW, + {self.}XmlAttrH, + {self.}XmlAttrOrient, ); end; @@ -69,49 +69,49 @@ begin ); end; -function PgSz.InitNode(_node);override; +function PgSz.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; -function PgSz.Copy(_obj);override; +function PgSz.Copy(_obj: PgSz);override; begin if not ifnil(_obj.XmlAttrW.Value) then - self.XmlAttrW.Value := _obj.XmlAttrW.Value; + {self.}XmlAttrW.Value := _obj.XmlAttrW.Value; if not ifnil(_obj.XmlAttrH.Value) then - self.XmlAttrH.Value := _obj.XmlAttrH.Value; + {self.}XmlAttrH.Value := _obj.XmlAttrH.Value; if not ifnil(_obj.XmlAttrOrient.Value) then - self.XmlAttrOrient.Value := _obj.XmlAttrOrient.Value; + {self.}XmlAttrOrient.Value := _obj.XmlAttrOrient.Value; end; function PgSz.ReadXmlAttrW(); begin - return self.XmlAttrW.Value; + return {self.}XmlAttrW.Value; end; function PgSz.WriteXmlAttrW(_value); begin - self.XmlAttrW.Value := _value; + {self.}XmlAttrW.Value := _value; end; function PgSz.ReadXmlAttrH(); begin - return self.XmlAttrH.Value; + return {self.}XmlAttrH.Value; end; function PgSz.WriteXmlAttrH(_value); begin - self.XmlAttrH.Value := _value; + {self.}XmlAttrH.Value := _value; end; function PgSz.ReadXmlAttrOrient(); begin - return self.XmlAttrOrient.Value; + return {self.}XmlAttrOrient.Value; end; function PgSz.WriteXmlAttrOrient(_value); begin - self.XmlAttrOrient.Value := _value; + {self.}XmlAttrOrient.Value := _value; end; diff --git a/autoclass/docx/Pic@DOCX.tsf b/autoclass/docx/Pic@DOCX.tsf index 697bc58..168a20b 100644 --- a/autoclass/docx/Pic@DOCX.tsf +++ b/autoclass/docx/Pic@DOCX.tsf @@ -26,7 +26,7 @@ end; function Pic.Create();overload; begin - self.Create(nil, "pic", "pic"); + {self.}Create(nil, "pic", "pic"); end; function Pic.Create(_node: XmlNode);overload; @@ -41,39 +41,39 @@ end; function Pic.Init();override; begin - self.XmlAttrXmlnsPic := new OpenXmlAttribute("xmlns", "pic", "http://schemas.openxmlformats.org/drawingml/2006/picture"); - self.NvPicPr := new NvPicPr(self, self.Prefix, "nvPicPr"); - self.BlipFill := new BlipFill(self, self.Prefix, "blipFill"); - self.SpPr := new SpPr(self, self.Prefix, "spPr"); + {self.}XmlAttrXmlnsPic := new OpenXmlAttribute("xmlns", "pic", "http://schemas.openxmlformats.org/drawingml/2006/picture"); + {self.}NvPicPr := new NvPicPr(self, {self.}Prefix, "nvPicPr"); + {self.}BlipFill := new BlipFill(self, {self.}Prefix, "blipFill"); + {self.}SpPr := new SpPr(self, {self.}Prefix, "spPr"); end; function Pic.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsPic, + {self.}XmlAttrXmlnsPic, ); end; function Pic.InitChildren();override; begin child_elements_ := array( - 0: self.NvPicPr, - 1: self.BlipFill, - 2: self.SpPr, + 0: {self.}NvPicPr, + 1: {self.}BlipFill, + 2: {self.}SpPr, ); sorted_child_ := array( "": -1, - self.NvPicPr.ElementName: 0, - self.BlipFill.ElementName: 1, - self.SpPr.ElementName: 2, + {self.}NvPicPr.ElementName: 0, + {self.}BlipFill.ElementName: 1, + {self.}SpPr.ElementName: 2, ); end; function Pic.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -82,7 +82,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -110,18 +110,18 @@ end; function Pic.Copy(_obj: Pic);override; begin if not ifnil(_obj.XmlAttrXmlnsPic.Value) then - self.XmlAttrXmlnsPic.Value := _obj.XmlAttrXmlnsPic.Value; - self.NvPicPr.Copy(_obj.NvPicPr); - self.BlipFill.Copy(_obj.BlipFill); - self.SpPr.Copy(_obj.SpPr); + {self.}XmlAttrXmlnsPic.Value := _obj.XmlAttrXmlnsPic.Value; + {self.}NvPicPr.Copy(_obj.NvPicPr); + {self.}BlipFill.Copy(_obj.BlipFill); + {self.}SpPr.Copy(_obj.SpPr); end; function Pic.ReadXmlAttrXmlnsPic(); begin - return self.XmlAttrXmlnsPic.Value; + return {self.}XmlAttrXmlnsPic.Value; end; function Pic.WriteXmlAttrXmlnsPic(_value); begin - self.XmlAttrXmlnsPic.Value := _value; + {self.}XmlAttrXmlnsPic.Value := _value; end; diff --git a/autoclass/docx/PicLocks@DOCX.tsf b/autoclass/docx/PicLocks@DOCX.tsf index 0734575..95c0b7b 100644 --- a/autoclass/docx/PicLocks@DOCX.tsf +++ b/autoclass/docx/PicLocks@DOCX.tsf @@ -23,7 +23,7 @@ end; function PicLocks.Create();overload; begin - self.Create(nil, "a", "picLocks"); + {self.}Create(nil, "a", "picLocks"); end; function PicLocks.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function PicLocks.Init();override; begin - self.XmlAttrNoChangeAspect := new OpenXmlAttribute(nil, "noChangeAspect", nil); + {self.}XmlAttrNoChangeAspect := new OpenXmlAttribute(nil, "noChangeAspect", nil); end; function PicLocks.InitAttributes();override; begin attributes_ := array( - self.XmlAttrNoChangeAspect, + {self.}XmlAttrNoChangeAspect, ); end; @@ -59,23 +59,23 @@ end; function PicLocks.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function PicLocks.Copy(_obj: PicLocks);override; begin if not ifnil(_obj.XmlAttrNoChangeAspect.Value) then - self.XmlAttrNoChangeAspect.Value := _obj.XmlAttrNoChangeAspect.Value; + {self.}XmlAttrNoChangeAspect.Value := _obj.XmlAttrNoChangeAspect.Value; end; function PicLocks.ReadXmlAttrNoChangeAspect(); begin - return self.XmlAttrNoChangeAspect.Value; + return {self.}XmlAttrNoChangeAspect.Value; end; function PicLocks.WriteXmlAttrNoChangeAspect(_value); begin - self.XmlAttrNoChangeAspect.Value := _value; + {self.}XmlAttrNoChangeAspect.Value := _value; end; diff --git a/autoclass/docx/PlotArea@DOCX.tsf b/autoclass/docx/PlotArea@DOCX.tsf index fe043a7..a0a8152 100644 --- a/autoclass/docx/PlotArea@DOCX.tsf +++ b/autoclass/docx/PlotArea@DOCX.tsf @@ -28,7 +28,7 @@ end; function PlotArea.Create();overload; begin - self.Create(nil, "c", "plotArea"); + {self.}Create(nil, "c", "plotArea"); end; function PlotArea.Create(_node: XmlNode);overload; @@ -43,12 +43,12 @@ end; function PlotArea.Init();override; begin - self.XmlChildLayout := new OpenXmlEmpty(self, self.Prefix, "layout"); - self.BarChart := new BarChart(self, self.Prefix, "barChart"); - self.CatAx := new Ax(self, self.Prefix, "catAx"); - self.ValAx := new Ax(self, self.Prefix, "ValAx"); - self.DTable := new DTable(self, self.Prefix, "dTable"); - self.SpPr := new SpPr(self, self.Prefix, "SpPr"); + {self.}XmlChildLayout := new OpenXmlEmpty(self, {self.}Prefix, "layout"); + {self.}BarChart := new BarChart(self, {self.}Prefix, "barChart"); + {self.}CatAx := new Ax(self, {self.}Prefix, "catAx"); + {self.}ValAx := new Ax(self, {self.}Prefix, "ValAx"); + {self.}DTable := new DTable(self, {self.}Prefix, "dTable"); + {self.}SpPr := new SpPr(self, {self.}Prefix, "SpPr"); end; function PlotArea.InitAttributes();override; @@ -60,29 +60,29 @@ end; function PlotArea.InitChildren();override; begin child_elements_ := array( - 0: self.XmlChildLayout, - 1: self.BarChart, - 2: self.CatAx, - 3: self.ValAx, - 4: self.DTable, - 5: self.SpPr, + 0: {self.}XmlChildLayout, + 1: {self.}BarChart, + 2: {self.}CatAx, + 3: {self.}ValAx, + 4: {self.}DTable, + 5: {self.}SpPr, ); sorted_child_ := array( "": -1, - self.XmlChildLayout.ElementName: 0, - self.BarChart.ElementName: 1, - self.CatAx.ElementName: 2, - self.ValAx.ElementName: 3, - self.DTable.ElementName: 4, - self.SpPr.ElementName: 5, + {self.}XmlChildLayout.ElementName: 0, + {self.}BarChart.ElementName: 1, + {self.}CatAx.ElementName: 2, + {self.}ValAx.ElementName: 3, + {self.}DTable.ElementName: 4, + {self.}SpPr.ElementName: 5, ); end; function PlotArea.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -91,7 +91,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -118,20 +118,20 @@ end; function PlotArea.Copy(_obj: PlotArea);override; begin - self.XmlChildLayout.Copy(_obj.XmlChildLayout); - self.BarChart.Copy(_obj.BarChart); - self.CatAx.Copy(_obj.CatAx); - self.ValAx.Copy(_obj.ValAx); - self.DTable.Copy(_obj.DTable); - self.SpPr.Copy(_obj.SpPr); + {self.}XmlChildLayout.Copy(_obj.XmlChildLayout); + {self.}BarChart.Copy(_obj.BarChart); + {self.}CatAx.Copy(_obj.CatAx); + {self.}ValAx.Copy(_obj.ValAx); + {self.}DTable.Copy(_obj.DTable); + {self.}SpPr.Copy(_obj.SpPr); end; function PlotArea.ReadXmlChildLayout(); begin - return ifnil(self.XmlChildLayout.Value) ? false : true; + return ifnil({self.}XmlChildLayout.Value) ? false : true; end; function PlotArea.WriteXmlChildLayout(_value); begin - self.XmlChildLayout.Value := _value; + {self.}XmlChildLayout.Value := _value; end; diff --git a/autoclass/docx/Properties@DOCX.tsf b/autoclass/docx/Properties@DOCX.tsf index 7837871..73e2ceb 100644 --- a/autoclass/docx/Properties@DOCX.tsf +++ b/autoclass/docx/Properties@DOCX.tsf @@ -43,7 +43,7 @@ end; function Properties.Create();overload; begin - self.Create(nil, nil, "Properties"); + {self.}Create(nil, nil, "Properties"); end; function Properties.Create(_node: XmlNode);overload; @@ -58,80 +58,80 @@ end; function Properties.Init();override; begin - self.XmlAttrXmlns := new OpenXmlAttribute(nil, "xmlns", "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"); - self.XmlAttrXmlnsVt := new OpenXmlAttribute("xmlns", "vt", "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"); - self.Template := new OpenXmlPcdata(self, nil, "Template"); - self.TotalTime := new OpenXmlPcdata(self, nil, "TotalTime"); - self.Pages := new OpenXmlPcdata(self, nil, "Pages"); - self.Words := new OpenXmlPcdata(self, nil, "Words"); - self.Characters := new OpenXmlPcdata(self, nil, "Characters"); - self.Application := new OpenXmlPcdata(self, nil, "Application"); - self.DocSecurity := new OpenXmlPcdata(self, nil, "DocSecurity"); - self.Lines := new OpenXmlPcdata(self, nil, "Lines"); - self.Paragraphs := new OpenXmlPcdata(self, nil, "Paragraphs"); - self.ScaleCrop := new OpenXmlPcdata(self, nil, "ScaleCrop"); - self.Company := new OpenXmlPcdata(self, nil, "Company"); - self.LinksUpToDate := new OpenXmlPcdata(self, nil, "LinksUpToDate"); - self.CharactersWithSpaces := new OpenXmlPcdata(self, nil, "charactersWithSpaces"); - self.SharedDoc := new OpenXmlPcdata(self, nil, "SharedDoc"); - self.HyperlinksChanged := new OpenXmlPcdata(self, nil, "HyperlinksChanged"); - self.AppVersion := new OpenXmlPcdata(self, nil, "AppVersion"); + {self.}XmlAttrXmlns := new OpenXmlAttribute(nil, "xmlns", "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"); + {self.}XmlAttrXmlnsVt := new OpenXmlAttribute("xmlns", "vt", "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"); + {self.}Template := new OpenXmlPcdata(self, nil, "Template"); + {self.}TotalTime := new OpenXmlPcdata(self, nil, "TotalTime"); + {self.}Pages := new OpenXmlPcdata(self, nil, "Pages"); + {self.}Words := new OpenXmlPcdata(self, nil, "Words"); + {self.}Characters := new OpenXmlPcdata(self, nil, "Characters"); + {self.}Application := new OpenXmlPcdata(self, nil, "Application"); + {self.}DocSecurity := new OpenXmlPcdata(self, nil, "DocSecurity"); + {self.}Lines := new OpenXmlPcdata(self, nil, "Lines"); + {self.}Paragraphs := new OpenXmlPcdata(self, nil, "Paragraphs"); + {self.}ScaleCrop := new OpenXmlPcdata(self, nil, "ScaleCrop"); + {self.}Company := new OpenXmlPcdata(self, nil, "Company"); + {self.}LinksUpToDate := new OpenXmlPcdata(self, nil, "LinksUpToDate"); + {self.}CharactersWithSpaces := new OpenXmlPcdata(self, nil, "charactersWithSpaces"); + {self.}SharedDoc := new OpenXmlPcdata(self, nil, "SharedDoc"); + {self.}HyperlinksChanged := new OpenXmlPcdata(self, nil, "HyperlinksChanged"); + {self.}AppVersion := new OpenXmlPcdata(self, nil, "AppVersion"); end; function Properties.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlns, - self.XmlAttrXmlnsVt, + {self.}XmlAttrXmlns, + {self.}XmlAttrXmlnsVt, ); end; function Properties.InitChildren();override; begin child_elements_ := array( - 0: self.Template, - 1: self.TotalTime, - 2: self.Pages, - 3: self.Words, - 4: self.Characters, - 5: self.Application, - 6: self.DocSecurity, - 7: self.Lines, - 8: self.Paragraphs, - 9: self.ScaleCrop, - 10: self.Company, - 11: self.LinksUpToDate, - 12: self.CharactersWithSpaces, - 13: self.SharedDoc, - 14: self.HyperlinksChanged, - 15: self.AppVersion, + 0: {self.}Template, + 1: {self.}TotalTime, + 2: {self.}Pages, + 3: {self.}Words, + 4: {self.}Characters, + 5: {self.}Application, + 6: {self.}DocSecurity, + 7: {self.}Lines, + 8: {self.}Paragraphs, + 9: {self.}ScaleCrop, + 10: {self.}Company, + 11: {self.}LinksUpToDate, + 12: {self.}CharactersWithSpaces, + 13: {self.}SharedDoc, + 14: {self.}HyperlinksChanged, + 15: {self.}AppVersion, ); sorted_child_ := array( "": -1, - self.Template.ElementName: 0, - self.TotalTime.ElementName: 1, - self.Pages.ElementName: 2, - self.Words.ElementName: 3, - self.Characters.ElementName: 4, - self.Application.ElementName: 5, - self.DocSecurity.ElementName: 6, - self.Lines.ElementName: 7, - self.Paragraphs.ElementName: 8, - self.ScaleCrop.ElementName: 9, - self.Company.ElementName: 10, - self.LinksUpToDate.ElementName: 11, - self.CharactersWithSpaces.ElementName: 12, - self.SharedDoc.ElementName: 13, - self.HyperlinksChanged.ElementName: 14, - self.AppVersion.ElementName: 15, + {self.}Template.ElementName: 0, + {self.}TotalTime.ElementName: 1, + {self.}Pages.ElementName: 2, + {self.}Words.ElementName: 3, + {self.}Characters.ElementName: 4, + {self.}Application.ElementName: 5, + {self.}DocSecurity.ElementName: 6, + {self.}Lines.ElementName: 7, + {self.}Paragraphs.ElementName: 8, + {self.}ScaleCrop.ElementName: 9, + {self.}Company.ElementName: 10, + {self.}LinksUpToDate.ElementName: 11, + {self.}CharactersWithSpaces.ElementName: 12, + {self.}SharedDoc.ElementName: 13, + {self.}HyperlinksChanged.ElementName: 14, + {self.}AppVersion.ElementName: 15, ); end; function Properties.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -140,7 +140,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -168,43 +168,43 @@ end; function Properties.Copy(_obj: Properties);override; begin if not ifnil(_obj.XmlAttrXmlns.Value) then - self.XmlAttrXmlns.Value := _obj.XmlAttrXmlns.Value; + {self.}XmlAttrXmlns.Value := _obj.XmlAttrXmlns.Value; if not ifnil(_obj.XmlAttrXmlnsVt.Value) then - self.XmlAttrXmlnsVt.Value := _obj.XmlAttrXmlnsVt.Value; - self.Template.Copy(_obj.Template); - self.TotalTime.Copy(_obj.TotalTime); - self.Pages.Copy(_obj.Pages); - self.Words.Copy(_obj.Words); - self.Characters.Copy(_obj.Characters); - self.Application.Copy(_obj.Application); - self.DocSecurity.Copy(_obj.DocSecurity); - self.Lines.Copy(_obj.Lines); - self.Paragraphs.Copy(_obj.Paragraphs); - self.ScaleCrop.Copy(_obj.ScaleCrop); - self.Company.Copy(_obj.Company); - self.LinksUpToDate.Copy(_obj.LinksUpToDate); - self.CharactersWithSpaces.Copy(_obj.CharactersWithSpaces); - self.SharedDoc.Copy(_obj.SharedDoc); - self.HyperlinksChanged.Copy(_obj.HyperlinksChanged); - self.AppVersion.Copy(_obj.AppVersion); + {self.}XmlAttrXmlnsVt.Value := _obj.XmlAttrXmlnsVt.Value; + {self.}Template.Copy(_obj.Template); + {self.}TotalTime.Copy(_obj.TotalTime); + {self.}Pages.Copy(_obj.Pages); + {self.}Words.Copy(_obj.Words); + {self.}Characters.Copy(_obj.Characters); + {self.}Application.Copy(_obj.Application); + {self.}DocSecurity.Copy(_obj.DocSecurity); + {self.}Lines.Copy(_obj.Lines); + {self.}Paragraphs.Copy(_obj.Paragraphs); + {self.}ScaleCrop.Copy(_obj.ScaleCrop); + {self.}Company.Copy(_obj.Company); + {self.}LinksUpToDate.Copy(_obj.LinksUpToDate); + {self.}CharactersWithSpaces.Copy(_obj.CharactersWithSpaces); + {self.}SharedDoc.Copy(_obj.SharedDoc); + {self.}HyperlinksChanged.Copy(_obj.HyperlinksChanged); + {self.}AppVersion.Copy(_obj.AppVersion); end; function Properties.ReadXmlAttrXmlns(); begin - return self.XmlAttrXmlns.Value; + return {self.}XmlAttrXmlns.Value; end; function Properties.WriteXmlAttrXmlns(_value); begin - self.XmlAttrXmlns.Value := _value; + {self.}XmlAttrXmlns.Value := _value; end; function Properties.ReadXmlAttrXmlnsVt(); begin - return self.XmlAttrXmlnsVt.Value; + return {self.}XmlAttrXmlnsVt.Value; end; function Properties.WriteXmlAttrXmlnsVt(_value); begin - self.XmlAttrXmlnsVt.Value := _value; + {self.}XmlAttrXmlnsVt.Value := _value; end; diff --git a/autoclass/docx/PrstGeom@DOCX.tsf b/autoclass/docx/PrstGeom@DOCX.tsf index 03a1408..2f85d72 100644 --- a/autoclass/docx/PrstGeom@DOCX.tsf +++ b/autoclass/docx/PrstGeom@DOCX.tsf @@ -24,7 +24,7 @@ end; function PrstGeom.Create();overload; begin - self.Create(nil, "a", "prstGeom"); + {self.}Create(nil, "a", "prstGeom"); end; function PrstGeom.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function PrstGeom.Init();override; begin - self.XmlAttrPrst := new OpenXmlAttribute(nil, "prst", nil); - self.AvLst := new PureVal(self, self.Prefix, "avLst"); + {self.}XmlAttrPrst := new OpenXmlAttribute(nil, "prst", nil); + {self.}AvLst := new PureVal(self, {self.}Prefix, "avLst"); end; function PrstGeom.InitAttributes();override; begin attributes_ := array( - self.XmlAttrPrst, + {self.}XmlAttrPrst, ); end; function PrstGeom.InitChildren();override; begin child_elements_ := array( - 0: self.AvLst, + 0: {self.}AvLst, ); sorted_child_ := array( "": -1, - self.AvLst.ElementName: 0, + {self.}AvLst.ElementName: 0, ); end; function PrstGeom.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function PrstGeom.Copy(_obj: PrstGeom);override; begin if not ifnil(_obj.XmlAttrPrst.Value) then - self.XmlAttrPrst.Value := _obj.XmlAttrPrst.Value; - self.AvLst.Copy(_obj.AvLst); + {self.}XmlAttrPrst.Value := _obj.XmlAttrPrst.Value; + {self.}AvLst.Copy(_obj.AvLst); end; function PrstGeom.ReadXmlAttrPrst(); begin - return self.XmlAttrPrst.Value; + return {self.}XmlAttrPrst.Value; end; function PrstGeom.WriteXmlAttrPrst(_value); begin - self.XmlAttrPrst.Value := _value; + {self.}XmlAttrPrst.Value := _value; end; diff --git a/autoclass/docx/Pt@DOCX.tsf b/autoclass/docx/Pt@DOCX.tsf index e47e6a7..da45c9f 100644 --- a/autoclass/docx/Pt@DOCX.tsf +++ b/autoclass/docx/Pt@DOCX.tsf @@ -24,7 +24,7 @@ end; function Pt.Create();overload; begin - self.Create(nil, "c", "pt"); + {self.}Create(nil, "c", "pt"); end; function Pt.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function Pt.Init();override; begin - self.XmlAttrIdx := new OpenXmlAttribute(nil, "idx", nil); - self.V := new OpenXmlPcdata(self, self.Prefix, "v"); + {self.}XmlAttrIdx := new OpenXmlAttribute(nil, "idx", nil); + {self.}V := new OpenXmlPcdata(self, {self.}Prefix, "v"); end; function Pt.InitAttributes();override; begin attributes_ := array( - self.XmlAttrIdx, + {self.}XmlAttrIdx, ); end; function Pt.InitChildren();override; begin child_elements_ := array( - 0: self.V, + 0: {self.}V, ); sorted_child_ := array( "": -1, - self.V.ElementName: 0, + {self.}V.ElementName: 0, ); end; function Pt.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function Pt.Copy(_obj: Pt);override; begin if not ifnil(_obj.XmlAttrIdx.Value) then - self.XmlAttrIdx.Value := _obj.XmlAttrIdx.Value; - self.V.Copy(_obj.V); + {self.}XmlAttrIdx.Value := _obj.XmlAttrIdx.Value; + {self.}V.Copy(_obj.V); end; function Pt.ReadXmlAttrIdx(); begin - return self.XmlAttrIdx.Value; + return {self.}XmlAttrIdx.Value; end; function Pt.WriteXmlAttrIdx(_value); begin - self.XmlAttrIdx.Value := _value; + {self.}XmlAttrIdx.Value := _value; end; diff --git a/autoclass/docx/PureVal@DOCX.tsf b/autoclass/docx/PureVal@DOCX.tsf index 1aa52fb..990c1fd 100644 --- a/autoclass/docx/PureVal@DOCX.tsf +++ b/autoclass/docx/PureVal@DOCX.tsf @@ -23,7 +23,7 @@ end; function PureVal.Create();overload; begin - self.Create(nil, nil, ""); + {self.}Create(nil, nil, ""); end; function PureVal.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function PureVal.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); + {self.}XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); end; function PureVal.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, + {self.}XmlAttrVal, ); end; @@ -59,23 +59,23 @@ end; function PureVal.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function PureVal.Copy(_obj: PureVal);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; end; function PureVal.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function PureVal.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/autoclass/docx/PureWVal@DOCX.tsf b/autoclass/docx/PureWVal@DOCX.tsf index 3c01adb..b8c5cca 100644 --- a/autoclass/docx/PureWVal@DOCX.tsf +++ b/autoclass/docx/PureWVal@DOCX.tsf @@ -1,13 +1,13 @@ type PureWVal = class(OpenXmlElement) public function Create();overload; - function Create(_node);overload; - function Create(_parent, _prefix, _local_name);overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; function Init();override; function InitAttributes();override; function InitChildren();override; - function InitNode(_node);override; - function Copy(_obj);override; + function InitNode(_node: XmlNode);override; + function Copy(_obj: PureWVal);override; property Val read ReadXmlAttrVal write WriteXmlAttrVal; function ReadXmlAttrVal(); @@ -15,7 +15,7 @@ public public // Attributes - XmlAttrVal; + XmlAttrVal: OpenXmlAttribute; // Children @@ -23,28 +23,28 @@ end; function PureWVal.Create();overload; begin - self.Create(nil, nil, ""); + {self.}Create(nil, nil, ""); end; -function PureWVal.Create(_node);overload; +function PureWVal.Create(_node: XmlNode);overload; begin - class(OpenXmlElement).Create(_node); + class(OpenXmlElement).Create(_node: XmlNode); end; -function PureWVal.Create(_parent, _prefix, _local_name);overload; +function PureWVal.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; begin class(OpenXmlElement).Create(_parent, _prefix, _local_name); end; function PureWVal.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute("w", "val", nil); + {self.}XmlAttrVal := new OpenXmlAttribute("w", "val", nil); end; function PureWVal.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, + {self.}XmlAttrVal, ); end; @@ -57,25 +57,25 @@ begin ); end; -function PureWVal.InitNode(_node);override; +function PureWVal.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; -function PureWVal.Copy(_obj);override; +function PureWVal.Copy(_obj: PureWVal);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; end; function PureWVal.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function PureWVal.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/autoclass/docx/R@DOCX.tsf b/autoclass/docx/R@DOCX.tsf index 34395b4..b1276b1 100644 --- a/autoclass/docx/R@DOCX.tsf +++ b/autoclass/docx/R@DOCX.tsf @@ -50,7 +50,7 @@ end; function R.Create();overload; begin - self.Create(nil, "w", "r"); + {self.}Create(nil, "w", "r"); end; function R.Create(_node: XmlNode);overload; @@ -65,61 +65,61 @@ end; function R.Init();override; begin - self.XmlAttrWRsidRPr := new OpenXmlAttribute("w", "rsidRPr", nil); - self.XmlAttrAnchor := new OpenXmlAttribute("w", "anchor", nil); - self.XmlAttrHistory := new OpenXmlAttribute("w", "history", nil); - self.RPr := new RPr(self, self.Prefix, "rPr"); - self.Br := new Br(self, self.Prefix, "br"); - self.FldChar := new FldChar(self, self.Prefix, "fldChar"); - self.InstrText := new InstrText(self, self.Prefix, "instrText"); - self.XmlChildSeparator := new OpenXmlEmpty(self, self.Prefix, "separator"); - self.XmlChildContinuationSeparator := new OpenXmlEmpty(self, self.Prefix, "continuationSeparator"); - self.XmlChildLastRenderedPageBreak := new OpenXmlEmpty(self, self.Prefix, "lastRenderedPageBreak"); - self.Drawing := new Drawing(self, self.Prefix, "drawing"); - self.T := new T(self, self.Prefix, "t"); + {self.}XmlAttrWRsidRPr := new OpenXmlAttribute("w", "rsidRPr", nil); + {self.}XmlAttrAnchor := new OpenXmlAttribute("w", "anchor", nil); + {self.}XmlAttrHistory := new OpenXmlAttribute("w", "history", nil); + {self.}RPr := new RPr(self, {self.}Prefix, "rPr"); + {self.}Br := new Br(self, {self.}Prefix, "br"); + {self.}FldChar := new FldChar(self, {self.}Prefix, "fldChar"); + {self.}InstrText := new InstrText(self, {self.}Prefix, "instrText"); + {self.}XmlChildSeparator := new OpenXmlEmpty(self, {self.}Prefix, "separator"); + {self.}XmlChildContinuationSeparator := new OpenXmlEmpty(self, {self.}Prefix, "continuationSeparator"); + {self.}XmlChildLastRenderedPageBreak := new OpenXmlEmpty(self, {self.}Prefix, "lastRenderedPageBreak"); + {self.}Drawing := new Drawing(self, {self.}Prefix, "drawing"); + {self.}T := new T(self, {self.}Prefix, "t"); end; function R.InitAttributes();override; begin attributes_ := array( - self.XmlAttrWRsidRPr, - self.XmlAttrAnchor, - self.XmlAttrHistory, + {self.}XmlAttrWRsidRPr, + {self.}XmlAttrAnchor, + {self.}XmlAttrHistory, ); end; function R.InitChildren();override; begin child_elements_ := array( - 0: self.RPr, - 1: self.Br, - 2: self.FldChar, - 3: self.InstrText, - 4: self.XmlChildSeparator, - 5: self.XmlChildContinuationSeparator, - 6: self.XmlChildLastRenderedPageBreak, - 7: self.Drawing, - 8: self.T, + 0: {self.}RPr, + 1: {self.}Br, + 2: {self.}FldChar, + 3: {self.}InstrText, + 4: {self.}XmlChildSeparator, + 5: {self.}XmlChildContinuationSeparator, + 6: {self.}XmlChildLastRenderedPageBreak, + 7: {self.}Drawing, + 8: {self.}T, ); sorted_child_ := array( "": -1, - self.RPr.ElementName: 0, - self.Br.ElementName: 1, - self.FldChar.ElementName: 2, - self.InstrText.ElementName: 3, - self.XmlChildSeparator.ElementName: 4, - self.XmlChildContinuationSeparator.ElementName: 5, - self.XmlChildLastRenderedPageBreak.ElementName: 6, - self.Drawing.ElementName: 7, - self.T.ElementName: 8, + {self.}RPr.ElementName: 0, + {self.}Br.ElementName: 1, + {self.}FldChar.ElementName: 2, + {self.}InstrText.ElementName: 3, + {self.}XmlChildSeparator.ElementName: 4, + {self.}XmlChildContinuationSeparator.ElementName: 5, + {self.}XmlChildLastRenderedPageBreak.ElementName: 6, + {self.}Drawing.ElementName: 7, + {self.}T.ElementName: 8, ); end; function R.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -128,7 +128,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -156,78 +156,78 @@ end; function R.Copy(_obj: R);override; begin if not ifnil(_obj.XmlAttrWRsidRPr.Value) then - self.XmlAttrWRsidRPr.Value := _obj.XmlAttrWRsidRPr.Value; + {self.}XmlAttrWRsidRPr.Value := _obj.XmlAttrWRsidRPr.Value; if not ifnil(_obj.XmlAttrAnchor.Value) then - self.XmlAttrAnchor.Value := _obj.XmlAttrAnchor.Value; + {self.}XmlAttrAnchor.Value := _obj.XmlAttrAnchor.Value; if not ifnil(_obj.XmlAttrHistory.Value) then - self.XmlAttrHistory.Value := _obj.XmlAttrHistory.Value; - self.RPr.Copy(_obj.RPr); - self.Br.Copy(_obj.Br); - self.FldChar.Copy(_obj.FldChar); - self.InstrText.Copy(_obj.InstrText); - self.XmlChildSeparator.Copy(_obj.XmlChildSeparator); - self.XmlChildContinuationSeparator.Copy(_obj.XmlChildContinuationSeparator); - self.XmlChildLastRenderedPageBreak.Copy(_obj.XmlChildLastRenderedPageBreak); - self.Drawing.Copy(_obj.Drawing); - self.T.Copy(_obj.T); + {self.}XmlAttrHistory.Value := _obj.XmlAttrHistory.Value; + {self.}RPr.Copy(_obj.RPr); + {self.}Br.Copy(_obj.Br); + {self.}FldChar.Copy(_obj.FldChar); + {self.}InstrText.Copy(_obj.InstrText); + {self.}XmlChildSeparator.Copy(_obj.XmlChildSeparator); + {self.}XmlChildContinuationSeparator.Copy(_obj.XmlChildContinuationSeparator); + {self.}XmlChildLastRenderedPageBreak.Copy(_obj.XmlChildLastRenderedPageBreak); + {self.}Drawing.Copy(_obj.Drawing); + {self.}T.Copy(_obj.T); end; function R.ReadXmlAttrWRsidRPr(); begin - return self.XmlAttrWRsidRPr.Value; + return {self.}XmlAttrWRsidRPr.Value; end; function R.WriteXmlAttrWRsidRPr(_value); begin - self.XmlAttrWRsidRPr.Value := _value; + {self.}XmlAttrWRsidRPr.Value := _value; end; function R.ReadXmlAttrAnchor(); begin - return self.XmlAttrAnchor.Value; + return {self.}XmlAttrAnchor.Value; end; function R.WriteXmlAttrAnchor(_value); begin - self.XmlAttrAnchor.Value := _value; + {self.}XmlAttrAnchor.Value := _value; end; function R.ReadXmlAttrHistory(); begin - return self.XmlAttrHistory.Value; + return {self.}XmlAttrHistory.Value; end; function R.WriteXmlAttrHistory(_value); begin - self.XmlAttrHistory.Value := _value; + {self.}XmlAttrHistory.Value := _value; end; function R.ReadXmlChildSeparator(); begin - return ifnil(self.XmlChildSeparator.Value) ? false : true; + return ifnil({self.}XmlChildSeparator.Value) ? false : true; end; function R.WriteXmlChildSeparator(_value); begin - self.XmlChildSeparator.Value := _value; + {self.}XmlChildSeparator.Value := _value; end; function R.ReadXmlChildContinuationSeparator(); begin - return ifnil(self.XmlChildContinuationSeparator.Value) ? false : true; + return ifnil({self.}XmlChildContinuationSeparator.Value) ? false : true; end; function R.WriteXmlChildContinuationSeparator(_value); begin - self.XmlChildContinuationSeparator.Value := _value; + {self.}XmlChildContinuationSeparator.Value := _value; end; function R.ReadXmlChildLastRenderedPageBreak(); begin - return ifnil(self.XmlChildLastRenderedPageBreak.Value) ? false : true; + return ifnil({self.}XmlChildLastRenderedPageBreak.Value) ? false : true; end; function R.WriteXmlChildLastRenderedPageBreak(_value); begin - self.XmlChildLastRenderedPageBreak.Value := _value; + {self.}XmlChildLastRenderedPageBreak.Value := _value; end; diff --git a/autoclass/docx/RFonts@DOCX.tsf b/autoclass/docx/RFonts@DOCX.tsf index 6802327..c7ada74 100644 --- a/autoclass/docx/RFonts@DOCX.tsf +++ b/autoclass/docx/RFonts@DOCX.tsf @@ -51,7 +51,7 @@ end; function RFonts.Create();overload; begin - self.Create(nil, "w", "rFonts"); + {self.}Create(nil, "w", "rFonts"); end; function RFonts.Create(_node: XmlNode);overload; @@ -66,27 +66,27 @@ end; function RFonts.Init();override; begin - self.XmlAttrAscii := new OpenXmlAttribute(self.Prefix, "ascii", nil); - self.XmlAttrAsciiTheme := new OpenXmlAttribute(self.Prefix, "asciiTheme", nil); - self.XmlAttrEastAsia := new OpenXmlAttribute(self.Prefix, "eastAsia", nil); - self.XmlAttrEastAsiaTheme := new OpenXmlAttribute(self.Prefix, "eastAsiaTheme", nil); - self.XmlAttrHAnsi := new OpenXmlAttribute(self.Prefix, "hAnsi", nil); - self.XmlAttrHAnsiTheme := new OpenXmlAttribute(self.Prefix, "hAnsiTheme", nil); - self.XmlAttrHint := new OpenXmlAttribute(self.Prefix, "hint", nil); - self.XmlAttrCsTheme := new OpenXmlAttribute(self.Prefix, "cstheme", nil); + {self.}XmlAttrAscii := new OpenXmlAttribute({self.}Prefix, "ascii", nil); + {self.}XmlAttrAsciiTheme := new OpenXmlAttribute({self.}Prefix, "asciiTheme", nil); + {self.}XmlAttrEastAsia := new OpenXmlAttribute({self.}Prefix, "eastAsia", nil); + {self.}XmlAttrEastAsiaTheme := new OpenXmlAttribute({self.}Prefix, "eastAsiaTheme", nil); + {self.}XmlAttrHAnsi := new OpenXmlAttribute({self.}Prefix, "hAnsi", nil); + {self.}XmlAttrHAnsiTheme := new OpenXmlAttribute({self.}Prefix, "hAnsiTheme", nil); + {self.}XmlAttrHint := new OpenXmlAttribute({self.}Prefix, "hint", nil); + {self.}XmlAttrCsTheme := new OpenXmlAttribute({self.}Prefix, "cstheme", nil); end; function RFonts.InitAttributes();override; begin attributes_ := array( - self.XmlAttrAscii, - self.XmlAttrAsciiTheme, - self.XmlAttrEastAsia, - self.XmlAttrEastAsiaTheme, - self.XmlAttrHAnsi, - self.XmlAttrHAnsiTheme, - self.XmlAttrHint, - self.XmlAttrCsTheme, + {self.}XmlAttrAscii, + {self.}XmlAttrAsciiTheme, + {self.}XmlAttrEastAsia, + {self.}XmlAttrEastAsiaTheme, + {self.}XmlAttrHAnsi, + {self.}XmlAttrHAnsiTheme, + {self.}XmlAttrHint, + {self.}XmlAttrCsTheme, ); end; @@ -101,107 +101,107 @@ end; function RFonts.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function RFonts.Copy(_obj: RFonts);override; begin if not ifnil(_obj.XmlAttrAscii.Value) then - self.XmlAttrAscii.Value := _obj.XmlAttrAscii.Value; + {self.}XmlAttrAscii.Value := _obj.XmlAttrAscii.Value; if not ifnil(_obj.XmlAttrAsciiTheme.Value) then - self.XmlAttrAsciiTheme.Value := _obj.XmlAttrAsciiTheme.Value; + {self.}XmlAttrAsciiTheme.Value := _obj.XmlAttrAsciiTheme.Value; if not ifnil(_obj.XmlAttrEastAsia.Value) then - self.XmlAttrEastAsia.Value := _obj.XmlAttrEastAsia.Value; + {self.}XmlAttrEastAsia.Value := _obj.XmlAttrEastAsia.Value; if not ifnil(_obj.XmlAttrEastAsiaTheme.Value) then - self.XmlAttrEastAsiaTheme.Value := _obj.XmlAttrEastAsiaTheme.Value; + {self.}XmlAttrEastAsiaTheme.Value := _obj.XmlAttrEastAsiaTheme.Value; if not ifnil(_obj.XmlAttrHAnsi.Value) then - self.XmlAttrHAnsi.Value := _obj.XmlAttrHAnsi.Value; + {self.}XmlAttrHAnsi.Value := _obj.XmlAttrHAnsi.Value; if not ifnil(_obj.XmlAttrHAnsiTheme.Value) then - self.XmlAttrHAnsiTheme.Value := _obj.XmlAttrHAnsiTheme.Value; + {self.}XmlAttrHAnsiTheme.Value := _obj.XmlAttrHAnsiTheme.Value; if not ifnil(_obj.XmlAttrHint.Value) then - self.XmlAttrHint.Value := _obj.XmlAttrHint.Value; + {self.}XmlAttrHint.Value := _obj.XmlAttrHint.Value; if not ifnil(_obj.XmlAttrCsTheme.Value) then - self.XmlAttrCsTheme.Value := _obj.XmlAttrCsTheme.Value; + {self.}XmlAttrCsTheme.Value := _obj.XmlAttrCsTheme.Value; end; function RFonts.ReadXmlAttrAscii(); begin - return self.XmlAttrAscii.Value; + return {self.}XmlAttrAscii.Value; end; function RFonts.WriteXmlAttrAscii(_value); begin - self.XmlAttrAscii.Value := _value; + {self.}XmlAttrAscii.Value := _value; end; function RFonts.ReadXmlAttrAsciiTheme(); begin - return self.XmlAttrAsciiTheme.Value; + return {self.}XmlAttrAsciiTheme.Value; end; function RFonts.WriteXmlAttrAsciiTheme(_value); begin - self.XmlAttrAsciiTheme.Value := _value; + {self.}XmlAttrAsciiTheme.Value := _value; end; function RFonts.ReadXmlAttrEastAsia(); begin - return self.XmlAttrEastAsia.Value; + return {self.}XmlAttrEastAsia.Value; end; function RFonts.WriteXmlAttrEastAsia(_value); begin - self.XmlAttrEastAsia.Value := _value; + {self.}XmlAttrEastAsia.Value := _value; end; function RFonts.ReadXmlAttrEastAsiaTheme(); begin - return self.XmlAttrEastAsiaTheme.Value; + return {self.}XmlAttrEastAsiaTheme.Value; end; function RFonts.WriteXmlAttrEastAsiaTheme(_value); begin - self.XmlAttrEastAsiaTheme.Value := _value; + {self.}XmlAttrEastAsiaTheme.Value := _value; end; function RFonts.ReadXmlAttrHAnsi(); begin - return self.XmlAttrHAnsi.Value; + return {self.}XmlAttrHAnsi.Value; end; function RFonts.WriteXmlAttrHAnsi(_value); begin - self.XmlAttrHAnsi.Value := _value; + {self.}XmlAttrHAnsi.Value := _value; end; function RFonts.ReadXmlAttrHAnsiTheme(); begin - return self.XmlAttrHAnsiTheme.Value; + return {self.}XmlAttrHAnsiTheme.Value; end; function RFonts.WriteXmlAttrHAnsiTheme(_value); begin - self.XmlAttrHAnsiTheme.Value := _value; + {self.}XmlAttrHAnsiTheme.Value := _value; end; function RFonts.ReadXmlAttrHint(); begin - return self.XmlAttrHint.Value; + return {self.}XmlAttrHint.Value; end; function RFonts.WriteXmlAttrHint(_value); begin - self.XmlAttrHint.Value := _value; + {self.}XmlAttrHint.Value := _value; end; function RFonts.ReadXmlAttrCsTheme(); begin - return self.XmlAttrCsTheme.Value; + return {self.}XmlAttrCsTheme.Value; end; function RFonts.WriteXmlAttrCsTheme(_value); begin - self.XmlAttrCsTheme.Value := _value; + {self.}XmlAttrCsTheme.Value := _value; end; diff --git a/autoclass/docx/RPr@DOCX.tsf b/autoclass/docx/RPr@DOCX.tsf index 862c1e3..351b528 100644 --- a/autoclass/docx/RPr@DOCX.tsf +++ b/autoclass/docx/RPr@DOCX.tsf @@ -53,7 +53,7 @@ end; function RPr.Create();overload; begin - self.Create(nil, "w", "rPr"); + {self.}Create(nil, "w", "rPr"); end; function RPr.Create(_node: XmlNode);overload; @@ -68,22 +68,22 @@ end; function RPr.Init();override; begin - self.NoProof := new PureVal(self, self.Prefix, "noProof"); - self.WebHidden := new PureWVal(self, self.Prefix, "wedHidden"); - self.RStyle := new PureWVal(self, self.Prefix, "rStyle"); - self.RFonts := new RFonts(self, self.Prefix, "rFonts"); - self.Kern := new PureWVal(self, self.Prefix, "kern"); - self.XmlChildI := new OpenXmlEmpty(self, self.Prefix, "i"); - self.XmlChildICs := new OpenXmlEmpty(self, self.Prefix, "iCs"); - self.XmlChildB := new OpenXmlEmpty(self, self.Prefix, "b"); - self.XmlChildBCs := new OpenXmlEmpty(self, self.Prefix, "bCs"); - self.XmlChildStrike := new OpenXmlEmpty(self, self.Prefix, "strike"); - self.Color := new Color(self, self.Prefix, "color"); - self.Sz := new Sz(self, self.Prefix, "sz"); - self.SzCs := new SzCs(self, self.Prefix, "szCs"); - self.XmlChildU := new OpenXmlEmpty(self, self.Prefix, "u"); - self.Lang := new Lang(self, self.Prefix, "lang"); - self.W14Ligatures := new PureWVal(self, "w14", "ligatures"); + {self.}NoProof := new PureVal(self, {self.}Prefix, "noProof"); + {self.}WebHidden := new PureWVal(self, {self.}Prefix, "wedHidden"); + {self.}RStyle := new PureWVal(self, {self.}Prefix, "rStyle"); + {self.}RFonts := new RFonts(self, {self.}Prefix, "rFonts"); + {self.}Kern := new PureWVal(self, {self.}Prefix, "kern"); + {self.}XmlChildI := new OpenXmlEmpty(self, {self.}Prefix, "i"); + {self.}XmlChildICs := new OpenXmlEmpty(self, {self.}Prefix, "iCs"); + {self.}XmlChildB := new OpenXmlEmpty(self, {self.}Prefix, "b"); + {self.}XmlChildBCs := new OpenXmlEmpty(self, {self.}Prefix, "bCs"); + {self.}XmlChildStrike := new OpenXmlEmpty(self, {self.}Prefix, "strike"); + {self.}Color := new Color(self, {self.}Prefix, "color"); + {self.}Sz := new Sz(self, {self.}Prefix, "sz"); + {self.}SzCs := new SzCs(self, {self.}Prefix, "szCs"); + {self.}XmlChildU := new OpenXmlEmpty(self, {self.}Prefix, "u"); + {self.}Lang := new Lang(self, {self.}Prefix, "lang"); + {self.}W14Ligatures := new PureWVal(self, "w14", "ligatures"); end; function RPr.InitAttributes();override; @@ -95,49 +95,49 @@ end; function RPr.InitChildren();override; begin child_elements_ := array( - 0: self.NoProof, - 1: self.WebHidden, - 2: self.RStyle, - 3: self.RFonts, - 4: self.Kern, - 5: self.XmlChildI, - 6: self.XmlChildICs, - 7: self.XmlChildB, - 8: self.XmlChildBCs, - 9: self.XmlChildStrike, - 10: self.Color, - 11: self.Sz, - 12: self.SzCs, - 13: self.XmlChildU, - 14: self.Lang, - 15: self.W14Ligatures, + 0: {self.}NoProof, + 1: {self.}WebHidden, + 2: {self.}RStyle, + 3: {self.}RFonts, + 4: {self.}Kern, + 5: {self.}XmlChildI, + 6: {self.}XmlChildICs, + 7: {self.}XmlChildB, + 8: {self.}XmlChildBCs, + 9: {self.}XmlChildStrike, + 10: {self.}Color, + 11: {self.}Sz, + 12: {self.}SzCs, + 13: {self.}XmlChildU, + 14: {self.}Lang, + 15: {self.}W14Ligatures, ); sorted_child_ := array( "": -1, - self.NoProof.ElementName: 0, - self.WebHidden.ElementName: 1, - self.RStyle.ElementName: 2, - self.RFonts.ElementName: 3, - self.Kern.ElementName: 4, - self.XmlChildI.ElementName: 5, - self.XmlChildICs.ElementName: 6, - self.XmlChildB.ElementName: 7, - self.XmlChildBCs.ElementName: 8, - self.XmlChildStrike.ElementName: 9, - self.Color.ElementName: 10, - self.Sz.ElementName: 11, - self.SzCs.ElementName: 12, - self.XmlChildU.ElementName: 13, - self.Lang.ElementName: 14, - self.W14Ligatures.ElementName: 15, + {self.}NoProof.ElementName: 0, + {self.}WebHidden.ElementName: 1, + {self.}RStyle.ElementName: 2, + {self.}RFonts.ElementName: 3, + {self.}Kern.ElementName: 4, + {self.}XmlChildI.ElementName: 5, + {self.}XmlChildICs.ElementName: 6, + {self.}XmlChildB.ElementName: 7, + {self.}XmlChildBCs.ElementName: 8, + {self.}XmlChildStrike.ElementName: 9, + {self.}Color.ElementName: 10, + {self.}Sz.ElementName: 11, + {self.}SzCs.ElementName: 12, + {self.}XmlChildU.ElementName: 13, + {self.}Lang.ElementName: 14, + {self.}W14Ligatures.ElementName: 15, ); end; function RPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -146,7 +146,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -173,80 +173,80 @@ end; function RPr.Copy(_obj: RPr);override; begin - self.NoProof.Copy(_obj.NoProof); - self.WebHidden.Copy(_obj.WebHidden); - self.RStyle.Copy(_obj.RStyle); - self.RFonts.Copy(_obj.RFonts); - self.Kern.Copy(_obj.Kern); - self.XmlChildI.Copy(_obj.XmlChildI); - self.XmlChildICs.Copy(_obj.XmlChildICs); - self.XmlChildB.Copy(_obj.XmlChildB); - self.XmlChildBCs.Copy(_obj.XmlChildBCs); - self.XmlChildStrike.Copy(_obj.XmlChildStrike); - self.Color.Copy(_obj.Color); - self.Sz.Copy(_obj.Sz); - self.SzCs.Copy(_obj.SzCs); - self.XmlChildU.Copy(_obj.XmlChildU); - self.Lang.Copy(_obj.Lang); - self.W14Ligatures.Copy(_obj.W14Ligatures); + {self.}NoProof.Copy(_obj.NoProof); + {self.}WebHidden.Copy(_obj.WebHidden); + {self.}RStyle.Copy(_obj.RStyle); + {self.}RFonts.Copy(_obj.RFonts); + {self.}Kern.Copy(_obj.Kern); + {self.}XmlChildI.Copy(_obj.XmlChildI); + {self.}XmlChildICs.Copy(_obj.XmlChildICs); + {self.}XmlChildB.Copy(_obj.XmlChildB); + {self.}XmlChildBCs.Copy(_obj.XmlChildBCs); + {self.}XmlChildStrike.Copy(_obj.XmlChildStrike); + {self.}Color.Copy(_obj.Color); + {self.}Sz.Copy(_obj.Sz); + {self.}SzCs.Copy(_obj.SzCs); + {self.}XmlChildU.Copy(_obj.XmlChildU); + {self.}Lang.Copy(_obj.Lang); + {self.}W14Ligatures.Copy(_obj.W14Ligatures); end; function RPr.ReadXmlChildI(); begin - return ifnil(self.XmlChildI.Value) ? false : true; + return ifnil({self.}XmlChildI.Value) ? false : true; end; function RPr.WriteXmlChildI(_value); begin - self.XmlChildI.Value := _value; + {self.}XmlChildI.Value := _value; end; function RPr.ReadXmlChildICs(); begin - return ifnil(self.XmlChildICs.Value) ? false : true; + return ifnil({self.}XmlChildICs.Value) ? false : true; end; function RPr.WriteXmlChildICs(_value); begin - self.XmlChildICs.Value := _value; + {self.}XmlChildICs.Value := _value; end; function RPr.ReadXmlChildB(); begin - return ifnil(self.XmlChildB.Value) ? false : true; + return ifnil({self.}XmlChildB.Value) ? false : true; end; function RPr.WriteXmlChildB(_value); begin - self.XmlChildB.Value := _value; + {self.}XmlChildB.Value := _value; end; function RPr.ReadXmlChildBCs(); begin - return ifnil(self.XmlChildBCs.Value) ? false : true; + return ifnil({self.}XmlChildBCs.Value) ? false : true; end; function RPr.WriteXmlChildBCs(_value); begin - self.XmlChildBCs.Value := _value; + {self.}XmlChildBCs.Value := _value; end; function RPr.ReadXmlChildStrike(); begin - return ifnil(self.XmlChildStrike.Value) ? false : true; + return ifnil({self.}XmlChildStrike.Value) ? false : true; end; function RPr.WriteXmlChildStrike(_value); begin - self.XmlChildStrike.Value := _value; + {self.}XmlChildStrike.Value := _value; end; function RPr.ReadXmlChildU(); begin - return ifnil(self.XmlChildU.Value) ? false : true; + return ifnil({self.}XmlChildU.Value) ? false : true; end; function RPr.WriteXmlChildU(_value); begin - self.XmlChildU.Value := _value; + {self.}XmlChildU.Value := _value; end; diff --git a/autoclass/docx/RPrDefault@DOCX.tsf b/autoclass/docx/RPrDefault@DOCX.tsf index fe00b38..ae55b45 100644 --- a/autoclass/docx/RPrDefault@DOCX.tsf +++ b/autoclass/docx/RPrDefault@DOCX.tsf @@ -19,7 +19,7 @@ end; function RPrDefault.Create();overload; begin - self.Create(nil, "w", "rPrDefault"); + {self.}Create(nil, "w", "rPrDefault"); end; function RPrDefault.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function RPrDefault.Init();override; begin - self.RPr := new RPr(self, self.Prefix, "rPr"); + {self.}RPr := new RPr(self, {self.}Prefix, "rPr"); end; function RPrDefault.InitAttributes();override; @@ -46,19 +46,19 @@ end; function RPrDefault.InitChildren();override; begin child_elements_ := array( - 0: self.RPr, + 0: {self.}RPr, ); sorted_child_ := array( "": -1, - self.RPr.ElementName: 0, + {self.}RPr.ElementName: 0, ); end; function RPrDefault.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function RPrDefault.Copy(_obj: RPrDefault);override; begin - self.RPr.Copy(_obj.RPr); + {self.}RPr.Copy(_obj.RPr); end; diff --git a/autoclass/docx/Reference@DOCX.tsf b/autoclass/docx/Reference@DOCX.tsf index 8368fee..c06f3f3 100644 --- a/autoclass/docx/Reference@DOCX.tsf +++ b/autoclass/docx/Reference@DOCX.tsf @@ -27,7 +27,7 @@ end; function Reference.Create();overload; begin - self.Create(nil, "w", ""); + {self.}Create(nil, "w", ""); end; function Reference.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function Reference.Init();override; begin - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); - self.XmlAttrId := new OpenXmlAttribute("r", "id", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); + {self.}XmlAttrId := new OpenXmlAttribute("r", "id", nil); end; function Reference.InitAttributes();override; begin attributes_ := array( - self.XmlAttrType, - self.XmlAttrId, + {self.}XmlAttrType, + {self.}XmlAttrId, ); end; @@ -65,35 +65,35 @@ end; function Reference.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Reference.Copy(_obj: Reference);override; begin if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; end; function Reference.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function Reference.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; function Reference.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function Reference.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; diff --git a/autoclass/docx/Relationship@DOCX.tsf b/autoclass/docx/Relationship@DOCX.tsf index 3ff6fad..85ba5c2 100644 --- a/autoclass/docx/Relationship@DOCX.tsf +++ b/autoclass/docx/Relationship@DOCX.tsf @@ -31,7 +31,7 @@ end; function Relationship.Create();overload; begin - self.Create(nil, nil, "Relationship"); + {self.}Create(nil, nil, "Relationship"); end; function Relationship.Create(_node: XmlNode);overload; @@ -46,17 +46,17 @@ end; function Relationship.Init();override; begin - self.XmlAttrId := new OpenXmlAttribute(nil, "Id", nil); - self.XmlAttrType := new OpenXmlAttribute(nil, "Type", nil); - self.XmlAttrTarget := new OpenXmlAttribute(nil, "Target", nil); + {self.}XmlAttrId := new OpenXmlAttribute(nil, "Id", nil); + {self.}XmlAttrType := new OpenXmlAttribute(nil, "Type", nil); + {self.}XmlAttrTarget := new OpenXmlAttribute(nil, "Target", nil); end; function Relationship.InitAttributes();override; begin attributes_ := array( - self.XmlAttrId, - self.XmlAttrType, - self.XmlAttrTarget, + {self.}XmlAttrId, + {self.}XmlAttrType, + {self.}XmlAttrTarget, ); end; @@ -71,47 +71,47 @@ end; function Relationship.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Relationship.Copy(_obj: Relationship);override; begin if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; if not ifnil(_obj.XmlAttrTarget.Value) then - self.XmlAttrTarget.Value := _obj.XmlAttrTarget.Value; + {self.}XmlAttrTarget.Value := _obj.XmlAttrTarget.Value; end; function Relationship.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function Relationship.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; function Relationship.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function Relationship.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; function Relationship.ReadXmlAttrTarget(); begin - return self.XmlAttrTarget.Value; + return {self.}XmlAttrTarget.Value; end; function Relationship.WriteXmlAttrTarget(_value); begin - self.XmlAttrTarget.Value := _value; + {self.}XmlAttrTarget.Value := _value; end; diff --git a/autoclass/docx/Relationships@DOCX.tsf b/autoclass/docx/Relationships@DOCX.tsf index b886e8f..0ab172b 100644 --- a/autoclass/docx/Relationships@DOCX.tsf +++ b/autoclass/docx/Relationships@DOCX.tsf @@ -28,7 +28,7 @@ end; function Relationships.Create();overload; begin - self.Create(nil, nil, "Relationships"); + {self.}Create(nil, nil, "Relationships"); end; function Relationships.Create(_node: XmlNode);overload; @@ -43,13 +43,13 @@ end; function Relationships.Init();override; begin - self.XmlAttrxmlns := new OpenXmlAttribute(nil, "xmlns", "http://schemas.openxmlformats.org/package/2006/relationships"); + {self.}XmlAttrxmlns := new OpenXmlAttribute(nil, "xmlns", "http://schemas.openxmlformats.org/package/2006/relationships"); end; function Relationships.InitAttributes();override; begin attributes_ := array( - self.XmlAttrxmlns, + {self.}XmlAttrxmlns, ); end; @@ -64,9 +64,9 @@ end; function Relationships.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -75,7 +75,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -84,7 +84,7 @@ begin begin obj := nil; case node_name of - "Relationship": obj := self.AppendRelationship(); + "Relationship": obj := {self.}AppendRelationship(); end; if ifObj(obj) then obj.InitNode(node); end @@ -104,7 +104,7 @@ end; function Relationships.Copy(_obj: Relationships);override; begin if not ifnil(_obj.XmlAttrxmlns.Value) then - self.XmlAttrxmlns.Value := _obj.XmlAttrxmlns.Value; + {self.}XmlAttrxmlns.Value := _obj.XmlAttrxmlns.Value; end; function Relationships.AddRelationship(): Relationship; @@ -116,7 +116,7 @@ begin if child_elements_[i].LocalName = "Relationship" then break; end obj := new Relationship(self, nil, "Relationship"); - self.InsertChild(obj, i+1); + {self.}InsertChild(obj, i+1); return obj; end; @@ -145,10 +145,10 @@ end; function Relationships.ReadXmlAttrxmlns(); begin - return self.XmlAttrxmlns.Value; + return {self.}XmlAttrxmlns.Value; end; function Relationships.WriteXmlAttrxmlns(_value); begin - self.XmlAttrxmlns.Value := _value; + {self.}XmlAttrxmlns.Value := _value; end; diff --git a/autoclass/docx/Rich@DOCX.tsf b/autoclass/docx/Rich@DOCX.tsf index da3699f..ec4bb53 100644 --- a/autoclass/docx/Rich@DOCX.tsf +++ b/autoclass/docx/Rich@DOCX.tsf @@ -29,7 +29,7 @@ end; function Rich.Create();overload; begin - self.Create(nil, "c", "rich"); + {self.}Create(nil, "c", "rich"); end; function Rich.Create(_node: XmlNode);overload; @@ -44,8 +44,8 @@ end; function Rich.Init();override; begin - self.BodyPr := new BodyPr(self, "a", "BodyPr"); - self.XmlChildLstStyle := new OpenXmlEmpty(self, "a", "LstStyle"); + {self.}BodyPr := new BodyPr(self, "a", "BodyPr"); + {self.}XmlChildLstStyle := new OpenXmlEmpty(self, "a", "LstStyle"); end; function Rich.InitAttributes();override; @@ -57,21 +57,21 @@ end; function Rich.InitChildren();override; begin child_elements_ := array( - 0: self.BodyPr, - 1: self.XmlChildLstStyle, + 0: {self.}BodyPr, + 1: {self.}XmlChildLstStyle, ); sorted_child_ := array( "": -1, - self.BodyPr.ElementName: 0, - self.XmlChildLstStyle.ElementName: 1, + {self.}BodyPr.ElementName: 0, + {self.}XmlChildLstStyle.ElementName: 1, ); end; function Rich.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -80,7 +80,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -89,7 +89,7 @@ begin begin obj := nil; case node_name of - "a:p": obj := self.AppendP(); + "a:p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,8 +108,8 @@ end; function Rich.Copy(_obj: Rich);override; begin - self.BodyPr.Copy(_obj.BodyPr); - self.XmlChildLstStyle.Copy(_obj.XmlChildLstStyle); + {self.}BodyPr.Copy(_obj.BodyPr); + {self.}XmlChildLstStyle.Copy(_obj.XmlChildLstStyle); end; function Rich.AddP(): Ap; @@ -121,7 +121,7 @@ begin if child_elements_[i].LocalName = "p" then break; end obj := new Ap(self, "a", "p"); - self.InsertChild(obj, i+1); + {self.}InsertChild(obj, i+1); return obj; end; @@ -150,10 +150,10 @@ end; function Rich.ReadXmlChildLstStyle(); begin - return ifnil(self.XmlChildLstStyle.Value) ? false : true; + return ifnil({self.}XmlChildLstStyle.Value) ? false : true; end; function Rich.WriteXmlChildLstStyle(_value); begin - self.XmlChildLstStyle.Value := _value; + {self.}XmlChildLstStyle.Value := _value; end; diff --git a/autoclass/docx/Rsids@DOCX.tsf b/autoclass/docx/Rsids@DOCX.tsf index d54251e..5a2e29c 100644 --- a/autoclass/docx/Rsids@DOCX.tsf +++ b/autoclass/docx/Rsids@DOCX.tsf @@ -24,7 +24,7 @@ end; function Rsids.Create();overload; begin - self.Create(nil, "w", "rsids"); + {self.}Create(nil, "w", "rsids"); end; function Rsids.Create(_node: XmlNode);overload; @@ -39,7 +39,7 @@ end; function Rsids.Init();override; begin - self.RsidRoot := new PureWVal(self, self.Prefix, "rsidRoot"); + {self.}RsidRoot := new PureWVal(self, {self.}Prefix, "rsidRoot"); end; function Rsids.InitAttributes();override; @@ -51,19 +51,19 @@ end; function Rsids.InitChildren();override; begin child_elements_ := array( - 0: self.RsidRoot, + 0: {self.}RsidRoot, ); sorted_child_ := array( "": -1, - self.RsidRoot.ElementName: 0, + {self.}RsidRoot.ElementName: 0, ); end; function Rsids.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -72,7 +72,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -81,7 +81,7 @@ begin begin obj := nil; case node_name of - pre + "rsid": obj := self.AppendRsid(); + pre + "rsid": obj := {self.}AppendRsid(); end; if ifObj(obj) then obj.InitNode(node); end @@ -100,7 +100,7 @@ end; function Rsids.Copy(_obj: Rsids);override; begin - self.RsidRoot.Copy(_obj.RsidRoot); + {self.}RsidRoot.Copy(_obj.RsidRoot); end; function Rsids.AddRsid(): PureWVal; @@ -111,14 +111,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "rsid" then break; end - obj := new PureWVal(self, self.Prefix, "rsid"); - self.InsertChild(obj, i+1); + obj := new PureWVal(self, {self.}Prefix, "rsid"); + {self.}InsertChild(obj, i+1); return obj; end; function Rsids.AppendRsid(): PureWVal; begin - obj := new PureWVal(self, self.Prefix, "rsid"); + obj := new PureWVal(self, {self.}Prefix, "rsid"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Scaling@DOCX.tsf b/autoclass/docx/Scaling@DOCX.tsf index ebdd370..aae45c4 100644 --- a/autoclass/docx/Scaling@DOCX.tsf +++ b/autoclass/docx/Scaling@DOCX.tsf @@ -23,7 +23,7 @@ end; function Scaling.Create();overload; begin - self.Create(nil, "c", "scaling"); + {self.}Create(nil, "c", "scaling"); end; function Scaling.Create(_node: XmlNode);overload; @@ -38,7 +38,7 @@ end; function Scaling.Init();override; begin - self.XmlChildOrientation := new PureVal(self, self.Prefix, "orientation"); + {self.}XmlChildOrientation := new PureVal(self, {self.}Prefix, "orientation"); end; function Scaling.InitAttributes();override; @@ -50,19 +50,19 @@ end; function Scaling.InitChildren();override; begin child_elements_ := array( - 0: self.XmlChildOrientation, + 0: {self.}XmlChildOrientation, ); sorted_child_ := array( "": -1, - self.XmlChildOrientation.ElementName: 0, + {self.}XmlChildOrientation.ElementName: 0, ); end; function Scaling.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,15 +98,15 @@ end; function Scaling.Copy(_obj: Scaling);override; begin - self.XmlChildOrientation.Copy(_obj.XmlChildOrientation); + {self.}XmlChildOrientation.Copy(_obj.XmlChildOrientation); end; function Scaling.ReadXmlChildOrientation(); begin - return ifnil(self.XmlChildOrientation.Value) ? false : true; + return ifnil({self.}XmlChildOrientation.Value) ? false : true; end; function Scaling.WriteXmlChildOrientation(_value); begin - self.XmlChildOrientation.Value := _value; + {self.}XmlChildOrientation.Value := _value; end; diff --git a/autoclass/docx/SchemeClr@DOCX.tsf b/autoclass/docx/SchemeClr@DOCX.tsf index a66be58..1edcab7 100644 --- a/autoclass/docx/SchemeClr@DOCX.tsf +++ b/autoclass/docx/SchemeClr@DOCX.tsf @@ -26,7 +26,7 @@ end; function SchemeClr.Create();overload; begin - self.Create(nil, "a", "schemeClr"); + {self.}Create(nil, "a", "schemeClr"); end; function SchemeClr.Create(_node: XmlNode);overload; @@ -41,39 +41,39 @@ end; function SchemeClr.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); - self.LumMod := new PureVal(self, self.Prefix, "lumMod"); - self.SatMod := new PureVal(self, self.Prefix, "satMod"); - self.Tint := new PureVal(self, self.Prefix, "tint"); + {self.}XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); + {self.}LumMod := new PureVal(self, {self.}Prefix, "lumMod"); + {self.}SatMod := new PureVal(self, {self.}Prefix, "satMod"); + {self.}Tint := new PureVal(self, {self.}Prefix, "tint"); end; function SchemeClr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, + {self.}XmlAttrVal, ); end; function SchemeClr.InitChildren();override; begin child_elements_ := array( - 0: self.LumMod, - 1: self.SatMod, - 2: self.Tint, + 0: {self.}LumMod, + 1: {self.}SatMod, + 2: {self.}Tint, ); sorted_child_ := array( "": -1, - self.LumMod.ElementName: 0, - self.SatMod.ElementName: 1, - self.Tint.ElementName: 2, + {self.}LumMod.ElementName: 0, + {self.}SatMod.ElementName: 1, + {self.}Tint.ElementName: 2, ); end; function SchemeClr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -82,7 +82,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -110,18 +110,18 @@ end; function SchemeClr.Copy(_obj: SchemeClr);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; - self.LumMod.Copy(_obj.LumMod); - self.SatMod.Copy(_obj.SatMod); - self.Tint.Copy(_obj.Tint); + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}LumMod.Copy(_obj.LumMod); + {self.}SatMod.Copy(_obj.SatMod); + {self.}Tint.Copy(_obj.Tint); end; function SchemeClr.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function SchemeClr.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/autoclass/docx/Sdt@DOCX.tsf b/autoclass/docx/Sdt@DOCX.tsf index 262a788..8251aea 100644 --- a/autoclass/docx/Sdt@DOCX.tsf +++ b/autoclass/docx/Sdt@DOCX.tsf @@ -21,7 +21,7 @@ end; function Sdt.Create();overload; begin - self.Create(nil, "w", "sdt"); + {self.}Create(nil, "w", "sdt"); end; function Sdt.Create(_node: XmlNode);overload; @@ -36,9 +36,9 @@ end; function Sdt.Init();override; begin - self.SdtPr := new SdtPr(self, self.Prefix, "stdPr"); - self.SdtEndPr := new SdtEndPr(self, self.Prefix, "sdtEndPr"); - self.SdtContent := new SdtContent(self, self.Prefix, "sdtContent"); + {self.}SdtPr := new SdtPr(self, {self.}Prefix, "stdPr"); + {self.}SdtEndPr := new SdtEndPr(self, {self.}Prefix, "sdtEndPr"); + {self.}SdtContent := new SdtContent(self, {self.}Prefix, "sdtContent"); end; function Sdt.InitAttributes();override; @@ -50,23 +50,23 @@ end; function Sdt.InitChildren();override; begin child_elements_ := array( - 0: self.SdtPr, - 1: self.SdtEndPr, - 2: self.SdtContent, + 0: {self.}SdtPr, + 1: {self.}SdtEndPr, + 2: {self.}SdtContent, ); sorted_child_ := array( "": -1, - self.SdtPr.ElementName: 0, - self.SdtEndPr.ElementName: 1, - self.SdtContent.ElementName: 2, + {self.}SdtPr.ElementName: 0, + {self.}SdtEndPr.ElementName: 1, + {self.}SdtContent.ElementName: 2, ); end; function Sdt.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -75,7 +75,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,7 +102,7 @@ end; function Sdt.Copy(_obj: Sdt);override; begin - self.SdtPr.Copy(_obj.SdtPr); - self.SdtEndPr.Copy(_obj.SdtEndPr); - self.SdtContent.Copy(_obj.SdtContent); + {self.}SdtPr.Copy(_obj.SdtPr); + {self.}SdtEndPr.Copy(_obj.SdtEndPr); + {self.}SdtContent.Copy(_obj.SdtContent); end; diff --git a/autoclass/docx/SdtContent@DOCX.tsf b/autoclass/docx/SdtContent@DOCX.tsf index 528ad08..3b210f7 100644 --- a/autoclass/docx/SdtContent@DOCX.tsf +++ b/autoclass/docx/SdtContent@DOCX.tsf @@ -23,7 +23,7 @@ end; function SdtContent.Create();overload; begin - self.Create(nil, "w", "sdtContent"); + {self.}Create(nil, "w", "sdtContent"); end; function SdtContent.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function SdtContent.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); + pre + "p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; function SdtContent.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/SdtEndPr@DOCX.tsf b/autoclass/docx/SdtEndPr@DOCX.tsf index 8331d1e..4e2df2c 100644 --- a/autoclass/docx/SdtEndPr@DOCX.tsf +++ b/autoclass/docx/SdtEndPr@DOCX.tsf @@ -19,7 +19,7 @@ end; function SdtEndPr.Create();overload; begin - self.Create(nil, "w", "sdtEndPr"); + {self.}Create(nil, "w", "sdtEndPr"); end; function SdtEndPr.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function SdtEndPr.Init();override; begin - self.RPr := new RPr(self, self.Prefix, "rPr"); + {self.}RPr := new RPr(self, {self.}Prefix, "rPr"); end; function SdtEndPr.InitAttributes();override; @@ -46,19 +46,19 @@ end; function SdtEndPr.InitChildren();override; begin child_elements_ := array( - 0: self.RPr, + 0: {self.}RPr, ); sorted_child_ := array( "": -1, - self.RPr.ElementName: 0, + {self.}RPr.ElementName: 0, ); end; function SdtEndPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function SdtEndPr.Copy(_obj: SdtEndPr);override; begin - self.RPr.Copy(_obj.RPr); + {self.}RPr.Copy(_obj.RPr); end; diff --git a/autoclass/docx/SdtPr@DOCX.tsf b/autoclass/docx/SdtPr@DOCX.tsf index d0491ac..d4ee27d 100644 --- a/autoclass/docx/SdtPr@DOCX.tsf +++ b/autoclass/docx/SdtPr@DOCX.tsf @@ -21,7 +21,7 @@ end; function SdtPr.Create();overload; begin - self.Create(nil, "w", "sdtPr"); + {self.}Create(nil, "w", "sdtPr"); end; function SdtPr.Create(_node: XmlNode);overload; @@ -36,9 +36,9 @@ end; function SdtPr.Init();override; begin - self.RPr := new RPr(self, self.Prefix, "rPr"); - self.Id := new PureWVal(self, self.Prefix, "id"); - self.DocPartObj := new DocPartObj(self, self.Prefix, "docPartObj"); + {self.}RPr := new RPr(self, {self.}Prefix, "rPr"); + {self.}Id := new PureWVal(self, {self.}Prefix, "id"); + {self.}DocPartObj := new DocPartObj(self, {self.}Prefix, "docPartObj"); end; function SdtPr.InitAttributes();override; @@ -50,23 +50,23 @@ end; function SdtPr.InitChildren();override; begin child_elements_ := array( - 0: self.RPr, - 1: self.Id, - 2: self.DocPartObj, + 0: {self.}RPr, + 1: {self.}Id, + 2: {self.}DocPartObj, ); sorted_child_ := array( "": -1, - self.RPr.ElementName: 0, - self.Id.ElementName: 1, - self.DocPartObj.ElementName: 2, + {self.}RPr.ElementName: 0, + {self.}Id.ElementName: 1, + {self.}DocPartObj.ElementName: 2, ); end; function SdtPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -75,7 +75,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,7 +102,7 @@ end; function SdtPr.Copy(_obj: SdtPr);override; begin - self.RPr.Copy(_obj.RPr); - self.Id.Copy(_obj.Id); - self.DocPartObj.Copy(_obj.DocPartObj); + {self.}RPr.Copy(_obj.RPr); + {self.}Id.Copy(_obj.Id); + {self.}DocPartObj.Copy(_obj.DocPartObj); end; diff --git a/autoclass/docx/SectPr@DOCX.tsf b/autoclass/docx/SectPr@DOCX.tsf index dedc2d4..5b26bc5 100644 --- a/autoclass/docx/SectPr@DOCX.tsf +++ b/autoclass/docx/SectPr@DOCX.tsf @@ -42,7 +42,7 @@ end; function SectPr.Create();overload; begin - self.Create(nil, "w", "sectPr"); + {self.}Create(nil, "w", "sectPr"); end; function SectPr.Create(_node: XmlNode);overload; @@ -57,50 +57,50 @@ end; function SectPr.Init();override; begin - self.XmlAttrWRsidR := new OpenXmlAttribute(self.Prefix, "rsidR", nil); - self.XmlAttrWRsidSect := new OpenXmlAttribute(self.Prefix, "rsidSect", nil); - self.Type := new PureWVal(self, self.Prefix, "type"); - self.PgSz := new PgSz(self, self.Prefix, "pgSz"); - self.PgMar := new PgMar(self, self.Prefix, "pgMar"); - self.PgNumType := new PgNumType(self, self.Prefix, "pgNumType"); - self.Cols := new Cols(self, self.Prefix, "cols"); - self.DocGrid := new docGrid(self, self.Prefix, "docGrid"); + {self.}XmlAttrWRsidR := new OpenXmlAttribute({self.}Prefix, "rsidR", nil); + {self.}XmlAttrWRsidSect := new OpenXmlAttribute({self.}Prefix, "rsidSect", nil); + {self.}Type := new PureWVal(self, {self.}Prefix, "type"); + {self.}PgSz := new PgSz(self, {self.}Prefix, "pgSz"); + {self.}PgMar := new PgMar(self, {self.}Prefix, "pgMar"); + {self.}PgNumType := new PgNumType(self, {self.}Prefix, "pgNumType"); + {self.}Cols := new Cols(self, {self.}Prefix, "cols"); + {self.}DocGrid := new docGrid(self, {self.}Prefix, "docGrid"); end; function SectPr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrWRsidR, - self.XmlAttrWRsidSect, + {self.}XmlAttrWRsidR, + {self.}XmlAttrWRsidSect, ); end; function SectPr.InitChildren();override; begin child_elements_ := array( - 2: self.Type, - 3: self.PgSz, - 4: self.PgMar, - 5: self.PgNumType, - 6: self.Cols, - 7: self.DocGrid, + 2: {self.}Type, + 3: {self.}PgSz, + 4: {self.}PgMar, + 5: {self.}PgNumType, + 6: {self.}Cols, + 7: {self.}DocGrid, ); sorted_child_ := array( "": -1, - self.Type.ElementName: 2, - self.PgSz.ElementName: 3, - self.PgMar.ElementName: 4, - self.PgNumType.ElementName: 5, - self.Cols.ElementName: 6, - self.DocGrid.ElementName: 7, + {self.}Type.ElementName: 2, + {self.}PgSz.ElementName: 3, + {self.}PgMar.ElementName: 4, + {self.}PgNumType.ElementName: 5, + {self.}Cols.ElementName: 6, + {self.}DocGrid.ElementName: 7, ); end; function SectPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -109,7 +109,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -118,8 +118,8 @@ begin begin obj := nil; case node_name of - pre + "headerReference": obj := self.AppendHeaderReference(); - pre + "FooterReference": obj := self.AppendFooterReference(); + pre + "headerReference": obj := {self.}AppendHeaderReference(); + pre + "FooterReference": obj := {self.}AppendFooterReference(); end; if ifObj(obj) then obj.InitNode(node); end @@ -139,15 +139,15 @@ end; function SectPr.Copy(_obj: SectPr);override; begin if not ifnil(_obj.XmlAttrWRsidR.Value) then - self.XmlAttrWRsidR.Value := _obj.XmlAttrWRsidR.Value; + {self.}XmlAttrWRsidR.Value := _obj.XmlAttrWRsidR.Value; if not ifnil(_obj.XmlAttrWRsidSect.Value) then - self.XmlAttrWRsidSect.Value := _obj.XmlAttrWRsidSect.Value; - self.Type.Copy(_obj.Type); - self.PgSz.Copy(_obj.PgSz); - self.PgMar.Copy(_obj.PgMar); - self.PgNumType.Copy(_obj.PgNumType); - self.Cols.Copy(_obj.Cols); - self.DocGrid.Copy(_obj.DocGrid); + {self.}XmlAttrWRsidSect.Value := _obj.XmlAttrWRsidSect.Value; + {self.}Type.Copy(_obj.Type); + {self.}PgSz.Copy(_obj.PgSz); + {self.}PgMar.Copy(_obj.PgMar); + {self.}PgNumType.Copy(_obj.PgNumType); + {self.}Cols.Copy(_obj.Cols); + {self.}DocGrid.Copy(_obj.DocGrid); end; function SectPr.AddHeaderReference(): Reference; @@ -158,8 +158,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "headerReference" then break; end - obj := new Reference(self, self.Prefix, "headerReference"); - self.InsertChild(obj, i+1); + obj := new Reference(self, {self.}Prefix, "headerReference"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -171,21 +171,21 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "FooterReference" then break; end - obj := new Reference(self, self.Prefix, "FooterReference"); - self.InsertChild(obj, i+1); + obj := new Reference(self, {self.}Prefix, "FooterReference"); + {self.}InsertChild(obj, i+1); return obj; end; function SectPr.AppendHeaderReference(): Reference; begin - obj := new Reference(self, self.Prefix, "headerReference"); + obj := new Reference(self, {self.}Prefix, "headerReference"); child_elements_[length(child_elements_)] := obj; return obj; end; function SectPr.AppendFooterReference(): Reference; begin - obj := new Reference(self, self.Prefix, "FooterReference"); + obj := new Reference(self, {self.}Prefix, "FooterReference"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -224,20 +224,20 @@ end; function SectPr.ReadXmlAttrWRsidR(); begin - return self.XmlAttrWRsidR.Value; + return {self.}XmlAttrWRsidR.Value; end; function SectPr.WriteXmlAttrWRsidR(_value); begin - self.XmlAttrWRsidR.Value := _value; + {self.}XmlAttrWRsidR.Value := _value; end; function SectPr.ReadXmlAttrWRsidSect(); begin - return self.XmlAttrWRsidSect.Value; + return {self.}XmlAttrWRsidSect.Value; end; function SectPr.WriteXmlAttrWRsidSect(_value); begin - self.XmlAttrWRsidSect.Value := _value; + {self.}XmlAttrWRsidSect.Value := _value; end; diff --git a/autoclass/docx/Ser@DOCX.tsf b/autoclass/docx/Ser@DOCX.tsf index 5c1521b..2a1facf 100644 --- a/autoclass/docx/Ser@DOCX.tsf +++ b/autoclass/docx/Ser@DOCX.tsf @@ -26,7 +26,7 @@ end; function Ser.Create();overload; begin - self.Create(nil, "c", "ser"); + {self.}Create(nil, "c", "ser"); end; function Ser.Create(_node: XmlNode);overload; @@ -41,14 +41,14 @@ end; function Ser.Init();override; begin - self.Idx := new PureVal(self, self.Prefix, "idx"); - self.Order := new PureVal(self, self.Prefix, "order"); - self.Tx := new Tx(self, self.Prefix, "tx"); - self.InvertIfNegative := new PureVal(self, self.Prefix, "invertIfNegative"); - self.DLbls := new DLbls(self, self.Prefix, "dLbls"); - self.Cat := new Cat(self, self.Prefix, "cat"); - self.Val := new Val(self, self.Prefix, "val"); - self.ExtLst := new ExtLst(self, self.Prefix, "extLst"); + {self.}Idx := new PureVal(self, {self.}Prefix, "idx"); + {self.}Order := new PureVal(self, {self.}Prefix, "order"); + {self.}Tx := new Tx(self, {self.}Prefix, "tx"); + {self.}InvertIfNegative := new PureVal(self, {self.}Prefix, "invertIfNegative"); + {self.}DLbls := new DLbls(self, {self.}Prefix, "dLbls"); + {self.}Cat := new Cat(self, {self.}Prefix, "cat"); + {self.}Val := new Val(self, {self.}Prefix, "val"); + {self.}ExtLst := new ExtLst(self, {self.}Prefix, "extLst"); end; function Ser.InitAttributes();override; @@ -60,33 +60,33 @@ end; function Ser.InitChildren();override; begin child_elements_ := array( - 0: self.Idx, - 1: self.Order, - 2: self.Tx, - 3: self.InvertIfNegative, - 4: self.DLbls, - 5: self.Cat, - 6: self.Val, - 7: self.ExtLst, + 0: {self.}Idx, + 1: {self.}Order, + 2: {self.}Tx, + 3: {self.}InvertIfNegative, + 4: {self.}DLbls, + 5: {self.}Cat, + 6: {self.}Val, + 7: {self.}ExtLst, ); sorted_child_ := array( "": -1, - self.Idx.ElementName: 0, - self.Order.ElementName: 1, - self.Tx.ElementName: 2, - self.InvertIfNegative.ElementName: 3, - self.DLbls.ElementName: 4, - self.Cat.ElementName: 5, - self.Val.ElementName: 6, - self.ExtLst.ElementName: 7, + {self.}Idx.ElementName: 0, + {self.}Order.ElementName: 1, + {self.}Tx.ElementName: 2, + {self.}InvertIfNegative.ElementName: 3, + {self.}DLbls.ElementName: 4, + {self.}Cat.ElementName: 5, + {self.}Val.ElementName: 6, + {self.}ExtLst.ElementName: 7, ); end; function Ser.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -95,7 +95,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -122,12 +122,12 @@ end; function Ser.Copy(_obj: Ser);override; begin - self.Idx.Copy(_obj.Idx); - self.Order.Copy(_obj.Order); - self.Tx.Copy(_obj.Tx); - self.InvertIfNegative.Copy(_obj.InvertIfNegative); - self.DLbls.Copy(_obj.DLbls); - self.Cat.Copy(_obj.Cat); - self.Val.Copy(_obj.Val); - self.ExtLst.Copy(_obj.ExtLst); + {self.}Idx.Copy(_obj.Idx); + {self.}Order.Copy(_obj.Order); + {self.}Tx.Copy(_obj.Tx); + {self.}InvertIfNegative.Copy(_obj.InvertIfNegative); + {self.}DLbls.Copy(_obj.DLbls); + {self.}Cat.Copy(_obj.Cat); + {self.}Val.Copy(_obj.Val); + {self.}ExtLst.Copy(_obj.ExtLst); end; diff --git a/autoclass/docx/Settings@DOCX.tsf b/autoclass/docx/Settings@DOCX.tsf index 2d67051..af7710f 100644 --- a/autoclass/docx/Settings@DOCX.tsf +++ b/autoclass/docx/Settings@DOCX.tsf @@ -111,7 +111,7 @@ end; function Settings.Create();overload; begin - self.Create(nil, "w", "settings"); + {self.}Create(nil, "w", "settings"); end; function Settings.Create(_node: XmlNode);overload; @@ -126,125 +126,125 @@ end; function Settings.Init();override; begin - self.XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); - self.XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrXmlnsSl := new OpenXmlAttribute("xmlns", "sl", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); - self.Zoom := new Zoom(self, self.Prefix, "zoom"); - self.XmlChildBordersDoNotSurroundHeader := new OpenXmlEmpty(self, self.Prefix, "bordersDoNotSurroundHeader"); - self.XmlChildBordersDoNotSurroundFooter := new OpenXmlEmpty(self, self.Prefix, "bordersDoNotSurroundFooter"); - self.DefaultTabStop := new PureWVal(self, self.Prefix, "defaultTabStop"); - self.DrawingGridVerticalSpacing := new PureWVal(self, self.Prefix, "drawingGridVerticalSpacing"); - self.DisplayHorizontalDrawingGridEvery := new PureWVal(self, self.Prefix, "displayHorizontalDrawingGridEvery"); - self.DisplayVerticalDrawingGridEvery := new PureWVal(self, self.Prefix, "DisplayVerticalDrawingGridEvery"); - self.CharacterSpacingControl := new PureWVal(self, self.Prefix, "characterSpacingControl"); - self.HdrShapeDefaults := new HdrShapeDefaults(self, self.Prefix, "hdrShapeDefaults"); - self.FootnotePr := new FootnotePr(self, self.Prefix, "footnotePr"); - self.EndnotePr := new EndnotePr(self, self.Prefix, "endnotePr"); - self.Compat := new Compat(self, self.Prefix, "Compat"); - self.Rsids := new Rsids(self, self.Prefix, "rsids"); - self.MathPr := new MathPr(self, "m", "mathPr"); - self.ThemeFontLang := new ThemeFontLang(self, self.Prefix, "themeFontLang"); - self.ClrSchemeMapping := new ClrSchemeMapping(self, self.Prefix, "clrSchemeMapping"); - self.XmlChildDoNotIncludeSubdocsInStats := new OpenXmlEmpty(self, self.Prefix, "doNotIncludeSubdocsInStats"); - self.ShapeDefaults := new ShapeDefaults2(self, self.Prefix, "shapeDefaults"); - self.DecimalSymbol := new PureWVal(self, self.Prefix, "decimalSymbol"); - self.ListSeparator := new PureWVal(self, self.Prefix, "listSeparator"); - self.W14DocId := new PureWVal(self, "w14", "docId"); - self.XmlChildW15ChartTrackingRefBased := new OpenXmlEmpty(self, "w15", "chartTrackingRefBased"); - self.W15DocId := new PureWVal(self, "w15", "docId"); + {self.}XmlAttrXmlnsO := new OpenXmlAttribute("xmlns", "o", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsM := new OpenXmlAttribute("xmlns", "m", nil); + {self.}XmlAttrXmlnsV := new OpenXmlAttribute("xmlns", "v", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrXmlnsSl := new OpenXmlAttribute("xmlns", "sl", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}Zoom := new Zoom(self, {self.}Prefix, "zoom"); + {self.}XmlChildBordersDoNotSurroundHeader := new OpenXmlEmpty(self, {self.}Prefix, "bordersDoNotSurroundHeader"); + {self.}XmlChildBordersDoNotSurroundFooter := new OpenXmlEmpty(self, {self.}Prefix, "bordersDoNotSurroundFooter"); + {self.}DefaultTabStop := new PureWVal(self, {self.}Prefix, "defaultTabStop"); + {self.}DrawingGridVerticalSpacing := new PureWVal(self, {self.}Prefix, "drawingGridVerticalSpacing"); + {self.}DisplayHorizontalDrawingGridEvery := new PureWVal(self, {self.}Prefix, "displayHorizontalDrawingGridEvery"); + {self.}DisplayVerticalDrawingGridEvery := new PureWVal(self, {self.}Prefix, "DisplayVerticalDrawingGridEvery"); + {self.}CharacterSpacingControl := new PureWVal(self, {self.}Prefix, "characterSpacingControl"); + {self.}HdrShapeDefaults := new HdrShapeDefaults(self, {self.}Prefix, "hdrShapeDefaults"); + {self.}FootnotePr := new FootnotePr(self, {self.}Prefix, "footnotePr"); + {self.}EndnotePr := new EndnotePr(self, {self.}Prefix, "endnotePr"); + {self.}Compat := new Compat(self, {self.}Prefix, "Compat"); + {self.}Rsids := new Rsids(self, {self.}Prefix, "rsids"); + {self.}MathPr := new MathPr(self, "m", "mathPr"); + {self.}ThemeFontLang := new ThemeFontLang(self, {self.}Prefix, "themeFontLang"); + {self.}ClrSchemeMapping := new ClrSchemeMapping(self, {self.}Prefix, "clrSchemeMapping"); + {self.}XmlChildDoNotIncludeSubdocsInStats := new OpenXmlEmpty(self, {self.}Prefix, "doNotIncludeSubdocsInStats"); + {self.}ShapeDefaults := new ShapeDefaults2(self, {self.}Prefix, "shapeDefaults"); + {self.}DecimalSymbol := new PureWVal(self, {self.}Prefix, "decimalSymbol"); + {self.}ListSeparator := new PureWVal(self, {self.}Prefix, "listSeparator"); + {self.}W14DocId := new PureWVal(self, "w14", "docId"); + {self.}XmlChildW15ChartTrackingRefBased := new OpenXmlEmpty(self, "w15", "chartTrackingRefBased"); + {self.}W15DocId := new PureWVal(self, "w15", "docId"); end; function Settings.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsO, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsM, - self.XmlAttrXmlnsV, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16se, - self.XmlAttrXmlnsSl, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsO, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsM, + {self.}XmlAttrXmlnsV, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrXmlnsSl, + {self.}XmlAttrMcIgnorable, ); end; function Settings.InitChildren();override; begin child_elements_ := array( - 0: self.Zoom, - 1: self.XmlChildBordersDoNotSurroundHeader, - 2: self.XmlChildBordersDoNotSurroundFooter, - 3: self.DefaultTabStop, - 4: self.DrawingGridVerticalSpacing, - 5: self.DisplayHorizontalDrawingGridEvery, - 6: self.DisplayVerticalDrawingGridEvery, - 7: self.CharacterSpacingControl, - 8: self.HdrShapeDefaults, - 9: self.FootnotePr, - 10: self.EndnotePr, - 11: self.Compat, - 12: self.Rsids, - 13: self.MathPr, - 14: self.ThemeFontLang, - 15: self.ClrSchemeMapping, - 16: self.XmlChildDoNotIncludeSubdocsInStats, - 17: self.ShapeDefaults, - 18: self.DecimalSymbol, - 19: self.ListSeparator, - 20: self.W14DocId, - 21: self.XmlChildW15ChartTrackingRefBased, - 22: self.W15DocId, + 0: {self.}Zoom, + 1: {self.}XmlChildBordersDoNotSurroundHeader, + 2: {self.}XmlChildBordersDoNotSurroundFooter, + 3: {self.}DefaultTabStop, + 4: {self.}DrawingGridVerticalSpacing, + 5: {self.}DisplayHorizontalDrawingGridEvery, + 6: {self.}DisplayVerticalDrawingGridEvery, + 7: {self.}CharacterSpacingControl, + 8: {self.}HdrShapeDefaults, + 9: {self.}FootnotePr, + 10: {self.}EndnotePr, + 11: {self.}Compat, + 12: {self.}Rsids, + 13: {self.}MathPr, + 14: {self.}ThemeFontLang, + 15: {self.}ClrSchemeMapping, + 16: {self.}XmlChildDoNotIncludeSubdocsInStats, + 17: {self.}ShapeDefaults, + 18: {self.}DecimalSymbol, + 19: {self.}ListSeparator, + 20: {self.}W14DocId, + 21: {self.}XmlChildW15ChartTrackingRefBased, + 22: {self.}W15DocId, ); sorted_child_ := array( "": -1, - self.Zoom.ElementName: 0, - self.XmlChildBordersDoNotSurroundHeader.ElementName: 1, - self.XmlChildBordersDoNotSurroundFooter.ElementName: 2, - self.DefaultTabStop.ElementName: 3, - self.DrawingGridVerticalSpacing.ElementName: 4, - self.DisplayHorizontalDrawingGridEvery.ElementName: 5, - self.DisplayVerticalDrawingGridEvery.ElementName: 6, - self.CharacterSpacingControl.ElementName: 7, - self.HdrShapeDefaults.ElementName: 8, - self.FootnotePr.ElementName: 9, - self.EndnotePr.ElementName: 10, - self.Compat.ElementName: 11, - self.Rsids.ElementName: 12, - self.MathPr.ElementName: 13, - self.ThemeFontLang.ElementName: 14, - self.ClrSchemeMapping.ElementName: 15, - self.XmlChildDoNotIncludeSubdocsInStats.ElementName: 16, - self.ShapeDefaults.ElementName: 17, - self.DecimalSymbol.ElementName: 18, - self.ListSeparator.ElementName: 19, - self.W14DocId.ElementName: 20, - self.XmlChildW15ChartTrackingRefBased.ElementName: 21, - self.W15DocId.ElementName: 22, + {self.}Zoom.ElementName: 0, + {self.}XmlChildBordersDoNotSurroundHeader.ElementName: 1, + {self.}XmlChildBordersDoNotSurroundFooter.ElementName: 2, + {self.}DefaultTabStop.ElementName: 3, + {self.}DrawingGridVerticalSpacing.ElementName: 4, + {self.}DisplayHorizontalDrawingGridEvery.ElementName: 5, + {self.}DisplayVerticalDrawingGridEvery.ElementName: 6, + {self.}CharacterSpacingControl.ElementName: 7, + {self.}HdrShapeDefaults.ElementName: 8, + {self.}FootnotePr.ElementName: 9, + {self.}EndnotePr.ElementName: 10, + {self.}Compat.ElementName: 11, + {self.}Rsids.ElementName: 12, + {self.}MathPr.ElementName: 13, + {self.}ThemeFontLang.ElementName: 14, + {self.}ClrSchemeMapping.ElementName: 15, + {self.}XmlChildDoNotIncludeSubdocsInStats.ElementName: 16, + {self.}ShapeDefaults.ElementName: 17, + {self.}DecimalSymbol.ElementName: 18, + {self.}ListSeparator.ElementName: 19, + {self.}W14DocId.ElementName: 20, + {self.}XmlChildW15ChartTrackingRefBased.ElementName: 21, + {self.}W15DocId.ElementName: 22, ); end; function Settings.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -253,7 +253,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -281,234 +281,234 @@ end; function Settings.Copy(_obj: Settings);override; begin if not ifnil(_obj.XmlAttrXmlnsO.Value) then - self.XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; + {self.}XmlAttrXmlnsO.Value := _obj.XmlAttrXmlnsO.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsM.Value) then - self.XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; + {self.}XmlAttrXmlnsM.Value := _obj.XmlAttrXmlnsM.Value; if not ifnil(_obj.XmlAttrXmlnsV.Value) then - self.XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; + {self.}XmlAttrXmlnsV.Value := _obj.XmlAttrXmlnsV.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrXmlnsSl.Value) then - self.XmlAttrXmlnsSl.Value := _obj.XmlAttrXmlnsSl.Value; + {self.}XmlAttrXmlnsSl.Value := _obj.XmlAttrXmlnsSl.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; - self.Zoom.Copy(_obj.Zoom); - self.XmlChildBordersDoNotSurroundHeader.Copy(_obj.XmlChildBordersDoNotSurroundHeader); - self.XmlChildBordersDoNotSurroundFooter.Copy(_obj.XmlChildBordersDoNotSurroundFooter); - self.DefaultTabStop.Copy(_obj.DefaultTabStop); - self.DrawingGridVerticalSpacing.Copy(_obj.DrawingGridVerticalSpacing); - self.DisplayHorizontalDrawingGridEvery.Copy(_obj.DisplayHorizontalDrawingGridEvery); - self.DisplayVerticalDrawingGridEvery.Copy(_obj.DisplayVerticalDrawingGridEvery); - self.CharacterSpacingControl.Copy(_obj.CharacterSpacingControl); - self.HdrShapeDefaults.Copy(_obj.HdrShapeDefaults); - self.FootnotePr.Copy(_obj.FootnotePr); - self.EndnotePr.Copy(_obj.EndnotePr); - self.Compat.Copy(_obj.Compat); - self.Rsids.Copy(_obj.Rsids); - self.MathPr.Copy(_obj.MathPr); - self.ThemeFontLang.Copy(_obj.ThemeFontLang); - self.ClrSchemeMapping.Copy(_obj.ClrSchemeMapping); - self.XmlChildDoNotIncludeSubdocsInStats.Copy(_obj.XmlChildDoNotIncludeSubdocsInStats); - self.ShapeDefaults.Copy(_obj.ShapeDefaults); - self.DecimalSymbol.Copy(_obj.DecimalSymbol); - self.ListSeparator.Copy(_obj.ListSeparator); - self.W14DocId.Copy(_obj.W14DocId); - self.XmlChildW15ChartTrackingRefBased.Copy(_obj.XmlChildW15ChartTrackingRefBased); - self.W15DocId.Copy(_obj.W15DocId); + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}Zoom.Copy(_obj.Zoom); + {self.}XmlChildBordersDoNotSurroundHeader.Copy(_obj.XmlChildBordersDoNotSurroundHeader); + {self.}XmlChildBordersDoNotSurroundFooter.Copy(_obj.XmlChildBordersDoNotSurroundFooter); + {self.}DefaultTabStop.Copy(_obj.DefaultTabStop); + {self.}DrawingGridVerticalSpacing.Copy(_obj.DrawingGridVerticalSpacing); + {self.}DisplayHorizontalDrawingGridEvery.Copy(_obj.DisplayHorizontalDrawingGridEvery); + {self.}DisplayVerticalDrawingGridEvery.Copy(_obj.DisplayVerticalDrawingGridEvery); + {self.}CharacterSpacingControl.Copy(_obj.CharacterSpacingControl); + {self.}HdrShapeDefaults.Copy(_obj.HdrShapeDefaults); + {self.}FootnotePr.Copy(_obj.FootnotePr); + {self.}EndnotePr.Copy(_obj.EndnotePr); + {self.}Compat.Copy(_obj.Compat); + {self.}Rsids.Copy(_obj.Rsids); + {self.}MathPr.Copy(_obj.MathPr); + {self.}ThemeFontLang.Copy(_obj.ThemeFontLang); + {self.}ClrSchemeMapping.Copy(_obj.ClrSchemeMapping); + {self.}XmlChildDoNotIncludeSubdocsInStats.Copy(_obj.XmlChildDoNotIncludeSubdocsInStats); + {self.}ShapeDefaults.Copy(_obj.ShapeDefaults); + {self.}DecimalSymbol.Copy(_obj.DecimalSymbol); + {self.}ListSeparator.Copy(_obj.ListSeparator); + {self.}W14DocId.Copy(_obj.W14DocId); + {self.}XmlChildW15ChartTrackingRefBased.Copy(_obj.XmlChildW15ChartTrackingRefBased); + {self.}W15DocId.Copy(_obj.W15DocId); end; function Settings.ReadXmlAttrXmlnsO(); begin - return self.XmlAttrXmlnsO.Value; + return {self.}XmlAttrXmlnsO.Value; end; function Settings.WriteXmlAttrXmlnsO(_value); begin - self.XmlAttrXmlnsO.Value := _value; + {self.}XmlAttrXmlnsO.Value := _value; end; function Settings.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Settings.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Settings.ReadXmlAttrXmlnsM(); begin - return self.XmlAttrXmlnsM.Value; + return {self.}XmlAttrXmlnsM.Value; end; function Settings.WriteXmlAttrXmlnsM(_value); begin - self.XmlAttrXmlnsM.Value := _value; + {self.}XmlAttrXmlnsM.Value := _value; end; function Settings.ReadXmlAttrXmlnsV(); begin - return self.XmlAttrXmlnsV.Value; + return {self.}XmlAttrXmlnsV.Value; end; function Settings.WriteXmlAttrXmlnsV(_value); begin - self.XmlAttrXmlnsV.Value := _value; + {self.}XmlAttrXmlnsV.Value := _value; end; function Settings.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function Settings.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function Settings.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Settings.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Settings.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Settings.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Settings.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function Settings.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function Settings.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function Settings.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function Settings.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function Settings.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function Settings.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function Settings.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function Settings.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function Settings.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function Settings.ReadXmlAttrXmlnsSl(); begin - return self.XmlAttrXmlnsSl.Value; + return {self.}XmlAttrXmlnsSl.Value; end; function Settings.WriteXmlAttrXmlnsSl(_value); begin - self.XmlAttrXmlnsSl.Value := _value; + {self.}XmlAttrXmlnsSl.Value := _value; end; function Settings.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Settings.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; function Settings.ReadXmlChildBordersDoNotSurroundHeader(); begin - return ifnil(self.XmlChildBordersDoNotSurroundHeader.Value) ? false : true; + return ifnil({self.}XmlChildBordersDoNotSurroundHeader.Value) ? false : true; end; function Settings.WriteXmlChildBordersDoNotSurroundHeader(_value); begin - self.XmlChildBordersDoNotSurroundHeader.Value := _value; + {self.}XmlChildBordersDoNotSurroundHeader.Value := _value; end; function Settings.ReadXmlChildBordersDoNotSurroundFooter(); begin - return ifnil(self.XmlChildBordersDoNotSurroundFooter.Value) ? false : true; + return ifnil({self.}XmlChildBordersDoNotSurroundFooter.Value) ? false : true; end; function Settings.WriteXmlChildBordersDoNotSurroundFooter(_value); begin - self.XmlChildBordersDoNotSurroundFooter.Value := _value; + {self.}XmlChildBordersDoNotSurroundFooter.Value := _value; end; function Settings.ReadXmlChildDoNotIncludeSubdocsInStats(); begin - return ifnil(self.XmlChildDoNotIncludeSubdocsInStats.Value) ? false : true; + return ifnil({self.}XmlChildDoNotIncludeSubdocsInStats.Value) ? false : true; end; function Settings.WriteXmlChildDoNotIncludeSubdocsInStats(_value); begin - self.XmlChildDoNotIncludeSubdocsInStats.Value := _value; + {self.}XmlChildDoNotIncludeSubdocsInStats.Value := _value; end; function Settings.ReadXmlChildW15ChartTrackingRefBased(); begin - return ifnil(self.XmlChildW15ChartTrackingRefBased.Value) ? false : true; + return ifnil({self.}XmlChildW15ChartTrackingRefBased.Value) ? false : true; end; function Settings.WriteXmlChildW15ChartTrackingRefBased(_value); begin - self.XmlChildW15ChartTrackingRefBased.Value := _value; + {self.}XmlChildW15ChartTrackingRefBased.Value := _value; end; diff --git a/autoclass/docx/ShapeDefaults2@DOCX.tsf b/autoclass/docx/ShapeDefaults2@DOCX.tsf index 030b5be..ff21587 100644 --- a/autoclass/docx/ShapeDefaults2@DOCX.tsf +++ b/autoclass/docx/ShapeDefaults2@DOCX.tsf @@ -20,7 +20,7 @@ end; function ShapeDefaults2.Create();overload; begin - self.Create(nil, "w", "shapeDefaults"); + {self.}Create(nil, "w", "shapeDefaults"); end; function ShapeDefaults2.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function ShapeDefaults2.Init();override; begin - self.ShapeDefaults := new ShapeDefaults(self, "o", "shapeDefaults"); - self.ShapeLayout := new ShapeLayout(self, "o", "shapelayout"); + {self.}ShapeDefaults := new ShapeDefaults(self, "o", "shapeDefaults"); + {self.}ShapeLayout := new ShapeLayout(self, "o", "shapelayout"); end; function ShapeDefaults2.InitAttributes();override; @@ -48,21 +48,21 @@ end; function ShapeDefaults2.InitChildren();override; begin child_elements_ := array( - 0: self.ShapeDefaults, - 1: self.ShapeLayout, + 0: {self.}ShapeDefaults, + 1: {self.}ShapeLayout, ); sorted_child_ := array( "": -1, - self.ShapeDefaults.ElementName: 0, - self.ShapeLayout.ElementName: 1, + {self.}ShapeDefaults.ElementName: 0, + {self.}ShapeLayout.ElementName: 1, ); end; function ShapeDefaults2.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function ShapeDefaults2.Copy(_obj: ShapeDefaults2);override; begin - self.ShapeDefaults.Copy(_obj.ShapeDefaults); - self.ShapeLayout.Copy(_obj.ShapeLayout); + {self.}ShapeDefaults.Copy(_obj.ShapeDefaults); + {self.}ShapeLayout.Copy(_obj.ShapeLayout); end; diff --git a/autoclass/docx/ShapeDefaults@DOCX.tsf b/autoclass/docx/ShapeDefaults@DOCX.tsf index df04de9..cec55e1 100644 --- a/autoclass/docx/ShapeDefaults@DOCX.tsf +++ b/autoclass/docx/ShapeDefaults@DOCX.tsf @@ -27,7 +27,7 @@ end; function ShapeDefaults.Create();overload; begin - self.Create(nil, "o", "shapeDefaults"); + {self.}Create(nil, "o", "shapeDefaults"); end; function ShapeDefaults.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function ShapeDefaults.Init();override; begin - self.XmlAttrExt := new OpenXmlAttribute("v", "ext", nil); - self.XmlAttrSpidmax := new OpenXmlAttribute(nil, "spidmax", nil); + {self.}XmlAttrExt := new OpenXmlAttribute("v", "ext", nil); + {self.}XmlAttrSpidmax := new OpenXmlAttribute(nil, "spidmax", nil); end; function ShapeDefaults.InitAttributes();override; begin attributes_ := array( - self.XmlAttrExt, - self.XmlAttrSpidmax, + {self.}XmlAttrExt, + {self.}XmlAttrSpidmax, ); end; @@ -65,35 +65,35 @@ end; function ShapeDefaults.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function ShapeDefaults.Copy(_obj: ShapeDefaults);override; begin if not ifnil(_obj.XmlAttrExt.Value) then - self.XmlAttrExt.Value := _obj.XmlAttrExt.Value; + {self.}XmlAttrExt.Value := _obj.XmlAttrExt.Value; if not ifnil(_obj.XmlAttrSpidmax.Value) then - self.XmlAttrSpidmax.Value := _obj.XmlAttrSpidmax.Value; + {self.}XmlAttrSpidmax.Value := _obj.XmlAttrSpidmax.Value; end; function ShapeDefaults.ReadXmlAttrExt(); begin - return self.XmlAttrExt.Value; + return {self.}XmlAttrExt.Value; end; function ShapeDefaults.WriteXmlAttrExt(_value); begin - self.XmlAttrExt.Value := _value; + {self.}XmlAttrExt.Value := _value; end; function ShapeDefaults.ReadXmlAttrSpidmax(); begin - return self.XmlAttrSpidmax.Value; + return {self.}XmlAttrSpidmax.Value; end; function ShapeDefaults.WriteXmlAttrSpidmax(_value); begin - self.XmlAttrSpidmax.Value := _value; + {self.}XmlAttrSpidmax.Value := _value; end; diff --git a/autoclass/docx/ShapeLayout@DOCX.tsf b/autoclass/docx/ShapeLayout@DOCX.tsf index 91ed6b1..7313dd5 100644 --- a/autoclass/docx/ShapeLayout@DOCX.tsf +++ b/autoclass/docx/ShapeLayout@DOCX.tsf @@ -24,7 +24,7 @@ end; function ShapeLayout.Create();overload; begin - self.Create(nil, "o", "shapelayout"); + {self.}Create(nil, "o", "shapelayout"); end; function ShapeLayout.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function ShapeLayout.Init();override; begin - self.XmlAttrExt := new OpenXmlAttribute("v", "ext", nil); - self.IdMap := new IdMap(self, self.Prefix, "idmap"); + {self.}XmlAttrExt := new OpenXmlAttribute("v", "ext", nil); + {self.}IdMap := new IdMap(self, {self.}Prefix, "idmap"); end; function ShapeLayout.InitAttributes();override; begin attributes_ := array( - self.XmlAttrExt, + {self.}XmlAttrExt, ); end; function ShapeLayout.InitChildren();override; begin child_elements_ := array( - 0: self.IdMap, + 0: {self.}IdMap, ); sorted_child_ := array( "": -1, - self.IdMap.ElementName: 0, + {self.}IdMap.ElementName: 0, ); end; function ShapeLayout.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function ShapeLayout.Copy(_obj: ShapeLayout);override; begin if not ifnil(_obj.XmlAttrExt.Value) then - self.XmlAttrExt.Value := _obj.XmlAttrExt.Value; - self.IdMap.Copy(_obj.IdMap); + {self.}XmlAttrExt.Value := _obj.XmlAttrExt.Value; + {self.}IdMap.Copy(_obj.IdMap); end; function ShapeLayout.ReadXmlAttrExt(); begin - return self.XmlAttrExt.Value; + return {self.}XmlAttrExt.Value; end; function ShapeLayout.WriteXmlAttrExt(_value); begin - self.XmlAttrExt.Value := _value; + {self.}XmlAttrExt.Value := _value; end; diff --git a/autoclass/docx/Shd@DOCX.tsf b/autoclass/docx/Shd@DOCX.tsf index 9e63e15..07d68e2 100644 --- a/autoclass/docx/Shd@DOCX.tsf +++ b/autoclass/docx/Shd@DOCX.tsf @@ -39,7 +39,7 @@ end; function Shd.Create();overload; begin - self.Create(nil, "w", "shd"); + {self.}Create(nil, "w", "shd"); end; function Shd.Create(_node: XmlNode);overload; @@ -54,21 +54,21 @@ end; function Shd.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute("w", "val", nil); - self.XmlAttrColor := new OpenXmlAttribute("w", "color", nil); - self.XmlAttrFill := new OpenXmlAttribute("w", "fill", nil); - self.XmlAttrThemeFill := new OpenXmlAttribute("w", "themeFill", nil); - self.XmlAttrThemeFillTint := new OpenXmlAttribute("w", "themeFillTint", nil); + {self.}XmlAttrVal := new OpenXmlAttribute("w", "val", nil); + {self.}XmlAttrColor := new OpenXmlAttribute("w", "color", nil); + {self.}XmlAttrFill := new OpenXmlAttribute("w", "fill", nil); + {self.}XmlAttrThemeFill := new OpenXmlAttribute("w", "themeFill", nil); + {self.}XmlAttrThemeFillTint := new OpenXmlAttribute("w", "themeFillTint", nil); end; function Shd.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, - self.XmlAttrColor, - self.XmlAttrFill, - self.XmlAttrThemeFill, - self.XmlAttrThemeFillTint, + {self.}XmlAttrVal, + {self.}XmlAttrColor, + {self.}XmlAttrFill, + {self.}XmlAttrThemeFill, + {self.}XmlAttrThemeFillTint, ); end; @@ -83,71 +83,71 @@ end; function Shd.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Shd.Copy(_obj: Shd);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; if not ifnil(_obj.XmlAttrColor.Value) then - self.XmlAttrColor.Value := _obj.XmlAttrColor.Value; + {self.}XmlAttrColor.Value := _obj.XmlAttrColor.Value; if not ifnil(_obj.XmlAttrFill.Value) then - self.XmlAttrFill.Value := _obj.XmlAttrFill.Value; + {self.}XmlAttrFill.Value := _obj.XmlAttrFill.Value; if not ifnil(_obj.XmlAttrThemeFill.Value) then - self.XmlAttrThemeFill.Value := _obj.XmlAttrThemeFill.Value; + {self.}XmlAttrThemeFill.Value := _obj.XmlAttrThemeFill.Value; if not ifnil(_obj.XmlAttrThemeFillTint.Value) then - self.XmlAttrThemeFillTint.Value := _obj.XmlAttrThemeFillTint.Value; + {self.}XmlAttrThemeFillTint.Value := _obj.XmlAttrThemeFillTint.Value; end; function Shd.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function Shd.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; function Shd.ReadXmlAttrColor(); begin - return self.XmlAttrColor.Value; + return {self.}XmlAttrColor.Value; end; function Shd.WriteXmlAttrColor(_value); begin - self.XmlAttrColor.Value := _value; + {self.}XmlAttrColor.Value := _value; end; function Shd.ReadXmlAttrFill(); begin - return self.XmlAttrFill.Value; + return {self.}XmlAttrFill.Value; end; function Shd.WriteXmlAttrFill(_value); begin - self.XmlAttrFill.Value := _value; + {self.}XmlAttrFill.Value := _value; end; function Shd.ReadXmlAttrThemeFill(); begin - return self.XmlAttrThemeFill.Value; + return {self.}XmlAttrThemeFill.Value; end; function Shd.WriteXmlAttrThemeFill(_value); begin - self.XmlAttrThemeFill.Value := _value; + {self.}XmlAttrThemeFill.Value := _value; end; function Shd.ReadXmlAttrThemeFillTint(); begin - return self.XmlAttrThemeFillTint.Value; + return {self.}XmlAttrThemeFillTint.Value; end; function Shd.WriteXmlAttrThemeFillTint(_value); begin - self.XmlAttrThemeFillTint.Value := _value; + {self.}XmlAttrThemeFillTint.Value := _value; end; diff --git a/autoclass/docx/Sig@DOCX.tsf b/autoclass/docx/Sig@DOCX.tsf index 450523d..0b99e6f 100644 --- a/autoclass/docx/Sig@DOCX.tsf +++ b/autoclass/docx/Sig@DOCX.tsf @@ -43,7 +43,7 @@ end; function Sig.Create();overload; begin - self.Create(nil, "w", "sig"); + {self.}Create(nil, "w", "sig"); end; function Sig.Create(_node: XmlNode);overload; @@ -58,23 +58,23 @@ end; function Sig.Init();override; begin - self.XmlAttrUsb0 := new OpenXmlAttribute(self.Prefix, "usb0", nil); - self.XmlAttrUsb1 := new OpenXmlAttribute(self.Prefix, "usb1", nil); - self.XmlAttrUsb2 := new OpenXmlAttribute(self.Prefix, "usb2", nil); - self.XmlAttrUsb3 := new OpenXmlAttribute(self.Prefix, "usb3", nil); - self.XmlAttrcsb0 := new OpenXmlAttribute(self.Prefix, "csb0", nil); - self.XmlAttrcsb1 := new OpenXmlAttribute(self.Prefix, "csb1", nil); + {self.}XmlAttrUsb0 := new OpenXmlAttribute({self.}Prefix, "usb0", nil); + {self.}XmlAttrUsb1 := new OpenXmlAttribute({self.}Prefix, "usb1", nil); + {self.}XmlAttrUsb2 := new OpenXmlAttribute({self.}Prefix, "usb2", nil); + {self.}XmlAttrUsb3 := new OpenXmlAttribute({self.}Prefix, "usb3", nil); + {self.}XmlAttrcsb0 := new OpenXmlAttribute({self.}Prefix, "csb0", nil); + {self.}XmlAttrcsb1 := new OpenXmlAttribute({self.}Prefix, "csb1", nil); end; function Sig.InitAttributes();override; begin attributes_ := array( - self.XmlAttrUsb0, - self.XmlAttrUsb1, - self.XmlAttrUsb2, - self.XmlAttrUsb3, - self.XmlAttrcsb0, - self.XmlAttrcsb1, + {self.}XmlAttrUsb0, + {self.}XmlAttrUsb1, + {self.}XmlAttrUsb2, + {self.}XmlAttrUsb3, + {self.}XmlAttrcsb0, + {self.}XmlAttrcsb1, ); end; @@ -89,83 +89,83 @@ end; function Sig.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Sig.Copy(_obj: Sig);override; begin if not ifnil(_obj.XmlAttrUsb0.Value) then - self.XmlAttrUsb0.Value := _obj.XmlAttrUsb0.Value; + {self.}XmlAttrUsb0.Value := _obj.XmlAttrUsb0.Value; if not ifnil(_obj.XmlAttrUsb1.Value) then - self.XmlAttrUsb1.Value := _obj.XmlAttrUsb1.Value; + {self.}XmlAttrUsb1.Value := _obj.XmlAttrUsb1.Value; if not ifnil(_obj.XmlAttrUsb2.Value) then - self.XmlAttrUsb2.Value := _obj.XmlAttrUsb2.Value; + {self.}XmlAttrUsb2.Value := _obj.XmlAttrUsb2.Value; if not ifnil(_obj.XmlAttrUsb3.Value) then - self.XmlAttrUsb3.Value := _obj.XmlAttrUsb3.Value; + {self.}XmlAttrUsb3.Value := _obj.XmlAttrUsb3.Value; if not ifnil(_obj.XmlAttrcsb0.Value) then - self.XmlAttrcsb0.Value := _obj.XmlAttrcsb0.Value; + {self.}XmlAttrcsb0.Value := _obj.XmlAttrcsb0.Value; if not ifnil(_obj.XmlAttrcsb1.Value) then - self.XmlAttrcsb1.Value := _obj.XmlAttrcsb1.Value; + {self.}XmlAttrcsb1.Value := _obj.XmlAttrcsb1.Value; end; function Sig.ReadXmlAttrUsb0(); begin - return self.XmlAttrUsb0.Value; + return {self.}XmlAttrUsb0.Value; end; function Sig.WriteXmlAttrUsb0(_value); begin - self.XmlAttrUsb0.Value := _value; + {self.}XmlAttrUsb0.Value := _value; end; function Sig.ReadXmlAttrUsb1(); begin - return self.XmlAttrUsb1.Value; + return {self.}XmlAttrUsb1.Value; end; function Sig.WriteXmlAttrUsb1(_value); begin - self.XmlAttrUsb1.Value := _value; + {self.}XmlAttrUsb1.Value := _value; end; function Sig.ReadXmlAttrUsb2(); begin - return self.XmlAttrUsb2.Value; + return {self.}XmlAttrUsb2.Value; end; function Sig.WriteXmlAttrUsb2(_value); begin - self.XmlAttrUsb2.Value := _value; + {self.}XmlAttrUsb2.Value := _value; end; function Sig.ReadXmlAttrUsb3(); begin - return self.XmlAttrUsb3.Value; + return {self.}XmlAttrUsb3.Value; end; function Sig.WriteXmlAttrUsb3(_value); begin - self.XmlAttrUsb3.Value := _value; + {self.}XmlAttrUsb3.Value := _value; end; function Sig.ReadXmlAttrcsb0(); begin - return self.XmlAttrcsb0.Value; + return {self.}XmlAttrcsb0.Value; end; function Sig.WriteXmlAttrcsb0(_value); begin - self.XmlAttrcsb0.Value := _value; + {self.}XmlAttrcsb0.Value := _value; end; function Sig.ReadXmlAttrcsb1(); begin - return self.XmlAttrcsb1.Value; + return {self.}XmlAttrcsb1.Value; end; function Sig.WriteXmlAttrcsb1(_value); begin - self.XmlAttrcsb1.Value := _value; + {self.}XmlAttrcsb1.Value := _value; end; diff --git a/autoclass/docx/SolidFill@DOCX.tsf b/autoclass/docx/SolidFill@DOCX.tsf index d0bb4d0..569ecb1 100644 --- a/autoclass/docx/SolidFill@DOCX.tsf +++ b/autoclass/docx/SolidFill@DOCX.tsf @@ -19,7 +19,7 @@ end; function SolidFill.Create();overload; begin - self.Create(nil, "a", "solidFill"); + {self.}Create(nil, "a", "solidFill"); end; function SolidFill.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function SolidFill.Init();override; begin - self.SchemeClr := new SchemeClr(self, self.Prefix, "schemeClr"); + {self.}SchemeClr := new SchemeClr(self, {self.}Prefix, "schemeClr"); end; function SolidFill.InitAttributes();override; @@ -46,19 +46,19 @@ end; function SolidFill.InitChildren();override; begin child_elements_ := array( - 0: self.SchemeClr, + 0: {self.}SchemeClr, ); sorted_child_ := array( "": -1, - self.SchemeClr.ElementName: 0, + {self.}SchemeClr.ElementName: 0, ); end; function SolidFill.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function SolidFill.Copy(_obj: SolidFill);override; begin - self.SchemeClr.Copy(_obj.SchemeClr); + {self.}SchemeClr.Copy(_obj.SchemeClr); end; diff --git a/autoclass/docx/SpPr@DOCX.tsf b/autoclass/docx/SpPr@DOCX.tsf index 234cdb0..bba4a5a 100644 --- a/autoclass/docx/SpPr@DOCX.tsf +++ b/autoclass/docx/SpPr@DOCX.tsf @@ -28,7 +28,7 @@ end; function SpPr.Create();overload; begin - self.Create(nil, "pic", "spPr"); + {self.}Create(nil, "pic", "spPr"); end; function SpPr.Create(_node: XmlNode);overload; @@ -43,12 +43,12 @@ end; function SpPr.Init();override; begin - self.Xfrm := new Xfrm(self, "a", "xfrm"); - self.PrstGeom := new PrstGeom(self, "a", "prstGeom"); - self.XmlChildNoFill := new OpenXmlEmpty(self, "a", "noFill"); - self.SolidFill := new SolidFill(self, "a", "solidFill"); - self.Ln := new Ln(self, "a", "ln"); - self.EffectLst := new EffectLst(self, "a", "effectLst"); + {self.}Xfrm := new Xfrm(self, "a", "xfrm"); + {self.}PrstGeom := new PrstGeom(self, "a", "prstGeom"); + {self.}XmlChildNoFill := new OpenXmlEmpty(self, "a", "noFill"); + {self.}SolidFill := new SolidFill(self, "a", "solidFill"); + {self.}Ln := new Ln(self, "a", "ln"); + {self.}EffectLst := new EffectLst(self, "a", "effectLst"); end; function SpPr.InitAttributes();override; @@ -60,29 +60,29 @@ end; function SpPr.InitChildren();override; begin child_elements_ := array( - 0: self.Xfrm, - 1: self.PrstGeom, - 2: self.XmlChildNoFill, - 3: self.SolidFill, - 4: self.Ln, - 5: self.EffectLst, + 0: {self.}Xfrm, + 1: {self.}PrstGeom, + 2: {self.}XmlChildNoFill, + 3: {self.}SolidFill, + 4: {self.}Ln, + 5: {self.}EffectLst, ); sorted_child_ := array( "": -1, - self.Xfrm.ElementName: 0, - self.PrstGeom.ElementName: 1, - self.XmlChildNoFill.ElementName: 2, - self.SolidFill.ElementName: 3, - self.Ln.ElementName: 4, - self.EffectLst.ElementName: 5, + {self.}Xfrm.ElementName: 0, + {self.}PrstGeom.ElementName: 1, + {self.}XmlChildNoFill.ElementName: 2, + {self.}SolidFill.ElementName: 3, + {self.}Ln.ElementName: 4, + {self.}EffectLst.ElementName: 5, ); end; function SpPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -91,7 +91,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -118,20 +118,20 @@ end; function SpPr.Copy(_obj: SpPr);override; begin - self.Xfrm.Copy(_obj.Xfrm); - self.PrstGeom.Copy(_obj.PrstGeom); - self.XmlChildNoFill.Copy(_obj.XmlChildNoFill); - self.SolidFill.Copy(_obj.SolidFill); - self.Ln.Copy(_obj.Ln); - self.EffectLst.Copy(_obj.EffectLst); + {self.}Xfrm.Copy(_obj.Xfrm); + {self.}PrstGeom.Copy(_obj.PrstGeom); + {self.}XmlChildNoFill.Copy(_obj.XmlChildNoFill); + {self.}SolidFill.Copy(_obj.SolidFill); + {self.}Ln.Copy(_obj.Ln); + {self.}EffectLst.Copy(_obj.EffectLst); end; function SpPr.ReadXmlChildNoFill(); begin - return ifnil(self.XmlChildNoFill.Value) ? false : true; + return ifnil({self.}XmlChildNoFill.Value) ? false : true; end; function SpPr.WriteXmlChildNoFill(_value); begin - self.XmlChildNoFill.Value := _value; + {self.}XmlChildNoFill.Value := _value; end; diff --git a/autoclass/docx/Spacing@DOCX.tsf b/autoclass/docx/Spacing@DOCX.tsf index f9ace6a..97646f0 100644 --- a/autoclass/docx/Spacing@DOCX.tsf +++ b/autoclass/docx/Spacing@DOCX.tsf @@ -51,7 +51,7 @@ end; function Spacing.Create();overload; begin - self.Create(nil, "w", "spacing"); + {self.}Create(nil, "w", "spacing"); end; function Spacing.Create(_node: XmlNode);overload; @@ -66,27 +66,27 @@ end; function Spacing.Init();override; begin - self.XmlAttrBefore := new OpenXmlAttribute(self.Prefix, "before", nil); - self.XmlAttrBeforeLines := new OpenXmlAttribute(self.Prefix, "beforeLines", nil); - self.XmlAttrBeforeAutospacing := new OpenXmlAttribute(self.Prefix, "beforeAutospacing", nil); - self.XmlAttrAfter := new OpenXmlAttribute(self.Prefix, "after", nil); - self.XmlAttrAfterLines := new OpenXmlAttribute(self.Prefix, "afterLines", nil); - self.XmlAttrAfterAutospacing := new OpenXmlAttribute(self.Prefix, "afterAutospacing", nil); - self.XmlAttrLine := new OpenXmlAttribute(self.Prefix, "line", nil); - self.XmlAttrLineRule := new OpenXmlAttribute(self.Prefix, "lineRule", nil); + {self.}XmlAttrBefore := new OpenXmlAttribute({self.}Prefix, "before", nil); + {self.}XmlAttrBeforeLines := new OpenXmlAttribute({self.}Prefix, "beforeLines", nil); + {self.}XmlAttrBeforeAutospacing := new OpenXmlAttribute({self.}Prefix, "beforeAutospacing", nil); + {self.}XmlAttrAfter := new OpenXmlAttribute({self.}Prefix, "after", nil); + {self.}XmlAttrAfterLines := new OpenXmlAttribute({self.}Prefix, "afterLines", nil); + {self.}XmlAttrAfterAutospacing := new OpenXmlAttribute({self.}Prefix, "afterAutospacing", nil); + {self.}XmlAttrLine := new OpenXmlAttribute({self.}Prefix, "line", nil); + {self.}XmlAttrLineRule := new OpenXmlAttribute({self.}Prefix, "lineRule", nil); end; function Spacing.InitAttributes();override; begin attributes_ := array( - self.XmlAttrBefore, - self.XmlAttrBeforeLines, - self.XmlAttrBeforeAutospacing, - self.XmlAttrAfter, - self.XmlAttrAfterLines, - self.XmlAttrAfterAutospacing, - self.XmlAttrLine, - self.XmlAttrLineRule, + {self.}XmlAttrBefore, + {self.}XmlAttrBeforeLines, + {self.}XmlAttrBeforeAutospacing, + {self.}XmlAttrAfter, + {self.}XmlAttrAfterLines, + {self.}XmlAttrAfterAutospacing, + {self.}XmlAttrLine, + {self.}XmlAttrLineRule, ); end; @@ -101,107 +101,107 @@ end; function Spacing.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Spacing.Copy(_obj: Spacing);override; begin if not ifnil(_obj.XmlAttrBefore.Value) then - self.XmlAttrBefore.Value := _obj.XmlAttrBefore.Value; + {self.}XmlAttrBefore.Value := _obj.XmlAttrBefore.Value; if not ifnil(_obj.XmlAttrBeforeLines.Value) then - self.XmlAttrBeforeLines.Value := _obj.XmlAttrBeforeLines.Value; + {self.}XmlAttrBeforeLines.Value := _obj.XmlAttrBeforeLines.Value; if not ifnil(_obj.XmlAttrBeforeAutospacing.Value) then - self.XmlAttrBeforeAutospacing.Value := _obj.XmlAttrBeforeAutospacing.Value; + {self.}XmlAttrBeforeAutospacing.Value := _obj.XmlAttrBeforeAutospacing.Value; if not ifnil(_obj.XmlAttrAfter.Value) then - self.XmlAttrAfter.Value := _obj.XmlAttrAfter.Value; + {self.}XmlAttrAfter.Value := _obj.XmlAttrAfter.Value; if not ifnil(_obj.XmlAttrAfterLines.Value) then - self.XmlAttrAfterLines.Value := _obj.XmlAttrAfterLines.Value; + {self.}XmlAttrAfterLines.Value := _obj.XmlAttrAfterLines.Value; if not ifnil(_obj.XmlAttrAfterAutospacing.Value) then - self.XmlAttrAfterAutospacing.Value := _obj.XmlAttrAfterAutospacing.Value; + {self.}XmlAttrAfterAutospacing.Value := _obj.XmlAttrAfterAutospacing.Value; if not ifnil(_obj.XmlAttrLine.Value) then - self.XmlAttrLine.Value := _obj.XmlAttrLine.Value; + {self.}XmlAttrLine.Value := _obj.XmlAttrLine.Value; if not ifnil(_obj.XmlAttrLineRule.Value) then - self.XmlAttrLineRule.Value := _obj.XmlAttrLineRule.Value; + {self.}XmlAttrLineRule.Value := _obj.XmlAttrLineRule.Value; end; function Spacing.ReadXmlAttrBefore(); begin - return self.XmlAttrBefore.Value; + return {self.}XmlAttrBefore.Value; end; function Spacing.WriteXmlAttrBefore(_value); begin - self.XmlAttrBefore.Value := _value; + {self.}XmlAttrBefore.Value := _value; end; function Spacing.ReadXmlAttrBeforeLines(); begin - return self.XmlAttrBeforeLines.Value; + return {self.}XmlAttrBeforeLines.Value; end; function Spacing.WriteXmlAttrBeforeLines(_value); begin - self.XmlAttrBeforeLines.Value := _value; + {self.}XmlAttrBeforeLines.Value := _value; end; function Spacing.ReadXmlAttrBeforeAutospacing(); begin - return self.XmlAttrBeforeAutospacing.Value; + return {self.}XmlAttrBeforeAutospacing.Value; end; function Spacing.WriteXmlAttrBeforeAutospacing(_value); begin - self.XmlAttrBeforeAutospacing.Value := _value; + {self.}XmlAttrBeforeAutospacing.Value := _value; end; function Spacing.ReadXmlAttrAfter(); begin - return self.XmlAttrAfter.Value; + return {self.}XmlAttrAfter.Value; end; function Spacing.WriteXmlAttrAfter(_value); begin - self.XmlAttrAfter.Value := _value; + {self.}XmlAttrAfter.Value := _value; end; function Spacing.ReadXmlAttrAfterLines(); begin - return self.XmlAttrAfterLines.Value; + return {self.}XmlAttrAfterLines.Value; end; function Spacing.WriteXmlAttrAfterLines(_value); begin - self.XmlAttrAfterLines.Value := _value; + {self.}XmlAttrAfterLines.Value := _value; end; function Spacing.ReadXmlAttrAfterAutospacing(); begin - return self.XmlAttrAfterAutospacing.Value; + return {self.}XmlAttrAfterAutospacing.Value; end; function Spacing.WriteXmlAttrAfterAutospacing(_value); begin - self.XmlAttrAfterAutospacing.Value := _value; + {self.}XmlAttrAfterAutospacing.Value := _value; end; function Spacing.ReadXmlAttrLine(); begin - return self.XmlAttrLine.Value; + return {self.}XmlAttrLine.Value; end; function Spacing.WriteXmlAttrLine(_value); begin - self.XmlAttrLine.Value := _value; + {self.}XmlAttrLine.Value := _value; end; function Spacing.ReadXmlAttrLineRule(); begin - return self.XmlAttrLineRule.Value; + return {self.}XmlAttrLineRule.Value; end; function Spacing.WriteXmlAttrLineRule(_value); begin - self.XmlAttrLineRule.Value := _value; + {self.}XmlAttrLineRule.Value := _value; end; diff --git a/autoclass/docx/SrgbClr@DOCX.tsf b/autoclass/docx/SrgbClr@DOCX.tsf index 0e211c0..35c02c2 100644 --- a/autoclass/docx/SrgbClr@DOCX.tsf +++ b/autoclass/docx/SrgbClr@DOCX.tsf @@ -24,7 +24,7 @@ end; function SrgbClr.Create();overload; begin - self.Create(nil, "a", "srgbClr"); + {self.}Create(nil, "a", "srgbClr"); end; function SrgbClr.Create(_node: XmlNode);overload; @@ -39,33 +39,33 @@ end; function SrgbClr.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); - self.Alpha := new PureVal(self, self.Prefix, "aplha"); + {self.}XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); + {self.}Alpha := new PureVal(self, {self.}Prefix, "aplha"); end; function SrgbClr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, + {self.}XmlAttrVal, ); end; function SrgbClr.InitChildren();override; begin child_elements_ := array( - 0: self.Alpha, + 0: {self.}Alpha, ); sorted_child_ := array( "": -1, - self.Alpha.ElementName: 0, + {self.}Alpha.ElementName: 0, ); end; function SrgbClr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -74,7 +74,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,16 +102,16 @@ end; function SrgbClr.Copy(_obj: SrgbClr);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; - self.Alpha.Copy(_obj.Alpha); + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}Alpha.Copy(_obj.Alpha); end; function SrgbClr.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function SrgbClr.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/autoclass/docx/StrRef@DOCX.tsf b/autoclass/docx/StrRef@DOCX.tsf index 4f5ed62..9e8a5a0 100644 --- a/autoclass/docx/StrRef@DOCX.tsf +++ b/autoclass/docx/StrRef@DOCX.tsf @@ -20,7 +20,7 @@ end; function StrRef.Create();overload; begin - self.Create(nil, "c", "strRef"); + {self.}Create(nil, "c", "strRef"); end; function StrRef.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function StrRef.Init();override; begin - self.F := new OpenXmlPcdata(self, self.Prefix, "f"); - self.StrCache := new Cache(self, self.Prefix, "strCache"); + {self.}F := new OpenXmlPcdata(self, {self.}Prefix, "f"); + {self.}StrCache := new Cache(self, {self.}Prefix, "strCache"); end; function StrRef.InitAttributes();override; @@ -48,21 +48,21 @@ end; function StrRef.InitChildren();override; begin child_elements_ := array( - 0: self.F, - 1: self.StrCache, + 0: {self.}F, + 1: {self.}StrCache, ); sorted_child_ := array( "": -1, - self.F.ElementName: 0, - self.StrCache.ElementName: 1, + {self.}F.ElementName: 0, + {self.}StrCache.ElementName: 1, ); end; function StrRef.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function StrRef.Copy(_obj: StrRef);override; begin - self.F.Copy(_obj.F); - self.StrCache.Copy(_obj.StrCache); + {self.}F.Copy(_obj.F); + {self.}StrCache.Copy(_obj.StrCache); end; diff --git a/autoclass/docx/Stretch@DOCX.tsf b/autoclass/docx/Stretch@DOCX.tsf index bac1cab..30541e6 100644 --- a/autoclass/docx/Stretch@DOCX.tsf +++ b/autoclass/docx/Stretch@DOCX.tsf @@ -19,7 +19,7 @@ end; function Stretch.Create();overload; begin - self.Create(nil, "a", "stretch"); + {self.}Create(nil, "a", "stretch"); end; function Stretch.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function Stretch.Init();override; begin - self.FillRect := new PureVal(self, "a", "fillRect"); + {self.}FillRect := new PureVal(self, "a", "fillRect"); end; function Stretch.InitAttributes();override; @@ -46,19 +46,19 @@ end; function Stretch.InitChildren();override; begin child_elements_ := array( - 0: self.FillRect, + 0: {self.}FillRect, ); sorted_child_ := array( "": -1, - self.FillRect.ElementName: 0, + {self.}FillRect.ElementName: 0, ); end; function Stretch.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function Stretch.Copy(_obj: Stretch);override; begin - self.FillRect.Copy(_obj.FillRect); + {self.}FillRect.Copy(_obj.FillRect); end; diff --git a/autoclass/docx/Style@DOCX.tsf b/autoclass/docx/Style@DOCX.tsf index 431f403..e280c84 100644 --- a/autoclass/docx/Style@DOCX.tsf +++ b/autoclass/docx/Style@DOCX.tsf @@ -60,7 +60,7 @@ end; function Style.Create();overload; begin - self.Create(nil, "w", "style"); + {self.}Create(nil, "w", "style"); end; function Style.Create(_node: XmlNode);overload; @@ -75,82 +75,82 @@ end; function Style.Init();override; begin - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); - self.XmlAttrDefault := new OpenXmlAttribute(self.Prefix, "default", nil); - self.XmlAttrStyleId := new OpenXmlAttribute(self.Prefix, "styleId", nil); - self.Name := new PureWVal(self, self.Prefix, "name"); - self.BasedOn := new PureWVal(self, self.Prefix, "basedOn"); - self.Next := new PureWVal(self, self.Prefix, "next"); - self.AutoRedefine := new PureWVal(self, self.Prefix, "autoRedefine"); - self.Link := new PureWVal(self, self.Prefix, "link"); - self.UIPriority := new PureWVal(self, self.Prefix, "uiPriority"); - self.XmlChildSemiHidden := new OpenXmlEmpty(self, self.Prefix, "semiHidden"); - self.XmlChildUnhideWhenUsed := new OpenXmlEmpty(self, self.Prefix, "unhideWhenUsed"); - self.XmlChildQFormat := new OpenXmlEmpty(self, self.Prefix, "qFormat"); - self.XmlChildRsid := new PureWVal(self, self.Prefix, "rsid"); - self.PPr := new PPr(self, self.Prefix, "pPr"); - self.RPr := new RPr(self, self.Prefix, "rPr"); - self.TblPr := new TblPr(self, self.Prefix, "tblPr"); - self.TrPr := new TrPr(self, self.Prefix, "trPr"); - self.TcPr := new TcPr(self, self.Prefix, "tcPr"); - self.TblStylePr := new TblStylePr(self, self.Prefix, "tblStylePr"); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); + {self.}XmlAttrDefault := new OpenXmlAttribute({self.}Prefix, "default", nil); + {self.}XmlAttrStyleId := new OpenXmlAttribute({self.}Prefix, "styleId", nil); + {self.}Name := new PureWVal(self, {self.}Prefix, "name"); + {self.}BasedOn := new PureWVal(self, {self.}Prefix, "basedOn"); + {self.}Next := new PureWVal(self, {self.}Prefix, "next"); + {self.}AutoRedefine := new PureWVal(self, {self.}Prefix, "autoRedefine"); + {self.}Link := new PureWVal(self, {self.}Prefix, "link"); + {self.}UIPriority := new PureWVal(self, {self.}Prefix, "uiPriority"); + {self.}XmlChildSemiHidden := new OpenXmlEmpty(self, {self.}Prefix, "semiHidden"); + {self.}XmlChildUnhideWhenUsed := new OpenXmlEmpty(self, {self.}Prefix, "unhideWhenUsed"); + {self.}XmlChildQFormat := new OpenXmlEmpty(self, {self.}Prefix, "qFormat"); + {self.}XmlChildRsid := new PureWVal(self, {self.}Prefix, "rsid"); + {self.}PPr := new PPr(self, {self.}Prefix, "pPr"); + {self.}RPr := new RPr(self, {self.}Prefix, "rPr"); + {self.}TblPr := new TblPr(self, {self.}Prefix, "tblPr"); + {self.}TrPr := new TrPr(self, {self.}Prefix, "trPr"); + {self.}TcPr := new TcPr(self, {self.}Prefix, "tcPr"); + {self.}TblStylePr := new TblStylePr(self, {self.}Prefix, "tblStylePr"); end; function Style.InitAttributes();override; begin attributes_ := array( - self.XmlAttrType, - self.XmlAttrDefault, - self.XmlAttrStyleId, + {self.}XmlAttrType, + {self.}XmlAttrDefault, + {self.}XmlAttrStyleId, ); end; function Style.InitChildren();override; begin child_elements_ := array( - 0: self.Name, - 1: self.BasedOn, - 2: self.Next, - 3: self.AutoRedefine, - 4: self.Link, - 5: self.UIPriority, - 6: self.XmlChildSemiHidden, - 7: self.XmlChildUnhideWhenUsed, - 8: self.XmlChildQFormat, - 9: self.XmlChildRsid, - 10: self.PPr, - 11: self.RPr, - 12: self.TblPr, - 13: self.TrPr, - 14: self.TcPr, - 15: self.TblStylePr, + 0: {self.}Name, + 1: {self.}BasedOn, + 2: {self.}Next, + 3: {self.}AutoRedefine, + 4: {self.}Link, + 5: {self.}UIPriority, + 6: {self.}XmlChildSemiHidden, + 7: {self.}XmlChildUnhideWhenUsed, + 8: {self.}XmlChildQFormat, + 9: {self.}XmlChildRsid, + 10: {self.}PPr, + 11: {self.}RPr, + 12: {self.}TblPr, + 13: {self.}TrPr, + 14: {self.}TcPr, + 15: {self.}TblStylePr, ); sorted_child_ := array( "": -1, - self.Name.ElementName: 0, - self.BasedOn.ElementName: 1, - self.Next.ElementName: 2, - self.AutoRedefine.ElementName: 3, - self.Link.ElementName: 4, - self.UIPriority.ElementName: 5, - self.XmlChildSemiHidden.ElementName: 6, - self.XmlChildUnhideWhenUsed.ElementName: 7, - self.XmlChildQFormat.ElementName: 8, - self.XmlChildRsid.ElementName: 9, - self.PPr.ElementName: 10, - self.RPr.ElementName: 11, - self.TblPr.ElementName: 12, - self.TrPr.ElementName: 13, - self.TcPr.ElementName: 14, - self.TblStylePr.ElementName: 15, + {self.}Name.ElementName: 0, + {self.}BasedOn.ElementName: 1, + {self.}Next.ElementName: 2, + {self.}AutoRedefine.ElementName: 3, + {self.}Link.ElementName: 4, + {self.}UIPriority.ElementName: 5, + {self.}XmlChildSemiHidden.ElementName: 6, + {self.}XmlChildUnhideWhenUsed.ElementName: 7, + {self.}XmlChildQFormat.ElementName: 8, + {self.}XmlChildRsid.ElementName: 9, + {self.}PPr.ElementName: 10, + {self.}RPr.ElementName: 11, + {self.}TblPr.ElementName: 12, + {self.}TrPr.ElementName: 13, + {self.}TcPr.ElementName: 14, + {self.}TblStylePr.ElementName: 15, ); end; function Style.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -159,7 +159,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -187,95 +187,95 @@ end; function Style.Copy(_obj: Style);override; begin if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; if not ifnil(_obj.XmlAttrDefault.Value) then - self.XmlAttrDefault.Value := _obj.XmlAttrDefault.Value; + {self.}XmlAttrDefault.Value := _obj.XmlAttrDefault.Value; if not ifnil(_obj.XmlAttrStyleId.Value) then - self.XmlAttrStyleId.Value := _obj.XmlAttrStyleId.Value; - self.Name.Copy(_obj.Name); - self.BasedOn.Copy(_obj.BasedOn); - self.Next.Copy(_obj.Next); - self.AutoRedefine.Copy(_obj.AutoRedefine); - self.Link.Copy(_obj.Link); - self.UIPriority.Copy(_obj.UIPriority); - self.XmlChildSemiHidden.Copy(_obj.XmlChildSemiHidden); - self.XmlChildUnhideWhenUsed.Copy(_obj.XmlChildUnhideWhenUsed); - self.XmlChildQFormat.Copy(_obj.XmlChildQFormat); - self.XmlChildRsid.Copy(_obj.XmlChildRsid); - self.PPr.Copy(_obj.PPr); - self.RPr.Copy(_obj.RPr); - self.TblPr.Copy(_obj.TblPr); - self.TrPr.Copy(_obj.TrPr); - self.TcPr.Copy(_obj.TcPr); - self.TblStylePr.Copy(_obj.TblStylePr); + {self.}XmlAttrStyleId.Value := _obj.XmlAttrStyleId.Value; + {self.}Name.Copy(_obj.Name); + {self.}BasedOn.Copy(_obj.BasedOn); + {self.}Next.Copy(_obj.Next); + {self.}AutoRedefine.Copy(_obj.AutoRedefine); + {self.}Link.Copy(_obj.Link); + {self.}UIPriority.Copy(_obj.UIPriority); + {self.}XmlChildSemiHidden.Copy(_obj.XmlChildSemiHidden); + {self.}XmlChildUnhideWhenUsed.Copy(_obj.XmlChildUnhideWhenUsed); + {self.}XmlChildQFormat.Copy(_obj.XmlChildQFormat); + {self.}XmlChildRsid.Copy(_obj.XmlChildRsid); + {self.}PPr.Copy(_obj.PPr); + {self.}RPr.Copy(_obj.RPr); + {self.}TblPr.Copy(_obj.TblPr); + {self.}TrPr.Copy(_obj.TrPr); + {self.}TcPr.Copy(_obj.TcPr); + {self.}TblStylePr.Copy(_obj.TblStylePr); end; function Style.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function Style.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; function Style.ReadXmlAttrDefault(); begin - return self.XmlAttrDefault.Value; + return {self.}XmlAttrDefault.Value; end; function Style.WriteXmlAttrDefault(_value); begin - self.XmlAttrDefault.Value := _value; + {self.}XmlAttrDefault.Value := _value; end; function Style.ReadXmlAttrStyleId(); begin - return self.XmlAttrStyleId.Value; + return {self.}XmlAttrStyleId.Value; end; function Style.WriteXmlAttrStyleId(_value); begin - self.XmlAttrStyleId.Value := _value; + {self.}XmlAttrStyleId.Value := _value; end; function Style.ReadXmlChildSemiHidden(); begin - return ifnil(self.XmlChildSemiHidden.Value) ? false : true; + return ifnil({self.}XmlChildSemiHidden.Value) ? false : true; end; function Style.WriteXmlChildSemiHidden(_value); begin - self.XmlChildSemiHidden.Value := _value; + {self.}XmlChildSemiHidden.Value := _value; end; function Style.ReadXmlChildUnhideWhenUsed(); begin - return ifnil(self.XmlChildUnhideWhenUsed.Value) ? false : true; + return ifnil({self.}XmlChildUnhideWhenUsed.Value) ? false : true; end; function Style.WriteXmlChildUnhideWhenUsed(_value); begin - self.XmlChildUnhideWhenUsed.Value := _value; + {self.}XmlChildUnhideWhenUsed.Value := _value; end; function Style.ReadXmlChildQFormat(); begin - return ifnil(self.XmlChildQFormat.Value) ? false : true; + return ifnil({self.}XmlChildQFormat.Value) ? false : true; end; function Style.WriteXmlChildQFormat(_value); begin - self.XmlChildQFormat.Value := _value; + {self.}XmlChildQFormat.Value := _value; end; function Style.ReadXmlChildRsid(); begin - return ifnil(self.XmlChildRsid.Value) ? false : true; + return ifnil({self.}XmlChildRsid.Value) ? false : true; end; function Style.WriteXmlChildRsid(_value); begin - self.XmlChildRsid.Value := _value; + {self.}XmlChildRsid.Value := _value; end; diff --git a/autoclass/docx/Styles@DOCX.tsf b/autoclass/docx/Styles@DOCX.tsf index 1035658..1d24807 100644 --- a/autoclass/docx/Styles@DOCX.tsf +++ b/autoclass/docx/Styles@DOCX.tsf @@ -74,7 +74,7 @@ end; function Styles.Create();overload; begin - self.Create(nil, "w", "styles"); + {self.}Create(nil, "w", "styles"); end; function Styles.Create(_node: XmlNode);overload; @@ -89,58 +89,58 @@ end; function Styles.Init();override; begin - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); - self.DocDefaults := new DocDefaults(self, self.Prefix, "docDefaults"); - self.LatenStyles := new LatenStyles(self, self.Prefix, "latenStyles"); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}DocDefaults := new DocDefaults(self, {self.}Prefix, "docDefaults"); + {self.}LatenStyles := new LatenStyles(self, {self.}Prefix, "latenStyles"); end; function Styles.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16sdtdh, - self.XmlAttrXmlnsW16se, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16sdtdh, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrMcIgnorable, ); end; function Styles.InitChildren();override; begin child_elements_ := array( - 0: self.DocDefaults, - 1: self.LatenStyles, + 0: {self.}DocDefaults, + 1: {self.}LatenStyles, ); sorted_child_ := array( "": -1, - self.DocDefaults.ElementName: 0, - self.LatenStyles.ElementName: 1, + {self.}DocDefaults.ElementName: 0, + {self.}LatenStyles.ElementName: 1, ); end; function Styles.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -149,7 +149,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -158,7 +158,7 @@ begin begin obj := nil; case node_name of - pre + "style": obj := self.AppendStyle(); + pre + "style": obj := {self.}AppendStyle(); end; if ifObj(obj) then obj.InitNode(node); end @@ -178,31 +178,31 @@ end; function Styles.Copy(_obj: Styles);override; begin if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16sdtdh.Value) then - self.XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; - self.DocDefaults.Copy(_obj.DocDefaults); - self.LatenStyles.Copy(_obj.LatenStyles); + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}DocDefaults.Copy(_obj.DocDefaults); + {self.}LatenStyles.Copy(_obj.LatenStyles); end; function Styles.AddStyle(): Style; @@ -213,14 +213,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "style" then break; end - obj := new Style(self, self.Prefix, "style"); - self.InsertChild(obj, i+1); + obj := new Style(self, {self.}Prefix, "style"); + {self.}InsertChild(obj, i+1); return obj; end; function Styles.AppendStyle(): Style; begin - obj := new Style(self, self.Prefix, "style"); + obj := new Style(self, {self.}Prefix, "style"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -243,120 +243,120 @@ end; function Styles.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function Styles.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function Styles.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function Styles.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function Styles.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function Styles.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function Styles.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function Styles.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function Styles.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function Styles.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function Styles.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function Styles.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function Styles.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function Styles.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function Styles.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function Styles.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function Styles.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function Styles.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function Styles.ReadXmlAttrXmlnsW16sdtdh(); begin - return self.XmlAttrXmlnsW16sdtdh.Value; + return {self.}XmlAttrXmlnsW16sdtdh.Value; end; function Styles.WriteXmlAttrXmlnsW16sdtdh(_value); begin - self.XmlAttrXmlnsW16sdtdh.Value := _value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _value; end; function Styles.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function Styles.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function Styles.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function Styles.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; diff --git a/autoclass/docx/SysClr@DOCX.tsf b/autoclass/docx/SysClr@DOCX.tsf index 5af6af7..8383d2e 100644 --- a/autoclass/docx/SysClr@DOCX.tsf +++ b/autoclass/docx/SysClr@DOCX.tsf @@ -27,7 +27,7 @@ end; function SysClr.Create();overload; begin - self.Create(nil, "a", "sysClr"); + {self.}Create(nil, "a", "sysClr"); end; function SysClr.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function SysClr.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); - self.XmlAttrLastClr := new OpenXmlAttribute(nil, "LastClr", nil); + {self.}XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); + {self.}XmlAttrLastClr := new OpenXmlAttribute(nil, "LastClr", nil); end; function SysClr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, - self.XmlAttrLastClr, + {self.}XmlAttrVal, + {self.}XmlAttrLastClr, ); end; @@ -65,35 +65,35 @@ end; function SysClr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function SysClr.Copy(_obj: SysClr);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; if not ifnil(_obj.XmlAttrLastClr.Value) then - self.XmlAttrLastClr.Value := _obj.XmlAttrLastClr.Value; + {self.}XmlAttrLastClr.Value := _obj.XmlAttrLastClr.Value; end; function SysClr.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function SysClr.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; function SysClr.ReadXmlAttrLastClr(); begin - return self.XmlAttrLastClr.Value; + return {self.}XmlAttrLastClr.Value; end; function SysClr.WriteXmlAttrLastClr(_value); begin - self.XmlAttrLastClr.Value := _value; + {self.}XmlAttrLastClr.Value := _value; end; diff --git a/autoclass/docx/Sz@DOCX.tsf b/autoclass/docx/Sz@DOCX.tsf index da8ef80..4d9f81d 100644 --- a/autoclass/docx/Sz@DOCX.tsf +++ b/autoclass/docx/Sz@DOCX.tsf @@ -23,7 +23,7 @@ end; function Sz.Create();overload; begin - self.Create(nil, "w", "sz"); + {self.}Create(nil, "w", "sz"); end; function Sz.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function Sz.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute("w", "val", nil); + {self.}XmlAttrVal := new OpenXmlAttribute("w", "val", nil); end; function Sz.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, + {self.}XmlAttrVal, ); end; @@ -59,23 +59,23 @@ end; function Sz.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Sz.Copy(_obj: Sz);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; end; function Sz.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function Sz.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/autoclass/docx/SzCs@DOCX.tsf b/autoclass/docx/SzCs@DOCX.tsf index 5b48edd..ed147d6 100644 --- a/autoclass/docx/SzCs@DOCX.tsf +++ b/autoclass/docx/SzCs@DOCX.tsf @@ -23,7 +23,7 @@ end; function SzCs.Create();overload; begin - self.Create(nil, "w", "szCs"); + {self.}Create(nil, "w", "szCs"); end; function SzCs.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function SzCs.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute("w", "val", nil); + {self.}XmlAttrVal := new OpenXmlAttribute("w", "val", nil); end; function SzCs.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, + {self.}XmlAttrVal, ); end; @@ -59,23 +59,23 @@ end; function SzCs.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function SzCs.Copy(_obj: SzCs);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; end; function SzCs.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function SzCs.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/autoclass/docx/T@DOCX.tsf b/autoclass/docx/T@DOCX.tsf index 7d05c39..6fc9a5c 100644 --- a/autoclass/docx/T@DOCX.tsf +++ b/autoclass/docx/T@DOCX.tsf @@ -22,7 +22,7 @@ end; function T.Create();overload; begin - self.Create(nil, "w", "t"); + {self.}Create(nil, "w", "t"); end; function T.Create(_node: XmlNode);overload; @@ -37,35 +37,35 @@ end; function T.Init();override; begin - self.XmlAttrSpace := new OpenXmlAttribute("xml", "space", nil); + {self.}XmlAttrSpace := new OpenXmlAttribute("xml", "space", nil); end; function T.InitAttributes();override; begin attributes_ := array( - self.XmlAttrSpace, + {self.}XmlAttrSpace, ); end; function T.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function T.Copy(_obj: T);override; begin if not ifnil(_obj.XmlAttrSpace.Value) then - self.XmlAttrSpace.Value := _obj.XmlAttrSpace.Value; + {self.}XmlAttrSpace.Value := _obj.XmlAttrSpace.Value; end; function T.ReadXmlAttrSpace(); begin - return self.XmlAttrSpace.Value; + return {self.}XmlAttrSpace.Value; end; function T.WriteXmlAttrSpace(_value); begin - self.XmlAttrSpace.Value := _value; + {self.}XmlAttrSpace.Value := _value; end; diff --git a/autoclass/docx/Tab@DOCX.tsf b/autoclass/docx/Tab@DOCX.tsf index cd9da46..42f188c 100644 --- a/autoclass/docx/Tab@DOCX.tsf +++ b/autoclass/docx/Tab@DOCX.tsf @@ -31,7 +31,7 @@ end; function Tab.Create();overload; begin - self.Create(nil, "w", "tab"); + {self.}Create(nil, "w", "tab"); end; function Tab.Create(_node: XmlNode);overload; @@ -46,17 +46,17 @@ end; function Tab.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); - self.XmlAttrLeader := new OpenXmlAttribute(self.Prefix, "leader", nil); - self.XmlAttrPos := new OpenXmlAttribute(self.Prefix, "pos", nil); + {self.}XmlAttrVal := new OpenXmlAttribute(nil, "val", nil); + {self.}XmlAttrLeader := new OpenXmlAttribute({self.}Prefix, "leader", nil); + {self.}XmlAttrPos := new OpenXmlAttribute({self.}Prefix, "pos", nil); end; function Tab.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, - self.XmlAttrLeader, - self.XmlAttrPos, + {self.}XmlAttrVal, + {self.}XmlAttrLeader, + {self.}XmlAttrPos, ); end; @@ -71,47 +71,47 @@ end; function Tab.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Tab.Copy(_obj: Tab);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; if not ifnil(_obj.XmlAttrLeader.Value) then - self.XmlAttrLeader.Value := _obj.XmlAttrLeader.Value; + {self.}XmlAttrLeader.Value := _obj.XmlAttrLeader.Value; if not ifnil(_obj.XmlAttrPos.Value) then - self.XmlAttrPos.Value := _obj.XmlAttrPos.Value; + {self.}XmlAttrPos.Value := _obj.XmlAttrPos.Value; end; function Tab.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function Tab.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; function Tab.ReadXmlAttrLeader(); begin - return self.XmlAttrLeader.Value; + return {self.}XmlAttrLeader.Value; end; function Tab.WriteXmlAttrLeader(_value); begin - self.XmlAttrLeader.Value := _value; + {self.}XmlAttrLeader.Value := _value; end; function Tab.ReadXmlAttrPos(); begin - return self.XmlAttrPos.Value; + return {self.}XmlAttrPos.Value; end; function Tab.WriteXmlAttrPos(_value); begin - self.XmlAttrPos.Value := _value; + {self.}XmlAttrPos.Value := _value; end; diff --git a/autoclass/docx/Tabs@DOCX.tsf b/autoclass/docx/Tabs@DOCX.tsf index c56c51c..a89e19b 100644 --- a/autoclass/docx/Tabs@DOCX.tsf +++ b/autoclass/docx/Tabs@DOCX.tsf @@ -23,7 +23,7 @@ end; function Tabs.Create();overload; begin - self.Create(nil, "w", "tabs"); + {self.}Create(nil, "w", "tabs"); end; function Tabs.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function Tabs.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "tab": obj := self.AppendTab(); + pre + "tab": obj := {self.}AppendTab(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "tab" then break; end - obj := new Tab(self, self.Prefix, "tab"); - self.InsertChild(obj, i+1); + obj := new Tab(self, {self.}Prefix, "tab"); + {self.}InsertChild(obj, i+1); return obj; end; function Tabs.AppendTab(): Tab; begin - obj := new Tab(self, self.Prefix, "tab"); + obj := new Tab(self, {self.}Prefix, "tab"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/Tbl@DOCX.tsf b/autoclass/docx/Tbl@DOCX.tsf index 4cc169c..49cec92 100644 --- a/autoclass/docx/Tbl@DOCX.tsf +++ b/autoclass/docx/Tbl@DOCX.tsf @@ -25,7 +25,7 @@ end; function Tbl.Create();overload; begin - self.Create(nil, "w", "tbl"); + {self.}Create(nil, "w", "tbl"); end; function Tbl.Create(_node: XmlNode);overload; @@ -40,8 +40,8 @@ end; function Tbl.Init();override; begin - self.TblPr := new TblPr(self, self.Prefix, "tblPr"); - self.TblGrid := new TblGrid(self, self.Prefix, "tblGrid"); + {self.}TblPr := new TblPr(self, {self.}Prefix, "tblPr"); + {self.}TblGrid := new TblGrid(self, {self.}Prefix, "tblGrid"); end; function Tbl.InitAttributes();override; @@ -53,21 +53,21 @@ end; function Tbl.InitChildren();override; begin child_elements_ := array( - 0: self.TblPr, - 1: self.TblGrid, + 0: {self.}TblPr, + 1: {self.}TblGrid, ); sorted_child_ := array( "": -1, - self.TblPr.ElementName: 0, - self.TblGrid.ElementName: 1, + {self.}TblPr.ElementName: 0, + {self.}TblGrid.ElementName: 1, ); end; function Tbl.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -76,7 +76,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -85,7 +85,7 @@ begin begin obj := nil; case node_name of - pre + "tr": obj := self.AppendTr(); + pre + "tr": obj := {self.}AppendTr(); end; if ifObj(obj) then obj.InitNode(node); end @@ -104,8 +104,8 @@ end; function Tbl.Copy(_obj: Tbl);override; begin - self.TblPr.Copy(_obj.TblPr); - self.TblGrid.Copy(_obj.TblGrid); + {self.}TblPr.Copy(_obj.TblPr); + {self.}TblGrid.Copy(_obj.TblGrid); end; function Tbl.AddTr(): Tr; @@ -116,14 +116,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "tr" then break; end - obj := new Tr(self, self.Prefix, "tr"); - self.InsertChild(obj, i+1); + obj := new Tr(self, {self.}Prefix, "tr"); + {self.}InsertChild(obj, i+1); return obj; end; function Tbl.AppendTr(): Tr; begin - obj := new Tr(self, self.Prefix, "tr"); + obj := new Tr(self, {self.}Prefix, "tr"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/TblBorder@DOCX.tsf b/autoclass/docx/TblBorder@DOCX.tsf index 689cd4e..7866d6a 100644 --- a/autoclass/docx/TblBorder@DOCX.tsf +++ b/autoclass/docx/TblBorder@DOCX.tsf @@ -43,7 +43,7 @@ end; function TblBorder.Create();overload; begin - self.Create(nil, "w", ""); + {self.}Create(nil, "w", ""); end; function TblBorder.Create(_node: XmlNode);overload; @@ -58,23 +58,23 @@ end; function TblBorder.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(self.Prefix, "val", nil); - self.XmlAttrColor := new OpenXmlAttribute(self.Prefix, "color", nil); - self.XmlAttrSpce := new OpenXmlAttribute(self.Prefix, "space", nil); - self.XmlAttrThemeColor := new OpenXmlAttribute(self.Prefix, "themeColor", nil); - self.XmlAttrThemeTint := new OpenXmlAttribute(self.Prefix, "themeTint", nil); - self.XmlAttrSz := new OpenXmlAttribute(self.Prefix, "sz", nil); + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + {self.}XmlAttrColor := new OpenXmlAttribute({self.}Prefix, "color", nil); + {self.}XmlAttrSpce := new OpenXmlAttribute({self.}Prefix, "space", nil); + {self.}XmlAttrThemeColor := new OpenXmlAttribute({self.}Prefix, "themeColor", nil); + {self.}XmlAttrThemeTint := new OpenXmlAttribute({self.}Prefix, "themeTint", nil); + {self.}XmlAttrSz := new OpenXmlAttribute({self.}Prefix, "sz", nil); end; function TblBorder.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, - self.XmlAttrColor, - self.XmlAttrSpce, - self.XmlAttrThemeColor, - self.XmlAttrThemeTint, - self.XmlAttrSz, + {self.}XmlAttrVal, + {self.}XmlAttrColor, + {self.}XmlAttrSpce, + {self.}XmlAttrThemeColor, + {self.}XmlAttrThemeTint, + {self.}XmlAttrSz, ); end; @@ -89,83 +89,83 @@ end; function TblBorder.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function TblBorder.Copy(_obj: TblBorder);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; if not ifnil(_obj.XmlAttrColor.Value) then - self.XmlAttrColor.Value := _obj.XmlAttrColor.Value; + {self.}XmlAttrColor.Value := _obj.XmlAttrColor.Value; if not ifnil(_obj.XmlAttrSpce.Value) then - self.XmlAttrSpce.Value := _obj.XmlAttrSpce.Value; + {self.}XmlAttrSpce.Value := _obj.XmlAttrSpce.Value; if not ifnil(_obj.XmlAttrThemeColor.Value) then - self.XmlAttrThemeColor.Value := _obj.XmlAttrThemeColor.Value; + {self.}XmlAttrThemeColor.Value := _obj.XmlAttrThemeColor.Value; if not ifnil(_obj.XmlAttrThemeTint.Value) then - self.XmlAttrThemeTint.Value := _obj.XmlAttrThemeTint.Value; + {self.}XmlAttrThemeTint.Value := _obj.XmlAttrThemeTint.Value; if not ifnil(_obj.XmlAttrSz.Value) then - self.XmlAttrSz.Value := _obj.XmlAttrSz.Value; + {self.}XmlAttrSz.Value := _obj.XmlAttrSz.Value; end; function TblBorder.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function TblBorder.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; function TblBorder.ReadXmlAttrColor(); begin - return self.XmlAttrColor.Value; + return {self.}XmlAttrColor.Value; end; function TblBorder.WriteXmlAttrColor(_value); begin - self.XmlAttrColor.Value := _value; + {self.}XmlAttrColor.Value := _value; end; function TblBorder.ReadXmlAttrSpce(); begin - return self.XmlAttrSpce.Value; + return {self.}XmlAttrSpce.Value; end; function TblBorder.WriteXmlAttrSpce(_value); begin - self.XmlAttrSpce.Value := _value; + {self.}XmlAttrSpce.Value := _value; end; function TblBorder.ReadXmlAttrThemeColor(); begin - return self.XmlAttrThemeColor.Value; + return {self.}XmlAttrThemeColor.Value; end; function TblBorder.WriteXmlAttrThemeColor(_value); begin - self.XmlAttrThemeColor.Value := _value; + {self.}XmlAttrThemeColor.Value := _value; end; function TblBorder.ReadXmlAttrThemeTint(); begin - return self.XmlAttrThemeTint.Value; + return {self.}XmlAttrThemeTint.Value; end; function TblBorder.WriteXmlAttrThemeTint(_value); begin - self.XmlAttrThemeTint.Value := _value; + {self.}XmlAttrThemeTint.Value := _value; end; function TblBorder.ReadXmlAttrSz(); begin - return self.XmlAttrSz.Value; + return {self.}XmlAttrSz.Value; end; function TblBorder.WriteXmlAttrSz(_value); begin - self.XmlAttrSz.Value := _value; + {self.}XmlAttrSz.Value := _value; end; diff --git a/autoclass/docx/TblBorders@DOCX.tsf b/autoclass/docx/TblBorders@DOCX.tsf index 172d0ed..0f13ab1 100644 --- a/autoclass/docx/TblBorders@DOCX.tsf +++ b/autoclass/docx/TblBorders@DOCX.tsf @@ -24,7 +24,7 @@ end; function TblBorders.Create();overload; begin - self.Create(nil, "w", "tblBorders"); + {self.}Create(nil, "w", "tblBorders"); end; function TblBorders.Create(_node: XmlNode);overload; @@ -39,12 +39,12 @@ end; function TblBorders.Init();override; begin - self.Top := new tblBorder(self, self.Prefix, "top"); - self.Left := new tblBorder(self, self.Prefix, "left"); - self.Bottom := new tblBorder(self, self.Prefix, "bottom"); - self.Right := new tblBorder(self, self.Prefix, "right"); - self.InsideH := new PureWVal(self, self.Prefix, "insideH"); - self.InsideV := new PureWVal(self, self.Prefix, "insideV"); + {self.}Top := new tblBorder(self, {self.}Prefix, "top"); + {self.}Left := new tblBorder(self, {self.}Prefix, "left"); + {self.}Bottom := new tblBorder(self, {self.}Prefix, "bottom"); + {self.}Right := new tblBorder(self, {self.}Prefix, "right"); + {self.}InsideH := new PureWVal(self, {self.}Prefix, "insideH"); + {self.}InsideV := new PureWVal(self, {self.}Prefix, "insideV"); end; function TblBorders.InitAttributes();override; @@ -56,29 +56,29 @@ end; function TblBorders.InitChildren();override; begin child_elements_ := array( - 0: self.Top, - 1: self.Left, - 2: self.Bottom, - 3: self.Right, - 4: self.InsideH, - 5: self.InsideV, + 0: {self.}Top, + 1: {self.}Left, + 2: {self.}Bottom, + 3: {self.}Right, + 4: {self.}InsideH, + 5: {self.}InsideV, ); sorted_child_ := array( "": -1, - self.Top.ElementName: 0, - self.Left.ElementName: 1, - self.Bottom.ElementName: 2, - self.Right.ElementName: 3, - self.InsideH.ElementName: 4, - self.InsideV.ElementName: 5, + {self.}Top.ElementName: 0, + {self.}Left.ElementName: 1, + {self.}Bottom.ElementName: 2, + {self.}Right.ElementName: 3, + {self.}InsideH.ElementName: 4, + {self.}InsideV.ElementName: 5, ); end; function TblBorders.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -87,7 +87,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -114,10 +114,10 @@ end; function TblBorders.Copy(_obj: TblBorders);override; begin - self.Top.Copy(_obj.Top); - self.Left.Copy(_obj.Left); - self.Bottom.Copy(_obj.Bottom); - self.Right.Copy(_obj.Right); - self.InsideH.Copy(_obj.InsideH); - self.InsideV.Copy(_obj.InsideV); + {self.}Top.Copy(_obj.Top); + {self.}Left.Copy(_obj.Left); + {self.}Bottom.Copy(_obj.Bottom); + {self.}Right.Copy(_obj.Right); + {self.}InsideH.Copy(_obj.InsideH); + {self.}InsideV.Copy(_obj.InsideV); end; diff --git a/autoclass/docx/TblCellMar@DOCX.tsf b/autoclass/docx/TblCellMar@DOCX.tsf index 1ad54ab..a6b0998 100644 --- a/autoclass/docx/TblCellMar@DOCX.tsf +++ b/autoclass/docx/TblCellMar@DOCX.tsf @@ -22,7 +22,7 @@ end; function TblCellMar.Create();overload; begin - self.Create(nil, "w", "tblCellMar"); + {self.}Create(nil, "w", "tblCellMar"); end; function TblCellMar.Create(_node: XmlNode);overload; @@ -37,10 +37,10 @@ end; function TblCellMar.Init();override; begin - self.Top := new TblInd(self, self.Prefix, "top"); - self.Left := new TblInd(self, self.Prefix, "left"); - self.Bottom := new TblInd(self, self.Prefix, "bottom"); - self.Right := new TblInd(self, self.Prefix, "right"); + {self.}Top := new TblInd(self, {self.}Prefix, "top"); + {self.}Left := new TblInd(self, {self.}Prefix, "left"); + {self.}Bottom := new TblInd(self, {self.}Prefix, "bottom"); + {self.}Right := new TblInd(self, {self.}Prefix, "right"); end; function TblCellMar.InitAttributes();override; @@ -52,25 +52,25 @@ end; function TblCellMar.InitChildren();override; begin child_elements_ := array( - 0: self.Top, - 1: self.Left, - 2: self.Bottom, - 3: self.Right, + 0: {self.}Top, + 1: {self.}Left, + 2: {self.}Bottom, + 3: {self.}Right, ); sorted_child_ := array( "": -1, - self.Top.ElementName: 0, - self.Left.ElementName: 1, - self.Bottom.ElementName: 2, - self.Right.ElementName: 3, + {self.}Top.ElementName: 0, + {self.}Left.ElementName: 1, + {self.}Bottom.ElementName: 2, + {self.}Right.ElementName: 3, ); end; function TblCellMar.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -79,7 +79,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,8 +106,8 @@ end; function TblCellMar.Copy(_obj: TblCellMar);override; begin - self.Top.Copy(_obj.Top); - self.Left.Copy(_obj.Left); - self.Bottom.Copy(_obj.Bottom); - self.Right.Copy(_obj.Right); + {self.}Top.Copy(_obj.Top); + {self.}Left.Copy(_obj.Left); + {self.}Bottom.Copy(_obj.Bottom); + {self.}Right.Copy(_obj.Right); end; diff --git a/autoclass/docx/TblGrid@DOCX.tsf b/autoclass/docx/TblGrid@DOCX.tsf index 4fa68ca..976b7f3 100644 --- a/autoclass/docx/TblGrid@DOCX.tsf +++ b/autoclass/docx/TblGrid@DOCX.tsf @@ -23,7 +23,7 @@ end; function TblGrid.Create();overload; begin - self.Create(nil, "w", "tblGrid"); + {self.}Create(nil, "w", "tblGrid"); end; function TblGrid.Create(_node: XmlNode);overload; @@ -58,9 +58,9 @@ end; function TblGrid.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -69,7 +69,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -78,7 +78,7 @@ begin begin obj := nil; case node_name of - pre + "gridCol": obj := self.AppendGridCol(); + pre + "gridCol": obj := {self.}AppendGridCol(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,14 +108,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "gridCol" then break; end - obj := new GridCol(self, self.Prefix, "gridCol"); - self.InsertChild(obj, i+1); + obj := new GridCol(self, {self.}Prefix, "gridCol"); + {self.}InsertChild(obj, i+1); return obj; end; function TblGrid.AppendGridCol(): GridCol; begin - obj := new GridCol(self, self.Prefix, "gridCol"); + obj := new GridCol(self, {self.}Prefix, "gridCol"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/TblInd@DOCX.tsf b/autoclass/docx/TblInd@DOCX.tsf index 800517e..b7bc52f 100644 --- a/autoclass/docx/TblInd@DOCX.tsf +++ b/autoclass/docx/TblInd@DOCX.tsf @@ -27,7 +27,7 @@ end; function TblInd.Create();overload; begin - self.Create(nil, "w", "tblInd"); + {self.}Create(nil, "w", "tblInd"); end; function TblInd.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function TblInd.Init();override; begin - self.XmlAttrW := new OpenXmlAttribute(self.Prefix, "w", nil); - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); + {self.}XmlAttrW := new OpenXmlAttribute({self.}Prefix, "w", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); end; function TblInd.InitAttributes();override; begin attributes_ := array( - self.XmlAttrW, - self.XmlAttrType, + {self.}XmlAttrW, + {self.}XmlAttrType, ); end; @@ -65,35 +65,35 @@ end; function TblInd.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function TblInd.Copy(_obj: TblInd);override; begin if not ifnil(_obj.XmlAttrW.Value) then - self.XmlAttrW.Value := _obj.XmlAttrW.Value; + {self.}XmlAttrW.Value := _obj.XmlAttrW.Value; if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; end; function TblInd.ReadXmlAttrW(); begin - return self.XmlAttrW.Value; + return {self.}XmlAttrW.Value; end; function TblInd.WriteXmlAttrW(_value); begin - self.XmlAttrW.Value := _value; + {self.}XmlAttrW.Value := _value; end; function TblInd.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function TblInd.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; diff --git a/autoclass/docx/TblLayout@DOCX.tsf b/autoclass/docx/TblLayout@DOCX.tsf index 8ae0eba..7e7ab70 100644 --- a/autoclass/docx/TblLayout@DOCX.tsf +++ b/autoclass/docx/TblLayout@DOCX.tsf @@ -23,7 +23,7 @@ end; function TblLayout.Create();overload; begin - self.Create(nil, "w", "tblLayout"); + {self.}Create(nil, "w", "tblLayout"); end; function TblLayout.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function TblLayout.Init();override; begin - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); end; function TblLayout.InitAttributes();override; begin attributes_ := array( - self.XmlAttrType, + {self.}XmlAttrType, ); end; @@ -59,23 +59,23 @@ end; function TblLayout.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function TblLayout.Copy(_obj: TblLayout);override; begin if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; end; function TblLayout.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function TblLayout.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; diff --git a/autoclass/docx/TblLook@DOCX.tsf b/autoclass/docx/TblLook@DOCX.tsf index 78e97f7..da6b41a 100644 --- a/autoclass/docx/TblLook@DOCX.tsf +++ b/autoclass/docx/TblLook@DOCX.tsf @@ -47,7 +47,7 @@ end; function TblLook.Create();overload; begin - self.Create(nil, "w", "tblLook"); + {self.}Create(nil, "w", "tblLook"); end; function TblLook.Create(_node: XmlNode);overload; @@ -62,25 +62,25 @@ end; function TblLook.Init();override; begin - self.XmlAttrVal := new OpenXmlAttribute(self.Prefix, "val", nil); - self.XmlAttrFirstRow := new OpenXmlAttribute(self.Prefix, "firstRow", nil); - self.XmlAttrLastRow := new OpenXmlAttribute(self.Prefix, "lastRow", nil); - self.XmlAttrFirstColumn := new OpenXmlAttribute(self.Prefix, "firstColumn", nil); - self.XmlAttrLastColumn := new OpenXmlAttribute(self.Prefix, "lastColumn", nil); - self.XmlAttrNoHBand := new OpenXmlAttribute(self.Prefix, "noHBand", nil); - self.XmlAttrNoVBand := new OpenXmlAttribute(self.Prefix, "noVBand", nil); + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + {self.}XmlAttrFirstRow := new OpenXmlAttribute({self.}Prefix, "firstRow", nil); + {self.}XmlAttrLastRow := new OpenXmlAttribute({self.}Prefix, "lastRow", nil); + {self.}XmlAttrFirstColumn := new OpenXmlAttribute({self.}Prefix, "firstColumn", nil); + {self.}XmlAttrLastColumn := new OpenXmlAttribute({self.}Prefix, "lastColumn", nil); + {self.}XmlAttrNoHBand := new OpenXmlAttribute({self.}Prefix, "noHBand", nil); + {self.}XmlAttrNoVBand := new OpenXmlAttribute({self.}Prefix, "noVBand", nil); end; function TblLook.InitAttributes();override; begin attributes_ := array( - self.XmlAttrVal, - self.XmlAttrFirstRow, - self.XmlAttrLastRow, - self.XmlAttrFirstColumn, - self.XmlAttrLastColumn, - self.XmlAttrNoHBand, - self.XmlAttrNoVBand, + {self.}XmlAttrVal, + {self.}XmlAttrFirstRow, + {self.}XmlAttrLastRow, + {self.}XmlAttrFirstColumn, + {self.}XmlAttrLastColumn, + {self.}XmlAttrNoHBand, + {self.}XmlAttrNoVBand, ); end; @@ -95,95 +95,95 @@ end; function TblLook.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function TblLook.Copy(_obj: TblLook);override; begin if not ifnil(_obj.XmlAttrVal.Value) then - self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; if not ifnil(_obj.XmlAttrFirstRow.Value) then - self.XmlAttrFirstRow.Value := _obj.XmlAttrFirstRow.Value; + {self.}XmlAttrFirstRow.Value := _obj.XmlAttrFirstRow.Value; if not ifnil(_obj.XmlAttrLastRow.Value) then - self.XmlAttrLastRow.Value := _obj.XmlAttrLastRow.Value; + {self.}XmlAttrLastRow.Value := _obj.XmlAttrLastRow.Value; if not ifnil(_obj.XmlAttrFirstColumn.Value) then - self.XmlAttrFirstColumn.Value := _obj.XmlAttrFirstColumn.Value; + {self.}XmlAttrFirstColumn.Value := _obj.XmlAttrFirstColumn.Value; if not ifnil(_obj.XmlAttrLastColumn.Value) then - self.XmlAttrLastColumn.Value := _obj.XmlAttrLastColumn.Value; + {self.}XmlAttrLastColumn.Value := _obj.XmlAttrLastColumn.Value; if not ifnil(_obj.XmlAttrNoHBand.Value) then - self.XmlAttrNoHBand.Value := _obj.XmlAttrNoHBand.Value; + {self.}XmlAttrNoHBand.Value := _obj.XmlAttrNoHBand.Value; if not ifnil(_obj.XmlAttrNoVBand.Value) then - self.XmlAttrNoVBand.Value := _obj.XmlAttrNoVBand.Value; + {self.}XmlAttrNoVBand.Value := _obj.XmlAttrNoVBand.Value; end; function TblLook.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function TblLook.WriteXmlAttrVal(_value); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; function TblLook.ReadXmlAttrFirstRow(); begin - return self.XmlAttrFirstRow.Value; + return {self.}XmlAttrFirstRow.Value; end; function TblLook.WriteXmlAttrFirstRow(_value); begin - self.XmlAttrFirstRow.Value := _value; + {self.}XmlAttrFirstRow.Value := _value; end; function TblLook.ReadXmlAttrLastRow(); begin - return self.XmlAttrLastRow.Value; + return {self.}XmlAttrLastRow.Value; end; function TblLook.WriteXmlAttrLastRow(_value); begin - self.XmlAttrLastRow.Value := _value; + {self.}XmlAttrLastRow.Value := _value; end; function TblLook.ReadXmlAttrFirstColumn(); begin - return self.XmlAttrFirstColumn.Value; + return {self.}XmlAttrFirstColumn.Value; end; function TblLook.WriteXmlAttrFirstColumn(_value); begin - self.XmlAttrFirstColumn.Value := _value; + {self.}XmlAttrFirstColumn.Value := _value; end; function TblLook.ReadXmlAttrLastColumn(); begin - return self.XmlAttrLastColumn.Value; + return {self.}XmlAttrLastColumn.Value; end; function TblLook.WriteXmlAttrLastColumn(_value); begin - self.XmlAttrLastColumn.Value := _value; + {self.}XmlAttrLastColumn.Value := _value; end; function TblLook.ReadXmlAttrNoHBand(); begin - return self.XmlAttrNoHBand.Value; + return {self.}XmlAttrNoHBand.Value; end; function TblLook.WriteXmlAttrNoHBand(_value); begin - self.XmlAttrNoHBand.Value := _value; + {self.}XmlAttrNoHBand.Value := _value; end; function TblLook.ReadXmlAttrNoVBand(); begin - return self.XmlAttrNoVBand.Value; + return {self.}XmlAttrNoVBand.Value; end; function TblLook.WriteXmlAttrNoVBand(_value); begin - self.XmlAttrNoVBand.Value := _value; + {self.}XmlAttrNoVBand.Value := _value; end; diff --git a/autoclass/docx/TblPr@DOCX.tsf b/autoclass/docx/TblPr@DOCX.tsf index cd0e767..3be7c6e 100644 --- a/autoclass/docx/TblPr@DOCX.tsf +++ b/autoclass/docx/TblPr@DOCX.tsf @@ -26,7 +26,7 @@ end; function TblPr.Create();overload; begin - self.Create(nil, "w", "tblPr"); + {self.}Create(nil, "w", "tblPr"); end; function TblPr.Create(_node: XmlNode);overload; @@ -41,14 +41,14 @@ end; function TblPr.Init();override; begin - self.Jc := new PureWVal(self, self.Prefix, "jc"); - self.TblStyle := new PureWVal(self, self.Prefix, "tblStyle"); - self.TblW := new TblW(self, self.Prefix, "tblW"); - self.TblInd := new TblW(self, self.Prefix, "tblInd"); - self.TblLayout := new TblLayout(self, self.Prefix, "tblLayout"); - self.TblLook := new TblLook(self, self.Prefix, "tblLook"); - self.TblBorders := new TblBorders(self, self.Prefix, "tblBorders"); - self.TblCellMar := new TblCellMar(self, self.Prefix, "tblCellMar"); + {self.}Jc := new PureWVal(self, {self.}Prefix, "jc"); + {self.}TblStyle := new PureWVal(self, {self.}Prefix, "tblStyle"); + {self.}TblW := new TblW(self, {self.}Prefix, "tblW"); + {self.}TblInd := new TblW(self, {self.}Prefix, "tblInd"); + {self.}TblLayout := new TblLayout(self, {self.}Prefix, "tblLayout"); + {self.}TblLook := new TblLook(self, {self.}Prefix, "tblLook"); + {self.}TblBorders := new TblBorders(self, {self.}Prefix, "tblBorders"); + {self.}TblCellMar := new TblCellMar(self, {self.}Prefix, "tblCellMar"); end; function TblPr.InitAttributes();override; @@ -60,33 +60,33 @@ end; function TblPr.InitChildren();override; begin child_elements_ := array( - 0: self.Jc, - 1: self.TblStyle, - 2: self.TblW, - 3: self.TblInd, - 4: self.TblLayout, - 5: self.TblLook, - 6: self.TblBorders, - 7: self.TblCellMar, + 0: {self.}Jc, + 1: {self.}TblStyle, + 2: {self.}TblW, + 3: {self.}TblInd, + 4: {self.}TblLayout, + 5: {self.}TblLook, + 6: {self.}TblBorders, + 7: {self.}TblCellMar, ); sorted_child_ := array( "": -1, - self.Jc.ElementName: 0, - self.TblStyle.ElementName: 1, - self.TblW.ElementName: 2, - self.TblInd.ElementName: 3, - self.TblLayout.ElementName: 4, - self.TblLook.ElementName: 5, - self.TblBorders.ElementName: 6, - self.TblCellMar.ElementName: 7, + {self.}Jc.ElementName: 0, + {self.}TblStyle.ElementName: 1, + {self.}TblW.ElementName: 2, + {self.}TblInd.ElementName: 3, + {self.}TblLayout.ElementName: 4, + {self.}TblLook.ElementName: 5, + {self.}TblBorders.ElementName: 6, + {self.}TblCellMar.ElementName: 7, ); end; function TblPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -95,7 +95,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -122,12 +122,12 @@ end; function TblPr.Copy(_obj: TblPr);override; begin - self.Jc.Copy(_obj.Jc); - self.TblStyle.Copy(_obj.TblStyle); - self.TblW.Copy(_obj.TblW); - self.TblInd.Copy(_obj.TblInd); - self.TblLayout.Copy(_obj.TblLayout); - self.TblLook.Copy(_obj.TblLook); - self.TblBorders.Copy(_obj.TblBorders); - self.TblCellMar.Copy(_obj.TblCellMar); + {self.}Jc.Copy(_obj.Jc); + {self.}TblStyle.Copy(_obj.TblStyle); + {self.}TblW.Copy(_obj.TblW); + {self.}TblInd.Copy(_obj.TblInd); + {self.}TblLayout.Copy(_obj.TblLayout); + {self.}TblLook.Copy(_obj.TblLook); + {self.}TblBorders.Copy(_obj.TblBorders); + {self.}TblCellMar.Copy(_obj.TblCellMar); end; diff --git a/autoclass/docx/TblStylePr@DOCX.tsf b/autoclass/docx/TblStylePr@DOCX.tsf index ea29bcc..b661b41 100644 --- a/autoclass/docx/TblStylePr@DOCX.tsf +++ b/autoclass/docx/TblStylePr@DOCX.tsf @@ -22,7 +22,7 @@ end; function TblStylePr.Create();overload; begin - self.Create(nil, "w", "tblStylePr"); + {self.}Create(nil, "w", "tblStylePr"); end; function TblStylePr.Create(_node: XmlNode);overload; @@ -37,10 +37,10 @@ end; function TblStylePr.Init();override; begin - self.PPr := new PPr(self, self.Prefix, "pPr"); - self.TblPr := new TblPr(self, self.Prefix, "tblPr"); - self.TrPr := new TrPr(self, self.Prefix, "trPr"); - self.TcPr := new TcPr(self, self.Prefix, "tcPr"); + {self.}PPr := new PPr(self, {self.}Prefix, "pPr"); + {self.}TblPr := new TblPr(self, {self.}Prefix, "tblPr"); + {self.}TrPr := new TrPr(self, {self.}Prefix, "trPr"); + {self.}TcPr := new TcPr(self, {self.}Prefix, "tcPr"); end; function TblStylePr.InitAttributes();override; @@ -52,25 +52,25 @@ end; function TblStylePr.InitChildren();override; begin child_elements_ := array( - 0: self.PPr, - 1: self.TblPr, - 2: self.TrPr, - 3: self.TcPr, + 0: {self.}PPr, + 1: {self.}TblPr, + 2: {self.}TrPr, + 3: {self.}TcPr, ); sorted_child_ := array( "": -1, - self.PPr.ElementName: 0, - self.TblPr.ElementName: 1, - self.TrPr.ElementName: 2, - self.TcPr.ElementName: 3, + {self.}PPr.ElementName: 0, + {self.}TblPr.ElementName: 1, + {self.}TrPr.ElementName: 2, + {self.}TcPr.ElementName: 3, ); end; function TblStylePr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -79,7 +79,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,8 +106,8 @@ end; function TblStylePr.Copy(_obj: TblStylePr);override; begin - self.PPr.Copy(_obj.PPr); - self.TblPr.Copy(_obj.TblPr); - self.TrPr.Copy(_obj.TrPr); - self.TcPr.Copy(_obj.TcPr); + {self.}PPr.Copy(_obj.PPr); + {self.}TblPr.Copy(_obj.TblPr); + {self.}TrPr.Copy(_obj.TrPr); + {self.}TcPr.Copy(_obj.TcPr); end; diff --git a/autoclass/docx/TblW@DOCX.tsf b/autoclass/docx/TblW@DOCX.tsf index a3078cd..b800c7b 100644 --- a/autoclass/docx/TblW@DOCX.tsf +++ b/autoclass/docx/TblW@DOCX.tsf @@ -27,7 +27,7 @@ end; function TblW.Create();overload; begin - self.Create(nil, "w", "tblW"); + {self.}Create(nil, "w", "tblW"); end; function TblW.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function TblW.Init();override; begin - self.XmlAttrW := new OpenXmlAttribute(self.Prefix, "w", nil); - self.XmlAttrType := new OpenXmlAttribute(self.Prefix, "type", nil); + {self.}XmlAttrW := new OpenXmlAttribute({self.}Prefix, "w", nil); + {self.}XmlAttrType := new OpenXmlAttribute({self.}Prefix, "type", nil); end; function TblW.InitAttributes();override; begin attributes_ := array( - self.XmlAttrW, - self.XmlAttrType, + {self.}XmlAttrW, + {self.}XmlAttrType, ); end; @@ -65,35 +65,35 @@ end; function TblW.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function TblW.Copy(_obj: TblW);override; begin if not ifnil(_obj.XmlAttrW.Value) then - self.XmlAttrW.Value := _obj.XmlAttrW.Value; + {self.}XmlAttrW.Value := _obj.XmlAttrW.Value; if not ifnil(_obj.XmlAttrType.Value) then - self.XmlAttrType.Value := _obj.XmlAttrType.Value; + {self.}XmlAttrType.Value := _obj.XmlAttrType.Value; end; function TblW.ReadXmlAttrW(); begin - return self.XmlAttrW.Value; + return {self.}XmlAttrW.Value; end; function TblW.WriteXmlAttrW(_value); begin - self.XmlAttrW.Value := _value; + {self.}XmlAttrW.Value := _value; end; function TblW.ReadXmlAttrType(); begin - return self.XmlAttrType.Value; + return {self.}XmlAttrType.Value; end; function TblW.WriteXmlAttrType(_value); begin - self.XmlAttrType.Value := _value; + {self.}XmlAttrType.Value := _value; end; diff --git a/autoclass/docx/Tc@DOCX.tsf b/autoclass/docx/Tc@DOCX.tsf index ccd7133..7c6eabd 100644 --- a/autoclass/docx/Tc@DOCX.tsf +++ b/autoclass/docx/Tc@DOCX.tsf @@ -28,7 +28,7 @@ end; function Tc.Create();overload; begin - self.Create(nil, "w", "tc"); + {self.}Create(nil, "w", "tc"); end; function Tc.Create(_node: XmlNode);overload; @@ -43,7 +43,7 @@ end; function Tc.Init();override; begin - self.TcPr := new TcPr(self, self.Prefix, "tcPr"); + {self.}TcPr := new TcPr(self, {self.}Prefix, "tcPr"); end; function Tc.InitAttributes();override; @@ -55,19 +55,19 @@ end; function Tc.InitChildren();override; begin child_elements_ := array( - 0: self.TcPr, + 0: {self.}TcPr, ); sorted_child_ := array( "": -1, - self.TcPr.ElementName: 0, + {self.}TcPr.ElementName: 0, ); end; function Tc.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -76,7 +76,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -85,8 +85,8 @@ begin begin obj := nil; case node_name of - pre + "p": obj := self.AppendP(); - pre + "tbl": obj := self.AppendTbl(); + pre + "p": obj := {self.}AppendP(); + pre + "tbl": obj := {self.}AppendTbl(); end; if ifObj(obj) then obj.InitNode(node); end @@ -105,7 +105,7 @@ end; function Tc.Copy(_obj: Tc);override; begin - self.TcPr.Copy(_obj.TcPr); + {self.}TcPr.Copy(_obj.TcPr); end; function Tc.AddP(): P; @@ -116,8 +116,8 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "p" then break; end - obj := new P(self, self.Prefix, "p"); - self.InsertChild(obj, i+1); + obj := new P(self, {self.}Prefix, "p"); + {self.}InsertChild(obj, i+1); return obj; end; @@ -129,21 +129,21 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "tbl" then break; end - obj := new Tbl(self, self.Prefix, "tbl"); - self.InsertChild(obj, i+1); + obj := new Tbl(self, {self.}Prefix, "tbl"); + {self.}InsertChild(obj, i+1); return obj; end; function Tc.AppendP(): P; begin - obj := new P(self, self.Prefix, "p"); + obj := new P(self, {self.}Prefix, "p"); child_elements_[length(child_elements_)] := obj; return obj; end; function Tc.AppendTbl(): Tbl; begin - obj := new Tbl(self, self.Prefix, "tbl"); + obj := new Tbl(self, {self.}Prefix, "tbl"); child_elements_[length(child_elements_)] := obj; return obj; end; diff --git a/autoclass/docx/TcPr@DOCX.tsf b/autoclass/docx/TcPr@DOCX.tsf index d3ddc87..226a582 100644 --- a/autoclass/docx/TcPr@DOCX.tsf +++ b/autoclass/docx/TcPr@DOCX.tsf @@ -23,7 +23,7 @@ end; function TcPr.Create();overload; begin - self.Create(nil, "w", "tcPr"); + {self.}Create(nil, "w", "tcPr"); end; function TcPr.Create(_node: XmlNode);overload; @@ -38,11 +38,11 @@ end; function TcPr.Init();override; begin - self.TcW := new TblW(self, self.Prefix, "tcW"); - self.GridSpan := new PureWVal(self, self.Prefix, "gridSpan"); - self.VMerge := new PureWVal(self, self.Prefix, "vMerge"); - self.VAlign := new PureWVal(self, self.Prefix, "vAlign"); - self.Shd := new Shd(self, self.Prefix, "shd"); + {self.}TcW := new TblW(self, {self.}Prefix, "tcW"); + {self.}GridSpan := new PureWVal(self, {self.}Prefix, "gridSpan"); + {self.}VMerge := new PureWVal(self, {self.}Prefix, "vMerge"); + {self.}VAlign := new PureWVal(self, {self.}Prefix, "vAlign"); + {self.}Shd := new Shd(self, {self.}Prefix, "shd"); end; function TcPr.InitAttributes();override; @@ -54,27 +54,27 @@ end; function TcPr.InitChildren();override; begin child_elements_ := array( - 0: self.TcW, - 1: self.GridSpan, - 2: self.VMerge, - 3: self.VAlign, - 4: self.Shd, + 0: {self.}TcW, + 1: {self.}GridSpan, + 2: {self.}VMerge, + 3: {self.}VAlign, + 4: {self.}Shd, ); sorted_child_ := array( "": -1, - self.TcW.ElementName: 0, - self.GridSpan.ElementName: 1, - self.VMerge.ElementName: 2, - self.VAlign.ElementName: 3, - self.Shd.ElementName: 4, + {self.}TcW.ElementName: 0, + {self.}GridSpan.ElementName: 1, + {self.}VMerge.ElementName: 2, + {self.}VAlign.ElementName: 3, + {self.}Shd.ElementName: 4, ); end; function TcPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -83,7 +83,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -110,9 +110,9 @@ end; function TcPr.Copy(_obj: TcPr);override; begin - self.TcW.Copy(_obj.TcW); - self.GridSpan.Copy(_obj.GridSpan); - self.VMerge.Copy(_obj.VMerge); - self.VAlign.Copy(_obj.VAlign); - self.Shd.Copy(_obj.Shd); + {self.}TcW.Copy(_obj.TcW); + {self.}GridSpan.Copy(_obj.GridSpan); + {self.}VMerge.Copy(_obj.VMerge); + {self.}VAlign.Copy(_obj.VAlign); + {self.}Shd.Copy(_obj.Shd); end; diff --git a/autoclass/docx/Theme@DOCX.tsf b/autoclass/docx/Theme@DOCX.tsf index 73926cd..58b4980 100644 --- a/autoclass/docx/Theme@DOCX.tsf +++ b/autoclass/docx/Theme@DOCX.tsf @@ -38,7 +38,7 @@ end; function Theme.Create();overload; begin - self.Create(nil, "a", "theme"); + {self.}Create(nil, "a", "theme"); end; function Theme.Create(_node: XmlNode);overload; @@ -53,44 +53,44 @@ end; function Theme.Init();override; begin - self.XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); - self.XmlAttrName := new OpenXmlAttribute(nil, "name", "Office 主题"); - self.ThemeElements := new ThemeElements(self, self.Prefix, "themeElements"); - self.XmlChildObjectDefaults := new OpenXmlEmpty(self, self.Prefix, "objectDefaults"); - self.XmlChildExtraClrSchemeLst := new OpenXmlEmpty(self, self.Prefix, "extraClrSchemeLst"); - self.ExtLst := new ExtLst(self, self.Prefix, "extLst"); + {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main"); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", "Office 主题"); + {self.}ThemeElements := new ThemeElements(self, {self.}Prefix, "themeElements"); + {self.}XmlChildObjectDefaults := new OpenXmlEmpty(self, {self.}Prefix, "objectDefaults"); + {self.}XmlChildExtraClrSchemeLst := new OpenXmlEmpty(self, {self.}Prefix, "extraClrSchemeLst"); + {self.}ExtLst := new ExtLst(self, {self.}Prefix, "extLst"); end; function Theme.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsA, - self.XmlAttrName, + {self.}XmlAttrXmlnsA, + {self.}XmlAttrName, ); end; function Theme.InitChildren();override; begin child_elements_ := array( - 0: self.ThemeElements, - 1: self.XmlChildObjectDefaults, - 2: self.XmlChildExtraClrSchemeLst, - 3: self.ExtLst, + 0: {self.}ThemeElements, + 1: {self.}XmlChildObjectDefaults, + 2: {self.}XmlChildExtraClrSchemeLst, + 3: {self.}ExtLst, ); sorted_child_ := array( "": -1, - self.ThemeElements.ElementName: 0, - self.XmlChildObjectDefaults.ElementName: 1, - self.XmlChildExtraClrSchemeLst.ElementName: 2, - self.ExtLst.ElementName: 3, + {self.}ThemeElements.ElementName: 0, + {self.}XmlChildObjectDefaults.ElementName: 1, + {self.}XmlChildExtraClrSchemeLst.ElementName: 2, + {self.}ExtLst.ElementName: 3, ); end; function Theme.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -99,7 +99,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -127,51 +127,51 @@ end; function Theme.Copy(_obj: Theme);override; begin if not ifnil(_obj.XmlAttrXmlnsA.Value) then - self.XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; + {self.}XmlAttrXmlnsA.Value := _obj.XmlAttrXmlnsA.Value; if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; - self.ThemeElements.Copy(_obj.ThemeElements); - self.XmlChildObjectDefaults.Copy(_obj.XmlChildObjectDefaults); - self.XmlChildExtraClrSchemeLst.Copy(_obj.XmlChildExtraClrSchemeLst); - self.ExtLst.Copy(_obj.ExtLst); + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}ThemeElements.Copy(_obj.ThemeElements); + {self.}XmlChildObjectDefaults.Copy(_obj.XmlChildObjectDefaults); + {self.}XmlChildExtraClrSchemeLst.Copy(_obj.XmlChildExtraClrSchemeLst); + {self.}ExtLst.Copy(_obj.ExtLst); end; function Theme.ReadXmlAttrXmlnsA(); begin - return self.XmlAttrXmlnsA.Value; + return {self.}XmlAttrXmlnsA.Value; end; function Theme.WriteXmlAttrXmlnsA(_value); begin - self.XmlAttrXmlnsA.Value := _value; + {self.}XmlAttrXmlnsA.Value := _value; end; function Theme.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function Theme.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; function Theme.ReadXmlChildObjectDefaults(); begin - return ifnil(self.XmlChildObjectDefaults.Value) ? false : true; + return ifnil({self.}XmlChildObjectDefaults.Value) ? false : true; end; function Theme.WriteXmlChildObjectDefaults(_value); begin - self.XmlChildObjectDefaults.Value := _value; + {self.}XmlChildObjectDefaults.Value := _value; end; function Theme.ReadXmlChildExtraClrSchemeLst(); begin - return ifnil(self.XmlChildExtraClrSchemeLst.Value) ? false : true; + return ifnil({self.}XmlChildExtraClrSchemeLst.Value) ? false : true; end; function Theme.WriteXmlChildExtraClrSchemeLst(_value); begin - self.XmlChildExtraClrSchemeLst.Value := _value; + {self.}XmlChildExtraClrSchemeLst.Value := _value; end; diff --git a/autoclass/docx/ThemeElements@DOCX.tsf b/autoclass/docx/ThemeElements@DOCX.tsf index 626b3b2..64a1fd0 100644 --- a/autoclass/docx/ThemeElements@DOCX.tsf +++ b/autoclass/docx/ThemeElements@DOCX.tsf @@ -26,7 +26,7 @@ end; function ThemeElements.Create();overload; begin - self.Create(nil, "a", "themeElements"); + {self.}Create(nil, "a", "themeElements"); end; function ThemeElements.Create(_node: XmlNode);overload; @@ -41,39 +41,39 @@ end; function ThemeElements.Init();override; begin - self.XmlAttrName := new OpenXmlAttribute(nil, "name", nil); - self.ClrScheme := new ClrScheme(self, self.Prefix, "clrScheme"); - self.FontScheme := new FontScheme(self, self.Prefix, "fontScheme"); - self.FmtScheme := new FmtScheme(self, self.Prefix, "fmtScheme"); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil); + {self.}ClrScheme := new ClrScheme(self, {self.}Prefix, "clrScheme"); + {self.}FontScheme := new FontScheme(self, {self.}Prefix, "fontScheme"); + {self.}FmtScheme := new FmtScheme(self, {self.}Prefix, "fmtScheme"); end; function ThemeElements.InitAttributes();override; begin attributes_ := array( - self.XmlAttrName, + {self.}XmlAttrName, ); end; function ThemeElements.InitChildren();override; begin child_elements_ := array( - 0: self.ClrScheme, - 1: self.FontScheme, - 2: self.FmtScheme, + 0: {self.}ClrScheme, + 1: {self.}FontScheme, + 2: {self.}FmtScheme, ); sorted_child_ := array( "": -1, - self.ClrScheme.ElementName: 0, - self.FontScheme.ElementName: 1, - self.FmtScheme.ElementName: 2, + {self.}ClrScheme.ElementName: 0, + {self.}FontScheme.ElementName: 1, + {self.}FmtScheme.ElementName: 2, ); end; function ThemeElements.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -82,7 +82,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -110,18 +110,18 @@ end; function ThemeElements.Copy(_obj: ThemeElements);override; begin if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; - self.ClrScheme.Copy(_obj.ClrScheme); - self.FontScheme.Copy(_obj.FontScheme); - self.FmtScheme.Copy(_obj.FmtScheme); + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}ClrScheme.Copy(_obj.ClrScheme); + {self.}FontScheme.Copy(_obj.FontScheme); + {self.}FmtScheme.Copy(_obj.FmtScheme); end; function ThemeElements.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function ThemeElements.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; diff --git a/autoclass/docx/ThemeFamily@DOCX.tsf b/autoclass/docx/ThemeFamily@DOCX.tsf index bc1fadc..9c7da1d 100644 --- a/autoclass/docx/ThemeFamily@DOCX.tsf +++ b/autoclass/docx/ThemeFamily@DOCX.tsf @@ -35,7 +35,7 @@ end; function ThemeFamily.Create();overload; begin - self.Create(nil, "thm15", "themeFamily"); + {self.}Create(nil, "thm15", "themeFamily"); end; function ThemeFamily.Create(_node: XmlNode);overload; @@ -50,19 +50,19 @@ end; function ThemeFamily.Init();override; begin - self.XmlAttrXmlnsThm15 := new OpenXmlAttribute("xmlns", "thm15", nil); - self.XmlAttrName := new OpenXmlAttribute(nil, "name", nil); - self.XmlAttrId := new OpenXmlAttribute(nil, "Id", nil); - self.XmlAttrVid := new OpenXmlAttribute(nil, "vid", nil); + {self.}XmlAttrXmlnsThm15 := new OpenXmlAttribute("xmlns", "thm15", nil); + {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil); + {self.}XmlAttrId := new OpenXmlAttribute(nil, "Id", nil); + {self.}XmlAttrVid := new OpenXmlAttribute(nil, "vid", nil); end; function ThemeFamily.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsThm15, - self.XmlAttrName, - self.XmlAttrId, - self.XmlAttrVid, + {self.}XmlAttrXmlnsThm15, + {self.}XmlAttrName, + {self.}XmlAttrId, + {self.}XmlAttrVid, ); end; @@ -77,59 +77,59 @@ end; function ThemeFamily.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function ThemeFamily.Copy(_obj: ThemeFamily);override; begin if not ifnil(_obj.XmlAttrXmlnsThm15.Value) then - self.XmlAttrXmlnsThm15.Value := _obj.XmlAttrXmlnsThm15.Value; + {self.}XmlAttrXmlnsThm15.Value := _obj.XmlAttrXmlnsThm15.Value; if not ifnil(_obj.XmlAttrName.Value) then - self.XmlAttrName.Value := _obj.XmlAttrName.Value; + {self.}XmlAttrName.Value := _obj.XmlAttrName.Value; if not ifnil(_obj.XmlAttrId.Value) then - self.XmlAttrId.Value := _obj.XmlAttrId.Value; + {self.}XmlAttrId.Value := _obj.XmlAttrId.Value; if not ifnil(_obj.XmlAttrVid.Value) then - self.XmlAttrVid.Value := _obj.XmlAttrVid.Value; + {self.}XmlAttrVid.Value := _obj.XmlAttrVid.Value; end; function ThemeFamily.ReadXmlAttrXmlnsThm15(); begin - return self.XmlAttrXmlnsThm15.Value; + return {self.}XmlAttrXmlnsThm15.Value; end; function ThemeFamily.WriteXmlAttrXmlnsThm15(_value); begin - self.XmlAttrXmlnsThm15.Value := _value; + {self.}XmlAttrXmlnsThm15.Value := _value; end; function ThemeFamily.ReadXmlAttrName(); begin - return self.XmlAttrName.Value; + return {self.}XmlAttrName.Value; end; function ThemeFamily.WriteXmlAttrName(_value); begin - self.XmlAttrName.Value := _value; + {self.}XmlAttrName.Value := _value; end; function ThemeFamily.ReadXmlAttrId(); begin - return self.XmlAttrId.Value; + return {self.}XmlAttrId.Value; end; function ThemeFamily.WriteXmlAttrId(_value); begin - self.XmlAttrId.Value := _value; + {self.}XmlAttrId.Value := _value; end; function ThemeFamily.ReadXmlAttrVid(); begin - return self.XmlAttrVid.Value; + return {self.}XmlAttrVid.Value; end; function ThemeFamily.WriteXmlAttrVid(_value); begin - self.XmlAttrVid.Value := _value; + {self.}XmlAttrVid.Value := _value; end; diff --git a/autoclass/docx/Title@DOCX.tsf b/autoclass/docx/Title@DOCX.tsf index ab1181e..c8570cb 100644 --- a/autoclass/docx/Title@DOCX.tsf +++ b/autoclass/docx/Title@DOCX.tsf @@ -25,7 +25,7 @@ end; function Title.Create();overload; begin - self.Create(nil, "c", "title"); + {self.}Create(nil, "c", "title"); end; function Title.Create(_node: XmlNode);overload; @@ -40,9 +40,9 @@ end; function Title.Init();override; begin - self.Tx := new Tx(self, self.Prefix, "tx"); - self.XmlChildLayout := new OpenXmlEmpty(self, self.Prefix, "layout"); - self.Overlay := new PureVal(self, self.Prefix, "overlay"); + {self.}Tx := new Tx(self, {self.}Prefix, "tx"); + {self.}XmlChildLayout := new OpenXmlEmpty(self, {self.}Prefix, "layout"); + {self.}Overlay := new PureVal(self, {self.}Prefix, "overlay"); end; function Title.InitAttributes();override; @@ -54,23 +54,23 @@ end; function Title.InitChildren();override; begin child_elements_ := array( - 0: self.Tx, - 1: self.XmlChildLayout, - 2: self.Overlay, + 0: {self.}Tx, + 1: {self.}XmlChildLayout, + 2: {self.}Overlay, ); sorted_child_ := array( "": -1, - self.Tx.ElementName: 0, - self.XmlChildLayout.ElementName: 1, - self.Overlay.ElementName: 2, + {self.}Tx.ElementName: 0, + {self.}XmlChildLayout.ElementName: 1, + {self.}Overlay.ElementName: 2, ); end; function Title.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -79,7 +79,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,17 +106,17 @@ end; function Title.Copy(_obj: Title);override; begin - self.Tx.Copy(_obj.Tx); - self.XmlChildLayout.Copy(_obj.XmlChildLayout); - self.Overlay.Copy(_obj.Overlay); + {self.}Tx.Copy(_obj.Tx); + {self.}XmlChildLayout.Copy(_obj.XmlChildLayout); + {self.}Overlay.Copy(_obj.Overlay); end; function Title.ReadXmlChildLayout(); begin - return ifnil(self.XmlChildLayout.Value) ? false : true; + return ifnil({self.}XmlChildLayout.Value) ? false : true; end; function Title.WriteXmlChildLayout(_value); begin - self.XmlChildLayout.Value := _value; + {self.}XmlChildLayout.Value := _value; end; diff --git a/autoclass/docx/Tr@DOCX.tsf b/autoclass/docx/Tr@DOCX.tsf index 56a92a0..62fb13b 100644 --- a/autoclass/docx/Tr@DOCX.tsf +++ b/autoclass/docx/Tr@DOCX.tsf @@ -41,7 +41,7 @@ end; function Tr.Create();overload; begin - self.Create(nil, "w", "tr"); + {self.}Create(nil, "w", "tr"); end; function Tr.Create(_node: XmlNode);overload; @@ -56,39 +56,39 @@ end; function Tr.Init();override; begin - self.XmlAttrWRsidR := new OpenXmlAttribute("w", "rsidR", nil); - self.XmlAttrW14ParaId := new OpenXmlAttribute("w14", "paraId", nil); - self.XmlAttrW14TextId := new OpenXmlAttribute("w14", "textId", nil); - self.XmlAttrWRsidTr := new OpenXmlAttribute("w", "rsidTr", nil); - self.TrPr := new TrPr(self, self.Prefix, "trPr"); + {self.}XmlAttrWRsidR := new OpenXmlAttribute("w", "rsidR", nil); + {self.}XmlAttrW14ParaId := new OpenXmlAttribute("w14", "paraId", nil); + {self.}XmlAttrW14TextId := new OpenXmlAttribute("w14", "textId", nil); + {self.}XmlAttrWRsidTr := new OpenXmlAttribute("w", "rsidTr", nil); + {self.}TrPr := new TrPr(self, {self.}Prefix, "trPr"); end; function Tr.InitAttributes();override; begin attributes_ := array( - self.XmlAttrWRsidR, - self.XmlAttrW14ParaId, - self.XmlAttrW14TextId, - self.XmlAttrWRsidTr, + {self.}XmlAttrWRsidR, + {self.}XmlAttrW14ParaId, + {self.}XmlAttrW14TextId, + {self.}XmlAttrWRsidTr, ); end; function Tr.InitChildren();override; begin child_elements_ := array( - 0: self.TrPr, + 0: {self.}TrPr, ); sorted_child_ := array( "": -1, - self.TrPr.ElementName: 0, + {self.}TrPr.ElementName: 0, ); end; function Tr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -97,7 +97,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,7 +106,7 @@ begin begin obj := nil; case node_name of - pre + "tc": obj := self.AppendTc(); + pre + "tc": obj := {self.}AppendTc(); end; if ifObj(obj) then obj.InitNode(node); end @@ -126,14 +126,14 @@ end; function Tr.Copy(_obj: Tr);override; begin if not ifnil(_obj.XmlAttrWRsidR.Value) then - self.XmlAttrWRsidR.Value := _obj.XmlAttrWRsidR.Value; + {self.}XmlAttrWRsidR.Value := _obj.XmlAttrWRsidR.Value; if not ifnil(_obj.XmlAttrW14ParaId.Value) then - self.XmlAttrW14ParaId.Value := _obj.XmlAttrW14ParaId.Value; + {self.}XmlAttrW14ParaId.Value := _obj.XmlAttrW14ParaId.Value; if not ifnil(_obj.XmlAttrW14TextId.Value) then - self.XmlAttrW14TextId.Value := _obj.XmlAttrW14TextId.Value; + {self.}XmlAttrW14TextId.Value := _obj.XmlAttrW14TextId.Value; if not ifnil(_obj.XmlAttrWRsidTr.Value) then - self.XmlAttrWRsidTr.Value := _obj.XmlAttrWRsidTr.Value; - self.TrPr.Copy(_obj.TrPr); + {self.}XmlAttrWRsidTr.Value := _obj.XmlAttrWRsidTr.Value; + {self.}TrPr.Copy(_obj.TrPr); end; function Tr.AddTc(): Tc; @@ -144,14 +144,14 @@ begin for i:=len-1 downto 0 do if child_elements_[i].LocalName = "tc" then break; end - obj := new Tc(self, self.Prefix, "tc"); - self.InsertChild(obj, i+1); + obj := new Tc(self, {self.}Prefix, "tc"); + {self.}InsertChild(obj, i+1); return obj; end; function Tr.AppendTc(): Tc; begin - obj := new Tc(self, self.Prefix, "tc"); + obj := new Tc(self, {self.}Prefix, "tc"); child_elements_[length(child_elements_)] := obj; return obj; end; @@ -174,40 +174,40 @@ end; function Tr.ReadXmlAttrWRsidR(); begin - return self.XmlAttrWRsidR.Value; + return {self.}XmlAttrWRsidR.Value; end; function Tr.WriteXmlAttrWRsidR(_value); begin - self.XmlAttrWRsidR.Value := _value; + {self.}XmlAttrWRsidR.Value := _value; end; function Tr.ReadXmlAttrW14ParaId(); begin - return self.XmlAttrW14ParaId.Value; + return {self.}XmlAttrW14ParaId.Value; end; function Tr.WriteXmlAttrW14ParaId(_value); begin - self.XmlAttrW14ParaId.Value := _value; + {self.}XmlAttrW14ParaId.Value := _value; end; function Tr.ReadXmlAttrW14TextId(); begin - return self.XmlAttrW14TextId.Value; + return {self.}XmlAttrW14TextId.Value; end; function Tr.WriteXmlAttrW14TextId(_value); begin - self.XmlAttrW14TextId.Value := _value; + {self.}XmlAttrW14TextId.Value := _value; end; function Tr.ReadXmlAttrWRsidTr(); begin - return self.XmlAttrWRsidTr.Value; + return {self.}XmlAttrWRsidTr.Value; end; function Tr.WriteXmlAttrWRsidTr(_value); begin - self.XmlAttrWRsidTr.Value := _value; + {self.}XmlAttrWRsidTr.Value := _value; end; diff --git a/autoclass/docx/TrHeight@DOCX.tsf b/autoclass/docx/TrHeight@DOCX.tsf index 57d8fff..132f140 100644 --- a/autoclass/docx/TrHeight@DOCX.tsf +++ b/autoclass/docx/TrHeight@DOCX.tsf @@ -23,7 +23,7 @@ end; function TrHeight.Create();overload; begin - self.Create(nil, "w", "trHeight"); + {self.}Create(nil, "w", "trHeight"); end; function TrHeight.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function TrHeight.Init();override; begin - self.XmlAttrval := new OpenXmlAttribute(self.Prefix, "val", nil); + {self.}XmlAttrval := new OpenXmlAttribute({self.}Prefix, "val", nil); end; function TrHeight.InitAttributes();override; begin attributes_ := array( - self.XmlAttrval, + {self.}XmlAttrval, ); end; @@ -59,23 +59,23 @@ end; function TrHeight.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function TrHeight.Copy(_obj: TrHeight);override; begin if not ifnil(_obj.XmlAttrval.Value) then - self.XmlAttrval.Value := _obj.XmlAttrval.Value; + {self.}XmlAttrval.Value := _obj.XmlAttrval.Value; end; function TrHeight.ReadXmlAttrval(); begin - return self.XmlAttrval.Value; + return {self.}XmlAttrval.Value; end; function TrHeight.WriteXmlAttrval(_value); begin - self.XmlAttrval.Value := _value; + {self.}XmlAttrval.Value := _value; end; diff --git a/autoclass/docx/TrPr@DOCX.tsf b/autoclass/docx/TrPr@DOCX.tsf index 6460537..9416239 100644 --- a/autoclass/docx/TrPr@DOCX.tsf +++ b/autoclass/docx/TrPr@DOCX.tsf @@ -25,7 +25,7 @@ end; function TrPr.Create();overload; begin - self.Create(nil, "w", "trPr"); + {self.}Create(nil, "w", "trPr"); end; function TrPr.Create(_node: XmlNode);overload; @@ -40,9 +40,9 @@ end; function TrPr.Init();override; begin - self.TrHeight := new TrHeight(self, self.Prefix, "trHeight"); - self.Jc := new PureWVal(self, self.Prefix, "jc"); - self.XmlChildCantSplit := new OpenXmlEmpty(self, self.Prefix, "cantSplit"); + {self.}TrHeight := new TrHeight(self, {self.}Prefix, "trHeight"); + {self.}Jc := new PureWVal(self, {self.}Prefix, "jc"); + {self.}XmlChildCantSplit := new OpenXmlEmpty(self, {self.}Prefix, "cantSplit"); end; function TrPr.InitAttributes();override; @@ -54,23 +54,23 @@ end; function TrPr.InitChildren();override; begin child_elements_ := array( - 0: self.TrHeight, - 1: self.Jc, - 2: self.XmlChildCantSplit, + 0: {self.}TrHeight, + 1: {self.}Jc, + 2: {self.}XmlChildCantSplit, ); sorted_child_ := array( "": -1, - self.TrHeight.ElementName: 0, - self.Jc.ElementName: 1, - self.XmlChildCantSplit.ElementName: 2, + {self.}TrHeight.ElementName: 0, + {self.}Jc.ElementName: 1, + {self.}XmlChildCantSplit.ElementName: 2, ); end; function TrPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -79,7 +79,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -106,17 +106,17 @@ end; function TrPr.Copy(_obj: TrPr);override; begin - self.TrHeight.Copy(_obj.TrHeight); - self.Jc.Copy(_obj.Jc); - self.XmlChildCantSplit.Copy(_obj.XmlChildCantSplit); + {self.}TrHeight.Copy(_obj.TrHeight); + {self.}Jc.Copy(_obj.Jc); + {self.}XmlChildCantSplit.Copy(_obj.XmlChildCantSplit); end; function TrPr.ReadXmlChildCantSplit(); begin - return ifnil(self.XmlChildCantSplit.Value) ? false : true; + return ifnil({self.}XmlChildCantSplit.Value) ? false : true; end; function TrPr.WriteXmlChildCantSplit(_value); begin - self.XmlChildCantSplit.Value := _value; + {self.}XmlChildCantSplit.Value := _value; end; diff --git a/autoclass/docx/Tx@DOCX.tsf b/autoclass/docx/Tx@DOCX.tsf index b29782f..e1e3e94 100644 --- a/autoclass/docx/Tx@DOCX.tsf +++ b/autoclass/docx/Tx@DOCX.tsf @@ -20,7 +20,7 @@ end; function Tx.Create();overload; begin - self.Create(nil, "c", "tx"); + {self.}Create(nil, "c", "tx"); end; function Tx.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function Tx.Init();override; begin - self.StrRef := new StrRef(self, self.Prefix, "strRef"); - self.Rich := new Rich(self, self.Prefix, "rich"); + {self.}StrRef := new StrRef(self, {self.}Prefix, "strRef"); + {self.}Rich := new Rich(self, {self.}Prefix, "rich"); end; function Tx.InitAttributes();override; @@ -48,21 +48,21 @@ end; function Tx.InitChildren();override; begin child_elements_ := array( - 0: self.StrRef, - 1: self.Rich, + 0: {self.}StrRef, + 1: {self.}Rich, ); sorted_child_ := array( "": -1, - self.StrRef.ElementName: 0, - self.Rich.ElementName: 1, + {self.}StrRef.ElementName: 0, + {self.}Rich.ElementName: 1, ); end; function Tx.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function Tx.Copy(_obj: Tx);override; begin - self.StrRef.Copy(_obj.StrRef); - self.Rich.Copy(_obj.Rich); + {self.}StrRef.Copy(_obj.StrRef); + {self.}Rich.Copy(_obj.Rich); end; diff --git a/autoclass/docx/TxPr@DOCX.tsf b/autoclass/docx/TxPr@DOCX.tsf index 7806063..ff4bce7 100644 --- a/autoclass/docx/TxPr@DOCX.tsf +++ b/autoclass/docx/TxPr@DOCX.tsf @@ -29,7 +29,7 @@ end; function TxPr.Create();overload; begin - self.Create(nil, "c", "txPr"); + {self.}Create(nil, "c", "txPr"); end; function TxPr.Create(_node: XmlNode);overload; @@ -44,8 +44,8 @@ end; function TxPr.Init();override; begin - self.BodyPr := new BodyPr(self, "a", "BodyPr"); - self.XmlChildLstStyle := new OpenXmlEmpty(self, "a", "LstStyle"); + {self.}BodyPr := new BodyPr(self, "a", "BodyPr"); + {self.}XmlChildLstStyle := new OpenXmlEmpty(self, "a", "LstStyle"); end; function TxPr.InitAttributes();override; @@ -57,21 +57,21 @@ end; function TxPr.InitChildren();override; begin child_elements_ := array( - 0: self.BodyPr, - 1: self.XmlChildLstStyle, + 0: {self.}BodyPr, + 1: {self.}XmlChildLstStyle, ); sorted_child_ := array( "": -1, - self.BodyPr.ElementName: 0, - self.XmlChildLstStyle.ElementName: 1, + {self.}BodyPr.ElementName: 0, + {self.}XmlChildLstStyle.ElementName: 1, ); end; function TxPr.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -80,7 +80,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -89,7 +89,7 @@ begin begin obj := nil; case node_name of - "a:p": obj := self.AppendP(); + "a:p": obj := {self.}AppendP(); end; if ifObj(obj) then obj.InitNode(node); end @@ -108,8 +108,8 @@ end; function TxPr.Copy(_obj: TxPr);override; begin - self.BodyPr.Copy(_obj.BodyPr); - self.XmlChildLstStyle.Copy(_obj.XmlChildLstStyle); + {self.}BodyPr.Copy(_obj.BodyPr); + {self.}XmlChildLstStyle.Copy(_obj.XmlChildLstStyle); end; function TxPr.AddP(): Ap; @@ -121,7 +121,7 @@ begin if child_elements_[i].LocalName = "p" then break; end obj := new Ap(self, "a", "p"); - self.InsertChild(obj, i+1); + {self.}InsertChild(obj, i+1); return obj; end; @@ -150,10 +150,10 @@ end; function TxPr.ReadXmlChildLstStyle(); begin - return ifnil(self.XmlChildLstStyle.Value) ? false : true; + return ifnil({self.}XmlChildLstStyle.Value) ? false : true; end; function TxPr.WriteXmlChildLstStyle(_value); begin - self.XmlChildLstStyle.Value := _value; + {self.}XmlChildLstStyle.Value := _value; end; diff --git a/autoclass/docx/Types@DOCX.tsf b/autoclass/docx/Types@DOCX.tsf index 890e3dc..dbd5a32 100644 --- a/autoclass/docx/Types@DOCX.tsf +++ b/autoclass/docx/Types@DOCX.tsf @@ -27,7 +27,7 @@ end; function Types.Create();overload; begin - self.Create(nil, nil, "Types"); + {self.}Create(nil, nil, "Types"); end; function Types.Create(_node: XmlNode);overload; @@ -62,9 +62,9 @@ end; function Types.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -73,7 +73,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -82,8 +82,8 @@ begin begin obj := nil; case node_name of - "Default": obj := self.AppendDefault(); - "Override": obj := self.AppendOverride(); + "Default": obj := {self.}AppendDefault(); + "Override": obj := {self.}AppendOverride(); end; if ifObj(obj) then obj.InitNode(node); end @@ -114,7 +114,7 @@ begin if child_elements_[i].LocalName = "Default" then break; end obj := new Default(self, nil, "Default"); - self.InsertChild(obj, i+1); + {self.}InsertChild(obj, i+1); return obj; end; @@ -127,7 +127,7 @@ begin if child_elements_[i].LocalName = "Override" then break; end obj := new _Override(self, nil, "Override"); - self.InsertChild(obj, i+1); + {self.}InsertChild(obj, i+1); return obj; end; diff --git a/autoclass/docx/Val@DOCX.tsf b/autoclass/docx/Val@DOCX.tsf index 593a53f..f848ae2 100644 --- a/autoclass/docx/Val@DOCX.tsf +++ b/autoclass/docx/Val@DOCX.tsf @@ -19,7 +19,7 @@ end; function Val.Create();overload; begin - self.Create(nil, "c", "val"); + {self.}Create(nil, "c", "val"); end; function Val.Create(_node: XmlNode);overload; @@ -34,7 +34,7 @@ end; function Val.Init();override; begin - self.NumRef := new NumRef(self, self.Prefix, "numRef"); + {self.}NumRef := new NumRef(self, {self.}Prefix, "numRef"); end; function Val.InitAttributes();override; @@ -46,19 +46,19 @@ end; function Val.InitChildren();override; begin child_elements_ := array( - 0: self.NumRef, + 0: {self.}NumRef, ); sorted_child_ := array( "": -1, - self.NumRef.ElementName: 0, + {self.}NumRef.ElementName: 0, ); end; function Val.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -67,7 +67,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -94,5 +94,5 @@ end; function Val.Copy(_obj: Val);override; begin - self.NumRef.Copy(_obj.NumRef); + {self.}NumRef.Copy(_obj.NumRef); end; diff --git a/autoclass/docx/View3D@DOCX.tsf b/autoclass/docx/View3D@DOCX.tsf index 67d5954..9e26afa 100644 --- a/autoclass/docx/View3D@DOCX.tsf +++ b/autoclass/docx/View3D@DOCX.tsf @@ -21,7 +21,7 @@ end; function View3D.Create();overload; begin - self.Create(nil, "c", "view3D"); + {self.}Create(nil, "c", "view3D"); end; function View3D.Create(_node: XmlNode);overload; @@ -36,9 +36,9 @@ end; function View3D.Init();override; begin - self.RotX := new PureVal(self, self.Prefix, "rotX"); - self.RotY := new PureVal(self, self.Prefix, "rotY"); - self.RAngAx := new PureVal(self, self.Prefix, "rAngAx"); + {self.}RotX := new PureVal(self, {self.}Prefix, "rotX"); + {self.}RotY := new PureVal(self, {self.}Prefix, "rotY"); + {self.}RAngAx := new PureVal(self, {self.}Prefix, "rAngAx"); end; function View3D.InitAttributes();override; @@ -50,23 +50,23 @@ end; function View3D.InitChildren();override; begin child_elements_ := array( - 0: self.RotX, - 1: self.RotY, - 2: self.RAngAx, + 0: {self.}RotX, + 1: {self.}RotY, + 2: {self.}RAngAx, ); sorted_child_ := array( "": -1, - self.RotX.ElementName: 0, - self.RotY.ElementName: 1, - self.RAngAx.ElementName: 2, + {self.}RotX.ElementName: 0, + {self.}RotY.ElementName: 1, + {self.}RAngAx.ElementName: 2, ); end; function View3D.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -75,7 +75,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -102,7 +102,7 @@ end; function View3D.Copy(_obj: View3D);override; begin - self.RotX.Copy(_obj.RotX); - self.RotY.Copy(_obj.RotY); - self.RAngAx.Copy(_obj.RAngAx); + {self.}RotX.Copy(_obj.RotX); + {self.}RotY.Copy(_obj.RotY); + {self.}RAngAx.Copy(_obj.RAngAx); end; diff --git a/autoclass/docx/WebSettings@DOCX.tsf b/autoclass/docx/WebSettings@DOCX.tsf index 35b7ffa..6c6e28e 100644 --- a/autoclass/docx/WebSettings@DOCX.tsf +++ b/autoclass/docx/WebSettings@DOCX.tsf @@ -76,7 +76,7 @@ end; function WebSettings.Create();overload; begin - self.Create(nil, "w", "webSettings"); + {self.}Create(nil, "w", "webSettings"); end; function WebSettings.Create(_node: XmlNode);overload; @@ -91,58 +91,58 @@ end; function WebSettings.Init();override; begin - self.XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); - self.XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); - self.XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); - self.XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); - self.XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); - self.XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); - self.XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); - self.XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); - self.XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); - self.XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); - self.XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); - self.XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); - self.XmlChildOptimizeForBrowser := new OpenXmlEmpty(self, self.Prefix, "optimizeForBrowser"); - self.XmlChildAllowPNG := new OpenXmlEmpty(self, self.Prefix, "allowPNG"); + {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil); + {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "r", nil); + {self.}XmlAttrXmlnsW := new OpenXmlAttribute("xmlns", "w", nil); + {self.}XmlAttrXmlnsW14 := new OpenXmlAttribute("xmlns", "w14", nil); + {self.}XmlAttrXmlnsW15 := new OpenXmlAttribute("xmlns", "w15", nil); + {self.}XmlAttrXmlnsW16Cex := new OpenXmlAttribute("xmlns", "w16cex", nil); + {self.}XmlAttrXmlnsW16Cid := new OpenXmlAttribute("xmlns", "w16cid", nil); + {self.}XmlAttrXmlnsW16 := new OpenXmlAttribute("xmlns", "w16", nil); + {self.}XmlAttrXmlnsW16Du := new OpenXmlAttribute("xmlns", "w16du", nil); + {self.}XmlAttrXmlnsW16sdtdh := new OpenXmlAttribute("xmlns", "w16sdtdh", nil); + {self.}XmlAttrXmlnsW16se := new OpenXmlAttribute("xmlns", "w16se", nil); + {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + {self.}XmlChildOptimizeForBrowser := new OpenXmlEmpty(self, {self.}Prefix, "optimizeForBrowser"); + {self.}XmlChildAllowPNG := new OpenXmlEmpty(self, {self.}Prefix, "allowPNG"); end; function WebSettings.InitAttributes();override; begin attributes_ := array( - self.XmlAttrXmlnsMc, - self.XmlAttrXmlnsR, - self.XmlAttrXmlnsW, - self.XmlAttrXmlnsW14, - self.XmlAttrXmlnsW15, - self.XmlAttrXmlnsW16Cex, - self.XmlAttrXmlnsW16Cid, - self.XmlAttrXmlnsW16, - self.XmlAttrXmlnsW16Du, - self.XmlAttrXmlnsW16sdtdh, - self.XmlAttrXmlnsW16se, - self.XmlAttrMcIgnorable, + {self.}XmlAttrXmlnsMc, + {self.}XmlAttrXmlnsR, + {self.}XmlAttrXmlnsW, + {self.}XmlAttrXmlnsW14, + {self.}XmlAttrXmlnsW15, + {self.}XmlAttrXmlnsW16Cex, + {self.}XmlAttrXmlnsW16Cid, + {self.}XmlAttrXmlnsW16, + {self.}XmlAttrXmlnsW16Du, + {self.}XmlAttrXmlnsW16sdtdh, + {self.}XmlAttrXmlnsW16se, + {self.}XmlAttrMcIgnorable, ); end; function WebSettings.InitChildren();override; begin child_elements_ := array( - 0: self.XmlChildOptimizeForBrowser, - 1: self.XmlChildAllowPNG, + 0: {self.}XmlChildOptimizeForBrowser, + 1: {self.}XmlChildAllowPNG, ); sorted_child_ := array( "": -1, - self.XmlChildOptimizeForBrowser.ElementName: 0, - self.XmlChildAllowPNG.ElementName: 1, + {self.}XmlChildOptimizeForBrowser.ElementName: 0, + {self.}XmlChildAllowPNG.ElementName: 1, ); end; function WebSettings.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -151,7 +151,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -179,169 +179,169 @@ end; function WebSettings.Copy(_obj: WebSettings);override; begin if not ifnil(_obj.XmlAttrXmlnsMc.Value) then - self.XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; + {self.}XmlAttrXmlnsMc.Value := _obj.XmlAttrXmlnsMc.Value; if not ifnil(_obj.XmlAttrXmlnsR.Value) then - self.XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; + {self.}XmlAttrXmlnsR.Value := _obj.XmlAttrXmlnsR.Value; if not ifnil(_obj.XmlAttrXmlnsW.Value) then - self.XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; + {self.}XmlAttrXmlnsW.Value := _obj.XmlAttrXmlnsW.Value; if not ifnil(_obj.XmlAttrXmlnsW14.Value) then - self.XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; + {self.}XmlAttrXmlnsW14.Value := _obj.XmlAttrXmlnsW14.Value; if not ifnil(_obj.XmlAttrXmlnsW15.Value) then - self.XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; + {self.}XmlAttrXmlnsW15.Value := _obj.XmlAttrXmlnsW15.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cex.Value) then - self.XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; + {self.}XmlAttrXmlnsW16Cex.Value := _obj.XmlAttrXmlnsW16Cex.Value; if not ifnil(_obj.XmlAttrXmlnsW16Cid.Value) then - self.XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; + {self.}XmlAttrXmlnsW16Cid.Value := _obj.XmlAttrXmlnsW16Cid.Value; if not ifnil(_obj.XmlAttrXmlnsW16.Value) then - self.XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; + {self.}XmlAttrXmlnsW16.Value := _obj.XmlAttrXmlnsW16.Value; if not ifnil(_obj.XmlAttrXmlnsW16Du.Value) then - self.XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; + {self.}XmlAttrXmlnsW16Du.Value := _obj.XmlAttrXmlnsW16Du.Value; if not ifnil(_obj.XmlAttrXmlnsW16sdtdh.Value) then - self.XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _obj.XmlAttrXmlnsW16sdtdh.Value; if not ifnil(_obj.XmlAttrXmlnsW16se.Value) then - self.XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; + {self.}XmlAttrXmlnsW16se.Value := _obj.XmlAttrXmlnsW16se.Value; if not ifnil(_obj.XmlAttrMcIgnorable.Value) then - self.XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; - self.XmlChildOptimizeForBrowser.Copy(_obj.XmlChildOptimizeForBrowser); - self.XmlChildAllowPNG.Copy(_obj.XmlChildAllowPNG); + {self.}XmlAttrMcIgnorable.Value := _obj.XmlAttrMcIgnorable.Value; + {self.}XmlChildOptimizeForBrowser.Copy(_obj.XmlChildOptimizeForBrowser); + {self.}XmlChildAllowPNG.Copy(_obj.XmlChildAllowPNG); end; function WebSettings.ReadXmlAttrXmlnsMc(); begin - return self.XmlAttrXmlnsMc.Value; + return {self.}XmlAttrXmlnsMc.Value; end; function WebSettings.WriteXmlAttrXmlnsMc(_value); begin - self.XmlAttrXmlnsMc.Value := _value; + {self.}XmlAttrXmlnsMc.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsR(); begin - return self.XmlAttrXmlnsR.Value; + return {self.}XmlAttrXmlnsR.Value; end; function WebSettings.WriteXmlAttrXmlnsR(_value); begin - self.XmlAttrXmlnsR.Value := _value; + {self.}XmlAttrXmlnsR.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW(); begin - return self.XmlAttrXmlnsW.Value; + return {self.}XmlAttrXmlnsW.Value; end; function WebSettings.WriteXmlAttrXmlnsW(_value); begin - self.XmlAttrXmlnsW.Value := _value; + {self.}XmlAttrXmlnsW.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW14(); begin - return self.XmlAttrXmlnsW14.Value; + return {self.}XmlAttrXmlnsW14.Value; end; function WebSettings.WriteXmlAttrXmlnsW14(_value); begin - self.XmlAttrXmlnsW14.Value := _value; + {self.}XmlAttrXmlnsW14.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW15(); begin - return self.XmlAttrXmlnsW15.Value; + return {self.}XmlAttrXmlnsW15.Value; end; function WebSettings.WriteXmlAttrXmlnsW15(_value); begin - self.XmlAttrXmlnsW15.Value := _value; + {self.}XmlAttrXmlnsW15.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW16Cex(); begin - return self.XmlAttrXmlnsW16Cex.Value; + return {self.}XmlAttrXmlnsW16Cex.Value; end; function WebSettings.WriteXmlAttrXmlnsW16Cex(_value); begin - self.XmlAttrXmlnsW16Cex.Value := _value; + {self.}XmlAttrXmlnsW16Cex.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW16Cid(); begin - return self.XmlAttrXmlnsW16Cid.Value; + return {self.}XmlAttrXmlnsW16Cid.Value; end; function WebSettings.WriteXmlAttrXmlnsW16Cid(_value); begin - self.XmlAttrXmlnsW16Cid.Value := _value; + {self.}XmlAttrXmlnsW16Cid.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW16(); begin - return self.XmlAttrXmlnsW16.Value; + return {self.}XmlAttrXmlnsW16.Value; end; function WebSettings.WriteXmlAttrXmlnsW16(_value); begin - self.XmlAttrXmlnsW16.Value := _value; + {self.}XmlAttrXmlnsW16.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW16Du(); begin - return self.XmlAttrXmlnsW16Du.Value; + return {self.}XmlAttrXmlnsW16Du.Value; end; function WebSettings.WriteXmlAttrXmlnsW16Du(_value); begin - self.XmlAttrXmlnsW16Du.Value := _value; + {self.}XmlAttrXmlnsW16Du.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW16sdtdh(); begin - return self.XmlAttrXmlnsW16sdtdh.Value; + return {self.}XmlAttrXmlnsW16sdtdh.Value; end; function WebSettings.WriteXmlAttrXmlnsW16sdtdh(_value); begin - self.XmlAttrXmlnsW16sdtdh.Value := _value; + {self.}XmlAttrXmlnsW16sdtdh.Value := _value; end; function WebSettings.ReadXmlAttrXmlnsW16se(); begin - return self.XmlAttrXmlnsW16se.Value; + return {self.}XmlAttrXmlnsW16se.Value; end; function WebSettings.WriteXmlAttrXmlnsW16se(_value); begin - self.XmlAttrXmlnsW16se.Value := _value; + {self.}XmlAttrXmlnsW16se.Value := _value; end; function WebSettings.ReadXmlAttrMcIgnorable(); begin - return self.XmlAttrMcIgnorable.Value; + return {self.}XmlAttrMcIgnorable.Value; end; function WebSettings.WriteXmlAttrMcIgnorable(_value); begin - self.XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrMcIgnorable.Value := _value; end; function WebSettings.ReadXmlChildOptimizeForBrowser(); begin - return ifnil(self.XmlChildOptimizeForBrowser.Value) ? false : true; + return ifnil({self.}XmlChildOptimizeForBrowser.Value) ? false : true; end; function WebSettings.WriteXmlChildOptimizeForBrowser(_value); begin - self.XmlChildOptimizeForBrowser.Value := _value; + {self.}XmlChildOptimizeForBrowser.Value := _value; end; function WebSettings.ReadXmlChildAllowPNG(); begin - return ifnil(self.XmlChildAllowPNG.Value) ? false : true; + return ifnil({self.}XmlChildAllowPNG.Value) ? false : true; end; function WebSettings.WriteXmlChildAllowPNG(_value); begin - self.XmlChildAllowPNG.Value := _value; + {self.}XmlChildAllowPNG.Value := _value; end; diff --git a/autoclass/docx/XY@DOCX.tsf b/autoclass/docx/XY@DOCX.tsf index 7b03395..4e86c9c 100644 --- a/autoclass/docx/XY@DOCX.tsf +++ b/autoclass/docx/XY@DOCX.tsf @@ -27,7 +27,7 @@ end; function XY.Create();overload; begin - self.Create(nil, nil, ""); + {self.}Create(nil, nil, ""); end; function XY.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function XY.Init();override; begin - self.XmlAttrX := new OpenXmlAttribute(nil, "x", nil); - self.XmlAttrY := new OpenXmlAttribute(nil, "y", nil); + {self.}XmlAttrX := new OpenXmlAttribute(nil, "x", nil); + {self.}XmlAttrY := new OpenXmlAttribute(nil, "y", nil); end; function XY.InitAttributes();override; begin attributes_ := array( - self.XmlAttrX, - self.XmlAttrY, + {self.}XmlAttrX, + {self.}XmlAttrY, ); end; @@ -65,35 +65,35 @@ end; function XY.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function XY.Copy(_obj: XY);override; begin if not ifnil(_obj.XmlAttrX.Value) then - self.XmlAttrX.Value := _obj.XmlAttrX.Value; + {self.}XmlAttrX.Value := _obj.XmlAttrX.Value; if not ifnil(_obj.XmlAttrY.Value) then - self.XmlAttrY.Value := _obj.XmlAttrY.Value; + {self.}XmlAttrY.Value := _obj.XmlAttrY.Value; end; function XY.ReadXmlAttrX(); begin - return self.XmlAttrX.Value; + return {self.}XmlAttrX.Value; end; function XY.WriteXmlAttrX(_value); begin - self.XmlAttrX.Value := _value; + {self.}XmlAttrX.Value := _value; end; function XY.ReadXmlAttrY(); begin - return self.XmlAttrY.Value; + return {self.}XmlAttrY.Value; end; function XY.WriteXmlAttrY(_value); begin - self.XmlAttrY.Value := _value; + {self.}XmlAttrY.Value := _value; end; diff --git a/autoclass/docx/Xfrm@DOCX.tsf b/autoclass/docx/Xfrm@DOCX.tsf index f4b6445..999d6fe 100644 --- a/autoclass/docx/Xfrm@DOCX.tsf +++ b/autoclass/docx/Xfrm@DOCX.tsf @@ -20,7 +20,7 @@ end; function Xfrm.Create();overload; begin - self.Create(nil, "a", "xfrm"); + {self.}Create(nil, "a", "xfrm"); end; function Xfrm.Create(_node: XmlNode);overload; @@ -35,8 +35,8 @@ end; function Xfrm.Init();override; begin - self.Off := new XY(self, self.Prefix, "off"); - self.Ext := new CXY(self, self.Prefix, "ext"); + {self.}Off := new XY(self, {self.}Prefix, "off"); + {self.}Ext := new CXY(self, {self.}Prefix, "ext"); end; function Xfrm.InitAttributes();override; @@ -48,21 +48,21 @@ end; function Xfrm.InitChildren();override; begin child_elements_ := array( - 0: self.Off, - 1: self.Ext, + 0: {self.}Off, + 1: {self.}Ext, ); sorted_child_ := array( "": -1, - self.Off.ElementName: 0, - self.Ext.ElementName: 1, + {self.}Off.ElementName: 0, + {self.}Ext.ElementName: 1, ); end; function Xfrm.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -71,7 +71,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -98,6 +98,6 @@ end; function Xfrm.Copy(_obj: Xfrm);override; begin - self.Off.Copy(_obj.Off); - self.Ext.Copy(_obj.Ext); + {self.}Off.Copy(_obj.Off); + {self.}Ext.Copy(_obj.Ext); end; diff --git a/autoclass/docx/Zoom@DOCX.tsf b/autoclass/docx/Zoom@DOCX.tsf index d4c841b..097da3b 100644 --- a/autoclass/docx/Zoom@DOCX.tsf +++ b/autoclass/docx/Zoom@DOCX.tsf @@ -23,7 +23,7 @@ end; function Zoom.Create();overload; begin - self.Create(nil, "w", "zoom"); + {self.}Create(nil, "w", "zoom"); end; function Zoom.Create(_node: XmlNode);overload; @@ -38,13 +38,13 @@ end; function Zoom.Init();override; begin - self.XmlAttrPercent := new OpenXmlAttribute(self.Prefix, "percent", nil); + {self.}XmlAttrPercent := new OpenXmlAttribute({self.}Prefix, "percent", nil); end; function Zoom.InitAttributes();override; begin attributes_ := array( - self.XmlAttrPercent, + {self.}XmlAttrPercent, ); end; @@ -59,23 +59,23 @@ end; function Zoom.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function Zoom.Copy(_obj: Zoom);override; begin if not ifnil(_obj.XmlAttrPercent.Value) then - self.XmlAttrPercent.Value := _obj.XmlAttrPercent.Value; + {self.}XmlAttrPercent.Value := _obj.XmlAttrPercent.Value; end; function Zoom.ReadXmlAttrPercent(); begin - return self.XmlAttrPercent.Value; + return {self.}XmlAttrPercent.Value; end; function Zoom.WriteXmlAttrPercent(_value); begin - self.XmlAttrPercent.Value := _value; + {self.}XmlAttrPercent.Value := _value; end; diff --git a/autoclass/docx/_Inline@DOCX.tsf b/autoclass/docx/_Inline@DOCX.tsf index f2a97d0..433d6ce 100644 --- a/autoclass/docx/_Inline@DOCX.tsf +++ b/autoclass/docx/_Inline@DOCX.tsf @@ -48,7 +48,7 @@ end; function _Inline.Create();overload; begin - self.Create(nil, "wp", "inline"); + {self.}Create(nil, "wp", "inline"); end; function _Inline.Create(_node: XmlNode);overload; @@ -63,55 +63,55 @@ end; function _Inline.Init();override; begin - self.XmlAttrDistT := new OpenXmlAttribute(nil, "distT", nil); - self.XmlAttrDistB := new OpenXmlAttribute(nil, "distB", nil); - self.XmlAttrDistL := new OpenXmlAttribute(nil, "distL", nil); - self.XmlAttrDistR := new OpenXmlAttribute(nil, "distR", nil); - self.XmlAttrAnchorId := new OpenXmlAttribute("wp14", "anchorId", nil); - self.XmlAttrEditId := new OpenXmlAttribute("wp14", "editId", nil); - self.Extent := new CXY(self, self.Prefix, "extent"); - self.EffectExtent := new EffectExtent(self, self.Prefix, "effectExtent"); - self.DocPr := new DocPr(self, self.Prefix, "docPr"); - self.CNvGraphicFramePr := new CNvGraphicFramePr(self, self.Prefix, "cNvGraphicFramePr"); - self.Graphic := new Graphic(self, "a", "graphic"); + {self.}XmlAttrDistT := new OpenXmlAttribute(nil, "distT", nil); + {self.}XmlAttrDistB := new OpenXmlAttribute(nil, "distB", nil); + {self.}XmlAttrDistL := new OpenXmlAttribute(nil, "distL", nil); + {self.}XmlAttrDistR := new OpenXmlAttribute(nil, "distR", nil); + {self.}XmlAttrAnchorId := new OpenXmlAttribute("wp14", "anchorId", nil); + {self.}XmlAttrEditId := new OpenXmlAttribute("wp14", "editId", nil); + {self.}Extent := new CXY(self, {self.}Prefix, "extent"); + {self.}EffectExtent := new EffectExtent(self, {self.}Prefix, "effectExtent"); + {self.}DocPr := new DocPr(self, {self.}Prefix, "docPr"); + {self.}CNvGraphicFramePr := new CNvGraphicFramePr(self, {self.}Prefix, "cNvGraphicFramePr"); + {self.}Graphic := new Graphic(self, "a", "graphic"); end; function _Inline.InitAttributes();override; begin attributes_ := array( - self.XmlAttrDistT, - self.XmlAttrDistB, - self.XmlAttrDistL, - self.XmlAttrDistR, - self.XmlAttrAnchorId, - self.XmlAttrEditId, + {self.}XmlAttrDistT, + {self.}XmlAttrDistB, + {self.}XmlAttrDistL, + {self.}XmlAttrDistR, + {self.}XmlAttrAnchorId, + {self.}XmlAttrEditId, ); end; function _Inline.InitChildren();override; begin child_elements_ := array( - 0: self.Extent, - 1: self.EffectExtent, - 2: self.DocPr, - 3: self.CNvGraphicFramePr, - 4: self.Graphic, + 0: {self.}Extent, + 1: {self.}EffectExtent, + 2: {self.}DocPr, + 3: {self.}CNvGraphicFramePr, + 4: {self.}Graphic, ); sorted_child_ := array( "": -1, - self.Extent.ElementName: 0, - self.EffectExtent.ElementName: 1, - self.DocPr.ElementName: 2, - self.CNvGraphicFramePr.ElementName: 3, - self.Graphic.ElementName: 4, + {self.}Extent.ElementName: 0, + {self.}EffectExtent.ElementName: 1, + {self.}DocPr.ElementName: 2, + {self.}CNvGraphicFramePr.ElementName: 3, + {self.}Graphic.ElementName: 4, ); end; function _Inline.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; node := ifObj(_node) ? _node.FirstChild() : nil; flag := false; if ifnil(child_elements_[0]) and length(child_elements_) > 0 then @@ -120,7 +120,7 @@ begin arr := child_elements_; child_elements_ := array(); end - pre := ifString(self.Prefix) ? self.Prefix + ":" : ""; + pre := ifString({self.}Prefix) ? {self.}Prefix + ":" : ""; while ifObj(node) do begin node_name := node.GetName(); @@ -148,80 +148,80 @@ end; function _Inline.Copy(_obj: _Inline);override; begin if not ifnil(_obj.XmlAttrDistT.Value) then - self.XmlAttrDistT.Value := _obj.XmlAttrDistT.Value; + {self.}XmlAttrDistT.Value := _obj.XmlAttrDistT.Value; if not ifnil(_obj.XmlAttrDistB.Value) then - self.XmlAttrDistB.Value := _obj.XmlAttrDistB.Value; + {self.}XmlAttrDistB.Value := _obj.XmlAttrDistB.Value; if not ifnil(_obj.XmlAttrDistL.Value) then - self.XmlAttrDistL.Value := _obj.XmlAttrDistL.Value; + {self.}XmlAttrDistL.Value := _obj.XmlAttrDistL.Value; if not ifnil(_obj.XmlAttrDistR.Value) then - self.XmlAttrDistR.Value := _obj.XmlAttrDistR.Value; + {self.}XmlAttrDistR.Value := _obj.XmlAttrDistR.Value; if not ifnil(_obj.XmlAttrAnchorId.Value) then - self.XmlAttrAnchorId.Value := _obj.XmlAttrAnchorId.Value; + {self.}XmlAttrAnchorId.Value := _obj.XmlAttrAnchorId.Value; if not ifnil(_obj.XmlAttrEditId.Value) then - self.XmlAttrEditId.Value := _obj.XmlAttrEditId.Value; - self.Extent.Copy(_obj.Extent); - self.EffectExtent.Copy(_obj.EffectExtent); - self.DocPr.Copy(_obj.DocPr); - self.CNvGraphicFramePr.Copy(_obj.CNvGraphicFramePr); - self.Graphic.Copy(_obj.Graphic); + {self.}XmlAttrEditId.Value := _obj.XmlAttrEditId.Value; + {self.}Extent.Copy(_obj.Extent); + {self.}EffectExtent.Copy(_obj.EffectExtent); + {self.}DocPr.Copy(_obj.DocPr); + {self.}CNvGraphicFramePr.Copy(_obj.CNvGraphicFramePr); + {self.}Graphic.Copy(_obj.Graphic); end; function _Inline.ReadXmlAttrDistT(); begin - return self.XmlAttrDistT.Value; + return {self.}XmlAttrDistT.Value; end; function _Inline.WriteXmlAttrDistT(_value); begin - self.XmlAttrDistT.Value := _value; + {self.}XmlAttrDistT.Value := _value; end; function _Inline.ReadXmlAttrDistB(); begin - return self.XmlAttrDistB.Value; + return {self.}XmlAttrDistB.Value; end; function _Inline.WriteXmlAttrDistB(_value); begin - self.XmlAttrDistB.Value := _value; + {self.}XmlAttrDistB.Value := _value; end; function _Inline.ReadXmlAttrDistL(); begin - return self.XmlAttrDistL.Value; + return {self.}XmlAttrDistL.Value; end; function _Inline.WriteXmlAttrDistL(_value); begin - self.XmlAttrDistL.Value := _value; + {self.}XmlAttrDistL.Value := _value; end; function _Inline.ReadXmlAttrDistR(); begin - return self.XmlAttrDistR.Value; + return {self.}XmlAttrDistR.Value; end; function _Inline.WriteXmlAttrDistR(_value); begin - self.XmlAttrDistR.Value := _value; + {self.}XmlAttrDistR.Value := _value; end; function _Inline.ReadXmlAttrAnchorId(); begin - return self.XmlAttrAnchorId.Value; + return {self.}XmlAttrAnchorId.Value; end; function _Inline.WriteXmlAttrAnchorId(_value); begin - self.XmlAttrAnchorId.Value := _value; + {self.}XmlAttrAnchorId.Value := _value; end; function _Inline.ReadXmlAttrEditId(); begin - return self.XmlAttrEditId.Value; + return {self.}XmlAttrEditId.Value; end; function _Inline.WriteXmlAttrEditId(_value); begin - self.XmlAttrEditId.Value := _value; + {self.}XmlAttrEditId.Value := _value; end; diff --git a/autoclass/docx/_Override@DOCX.tsf b/autoclass/docx/_Override@DOCX.tsf index 751eecd..8107dbb 100644 --- a/autoclass/docx/_Override@DOCX.tsf +++ b/autoclass/docx/_Override@DOCX.tsf @@ -27,7 +27,7 @@ end; function _Override.Create();overload; begin - self.Create(nil, nil, "Override"); + {self.}Create(nil, nil, "Override"); end; function _Override.Create(_node: XmlNode);overload; @@ -42,15 +42,15 @@ end; function _Override.Init();override; begin - self.XmlAttrPartName := new OpenXmlAttribute(nil, "PartName", nil); - self.XmlAttrContentType := new OpenXmlAttribute(nil, "ContentType", nil); + {self.}XmlAttrPartName := new OpenXmlAttribute(nil, "PartName", nil); + {self.}XmlAttrContentType := new OpenXmlAttribute(nil, "ContentType", nil); end; function _Override.InitAttributes();override; begin attributes_ := array( - self.XmlAttrPartName, - self.XmlAttrContentType, + {self.}XmlAttrPartName, + {self.}XmlAttrContentType, ); end; @@ -65,35 +65,35 @@ end; function _Override.InitNode(_node: XmlNode);override; begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then for k,v in child_elements_ do v.InitNode(nil); - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function _Override.Copy(_obj: _Override);override; begin if not ifnil(_obj.XmlAttrPartName.Value) then - self.XmlAttrPartName.Value := _obj.XmlAttrPartName.Value; + {self.}XmlAttrPartName.Value := _obj.XmlAttrPartName.Value; if not ifnil(_obj.XmlAttrContentType.Value) then - self.XmlAttrContentType.Value := _obj.XmlAttrContentType.Value; + {self.}XmlAttrContentType.Value := _obj.XmlAttrContentType.Value; end; function _Override.ReadXmlAttrPartName(); begin - return self.XmlAttrPartName.Value; + return {self.}XmlAttrPartName.Value; end; function _Override.WriteXmlAttrPartName(_value); begin - self.XmlAttrPartName.Value := _value; + {self.}XmlAttrPartName.Value := _value; end; function _Override.ReadXmlAttrContentType(); begin - return self.XmlAttrContentType.Value; + return {self.}XmlAttrContentType.Value; end; function _Override.WriteXmlAttrContentType(_value); begin - self.XmlAttrContentType.Value := _value; + {self.}XmlAttrContentType.Value := _value; end; diff --git a/openxml/OpenXmlAttribute.tsf b/openxml/OpenXmlAttribute.tsf index 7366af5..7c86233 100644 --- a/openxml/OpenXmlAttribute.tsf +++ b/openxml/OpenXmlAttribute.tsf @@ -5,21 +5,21 @@ public public LocalName: string; - Prefix: tslobj; + Prefix: string; ElementName: string; Value: any; end; function OpenXmlAttribute.Create(_prefix: string; _local_name: string);overload; begin - self.Create(_prefix, _local_name, nil); + {self.}Create(_prefix, _local_name, nil); end; function OpenXmlAttribute.Create(_prefix: string; _local_name: string; _value: any);overload; begin - self.Prefix := _prefix; - self.LocalName := _local_name; - self.Value := _value; - self.ElementName := ifString(self.Prefix) and self.Prefix <> "" ? format("%s:%s", self.Prefix, self.LocalName) : self.LocalName; + {self.}Prefix := _prefix; + {self.}LocalName := _local_name; + {self.}Value := _value; + {self.}ElementName := ifString({self.}Prefix) and {self.}Prefix <> "" ? format("%s:%s", {self.}Prefix, {self.}LocalName) : {self.}LocalName; end; diff --git a/openxml/OpenXmlElement.tsf b/openxml/OpenXmlElement.tsf index ceac7fe..f0ba3d3 100644 --- a/openxml/OpenXmlElement.tsf +++ b/openxml/OpenXmlElement.tsf @@ -36,7 +36,7 @@ public ElementName: string; protected - attributes_: tableArray; // 属性 + attributes_: array of OpenXmlAttribute; // 属性 child_elements_: array of tslobj; // 子节点元素 sorted_child_: tableArray; end; @@ -45,26 +45,26 @@ function OpenXmlElement.Create(_node: XmlNode);overload; begin node_name := _node.GetName(); pos := Pos(":", node_name); - if pos then self.Create(nil, node_name[:pos-1], node_name[pos+1:]); - else self.Create(nil, nil, node_name); - self.InitNode(_node); + if pos then {self.}Create(nil, node_name[:pos-1], node_name[pos+1:]); + else {self.}Create(nil, nil, node_name); + {self.}InitNode(_node); end; function OpenXmlElement.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; begin - self.Parent := _parent; - self.Prefix := _prefix; - self.LocalName := _local_name; - self.XmlNode := nil; - self.ElementName := ifString(self.Prefix) and self.Prefix <> "" ? format("%s:%s", self.Prefix, self.LocalName) : self.LocalName; - self.Init(); - self.InitAttributes(); - self.InitChildren(); + {self.}Parent := _parent; + {self.}Prefix := _prefix; + {self.}LocalName := _local_name; + {self.}XmlNode := nil; + {self.}ElementName := ifString({self.}Prefix) and {self.}Prefix <> "" ? format("%s:%s", {self.}Prefix, {self.}LocalName) : {self.}LocalName; + {self.}Init(); + {self.}InitAttributes(); + {self.}InitChildren(); end; function OpenXmlElement.GetOrCreateNode(_obj: tslobj); begin - if not ifObj(self.XmlNode) then self.XmlNode := Self.Parent.GetOrCreateNode(self); + if not ifObj({self.}XmlNode) then {self.}XmlNode := {self.}Parent.GetOrCreateNode(self); nearest_node := nil; for k, v in child_elements_ do begin @@ -72,8 +72,8 @@ begin if v = _obj then begin if ifObj(v.XmlNode) then return v.XmlNode; - if ifnil(nearest_node) then return self.XmlNode.InsertFirstChild("element", _obj.ElementName); - else return self.XmlNode.InsertAfterChild(nearest_node, "element", _obj.ElementName); + if ifnil(nearest_node) then return {self.}XmlNode.InsertFirstChild("element", _obj.ElementName); + else return {self.}XmlNode.InsertAfterChild(nearest_node, "element", _obj.ElementName); end end raise "No child."; @@ -81,16 +81,16 @@ end; function OpenXmlElement.GetNode(): XmlNode; begin - if not ifObj(self.XmlNode) then self.XmlNode := self.Parent.GetOrCreateNode(self); - return self.XmlNode; + if not ifObj({self.}XmlNode) then {self.}XmlNode := {self.}Parent.GetOrCreateNode(self); + return {self.}XmlNode; end; function OpenXmlElement.Deserialize(); begin - if not ifObj(self.XmlNode) then return nil; + if not ifObj({self.}XmlNode) then return nil; for k, v in attributes_ do begin - attr := self.XmlNode.GetAttribute(v.ElementName); + attr := {self.}XmlNode.GetAttribute(v.ElementName); v.Value := attr = "" ? nil : attr; end for k, v in child_elements_ do @@ -101,7 +101,7 @@ function OpenXmlElement.Serialize(); begin // Attributes for k, v in attributes_ do - if not ifnil(v.Value) then self.GetNode().SetAttribute(v.ElementName, v.Value); + if not ifnil(v.Value) then {self.}GetNode().SetAttribute(v.ElementName, v.Value); // Children for k, v in child_elements_ do if ifObj(v) then v.Serialize(); @@ -132,7 +132,7 @@ begin end end - tmp_arr := array("type": "element", "name": self.ElementName, "children": child_arr, "attributes": array()); + tmp_arr := array("type": "element", "name": {self.}ElementName, "children": child_arr, "attributes": array()); for k,v in attributes_ do begin if not ifnil(v.Value) then tmp_arr["attributes"][v.ElementName] := v.Value; @@ -142,7 +142,7 @@ end; function OpenXmlElement.Append(_obj: tslobj): boolean; // OpenXmlElement or OpenXmlPcdata begin - if not self.IsValidChild(_obj) then return false; + if not {self.}IsValidChild(_obj) then return false; _obj.Parent := self; child_elements_[length(child_elements_)] := _obj; // _obj := nil; @@ -151,26 +151,26 @@ end; function OpenXmlElement.InsertAfter(_pos_obj: tslobj; _obj: tslobj): boolean; begin - if not self.IsValidChild(_pos_obj) or not self.IsValidChild(_obj) then return false; - find_pos := self.FindChild(_pos_obj); + if not {self.}IsValidChild(_pos_obj) or not {self.}IsValidChild(_obj) then return false; + find_pos := {self.}FindChild(_pos_obj); if find_pos = -1 then return false; - self.InsertChild(_obj, find_pos); + {self.}InsertChild(_obj, find_pos); return true; end; function OpenXmlElement.InsertBefore(_pos_obj: tslobj; _obj: tslobj): boolean; begin - if not self.IsValidChild(_pos_obj) or not self.IsValidChild(_obj) then return false; - find_pos := self.FindChild(_pos_obj); + if not {self.}IsValidChild(_pos_obj) or not {self.}IsValidChild(_obj) then return false; + find_pos := {self.}FindChild(_pos_obj); if find_pos = -1 then return false; - self.InsertChild(_obj, find_pos-1); + {self.}InsertChild(_obj, find_pos-1); return true; end; function OpenXmlElement.Prepend(_obj: tslobj): boolean; begin - if not self.IsValidChild(_pos_obj) or not self.IsValidChild(_obj) then return false; - self.InsertChild(_obj, 0); + if not {self.}IsValidChild(_pos_obj) or not {self.}IsValidChild(_obj) then return false; + {self.}InsertChild(_obj, 0); return true; end; @@ -178,20 +178,20 @@ function OpenXmlElement.Remove(_obj: tslobj): boolean; begin if ifnil(_obj)then // 删除所有 begin - if not ifObj(self.XmlNode) or not ifObj(self.Parent) or not ifObj(self.PartName.XmlNode) then return false; - self.Parent.XmlNode.DeleteChild(self.XmlNode); + if not ifObj({self.}XmlNode) or not ifObj({self.}Parent) or not ifObj({self.}PartName.XmlNode) then return false; + {self.}Parent.XmlNode.DeleteChild({self.}XmlNode); return true; end - else if self.IsValidChild(_obj) then + else if {self.}IsValidChild(_obj) then begin - if not ifObj(_obj.XmlNode) or not ifObj(self.XmlNode) then return false; - self.XmlNode.DeleteChild(_obj.XmlNode); + if not ifObj(_obj.XmlNode) or not ifObj({self.}XmlNode) then return false; + {self.}XmlNode.DeleteChild(_obj.XmlNode); return true; end else if _obj is Class(OpenXmlAttribute) then begin - if not ifObj(self.XmlNode) then return false; - self.XmlNode.DeleteAttribute(_obj.ElementName); + if not ifObj({self.}XmlNode) then return false; + {self.}XmlNode.DeleteAttribute(_obj.ElementName); return false; end end; diff --git a/openxml/OpenXmlEmpty.tsf b/openxml/OpenXmlEmpty.tsf index 11a719c..d1d0a92 100644 --- a/openxml/OpenXmlEmpty.tsf +++ b/openxml/OpenXmlEmpty.tsf @@ -30,78 +30,78 @@ function OpenXmlEmpty.Create(_node: XmlNode);overload; begin node_name := _node.GetName(); pos := Pos(":", node_name); - if pos then self.Create(nil, node_name[:pos-1], node_name[pos+1:]); - else self.Create(nil, nil, node_name); - self.InitNode(_node); + if pos then {self.}Create(nil, node_name[:pos-1], node_name[pos+1:]); + else {self.}Create(nil, nil, node_name); + {self.}InitNode(_node); end; function OpenXmlEmpty.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; begin - self.Parent := _parent; - self.Prefix := _prefix; - self.LocalName := _local_name; - self.XmlNode := nil; - self.ElementName := ifString(self.Prefix) and self.Prefix <> "" ? format("%s:%s", self.Prefix, self.LocalName) : self.LocalName; - self.Init(); + {self.}Parent := _parent; + {self.}Prefix := _prefix; + {self.}LocalName := _local_name; + {self.}XmlNode := nil; + {self.}ElementName := ifString({self.}Prefix) and {self.}Prefix <> "" ? format("%s:%s", {self.}Prefix, {self.}LocalName) : {self.}LocalName; + {self.}Init(); end; function OpenXmlEmpty.Init(); begin - self.XmlAttrVal := new OpenXmlAttribute(self.Prefix, "val", nil); + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); end function OpenXmlEmpty.InitNode(_node: XmlNode); begin - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function OpenXmlEmpty.Copy(_obj: tslobj); begin - if not ifnil(_obj.Value) then self.Value := _obj.Value; - if not ifnil(_obj.XmlAttrVal.Value) then self.XmlAttrVal.Value := _obj.XmlAttrVal.Value; + if not ifnil(_obj.Value) then {self.}Value := _obj.Value; + if not ifnil(_obj.XmlAttrVal.Value) then {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value; end; function OpenXmlEmpty.Marshal(): tableArray; begin - if not self.Value then return array(); + if not {self.}Value then return array(); attr := array(); - if not inil(self.XmlAttrVal.Value) then attr[self.XmlAttrVal.ElementName] := self.XmlAttrVal.Value; + if not inil({self.}XmlAttrVal.Value) then attr[{self.}XmlAttrVal.ElementName] := {self.}XmlAttrVal.Value; arr := array("type": "element", "name": name_, "attributes": attr, "children": array()); return arr; end; function OpenXmlEmpty.Deserialize(); begin - if ifObj(self.XmlNode) then + if ifObj({self.}XmlNode) then begin - v := self.XmlNode.GetAttribute(self.XmlAttrVal.ElementName); - self.Value := v = "0" ? false : true; - self.XmlAttrVal.Value := v = "" ? nil : v; + v := {self.}XmlNode.GetAttribute({self.}XmlAttrVal.ElementName); + {self.}Value := v = "0" ? false : true; + {self.}XmlAttrVal.Value := v = "" ? nil : v; end else begin - self.Value := nil; + {self.}Value := nil; end end; function OpenXmlEmpty.GetNode(): XmlNode; begin - if not ifObj(self.XmlNode) then self.XmlNode := self.Parent.GetOrCreateNode(self); - return self.XmlNode; + if not ifObj({self.}XmlNode) then {self.}XmlNode := {self.}Parent.GetOrCreateNode(self); + return {self.}XmlNode; end; function OpenXmlEmpty.Serialize(); begin - if not ifObj(self.XmlNode) and not self.Value then return; - if ifObj(self.XmlNode) and not self.Value and ifObj(self.Parent) and ifObj(self.Parent.XmlNode) then self.Parent.XmlNode.DeleteChild(self.XmlNode); - if not ifObj(self.XmlNode) and self.Value then self.GetNode(); + if not ifObj({self.}XmlNode) and not {self.}Value then return; + if ifObj({self.}XmlNode) and not {self.}Value and ifObj({self.}Parent) and ifObj({self.}Parent.XmlNode) then {self.}Parent.XmlNode.DeleteChild({self.}XmlNode); + if not ifObj({self.}XmlNode) and {self.}Value then {self.}GetNode(); end; function OpenXmlEmpty.ReadXmlAttrVal(); begin - return self.XmlAttrVal.Value; + return {self.}XmlAttrVal.Value; end; function OpenXmlEmpty.WriteXmlAttrVal(_value: any); begin - self.XmlAttrVal.Value := _value; + {self.}XmlAttrVal.Value := _value; end; diff --git a/openxml/OpenXmlPcdata.tsf b/openxml/OpenXmlPcdata.tsf index 35e8141..778028a 100644 --- a/openxml/OpenXmlPcdata.tsf +++ b/openxml/OpenXmlPcdata.tsf @@ -18,10 +18,10 @@ public Prefix: string; // 前缀 XmlNode: XmlNode; // XMLNode节点 ElementName: string; - Text: string; // 元素的文本内容，有的话就是pcdata，没有就是普通的节点 + Text: string; // 元素的文本内容 protected - attributes_: tableArray; // 不提供访问 + attributes_: array of OpenXmlAttribute; // 属性 end; @@ -29,26 +29,26 @@ function OpenXmlPcdata.Create(_node: XmlNode);overload; begin node_name := _node.GetName(); pos := Pos(":", node_name); - if pos then self.Create(nil, node_name[:pos-1], node_name[pos+1:]); - else self.Create(nil, nil, node_name); - self.InitNode(_node); + if pos then {self.}Create(nil, node_name[:pos-1], node_name[pos+1:]); + else {self.}Create(nil, nil, node_name); + {self.}InitNode(_node); end; function OpenXmlPcdata.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; begin - self.Parent := _parent; - self.Prefix := _prefix; - self.LocalName := _local_name; - self.XmlNode := nil; - self.Text := nil; - self.ElementName := ifString(self.Prefix) and self.Prefix <> "" ? format("%s:%s", self.Prefix, self.LocalName) : self.LocalName; - self.Init(); - self.InitAttributes(); + {self.}Parent := _parent; + {self.}Prefix := _prefix; + {self.}LocalName := _local_name; + {self.}XmlNode := nil; + {self.}Text := nil; + {self.}ElementName := ifString({self.}Prefix) and {self.}Prefix <> "" ? format("%s:%s", {self.}Prefix, {self.}LocalName) : {self.}LocalName; + {self.}Init(); + {self.}InitAttributes(); end; function OpenXmlPcdata.InitNode(_node: XmlNode);virtual; begin - self.XmlNode := ifObj(_node) ? _node : nil; + {self.}XmlNode := ifObj(_node) ? _node : nil; end; function OpenXmlPcdata.Marshal(): tableArray; @@ -56,27 +56,27 @@ begin arr := array("type": "element", "name": name_, "attributes": array(), "children": array()); for k,v in attributes_ do if not ifnil(v.Value) then arr["attributes"][v.ElementName] := v.Value; - if not ifnil(self.Text) then arr["children"] := array(("type": "pcdata", "value": self.Text)); + if not ifnil({self.}Text) then arr["children"] := array(("type": "pcdata", "value": {self.}Text)); return arr; end; function OpenXmlPcdata.Deserialize(); begin - self.Text := ifObj(self.XmlNode) ? self.XmlNode.GetText() : nil; + {self.}Text := ifObj({self.}XmlNode) ? {self.}XmlNode.GetText() : nil; for k,v in attributes_ do - v.Value := ifObj(self.XmlNode) ? self.XmlNode.GetAttribute(v.ElementName) : nil; + v.Value := ifObj({self.}XmlNode) ? {self.}XmlNode.GetAttribute(v.ElementName) : nil; end; function OpenXmlPcdata.GetNode(): XmlNode; begin - if not ifObj(self.XmlNode) then self.XmlNode := self.Parent.GetOrCreateNode(self); - return self.XmlNode; + if not ifObj({self.}XmlNode) then {self.}XmlNode := {self.}Parent.GetOrCreateNode(self); + return {self.}XmlNode; end; function OpenXmlPcdata.Serialize(); begin - if not ifnil(self.Text) then self.GetNode().SetValue(self.Text); + if not ifnil({self.}Text) then {self.}GetNode().SetValue({self.}Text); for k,v in attributes_ do - if not ifnil(v.Value) then self.GetNode().SetAttribute(v.ElementName, v.Value); + if not ifnil(v.Value) then {self.}GetNode().SetAttribute(v.ElementName, v.Value); end; diff --git a/utils/TSComponentsBase.tsf b/utils/TSComponentsBase.tsf index e1d6270..28982d1 100644 --- a/utils/TSComponentsBase.tsf +++ b/utils/TSComponentsBase.tsf @@ -22,7 +22,7 @@ end; function TSComponentsBase.OpenFile(alias: string; file: string; password: string): tableArray; begin - self.Init(); + {self.}Init(); zipfile_ := new ZipFile(); return zipfile_.Open(alias, file, password); end; @@ -42,7 +42,7 @@ begin begin node := xml.FirstChild(conf_[_name][1]); if not ifObj(node) then raise (name $ " error."); - _variable := self.NewObject(_name); + _variable := {self.}NewObject(_name); _variable.InitNode(node); end end @@ -59,7 +59,7 @@ begin while ifObj(xml) do begin node := xml.FirstChild(conf_[_name][1]); - obj := self.NewObject(_name); + obj := {self.}NewObject(_name); obj.InitNode(node); _variable[length(_variable)] := obj; name := Format(conf_[_name][0], ++ind); @@ -70,7 +70,7 @@ begin if ifnil(_variable[_index]) then begin obj := nil; - self.SetProp(obj, _name, _index + 1); + {self.}SetProp(obj, _name, _index + 1); _variable[_index] := obj; end return _variable[_index];