config update

This commit is contained in:
csh 2025-01-03 10:24:13 +08:00
parent c77abfc1c8
commit 41bbf69f79
7 changed files with 3211 additions and 320 deletions

File diff suppressed because it is too large Load Diff

View File

@ -92,6 +92,15 @@ private
object_: PBdr; object_: PBdr;
end; end;
type FramePrUnitDecorator = class(FramePr)
public
function Create(_obj: FramePr);
function GetObject();
function Convert();
private
object_: FramePr;
end;
type PBorderUnitDecorator = class(PBorder) type PBorderUnitDecorator = class(PBorder)
public public
function Create(_obj: PBorder); function Create(_obj: PBorder);
@ -155,6 +164,60 @@ private
object_: RPr; object_: RPr;
end; 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) type RFontsUnitDecorator = class(RFonts)
public public
function Create(_obj: RFonts); function Create(_obj: RFonts);
@ -470,15 +533,6 @@ private
object_: GridSpan; object_: GridSpan;
end; end;
type ShdUnitDecorator = class(Shd)
public
function Create(_obj: Shd);
function GetObject();
function Convert();
private
object_: Shd;
end;
type SdtUnitDecorator = class(Sdt) type SdtUnitDecorator = class(Sdt)
public public
function Create(_obj: Sdt); function Create(_obj: Sdt);
@ -920,6 +974,15 @@ private
object_: Pict; object_: Pict;
end; end;
type ControlUnitDecorator = class(Control)
public
function Create(_obj: Control);
function GetObject();
function Convert();
private
object_: Control;
end;
type FtrUnitDecorator = class(Ftr) type FtrUnitDecorator = class(Ftr)
public public
function Create(_obj: Ftr); function Create(_obj: Ftr);
@ -1045,8 +1108,8 @@ function DocumentUnitDecorator.Convert();
begin begin
tslassigning_backup := tslassigning; tslassigning_backup := tslassigning;
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlAttrMcIgnorable) then if not ifnil(object_.XmlAttrIgnorable) then
{self.}McIgnorable := object_.XmlAttrMcIgnorable.Value; {self.}Ignorable := object_.XmlAttrIgnorable.Value;
if not ifnil(object_.XmlChildBody) then if not ifnil(object_.XmlChildBody) then
{self.}XmlChildBody := new BodyUnitDecorator(object_.XmlChildBody); {self.}XmlChildBody := new BodyUnitDecorator(object_.XmlChildBody);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
@ -1116,6 +1179,11 @@ begin
{self.}XmlChildOMathPara := new OMathParaUnitDecorator(object_.XmlChildOMathPara); {self.}XmlChildOMathPara := new OMathParaUnitDecorator(object_.XmlChildOMathPara);
if not ifnil(object_.XmlChildIns) then if not ifnil(object_.XmlChildIns) then
{self.}XmlChildIns := new InsUnitDecorator(object_.XmlChildIns); {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(); elems := object_.Rs();
for _,elem in elems do for _,elem in elems do
{self.}AppendChild(new RUnitDecorator(elem)); {self.}AppendChild(new RUnitDecorator(elem));
@ -1256,6 +1324,8 @@ begin
{self.}XmlChildSectPr := new SectPrUnitDecorator(object_.XmlChildSectPr); {self.}XmlChildSectPr := new SectPrUnitDecorator(object_.XmlChildSectPr);
if not ifnil(object_.XmlChildTabs) then if not ifnil(object_.XmlChildTabs) then
{self.}XmlChildTabs := new TabsUnitDecorator(object_.XmlChildTabs); {self.}XmlChildTabs := new TabsUnitDecorator(object_.XmlChildTabs);
if not ifnil(object_.XmlChildBidi) then
{self.}Bidi.Copy(object_.XmlChildBidi);
if not ifnil(object_.XmlChildWidowControl) then if not ifnil(object_.XmlChildWidowControl) then
{self.}WidowControl.Copy(object_.XmlChildWidowControl); {self.}WidowControl.Copy(object_.XmlChildWidowControl);
if not ifnil(object_.XmlChildSnapToGrid) then if not ifnil(object_.XmlChildSnapToGrid) then
@ -1272,8 +1342,20 @@ begin
{self.}KeepNext.Copy(object_.XmlChildKeepNext); {self.}KeepNext.Copy(object_.XmlChildKeepNext);
if not ifnil(object_.XmlChildKeepLines) then if not ifnil(object_.XmlChildKeepLines) then
{self.}KeepLines.Copy(object_.XmlChildKeepLines); {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 if not ifnil(object_.XmlChildPageBreakBefore) then
{self.}PageBreakBefore.Copy(object_.XmlChildPageBreakBefore); {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 if not ifnil(object_.XmlChildAdjustRightInd) then
{self.}XmlChildAdjustRightInd := new PureWValUnitDecorator(object_.XmlChildAdjustRightInd); {self.}XmlChildAdjustRightInd := new PureWValUnitDecorator(object_.XmlChildAdjustRightInd);
if not ifnil(object_.XmlChildSpacing) then if not ifnil(object_.XmlChildSpacing) then
@ -1294,8 +1376,20 @@ begin
{self.}XmlChildShd := new ShdUnitDecorator(object_.XmlChildShd); {self.}XmlChildShd := new ShdUnitDecorator(object_.XmlChildShd);
if not ifnil(object_.XmlChildWordWrap) then if not ifnil(object_.XmlChildWordWrap) then
{self.}XmlChildWordWrap := new PureWValUnitDecorator(object_.XmlChildWordWrap); {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 if not ifnil(object_.XmlChildTextboxTightWrap) then
{self.}XmlChildTextboxTightWrap := new PureWValUnitDecorator(object_.XmlChildTextboxTightWrap); {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; tslassigning := tslassigning_backup;
end; end;
@ -1317,8 +1411,65 @@ begin
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlChildTop) then if not ifnil(object_.XmlChildTop) then
{self.}XmlChildTop := new PBorderUnitDecorator(object_.XmlChildTop); {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 if not ifnil(object_.XmlChildBottom) then
{self.}XmlChildBottom := new PBorderUnitDecorator(object_.XmlChildBottom); {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; tslassigning := tslassigning_backup;
end; end;
@ -1344,8 +1495,14 @@ begin
{self.}Color := object_.XmlAttrColor.Value; {self.}Color := object_.XmlAttrColor.Value;
if not ifnil(object_.XmlAttrSpace) then if not ifnil(object_.XmlAttrSpace) then
{self.}Space := object_.XmlAttrSpace.Value; {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 if not ifnil(object_.XmlAttrThemeColor) then
{self.}ThemeColor := object_.XmlAttrThemeColor.Value; {self.}ThemeColor := object_.XmlAttrThemeColor.Value;
if not ifnil(object_.XmlAttrThemeShade) then
{self.}ThemeShade := object_.XmlAttrThemeShade.Value;
if not ifnil(object_.XmlAttrThemeTint) then if not ifnil(object_.XmlAttrThemeTint) then
{self.}ThemeTint := object_.XmlAttrThemeTint.Value; {self.}ThemeTint := object_.XmlAttrThemeTint.Value;
if not ifnil(object_.XmlAttrSz) then if not ifnil(object_.XmlAttrSz) then
@ -1511,6 +1668,8 @@ begin
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlChildNoProof) then if not ifnil(object_.XmlChildNoProof) then
{self.}XmlChildNoProof := new PureValUnitDecorator(object_.XmlChildNoProof); {self.}XmlChildNoProof := new PureValUnitDecorator(object_.XmlChildNoProof);
if not ifnil(object_.XmlChildOutline) then
{self.}XmlChildOutline := new PureValUnitDecorator(object_.XmlChildOutline);
if not ifnil(object_.XmlChildPosition) then if not ifnil(object_.XmlChildPosition) then
{self.}XmlChildPosition := new PureValUnitDecorator(object_.XmlChildPosition); {self.}XmlChildPosition := new PureValUnitDecorator(object_.XmlChildPosition);
if not ifnil(object_.XmlChildWebHidden) then if not ifnil(object_.XmlChildWebHidden) then
@ -1531,10 +1690,32 @@ begin
{self.}B.Copy(object_.XmlChildB); {self.}B.Copy(object_.XmlChildB);
if not ifnil(object_.XmlChildBCs) then if not ifnil(object_.XmlChildBCs) then
{self.}BCs.Copy(object_.XmlChildBCs); {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 if not ifnil(object_.XmlChildStrike) then
{self.}Strike.Copy(object_.XmlChildStrike); {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 if not ifnil(object_.XmlChildColor) then
{self.}XmlChildColor := new ColorUnitDecorator(object_.XmlChildColor); {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 if not ifnil(object_.XmlChildSz) then
{self.}XmlChildSz := new SzUnitDecorator(object_.XmlChildSz); {self.}XmlChildSz := new SzUnitDecorator(object_.XmlChildSz);
if not ifnil(object_.XmlChildSzCs) then if not ifnil(object_.XmlChildSzCs) then
@ -1543,10 +1724,212 @@ begin
{self.}U.Copy(object_.XmlChildU); {self.}U.Copy(object_.XmlChildU);
if not ifnil(object_.XmlChildLang) then if not ifnil(object_.XmlChildLang) then
{self.}XmlChildLang := new LangUnitDecorator(object_.XmlChildLang); {self.}XmlChildLang := new LangUnitDecorator(object_.XmlChildLang);
if not ifnil(object_.XmlChildImprint) then
{self.}XmlChildImprint := new PureWValUnitDecorator(object_.XmlChildImprint);
if not ifnil(object_.XmlChildVertAlign) then if not ifnil(object_.XmlChildVertAlign) then
{self.}XmlChildVertAlign := new PureWValUnitDecorator(object_.XmlChildVertAlign); {self.}XmlChildVertAlign := new PureWValUnitDecorator(object_.XmlChildVertAlign);
if not ifnil(object_.XmlChildLigatures) then if not ifnil(object_.XmlChildLigatures) then
{self.}XmlChildLigatures := new PureWValUnitDecorator(object_.XmlChildLigatures); {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; tslassigning := tslassigning_backup;
end; end;
@ -1738,6 +2121,8 @@ begin
{self.}XmlChildAlternateContent := new AlternateContentUnitDecorator(object_.XmlChildAlternateContent); {self.}XmlChildAlternateContent := new AlternateContentUnitDecorator(object_.XmlChildAlternateContent);
if not ifnil(object_.XmlChildDrawing) then if not ifnil(object_.XmlChildDrawing) then
{self.}XmlChildDrawing := new DrawingUnitDecorator(object_.XmlChildDrawing); {self.}XmlChildDrawing := new DrawingUnitDecorator(object_.XmlChildDrawing);
if not ifnil(object_.XmlChildPict) then
{self.}XmlChildPict := new PictUnitDecorator(object_.XmlChildPict);
if not ifnil(object_.XmlChildT) then if not ifnil(object_.XmlChildT) then
{self.}XmlChildT := new TUnitDecorator(object_.XmlChildT); {self.}XmlChildT := new TUnitDecorator(object_.XmlChildT);
if not ifnil(object_.XmlChildObject) then if not ifnil(object_.XmlChildObject) then
@ -1957,6 +2342,9 @@ begin
elems := object_.Trs(); elems := object_.Trs();
for _,elem in elems do for _,elem in elems do
{self.}AppendChild(new TrUnitDecorator(elem)); {self.}AppendChild(new TrUnitDecorator(elem));
elems := object_.Sdts();
for _,elem in elems do
{self.}AppendChild(new SdtUnitDecorator(elem));
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;
@ -2238,6 +2626,9 @@ begin
{self.}RsidTr := object_.XmlAttrRsidTr.Value; {self.}RsidTr := object_.XmlAttrRsidTr.Value;
if not ifnil(object_.XmlChildTrPr) then if not ifnil(object_.XmlChildTrPr) then
{self.}XmlChildTrPr := new TrPrUnitDecorator(object_.XmlChildTrPr); {self.}XmlChildTrPr := new TrPrUnitDecorator(object_.XmlChildTrPr);
elems := object_.Sdts();
for _,elem in elems do
{self.}AppendChild(new SdtUnitDecorator(elem));
elems := object_.Tcs(); elems := object_.Tcs();
for _,elem in elems do for _,elem in elems do
{self.}AppendChild(new TcUnitDecorator(elem)); {self.}AppendChild(new TcUnitDecorator(elem));
@ -2272,6 +2663,8 @@ begin
{self.}XmlChildCnfStyle := new CnfStyleUnitDecorator(object_.XmlChildCnfStyle); {self.}XmlChildCnfStyle := new CnfStyleUnitDecorator(object_.XmlChildCnfStyle);
if not ifnil(object_.XmlChildIns) then if not ifnil(object_.XmlChildIns) then
{self.}XmlChildIns := new InsUnitDecorator(object_.XmlChildIns); {self.}XmlChildIns := new InsUnitDecorator(object_.XmlChildIns);
if not ifnil(object_.XmlChildDel) then
{self.}XmlChildDel := new DelUnitDecorator(object_.XmlChildDel);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;
@ -2430,6 +2823,8 @@ begin
{self.}XmlChildShd := new ShdUnitDecorator(object_.XmlChildShd); {self.}XmlChildShd := new ShdUnitDecorator(object_.XmlChildShd);
if not ifnil(object_.XmlChildTcBorders) then if not ifnil(object_.XmlChildTcBorders) then
{self.}XmlChildTcBorders := new TcBordersUnitDecorator(object_.XmlChildTcBorders); {self.}XmlChildTcBorders := new TcBordersUnitDecorator(object_.XmlChildTcBorders);
if not ifnil(object_.XmlChildTextDirection) then
{self.}XmlChildTextDirection := new PureWValUnitDecorator(object_.XmlChildTextDirection);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;
@ -2520,35 +2915,6 @@ begin
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; 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); function SdtUnitDecorator.Create(_obj: Sdt);
begin begin
class(Sdt).Create(); class(Sdt).Create();
@ -2709,6 +3075,8 @@ begin
{self.}TitlePg.Copy(object_.XmlChildTitlePg); {self.}TitlePg.Copy(object_.XmlChildTitlePg);
if not ifnil(object_.XmlChildDocGrid) then if not ifnil(object_.XmlChildDocGrid) then
{self.}XmlChildDocGrid := new DocGridUnitDecorator(object_.XmlChildDocGrid); {self.}XmlChildDocGrid := new DocGridUnitDecorator(object_.XmlChildDocGrid);
if not ifnil(object_.XmlChildTextDirection) then
{self.}XmlChildTextDirection := new PureWValUnitDecorator(object_.XmlChildTextDirection);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;
@ -3506,8 +3874,8 @@ function StylesUnitDecorator.Convert();
begin begin
tslassigning_backup := tslassigning; tslassigning_backup := tslassigning;
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlAttrMcIgnorable) then if not ifnil(object_.XmlAttrIgnorable) then
{self.}McIgnorable := object_.XmlAttrMcIgnorable.Value; {self.}Ignorable := object_.XmlAttrIgnorable.Value;
if not ifnil(object_.XmlChildDocDefaults) then if not ifnil(object_.XmlChildDocDefaults) then
{self.}XmlChildDocDefaults := new DocDefaultsUnitDecorator(object_.XmlChildDocDefaults); {self.}XmlChildDocDefaults := new DocDefaultsUnitDecorator(object_.XmlChildDocDefaults);
if not ifnil(object_.XmlChildLatenStyles) then if not ifnil(object_.XmlChildLatenStyles) then
@ -3801,8 +4169,8 @@ function WebSettingsUnitDecorator.Convert();
begin begin
tslassigning_backup := tslassigning; tslassigning_backup := tslassigning;
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlAttrMcIgnorable) then if not ifnil(object_.XmlAttrIgnorable) then
{self.}McIgnorable := object_.XmlAttrMcIgnorable.Value; {self.}Ignorable := object_.XmlAttrIgnorable.Value;
if not ifnil(object_.XmlChildOptimizeForBrowser) then if not ifnil(object_.XmlChildOptimizeForBrowser) then
{self.}OptimizeForBrowser.Copy(object_.XmlChildOptimizeForBrowser); {self.}OptimizeForBrowser.Copy(object_.XmlChildOptimizeForBrowser);
if not ifnil(object_.XmlChildAllowPNG) then if not ifnil(object_.XmlChildAllowPNG) then
@ -3901,6 +4269,33 @@ begin
{self.}XmlChildShapetype := new ShapetypeUnitDecorator(object_.XmlChildShapetype); {self.}XmlChildShapetype := new ShapetypeUnitDecorator(object_.XmlChildShapetype);
if not ifnil(object_.XmlChildShape) then if not ifnil(object_.XmlChildShape) then
{self.}XmlChildShape := new ShapeUnitDecorator(object_.XmlChildShape); {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; tslassigning := tslassigning_backup;
end; end;
@ -3949,6 +4344,8 @@ begin
elems := object_.Ps(); elems := object_.Ps();
for _,elem in elems do for _,elem in elems do
{self.}AppendChild(new PUnitDecorator(elem)); {self.}AppendChild(new PUnitDecorator(elem));
if not ifnil(object_.XmlChildSdt) then
{self.}XmlChildSdt := new SdtUnitDecorator(object_.XmlChildSdt);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;

View File

@ -259,11 +259,14 @@ public
// normal property // normal property
property RPr read ReadXmlChildRPr; property RPr read ReadXmlChildRPr;
property Del read ReadXmlChildDel;
function ReadXmlChildRPr(): RPr; function ReadXmlChildRPr(): RPr;
function ReadXmlChildDel(): Del;
public public
// Children // Children
XmlChildRPr: RPr; XmlChildRPr: RPr;
XmlChildDel: Del;
end; end;
type E = class(OpenXmlElement) type E = class(OpenXmlElement)
@ -1576,6 +1579,7 @@ begin
); );
sorted_child_ := array( sorted_child_ := array(
pre + "rPr": array(0, makeweakref(thisFunction(ReadXmlChildRPr))), pre + "rPr": array(0, makeweakref(thisFunction(ReadXmlChildRPr))),
pre + "del": array(1, makeweakref(thisFunction(ReadXmlChildDel))),
); );
container_ := new TSOfficeContainer(sorted_child_); container_ := new TSOfficeContainer(sorted_child_);
end; end;
@ -1587,6 +1591,8 @@ begin
class(OpenXmlElement).Copy(_obj); class(OpenXmlElement).Copy(_obj);
if not ifnil(_obj.XmlChildRPr) then if not ifnil(_obj.XmlChildRPr) then
{self.}RPr.Copy(_obj.XmlChildRPr); {self.}RPr.Copy(_obj.XmlChildRPr);
if not ifnil(_obj.XmlChildDel) then
{self.}Del.Copy(_obj.XmlChildDel);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;
@ -1600,6 +1606,16 @@ begin
return {self.}XmlChildRPr; return {self.}XmlChildRPr;
end; 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; function E.Create();overload;
begin begin
{self.}Create(nil, "m", "e"); {self.}Create(nil, "m", "e");

View File

@ -569,6 +569,8 @@ begin
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlChildRPr) then if not ifnil(object_.XmlChildRPr) then
{self.}XmlChildRPr := new RPrUnitDecorator(object_.XmlChildRPr); {self.}XmlChildRPr := new RPrUnitDecorator(object_.XmlChildRPr);
if not ifnil(object_.XmlChildDel) then
{self.}XmlChildDel := new DelUnitDecorator(object_.XmlChildDel);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;

View File

@ -1,4 +1,4 @@
unit VXml; unit VML;
interface interface
uses DocxML; uses DocxML;
@ -202,17 +202,25 @@ public
function Copy(_obj: Textpath);override; function Copy(_obj: Textpath);override;
public public
// attributes property // attributes property
property On read ReadXmlAttrOn write WriteXmlAttrOn; property _On read ReadXmlAttr_On write WriteXmlAttr_On;
property Fitshape read ReadXmlAttrFitshape write WriteXmlAttrFitshape; property Fitshape read ReadXmlAttrFitshape write WriteXmlAttrFitshape;
function ReadXmlAttrOn(); property Style read ReadXmlAttrStyle write WriteXmlAttrStyle;
function WriteXmlAttrOn(_value); property String read ReadXmlAttrString write WriteXmlAttrString;
function ReadXmlAttr_On();
function WriteXmlAttr_On(_value);
function ReadXmlAttrFitshape(); function ReadXmlAttrFitshape();
function WriteXmlAttrFitshape(_value); function WriteXmlAttrFitshape(_value);
function ReadXmlAttrStyle();
function WriteXmlAttrStyle(_value);
function ReadXmlAttrString();
function WriteXmlAttrString(_value);
public public
// Attributes // Attributes
XmlAttrOn: OpenXmlAttribute; XmlAttr_On: OpenXmlAttribute;
XmlAttrFitshape: OpenXmlAttribute; XmlAttrFitshape: OpenXmlAttribute;
XmlAttrStyle: OpenXmlAttribute;
XmlAttrString: OpenXmlAttribute;
end; end;
@ -1127,8 +1135,10 @@ begin
pre := {self.}Prefix ? {self.}Prefix + ":" : ""; pre := {self.}Prefix ? {self.}Prefix + ":" : "";
attributes_ := array(); attributes_ := array();
attributes_pf_ := array( attributes_pf_ := array(
"on": makeweakref(thisFunction(WriteXmlAttrOn)), "on": makeweakref(thisFunction(WriteXmlAttr_On)),
"fitshape": makeweakref(thisFunction(WriteXmlAttrFitshape)), "fitshape": makeweakref(thisFunction(WriteXmlAttrFitshape)),
"style": makeweakref(thisFunction(WriteXmlAttrStyle)),
"string": makeweakref(thisFunction(WriteXmlAttrString)),
); );
sorted_child_ := array( sorted_child_ := array(
); );
@ -1140,26 +1150,30 @@ begin
tslassigning_backup := tslassigning; tslassigning_backup := tslassigning;
tslassigning := 1; tslassigning := 1;
class(OpenXmlElement).Copy(_obj); class(OpenXmlElement).Copy(_obj);
if not ifnil(_obj.On) then if not ifnil(_obj._On) then
{self.}On := _obj.On; {self.}_On := _obj._On;
if not ifnil(_obj.Fitshape) then if not ifnil(_obj.Fitshape) then
{self.}Fitshape := _obj.Fitshape; {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; tslassigning := tslassigning_backup;
end; end;
function Textpath.ReadXmlAttrOn(); function Textpath.ReadXmlAttr_On();
begin begin
return {self.}XmlAttrOn.Value; return {self.}XmlAttr_On.Value;
end; end;
function Textpath.WriteXmlAttrOn(_value); function Textpath.WriteXmlAttr_On(_value);
begin begin
if ifnil({self.}XmlAttrOn) then if ifnil({self.}XmlAttr_On) then
begin begin
{self.}XmlAttrOn := new OpenXmlAttribute("", "on", nil); {self.}XmlAttr_On := new OpenXmlAttribute("", "on", nil);
attributes_[length(attributes_)] := {self.}XmlAttrOn; attributes_[length(attributes_)] := {self.}XmlAttr_On;
end end
{self.}XmlAttrOn.Value := _value; {self.}XmlAttr_On.Value := _value;
end; end;
function Textpath.ReadXmlAttrFitshape(); function Textpath.ReadXmlAttrFitshape();
@ -1177,6 +1191,36 @@ begin
{self.}XmlAttrFitshape.Value := _value; {self.}XmlAttrFitshape.Value := _value;
end; 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; function Handles.Create();overload;
begin begin
{self.}Create(nil, "v", "handles"); {self.}Create(nil, "v", "handles");

View File

@ -1,4 +1,4 @@
unit VXmlAdapter; unit VMLAdapter;
interface interface
implementation implementation

View File

@ -1,6 +1,6 @@
unit VXmlUnitDecorator; unit VMLUnitDecorator;
interface interface
uses VXml, TSSafeUnitConverter; uses VML, TSSafeUnitConverter;
type ShapetypeUnitDecorator = class(Shapetype) type ShapetypeUnitDecorator = class(Shapetype)
public public
@ -322,10 +322,14 @@ function TextpathUnitDecorator.Convert();
begin begin
tslassigning_backup := tslassigning; tslassigning_backup := tslassigning;
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlAttrOn) then if not ifnil(object_.XmlAttr_On) then
{self.}On := object_.XmlAttrOn.Value; {self.}_On := object_.XmlAttr_On.Value;
if not ifnil(object_.XmlAttrFitshape) then if not ifnil(object_.XmlAttrFitshape) then
{self.}Fitshape := object_.XmlAttrFitshape.Value; {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; tslassigning := tslassigning_backup;
end; end;