From 41bbf69f7918908b7e9ec09129ab53fe3e454202 Mon Sep 17 00:00:00 2001 From: csh Date: Fri, 3 Jan 2025 10:24:13 +0800 Subject: [PATCH] config update --- autounit/DocxML.tsf | 2940 +++++++++++++++-- autounit/DocxMLUnitDecorator.tsf | 485 ++- autounit/SharedML.tsf | 16 + autounit/SharedMLUnitDecorator.tsf | 2 + autounit/{VXml.tsf => VML.tsf} | 74 +- autounit/{VXmlAdapter.tsf => VMLAdapter.tsf} | 2 +- ...UnitDecorator.tsf => VMLUnitDecorator.tsf} | 12 +- 7 files changed, 3211 insertions(+), 320 deletions(-) rename autounit/{VXml.tsf => VML.tsf} (96%) rename autounit/{VXmlAdapter.tsf => VMLAdapter.tsf} (55%) rename autounit/{VXmlUnitDecorator.tsf => VMLUnitDecorator.tsf} (97%) diff --git a/autounit/DocxML.tsf b/autounit/DocxML.tsf index 1f3693b..13e5220 100644 --- a/autounit/DocxML.tsf +++ b/autounit/DocxML.tsf @@ -74,9 +74,9 @@ public function Copy(_obj: Document);override; public // attributes property - property McIgnorable read ReadXmlAttrMcIgnorable write WriteXmlAttrMcIgnorable; - function ReadXmlAttrMcIgnorable(); - function WriteXmlAttrMcIgnorable(_value); + property Ignorable read ReadXmlAttrIgnorable write WriteXmlAttrIgnorable; + function ReadXmlAttrIgnorable(); + function WriteXmlAttrIgnorable(_value); // normal property property Body read ReadXmlChildBody; @@ -84,7 +84,7 @@ public public // Attributes - XmlAttrMcIgnorable: OpenXmlAttribute; + XmlAttrIgnorable: OpenXmlAttribute; // Children XmlChildBody: Body; @@ -154,11 +154,14 @@ public property PPr read ReadXmlChildPPr; property OMathPara read ReadXmlChildOMathPara; property Ins read ReadXmlChildIns; + property Del read ReadXmlChildDel; function ReadXmlChildPPr(): PPr; function ReadXmlChildOMathPara(): OMathPara; function ReadXmlChildIns(): Ins; + function ReadXmlChildDel(): Del; // multi property + property Sdts read ReadSdts; property Rs read ReadRs; property CommentRangeStarts read ReadCommentRangeStarts; property CommentRangeEnds read ReadCommentRangeEnds; @@ -166,6 +169,7 @@ public property BookmarkEnds read ReadBookmarkEnds; property Hyperlinks read ReadHyperlinks; property FldSimples read ReadFldSimples; + function ReadSdts(_index); function ReadRs(_index); function ReadCommentRangeStarts(_index); function ReadCommentRangeEnds(_index); @@ -173,6 +177,7 @@ public function ReadBookmarkEnds(_index); function ReadHyperlinks(_index); function ReadFldSimples(_index); + function AddSdt(): Sdt; function AddR(): R; function AddCommentRangeStart(): CommentRange; function AddCommentRangeEnd(): CommentRange; @@ -180,6 +185,7 @@ public function AddBookmarkEnd(): Bookmark; function AddHyperLink(): HyperLink; function AddFldSimple(): FldSimple; + function AppendSdt(): Sdt; function AppendR(): R; function AppendCommentRangeStart(): CommentRange; function AppendCommentRangeEnd(): CommentRange; @@ -201,6 +207,7 @@ public XmlChildPPr: PPr; XmlChildOMathPara: OMathPara; XmlChildIns: Ins; + XmlChildDel: Del; end; type FldSimple = class(OpenXmlElement) @@ -315,12 +322,19 @@ public public // empty property + property Bidi read ReadXmlChildBidi write WriteXmlChildBidi; property WidowControl read ReadXmlChildWidowControl write WriteXmlChildWidowControl; property SnapToGrid read ReadXmlChildSnapToGrid write WriteXmlChildSnapToGrid; property KeepNext read ReadXmlChildKeepNext write WriteXmlChildKeepNext; property KeepLines read ReadXmlChildKeepLines write WriteXmlChildKeepLines; + property MirrorIndents read ReadXmlChildMirrorIndents write WriteXmlChildMirrorIndents; property PageBreakBefore read ReadXmlChildPageBreakBefore write WriteXmlChildPageBreakBefore; + property SuppressAutoHyphens read ReadXmlChildSuppressAutoHyphens write WriteXmlChildSuppressAutoHyphens; + property SuppressLineNumbers read ReadXmlChildSuppressLineNumbers write WriteXmlChildSuppressLineNumbers; + property SuppressOverlap read ReadXmlChildSuppressOverlap write WriteXmlChildSuppressOverlap; property ContextualSpacing read ReadXmlChildContextualSpacing write WriteXmlChildContextualSpacing; + function ReadXmlChildBidi(); + function WriteXmlChildBidi(_value); function ReadXmlChildWidowControl(); function WriteXmlChildWidowControl(_value); function ReadXmlChildSnapToGrid(); @@ -329,8 +343,16 @@ public function WriteXmlChildKeepNext(_value); function ReadXmlChildKeepLines(); function WriteXmlChildKeepLines(_value); + function ReadXmlChildMirrorIndents(); + function WriteXmlChildMirrorIndents(_value); function ReadXmlChildPageBreakBefore(); function WriteXmlChildPageBreakBefore(_value); + function ReadXmlChildSuppressAutoHyphens(); + function WriteXmlChildSuppressAutoHyphens(_value); + function ReadXmlChildSuppressLineNumbers(); + function WriteXmlChildSuppressLineNumbers(_value); + function ReadXmlChildSuppressOverlap(); + function WriteXmlChildSuppressOverlap(_value); function ReadXmlChildContextualSpacing(); function WriteXmlChildContextualSpacing(_value); @@ -341,6 +363,8 @@ public property NumPr read ReadXmlChildNumPr; property Jc read ReadXmlChildJc; property Ind read ReadXmlChildInd; + property Kinsoku read ReadXmlChildKinsoku; + property OverflowPunct read ReadXmlChildOverflowPunct; property AdjustRightInd read ReadXmlChildAdjustRightInd; property Spacing read ReadXmlChildSpacing; property OutlineLvl read ReadXmlChildOutlineLvl; @@ -350,13 +374,21 @@ public property PBdr read ReadXmlChildPBdr; property Shd read ReadXmlChildShd; property WordWrap read ReadXmlChildWordWrap; + property DivId read ReadXmlChildDivId; + property CnfStyle read ReadXmlChildCnfStyle; + property FramePr read ReadXmlChildFramePr; property TextboxTightWrap read ReadXmlChildTextboxTightWrap; + property TopLinePunct read ReadXmlChildTopLinePunct; + property TextAlignment read ReadXmlChildTextAlignment; + property TextDirection read ReadXmlChildTextDirection; function ReadXmlChildSectPr(): SectPr; function ReadXmlChildTabs(): Tabs; function ReadXmlChildPStyle(): PureWVal; function ReadXmlChildNumPr(): NumPr; function ReadXmlChildJc(): PureWVal; function ReadXmlChildInd(): Ind; + function ReadXmlChildKinsoku(): PureWVal; + function ReadXmlChildOverflowPunct(): PureWVal; function ReadXmlChildAdjustRightInd(): PureWVal; function ReadXmlChildSpacing(): Spacing; function ReadXmlChildOutlineLvl(): PureWVal; @@ -366,12 +398,19 @@ public function ReadXmlChildPBdr(): PBdr; function ReadXmlChildShd(): Shd; function ReadXmlChildWordWrap(): PureWVal; + function ReadXmlChildDivId(): PureWVal; + function ReadXmlChildCnfStyle(): PureWVal; + function ReadXmlChildFramePr(): FramePr; function ReadXmlChildTextboxTightWrap(): PureWVal; + function ReadXmlChildTopLinePunct(): PureWVal; + function ReadXmlChildTextAlignment(): PureWVal; + function ReadXmlChildTextDirection(): PureWVal; public // Children XmlChildSectPr: SectPr; XmlChildTabs: Tabs; + XmlChildBidi: OpenXmlEmpty; XmlChildWidowControl: OpenXmlEmpty; XmlChildSnapToGrid: OpenXmlEmpty; XmlChildPStyle: PureWVal; @@ -380,7 +419,13 @@ public XmlChildInd: Ind; XmlChildKeepNext: OpenXmlEmpty; XmlChildKeepLines: OpenXmlEmpty; + XmlChildMirrorIndents: OpenXmlEmpty; + XmlChildKinsoku: PureWVal; XmlChildPageBreakBefore: OpenXmlEmpty; + XmlChildSuppressAutoHyphens: OpenXmlEmpty; + XmlChildSuppressLineNumbers: OpenXmlEmpty; + XmlChildSuppressOverlap: OpenXmlEmpty; + XmlChildOverflowPunct: PureWVal; XmlChildAdjustRightInd: PureWVal; XmlChildSpacing: Spacing; XmlChildOutlineLvl: PureWVal; @@ -391,7 +436,13 @@ public XmlChildContextualSpacing: OpenXmlEmpty; XmlChildShd: Shd; XmlChildWordWrap: PureWVal; + XmlChildDivId: PureWVal; + XmlChildCnfStyle: PureWVal; + XmlChildFramePr: FramePr; XmlChildTextboxTightWrap: PureWVal; + XmlChildTopLinePunct: PureWVal; + XmlChildTextAlignment: PureWVal; + XmlChildTextDirection: PureWVal; end; type PBdr = class(OpenXmlElement) @@ -405,14 +456,102 @@ public // normal property property Top read ReadXmlChildTop; + property Left read ReadXmlChildLeft; + property Right read ReadXmlChildRight; property Bottom read ReadXmlChildBottom; + property Between read ReadXmlChildBetween; function ReadXmlChildTop(): PBorder; + function ReadXmlChildLeft(): PBorder; + function ReadXmlChildRight(): PBorder; function ReadXmlChildBottom(): PBorder; + function ReadXmlChildBetween(): PBorder; public // Children XmlChildTop: PBorder; + XmlChildLeft: PBorder; + XmlChildRight: PBorder; XmlChildBottom: PBorder; + XmlChildBetween: PBorder; +end; + +type FramePr = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: FramePr);override; +public + // attributes property + property AnchorLock read ReadXmlAttrAnchorLock write WriteXmlAttrAnchorLock; + property DropCap read ReadXmlAttrDropCap write WriteXmlAttrDropCap; + property VAnchor read ReadXmlAttrVAnchor write WriteXmlAttrVAnchor; + property HAnchor read ReadXmlAttrHAnchor write WriteXmlAttrHAnchor; + property HRule read ReadXmlAttrHRule write WriteXmlAttrHRule; + property HSpace read ReadXmlAttrHSpace write WriteXmlAttrHSpace; + property VSpace read ReadXmlAttrVSpace write WriteXmlAttrVSpace; + property Lines read ReadXmlAttrLines write WriteXmlAttrLines; + property Wrap read ReadXmlAttrWrap write WriteXmlAttrWrap; + property Val read ReadXmlAttrVal write WriteXmlAttrVal; + property W read ReadXmlAttrW write WriteXmlAttrW; + property H read ReadXmlAttrH write WriteXmlAttrH; + property X read ReadXmlAttrX write WriteXmlAttrX; + property Y read ReadXmlAttrY write WriteXmlAttrY; + property XAlign read ReadXmlAttrXAlign write WriteXmlAttrXAlign; + property YAlign read ReadXmlAttrYAlign write WriteXmlAttrYAlign; + function ReadXmlAttrAnchorLock(); + function WriteXmlAttrAnchorLock(_value); + function ReadXmlAttrDropCap(); + function WriteXmlAttrDropCap(_value); + function ReadXmlAttrVAnchor(); + function WriteXmlAttrVAnchor(_value); + function ReadXmlAttrHAnchor(); + function WriteXmlAttrHAnchor(_value); + function ReadXmlAttrHRule(); + function WriteXmlAttrHRule(_value); + function ReadXmlAttrHSpace(); + function WriteXmlAttrHSpace(_value); + function ReadXmlAttrVSpace(); + function WriteXmlAttrVSpace(_value); + function ReadXmlAttrLines(); + function WriteXmlAttrLines(_value); + function ReadXmlAttrWrap(); + function WriteXmlAttrWrap(_value); + function ReadXmlAttrVal(); + function WriteXmlAttrVal(_value); + function ReadXmlAttrW(); + function WriteXmlAttrW(_value); + function ReadXmlAttrH(); + function WriteXmlAttrH(_value); + function ReadXmlAttrX(); + function WriteXmlAttrX(_value); + function ReadXmlAttrY(); + function WriteXmlAttrY(_value); + function ReadXmlAttrXAlign(); + function WriteXmlAttrXAlign(_value); + function ReadXmlAttrYAlign(); + function WriteXmlAttrYAlign(_value); + +public + // Attributes + XmlAttrAnchorLock: OpenXmlAttribute; + XmlAttrDropCap: OpenXmlAttribute; + XmlAttrVAnchor: OpenXmlAttribute; + XmlAttrHAnchor: OpenXmlAttribute; + XmlAttrHRule: OpenXmlAttribute; + XmlAttrHSpace: OpenXmlAttribute; + XmlAttrVSpace: OpenXmlAttribute; + XmlAttrLines: OpenXmlAttribute; + XmlAttrWrap: OpenXmlAttribute; + XmlAttrVal: OpenXmlAttribute; + XmlAttrW: OpenXmlAttribute; + XmlAttrH: OpenXmlAttribute; + XmlAttrX: OpenXmlAttribute; + XmlAttrY: OpenXmlAttribute; + XmlAttrXAlign: OpenXmlAttribute; + XmlAttrYAlign: OpenXmlAttribute; + end; type PBorder = class(OpenXmlElement) @@ -427,7 +566,10 @@ public property Val read ReadXmlAttrVal write WriteXmlAttrVal; property Color read ReadXmlAttrColor write WriteXmlAttrColor; property Space read ReadXmlAttrSpace write WriteXmlAttrSpace; + property Frame read ReadXmlAttrFrame write WriteXmlAttrFrame; + property Shadow read ReadXmlAttrShadow write WriteXmlAttrShadow; property ThemeColor read ReadXmlAttrThemeColor write WriteXmlAttrThemeColor; + property ThemeShade read ReadXmlAttrThemeShade write WriteXmlAttrThemeShade; property ThemeTint read ReadXmlAttrThemeTint write WriteXmlAttrThemeTint; property Sz read ReadXmlAttrSz write WriteXmlAttrSz; function ReadXmlAttrVal(); @@ -436,8 +578,14 @@ public function WriteXmlAttrColor(_value); function ReadXmlAttrSpace(); function WriteXmlAttrSpace(_value); + function ReadXmlAttrFrame(); + function WriteXmlAttrFrame(_value); + function ReadXmlAttrShadow(); + function WriteXmlAttrShadow(_value); function ReadXmlAttrThemeColor(); function WriteXmlAttrThemeColor(_value); + function ReadXmlAttrThemeShade(); + function WriteXmlAttrThemeShade(_value); function ReadXmlAttrThemeTint(); function WriteXmlAttrThemeTint(_value); function ReadXmlAttrSz(); @@ -448,7 +596,10 @@ public XmlAttrVal: OpenXmlAttribute; XmlAttrColor: OpenXmlAttribute; XmlAttrSpace: OpenXmlAttribute; + XmlAttrFrame: OpenXmlAttribute; + XmlAttrShadow: OpenXmlAttribute; XmlAttrThemeColor: OpenXmlAttribute; + XmlAttrThemeShade: OpenXmlAttribute; XmlAttrThemeTint: OpenXmlAttribute; XmlAttrSz: OpenXmlAttribute; @@ -630,7 +781,12 @@ public property B read ReadXmlChildB write WriteXmlChildB; property BCs read ReadXmlChildBCs write WriteXmlChildBCs; property Strike read ReadXmlChildStrike write WriteXmlChildStrike; + property Cs read ReadXmlChildCs write WriteXmlChildCs; property U read ReadXmlChildU write WriteXmlChildU; + property OMath read ReadXmlChildOMath write WriteXmlChildOMath; + property Shadow read ReadXmlChildShadow write WriteXmlChildShadow; + property SpecVanish read ReadXmlChildSpecVanish write WriteXmlChildSpecVanish; + property Vanish read ReadXmlChildVanish write WriteXmlChildVanish; function ReadXmlChildI(); function WriteXmlChildI(_value); function ReadXmlChildICs(); @@ -641,40 +797,83 @@ public function WriteXmlChildBCs(_value); function ReadXmlChildStrike(); function WriteXmlChildStrike(_value); + function ReadXmlChildCs(); + function WriteXmlChildCs(_value); function ReadXmlChildU(); function WriteXmlChildU(_value); + function ReadXmlChildOMath(); + function WriteXmlChildOMath(_value); + function ReadXmlChildShadow(); + function WriteXmlChildShadow(_value); + function ReadXmlChildSpecVanish(); + function WriteXmlChildSpecVanish(_value); + function ReadXmlChildVanish(); + function WriteXmlChildVanish(_value); // normal property property NoProof read ReadXmlChildNoProof; + property Outline read ReadXmlChildOutline; property Position read ReadXmlChildPosition; property WebHidden read ReadXmlChildWebHidden; property RStyle read ReadXmlChildRStyle; property Ins read ReadXmlChildIns; property RFonts read ReadXmlChildRFonts; property Kern read ReadXmlChildKern; + property Bdr read ReadXmlChildBdr; + property Caps read ReadXmlChildCaps; + property Del read ReadXmlChildDel; + property DStrike read ReadXmlChildDStrike; + property Effect read ReadXmlChildEffect; + property Em read ReadXmlChildEm; + property Emboss read ReadXmlChildEmboss; + property FitText read ReadXmlChildFitText; + property Highlight read ReadXmlChildHighlight; property Color read ReadXmlChildColor; + property EastAsianLayout read ReadXmlChildEastAsianLayout; property Sz read ReadXmlChildSz; property SzCs read ReadXmlChildSzCs; property Lang read ReadXmlChildLang; + property Imprint read ReadXmlChildImprint; property VertAlign read ReadXmlChildVertAlign; property Ligatures read ReadXmlChildLigatures; + property Rtl read ReadXmlChildRtl; + property Shd read ReadXmlChildShd; + property SmallCaps read ReadXmlChildSmallCaps; + property W read ReadXmlChildW; function ReadXmlChildNoProof(): PureVal; + function ReadXmlChildOutline(): PureVal; function ReadXmlChildPosition(): PureVal; function ReadXmlChildWebHidden(): PureWVal; function ReadXmlChildRStyle(): PureWVal; function ReadXmlChildIns(): Ins; function ReadXmlChildRFonts(): RFonts; function ReadXmlChildKern(): PureWVal; + function ReadXmlChildBdr(): Bdr; + function ReadXmlChildCaps(): PureWVal; + function ReadXmlChildDel(): Del; + function ReadXmlChildDStrike(): PureWVal; + function ReadXmlChildEffect(): PureWVal; + function ReadXmlChildEm(): PureWVal; + function ReadXmlChildEmboss(): PureWVal; + function ReadXmlChildFitText(): FitText; + function ReadXmlChildHighlight(): Highlight; function ReadXmlChildColor(): Color; + function ReadXmlChildEastAsianLayout(): EastAsianLayout; function ReadXmlChildSz(): Sz; function ReadXmlChildSzCs(): SzCs; function ReadXmlChildLang(): Lang; + function ReadXmlChildImprint(): PureWVal; function ReadXmlChildVertAlign(): PureWVal; function ReadXmlChildLigatures(): PureWVal; + function ReadXmlChildRtl(): PureWVal; + function ReadXmlChildShd(): Shd; + function ReadXmlChildSmallCaps(): PureWVal; + function ReadXmlChildW(): PureWVal; public // Children XmlChildNoProof: PureVal; + XmlChildOutline: PureVal; XmlChildPosition: PureVal; XmlChildWebHidden: PureWVal; XmlChildRStyle: PureWVal; @@ -685,14 +884,264 @@ public XmlChildICs: OpenXmlEmpty; XmlChildB: OpenXmlEmpty; XmlChildBCs: OpenXmlEmpty; + XmlChildBdr: Bdr; + XmlChildCaps: PureWVal; + XmlChildDel: Del; XmlChildStrike: OpenXmlEmpty; + XmlChildDStrike: PureWVal; + XmlChildEffect: PureWVal; + XmlChildEm: PureWVal; + XmlChildEmboss: PureWVal; + XmlChildFitText: FitText; + XmlChildHighlight: Highlight; XmlChildColor: Color; + XmlChildEastAsianLayout: EastAsianLayout; + XmlChildCs: OpenXmlEmpty; XmlChildSz: Sz; XmlChildSzCs: SzCs; XmlChildU: OpenXmlEmpty; XmlChildLang: Lang; + XmlChildImprint: PureWVal; XmlChildVertAlign: PureWVal; XmlChildLigatures: PureWVal; + XmlChildRtl: PureWVal; + XmlChildOMath: OpenXmlEmpty; + XmlChildShadow: OpenXmlEmpty; + XmlChildSpecVanish: OpenXmlEmpty; + XmlChildVanish: OpenXmlEmpty; + XmlChildShd: Shd; + XmlChildSmallCaps: PureWVal; + XmlChildW: PureWVal; +end; + +type Shd = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: Shd);override; +public + // attributes property + property Val read ReadXmlAttrVal write WriteXmlAttrVal; + property Color read ReadXmlAttrColor write WriteXmlAttrColor; + property Fill read ReadXmlAttrFill write WriteXmlAttrFill; + property ThemeColor read ReadXmlAttrThemeColor write WriteXmlAttrThemeColor; + property ThemeFill read ReadXmlAttrThemeFill write WriteXmlAttrThemeFill; + property ThemeFillTint read ReadXmlAttrThemeFillTint write WriteXmlAttrThemeFillTint; + property ThemeFillShade read ReadXmlAttrThemeFillShade write WriteXmlAttrThemeFillShade; + property ThemeShade read ReadXmlAttrThemeShade write WriteXmlAttrThemeShade; + property ThemeTint read ReadXmlAttrThemeTint write WriteXmlAttrThemeTint; + function ReadXmlAttrVal(); + function WriteXmlAttrVal(_value); + function ReadXmlAttrColor(); + function WriteXmlAttrColor(_value); + function ReadXmlAttrFill(); + function WriteXmlAttrFill(_value); + function ReadXmlAttrThemeColor(); + function WriteXmlAttrThemeColor(_value); + function ReadXmlAttrThemeFill(); + function WriteXmlAttrThemeFill(_value); + function ReadXmlAttrThemeFillTint(); + function WriteXmlAttrThemeFillTint(_value); + function ReadXmlAttrThemeFillShade(); + function WriteXmlAttrThemeFillShade(_value); + function ReadXmlAttrThemeShade(); + function WriteXmlAttrThemeShade(_value); + function ReadXmlAttrThemeTint(); + function WriteXmlAttrThemeTint(_value); + +public + // Attributes + XmlAttrVal: OpenXmlAttribute; + XmlAttrColor: OpenXmlAttribute; + XmlAttrFill: OpenXmlAttribute; + XmlAttrThemeColor: OpenXmlAttribute; + XmlAttrThemeFill: OpenXmlAttribute; + XmlAttrThemeFillTint: OpenXmlAttribute; + XmlAttrThemeFillShade: OpenXmlAttribute; + XmlAttrThemeShade: OpenXmlAttribute; + XmlAttrThemeTint: OpenXmlAttribute; + +end; + +type Highlight = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: Highlight);override; +public + // attributes property + property Val read ReadXmlAttrVal write WriteXmlAttrVal; + function ReadXmlAttrVal(); + function WriteXmlAttrVal(_value); + +public + // Attributes + XmlAttrVal: OpenXmlAttribute; + +end; + +type FitText = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: FitText);override; +public + // attributes property + property Id read ReadXmlAttrId write WriteXmlAttrId; + property Val read ReadXmlAttrVal write WriteXmlAttrVal; + function ReadXmlAttrId(); + function WriteXmlAttrId(_value); + function ReadXmlAttrVal(); + function WriteXmlAttrVal(_value); + +public + // Attributes + XmlAttrId: OpenXmlAttribute; + XmlAttrVal: OpenXmlAttribute; + +end; + +type EastAsianLayout = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: EastAsianLayout);override; +public + // attributes property + property Combine read ReadXmlAttrCombine write WriteXmlAttrCombine; + property CombineBrackets read ReadXmlAttrCombineBrackets write WriteXmlAttrCombineBrackets; + property Id read ReadXmlAttrId write WriteXmlAttrId; + property Vert read ReadXmlAttrVert write WriteXmlAttrVert; + property VertCompress read ReadXmlAttrVertCompress write WriteXmlAttrVertCompress; + function ReadXmlAttrCombine(); + function WriteXmlAttrCombine(_value); + function ReadXmlAttrCombineBrackets(); + function WriteXmlAttrCombineBrackets(_value); + function ReadXmlAttrId(); + function WriteXmlAttrId(_value); + function ReadXmlAttrVert(); + function WriteXmlAttrVert(_value); + function ReadXmlAttrVertCompress(); + function WriteXmlAttrVertCompress(_value); + +public + // Attributes + XmlAttrCombine: OpenXmlAttribute; + XmlAttrCombineBrackets: OpenXmlAttribute; + XmlAttrId: OpenXmlAttribute; + XmlAttrVert: OpenXmlAttribute; + XmlAttrVertCompress: OpenXmlAttribute; + +end; + +type Del = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: Del);override; +public + // attributes property + property Author read ReadXmlAttrAuthor write WriteXmlAttrAuthor; + property Date read ReadXmlAttrDate write WriteXmlAttrDate; + property Id read ReadXmlAttrId write WriteXmlAttrId; + property Color read ReadXmlAttrColor write WriteXmlAttrColor; + property ThemeColor read ReadXmlAttrThemeColor write WriteXmlAttrThemeColor; + property ThemeShade read ReadXmlAttrThemeShade write WriteXmlAttrThemeShade; + property ThemeTint read ReadXmlAttrThemeTint write WriteXmlAttrThemeTint; + property Frame read ReadXmlAttrFrame write WriteXmlAttrFrame; + property Shadow read ReadXmlAttrShadow write WriteXmlAttrShadow; + function ReadXmlAttrAuthor(); + function WriteXmlAttrAuthor(_value); + function ReadXmlAttrDate(); + function WriteXmlAttrDate(_value); + function ReadXmlAttrId(); + function WriteXmlAttrId(_value); + function ReadXmlAttrColor(); + function WriteXmlAttrColor(_value); + function ReadXmlAttrThemeColor(); + function WriteXmlAttrThemeColor(_value); + function ReadXmlAttrThemeShade(); + function WriteXmlAttrThemeShade(_value); + function ReadXmlAttrThemeTint(); + function WriteXmlAttrThemeTint(_value); + function ReadXmlAttrFrame(); + function WriteXmlAttrFrame(_value); + function ReadXmlAttrShadow(); + function WriteXmlAttrShadow(_value); + +public + // Attributes + XmlAttrAuthor: OpenXmlAttribute; + XmlAttrDate: OpenXmlAttribute; + XmlAttrId: OpenXmlAttribute; + XmlAttrColor: OpenXmlAttribute; + XmlAttrThemeColor: OpenXmlAttribute; + XmlAttrThemeShade: OpenXmlAttribute; + XmlAttrThemeTint: OpenXmlAttribute; + XmlAttrFrame: OpenXmlAttribute; + XmlAttrShadow: OpenXmlAttribute; + +end; + +type Bdr = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: Bdr);override; +public + // attributes property + property Val read ReadXmlAttrVal write WriteXmlAttrVal; + property Sz read ReadXmlAttrSz write WriteXmlAttrSz; + property Space read ReadXmlAttrSpace write WriteXmlAttrSpace; + property Color read ReadXmlAttrColor write WriteXmlAttrColor; + property ThemeColor read ReadXmlAttrThemeColor write WriteXmlAttrThemeColor; + property ThemeShade read ReadXmlAttrThemeShade write WriteXmlAttrThemeShade; + property ThemeTint read ReadXmlAttrThemeTint write WriteXmlAttrThemeTint; + property Frame read ReadXmlAttrFrame write WriteXmlAttrFrame; + property Shadow read ReadXmlAttrShadow write WriteXmlAttrShadow; + function ReadXmlAttrVal(); + function WriteXmlAttrVal(_value); + function ReadXmlAttrSz(); + function WriteXmlAttrSz(_value); + function ReadXmlAttrSpace(); + function WriteXmlAttrSpace(_value); + function ReadXmlAttrColor(); + function WriteXmlAttrColor(_value); + function ReadXmlAttrThemeColor(); + function WriteXmlAttrThemeColor(_value); + function ReadXmlAttrThemeShade(); + function WriteXmlAttrThemeShade(_value); + function ReadXmlAttrThemeTint(); + function WriteXmlAttrThemeTint(_value); + function ReadXmlAttrFrame(); + function WriteXmlAttrFrame(_value); + function ReadXmlAttrShadow(); + function WriteXmlAttrShadow(_value); + +public + // Attributes + XmlAttrVal: OpenXmlAttribute; + XmlAttrSz: OpenXmlAttribute; + XmlAttrSpace: OpenXmlAttribute; + XmlAttrColor: OpenXmlAttribute; + XmlAttrThemeColor: OpenXmlAttribute; + XmlAttrThemeShade: OpenXmlAttribute; + XmlAttrThemeTint: OpenXmlAttribute; + XmlAttrFrame: OpenXmlAttribute; + XmlAttrShadow: OpenXmlAttribute; + end; type RFonts = class(OpenXmlElement) @@ -893,6 +1342,7 @@ public property InstrText read ReadXmlChildInstrText; property AlternateContent read ReadXmlChildAlternateContent; property Drawing read ReadXmlChildDrawing; + property Pict read ReadXmlChildPict; property T read ReadXmlChildT; property Object read ReadXmlChildObject; property FootnoteReference read ReadXmlChildFootnoteReference; @@ -902,6 +1352,7 @@ public function ReadXmlChildInstrText(): InstrText; function ReadXmlChildAlternateContent(): AlternateContent; function ReadXmlChildDrawing(): Drawing; + function ReadXmlChildPict(): Pict; function ReadXmlChildT(): T; function ReadXmlChildObject(): Object; function ReadXmlChildFootnoteReference(): FootnoteReference; @@ -922,6 +1373,7 @@ public XmlChildLastRenderedPageBreak: OpenXmlEmpty; XmlChildAlternateContent: AlternateContent; XmlChildDrawing: Drawing; + XmlChildPict: Pict; XmlChildT: T; XmlChildObject: Object; XmlChildFootnoteReference: FootnoteReference; @@ -1127,9 +1579,13 @@ public // multi property property Trs read ReadTrs; + property Sdts read ReadSdts; function ReadTrs(_index); + function ReadSdts(_index); function AddTr(): Tr; + function AddSdt(): Sdt; function AppendTr(): Tr; + function AppendSdt(): Sdt; public // Children @@ -1439,9 +1895,13 @@ public function ReadXmlChildTrPr(): TrPr; // multi property + property Sdts read ReadSdts; property Tcs read ReadTcs; + function ReadSdts(_index); function ReadTcs(_index); + function AddSdt(): Sdt; function AddTc(): Tc; + function AppendSdt(): Sdt; function AppendTc(): Tc; public @@ -1475,11 +1935,13 @@ public property Jc read ReadXmlChildJc; property CnfStyle read ReadXmlChildCnfStyle; property Ins read ReadXmlChildIns; + property Del read ReadXmlChildDel; function ReadXmlChildTrHeight(): TrHeight; function ReadXmlChildTblHeader(): PureWVal; function ReadXmlChildJc(): PureWVal; function ReadXmlChildCnfStyle(): CnfStyle; function ReadXmlChildIns(): Ins; + function ReadXmlChildDel(): Del; public // Children @@ -1489,6 +1951,7 @@ public XmlChildCantSplit: OpenXmlEmpty; XmlChildCnfStyle: CnfStyle; XmlChildIns: Ins; + XmlChildDel: Del; end; type Ins = class(OpenXmlElement) @@ -1670,11 +2133,13 @@ public property VAlign read ReadXmlChildVAlign; property Shd read ReadXmlChildShd; property TcBorders read ReadXmlChildTcBorders; + property TextDirection read ReadXmlChildTextDirection; function ReadXmlChildTcW(): TblW; function ReadXmlChildGridSpan(): GridSpan; function ReadXmlChildVAlign(): PureWVal; function ReadXmlChildShd(): Shd; function ReadXmlChildTcBorders(): TcBorders; + function ReadXmlChildTextDirection(): PureWVal; public // Children @@ -1685,6 +2150,7 @@ public XmlChildHideMark: OpenXmlEmpty; XmlChildShd: Shd; XmlChildTcBorders: TcBorders; + XmlChildTextDirection: PureWVal; end; type TcBorders = class(OpenXmlElement) @@ -1784,41 +2250,6 @@ public end; -type Shd = class(OpenXmlElement) -public - function Create();overload; - function Create(_node: XmlNode);overload; - function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; - function Init();override; - function Copy(_obj: Shd);override; -public - // attributes property - property Val read ReadXmlAttrVal write WriteXmlAttrVal; - property Color read ReadXmlAttrColor write WriteXmlAttrColor; - property Fill read ReadXmlAttrFill write WriteXmlAttrFill; - property ThemeFill read ReadXmlAttrThemeFill write WriteXmlAttrThemeFill; - property ThemeFillTint read ReadXmlAttrThemeFillTint write WriteXmlAttrThemeFillTint; - function ReadXmlAttrVal(); - function WriteXmlAttrVal(_value); - function ReadXmlAttrColor(); - function WriteXmlAttrColor(_value); - function ReadXmlAttrFill(); - function WriteXmlAttrFill(_value); - function ReadXmlAttrThemeFill(); - function WriteXmlAttrThemeFill(_value); - function ReadXmlAttrThemeFillTint(); - function WriteXmlAttrThemeFillTint(_value); - -public - // Attributes - XmlAttrVal: OpenXmlAttribute; - XmlAttrColor: OpenXmlAttribute; - XmlAttrFill: OpenXmlAttribute; - XmlAttrThemeFill: OpenXmlAttribute; - XmlAttrThemeFillTint: OpenXmlAttribute; - -end; - type Sdt = class(OpenXmlElement) public function Create();overload; @@ -1955,6 +2386,7 @@ public property PgNumType read ReadXmlChildPgNumType; property Cols read ReadXmlChildCols; property DocGrid read ReadXmlChildDocGrid; + property TextDirection read ReadXmlChildTextDirection; function ReadXmlChildFootnotePr(): FootnotePr; function ReadXmlChildEndnotePr(): EndnotePr; function ReadXmlChildType(): PureWVal; @@ -1963,6 +2395,7 @@ public function ReadXmlChildPgNumType(): PgNumType; function ReadXmlChildCols(): Cols; function ReadXmlChildDocGrid(): DocGrid; + function ReadXmlChildTextDirection(): PureWVal; // multi property property HeaderReferences read ReadHeaderReferences; @@ -1989,6 +2422,7 @@ public XmlChildCols: Cols; XmlChildTitlePg: OpenXmlEmpty; XmlChildDocGrid: DocGrid; + XmlChildTextDirection: PureWVal; end; type Reference = class(OpenXmlElement) @@ -2895,9 +3329,9 @@ public function Copy(_obj: Styles);override; public // attributes property - property McIgnorable read ReadXmlAttrMcIgnorable write WriteXmlAttrMcIgnorable; - function ReadXmlAttrMcIgnorable(); - function WriteXmlAttrMcIgnorable(_value); + property Ignorable read ReadXmlAttrIgnorable write WriteXmlAttrIgnorable; + function ReadXmlAttrIgnorable(); + function WriteXmlAttrIgnorable(_value); // normal property property DocDefaults read ReadXmlChildDocDefaults; @@ -2913,7 +3347,7 @@ public public // Attributes - XmlAttrMcIgnorable: OpenXmlAttribute; + XmlAttrIgnorable: OpenXmlAttribute; // Children XmlChildDocDefaults: DocDefaults; @@ -3241,9 +3675,9 @@ public function Copy(_obj: WebSettings);override; public // attributes property - property McIgnorable read ReadXmlAttrMcIgnorable write WriteXmlAttrMcIgnorable; - function ReadXmlAttrMcIgnorable(); - function WriteXmlAttrMcIgnorable(_value); + property Ignorable read ReadXmlAttrIgnorable write WriteXmlAttrIgnorable; + function ReadXmlAttrIgnorable(); + function WriteXmlAttrIgnorable(_value); // empty property property OptimizeForBrowser read ReadXmlChildOptimizeForBrowser write WriteXmlChildOptimizeForBrowser; @@ -3255,7 +3689,7 @@ public public // Attributes - XmlAttrMcIgnorable: OpenXmlAttribute; + XmlAttrIgnorable: OpenXmlAttribute; // Children XmlChildOptimizeForBrowser: OpenXmlEmpty; @@ -3344,13 +3778,43 @@ public // normal property property Shapetype read ReadXmlChildShapetype; property Shape read ReadXmlChildShape; + property Control read ReadXmlChildControl; function ReadXmlChildShapetype(): Shapetype; function ReadXmlChildShape(): Shape; + function ReadXmlChildControl(): Control; public // Children XmlChildShapetype: Shapetype; XmlChildShape: Shape; + XmlChildControl: Control; +end; + +type Control = class(OpenXmlElement) +public + function Create();overload; + function Create(_node: XmlNode);overload; + function Create(_parent: tslobj; _prefix: string; _local_name: string);overload; + function Init();override; + function Copy(_obj: Control);override; +public + // attributes property + property Id read ReadXmlAttrId write WriteXmlAttrId; + property Shapeid read ReadXmlAttrShapeid write WriteXmlAttrShapeid; + property name read ReadXmlAttrname write WriteXmlAttrname; + function ReadXmlAttrId(); + function WriteXmlAttrId(_value); + function ReadXmlAttrShapeid(); + function WriteXmlAttrShapeid(_value); + function ReadXmlAttrname(); + function WriteXmlAttrname(_value); + +public + // Attributes + XmlAttrId: OpenXmlAttribute; + XmlAttrShapeid: OpenXmlAttribute; + XmlAttrname: OpenXmlAttribute; + end; type Ftr = class(OpenXmlElement) @@ -3392,6 +3856,10 @@ public function ReadXmlAttrIgnorable(); function WriteXmlAttrIgnorable(_value); + // normal property + property Sdt read ReadXmlChildSdt; + function ReadXmlChildSdt(): Sdt; + // multi property property Ps read ReadPs; function ReadPs(_index); @@ -3403,6 +3871,7 @@ public XmlAttrIgnorable: OpenXmlAttribute; // Children + XmlChildSdt: Sdt; end; type Comments = class(OpenXmlElement) @@ -3877,7 +4346,7 @@ begin pre := {self.}Prefix ? {self.}Prefix + ":" : ""; attributes_ := array(); attributes_pf_ := array( - "mc:Ignorable": makeweakref(thisFunction(WriteXmlAttrMcIgnorable)), + "mc:Ignorable": makeweakref(thisFunction(WriteXmlAttrIgnorable)), ); sorted_child_ := array( pre + "body": array(0, makeweakref(thisFunction(ReadXmlChildBody))), @@ -3890,26 +4359,26 @@ begin tslassigning_backup := tslassigning; tslassigning := 1; class(OpenXmlElement).Copy(_obj); - if not ifnil(_obj.McIgnorable) then - {self.}McIgnorable := _obj.McIgnorable; + if not ifnil(_obj.Ignorable) then + {self.}Ignorable := _obj.Ignorable; if not ifnil(_obj.XmlChildBody) then {self.}Body.Copy(_obj.XmlChildBody); tslassigning := tslassigning_backup; end; -function Document.ReadXmlAttrMcIgnorable(); +function Document.ReadXmlAttrIgnorable(); begin - return {self.}XmlAttrMcIgnorable.Value; + return {self.}XmlAttrIgnorable.Value; end; -function Document.WriteXmlAttrMcIgnorable(_value); +function Document.WriteXmlAttrIgnorable(_value); begin - if ifnil({self.}XmlAttrMcIgnorable) then + if ifnil({self.}XmlAttrIgnorable) then begin - {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); - attributes_[length(attributes_)] := {self.}XmlAttrMcIgnorable; + {self.}XmlAttrIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + attributes_[length(attributes_)] := {self.}XmlAttrIgnorable; end - {self.}XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrIgnorable.Value := _value; end; function Document.ReadXmlChildBody(): Body; @@ -4068,13 +4537,15 @@ begin pre + "pPr": array(0, makeweakref(thisFunction(ReadXmlChildPPr))), "m:oMathPara": array(1, makeweakref(thisFunction(ReadXmlChildOMathPara))), pre + "ins": array(2, makeweakref(thisFunction(ReadXmlChildIns))), - pre + "r": array(3, makeweakref(thisFunction(AppendR))), - pre + "commentRangeStart": array(4, makeweakref(thisFunction(AppendCommentRangeStart))), - pre + "commentRangeEnd": array(5, makeweakref(thisFunction(AppendCommentRangeEnd))), - pre + "bookmarkStart": array(6, makeweakref(thisFunction(AppendBookmarkStart))), - pre + "bookmarkEnd": array(7, makeweakref(thisFunction(AppendBookmarkEnd))), - pre + "hyperlink": array(8, makeweakref(thisFunction(AppendHyperLink))), - pre + "fldSimple": array(9, makeweakref(thisFunction(AppendFldSimple))), + pre + "del": array(3, makeweakref(thisFunction(ReadXmlChildDel))), + pre + "sdt": array(4, makeweakref(thisFunction(AppendSdt))), + pre + "r": array(5, makeweakref(thisFunction(AppendR))), + pre + "commentRangeStart": array(6, makeweakref(thisFunction(AppendCommentRangeStart))), + pre + "commentRangeEnd": array(7, makeweakref(thisFunction(AppendCommentRangeEnd))), + pre + "bookmarkStart": array(8, makeweakref(thisFunction(AppendBookmarkStart))), + pre + "bookmarkEnd": array(9, makeweakref(thisFunction(AppendBookmarkEnd))), + pre + "hyperlink": array(10, makeweakref(thisFunction(AppendHyperLink))), + pre + "fldSimple": array(11, makeweakref(thisFunction(AppendFldSimple))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -4102,6 +4573,8 @@ begin {self.}OMathPara.Copy(_obj.XmlChildOMathPara); if not ifnil(_obj.XmlChildIns) then {self.}Ins.Copy(_obj.XmlChildIns); + if not ifnil(_obj.XmlChildDel) then + {self.}Del.Copy(_obj.XmlChildDel); tslassigning := tslassigning_backup; end; @@ -4225,6 +4698,23 @@ begin return {self.}XmlChildIns; end; +function P.ReadXmlChildDel(): Del; +begin + if tslassigning and ifnil({self.}XmlChildDel) then + begin + {self.}XmlChildDel := new Del(self, {self.}Prefix, "del"); + container_.Set({self.}XmlChildDel); + end + return {self.}XmlChildDel; +end; + +function P.ReadSdts(_index); +begin + ind := ifnil(_index) ? -2 : _index; + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + return container_.Get(pre + "sdt", ind); +end; + function P.ReadRs(_index); begin ind := ifnil(_index) ? -2 : _index; @@ -4274,6 +4764,13 @@ begin return container_.Get(pre + "fldSimple", ind); end; +function P.AddSdt(): Sdt; +begin + obj := new Sdt(self, {self.}Prefix, "sdt"); + container_.Insert(obj); + return obj; +end; + function P.AddR(): R; begin obj := new R(self, {self.}Prefix, "r"); @@ -4323,6 +4820,13 @@ begin return obj; end; +function P.AppendSdt(): Sdt; +begin + obj := new Sdt(self, {self.}Prefix, "sdt"); + container_.Append(obj); + return obj; +end; + function P.AppendR(): R; begin obj := new R(self, {self.}Prefix, "r"); @@ -4707,26 +5211,39 @@ begin sorted_child_ := array( pre + "sectPr": array(0, makeweakref(thisFunction(ReadXmlChildSectPr))), pre + "tabs": array(1, makeweakref(thisFunction(ReadXmlChildTabs))), - pre + "widowControl": array(2, makeweakref(thisFunction(ReadXmlChildWidowControl))), - pre + "snapToGrid": array(3, makeweakref(thisFunction(ReadXmlChildSnapToGrid))), - pre + "pStyle": array(4, makeweakref(thisFunction(ReadXmlChildPStyle))), - pre + "numPr": array(5, makeweakref(thisFunction(ReadXmlChildNumPr))), - pre + "jc": array(6, makeweakref(thisFunction(ReadXmlChildJc))), - pre + "ind": array(7, makeweakref(thisFunction(ReadXmlChildInd))), - pre + "keepNext": array(8, makeweakref(thisFunction(ReadXmlChildKeepNext))), - pre + "keepLines": array(9, makeweakref(thisFunction(ReadXmlChildKeepLines))), - pre + "pageBreakBefore": array(10, makeweakref(thisFunction(ReadXmlChildPageBreakBefore))), - pre + "adjustRightInd": array(11, makeweakref(thisFunction(ReadXmlChildAdjustRightInd))), - pre + "spacing": array(12, makeweakref(thisFunction(ReadXmlChildSpacing))), - pre + "outlineLvl": array(13, makeweakref(thisFunction(ReadXmlChildOutlineLvl))), - pre + "autoSpaceDE": array(14, makeweakref(thisFunction(ReadXmlChildAutoSpaceDE))), - pre + "autoSpaceDN": array(15, makeweakref(thisFunction(ReadXmlChildAutoSpaceDN))), - pre + "rPr": array(16, makeweakref(thisFunction(ReadXmlChildRPr))), - pre + "pBdr": array(17, makeweakref(thisFunction(ReadXmlChildPBdr))), - pre + "contextualSpacing": array(18, makeweakref(thisFunction(ReadXmlChildContextualSpacing))), - pre + "shd": array(19, makeweakref(thisFunction(ReadXmlChildShd))), - pre + "wordWrap": array(20, makeweakref(thisFunction(ReadXmlChildWordWrap))), - pre + "textboxTightWrap": array(21, makeweakref(thisFunction(ReadXmlChildTextboxTightWrap))), + pre + "bidi": array(2, makeweakref(thisFunction(ReadXmlChildBidi))), + pre + "widowControl": array(3, makeweakref(thisFunction(ReadXmlChildWidowControl))), + pre + "snapToGrid": array(4, makeweakref(thisFunction(ReadXmlChildSnapToGrid))), + pre + "pStyle": array(5, makeweakref(thisFunction(ReadXmlChildPStyle))), + pre + "numPr": array(6, makeweakref(thisFunction(ReadXmlChildNumPr))), + pre + "jc": array(7, makeweakref(thisFunction(ReadXmlChildJc))), + pre + "ind": array(8, makeweakref(thisFunction(ReadXmlChildInd))), + pre + "keepNext": array(9, makeweakref(thisFunction(ReadXmlChildKeepNext))), + pre + "keepLines": array(10, makeweakref(thisFunction(ReadXmlChildKeepLines))), + pre + "mirrorIndents": array(11, makeweakref(thisFunction(ReadXmlChildMirrorIndents))), + pre + "kinsoku": array(12, makeweakref(thisFunction(ReadXmlChildKinsoku))), + pre + "pageBreakBefore": array(13, makeweakref(thisFunction(ReadXmlChildPageBreakBefore))), + pre + "suppressAutoHyphens": array(14, makeweakref(thisFunction(ReadXmlChildSuppressAutoHyphens))), + pre + "suppressLineNumbers": array(15, makeweakref(thisFunction(ReadXmlChildSuppressLineNumbers))), + pre + "suppressOverlap": array(16, makeweakref(thisFunction(ReadXmlChildSuppressOverlap))), + pre + "overflowPunct": array(17, makeweakref(thisFunction(ReadXmlChildOverflowPunct))), + pre + "adjustRightInd": array(18, makeweakref(thisFunction(ReadXmlChildAdjustRightInd))), + pre + "spacing": array(19, makeweakref(thisFunction(ReadXmlChildSpacing))), + pre + "outlineLvl": array(20, makeweakref(thisFunction(ReadXmlChildOutlineLvl))), + pre + "autoSpaceDE": array(21, makeweakref(thisFunction(ReadXmlChildAutoSpaceDE))), + pre + "autoSpaceDN": array(22, makeweakref(thisFunction(ReadXmlChildAutoSpaceDN))), + pre + "rPr": array(23, makeweakref(thisFunction(ReadXmlChildRPr))), + pre + "pBdr": array(24, makeweakref(thisFunction(ReadXmlChildPBdr))), + pre + "contextualSpacing": array(25, makeweakref(thisFunction(ReadXmlChildContextualSpacing))), + pre + "shd": array(26, makeweakref(thisFunction(ReadXmlChildShd))), + pre + "wordWrap": array(27, makeweakref(thisFunction(ReadXmlChildWordWrap))), + pre + "divId": array(28, makeweakref(thisFunction(ReadXmlChildDivId))), + pre + "cnfStyle": array(29, makeweakref(thisFunction(ReadXmlChildCnfStyle))), + pre + "framePr": array(30, makeweakref(thisFunction(ReadXmlChildFramePr))), + pre + "textboxTightWrap": array(31, makeweakref(thisFunction(ReadXmlChildTextboxTightWrap))), + pre + "topLinePunct": array(32, makeweakref(thisFunction(ReadXmlChildTopLinePunct))), + pre + "textAlignment": array(33, makeweakref(thisFunction(ReadXmlChildTextAlignment))), + pre + "textDirection": array(34, makeweakref(thisFunction(ReadXmlChildTextDirection))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -4740,6 +5257,8 @@ begin {self.}SectPr.Copy(_obj.XmlChildSectPr); if not ifnil(_obj.XmlChildTabs) then {self.}Tabs.Copy(_obj.XmlChildTabs); + if not ifnil(_obj.XmlChildBidi) then + ifnil({self.}XmlChildBidi) ? {self.}Bidi.Copy(_obj.XmlChildBidi) : {self.}XmlChildBidi.Copy(_obj.XmlChildBidi); if not ifnil(_obj.XmlChildWidowControl) then ifnil({self.}XmlChildWidowControl) ? {self.}WidowControl.Copy(_obj.XmlChildWidowControl) : {self.}XmlChildWidowControl.Copy(_obj.XmlChildWidowControl); if not ifnil(_obj.XmlChildSnapToGrid) then @@ -4756,8 +5275,20 @@ begin ifnil({self.}XmlChildKeepNext) ? {self.}KeepNext.Copy(_obj.XmlChildKeepNext) : {self.}XmlChildKeepNext.Copy(_obj.XmlChildKeepNext); if not ifnil(_obj.XmlChildKeepLines) then ifnil({self.}XmlChildKeepLines) ? {self.}KeepLines.Copy(_obj.XmlChildKeepLines) : {self.}XmlChildKeepLines.Copy(_obj.XmlChildKeepLines); + if not ifnil(_obj.XmlChildMirrorIndents) then + ifnil({self.}XmlChildMirrorIndents) ? {self.}MirrorIndents.Copy(_obj.XmlChildMirrorIndents) : {self.}XmlChildMirrorIndents.Copy(_obj.XmlChildMirrorIndents); + if not ifnil(_obj.XmlChildKinsoku) then + {self.}Kinsoku.Copy(_obj.XmlChildKinsoku); if not ifnil(_obj.XmlChildPageBreakBefore) then ifnil({self.}XmlChildPageBreakBefore) ? {self.}PageBreakBefore.Copy(_obj.XmlChildPageBreakBefore) : {self.}XmlChildPageBreakBefore.Copy(_obj.XmlChildPageBreakBefore); + if not ifnil(_obj.XmlChildSuppressAutoHyphens) then + ifnil({self.}XmlChildSuppressAutoHyphens) ? {self.}SuppressAutoHyphens.Copy(_obj.XmlChildSuppressAutoHyphens) : {self.}XmlChildSuppressAutoHyphens.Copy(_obj.XmlChildSuppressAutoHyphens); + if not ifnil(_obj.XmlChildSuppressLineNumbers) then + ifnil({self.}XmlChildSuppressLineNumbers) ? {self.}SuppressLineNumbers.Copy(_obj.XmlChildSuppressLineNumbers) : {self.}XmlChildSuppressLineNumbers.Copy(_obj.XmlChildSuppressLineNumbers); + if not ifnil(_obj.XmlChildSuppressOverlap) then + ifnil({self.}XmlChildSuppressOverlap) ? {self.}SuppressOverlap.Copy(_obj.XmlChildSuppressOverlap) : {self.}XmlChildSuppressOverlap.Copy(_obj.XmlChildSuppressOverlap); + if not ifnil(_obj.XmlChildOverflowPunct) then + {self.}OverflowPunct.Copy(_obj.XmlChildOverflowPunct); if not ifnil(_obj.XmlChildAdjustRightInd) then {self.}AdjustRightInd.Copy(_obj.XmlChildAdjustRightInd); if not ifnil(_obj.XmlChildSpacing) then @@ -4778,11 +5309,47 @@ begin {self.}Shd.Copy(_obj.XmlChildShd); if not ifnil(_obj.XmlChildWordWrap) then {self.}WordWrap.Copy(_obj.XmlChildWordWrap); + if not ifnil(_obj.XmlChildDivId) then + {self.}DivId.Copy(_obj.XmlChildDivId); + if not ifnil(_obj.XmlChildCnfStyle) then + {self.}CnfStyle.Copy(_obj.XmlChildCnfStyle); + if not ifnil(_obj.XmlChildFramePr) then + {self.}FramePr.Copy(_obj.XmlChildFramePr); if not ifnil(_obj.XmlChildTextboxTightWrap) then {self.}TextboxTightWrap.Copy(_obj.XmlChildTextboxTightWrap); + if not ifnil(_obj.XmlChildTopLinePunct) then + {self.}TopLinePunct.Copy(_obj.XmlChildTopLinePunct); + if not ifnil(_obj.XmlChildTextAlignment) then + {self.}TextAlignment.Copy(_obj.XmlChildTextAlignment); + if not ifnil(_obj.XmlChildTextDirection) then + {self.}TextDirection.Copy(_obj.XmlChildTextDirection); tslassigning := tslassigning_backup; end; +function PPr.ReadXmlChildBidi(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildBidi) then + begin + {self.}XmlChildBidi := new OpenXmlEmpty(self, {self.}Prefix, "bidi"); + container_.Set({self.}XmlChildBidi); + end + return {self.}XmlChildBidi; + end + return ifnil({self.}XmlChildBidi) ? nil : {self.}XmlChildBidi.BoolValue(); +end; + +function PPr.WriteXmlChildBidi(_value); +begin + if ifnil({self.}XmlChildBidi) then + begin + {self.}XmlChildBidi := new OpenXmlEmpty(self, {self.}Prefix, "bidi"); + container_.Set({self.}XmlChildBidi); + end + {self.}XmlChildBidi.Value := _value; +end; + function PPr.ReadXmlChildWidowControl(); begin if tslassigning then @@ -4879,6 +5446,30 @@ begin {self.}XmlChildKeepLines.Value := _value; end; +function PPr.ReadXmlChildMirrorIndents(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildMirrorIndents) then + begin + {self.}XmlChildMirrorIndents := new OpenXmlEmpty(self, {self.}Prefix, "mirrorIndents"); + container_.Set({self.}XmlChildMirrorIndents); + end + return {self.}XmlChildMirrorIndents; + end + return ifnil({self.}XmlChildMirrorIndents) ? nil : {self.}XmlChildMirrorIndents.BoolValue(); +end; + +function PPr.WriteXmlChildMirrorIndents(_value); +begin + if ifnil({self.}XmlChildMirrorIndents) then + begin + {self.}XmlChildMirrorIndents := new OpenXmlEmpty(self, {self.}Prefix, "mirrorIndents"); + container_.Set({self.}XmlChildMirrorIndents); + end + {self.}XmlChildMirrorIndents.Value := _value; +end; + function PPr.ReadXmlChildPageBreakBefore(); begin if tslassigning then @@ -4903,6 +5494,78 @@ begin {self.}XmlChildPageBreakBefore.Value := _value; end; +function PPr.ReadXmlChildSuppressAutoHyphens(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildSuppressAutoHyphens) then + begin + {self.}XmlChildSuppressAutoHyphens := new OpenXmlEmpty(self, {self.}Prefix, "suppressAutoHyphens"); + container_.Set({self.}XmlChildSuppressAutoHyphens); + end + return {self.}XmlChildSuppressAutoHyphens; + end + return ifnil({self.}XmlChildSuppressAutoHyphens) ? nil : {self.}XmlChildSuppressAutoHyphens.BoolValue(); +end; + +function PPr.WriteXmlChildSuppressAutoHyphens(_value); +begin + if ifnil({self.}XmlChildSuppressAutoHyphens) then + begin + {self.}XmlChildSuppressAutoHyphens := new OpenXmlEmpty(self, {self.}Prefix, "suppressAutoHyphens"); + container_.Set({self.}XmlChildSuppressAutoHyphens); + end + {self.}XmlChildSuppressAutoHyphens.Value := _value; +end; + +function PPr.ReadXmlChildSuppressLineNumbers(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildSuppressLineNumbers) then + begin + {self.}XmlChildSuppressLineNumbers := new OpenXmlEmpty(self, {self.}Prefix, "suppressLineNumbers"); + container_.Set({self.}XmlChildSuppressLineNumbers); + end + return {self.}XmlChildSuppressLineNumbers; + end + return ifnil({self.}XmlChildSuppressLineNumbers) ? nil : {self.}XmlChildSuppressLineNumbers.BoolValue(); +end; + +function PPr.WriteXmlChildSuppressLineNumbers(_value); +begin + if ifnil({self.}XmlChildSuppressLineNumbers) then + begin + {self.}XmlChildSuppressLineNumbers := new OpenXmlEmpty(self, {self.}Prefix, "suppressLineNumbers"); + container_.Set({self.}XmlChildSuppressLineNumbers); + end + {self.}XmlChildSuppressLineNumbers.Value := _value; +end; + +function PPr.ReadXmlChildSuppressOverlap(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildSuppressOverlap) then + begin + {self.}XmlChildSuppressOverlap := new OpenXmlEmpty(self, {self.}Prefix, "suppressOverlap"); + container_.Set({self.}XmlChildSuppressOverlap); + end + return {self.}XmlChildSuppressOverlap; + end + return ifnil({self.}XmlChildSuppressOverlap) ? nil : {self.}XmlChildSuppressOverlap.BoolValue(); +end; + +function PPr.WriteXmlChildSuppressOverlap(_value); +begin + if ifnil({self.}XmlChildSuppressOverlap) then + begin + {self.}XmlChildSuppressOverlap := new OpenXmlEmpty(self, {self.}Prefix, "suppressOverlap"); + container_.Set({self.}XmlChildSuppressOverlap); + end + {self.}XmlChildSuppressOverlap.Value := _value; +end; + function PPr.ReadXmlChildContextualSpacing(); begin if tslassigning then @@ -4987,6 +5650,26 @@ begin return {self.}XmlChildInd; end; +function PPr.ReadXmlChildKinsoku(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildKinsoku) then + begin + {self.}XmlChildKinsoku := new PureWVal(self, {self.}Prefix, "kinsoku"); + container_.Set({self.}XmlChildKinsoku); + end + return {self.}XmlChildKinsoku; +end; + +function PPr.ReadXmlChildOverflowPunct(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildOverflowPunct) then + begin + {self.}XmlChildOverflowPunct := new PureWVal(self, {self.}Prefix, "overflowPunct"); + container_.Set({self.}XmlChildOverflowPunct); + end + return {self.}XmlChildOverflowPunct; +end; + function PPr.ReadXmlChildAdjustRightInd(): PureWVal; begin if tslassigning and ifnil({self.}XmlChildAdjustRightInd) then @@ -5077,6 +5760,36 @@ begin return {self.}XmlChildWordWrap; end; +function PPr.ReadXmlChildDivId(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildDivId) then + begin + {self.}XmlChildDivId := new PureWVal(self, {self.}Prefix, "divId"); + container_.Set({self.}XmlChildDivId); + end + return {self.}XmlChildDivId; +end; + +function PPr.ReadXmlChildCnfStyle(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildCnfStyle) then + begin + {self.}XmlChildCnfStyle := new PureWVal(self, {self.}Prefix, "cnfStyle"); + container_.Set({self.}XmlChildCnfStyle); + end + return {self.}XmlChildCnfStyle; +end; + +function PPr.ReadXmlChildFramePr(): FramePr; +begin + if tslassigning and ifnil({self.}XmlChildFramePr) then + begin + {self.}XmlChildFramePr := new FramePr(self, {self.}Prefix, "framePr"); + container_.Set({self.}XmlChildFramePr); + end + return {self.}XmlChildFramePr; +end; + function PPr.ReadXmlChildTextboxTightWrap(): PureWVal; begin if tslassigning and ifnil({self.}XmlChildTextboxTightWrap) then @@ -5087,6 +5800,36 @@ begin return {self.}XmlChildTextboxTightWrap; end; +function PPr.ReadXmlChildTopLinePunct(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildTopLinePunct) then + begin + {self.}XmlChildTopLinePunct := new PureWVal(self, {self.}Prefix, "topLinePunct"); + container_.Set({self.}XmlChildTopLinePunct); + end + return {self.}XmlChildTopLinePunct; +end; + +function PPr.ReadXmlChildTextAlignment(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildTextAlignment) then + begin + {self.}XmlChildTextAlignment := new PureWVal(self, {self.}Prefix, "textAlignment"); + container_.Set({self.}XmlChildTextAlignment); + end + return {self.}XmlChildTextAlignment; +end; + +function PPr.ReadXmlChildTextDirection(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildTextDirection) then + begin + {self.}XmlChildTextDirection := new PureWVal(self, {self.}Prefix, "textDirection"); + container_.Set({self.}XmlChildTextDirection); + end + return {self.}XmlChildTextDirection; +end; + function PBdr.Create();overload; begin {self.}Create(nil, "w", "pBdr"); @@ -5111,7 +5854,10 @@ begin ); sorted_child_ := array( pre + "top": array(0, makeweakref(thisFunction(ReadXmlChildTop))), - pre + "bottom": array(1, makeweakref(thisFunction(ReadXmlChildBottom))), + pre + "left": array(1, makeweakref(thisFunction(ReadXmlChildLeft))), + pre + "right": array(2, makeweakref(thisFunction(ReadXmlChildRight))), + pre + "bottom": array(3, makeweakref(thisFunction(ReadXmlChildBottom))), + pre + "between": array(4, makeweakref(thisFunction(ReadXmlChildBetween))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -5123,8 +5869,14 @@ begin class(OpenXmlElement).Copy(_obj); if not ifnil(_obj.XmlChildTop) then {self.}Top.Copy(_obj.XmlChildTop); + if not ifnil(_obj.XmlChildLeft) then + {self.}Left.Copy(_obj.XmlChildLeft); + if not ifnil(_obj.XmlChildRight) then + {self.}Right.Copy(_obj.XmlChildRight); if not ifnil(_obj.XmlChildBottom) then {self.}Bottom.Copy(_obj.XmlChildBottom); + if not ifnil(_obj.XmlChildBetween) then + {self.}Between.Copy(_obj.XmlChildBetween); tslassigning := tslassigning_backup; end; @@ -5138,6 +5890,26 @@ begin return {self.}XmlChildTop; end; +function PBdr.ReadXmlChildLeft(): PBorder; +begin + if tslassigning and ifnil({self.}XmlChildLeft) then + begin + {self.}XmlChildLeft := new PBorder(self, {self.}Prefix, "left"); + container_.Set({self.}XmlChildLeft); + end + return {self.}XmlChildLeft; +end; + +function PBdr.ReadXmlChildRight(): PBorder; +begin + if tslassigning and ifnil({self.}XmlChildRight) then + begin + {self.}XmlChildRight := new PBorder(self, {self.}Prefix, "right"); + container_.Set({self.}XmlChildRight); + end + return {self.}XmlChildRight; +end; + function PBdr.ReadXmlChildBottom(): PBorder; begin if tslassigning and ifnil({self.}XmlChildBottom) then @@ -5148,6 +5920,339 @@ begin return {self.}XmlChildBottom; end; +function PBdr.ReadXmlChildBetween(): PBorder; +begin + if tslassigning and ifnil({self.}XmlChildBetween) then + begin + {self.}XmlChildBetween := new PBorder(self, {self.}Prefix, "between"); + container_.Set({self.}XmlChildBetween); + end + return {self.}XmlChildBetween; +end; + +function FramePr.Create();overload; +begin + {self.}Create(nil, "w", "framePr"); +end; + +function FramePr.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function FramePr.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function FramePr.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + pre + "anchorLock": makeweakref(thisFunction(WriteXmlAttrAnchorLock)), + pre + "dropCap": makeweakref(thisFunction(WriteXmlAttrDropCap)), + pre + "vAnchor": makeweakref(thisFunction(WriteXmlAttrVAnchor)), + pre + "hAnchor": makeweakref(thisFunction(WriteXmlAttrHAnchor)), + pre + "hRule": makeweakref(thisFunction(WriteXmlAttrHRule)), + pre + "hSpace": makeweakref(thisFunction(WriteXmlAttrHSpace)), + pre + "vSpace": makeweakref(thisFunction(WriteXmlAttrVSpace)), + pre + "lines": makeweakref(thisFunction(WriteXmlAttrLines)), + pre + "wrap": makeweakref(thisFunction(WriteXmlAttrWrap)), + pre + "val": makeweakref(thisFunction(WriteXmlAttrVal)), + pre + "w": makeweakref(thisFunction(WriteXmlAttrW)), + pre + "h": makeweakref(thisFunction(WriteXmlAttrH)), + pre + "x": makeweakref(thisFunction(WriteXmlAttrX)), + pre + "y": makeweakref(thisFunction(WriteXmlAttrY)), + pre + "xAlign": makeweakref(thisFunction(WriteXmlAttrXAlign)), + pre + "yAlign": makeweakref(thisFunction(WriteXmlAttrYAlign)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function FramePr.Copy(_obj: FramePr);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.AnchorLock) then + {self.}AnchorLock := _obj.AnchorLock; + if not ifnil(_obj.DropCap) then + {self.}DropCap := _obj.DropCap; + if not ifnil(_obj.VAnchor) then + {self.}VAnchor := _obj.VAnchor; + if not ifnil(_obj.HAnchor) then + {self.}HAnchor := _obj.HAnchor; + if not ifnil(_obj.HRule) then + {self.}HRule := _obj.HRule; + if not ifnil(_obj.HSpace) then + {self.}HSpace := _obj.HSpace; + if not ifnil(_obj.VSpace) then + {self.}VSpace := _obj.VSpace; + if not ifnil(_obj.Lines) then + {self.}Lines := _obj.Lines; + if not ifnil(_obj.Wrap) then + {self.}Wrap := _obj.Wrap; + if not ifnil(_obj.Val) then + {self.}Val := _obj.Val; + if not ifnil(_obj.W) then + {self.}W := _obj.W; + if not ifnil(_obj.H) then + {self.}H := _obj.H; + if not ifnil(_obj.X) then + {self.}X := _obj.X; + if not ifnil(_obj.Y) then + {self.}Y := _obj.Y; + if not ifnil(_obj.XAlign) then + {self.}XAlign := _obj.XAlign; + if not ifnil(_obj.YAlign) then + {self.}YAlign := _obj.YAlign; + tslassigning := tslassigning_backup; +end; + +function FramePr.ReadXmlAttrAnchorLock(); +begin + return {self.}XmlAttrAnchorLock.Value; +end; + +function FramePr.WriteXmlAttrAnchorLock(_value); +begin + if ifnil({self.}XmlAttrAnchorLock) then + begin + {self.}XmlAttrAnchorLock := new OpenXmlAttribute({self.}Prefix, "anchorLock", nil); + attributes_[length(attributes_)] := {self.}XmlAttrAnchorLock; + end + {self.}XmlAttrAnchorLock.Value := _value; +end; + +function FramePr.ReadXmlAttrDropCap(); +begin + return {self.}XmlAttrDropCap.Value; +end; + +function FramePr.WriteXmlAttrDropCap(_value); +begin + if ifnil({self.}XmlAttrDropCap) then + begin + {self.}XmlAttrDropCap := new OpenXmlAttribute({self.}Prefix, "dropCap", nil); + attributes_[length(attributes_)] := {self.}XmlAttrDropCap; + end + {self.}XmlAttrDropCap.Value := _value; +end; + +function FramePr.ReadXmlAttrVAnchor(); +begin + return {self.}XmlAttrVAnchor.Value; +end; + +function FramePr.WriteXmlAttrVAnchor(_value); +begin + if ifnil({self.}XmlAttrVAnchor) then + begin + {self.}XmlAttrVAnchor := new OpenXmlAttribute({self.}Prefix, "vAnchor", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVAnchor; + end + {self.}XmlAttrVAnchor.Value := _value; +end; + +function FramePr.ReadXmlAttrHAnchor(); +begin + return {self.}XmlAttrHAnchor.Value; +end; + +function FramePr.WriteXmlAttrHAnchor(_value); +begin + if ifnil({self.}XmlAttrHAnchor) then + begin + {self.}XmlAttrHAnchor := new OpenXmlAttribute({self.}Prefix, "hAnchor", nil); + attributes_[length(attributes_)] := {self.}XmlAttrHAnchor; + end + {self.}XmlAttrHAnchor.Value := _value; +end; + +function FramePr.ReadXmlAttrHRule(); +begin + return {self.}XmlAttrHRule.Value; +end; + +function FramePr.WriteXmlAttrHRule(_value); +begin + if ifnil({self.}XmlAttrHRule) then + begin + {self.}XmlAttrHRule := new OpenXmlAttribute({self.}Prefix, "hRule", nil); + attributes_[length(attributes_)] := {self.}XmlAttrHRule; + end + {self.}XmlAttrHRule.Value := _value; +end; + +function FramePr.ReadXmlAttrHSpace(); +begin + return {self.}XmlAttrHSpace.Value; +end; + +function FramePr.WriteXmlAttrHSpace(_value); +begin + if ifnil({self.}XmlAttrHSpace) then + begin + {self.}XmlAttrHSpace := new OpenXmlAttribute({self.}Prefix, "hSpace", nil); + attributes_[length(attributes_)] := {self.}XmlAttrHSpace; + end + {self.}XmlAttrHSpace.Value := _value; +end; + +function FramePr.ReadXmlAttrVSpace(); +begin + return {self.}XmlAttrVSpace.Value; +end; + +function FramePr.WriteXmlAttrVSpace(_value); +begin + if ifnil({self.}XmlAttrVSpace) then + begin + {self.}XmlAttrVSpace := new OpenXmlAttribute({self.}Prefix, "vSpace", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVSpace; + end + {self.}XmlAttrVSpace.Value := _value; +end; + +function FramePr.ReadXmlAttrLines(); +begin + return {self.}XmlAttrLines.Value; +end; + +function FramePr.WriteXmlAttrLines(_value); +begin + if ifnil({self.}XmlAttrLines) then + begin + {self.}XmlAttrLines := new OpenXmlAttribute({self.}Prefix, "lines", nil); + attributes_[length(attributes_)] := {self.}XmlAttrLines; + end + {self.}XmlAttrLines.Value := _value; +end; + +function FramePr.ReadXmlAttrWrap(); +begin + return {self.}XmlAttrWrap.Value; +end; + +function FramePr.WriteXmlAttrWrap(_value); +begin + if ifnil({self.}XmlAttrWrap) then + begin + {self.}XmlAttrWrap := new OpenXmlAttribute({self.}Prefix, "wrap", nil); + attributes_[length(attributes_)] := {self.}XmlAttrWrap; + end + {self.}XmlAttrWrap.Value := _value; +end; + +function FramePr.ReadXmlAttrVal(); +begin + return {self.}XmlAttrVal.Value; +end; + +function FramePr.WriteXmlAttrVal(_value); +begin + if ifnil({self.}XmlAttrVal) then + begin + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVal; + end + {self.}XmlAttrVal.Value := _value; +end; + +function FramePr.ReadXmlAttrW(); +begin + return {self.}XmlAttrW.Value; +end; + +function FramePr.WriteXmlAttrW(_value); +begin + if ifnil({self.}XmlAttrW) then + begin + {self.}XmlAttrW := new OpenXmlAttribute({self.}Prefix, "w", nil); + attributes_[length(attributes_)] := {self.}XmlAttrW; + end + {self.}XmlAttrW.Value := _value; +end; + +function FramePr.ReadXmlAttrH(); +begin + return {self.}XmlAttrH.Value; +end; + +function FramePr.WriteXmlAttrH(_value); +begin + if ifnil({self.}XmlAttrH) then + begin + {self.}XmlAttrH := new OpenXmlAttribute({self.}Prefix, "h", nil); + attributes_[length(attributes_)] := {self.}XmlAttrH; + end + {self.}XmlAttrH.Value := _value; +end; + +function FramePr.ReadXmlAttrX(); +begin + return {self.}XmlAttrX.Value; +end; + +function FramePr.WriteXmlAttrX(_value); +begin + if ifnil({self.}XmlAttrX) then + begin + {self.}XmlAttrX := new OpenXmlAttribute({self.}Prefix, "x", nil); + attributes_[length(attributes_)] := {self.}XmlAttrX; + end + {self.}XmlAttrX.Value := _value; +end; + +function FramePr.ReadXmlAttrY(); +begin + return {self.}XmlAttrY.Value; +end; + +function FramePr.WriteXmlAttrY(_value); +begin + if ifnil({self.}XmlAttrY) then + begin + {self.}XmlAttrY := new OpenXmlAttribute({self.}Prefix, "y", nil); + attributes_[length(attributes_)] := {self.}XmlAttrY; + end + {self.}XmlAttrY.Value := _value; +end; + +function FramePr.ReadXmlAttrXAlign(); +begin + return {self.}XmlAttrXAlign.Value; +end; + +function FramePr.WriteXmlAttrXAlign(_value); +begin + if ifnil({self.}XmlAttrXAlign) then + begin + {self.}XmlAttrXAlign := new OpenXmlAttribute({self.}Prefix, "xAlign", nil); + attributes_[length(attributes_)] := {self.}XmlAttrXAlign; + end + {self.}XmlAttrXAlign.Value := _value; +end; + +function FramePr.ReadXmlAttrYAlign(); +begin + return {self.}XmlAttrYAlign.Value; +end; + +function FramePr.WriteXmlAttrYAlign(_value); +begin + if ifnil({self.}XmlAttrYAlign) then + begin + {self.}XmlAttrYAlign := new OpenXmlAttribute({self.}Prefix, "yAlign", nil); + attributes_[length(attributes_)] := {self.}XmlAttrYAlign; + end + {self.}XmlAttrYAlign.Value := _value; +end; + function PBorder.Create();overload; begin {self.}Create(nil, "w", ""); @@ -5172,7 +6277,10 @@ begin pre + "val": makeweakref(thisFunction(WriteXmlAttrVal)), pre + "color": makeweakref(thisFunction(WriteXmlAttrColor)), pre + "space": makeweakref(thisFunction(WriteXmlAttrSpace)), + pre + "frame": makeweakref(thisFunction(WriteXmlAttrFrame)), + pre + "shadow": makeweakref(thisFunction(WriteXmlAttrShadow)), pre + "themeColor": makeweakref(thisFunction(WriteXmlAttrThemeColor)), + pre + "themeShade": makeweakref(thisFunction(WriteXmlAttrThemeShade)), pre + "themeTint": makeweakref(thisFunction(WriteXmlAttrThemeTint)), pre + "sz": makeweakref(thisFunction(WriteXmlAttrSz)), ); @@ -5192,8 +6300,14 @@ begin {self.}Color := _obj.Color; if not ifnil(_obj.Space) then {self.}Space := _obj.Space; + if not ifnil(_obj.Frame) then + {self.}Frame := _obj.Frame; + if not ifnil(_obj.Shadow) then + {self.}Shadow := _obj.Shadow; if not ifnil(_obj.ThemeColor) then {self.}ThemeColor := _obj.ThemeColor; + if not ifnil(_obj.ThemeShade) then + {self.}ThemeShade := _obj.ThemeShade; if not ifnil(_obj.ThemeTint) then {self.}ThemeTint := _obj.ThemeTint; if not ifnil(_obj.Sz) then @@ -5246,6 +6360,36 @@ begin {self.}XmlAttrSpace.Value := _value; end; +function PBorder.ReadXmlAttrFrame(); +begin + return {self.}XmlAttrFrame.Value; +end; + +function PBorder.WriteXmlAttrFrame(_value); +begin + if ifnil({self.}XmlAttrFrame) then + begin + {self.}XmlAttrFrame := new OpenXmlAttribute({self.}Prefix, "frame", nil); + attributes_[length(attributes_)] := {self.}XmlAttrFrame; + end + {self.}XmlAttrFrame.Value := _value; +end; + +function PBorder.ReadXmlAttrShadow(); +begin + return {self.}XmlAttrShadow.Value; +end; + +function PBorder.WriteXmlAttrShadow(_value); +begin + if ifnil({self.}XmlAttrShadow) then + begin + {self.}XmlAttrShadow := new OpenXmlAttribute({self.}Prefix, "shadow", nil); + attributes_[length(attributes_)] := {self.}XmlAttrShadow; + end + {self.}XmlAttrShadow.Value := _value; +end; + function PBorder.ReadXmlAttrThemeColor(); begin return {self.}XmlAttrThemeColor.Value; @@ -5261,6 +6405,21 @@ begin {self.}XmlAttrThemeColor.Value := _value; end; +function PBorder.ReadXmlAttrThemeShade(); +begin + return {self.}XmlAttrThemeShade.Value; +end; + +function PBorder.WriteXmlAttrThemeShade(_value); +begin + if ifnil({self.}XmlAttrThemeShade) then + begin + {self.}XmlAttrThemeShade := new OpenXmlAttribute({self.}Prefix, "themeShade", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeShade; + end + {self.}XmlAttrThemeShade.Value := _value; +end; + function PBorder.ReadXmlAttrThemeTint(); begin return {self.}XmlAttrThemeTint.Value; @@ -5880,24 +7039,45 @@ begin ); sorted_child_ := array( pre + "noProof": array(0, makeweakref(thisFunction(ReadXmlChildNoProof))), - pre + "position": array(1, makeweakref(thisFunction(ReadXmlChildPosition))), - pre + "wedHidden": array(2, makeweakref(thisFunction(ReadXmlChildWebHidden))), - pre + "rStyle": array(3, makeweakref(thisFunction(ReadXmlChildRStyle))), - pre + "ins": array(4, makeweakref(thisFunction(ReadXmlChildIns))), - pre + "rFonts": array(5, makeweakref(thisFunction(ReadXmlChildRFonts))), - pre + "kern": array(6, makeweakref(thisFunction(ReadXmlChildKern))), - pre + "i": array(7, makeweakref(thisFunction(ReadXmlChildI))), - pre + "iCs": array(8, makeweakref(thisFunction(ReadXmlChildICs))), - pre + "b": array(9, makeweakref(thisFunction(ReadXmlChildB))), - pre + "bCs": array(10, makeweakref(thisFunction(ReadXmlChildBCs))), - pre + "strike": array(11, makeweakref(thisFunction(ReadXmlChildStrike))), - pre + "color": array(12, makeweakref(thisFunction(ReadXmlChildColor))), - pre + "sz": array(13, makeweakref(thisFunction(ReadXmlChildSz))), - pre + "szCs": array(14, makeweakref(thisFunction(ReadXmlChildSzCs))), - pre + "u": array(15, makeweakref(thisFunction(ReadXmlChildU))), - pre + "lang": array(16, makeweakref(thisFunction(ReadXmlChildLang))), - pre + "vertAlign": array(17, makeweakref(thisFunction(ReadXmlChildVertAlign))), - "w14:ligatures": array(18, makeweakref(thisFunction(ReadXmlChildLigatures))), + pre + "outline": array(1, makeweakref(thisFunction(ReadXmlChildOutline))), + pre + "position": array(2, makeweakref(thisFunction(ReadXmlChildPosition))), + pre + "wedHidden": array(3, makeweakref(thisFunction(ReadXmlChildWebHidden))), + pre + "rStyle": array(4, makeweakref(thisFunction(ReadXmlChildRStyle))), + pre + "ins": array(5, makeweakref(thisFunction(ReadXmlChildIns))), + pre + "rFonts": array(6, makeweakref(thisFunction(ReadXmlChildRFonts))), + pre + "kern": array(7, makeweakref(thisFunction(ReadXmlChildKern))), + pre + "i": array(8, makeweakref(thisFunction(ReadXmlChildI))), + pre + "iCs": array(9, makeweakref(thisFunction(ReadXmlChildICs))), + pre + "b": array(10, makeweakref(thisFunction(ReadXmlChildB))), + pre + "bCs": array(11, makeweakref(thisFunction(ReadXmlChildBCs))), + pre + "bdr": array(12, makeweakref(thisFunction(ReadXmlChildBdr))), + pre + "caps": array(13, makeweakref(thisFunction(ReadXmlChildCaps))), + pre + "del": array(14, makeweakref(thisFunction(ReadXmlChildDel))), + pre + "strike": array(15, makeweakref(thisFunction(ReadXmlChildStrike))), + pre + "dstrike": array(16, makeweakref(thisFunction(ReadXmlChildDStrike))), + pre + "effect": array(17, makeweakref(thisFunction(ReadXmlChildEffect))), + pre + "em": array(18, makeweakref(thisFunction(ReadXmlChildEm))), + pre + "emboss": array(19, makeweakref(thisFunction(ReadXmlChildEmboss))), + pre + "fitText": array(20, makeweakref(thisFunction(ReadXmlChildFitText))), + pre + "highlight": array(21, makeweakref(thisFunction(ReadXmlChildHighlight))), + pre + "color": array(22, makeweakref(thisFunction(ReadXmlChildColor))), + pre + "eastAsianLayout": array(23, makeweakref(thisFunction(ReadXmlChildEastAsianLayout))), + pre + "cs": array(24, makeweakref(thisFunction(ReadXmlChildCs))), + pre + "sz": array(25, makeweakref(thisFunction(ReadXmlChildSz))), + pre + "szCs": array(26, makeweakref(thisFunction(ReadXmlChildSzCs))), + pre + "u": array(27, makeweakref(thisFunction(ReadXmlChildU))), + pre + "lang": array(28, makeweakref(thisFunction(ReadXmlChildLang))), + pre + "imprint": array(29, makeweakref(thisFunction(ReadXmlChildImprint))), + pre + "vertAlign": array(30, makeweakref(thisFunction(ReadXmlChildVertAlign))), + "w14:ligatures": array(31, makeweakref(thisFunction(ReadXmlChildLigatures))), + pre + "rtl": array(32, makeweakref(thisFunction(ReadXmlChildRtl))), + pre + "oMath": array(33, makeweakref(thisFunction(ReadXmlChildOMath))), + pre + "shadow": array(34, makeweakref(thisFunction(ReadXmlChildShadow))), + pre + "specVanish": array(35, makeweakref(thisFunction(ReadXmlChildSpecVanish))), + pre + "vanish": array(36, makeweakref(thisFunction(ReadXmlChildVanish))), + pre + "shd": array(37, makeweakref(thisFunction(ReadXmlChildShd))), + pre + "smallCaps": array(38, makeweakref(thisFunction(ReadXmlChildSmallCaps))), + pre + "w": array(39, makeweakref(thisFunction(ReadXmlChildW))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -5909,6 +7089,8 @@ begin class(OpenXmlElement).Copy(_obj); if not ifnil(_obj.XmlChildNoProof) then {self.}NoProof.Copy(_obj.XmlChildNoProof); + if not ifnil(_obj.XmlChildOutline) then + {self.}Outline.Copy(_obj.XmlChildOutline); if not ifnil(_obj.XmlChildPosition) then {self.}Position.Copy(_obj.XmlChildPosition); if not ifnil(_obj.XmlChildWebHidden) then @@ -5929,10 +7111,32 @@ begin ifnil({self.}XmlChildB) ? {self.}B.Copy(_obj.XmlChildB) : {self.}XmlChildB.Copy(_obj.XmlChildB); if not ifnil(_obj.XmlChildBCs) then ifnil({self.}XmlChildBCs) ? {self.}BCs.Copy(_obj.XmlChildBCs) : {self.}XmlChildBCs.Copy(_obj.XmlChildBCs); + if not ifnil(_obj.XmlChildBdr) then + {self.}Bdr.Copy(_obj.XmlChildBdr); + if not ifnil(_obj.XmlChildCaps) then + {self.}Caps.Copy(_obj.XmlChildCaps); + if not ifnil(_obj.XmlChildDel) then + {self.}Del.Copy(_obj.XmlChildDel); if not ifnil(_obj.XmlChildStrike) then ifnil({self.}XmlChildStrike) ? {self.}Strike.Copy(_obj.XmlChildStrike) : {self.}XmlChildStrike.Copy(_obj.XmlChildStrike); + if not ifnil(_obj.XmlChildDStrike) then + {self.}DStrike.Copy(_obj.XmlChildDStrike); + if not ifnil(_obj.XmlChildEffect) then + {self.}Effect.Copy(_obj.XmlChildEffect); + if not ifnil(_obj.XmlChildEm) then + {self.}Em.Copy(_obj.XmlChildEm); + if not ifnil(_obj.XmlChildEmboss) then + {self.}Emboss.Copy(_obj.XmlChildEmboss); + if not ifnil(_obj.XmlChildFitText) then + {self.}FitText.Copy(_obj.XmlChildFitText); + if not ifnil(_obj.XmlChildHighlight) then + {self.}Highlight.Copy(_obj.XmlChildHighlight); if not ifnil(_obj.XmlChildColor) then {self.}Color.Copy(_obj.XmlChildColor); + if not ifnil(_obj.XmlChildEastAsianLayout) then + {self.}EastAsianLayout.Copy(_obj.XmlChildEastAsianLayout); + if not ifnil(_obj.XmlChildCs) then + ifnil({self.}XmlChildCs) ? {self.}Cs.Copy(_obj.XmlChildCs) : {self.}XmlChildCs.Copy(_obj.XmlChildCs); if not ifnil(_obj.XmlChildSz) then {self.}Sz.Copy(_obj.XmlChildSz); if not ifnil(_obj.XmlChildSzCs) then @@ -5941,10 +7145,28 @@ begin ifnil({self.}XmlChildU) ? {self.}U.Copy(_obj.XmlChildU) : {self.}XmlChildU.Copy(_obj.XmlChildU); if not ifnil(_obj.XmlChildLang) then {self.}Lang.Copy(_obj.XmlChildLang); + if not ifnil(_obj.XmlChildImprint) then + {self.}Imprint.Copy(_obj.XmlChildImprint); if not ifnil(_obj.XmlChildVertAlign) then {self.}VertAlign.Copy(_obj.XmlChildVertAlign); if not ifnil(_obj.XmlChildLigatures) then {self.}Ligatures.Copy(_obj.XmlChildLigatures); + if not ifnil(_obj.XmlChildRtl) then + {self.}Rtl.Copy(_obj.XmlChildRtl); + if not ifnil(_obj.XmlChildOMath) then + ifnil({self.}XmlChildOMath) ? {self.}OMath.Copy(_obj.XmlChildOMath) : {self.}XmlChildOMath.Copy(_obj.XmlChildOMath); + if not ifnil(_obj.XmlChildShadow) then + ifnil({self.}XmlChildShadow) ? {self.}Shadow.Copy(_obj.XmlChildShadow) : {self.}XmlChildShadow.Copy(_obj.XmlChildShadow); + if not ifnil(_obj.XmlChildSpecVanish) then + ifnil({self.}XmlChildSpecVanish) ? {self.}SpecVanish.Copy(_obj.XmlChildSpecVanish) : {self.}XmlChildSpecVanish.Copy(_obj.XmlChildSpecVanish); + if not ifnil(_obj.XmlChildVanish) then + ifnil({self.}XmlChildVanish) ? {self.}Vanish.Copy(_obj.XmlChildVanish) : {self.}XmlChildVanish.Copy(_obj.XmlChildVanish); + if not ifnil(_obj.XmlChildShd) then + {self.}Shd.Copy(_obj.XmlChildShd); + if not ifnil(_obj.XmlChildSmallCaps) then + {self.}SmallCaps.Copy(_obj.XmlChildSmallCaps); + if not ifnil(_obj.XmlChildW) then + {self.}W.Copy(_obj.XmlChildW); tslassigning := tslassigning_backup; end; @@ -6068,6 +7290,30 @@ begin {self.}XmlChildStrike.Value := _value; end; +function RPr.ReadXmlChildCs(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildCs) then + begin + {self.}XmlChildCs := new OpenXmlEmpty(self, {self.}Prefix, "cs"); + container_.Set({self.}XmlChildCs); + end + return {self.}XmlChildCs; + end + return ifnil({self.}XmlChildCs) ? nil : {self.}XmlChildCs.BoolValue(); +end; + +function RPr.WriteXmlChildCs(_value); +begin + if ifnil({self.}XmlChildCs) then + begin + {self.}XmlChildCs := new OpenXmlEmpty(self, {self.}Prefix, "cs"); + container_.Set({self.}XmlChildCs); + end + {self.}XmlChildCs.Value := _value; +end; + function RPr.ReadXmlChildU(); begin if tslassigning then @@ -6092,6 +7338,102 @@ begin {self.}XmlChildU.Value := _value; end; +function RPr.ReadXmlChildOMath(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildOMath) then + begin + {self.}XmlChildOMath := new OpenXmlEmpty(self, {self.}Prefix, "oMath"); + container_.Set({self.}XmlChildOMath); + end + return {self.}XmlChildOMath; + end + return ifnil({self.}XmlChildOMath) ? nil : {self.}XmlChildOMath.BoolValue(); +end; + +function RPr.WriteXmlChildOMath(_value); +begin + if ifnil({self.}XmlChildOMath) then + begin + {self.}XmlChildOMath := new OpenXmlEmpty(self, {self.}Prefix, "oMath"); + container_.Set({self.}XmlChildOMath); + end + {self.}XmlChildOMath.Value := _value; +end; + +function RPr.ReadXmlChildShadow(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildShadow) then + begin + {self.}XmlChildShadow := new OpenXmlEmpty(self, {self.}Prefix, "shadow"); + container_.Set({self.}XmlChildShadow); + end + return {self.}XmlChildShadow; + end + return ifnil({self.}XmlChildShadow) ? nil : {self.}XmlChildShadow.BoolValue(); +end; + +function RPr.WriteXmlChildShadow(_value); +begin + if ifnil({self.}XmlChildShadow) then + begin + {self.}XmlChildShadow := new OpenXmlEmpty(self, {self.}Prefix, "shadow"); + container_.Set({self.}XmlChildShadow); + end + {self.}XmlChildShadow.Value := _value; +end; + +function RPr.ReadXmlChildSpecVanish(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildSpecVanish) then + begin + {self.}XmlChildSpecVanish := new OpenXmlEmpty(self, {self.}Prefix, "specVanish"); + container_.Set({self.}XmlChildSpecVanish); + end + return {self.}XmlChildSpecVanish; + end + return ifnil({self.}XmlChildSpecVanish) ? nil : {self.}XmlChildSpecVanish.BoolValue(); +end; + +function RPr.WriteXmlChildSpecVanish(_value); +begin + if ifnil({self.}XmlChildSpecVanish) then + begin + {self.}XmlChildSpecVanish := new OpenXmlEmpty(self, {self.}Prefix, "specVanish"); + container_.Set({self.}XmlChildSpecVanish); + end + {self.}XmlChildSpecVanish.Value := _value; +end; + +function RPr.ReadXmlChildVanish(); +begin + if tslassigning then + begin + if ifnil({self.}XmlChildVanish) then + begin + {self.}XmlChildVanish := new OpenXmlEmpty(self, {self.}Prefix, "vanish"); + container_.Set({self.}XmlChildVanish); + end + return {self.}XmlChildVanish; + end + return ifnil({self.}XmlChildVanish) ? nil : {self.}XmlChildVanish.BoolValue(); +end; + +function RPr.WriteXmlChildVanish(_value); +begin + if ifnil({self.}XmlChildVanish) then + begin + {self.}XmlChildVanish := new OpenXmlEmpty(self, {self.}Prefix, "vanish"); + container_.Set({self.}XmlChildVanish); + end + {self.}XmlChildVanish.Value := _value; +end; + function RPr.ReadXmlChildNoProof(): PureVal; begin if tslassigning and ifnil({self.}XmlChildNoProof) then @@ -6102,6 +7444,16 @@ begin return {self.}XmlChildNoProof; end; +function RPr.ReadXmlChildOutline(): PureVal; +begin + if tslassigning and ifnil({self.}XmlChildOutline) then + begin + {self.}XmlChildOutline := new PureVal(self, {self.}Prefix, "outline"); + container_.Set({self.}XmlChildOutline); + end + return {self.}XmlChildOutline; +end; + function RPr.ReadXmlChildPosition(): PureVal; begin if tslassigning and ifnil({self.}XmlChildPosition) then @@ -6162,6 +7514,96 @@ begin return {self.}XmlChildKern; end; +function RPr.ReadXmlChildBdr(): Bdr; +begin + if tslassigning and ifnil({self.}XmlChildBdr) then + begin + {self.}XmlChildBdr := new Bdr(self, {self.}Prefix, "bdr"); + container_.Set({self.}XmlChildBdr); + end + return {self.}XmlChildBdr; +end; + +function RPr.ReadXmlChildCaps(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildCaps) then + begin + {self.}XmlChildCaps := new PureWVal(self, {self.}Prefix, "caps"); + container_.Set({self.}XmlChildCaps); + end + return {self.}XmlChildCaps; +end; + +function RPr.ReadXmlChildDel(): Del; +begin + if tslassigning and ifnil({self.}XmlChildDel) then + begin + {self.}XmlChildDel := new Del(self, {self.}Prefix, "del"); + container_.Set({self.}XmlChildDel); + end + return {self.}XmlChildDel; +end; + +function RPr.ReadXmlChildDStrike(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildDStrike) then + begin + {self.}XmlChildDStrike := new PureWVal(self, {self.}Prefix, "dstrike"); + container_.Set({self.}XmlChildDStrike); + end + return {self.}XmlChildDStrike; +end; + +function RPr.ReadXmlChildEffect(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildEffect) then + begin + {self.}XmlChildEffect := new PureWVal(self, {self.}Prefix, "effect"); + container_.Set({self.}XmlChildEffect); + end + return {self.}XmlChildEffect; +end; + +function RPr.ReadXmlChildEm(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildEm) then + begin + {self.}XmlChildEm := new PureWVal(self, {self.}Prefix, "em"); + container_.Set({self.}XmlChildEm); + end + return {self.}XmlChildEm; +end; + +function RPr.ReadXmlChildEmboss(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildEmboss) then + begin + {self.}XmlChildEmboss := new PureWVal(self, {self.}Prefix, "emboss"); + container_.Set({self.}XmlChildEmboss); + end + return {self.}XmlChildEmboss; +end; + +function RPr.ReadXmlChildFitText(): FitText; +begin + if tslassigning and ifnil({self.}XmlChildFitText) then + begin + {self.}XmlChildFitText := new FitText(self, {self.}Prefix, "fitText"); + container_.Set({self.}XmlChildFitText); + end + return {self.}XmlChildFitText; +end; + +function RPr.ReadXmlChildHighlight(): Highlight; +begin + if tslassigning and ifnil({self.}XmlChildHighlight) then + begin + {self.}XmlChildHighlight := new Highlight(self, {self.}Prefix, "highlight"); + container_.Set({self.}XmlChildHighlight); + end + return {self.}XmlChildHighlight; +end; + function RPr.ReadXmlChildColor(): Color; begin if tslassigning and ifnil({self.}XmlChildColor) then @@ -6172,6 +7614,16 @@ begin return {self.}XmlChildColor; end; +function RPr.ReadXmlChildEastAsianLayout(): EastAsianLayout; +begin + if tslassigning and ifnil({self.}XmlChildEastAsianLayout) then + begin + {self.}XmlChildEastAsianLayout := new EastAsianLayout(self, {self.}Prefix, "eastAsianLayout"); + container_.Set({self.}XmlChildEastAsianLayout); + end + return {self.}XmlChildEastAsianLayout; +end; + function RPr.ReadXmlChildSz(): Sz; begin if tslassigning and ifnil({self.}XmlChildSz) then @@ -6202,6 +7654,16 @@ begin return {self.}XmlChildLang; end; +function RPr.ReadXmlChildImprint(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildImprint) then + begin + {self.}XmlChildImprint := new PureWVal(self, {self.}Prefix, "imprint"); + container_.Set({self.}XmlChildImprint); + end + return {self.}XmlChildImprint; +end; + function RPr.ReadXmlChildVertAlign(): PureWVal; begin if tslassigning and ifnil({self.}XmlChildVertAlign) then @@ -6222,6 +7684,886 @@ begin return {self.}XmlChildLigatures; end; +function RPr.ReadXmlChildRtl(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildRtl) then + begin + {self.}XmlChildRtl := new PureWVal(self, {self.}Prefix, "rtl"); + container_.Set({self.}XmlChildRtl); + end + return {self.}XmlChildRtl; +end; + +function RPr.ReadXmlChildShd(): Shd; +begin + if tslassigning and ifnil({self.}XmlChildShd) then + begin + {self.}XmlChildShd := new Shd(self, {self.}Prefix, "shd"); + container_.Set({self.}XmlChildShd); + end + return {self.}XmlChildShd; +end; + +function RPr.ReadXmlChildSmallCaps(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildSmallCaps) then + begin + {self.}XmlChildSmallCaps := new PureWVal(self, {self.}Prefix, "smallCaps"); + container_.Set({self.}XmlChildSmallCaps); + end + return {self.}XmlChildSmallCaps; +end; + +function RPr.ReadXmlChildW(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildW) then + begin + {self.}XmlChildW := new PureWVal(self, {self.}Prefix, "w"); + container_.Set({self.}XmlChildW); + end + return {self.}XmlChildW; +end; + +function Shd.Create();overload; +begin + {self.}Create(nil, "w", "shd"); +end; + +function Shd.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function Shd.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function Shd.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + pre + "val": makeweakref(thisFunction(WriteXmlAttrVal)), + pre + "Color": makeweakref(thisFunction(WriteXmlAttrColor)), + pre + "Fill": makeweakref(thisFunction(WriteXmlAttrFill)), + pre + "themeColor": makeweakref(thisFunction(WriteXmlAttrThemeColor)), + pre + "themeFill": makeweakref(thisFunction(WriteXmlAttrThemeFill)), + pre + "themeFillTint": makeweakref(thisFunction(WriteXmlAttrThemeFillTint)), + pre + "themeFillShade": makeweakref(thisFunction(WriteXmlAttrThemeFillShade)), + pre + "themeShade": makeweakref(thisFunction(WriteXmlAttrThemeShade)), + pre + "themeTint": makeweakref(thisFunction(WriteXmlAttrThemeTint)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function Shd.Copy(_obj: Shd);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.Val) then + {self.}Val := _obj.Val; + if not ifnil(_obj.Color) then + {self.}Color := _obj.Color; + if not ifnil(_obj.Fill) then + {self.}Fill := _obj.Fill; + if not ifnil(_obj.ThemeColor) then + {self.}ThemeColor := _obj.ThemeColor; + if not ifnil(_obj.ThemeFill) then + {self.}ThemeFill := _obj.ThemeFill; + if not ifnil(_obj.ThemeFillTint) then + {self.}ThemeFillTint := _obj.ThemeFillTint; + if not ifnil(_obj.ThemeFillShade) then + {self.}ThemeFillShade := _obj.ThemeFillShade; + if not ifnil(_obj.ThemeShade) then + {self.}ThemeShade := _obj.ThemeShade; + if not ifnil(_obj.ThemeTint) then + {self.}ThemeTint := _obj.ThemeTint; + tslassigning := tslassigning_backup; +end; + +function Shd.ReadXmlAttrVal(); +begin + return {self.}XmlAttrVal.Value; +end; + +function Shd.WriteXmlAttrVal(_value); +begin + if ifnil({self.}XmlAttrVal) then + begin + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVal; + end + {self.}XmlAttrVal.Value := _value; +end; + +function Shd.ReadXmlAttrColor(); +begin + return {self.}XmlAttrColor.Value; +end; + +function Shd.WriteXmlAttrColor(_value); +begin + if ifnil({self.}XmlAttrColor) then + begin + {self.}XmlAttrColor := new OpenXmlAttribute({self.}Prefix, "Color", nil); + attributes_[length(attributes_)] := {self.}XmlAttrColor; + end + {self.}XmlAttrColor.Value := _value; +end; + +function Shd.ReadXmlAttrFill(); +begin + return {self.}XmlAttrFill.Value; +end; + +function Shd.WriteXmlAttrFill(_value); +begin + if ifnil({self.}XmlAttrFill) then + begin + {self.}XmlAttrFill := new OpenXmlAttribute({self.}Prefix, "Fill", nil); + attributes_[length(attributes_)] := {self.}XmlAttrFill; + end + {self.}XmlAttrFill.Value := _value; +end; + +function Shd.ReadXmlAttrThemeColor(); +begin + return {self.}XmlAttrThemeColor.Value; +end; + +function Shd.WriteXmlAttrThemeColor(_value); +begin + if ifnil({self.}XmlAttrThemeColor) then + begin + {self.}XmlAttrThemeColor := new OpenXmlAttribute({self.}Prefix, "themeColor", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeColor; + end + {self.}XmlAttrThemeColor.Value := _value; +end; + +function Shd.ReadXmlAttrThemeFill(); +begin + return {self.}XmlAttrThemeFill.Value; +end; + +function Shd.WriteXmlAttrThemeFill(_value); +begin + if ifnil({self.}XmlAttrThemeFill) then + begin + {self.}XmlAttrThemeFill := new OpenXmlAttribute({self.}Prefix, "themeFill", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeFill; + end + {self.}XmlAttrThemeFill.Value := _value; +end; + +function Shd.ReadXmlAttrThemeFillTint(); +begin + return {self.}XmlAttrThemeFillTint.Value; +end; + +function Shd.WriteXmlAttrThemeFillTint(_value); +begin + if ifnil({self.}XmlAttrThemeFillTint) then + begin + {self.}XmlAttrThemeFillTint := new OpenXmlAttribute({self.}Prefix, "themeFillTint", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeFillTint; + end + {self.}XmlAttrThemeFillTint.Value := _value; +end; + +function Shd.ReadXmlAttrThemeFillShade(); +begin + return {self.}XmlAttrThemeFillShade.Value; +end; + +function Shd.WriteXmlAttrThemeFillShade(_value); +begin + if ifnil({self.}XmlAttrThemeFillShade) then + begin + {self.}XmlAttrThemeFillShade := new OpenXmlAttribute({self.}Prefix, "themeFillShade", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeFillShade; + end + {self.}XmlAttrThemeFillShade.Value := _value; +end; + +function Shd.ReadXmlAttrThemeShade(); +begin + return {self.}XmlAttrThemeShade.Value; +end; + +function Shd.WriteXmlAttrThemeShade(_value); +begin + if ifnil({self.}XmlAttrThemeShade) then + begin + {self.}XmlAttrThemeShade := new OpenXmlAttribute({self.}Prefix, "themeShade", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeShade; + end + {self.}XmlAttrThemeShade.Value := _value; +end; + +function Shd.ReadXmlAttrThemeTint(); +begin + return {self.}XmlAttrThemeTint.Value; +end; + +function Shd.WriteXmlAttrThemeTint(_value); +begin + if ifnil({self.}XmlAttrThemeTint) then + begin + {self.}XmlAttrThemeTint := new OpenXmlAttribute({self.}Prefix, "themeTint", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeTint; + end + {self.}XmlAttrThemeTint.Value := _value; +end; + +function Highlight.Create();overload; +begin + {self.}Create(nil, "w", "highlight"); +end; + +function Highlight.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function Highlight.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function Highlight.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + pre + "val": makeweakref(thisFunction(WriteXmlAttrVal)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function Highlight.Copy(_obj: Highlight);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.Val) then + {self.}Val := _obj.Val; + tslassigning := tslassigning_backup; +end; + +function Highlight.ReadXmlAttrVal(); +begin + return {self.}XmlAttrVal.Value; +end; + +function Highlight.WriteXmlAttrVal(_value); +begin + if ifnil({self.}XmlAttrVal) then + begin + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVal; + end + {self.}XmlAttrVal.Value := _value; +end; + +function FitText.Create();overload; +begin + {self.}Create(nil, "w", "fitText"); +end; + +function FitText.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function FitText.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function FitText.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + pre + "id": makeweakref(thisFunction(WriteXmlAttrId)), + pre + "val": makeweakref(thisFunction(WriteXmlAttrVal)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function FitText.Copy(_obj: FitText);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.Id) then + {self.}Id := _obj.Id; + if not ifnil(_obj.Val) then + {self.}Val := _obj.Val; + tslassigning := tslassigning_backup; +end; + +function FitText.ReadXmlAttrId(); +begin + return {self.}XmlAttrId.Value; +end; + +function FitText.WriteXmlAttrId(_value); +begin + if ifnil({self.}XmlAttrId) then + begin + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); + attributes_[length(attributes_)] := {self.}XmlAttrId; + end + {self.}XmlAttrId.Value := _value; +end; + +function FitText.ReadXmlAttrVal(); +begin + return {self.}XmlAttrVal.Value; +end; + +function FitText.WriteXmlAttrVal(_value); +begin + if ifnil({self.}XmlAttrVal) then + begin + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVal; + end + {self.}XmlAttrVal.Value := _value; +end; + +function EastAsianLayout.Create();overload; +begin + {self.}Create(nil, "w", "eastAsianLayout"); +end; + +function EastAsianLayout.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function EastAsianLayout.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function EastAsianLayout.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + pre + "combine": makeweakref(thisFunction(WriteXmlAttrCombine)), + pre + "combineBrackets": makeweakref(thisFunction(WriteXmlAttrCombineBrackets)), + pre + "id": makeweakref(thisFunction(WriteXmlAttrId)), + pre + "vert": makeweakref(thisFunction(WriteXmlAttrVert)), + pre + "vertCompress": makeweakref(thisFunction(WriteXmlAttrVertCompress)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function EastAsianLayout.Copy(_obj: EastAsianLayout);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.Combine) then + {self.}Combine := _obj.Combine; + if not ifnil(_obj.CombineBrackets) then + {self.}CombineBrackets := _obj.CombineBrackets; + if not ifnil(_obj.Id) then + {self.}Id := _obj.Id; + if not ifnil(_obj.Vert) then + {self.}Vert := _obj.Vert; + if not ifnil(_obj.VertCompress) then + {self.}VertCompress := _obj.VertCompress; + tslassigning := tslassigning_backup; +end; + +function EastAsianLayout.ReadXmlAttrCombine(); +begin + return {self.}XmlAttrCombine.Value; +end; + +function EastAsianLayout.WriteXmlAttrCombine(_value); +begin + if ifnil({self.}XmlAttrCombine) then + begin + {self.}XmlAttrCombine := new OpenXmlAttribute({self.}Prefix, "combine", nil); + attributes_[length(attributes_)] := {self.}XmlAttrCombine; + end + {self.}XmlAttrCombine.Value := _value; +end; + +function EastAsianLayout.ReadXmlAttrCombineBrackets(); +begin + return {self.}XmlAttrCombineBrackets.Value; +end; + +function EastAsianLayout.WriteXmlAttrCombineBrackets(_value); +begin + if ifnil({self.}XmlAttrCombineBrackets) then + begin + {self.}XmlAttrCombineBrackets := new OpenXmlAttribute({self.}Prefix, "combineBrackets", nil); + attributes_[length(attributes_)] := {self.}XmlAttrCombineBrackets; + end + {self.}XmlAttrCombineBrackets.Value := _value; +end; + +function EastAsianLayout.ReadXmlAttrId(); +begin + return {self.}XmlAttrId.Value; +end; + +function EastAsianLayout.WriteXmlAttrId(_value); +begin + if ifnil({self.}XmlAttrId) then + begin + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); + attributes_[length(attributes_)] := {self.}XmlAttrId; + end + {self.}XmlAttrId.Value := _value; +end; + +function EastAsianLayout.ReadXmlAttrVert(); +begin + return {self.}XmlAttrVert.Value; +end; + +function EastAsianLayout.WriteXmlAttrVert(_value); +begin + if ifnil({self.}XmlAttrVert) then + begin + {self.}XmlAttrVert := new OpenXmlAttribute({self.}Prefix, "vert", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVert; + end + {self.}XmlAttrVert.Value := _value; +end; + +function EastAsianLayout.ReadXmlAttrVertCompress(); +begin + return {self.}XmlAttrVertCompress.Value; +end; + +function EastAsianLayout.WriteXmlAttrVertCompress(_value); +begin + if ifnil({self.}XmlAttrVertCompress) then + begin + {self.}XmlAttrVertCompress := new OpenXmlAttribute({self.}Prefix, "vertCompress", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVertCompress; + end + {self.}XmlAttrVertCompress.Value := _value; +end; + +function Del.Create();overload; +begin + {self.}Create(nil, "w", "del"); +end; + +function Del.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function Del.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function Del.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + pre + "author": makeweakref(thisFunction(WriteXmlAttrAuthor)), + pre + "date": makeweakref(thisFunction(WriteXmlAttrDate)), + pre + "id": makeweakref(thisFunction(WriteXmlAttrId)), + pre + "color": makeweakref(thisFunction(WriteXmlAttrColor)), + pre + "themeColor": makeweakref(thisFunction(WriteXmlAttrThemeColor)), + pre + "themeShade": makeweakref(thisFunction(WriteXmlAttrThemeShade)), + pre + "themeTint": makeweakref(thisFunction(WriteXmlAttrThemeTint)), + pre + "frame": makeweakref(thisFunction(WriteXmlAttrFrame)), + pre + "shadow": makeweakref(thisFunction(WriteXmlAttrShadow)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function Del.Copy(_obj: Del);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.Author) then + {self.}Author := _obj.Author; + if not ifnil(_obj.Date) then + {self.}Date := _obj.Date; + if not ifnil(_obj.Id) then + {self.}Id := _obj.Id; + if not ifnil(_obj.Color) then + {self.}Color := _obj.Color; + if not ifnil(_obj.ThemeColor) then + {self.}ThemeColor := _obj.ThemeColor; + if not ifnil(_obj.ThemeShade) then + {self.}ThemeShade := _obj.ThemeShade; + if not ifnil(_obj.ThemeTint) then + {self.}ThemeTint := _obj.ThemeTint; + if not ifnil(_obj.Frame) then + {self.}Frame := _obj.Frame; + if not ifnil(_obj.Shadow) then + {self.}Shadow := _obj.Shadow; + tslassigning := tslassigning_backup; +end; + +function Del.ReadXmlAttrAuthor(); +begin + return {self.}XmlAttrAuthor.Value; +end; + +function Del.WriteXmlAttrAuthor(_value); +begin + if ifnil({self.}XmlAttrAuthor) then + begin + {self.}XmlAttrAuthor := new OpenXmlAttribute({self.}Prefix, "author", nil); + attributes_[length(attributes_)] := {self.}XmlAttrAuthor; + end + {self.}XmlAttrAuthor.Value := _value; +end; + +function Del.ReadXmlAttrDate(); +begin + return {self.}XmlAttrDate.Value; +end; + +function Del.WriteXmlAttrDate(_value); +begin + if ifnil({self.}XmlAttrDate) then + begin + {self.}XmlAttrDate := new OpenXmlAttribute({self.}Prefix, "date", nil); + attributes_[length(attributes_)] := {self.}XmlAttrDate; + end + {self.}XmlAttrDate.Value := _value; +end; + +function Del.ReadXmlAttrId(); +begin + return {self.}XmlAttrId.Value; +end; + +function Del.WriteXmlAttrId(_value); +begin + if ifnil({self.}XmlAttrId) then + begin + {self.}XmlAttrId := new OpenXmlAttribute({self.}Prefix, "id", nil); + attributes_[length(attributes_)] := {self.}XmlAttrId; + end + {self.}XmlAttrId.Value := _value; +end; + +function Del.ReadXmlAttrColor(); +begin + return {self.}XmlAttrColor.Value; +end; + +function Del.WriteXmlAttrColor(_value); +begin + if ifnil({self.}XmlAttrColor) then + begin + {self.}XmlAttrColor := new OpenXmlAttribute({self.}Prefix, "color", nil); + attributes_[length(attributes_)] := {self.}XmlAttrColor; + end + {self.}XmlAttrColor.Value := _value; +end; + +function Del.ReadXmlAttrThemeColor(); +begin + return {self.}XmlAttrThemeColor.Value; +end; + +function Del.WriteXmlAttrThemeColor(_value); +begin + if ifnil({self.}XmlAttrThemeColor) then + begin + {self.}XmlAttrThemeColor := new OpenXmlAttribute({self.}Prefix, "themeColor", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeColor; + end + {self.}XmlAttrThemeColor.Value := _value; +end; + +function Del.ReadXmlAttrThemeShade(); +begin + return {self.}XmlAttrThemeShade.Value; +end; + +function Del.WriteXmlAttrThemeShade(_value); +begin + if ifnil({self.}XmlAttrThemeShade) then + begin + {self.}XmlAttrThemeShade := new OpenXmlAttribute({self.}Prefix, "themeShade", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeShade; + end + {self.}XmlAttrThemeShade.Value := _value; +end; + +function Del.ReadXmlAttrThemeTint(); +begin + return {self.}XmlAttrThemeTint.Value; +end; + +function Del.WriteXmlAttrThemeTint(_value); +begin + if ifnil({self.}XmlAttrThemeTint) then + begin + {self.}XmlAttrThemeTint := new OpenXmlAttribute({self.}Prefix, "themeTint", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeTint; + end + {self.}XmlAttrThemeTint.Value := _value; +end; + +function Del.ReadXmlAttrFrame(); +begin + return {self.}XmlAttrFrame.Value; +end; + +function Del.WriteXmlAttrFrame(_value); +begin + if ifnil({self.}XmlAttrFrame) then + begin + {self.}XmlAttrFrame := new OpenXmlAttribute({self.}Prefix, "frame", nil); + attributes_[length(attributes_)] := {self.}XmlAttrFrame; + end + {self.}XmlAttrFrame.Value := _value; +end; + +function Del.ReadXmlAttrShadow(); +begin + return {self.}XmlAttrShadow.Value; +end; + +function Del.WriteXmlAttrShadow(_value); +begin + if ifnil({self.}XmlAttrShadow) then + begin + {self.}XmlAttrShadow := new OpenXmlAttribute({self.}Prefix, "shadow", nil); + attributes_[length(attributes_)] := {self.}XmlAttrShadow; + end + {self.}XmlAttrShadow.Value := _value; +end; + +function Bdr.Create();overload; +begin + {self.}Create(nil, "w", "bdr"); +end; + +function Bdr.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function Bdr.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function Bdr.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + pre + "val": makeweakref(thisFunction(WriteXmlAttrVal)), + pre + "sz": makeweakref(thisFunction(WriteXmlAttrSz)), + pre + "space": makeweakref(thisFunction(WriteXmlAttrSpace)), + pre + "color": makeweakref(thisFunction(WriteXmlAttrColor)), + pre + "themeColor": makeweakref(thisFunction(WriteXmlAttrThemeColor)), + pre + "themeShade": makeweakref(thisFunction(WriteXmlAttrThemeShade)), + pre + "themeTint": makeweakref(thisFunction(WriteXmlAttrThemeTint)), + pre + "frame": makeweakref(thisFunction(WriteXmlAttrFrame)), + pre + "shadow": makeweakref(thisFunction(WriteXmlAttrShadow)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function Bdr.Copy(_obj: Bdr);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.Val) then + {self.}Val := _obj.Val; + if not ifnil(_obj.Sz) then + {self.}Sz := _obj.Sz; + if not ifnil(_obj.Space) then + {self.}Space := _obj.Space; + if not ifnil(_obj.Color) then + {self.}Color := _obj.Color; + if not ifnil(_obj.ThemeColor) then + {self.}ThemeColor := _obj.ThemeColor; + if not ifnil(_obj.ThemeShade) then + {self.}ThemeShade := _obj.ThemeShade; + if not ifnil(_obj.ThemeTint) then + {self.}ThemeTint := _obj.ThemeTint; + if not ifnil(_obj.Frame) then + {self.}Frame := _obj.Frame; + if not ifnil(_obj.Shadow) then + {self.}Shadow := _obj.Shadow; + tslassigning := tslassigning_backup; +end; + +function Bdr.ReadXmlAttrVal(); +begin + return {self.}XmlAttrVal.Value; +end; + +function Bdr.WriteXmlAttrVal(_value); +begin + if ifnil({self.}XmlAttrVal) then + begin + {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil); + attributes_[length(attributes_)] := {self.}XmlAttrVal; + end + {self.}XmlAttrVal.Value := _value; +end; + +function Bdr.ReadXmlAttrSz(); +begin + return {self.}XmlAttrSz.Value; +end; + +function Bdr.WriteXmlAttrSz(_value); +begin + if ifnil({self.}XmlAttrSz) then + begin + {self.}XmlAttrSz := new OpenXmlAttribute({self.}Prefix, "sz", nil); + attributes_[length(attributes_)] := {self.}XmlAttrSz; + end + {self.}XmlAttrSz.Value := _value; +end; + +function Bdr.ReadXmlAttrSpace(); +begin + return {self.}XmlAttrSpace.Value; +end; + +function Bdr.WriteXmlAttrSpace(_value); +begin + if ifnil({self.}XmlAttrSpace) then + begin + {self.}XmlAttrSpace := new OpenXmlAttribute({self.}Prefix, "space", nil); + attributes_[length(attributes_)] := {self.}XmlAttrSpace; + end + {self.}XmlAttrSpace.Value := _value; +end; + +function Bdr.ReadXmlAttrColor(); +begin + return {self.}XmlAttrColor.Value; +end; + +function Bdr.WriteXmlAttrColor(_value); +begin + if ifnil({self.}XmlAttrColor) then + begin + {self.}XmlAttrColor := new OpenXmlAttribute({self.}Prefix, "color", nil); + attributes_[length(attributes_)] := {self.}XmlAttrColor; + end + {self.}XmlAttrColor.Value := _value; +end; + +function Bdr.ReadXmlAttrThemeColor(); +begin + return {self.}XmlAttrThemeColor.Value; +end; + +function Bdr.WriteXmlAttrThemeColor(_value); +begin + if ifnil({self.}XmlAttrThemeColor) then + begin + {self.}XmlAttrThemeColor := new OpenXmlAttribute({self.}Prefix, "themeColor", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeColor; + end + {self.}XmlAttrThemeColor.Value := _value; +end; + +function Bdr.ReadXmlAttrThemeShade(); +begin + return {self.}XmlAttrThemeShade.Value; +end; + +function Bdr.WriteXmlAttrThemeShade(_value); +begin + if ifnil({self.}XmlAttrThemeShade) then + begin + {self.}XmlAttrThemeShade := new OpenXmlAttribute({self.}Prefix, "themeShade", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeShade; + end + {self.}XmlAttrThemeShade.Value := _value; +end; + +function Bdr.ReadXmlAttrThemeTint(); +begin + return {self.}XmlAttrThemeTint.Value; +end; + +function Bdr.WriteXmlAttrThemeTint(_value); +begin + if ifnil({self.}XmlAttrThemeTint) then + begin + {self.}XmlAttrThemeTint := new OpenXmlAttribute({self.}Prefix, "themeTint", nil); + attributes_[length(attributes_)] := {self.}XmlAttrThemeTint; + end + {self.}XmlAttrThemeTint.Value := _value; +end; + +function Bdr.ReadXmlAttrFrame(); +begin + return {self.}XmlAttrFrame.Value; +end; + +function Bdr.WriteXmlAttrFrame(_value); +begin + if ifnil({self.}XmlAttrFrame) then + begin + {self.}XmlAttrFrame := new OpenXmlAttribute({self.}Prefix, "frame", nil); + attributes_[length(attributes_)] := {self.}XmlAttrFrame; + end + {self.}XmlAttrFrame.Value := _value; +end; + +function Bdr.ReadXmlAttrShadow(); +begin + return {self.}XmlAttrShadow.Value; +end; + +function Bdr.WriteXmlAttrShadow(_value); +begin + if ifnil({self.}XmlAttrShadow) then + begin + {self.}XmlAttrShadow := new OpenXmlAttribute({self.}Prefix, "shadow", nil); + attributes_[length(attributes_)] := {self.}XmlAttrShadow; + end + {self.}XmlAttrShadow.Value := _value; +end; + function RFonts.Create();overload; begin {self.}Create(nil, "w", "rFonts"); @@ -6773,10 +9115,11 @@ begin pre + "lastRenderedPageBreak": array(6, makeweakref(thisFunction(ReadXmlChildLastRenderedPageBreak))), "mc:AlternateContent": array(7, makeweakref(thisFunction(ReadXmlChildAlternateContent))), pre + "drawing": array(8, makeweakref(thisFunction(ReadXmlChildDrawing))), - pre + "t": array(9, makeweakref(thisFunction(ReadXmlChildT))), - pre + "object": array(10, makeweakref(thisFunction(ReadXmlChildObject))), - pre + "footnoteReference": array(11, makeweakref(thisFunction(ReadXmlChildFootnoteReference))), - pre + "footnoteRef": array(12, makeweakref(thisFunction(ReadXmlChildFootnoteRef))), + pre + "pict": array(9, makeweakref(thisFunction(ReadXmlChildPict))), + pre + "t": array(10, makeweakref(thisFunction(ReadXmlChildT))), + pre + "object": array(11, makeweakref(thisFunction(ReadXmlChildObject))), + pre + "footnoteReference": array(12, makeweakref(thisFunction(ReadXmlChildFootnoteReference))), + pre + "footnoteRef": array(13, makeweakref(thisFunction(ReadXmlChildFootnoteRef))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -6810,6 +9153,8 @@ begin {self.}AlternateContent.Copy(_obj.XmlChildAlternateContent); if not ifnil(_obj.XmlChildDrawing) then {self.}Drawing.Copy(_obj.XmlChildDrawing); + if not ifnil(_obj.XmlChildPict) then + {self.}Pict.Copy(_obj.XmlChildPict); if not ifnil(_obj.XmlChildT) then {self.}T.Copy(_obj.XmlChildT); if not ifnil(_obj.XmlChildObject) then @@ -7022,6 +9367,16 @@ begin return {self.}XmlChildDrawing; end; +function R.ReadXmlChildPict(): Pict; +begin + if tslassigning and ifnil({self.}XmlChildPict) then + begin + {self.}XmlChildPict := new Pict(self, {self.}Prefix, "pict"); + container_.Set({self.}XmlChildPict); + end + return {self.}XmlChildPict; +end; + function R.ReadXmlChildT(): T; begin if tslassigning and ifnil({self.}XmlChildT) then @@ -7619,6 +9974,7 @@ begin pre + "tblPr": array(0, makeweakref(thisFunction(ReadXmlChildTblPr))), pre + "tblGrid": array(1, makeweakref(thisFunction(ReadXmlChildTblGrid))), pre + "tr": array(2, makeweakref(thisFunction(AppendTr))), + pre + "sdt": array(3, makeweakref(thisFunction(AppendSdt))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -7662,6 +10018,13 @@ begin return container_.Get(pre + "tr", ind); end; +function Tbl.ReadSdts(_index); +begin + ind := ifnil(_index) ? -2 : _index; + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + return container_.Get(pre + "sdt", ind); +end; + function Tbl.AddTr(): Tr; begin obj := new Tr(self, {self.}Prefix, "tr"); @@ -7669,6 +10032,13 @@ begin return obj; end; +function Tbl.AddSdt(): Sdt; +begin + obj := new Sdt(self, {self.}Prefix, "sdt"); + container_.Insert(obj); + return obj; +end; + function Tbl.AppendTr(): Tr; begin obj := new Tr(self, {self.}Prefix, "tr"); @@ -7676,6 +10046,13 @@ begin return obj; end; +function Tbl.AppendSdt(): Sdt; +begin + obj := new Sdt(self, {self.}Prefix, "sdt"); + container_.Append(obj); + return obj; +end; + function TblPr.Create();overload; begin {self.}Create(nil, "w", "tblPr"); @@ -8643,7 +11020,8 @@ begin ); sorted_child_ := array( pre + "trPr": array(0, makeweakref(thisFunction(ReadXmlChildTrPr))), - pre + "tc": array(1, makeweakref(thisFunction(AppendTc))), + pre + "sdt": array(1, makeweakref(thisFunction(AppendSdt))), + pre + "tc": array(2, makeweakref(thisFunction(AppendTc))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -8736,6 +11114,13 @@ begin return {self.}XmlChildTrPr; end; +function Tr.ReadSdts(_index); +begin + ind := ifnil(_index) ? -2 : _index; + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + return container_.Get(pre + "sdt", ind); +end; + function Tr.ReadTcs(_index); begin ind := ifnil(_index) ? -2 : _index; @@ -8743,6 +11128,13 @@ begin return container_.Get(pre + "tc", ind); end; +function Tr.AddSdt(): Sdt; +begin + obj := new Sdt(self, {self.}Prefix, "sdt"); + container_.Insert(obj); + return obj; +end; + function Tr.AddTc(): Tc; begin obj := new Tc(self, {self.}Prefix, "tc"); @@ -8750,6 +11142,13 @@ begin return obj; end; +function Tr.AppendSdt(): Sdt; +begin + obj := new Sdt(self, {self.}Prefix, "sdt"); + container_.Append(obj); + return obj; +end; + function Tr.AppendTc(): Tc; begin obj := new Tc(self, {self.}Prefix, "tc"); @@ -8786,6 +11185,7 @@ begin pre + "cantSplit": array(3, makeweakref(thisFunction(ReadXmlChildCantSplit))), pre + "cnfStyle": array(4, makeweakref(thisFunction(ReadXmlChildCnfStyle))), pre + "ins": array(5, makeweakref(thisFunction(ReadXmlChildIns))), + pre + "del": array(6, makeweakref(thisFunction(ReadXmlChildDel))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -8807,6 +11207,8 @@ begin {self.}CnfStyle.Copy(_obj.XmlChildCnfStyle); if not ifnil(_obj.XmlChildIns) then {self.}Ins.Copy(_obj.XmlChildIns); + if not ifnil(_obj.XmlChildDel) then + {self.}Del.Copy(_obj.XmlChildDel); tslassigning := tslassigning_backup; end; @@ -8884,9 +11286,19 @@ begin return {self.}XmlChildIns; end; +function TrPr.ReadXmlChildDel(): Del; +begin + if tslassigning and ifnil({self.}XmlChildDel) then + begin + {self.}XmlChildDel := new Del(self, {self.}Prefix, "del"); + container_.Set({self.}XmlChildDel); + end + return {self.}XmlChildDel; +end; + function Ins.Create();overload; begin - {self.}Create(nil, "w", "gridCol"); + {self.}Create(nil, "w", "ins"); end; function Ins.Create(_node: XmlNode);overload; @@ -9475,6 +11887,7 @@ begin pre + "hideMark": array(4, makeweakref(thisFunction(ReadXmlChildHideMark))), pre + "shd": array(5, makeweakref(thisFunction(ReadXmlChildShd))), pre + "tcBorders": array(6, makeweakref(thisFunction(ReadXmlChildTcBorders))), + pre + "textDirection": array(7, makeweakref(thisFunction(ReadXmlChildTextDirection))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -9498,6 +11911,8 @@ begin {self.}Shd.Copy(_obj.XmlChildShd); if not ifnil(_obj.XmlChildTcBorders) then {self.}TcBorders.Copy(_obj.XmlChildTcBorders); + if not ifnil(_obj.XmlChildTextDirection) then + {self.}TextDirection.Copy(_obj.XmlChildTextDirection); tslassigning := tslassigning_backup; end; @@ -9599,6 +12014,16 @@ begin return {self.}XmlChildTcBorders; end; +function TcPr.ReadXmlChildTextDirection(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildTextDirection) then + begin + {self.}XmlChildTextDirection := new PureWVal(self, {self.}Prefix, "textDirection"); + container_.Set({self.}XmlChildTextDirection); + end + return {self.}XmlChildTextDirection; +end; + function TcBorders.Create();overload; begin {self.}Create(nil, "w", "tcBorders"); @@ -9934,131 +12359,6 @@ begin {self.}XmlAttrVal.Value := _value; end; -function Shd.Create();overload; -begin - {self.}Create(nil, "w", "shd"); -end; - -function Shd.Create(_node: XmlNode);overload; -begin - class(OpenXmlElement).Create(_node: XmlNode); -end; - -function Shd.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; -begin - setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); - class(OpenXmlElement).Create(_parent, _prefix, _local_name); -end; - -function Shd.Init();override; -begin - pre := {self.}Prefix ? {self.}Prefix + ":" : ""; - attributes_ := array(); - attributes_pf_ := array( - "w:val": makeweakref(thisFunction(WriteXmlAttrVal)), - "w:color": makeweakref(thisFunction(WriteXmlAttrColor)), - "w:fill": makeweakref(thisFunction(WriteXmlAttrFill)), - "w:themeFill": makeweakref(thisFunction(WriteXmlAttrThemeFill)), - "w:themeFillTint": makeweakref(thisFunction(WriteXmlAttrThemeFillTint)), - ); - sorted_child_ := array( - ); - container_ := new TSOfficeContainer(sorted_child_); -end; - -function Shd.Copy(_obj: Shd);override; -begin - tslassigning_backup := tslassigning; - tslassigning := 1; - class(OpenXmlElement).Copy(_obj); - if not ifnil(_obj.Val) then - {self.}Val := _obj.Val; - if not ifnil(_obj.Color) then - {self.}Color := _obj.Color; - if not ifnil(_obj.Fill) then - {self.}Fill := _obj.Fill; - if not ifnil(_obj.ThemeFill) then - {self.}ThemeFill := _obj.ThemeFill; - if not ifnil(_obj.ThemeFillTint) then - {self.}ThemeFillTint := _obj.ThemeFillTint; - tslassigning := tslassigning_backup; -end; - -function Shd.ReadXmlAttrVal(); -begin - return {self.}XmlAttrVal.Value; -end; - -function Shd.WriteXmlAttrVal(_value); -begin - if ifnil({self.}XmlAttrVal) then - begin - {self.}XmlAttrVal := new OpenXmlAttribute("w", "val", nil); - attributes_[length(attributes_)] := {self.}XmlAttrVal; - end - {self.}XmlAttrVal.Value := _value; -end; - -function Shd.ReadXmlAttrColor(); -begin - return {self.}XmlAttrColor.Value; -end; - -function Shd.WriteXmlAttrColor(_value); -begin - if ifnil({self.}XmlAttrColor) then - begin - {self.}XmlAttrColor := new OpenXmlAttribute("w", "color", nil); - attributes_[length(attributes_)] := {self.}XmlAttrColor; - end - {self.}XmlAttrColor.Value := _value; -end; - -function Shd.ReadXmlAttrFill(); -begin - return {self.}XmlAttrFill.Value; -end; - -function Shd.WriteXmlAttrFill(_value); -begin - if ifnil({self.}XmlAttrFill) then - begin - {self.}XmlAttrFill := new OpenXmlAttribute("w", "fill", nil); - attributes_[length(attributes_)] := {self.}XmlAttrFill; - end - {self.}XmlAttrFill.Value := _value; -end; - -function Shd.ReadXmlAttrThemeFill(); -begin - return {self.}XmlAttrThemeFill.Value; -end; - -function Shd.WriteXmlAttrThemeFill(_value); -begin - if ifnil({self.}XmlAttrThemeFill) then - begin - {self.}XmlAttrThemeFill := new OpenXmlAttribute("w", "themeFill", nil); - attributes_[length(attributes_)] := {self.}XmlAttrThemeFill; - end - {self.}XmlAttrThemeFill.Value := _value; -end; - -function Shd.ReadXmlAttrThemeFillTint(); -begin - return {self.}XmlAttrThemeFillTint.Value; -end; - -function Shd.WriteXmlAttrThemeFillTint(_value); -begin - if ifnil({self.}XmlAttrThemeFillTint) then - begin - {self.}XmlAttrThemeFillTint := new OpenXmlAttribute("w", "themeFillTint", nil); - attributes_[length(attributes_)] := {self.}XmlAttrThemeFillTint; - end - {self.}XmlAttrThemeFillTint.Value := _value; -end; - function Sdt.Create();overload; begin {self.}Create(nil, "w", "sdt"); @@ -10409,6 +12709,7 @@ begin pre + "cols": array(8, makeweakref(thisFunction(ReadXmlChildCols))), pre + "titlePg": array(9, makeweakref(thisFunction(ReadXmlChildTitlePg))), pre + "docGrid": array(10, makeweakref(thisFunction(ReadXmlChildDocGrid))), + pre + "textDirection": array(11, makeweakref(thisFunction(ReadXmlChildTextDirection))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -10440,6 +12741,8 @@ begin ifnil({self.}XmlChildTitlePg) ? {self.}TitlePg.Copy(_obj.XmlChildTitlePg) : {self.}XmlChildTitlePg.Copy(_obj.XmlChildTitlePg); if not ifnil(_obj.XmlChildDocGrid) then {self.}DocGrid.Copy(_obj.XmlChildDocGrid); + if not ifnil(_obj.XmlChildTextDirection) then + {self.}TextDirection.Copy(_obj.XmlChildTextDirection); tslassigning := tslassigning_backup; end; @@ -10577,6 +12880,16 @@ begin return {self.}XmlChildDocGrid; end; +function SectPr.ReadXmlChildTextDirection(): PureWVal; +begin + if tslassigning and ifnil({self.}XmlChildTextDirection) then + begin + {self.}XmlChildTextDirection := new PureWVal(self, {self.}Prefix, "textDirection"); + container_.Set({self.}XmlChildTextDirection); + end + return {self.}XmlChildTextDirection; +end; + function SectPr.ReadHeaderReferences(_index); begin ind := ifnil(_index) ? -2 : _index; @@ -13735,7 +16048,7 @@ begin pre := {self.}Prefix ? {self.}Prefix + ":" : ""; attributes_ := array(); attributes_pf_ := array( - "mc:Ignorable": makeweakref(thisFunction(WriteXmlAttrMcIgnorable)), + "mc:Ignorable": makeweakref(thisFunction(WriteXmlAttrIgnorable)), ); sorted_child_ := array( pre + "docDefaults": array(0, makeweakref(thisFunction(ReadXmlChildDocDefaults))), @@ -13750,8 +16063,8 @@ begin tslassigning_backup := tslassigning; tslassigning := 1; class(OpenXmlElement).Copy(_obj); - if not ifnil(_obj.McIgnorable) then - {self.}McIgnorable := _obj.McIgnorable; + if not ifnil(_obj.Ignorable) then + {self.}Ignorable := _obj.Ignorable; if not ifnil(_obj.XmlChildDocDefaults) then {self.}DocDefaults.Copy(_obj.XmlChildDocDefaults); if not ifnil(_obj.XmlChildLatenStyles) then @@ -13759,19 +16072,19 @@ begin tslassigning := tslassigning_backup; end; -function Styles.ReadXmlAttrMcIgnorable(); +function Styles.ReadXmlAttrIgnorable(); begin - return {self.}XmlAttrMcIgnorable.Value; + return {self.}XmlAttrIgnorable.Value; end; -function Styles.WriteXmlAttrMcIgnorable(_value); +function Styles.WriteXmlAttrIgnorable(_value); begin - if ifnil({self.}XmlAttrMcIgnorable) then + if ifnil({self.}XmlAttrIgnorable) then begin - {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); - attributes_[length(attributes_)] := {self.}XmlAttrMcIgnorable; + {self.}XmlAttrIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + attributes_[length(attributes_)] := {self.}XmlAttrIgnorable; end - {self.}XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrIgnorable.Value := _value; end; function Styles.ReadXmlChildDocDefaults(): DocDefaults; @@ -14921,7 +17234,7 @@ begin pre := {self.}Prefix ? {self.}Prefix + ":" : ""; attributes_ := array(); attributes_pf_ := array( - "mc:Ignorable": makeweakref(thisFunction(WriteXmlAttrMcIgnorable)), + "mc:Ignorable": makeweakref(thisFunction(WriteXmlAttrIgnorable)), ); sorted_child_ := array( pre + "optimizeForBrowser": array(0, makeweakref(thisFunction(ReadXmlChildOptimizeForBrowser))), @@ -14935,8 +17248,8 @@ begin tslassigning_backup := tslassigning; tslassigning := 1; class(OpenXmlElement).Copy(_obj); - if not ifnil(_obj.McIgnorable) then - {self.}McIgnorable := _obj.McIgnorable; + if not ifnil(_obj.Ignorable) then + {self.}Ignorable := _obj.Ignorable; if not ifnil(_obj.XmlChildOptimizeForBrowser) then ifnil({self.}XmlChildOptimizeForBrowser) ? {self.}OptimizeForBrowser.Copy(_obj.XmlChildOptimizeForBrowser) : {self.}XmlChildOptimizeForBrowser.Copy(_obj.XmlChildOptimizeForBrowser); if not ifnil(_obj.XmlChildAllowPNG) then @@ -14944,19 +17257,19 @@ begin tslassigning := tslassigning_backup; end; -function WebSettings.ReadXmlAttrMcIgnorable(); +function WebSettings.ReadXmlAttrIgnorable(); begin - return {self.}XmlAttrMcIgnorable.Value; + return {self.}XmlAttrIgnorable.Value; end; -function WebSettings.WriteXmlAttrMcIgnorable(_value); +function WebSettings.WriteXmlAttrIgnorable(_value); begin - if ifnil({self.}XmlAttrMcIgnorable) then + if ifnil({self.}XmlAttrIgnorable) then begin - {self.}XmlAttrMcIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); - attributes_[length(attributes_)] := {self.}XmlAttrMcIgnorable; + {self.}XmlAttrIgnorable := new OpenXmlAttribute("mc", "Ignorable", nil); + attributes_[length(attributes_)] := {self.}XmlAttrIgnorable; end - {self.}XmlAttrMcIgnorable.Value := _value; + {self.}XmlAttrIgnorable.Value := _value; end; function WebSettings.ReadXmlChildOptimizeForBrowser(); @@ -15233,6 +17546,7 @@ begin sorted_child_ := array( "v:shapetype": array(0, makeweakref(thisFunction(ReadXmlChildShapetype))), "v:shape": array(1, makeweakref(thisFunction(ReadXmlChildShape))), + "v:control": array(2, makeweakref(thisFunction(ReadXmlChildControl))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -15246,6 +17560,8 @@ begin {self.}Shapetype.Copy(_obj.XmlChildShapetype); if not ifnil(_obj.XmlChildShape) then {self.}Shape.Copy(_obj.XmlChildShape); + if not ifnil(_obj.XmlChildControl) then + {self.}Control.Copy(_obj.XmlChildControl); tslassigning := tslassigning_backup; end; @@ -15253,7 +17569,7 @@ function Pict.ReadXmlChildShapetype(): Shapetype; begin if tslassigning and ifnil({self.}XmlChildShapetype) then begin - {self.}XmlChildShapetype := new Shapetype(self, "v", "shapetype"); + {self.}XmlChildShapetype := new VML.Shapetype(self, "v", "shapetype"); container_.Set({self.}XmlChildShapetype); end return {self.}XmlChildShapetype; @@ -15263,12 +17579,111 @@ function Pict.ReadXmlChildShape(): Shape; begin if tslassigning and ifnil({self.}XmlChildShape) then begin - {self.}XmlChildShape := new Shape(self, "v", "shape"); + {self.}XmlChildShape := new VML.Shape(self, "v", "shape"); container_.Set({self.}XmlChildShape); end return {self.}XmlChildShape; end; +function Pict.ReadXmlChildControl(): Control; +begin + if tslassigning and ifnil({self.}XmlChildControl) then + begin + {self.}XmlChildControl := new Control(self, "v", "control"); + container_.Set({self.}XmlChildControl); + end + return {self.}XmlChildControl; +end; + +function Control.Create();overload; +begin + {self.}Create(nil, "w", "control"); +end; + +function Control.Create(_node: XmlNode);overload; +begin + class(OpenXmlElement).Create(_node: XmlNode); +end; + +function Control.Create(_parent: tslobj; _prefix: string; _local_name: string);overload; +begin + setsysparam(pn_calcctrlword(), getsysparam(pn_calcctrlword()) .| 0x200); + class(OpenXmlElement).Create(_parent, _prefix, _local_name); +end; + +function Control.Init();override; +begin + pre := {self.}Prefix ? {self.}Prefix + ":" : ""; + attributes_ := array(); + attributes_pf_ := array( + "r:id": makeweakref(thisFunction(WriteXmlAttrId)), + pre + "shapeid": makeweakref(thisFunction(WriteXmlAttrShapeid)), + pre + "name": makeweakref(thisFunction(WriteXmlAttrname)), + ); + sorted_child_ := array( + ); + container_ := new TSOfficeContainer(sorted_child_); +end; + +function Control.Copy(_obj: Control);override; +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + class(OpenXmlElement).Copy(_obj); + if not ifnil(_obj.Id) then + {self.}Id := _obj.Id; + if not ifnil(_obj.Shapeid) then + {self.}Shapeid := _obj.Shapeid; + if not ifnil(_obj.name) then + {self.}name := _obj.name; + tslassigning := tslassigning_backup; +end; + +function Control.ReadXmlAttrId(); +begin + return {self.}XmlAttrId.Value; +end; + +function Control.WriteXmlAttrId(_value); +begin + if ifnil({self.}XmlAttrId) then + begin + {self.}XmlAttrId := new OpenXmlAttribute("r", "id", nil); + attributes_[length(attributes_)] := {self.}XmlAttrId; + end + {self.}XmlAttrId.Value := _value; +end; + +function Control.ReadXmlAttrShapeid(); +begin + return {self.}XmlAttrShapeid.Value; +end; + +function Control.WriteXmlAttrShapeid(_value); +begin + if ifnil({self.}XmlAttrShapeid) then + begin + {self.}XmlAttrShapeid := new OpenXmlAttribute({self.}Prefix, "shapeid", nil); + attributes_[length(attributes_)] := {self.}XmlAttrShapeid; + end + {self.}XmlAttrShapeid.Value := _value; +end; + +function Control.ReadXmlAttrname(); +begin + return {self.}XmlAttrname.Value; +end; + +function Control.WriteXmlAttrname(_value); +begin + if ifnil({self.}XmlAttrname) then + begin + {self.}XmlAttrname := new OpenXmlAttribute({self.}Prefix, "name", nil); + attributes_[length(attributes_)] := {self.}XmlAttrname; + end + {self.}XmlAttrname.Value := _value; +end; + function Ftr.Create();overload; begin {self.}Create(nil, "w", "ftr"); @@ -15369,6 +17784,7 @@ begin ); sorted_child_ := array( pre + "p": array(0, makeweakref(thisFunction(AppendP))), + pre + "sdt": array(1, makeweakref(thisFunction(ReadXmlChildSdt))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -15380,6 +17796,8 @@ begin class(OpenXmlElement).Copy(_obj); if not ifnil(_obj.Ignorable) then {self.}Ignorable := _obj.Ignorable; + if not ifnil(_obj.XmlChildSdt) then + {self.}Sdt.Copy(_obj.XmlChildSdt); tslassigning := tslassigning_backup; end; @@ -15398,6 +17816,16 @@ begin {self.}XmlAttrIgnorable.Value := _value; end; +function Hdr.ReadXmlChildSdt(): Sdt; +begin + if tslassigning and ifnil({self.}XmlChildSdt) then + begin + {self.}XmlChildSdt := new Sdt(self, {self.}Prefix, "sdt"); + container_.Set({self.}XmlChildSdt); + end + return {self.}XmlChildSdt; +end; + function Hdr.ReadPs(_index); begin ind := ifnil(_index) ? -2 : _index; diff --git a/autounit/DocxMLUnitDecorator.tsf b/autounit/DocxMLUnitDecorator.tsf index eb3e630..b63f264 100644 --- a/autounit/DocxMLUnitDecorator.tsf +++ b/autounit/DocxMLUnitDecorator.tsf @@ -92,6 +92,15 @@ private object_: PBdr; end; +type FramePrUnitDecorator = class(FramePr) +public + function Create(_obj: FramePr); + function GetObject(); + function Convert(); +private + object_: FramePr; +end; + type PBorderUnitDecorator = class(PBorder) public function Create(_obj: PBorder); @@ -155,6 +164,60 @@ private object_: RPr; end; +type ShdUnitDecorator = class(Shd) +public + function Create(_obj: Shd); + function GetObject(); + function Convert(); +private + object_: Shd; +end; + +type HighlightUnitDecorator = class(Highlight) +public + function Create(_obj: Highlight); + function GetObject(); + function Convert(); +private + object_: Highlight; +end; + +type FitTextUnitDecorator = class(FitText) +public + function Create(_obj: FitText); + function GetObject(); + function Convert(); +private + object_: FitText; +end; + +type EastAsianLayoutUnitDecorator = class(EastAsianLayout) +public + function Create(_obj: EastAsianLayout); + function GetObject(); + function Convert(); +private + object_: EastAsianLayout; +end; + +type DelUnitDecorator = class(Del) +public + function Create(_obj: Del); + function GetObject(); + function Convert(); +private + object_: Del; +end; + +type BdrUnitDecorator = class(Bdr) +public + function Create(_obj: Bdr); + function GetObject(); + function Convert(); +private + object_: Bdr; +end; + type RFontsUnitDecorator = class(RFonts) public function Create(_obj: RFonts); @@ -470,15 +533,6 @@ private object_: GridSpan; end; -type ShdUnitDecorator = class(Shd) -public - function Create(_obj: Shd); - function GetObject(); - function Convert(); -private - object_: Shd; -end; - type SdtUnitDecorator = class(Sdt) public function Create(_obj: Sdt); @@ -920,6 +974,15 @@ private object_: Pict; end; +type ControlUnitDecorator = class(Control) +public + function Create(_obj: Control); + function GetObject(); + function Convert(); +private + object_: Control; +end; + type FtrUnitDecorator = class(Ftr) public function Create(_obj: Ftr); @@ -1045,8 +1108,8 @@ function DocumentUnitDecorator.Convert(); begin tslassigning_backup := tslassigning; tslassigning := 1; - if not ifnil(object_.XmlAttrMcIgnorable) then - {self.}McIgnorable := object_.XmlAttrMcIgnorable.Value; + if not ifnil(object_.XmlAttrIgnorable) then + {self.}Ignorable := object_.XmlAttrIgnorable.Value; if not ifnil(object_.XmlChildBody) then {self.}XmlChildBody := new BodyUnitDecorator(object_.XmlChildBody); tslassigning := tslassigning_backup; @@ -1116,6 +1179,11 @@ begin {self.}XmlChildOMathPara := new OMathParaUnitDecorator(object_.XmlChildOMathPara); if not ifnil(object_.XmlChildIns) then {self.}XmlChildIns := new InsUnitDecorator(object_.XmlChildIns); + if not ifnil(object_.XmlChildDel) then + {self.}XmlChildDel := new DelUnitDecorator(object_.XmlChildDel); + elems := object_.Sdts(); + for _,elem in elems do + {self.}AppendChild(new SdtUnitDecorator(elem)); elems := object_.Rs(); for _,elem in elems do {self.}AppendChild(new RUnitDecorator(elem)); @@ -1256,6 +1324,8 @@ begin {self.}XmlChildSectPr := new SectPrUnitDecorator(object_.XmlChildSectPr); if not ifnil(object_.XmlChildTabs) then {self.}XmlChildTabs := new TabsUnitDecorator(object_.XmlChildTabs); + if not ifnil(object_.XmlChildBidi) then + {self.}Bidi.Copy(object_.XmlChildBidi); if not ifnil(object_.XmlChildWidowControl) then {self.}WidowControl.Copy(object_.XmlChildWidowControl); if not ifnil(object_.XmlChildSnapToGrid) then @@ -1272,8 +1342,20 @@ begin {self.}KeepNext.Copy(object_.XmlChildKeepNext); if not ifnil(object_.XmlChildKeepLines) then {self.}KeepLines.Copy(object_.XmlChildKeepLines); + if not ifnil(object_.XmlChildMirrorIndents) then + {self.}MirrorIndents.Copy(object_.XmlChildMirrorIndents); + if not ifnil(object_.XmlChildKinsoku) then + {self.}XmlChildKinsoku := new PureWValUnitDecorator(object_.XmlChildKinsoku); if not ifnil(object_.XmlChildPageBreakBefore) then {self.}PageBreakBefore.Copy(object_.XmlChildPageBreakBefore); + if not ifnil(object_.XmlChildSuppressAutoHyphens) then + {self.}SuppressAutoHyphens.Copy(object_.XmlChildSuppressAutoHyphens); + if not ifnil(object_.XmlChildSuppressLineNumbers) then + {self.}SuppressLineNumbers.Copy(object_.XmlChildSuppressLineNumbers); + if not ifnil(object_.XmlChildSuppressOverlap) then + {self.}SuppressOverlap.Copy(object_.XmlChildSuppressOverlap); + if not ifnil(object_.XmlChildOverflowPunct) then + {self.}XmlChildOverflowPunct := new PureWValUnitDecorator(object_.XmlChildOverflowPunct); if not ifnil(object_.XmlChildAdjustRightInd) then {self.}XmlChildAdjustRightInd := new PureWValUnitDecorator(object_.XmlChildAdjustRightInd); if not ifnil(object_.XmlChildSpacing) then @@ -1294,8 +1376,20 @@ begin {self.}XmlChildShd := new ShdUnitDecorator(object_.XmlChildShd); if not ifnil(object_.XmlChildWordWrap) then {self.}XmlChildWordWrap := new PureWValUnitDecorator(object_.XmlChildWordWrap); + if not ifnil(object_.XmlChildDivId) then + {self.}XmlChildDivId := new PureWValUnitDecorator(object_.XmlChildDivId); + if not ifnil(object_.XmlChildCnfStyle) then + {self.}XmlChildCnfStyle := new PureWValUnitDecorator(object_.XmlChildCnfStyle); + if not ifnil(object_.XmlChildFramePr) then + {self.}XmlChildFramePr := new FramePrUnitDecorator(object_.XmlChildFramePr); if not ifnil(object_.XmlChildTextboxTightWrap) then {self.}XmlChildTextboxTightWrap := new PureWValUnitDecorator(object_.XmlChildTextboxTightWrap); + if not ifnil(object_.XmlChildTopLinePunct) then + {self.}XmlChildTopLinePunct := new PureWValUnitDecorator(object_.XmlChildTopLinePunct); + if not ifnil(object_.XmlChildTextAlignment) then + {self.}XmlChildTextAlignment := new PureWValUnitDecorator(object_.XmlChildTextAlignment); + if not ifnil(object_.XmlChildTextDirection) then + {self.}XmlChildTextDirection := new PureWValUnitDecorator(object_.XmlChildTextDirection); tslassigning := tslassigning_backup; end; @@ -1317,8 +1411,65 @@ begin tslassigning := 1; if not ifnil(object_.XmlChildTop) then {self.}XmlChildTop := new PBorderUnitDecorator(object_.XmlChildTop); + if not ifnil(object_.XmlChildLeft) then + {self.}XmlChildLeft := new PBorderUnitDecorator(object_.XmlChildLeft); + if not ifnil(object_.XmlChildRight) then + {self.}XmlChildRight := new PBorderUnitDecorator(object_.XmlChildRight); if not ifnil(object_.XmlChildBottom) then {self.}XmlChildBottom := new PBorderUnitDecorator(object_.XmlChildBottom); + if not ifnil(object_.XmlChildBetween) then + {self.}XmlChildBetween := new PBorderUnitDecorator(object_.XmlChildBetween); + tslassigning := tslassigning_backup; +end; + +function FramePrUnitDecorator.Create(_obj: FramePr); +begin + class(FramePr).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function FramePrUnitDecorator.GetObject(); +begin + return object_; +end; + +function FramePrUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrAnchorLock) then + {self.}AnchorLock := object_.XmlAttrAnchorLock.Value; + if not ifnil(object_.XmlAttrDropCap) then + {self.}DropCap := object_.XmlAttrDropCap.Value; + if not ifnil(object_.XmlAttrVAnchor) then + {self.}VAnchor := object_.XmlAttrVAnchor.Value; + if not ifnil(object_.XmlAttrHAnchor) then + {self.}HAnchor := object_.XmlAttrHAnchor.Value; + if not ifnil(object_.XmlAttrHRule) then + {self.}HRule := object_.XmlAttrHRule.Value; + if not ifnil(object_.XmlAttrHSpace) then + {self.}HSpace := object_.XmlAttrHSpace.Value; + if not ifnil(object_.XmlAttrVSpace) then + {self.}VSpace := object_.XmlAttrVSpace.Value; + if not ifnil(object_.XmlAttrLines) then + {self.}Lines := object_.XmlAttrLines.Value; + if not ifnil(object_.XmlAttrWrap) then + {self.}Wrap := object_.XmlAttrWrap.Value; + if not ifnil(object_.XmlAttrVal) then + {self.}Val := object_.XmlAttrVal.Value; + if not ifnil(object_.XmlAttrW) then + {self.}W := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrW.Value); + if not ifnil(object_.XmlAttrH) then + {self.}H := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrH.Value); + if not ifnil(object_.XmlAttrX) then + {self.}X := object_.XmlAttrX.Value; + if not ifnil(object_.XmlAttrY) then + {self.}Y := object_.XmlAttrY.Value; + if not ifnil(object_.XmlAttrXAlign) then + {self.}XAlign := object_.XmlAttrXAlign.Value; + if not ifnil(object_.XmlAttrYAlign) then + {self.}YAlign := object_.XmlAttrYAlign.Value; tslassigning := tslassigning_backup; end; @@ -1344,8 +1495,14 @@ begin {self.}Color := object_.XmlAttrColor.Value; if not ifnil(object_.XmlAttrSpace) then {self.}Space := object_.XmlAttrSpace.Value; + if not ifnil(object_.XmlAttrFrame) then + {self.}Frame := object_.XmlAttrFrame.Value; + if not ifnil(object_.XmlAttrShadow) then + {self.}Shadow := object_.XmlAttrShadow.Value; if not ifnil(object_.XmlAttrThemeColor) then {self.}ThemeColor := object_.XmlAttrThemeColor.Value; + if not ifnil(object_.XmlAttrThemeShade) then + {self.}ThemeShade := object_.XmlAttrThemeShade.Value; if not ifnil(object_.XmlAttrThemeTint) then {self.}ThemeTint := object_.XmlAttrThemeTint.Value; if not ifnil(object_.XmlAttrSz) then @@ -1511,6 +1668,8 @@ begin tslassigning := 1; if not ifnil(object_.XmlChildNoProof) then {self.}XmlChildNoProof := new PureValUnitDecorator(object_.XmlChildNoProof); + if not ifnil(object_.XmlChildOutline) then + {self.}XmlChildOutline := new PureValUnitDecorator(object_.XmlChildOutline); if not ifnil(object_.XmlChildPosition) then {self.}XmlChildPosition := new PureValUnitDecorator(object_.XmlChildPosition); if not ifnil(object_.XmlChildWebHidden) then @@ -1531,10 +1690,32 @@ begin {self.}B.Copy(object_.XmlChildB); if not ifnil(object_.XmlChildBCs) then {self.}BCs.Copy(object_.XmlChildBCs); + if not ifnil(object_.XmlChildBdr) then + {self.}XmlChildBdr := new BdrUnitDecorator(object_.XmlChildBdr); + if not ifnil(object_.XmlChildCaps) then + {self.}XmlChildCaps := new PureWValUnitDecorator(object_.XmlChildCaps); + if not ifnil(object_.XmlChildDel) then + {self.}XmlChildDel := new DelUnitDecorator(object_.XmlChildDel); if not ifnil(object_.XmlChildStrike) then {self.}Strike.Copy(object_.XmlChildStrike); + if not ifnil(object_.XmlChildDStrike) then + {self.}XmlChildDStrike := new PureWValUnitDecorator(object_.XmlChildDStrike); + if not ifnil(object_.XmlChildEffect) then + {self.}XmlChildEffect := new PureWValUnitDecorator(object_.XmlChildEffect); + if not ifnil(object_.XmlChildEm) then + {self.}XmlChildEm := new PureWValUnitDecorator(object_.XmlChildEm); + if not ifnil(object_.XmlChildEmboss) then + {self.}XmlChildEmboss := new PureWValUnitDecorator(object_.XmlChildEmboss); + if not ifnil(object_.XmlChildFitText) then + {self.}XmlChildFitText := new FitTextUnitDecorator(object_.XmlChildFitText); + if not ifnil(object_.XmlChildHighlight) then + {self.}XmlChildHighlight := new HighlightUnitDecorator(object_.XmlChildHighlight); if not ifnil(object_.XmlChildColor) then {self.}XmlChildColor := new ColorUnitDecorator(object_.XmlChildColor); + if not ifnil(object_.XmlChildEastAsianLayout) then + {self.}XmlChildEastAsianLayout := new EastAsianLayoutUnitDecorator(object_.XmlChildEastAsianLayout); + if not ifnil(object_.XmlChildCs) then + {self.}Cs.Copy(object_.XmlChildCs); if not ifnil(object_.XmlChildSz) then {self.}XmlChildSz := new SzUnitDecorator(object_.XmlChildSz); if not ifnil(object_.XmlChildSzCs) then @@ -1543,10 +1724,212 @@ begin {self.}U.Copy(object_.XmlChildU); if not ifnil(object_.XmlChildLang) then {self.}XmlChildLang := new LangUnitDecorator(object_.XmlChildLang); + if not ifnil(object_.XmlChildImprint) then + {self.}XmlChildImprint := new PureWValUnitDecorator(object_.XmlChildImprint); if not ifnil(object_.XmlChildVertAlign) then {self.}XmlChildVertAlign := new PureWValUnitDecorator(object_.XmlChildVertAlign); if not ifnil(object_.XmlChildLigatures) then {self.}XmlChildLigatures := new PureWValUnitDecorator(object_.XmlChildLigatures); + if not ifnil(object_.XmlChildRtl) then + {self.}XmlChildRtl := new PureWValUnitDecorator(object_.XmlChildRtl); + if not ifnil(object_.XmlChildOMath) then + {self.}OMath.Copy(object_.XmlChildOMath); + if not ifnil(object_.XmlChildShadow) then + {self.}Shadow.Copy(object_.XmlChildShadow); + if not ifnil(object_.XmlChildSpecVanish) then + {self.}SpecVanish.Copy(object_.XmlChildSpecVanish); + if not ifnil(object_.XmlChildVanish) then + {self.}Vanish.Copy(object_.XmlChildVanish); + if not ifnil(object_.XmlChildShd) then + {self.}XmlChildShd := new ShdUnitDecorator(object_.XmlChildShd); + if not ifnil(object_.XmlChildSmallCaps) then + {self.}XmlChildSmallCaps := new PureWValUnitDecorator(object_.XmlChildSmallCaps); + if not ifnil(object_.XmlChildW) then + {self.}XmlChildW := new PureWValUnitDecorator(object_.XmlChildW); + tslassigning := tslassigning_backup; +end; + +function ShdUnitDecorator.Create(_obj: Shd); +begin + class(Shd).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function ShdUnitDecorator.GetObject(); +begin + return object_; +end; + +function ShdUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrVal) then + {self.}Val := object_.XmlAttrVal.Value; + if not ifnil(object_.XmlAttrColor) then + {self.}Color := object_.XmlAttrColor.Value; + if not ifnil(object_.XmlAttrFill) then + {self.}Fill := object_.XmlAttrFill.Value; + if not ifnil(object_.XmlAttrThemeColor) then + {self.}ThemeColor := object_.XmlAttrThemeColor.Value; + if not ifnil(object_.XmlAttrThemeFill) then + {self.}ThemeFill := object_.XmlAttrThemeFill.Value; + if not ifnil(object_.XmlAttrThemeFillTint) then + {self.}ThemeFillTint := object_.XmlAttrThemeFillTint.Value; + if not ifnil(object_.XmlAttrThemeFillShade) then + {self.}ThemeFillShade := object_.XmlAttrThemeFillShade.Value; + if not ifnil(object_.XmlAttrThemeShade) then + {self.}ThemeShade := object_.XmlAttrThemeShade.Value; + if not ifnil(object_.XmlAttrThemeTint) then + {self.}ThemeTint := object_.XmlAttrThemeTint.Value; + tslassigning := tslassigning_backup; +end; + +function HighlightUnitDecorator.Create(_obj: Highlight); +begin + class(Highlight).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function HighlightUnitDecorator.GetObject(); +begin + return object_; +end; + +function HighlightUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrVal) then + {self.}Val := object_.XmlAttrVal.Value; + tslassigning := tslassigning_backup; +end; + +function FitTextUnitDecorator.Create(_obj: FitText); +begin + class(FitText).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function FitTextUnitDecorator.GetObject(); +begin + return object_; +end; + +function FitTextUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrId) then + {self.}Id := object_.XmlAttrId.Value; + if not ifnil(object_.XmlAttrVal) then + {self.}Val := object_.XmlAttrVal.Value; + tslassigning := tslassigning_backup; +end; + +function EastAsianLayoutUnitDecorator.Create(_obj: EastAsianLayout); +begin + class(EastAsianLayout).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function EastAsianLayoutUnitDecorator.GetObject(); +begin + return object_; +end; + +function EastAsianLayoutUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrCombine) then + {self.}Combine := object_.XmlAttrCombine.Value; + if not ifnil(object_.XmlAttrCombineBrackets) then + {self.}CombineBrackets := object_.XmlAttrCombineBrackets.Value; + if not ifnil(object_.XmlAttrId) then + {self.}Id := object_.XmlAttrId.Value; + if not ifnil(object_.XmlAttrVert) then + {self.}Vert := object_.XmlAttrVert.Value; + if not ifnil(object_.XmlAttrVertCompress) then + {self.}VertCompress := object_.XmlAttrVertCompress.Value; + tslassigning := tslassigning_backup; +end; + +function DelUnitDecorator.Create(_obj: Del); +begin + class(Del).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function DelUnitDecorator.GetObject(); +begin + return object_; +end; + +function DelUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrAuthor) then + {self.}Author := object_.XmlAttrAuthor.Value; + if not ifnil(object_.XmlAttrDate) then + {self.}Date := object_.XmlAttrDate.Value; + if not ifnil(object_.XmlAttrId) then + {self.}Id := object_.XmlAttrId.Value; + if not ifnil(object_.XmlAttrColor) then + {self.}Color := object_.XmlAttrColor.Value; + if not ifnil(object_.XmlAttrThemeColor) then + {self.}ThemeColor := object_.XmlAttrThemeColor.Value; + if not ifnil(object_.XmlAttrThemeShade) then + {self.}ThemeShade := object_.XmlAttrThemeShade.Value; + if not ifnil(object_.XmlAttrThemeTint) then + {self.}ThemeTint := object_.XmlAttrThemeTint.Value; + if not ifnil(object_.XmlAttrFrame) then + {self.}Frame := object_.XmlAttrFrame.Value; + if not ifnil(object_.XmlAttrShadow) then + {self.}Shadow := object_.XmlAttrShadow.Value; + tslassigning := tslassigning_backup; +end; + +function BdrUnitDecorator.Create(_obj: Bdr); +begin + class(Bdr).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function BdrUnitDecorator.GetObject(); +begin + return object_; +end; + +function BdrUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrVal) then + {self.}Val := object_.XmlAttrVal.Value; + if not ifnil(object_.XmlAttrSz) then + {self.}Sz := object_.XmlAttrSz.Value; + if not ifnil(object_.XmlAttrSpace) then + {self.}Space := object_.XmlAttrSpace.Value; + if not ifnil(object_.XmlAttrColor) then + {self.}Color := object_.XmlAttrColor.Value; + if not ifnil(object_.XmlAttrThemeColor) then + {self.}ThemeColor := object_.XmlAttrThemeColor.Value; + if not ifnil(object_.XmlAttrThemeShade) then + {self.}ThemeShade := object_.XmlAttrThemeShade.Value; + if not ifnil(object_.XmlAttrThemeTint) then + {self.}ThemeTint := object_.XmlAttrThemeTint.Value; + if not ifnil(object_.XmlAttrFrame) then + {self.}Frame := object_.XmlAttrFrame.Value; + if not ifnil(object_.XmlAttrShadow) then + {self.}Shadow := object_.XmlAttrShadow.Value; tslassigning := tslassigning_backup; end; @@ -1738,6 +2121,8 @@ begin {self.}XmlChildAlternateContent := new AlternateContentUnitDecorator(object_.XmlChildAlternateContent); if not ifnil(object_.XmlChildDrawing) then {self.}XmlChildDrawing := new DrawingUnitDecorator(object_.XmlChildDrawing); + if not ifnil(object_.XmlChildPict) then + {self.}XmlChildPict := new PictUnitDecorator(object_.XmlChildPict); if not ifnil(object_.XmlChildT) then {self.}XmlChildT := new TUnitDecorator(object_.XmlChildT); if not ifnil(object_.XmlChildObject) then @@ -1957,6 +2342,9 @@ begin elems := object_.Trs(); for _,elem in elems do {self.}AppendChild(new TrUnitDecorator(elem)); + elems := object_.Sdts(); + for _,elem in elems do + {self.}AppendChild(new SdtUnitDecorator(elem)); tslassigning := tslassigning_backup; end; @@ -2238,6 +2626,9 @@ begin {self.}RsidTr := object_.XmlAttrRsidTr.Value; if not ifnil(object_.XmlChildTrPr) then {self.}XmlChildTrPr := new TrPrUnitDecorator(object_.XmlChildTrPr); + elems := object_.Sdts(); + for _,elem in elems do + {self.}AppendChild(new SdtUnitDecorator(elem)); elems := object_.Tcs(); for _,elem in elems do {self.}AppendChild(new TcUnitDecorator(elem)); @@ -2272,6 +2663,8 @@ begin {self.}XmlChildCnfStyle := new CnfStyleUnitDecorator(object_.XmlChildCnfStyle); if not ifnil(object_.XmlChildIns) then {self.}XmlChildIns := new InsUnitDecorator(object_.XmlChildIns); + if not ifnil(object_.XmlChildDel) then + {self.}XmlChildDel := new DelUnitDecorator(object_.XmlChildDel); tslassigning := tslassigning_backup; end; @@ -2430,6 +2823,8 @@ begin {self.}XmlChildShd := new ShdUnitDecorator(object_.XmlChildShd); if not ifnil(object_.XmlChildTcBorders) then {self.}XmlChildTcBorders := new TcBordersUnitDecorator(object_.XmlChildTcBorders); + if not ifnil(object_.XmlChildTextDirection) then + {self.}XmlChildTextDirection := new PureWValUnitDecorator(object_.XmlChildTextDirection); tslassigning := tslassigning_backup; end; @@ -2520,35 +2915,6 @@ begin tslassigning := tslassigning_backup; end; -function ShdUnitDecorator.Create(_obj: Shd); -begin - class(Shd).Create(); - object_ := _obj; - {self.}Convert(); -end; - -function ShdUnitDecorator.GetObject(); -begin - return object_; -end; - -function ShdUnitDecorator.Convert(); -begin - tslassigning_backup := tslassigning; - tslassigning := 1; - if not ifnil(object_.XmlAttrVal) then - {self.}Val := object_.XmlAttrVal.Value; - if not ifnil(object_.XmlAttrColor) then - {self.}Color := object_.XmlAttrColor.Value; - if not ifnil(object_.XmlAttrFill) then - {self.}Fill := object_.XmlAttrFill.Value; - if not ifnil(object_.XmlAttrThemeFill) then - {self.}ThemeFill := object_.XmlAttrThemeFill.Value; - if not ifnil(object_.XmlAttrThemeFillTint) then - {self.}ThemeFillTint := object_.XmlAttrThemeFillTint.Value; - tslassigning := tslassigning_backup; -end; - function SdtUnitDecorator.Create(_obj: Sdt); begin class(Sdt).Create(); @@ -2709,6 +3075,8 @@ begin {self.}TitlePg.Copy(object_.XmlChildTitlePg); if not ifnil(object_.XmlChildDocGrid) then {self.}XmlChildDocGrid := new DocGridUnitDecorator(object_.XmlChildDocGrid); + if not ifnil(object_.XmlChildTextDirection) then + {self.}XmlChildTextDirection := new PureWValUnitDecorator(object_.XmlChildTextDirection); tslassigning := tslassigning_backup; end; @@ -3506,8 +3874,8 @@ function StylesUnitDecorator.Convert(); begin tslassigning_backup := tslassigning; tslassigning := 1; - if not ifnil(object_.XmlAttrMcIgnorable) then - {self.}McIgnorable := object_.XmlAttrMcIgnorable.Value; + if not ifnil(object_.XmlAttrIgnorable) then + {self.}Ignorable := object_.XmlAttrIgnorable.Value; if not ifnil(object_.XmlChildDocDefaults) then {self.}XmlChildDocDefaults := new DocDefaultsUnitDecorator(object_.XmlChildDocDefaults); if not ifnil(object_.XmlChildLatenStyles) then @@ -3801,8 +4169,8 @@ function WebSettingsUnitDecorator.Convert(); begin tslassigning_backup := tslassigning; tslassigning := 1; - if not ifnil(object_.XmlAttrMcIgnorable) then - {self.}McIgnorable := object_.XmlAttrMcIgnorable.Value; + if not ifnil(object_.XmlAttrIgnorable) then + {self.}Ignorable := object_.XmlAttrIgnorable.Value; if not ifnil(object_.XmlChildOptimizeForBrowser) then {self.}OptimizeForBrowser.Copy(object_.XmlChildOptimizeForBrowser); if not ifnil(object_.XmlChildAllowPNG) then @@ -3901,6 +4269,33 @@ begin {self.}XmlChildShapetype := new ShapetypeUnitDecorator(object_.XmlChildShapetype); if not ifnil(object_.XmlChildShape) then {self.}XmlChildShape := new ShapeUnitDecorator(object_.XmlChildShape); + if not ifnil(object_.XmlChildControl) then + {self.}XmlChildControl := new ControlUnitDecorator(object_.XmlChildControl); + tslassigning := tslassigning_backup; +end; + +function ControlUnitDecorator.Create(_obj: Control); +begin + class(Control).Create(); + object_ := _obj; + {self.}Convert(); +end; + +function ControlUnitDecorator.GetObject(); +begin + return object_; +end; + +function ControlUnitDecorator.Convert(); +begin + tslassigning_backup := tslassigning; + tslassigning := 1; + if not ifnil(object_.XmlAttrId) then + {self.}Id := object_.XmlAttrId.Value; + if not ifnil(object_.XmlAttrShapeid) then + {self.}Shapeid := object_.XmlAttrShapeid.Value; + if not ifnil(object_.XmlAttrname) then + {self.}name := object_.XmlAttrname.Value; tslassigning := tslassigning_backup; end; @@ -3949,6 +4344,8 @@ begin elems := object_.Ps(); for _,elem in elems do {self.}AppendChild(new PUnitDecorator(elem)); + if not ifnil(object_.XmlChildSdt) then + {self.}XmlChildSdt := new SdtUnitDecorator(object_.XmlChildSdt); tslassigning := tslassigning_backup; end; diff --git a/autounit/SharedML.tsf b/autounit/SharedML.tsf index 7bc7049..7531baf 100644 --- a/autounit/SharedML.tsf +++ b/autounit/SharedML.tsf @@ -259,11 +259,14 @@ public // normal property property RPr read ReadXmlChildRPr; + property Del read ReadXmlChildDel; function ReadXmlChildRPr(): RPr; + function ReadXmlChildDel(): Del; public // Children XmlChildRPr: RPr; + XmlChildDel: Del; end; type E = class(OpenXmlElement) @@ -1576,6 +1579,7 @@ begin ); sorted_child_ := array( pre + "rPr": array(0, makeweakref(thisFunction(ReadXmlChildRPr))), + pre + "del": array(1, makeweakref(thisFunction(ReadXmlChildDel))), ); container_ := new TSOfficeContainer(sorted_child_); end; @@ -1587,6 +1591,8 @@ begin class(OpenXmlElement).Copy(_obj); if not ifnil(_obj.XmlChildRPr) then {self.}RPr.Copy(_obj.XmlChildRPr); + if not ifnil(_obj.XmlChildDel) then + {self.}Del.Copy(_obj.XmlChildDel); tslassigning := tslassigning_backup; end; @@ -1600,6 +1606,16 @@ begin return {self.}XmlChildRPr; end; +function CtrlPr.ReadXmlChildDel(): Del; +begin + if tslassigning and ifnil({self.}XmlChildDel) then + begin + {self.}XmlChildDel := new Del(self, {self.}Prefix, "del"); + container_.Set({self.}XmlChildDel); + end + return {self.}XmlChildDel; +end; + function E.Create();overload; begin {self.}Create(nil, "m", "e"); diff --git a/autounit/SharedMLUnitDecorator.tsf b/autounit/SharedMLUnitDecorator.tsf index d743b2d..e14b873 100644 --- a/autounit/SharedMLUnitDecorator.tsf +++ b/autounit/SharedMLUnitDecorator.tsf @@ -569,6 +569,8 @@ begin tslassigning := 1; if not ifnil(object_.XmlChildRPr) then {self.}XmlChildRPr := new RPrUnitDecorator(object_.XmlChildRPr); + if not ifnil(object_.XmlChildDel) then + {self.}XmlChildDel := new DelUnitDecorator(object_.XmlChildDel); tslassigning := tslassigning_backup; end; diff --git a/autounit/VXml.tsf b/autounit/VML.tsf similarity index 96% rename from autounit/VXml.tsf rename to autounit/VML.tsf index df9cf50..aaaeccf 100644 --- a/autounit/VXml.tsf +++ b/autounit/VML.tsf @@ -1,4 +1,4 @@ -unit VXml; +unit VML; interface uses DocxML; @@ -202,17 +202,25 @@ public function Copy(_obj: Textpath);override; public // attributes property - property On read ReadXmlAttrOn write WriteXmlAttrOn; + property _On read ReadXmlAttr_On write WriteXmlAttr_On; property Fitshape read ReadXmlAttrFitshape write WriteXmlAttrFitshape; - function ReadXmlAttrOn(); - function WriteXmlAttrOn(_value); + property Style read ReadXmlAttrStyle write WriteXmlAttrStyle; + property String read ReadXmlAttrString write WriteXmlAttrString; + function ReadXmlAttr_On(); + function WriteXmlAttr_On(_value); function ReadXmlAttrFitshape(); function WriteXmlAttrFitshape(_value); + function ReadXmlAttrStyle(); + function WriteXmlAttrStyle(_value); + function ReadXmlAttrString(); + function WriteXmlAttrString(_value); public // Attributes - XmlAttrOn: OpenXmlAttribute; + XmlAttr_On: OpenXmlAttribute; XmlAttrFitshape: OpenXmlAttribute; + XmlAttrStyle: OpenXmlAttribute; + XmlAttrString: OpenXmlAttribute; end; @@ -1127,8 +1135,10 @@ begin pre := {self.}Prefix ? {self.}Prefix + ":" : ""; attributes_ := array(); attributes_pf_ := array( - "on": makeweakref(thisFunction(WriteXmlAttrOn)), + "on": makeweakref(thisFunction(WriteXmlAttr_On)), "fitshape": makeweakref(thisFunction(WriteXmlAttrFitshape)), + "style": makeweakref(thisFunction(WriteXmlAttrStyle)), + "string": makeweakref(thisFunction(WriteXmlAttrString)), ); sorted_child_ := array( ); @@ -1140,26 +1150,30 @@ begin tslassigning_backup := tslassigning; tslassigning := 1; class(OpenXmlElement).Copy(_obj); - if not ifnil(_obj.On) then - {self.}On := _obj.On; + if not ifnil(_obj._On) then + {self.}_On := _obj._On; if not ifnil(_obj.Fitshape) then {self.}Fitshape := _obj.Fitshape; + if not ifnil(_obj.Style) then + {self.}Style := _obj.Style; + if not ifnil(_obj.String) then + {self.}String := _obj.String; tslassigning := tslassigning_backup; end; -function Textpath.ReadXmlAttrOn(); +function Textpath.ReadXmlAttr_On(); begin - return {self.}XmlAttrOn.Value; + return {self.}XmlAttr_On.Value; end; -function Textpath.WriteXmlAttrOn(_value); +function Textpath.WriteXmlAttr_On(_value); begin - if ifnil({self.}XmlAttrOn) then + if ifnil({self.}XmlAttr_On) then begin - {self.}XmlAttrOn := new OpenXmlAttribute("", "on", nil); - attributes_[length(attributes_)] := {self.}XmlAttrOn; + {self.}XmlAttr_On := new OpenXmlAttribute("", "on", nil); + attributes_[length(attributes_)] := {self.}XmlAttr_On; end - {self.}XmlAttrOn.Value := _value; + {self.}XmlAttr_On.Value := _value; end; function Textpath.ReadXmlAttrFitshape(); @@ -1177,6 +1191,36 @@ begin {self.}XmlAttrFitshape.Value := _value; end; +function Textpath.ReadXmlAttrStyle(); +begin + return {self.}XmlAttrStyle.Value; +end; + +function Textpath.WriteXmlAttrStyle(_value); +begin + if ifnil({self.}XmlAttrStyle) then + begin + {self.}XmlAttrStyle := new OpenXmlAttribute("", "style", nil); + attributes_[length(attributes_)] := {self.}XmlAttrStyle; + end + {self.}XmlAttrStyle.Value := _value; +end; + +function Textpath.ReadXmlAttrString(); +begin + return {self.}XmlAttrString.Value; +end; + +function Textpath.WriteXmlAttrString(_value); +begin + if ifnil({self.}XmlAttrString) then + begin + {self.}XmlAttrString := new OpenXmlAttribute("", "string", nil); + attributes_[length(attributes_)] := {self.}XmlAttrString; + end + {self.}XmlAttrString.Value := _value; +end; + function Handles.Create();overload; begin {self.}Create(nil, "v", "handles"); diff --git a/autounit/VXmlAdapter.tsf b/autounit/VMLAdapter.tsf similarity index 55% rename from autounit/VXmlAdapter.tsf rename to autounit/VMLAdapter.tsf index a698c2f..7942179 100644 --- a/autounit/VXmlAdapter.tsf +++ b/autounit/VMLAdapter.tsf @@ -1,4 +1,4 @@ -unit VXmlAdapter; +unit VMLAdapter; interface implementation diff --git a/autounit/VXmlUnitDecorator.tsf b/autounit/VMLUnitDecorator.tsf similarity index 97% rename from autounit/VXmlUnitDecorator.tsf rename to autounit/VMLUnitDecorator.tsf index 9947b25..fcad4fd 100644 --- a/autounit/VXmlUnitDecorator.tsf +++ b/autounit/VMLUnitDecorator.tsf @@ -1,6 +1,6 @@ -unit VXmlUnitDecorator; +unit VMLUnitDecorator; interface -uses VXml, TSSafeUnitConverter; +uses VML, TSSafeUnitConverter; type ShapetypeUnitDecorator = class(Shapetype) public @@ -322,10 +322,14 @@ function TextpathUnitDecorator.Convert(); begin tslassigning_backup := tslassigning; tslassigning := 1; - if not ifnil(object_.XmlAttrOn) then - {self.}On := object_.XmlAttrOn.Value; + if not ifnil(object_.XmlAttr_On) then + {self.}_On := object_.XmlAttr_On.Value; if not ifnil(object_.XmlAttrFitshape) then {self.}Fitshape := object_.XmlAttrFitshape.Value; + if not ifnil(object_.XmlAttrStyle) then + {self.}Style := object_.XmlAttrStyle.Value; + if not ifnil(object_.XmlAttrString) then + {self.}String := object_.XmlAttrString.Value; tslassigning := tslassigning_backup; end;