tinysoft/OfficeXml
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tinysoft/OfficeXml:16452c8362228a9d358b8ca0ca294bb68ad248f0
Branches Tags
tinysoft/OfficeXml:main
..
compare: tinysoft/OfficeXml:main
Branches Tags
tinysoft/OfficeXml:main
4 Commits
16452c8362 .. main
Author SHA1 Message Date
csh c92fd3b638 patch1 2025-09-26 11:36:18 +08:00
csh 20a343f501 20250925 2025-09-25 17:57:23 +08:00
csh 67a7d27363 3.0.0 update 2025-09-16 11:29:58 +08:00
csh 0b60aeb006 v3.0.0 2025-08-06 18:23:02 +08:00
16 changed files with 1640 additions and 809 deletions
Expand all files Collapse all files
OFFICEXML.tsf
+6
View File
@@ -0,0 +1,6 @@
unit OFFICEXML;
interface
const Version = "2025 09 25";
implementation
end.
autounit/DocxML.tsf
+674 -210
View File
File diff suppressed because it is too large Load Diff
autounit/DocxMLAdapter.tsf
-373
View File
@@ -1,373 +0,0 @@
unit DocxMLAdapter;
interface
type TabsAdapter = class
public
function Create(_obj: Tabs);
function Init();
function GetTabByVal(_key: string);
function SetTabByVal(_key: string; _value: tslobj);
private
object_: Tabs;
tab_hash_: tableArray;
end;
type SectPrAdapter = class
public
function Create(_obj: SectPr);
function Init();
function GetHeaderReferenceByType(_key: string);
function SetHeaderReferenceByType(_key: string; _value: tslobj);
function GetFooterReferenceByType(_key: string);
function SetFooterReferenceByType(_key: string; _value: tslobj);
private
object_: SectPr;
headerreference_hash_: tableArray;
footerreference_hash_: tableArray;
end;
type EndnotesAdapter = class
public
function Create(_obj: Endnotes);
function Init();
function GetEndnoteById(_key: string);
function SetEndnoteById(_key: string; _value: tslobj);
private
object_: Endnotes;
endnote_hash_: tableArray;
end;
type FootnotesAdapter = class
public
function Create(_obj: Footnotes);
function Init();
function GetFootnoteById(_key: string);
function SetFootnoteById(_key: string; _value: tslobj);
private
object_: Footnotes;
footnote_hash_: tableArray;
end;
type FootnotePrAdapter = class
public
function Create(_obj: FootnotePr);
function Init();
function GetFootnoteById(_key: string);
function SetFootnoteById(_key: string; _value: tslobj);
private
object_: FootnotePr;
footnote_hash_: tableArray;
end;
type EndnotePrAdapter = class
public
function Create(_obj: EndnotePr);
function Init();
function GetFootnoteById(_key: string);
function SetFootnoteById(_key: string; _value: tslobj);
private
object_: EndnotePr;
footnote_hash_: tableArray;
end;
type StylesAdapter = class
public
function Create(_obj: Styles);
function Init();
function GetStyleByStyleId(_key: string);
function SetStyleByStyleId(_key: string; _value: tslobj);
private
object_: Styles;
style_hash_: tableArray;
end;
type StyleAdapter = class
public
function Create(_obj: Style);
function Init();
function GetTblStylePrByType(_key: string);
function SetTblStylePrByType(_key: string; _value: tslobj);
private
object_: Style;
tblstylepr_hash_: tableArray;
end;
type NumberingAdapter = class
public
function Create(_obj: Numbering);
function Init();
function GetAbstractNumByAbstractNumId(_key: string);
function SetAbstractNumByAbstractNumId(_key: string; _value: tslobj);
function GetNumByNumId(_key: string);
function SetNumByNumId(_key: string; _value: tslobj);
private
object_: Numbering;
abstractnum_hash_: tableArray;
num_hash_: tableArray;
end;
implementation
function TabsAdapter.Create(_obj: Tabs);
begin
object_ := _obj;
tab_hash_ := array();
{self.}Init();
end;
function TabsAdapter.Init();
begin
elements := object_.Tabs();
for k,v in elements do
tab_hash_[v.Val] := v;
end;
function TabsAdapter.GetTabByVal(_key: string);
begin
return tab_hash_[_key];
end;
function TabsAdapter.SetTabByVal(_key: string; _value: tslobj);
begin
tab_hash_[_key] := _value;
end;
function SectPrAdapter.Create(_obj: SectPr);
begin
object_ := _obj;
headerreference_hash_ := array();
footerreference_hash_ := array();
{self.}Init();
end;
function SectPrAdapter.Init();
begin
elements := object_.HeaderReferences();
for k,v in elements do
headerreference_hash_[v.Type] := v;
elements := object_.FooterReferences();
for k,v in elements do
footerreference_hash_[v.Type] := v;
end;
function SectPrAdapter.GetHeaderReferenceByType(_key: string);
begin
return headerreference_hash_[_key];
end;
function SectPrAdapter.SetHeaderReferenceByType(_key: string; _value: tslobj);
begin
headerreference_hash_[_key] := _value;
end;
function SectPrAdapter.GetFooterReferenceByType(_key: string);
begin
return footerreference_hash_[_key];
end;
function SectPrAdapter.SetFooterReferenceByType(_key: string; _value: tslobj);
begin
footerreference_hash_[_key] := _value;
end;
function EndnotesAdapter.Create(_obj: Endnotes);
begin
object_ := _obj;
endnote_hash_ := array();
{self.}Init();
end;
function EndnotesAdapter.Init();
begin
elements := object_.Endnotes();
for k,v in elements do
endnote_hash_[v.Id] := v;
end;
function EndnotesAdapter.GetEndnoteById(_key: string);
begin
return endnote_hash_[_key];
end;
function EndnotesAdapter.SetEndnoteById(_key: string; _value: tslobj);
begin
endnote_hash_[_key] := _value;
end;
function FootnotesAdapter.Create(_obj: Footnotes);
begin
object_ := _obj;
footnote_hash_ := array();
{self.}Init();
end;
function FootnotesAdapter.Init();
begin
elements := object_.Footnotes();
for k,v in elements do
footnote_hash_[v.Id] := v;
end;
function FootnotesAdapter.GetFootnoteById(_key: string);
begin
return footnote_hash_[_key];
end;
function FootnotesAdapter.SetFootnoteById(_key: string; _value: tslobj);
begin
footnote_hash_[_key] := _value;
end;
function FootnotePrAdapter.Create(_obj: FootnotePr);
begin
object_ := _obj;
footnote_hash_ := array();
{self.}Init();
end;
function FootnotePrAdapter.Init();
begin
elements := object_.Footnotes();
for k,v in elements do
footnote_hash_[v.Id] := v;
end;
function FootnotePrAdapter.GetFootnoteById(_key: string);
begin
return footnote_hash_[_key];
end;
function FootnotePrAdapter.SetFootnoteById(_key: string; _value: tslobj);
begin
footnote_hash_[_key] := _value;
end;
function EndnotePrAdapter.Create(_obj: EndnotePr);
begin
object_ := _obj;
footnote_hash_ := array();
{self.}Init();
end;
function EndnotePrAdapter.Init();
begin
elements := object_.Footnotes();
for k,v in elements do
footnote_hash_[v.Id] := v;
end;
function EndnotePrAdapter.GetFootnoteById(_key: string);
begin
return footnote_hash_[_key];
end;
function EndnotePrAdapter.SetFootnoteById(_key: string; _value: tslobj);
begin
footnote_hash_[_key] := _value;
end;
function StylesAdapter.Create(_obj: Styles);
begin
object_ := _obj;
style_hash_ := array();
{self.}Init();
end;
function StylesAdapter.Init();
begin
elements := object_.Styles();
for k,v in elements do
style_hash_[v.StyleId] := v;
end;
function StylesAdapter.GetStyleByStyleId(_key: string);
begin
return style_hash_[_key];
end;
function StylesAdapter.SetStyleByStyleId(_key: string; _value: tslobj);
begin
style_hash_[_key] := _value;
end;
function StyleAdapter.Create(_obj: Style);
begin
object_ := _obj;
tblstylepr_hash_ := array();
{self.}Init();
end;
function StyleAdapter.Init();
begin
elements := object_.TblStylePrs();
for k,v in elements do
tblstylepr_hash_[v.Type] := v;
end;
function StyleAdapter.GetTblStylePrByType(_key: string);
begin
return tblstylepr_hash_[_key];
end;
function StyleAdapter.SetTblStylePrByType(_key: string; _value: tslobj);
begin
tblstylepr_hash_[_key] := _value;
end;
function NumberingAdapter.Create(_obj: Numbering);
begin
object_ := _obj;
abstractnum_hash_ := array();
num_hash_ := array();
{self.}Init();
end;
function NumberingAdapter.Init();
begin
elements := object_.AbstractNums();
for k,v in elements do
abstractnum_hash_[v.AbstractNumId] := v;
elements := object_.Nums();
for k,v in elements do
num_hash_[v.NumId] := v;
end;
function NumberingAdapter.GetAbstractNumByAbstractNumId(_key: string);
begin
return abstractnum_hash_[_key];
end;
function NumberingAdapter.SetAbstractNumByAbstractNumId(_key: string; _value: tslobj);
begin
abstractnum_hash_[_key] := _value;
end;
function NumberingAdapter.GetNumByNumId(_key: string);
begin
return num_hash_[_key];
end;
function NumberingAdapter.SetNumByNumId(_key: string; _value: tslobj);
begin
num_hash_[_key] := _value;
end;
end.
autounit/DocxMLAdapters.tsf
+527
View File
@@ -0,0 +1,527 @@
unit DocxMLAdapters;
interface
type Tabs = class
public
function create(_obj: Tabs);
function Init();
function GetTabByVal(_key: string);
function AddTab(_value: Tab);
function RemoveTab(_value: Tab);
property TabCount: uinteger read tab_count_;
private
object_: Tabs;
tab_val_hash_: hash;
tab_count_: uinteger;
end;
type SectPr = class
public
function create(_obj: SectPr);
function Init();
function GetHeaderReferenceByType(_key: string);
function AddHeaderReference(_value: HeaderReference);
function RemoveHeaderReference(_value: HeaderReference);
function GetFooterReferenceByType(_key: string);
function AddFooterReference(_value: FooterReference);
function RemoveFooterReference(_value: FooterReference);
property HeaderReferenceCount: uinteger read headerreference_count_;
property FooterReferenceCount: uinteger read footerreference_count_;
private
object_: SectPr;
headerreference_type_hash_: hash;
headerreference_count_: uinteger;
footerreference_type_hash_: hash;
footerreference_count_: uinteger;
end;
type Endnotes = class
public
function create(_obj: Endnotes);
function Init();
function GetEndnoteById(_key: string);
function AddEndnote(_value: Endnote);
function RemoveEndnote(_value: Endnote);
property EndnoteCount: uinteger read endnote_count_;
private
object_: Endnotes;
endnote_id_hash_: hash;
endnote_count_: uinteger;
end;
type Footnotes = class
public
function create(_obj: Footnotes);
function Init();
function GetFootnoteById(_key: string);
function AddFootnote(_value: Footnote);
function RemoveFootnote(_value: Footnote);
property FootnoteCount: uinteger read footnote_count_;
private
object_: Footnotes;
footnote_id_hash_: hash;
footnote_count_: uinteger;
end;
type FootnotePr = class
public
function create(_obj: FootnotePr);
function Init();
function GetFootnoteById(_key: string);
function AddFootnote(_value: Footnote);
function RemoveFootnote(_value: Footnote);
property FootnoteCount: uinteger read footnote_count_;
private
object_: FootnotePr;
footnote_id_hash_: hash;
footnote_count_: uinteger;
end;
type EndnotePr = class
public
function create(_obj: EndnotePr);
function Init();
function GetFootnoteById(_key: string);
function AddFootnote(_value: Footnote);
function RemoveFootnote(_value: Footnote);
property FootnoteCount: uinteger read footnote_count_;
private
object_: EndnotePr;
footnote_id_hash_: hash;
footnote_count_: uinteger;
end;
type Styles = class
public
function create(_obj: Styles);
function Init();
function GetStyleByStyleId(_key: string);
function GetStyleByName(_key: string);
function AddStyle(_value: Style);
function RemoveStyle(_value: Style);
property StyleCount: uinteger read style_count_;
private
object_: Styles;
style_styleid_hash_: hash;
style_name_hash_: hash;
style_count_: uinteger;
end;
type Style = class
public
function create(_obj: Style);
function Init();
function GetTblStylePrByType(_key: string);
function AddTblStylePr(_value: TblStylePr);
function RemoveTblStylePr(_value: TblStylePr);
property TblStylePrCount: uinteger read tblstylepr_count_;
private
object_: Style;
tblstylepr_type_hash_: hash;
tblstylepr_count_: uinteger;
end;
type Numbering = class
public
function create(_obj: Numbering);
function Init();
function GetAbstractNumByAbstractNumId(_key: string);
function AddAbstractNum(_value: AbstractNum);
function RemoveAbstractNum(_value: AbstractNum);
function GetNumByNumId(_key: string);
function AddNum(_value: Num);
function RemoveNum(_value: Num);
property AbstractNumCount: uinteger read abstractnum_count_;
property NumCount: uinteger read num_count_;
private
object_: Numbering;
abstractnum_abstractnumid_hash_: hash;
abstractnum_count_: uinteger;
num_numid_hash_: hash;
num_count_: uinteger;
end;
implementation
function Tabs.create(_obj: Tabs);
begin
object_ := _obj;
tab_count_ := 0;
tab_val_hash_ := array();
{self.}Init();
end;
function Tabs.Init();
begin
elements := object_.Tabs();
tab_count_ := length(elements);
for k,v in elements do
tab_val_hash_[v.Val] := v;
end;
function Tabs.GetTabByVal(_key: string);
begin
return tab_val_hash_[_key];
end;
function Tabs.AddTab(_value: Tab);
begin
tab_val_hash_[_value.Val] := _value;
tab_count_++;
end;
function Tabs.RemoveTab(_value: Tab);
begin
reindex(tab_val_hash_, array(_value.Val: nil));
tab_count_--;
end;
function SectPr.create(_obj: SectPr);
begin
object_ := _obj;
headerreference_count_ := 0;
headerreference_type_hash_ := array();
footerreference_count_ := 0;
footerreference_type_hash_ := array();
{self.}Init();
end;
function SectPr.Init();
begin
elements := object_.HeaderReferences();
headerreference_count_ := length(elements);
for k,v in elements do
headerreference_type_hash_[v.Type] := v;
elements := object_.FooterReferences();
footerreference_count_ := length(elements);
for k,v in elements do
footerreference_type_hash_[v.Type] := v;
end;
function SectPr.GetHeaderReferenceByType(_key: string);
begin
return headerreference_type_hash_[_key];
end;
function SectPr.AddHeaderReference(_value: HeaderReference);
begin
headerreference_type_hash_[_value.Type] := _value;
headerreference_count_++;
end;
function SectPr.RemoveHeaderReference(_value: HeaderReference);
begin
reindex(headerreference_type_hash_, array(_value.Type: nil));
headerreference_count_--;
end;
function SectPr.GetFooterReferenceByType(_key: string);
begin
return footerreference_type_hash_[_key];
end;
function SectPr.AddFooterReference(_value: FooterReference);
begin
footerreference_type_hash_[_value.Type] := _value;
footerreference_count_++;
end;
function SectPr.RemoveFooterReference(_value: FooterReference);
begin
reindex(footerreference_type_hash_, array(_value.Type: nil));
footerreference_count_--;
end;
function Endnotes.create(_obj: Endnotes);
begin
object_ := _obj;
endnote_count_ := 0;
endnote_id_hash_ := array();
{self.}Init();
end;
function Endnotes.Init();
begin
elements := object_.Endnotes();
endnote_count_ := length(elements);
for k,v in elements do
endnote_id_hash_[v.Id] := v;
end;
function Endnotes.GetEndnoteById(_key: string);
begin
return endnote_id_hash_[_key];
end;
function Endnotes.AddEndnote(_value: Endnote);
begin
endnote_id_hash_[_value.Id] := _value;
endnote_count_++;
end;
function Endnotes.RemoveEndnote(_value: Endnote);
begin
reindex(endnote_id_hash_, array(_value.Id: nil));
endnote_count_--;
end;
function Footnotes.create(_obj: Footnotes);
begin
object_ := _obj;
footnote_count_ := 0;
footnote_id_hash_ := array();
{self.}Init();
end;
function Footnotes.Init();
begin
elements := object_.Footnotes();
footnote_count_ := length(elements);
for k,v in elements do
footnote_id_hash_[v.Id] := v;
end;
function Footnotes.GetFootnoteById(_key: string);
begin
return footnote_id_hash_[_key];
end;
function Footnotes.AddFootnote(_value: Footnote);
begin
footnote_id_hash_[_value.Id] := _value;
footnote_count_++;
end;
function Footnotes.RemoveFootnote(_value: Footnote);
begin
reindex(footnote_id_hash_, array(_value.Id: nil));
footnote_count_--;
end;
function FootnotePr.create(_obj: FootnotePr);
begin
object_ := _obj;
footnote_count_ := 0;
footnote_id_hash_ := array();
{self.}Init();
end;
function FootnotePr.Init();
begin
elements := object_.Footnotes();
footnote_count_ := length(elements);
for k,v in elements do
footnote_id_hash_[v.Id] := v;
end;
function FootnotePr.GetFootnoteById(_key: string);
begin
return footnote_id_hash_[_key];
end;
function FootnotePr.AddFootnote(_value: Footnote);
begin
footnote_id_hash_[_value.Id] := _value;
footnote_count_++;
end;
function FootnotePr.RemoveFootnote(_value: Footnote);
begin
reindex(footnote_id_hash_, array(_value.Id: nil));
footnote_count_--;
end;
function EndnotePr.create(_obj: EndnotePr);
begin
object_ := _obj;
footnote_count_ := 0;
footnote_id_hash_ := array();
{self.}Init();
end;
function EndnotePr.Init();
begin
elements := object_.Footnotes();
footnote_count_ := length(elements);
for k,v in elements do
footnote_id_hash_[v.Id] := v;
end;
function EndnotePr.GetFootnoteById(_key: string);
begin
return footnote_id_hash_[_key];
end;
function EndnotePr.AddFootnote(_value: Footnote);
begin
footnote_id_hash_[_value.Id] := _value;
footnote_count_++;
end;
function EndnotePr.RemoveFootnote(_value: Footnote);
begin
reindex(footnote_id_hash_, array(_value.Id: nil));
footnote_count_--;
end;
function Styles.create(_obj: Styles);
begin
object_ := _obj;
style_count_ := 0;
style_styleid_hash_ := array();
style_name_hash_ := array();
{self.}Init();
end;
function Styles.Init();
begin
elements := object_.Styles();
style_count_ := length(elements);
for k,v in elements do
begin
style_styleid_hash_[v.StyleId] := v;
style_name_hash_[v.Name.Val] := v;
end
end;
function Styles.GetStyleByStyleId(_key: string);
begin
return style_styleid_hash_[_key];
end;
function Styles.GetStyleByName(_key: string);
begin
return style_name_hash_[_key];
end;
function Styles.AddStyle(_value: Style);
begin
style_styleid_hash_[_value.StyleId] := _value;
style_name_hash_[_value.Name.Val] := _value;
style_count_++;
end;
function Styles.RemoveStyle(_value: Style);
begin
reindex(style_styleid_hash_, array(_value.StyleId: nil));
reindex(style_name_hash_, array(_value.Name.Val: nil));
style_count_--;
end;
function Style.create(_obj: Style);
begin
object_ := _obj;
tblstylepr_count_ := 0;
tblstylepr_type_hash_ := array();
{self.}Init();
end;
function Style.Init();
begin
elements := object_.TblStylePrs();
tblstylepr_count_ := length(elements);
for k,v in elements do
tblstylepr_type_hash_[v.Type] := v;
end;
function Style.GetTblStylePrByType(_key: string);
begin
return tblstylepr_type_hash_[_key];
end;
function Style.AddTblStylePr(_value: TblStylePr);
begin
tblstylepr_type_hash_[_value.Type] := _value;
tblstylepr_count_++;
end;
function Style.RemoveTblStylePr(_value: TblStylePr);
begin
reindex(tblstylepr_type_hash_, array(_value.Type: nil));
tblstylepr_count_--;
end;
function Numbering.create(_obj: Numbering);
begin
object_ := _obj;
abstractnum_count_ := 0;
abstractnum_abstractnumid_hash_ := array();
num_count_ := 0;
num_numid_hash_ := array();
{self.}Init();
end;
function Numbering.Init();
begin
elements := object_.AbstractNums();
abstractnum_count_ := length(elements);
for k,v in elements do
abstractnum_abstractnumid_hash_[v.AbstractNumId] := v;
elements := object_.Nums();
num_count_ := length(elements);
for k,v in elements do
num_numid_hash_[v.NumId] := v;
end;
function Numbering.GetAbstractNumByAbstractNumId(_key: string);
begin
return abstractnum_abstractnumid_hash_[_key];
end;
function Numbering.AddAbstractNum(_value: AbstractNum);
begin
abstractnum_abstractnumid_hash_[_value.AbstractNumId] := _value;
abstractnum_count_++;
end;
function Numbering.RemoveAbstractNum(_value: AbstractNum);
begin
reindex(abstractnum_abstractnumid_hash_, array(_value.AbstractNumId: nil));
abstractnum_count_--;
end;
function Numbering.GetNumByNumId(_key: string);
begin
return num_numid_hash_[_key];
end;
function Numbering.AddNum(_value: Num);
begin
num_numid_hash_[_value.NumId] := _value;
num_count_++;
end;
function Numbering.RemoveNum(_value: Num);
begin
reindex(num_numid_hash_, array(_value.NumId: nil));
num_count_--;
end;
end.
autounit/DocxMLUnitDecorator.tsf
+65 -13
View File
@@ -641,6 +641,15 @@ private
object_: PgNumType; object_: PgNumType;
end; end;
type PgBordersUnitDecorator = class(PgBorders)
public
function create(_obj: PgBorders);
function GetObject();
function Convert();
private
object_: PgBorders;
end;
type PgSzUnitDecorator = class(PgSz) type PgSzUnitDecorator = class(PgSz)
public public
function create(_obj: PgSz); function create(_obj: PgSz);
@@ -911,13 +920,13 @@ private
object_: PPrDefault; object_: PPrDefault;
end; end;
type LatenStylesUnitDecorator = class(LatenStyles) type LatentStylesUnitDecorator = class(LatentStyles)
public public
function create(_obj: LatenStyles); function create(_obj: LatentStyles);
function GetObject(); function GetObject();
function Convert(); function Convert();
private private
object_: LatenStyles; object_: LatentStyles;
end; end;
type LsdExceptionUnitDecorator = class(LsdException) type LsdExceptionUnitDecorator = class(LsdException)
@@ -2779,6 +2788,8 @@ function TrPrUnitDecorator.Convert();
begin begin
tslassigning_backup := tslassigning; tslassigning_backup := tslassigning;
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlChildTblCellSpacing) then
{self.}XmlChildTblCellSpacing := new TblCellSpacingUnitDecorator(object_.XmlChildTblCellSpacing);
if not ifnil(object_.XmlChildTrHeight) then if not ifnil(object_.XmlChildTrHeight) then
{self.}XmlChildTrHeight := new TrHeightUnitDecorator(object_.XmlChildTrHeight); {self.}XmlChildTrHeight := new TrHeightUnitDecorator(object_.XmlChildTrHeight);
if not ifnil(object_.XmlChildTblHeader) then if not ifnil(object_.XmlChildTblHeader) then
@@ -3227,6 +3238,8 @@ begin
{self.}XmlChildPgMar := new PgMarUnitDecorator(object_.XmlChildPgMar); {self.}XmlChildPgMar := new PgMarUnitDecorator(object_.XmlChildPgMar);
if not ifnil(object_.XmlChildPgNumType) then if not ifnil(object_.XmlChildPgNumType) then
{self.}XmlChildPgNumType := new PgNumTypeUnitDecorator(object_.XmlChildPgNumType); {self.}XmlChildPgNumType := new PgNumTypeUnitDecorator(object_.XmlChildPgNumType);
if not ifnil(object_.XmlChildPgBorders) then
{self.}XmlChildPgBorders := new PgBordersUnitDecorator(object_.XmlChildPgBorders);
if not ifnil(object_.XmlChildCols) then if not ifnil(object_.XmlChildCols) then
{self.}XmlChildCols := new ColsUnitDecorator(object_.XmlChildCols); {self.}XmlChildCols := new ColsUnitDecorator(object_.XmlChildCols);
if not ifnil(object_.XmlChildTitlePg) then if not ifnil(object_.XmlChildTitlePg) then
@@ -3282,6 +3295,39 @@ begin
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;
function PgBordersUnitDecorator.create(_obj: PgBorders);
begin
class(PgBorders).create();
object_ := _obj;
{self.}Convert();
end;
function PgBordersUnitDecorator.GetObject();
begin
return object_;
end;
function PgBordersUnitDecorator.Convert();
begin
tslassigning_backup := tslassigning;
tslassigning := 1;
if not ifnil(object_.XmlAttrOffsetFrom) then
{self.}OffsetFrom := object_.XmlAttrOffsetFrom.Value;
if not ifnil(object_.XmlAttrDisplay) then
{self.}Display := object_.XmlAttrDisplay.Value;
if not ifnil(object_.XmlAttrZOrder) then
{self.}ZOrder := object_.XmlAttrZOrder.Value;
if not ifnil(object_.XmlChildTop) then
{self.}XmlChildTop := new BdrUnitDecorator(object_.XmlChildTop);
if not ifnil(object_.XmlChildLeft) then
{self.}XmlChildLeft := new BdrUnitDecorator(object_.XmlChildLeft);
if not ifnil(object_.XmlChildRight) then
{self.}XmlChildRight := new BdrUnitDecorator(object_.XmlChildRight);
if not ifnil(object_.XmlChildBottom) then
{self.}XmlChildBottom := new BdrUnitDecorator(object_.XmlChildBottom);
tslassigning := tslassigning_backup;
end;
function PgSzUnitDecorator.create(_obj: PgSz); function PgSzUnitDecorator.create(_obj: PgSz);
begin begin
class(PgSz).create(); class(PgSz).create();
@@ -4054,8 +4100,8 @@ begin
{self.}Ignorable := object_.XmlAttrIgnorable.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_.XmlChildLatentStyles) then
{self.}XmlChildLatenStyles := new LatenStylesUnitDecorator(object_.XmlChildLatenStyles); {self.}XmlChildLatentStyles := new LatentStylesUnitDecorator(object_.XmlChildLatentStyles);
elems := object_.Styles(); elems := object_.Styles();
for _,elem in elems do for _,elem in elems do
{self.}AppendChild(new StyleUnitDecorator(elem)); {self.}AppendChild(new StyleUnitDecorator(elem));
@@ -4127,19 +4173,19 @@ begin
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
end; end;
function LatenStylesUnitDecorator.create(_obj: LatenStyles); function LatentStylesUnitDecorator.create(_obj: LatentStyles);
begin begin
class(LatenStyles).create(); class(LatentStyles).create();
object_ := _obj; object_ := _obj;
{self.}Convert(); {self.}Convert();
end; end;
function LatenStylesUnitDecorator.GetObject(); function LatentStylesUnitDecorator.GetObject();
begin begin
return object_; return object_;
end; end;
function LatenStylesUnitDecorator.Convert(); function LatentStylesUnitDecorator.Convert();
begin begin
tslassigning_backup := tslassigning; tslassigning_backup := tslassigning;
tslassigning := 1; tslassigning := 1;
@@ -4179,8 +4225,8 @@ begin
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlAttrName) then if not ifnil(object_.XmlAttrName) then
{self.}Name := object_.XmlAttrName.Value; {self.}Name := object_.XmlAttrName.Value;
if not ifnil(object_.XmlAttrUIPriority) then if not ifnil(object_.XmlAttrUiPriority) then
{self.}UIPriority := object_.XmlAttrUIPriority.Value; {self.}UiPriority := object_.XmlAttrUiPriority.Value;
if not ifnil(object_.XmlAttrSemiHidden) then if not ifnil(object_.XmlAttrSemiHidden) then
{self.}SemiHidden := object_.XmlAttrSemiHidden.Value; {self.}SemiHidden := object_.XmlAttrSemiHidden.Value;
if not ifnil(object_.XmlAttrUnhideWhenUsed) then if not ifnil(object_.XmlAttrUnhideWhenUsed) then
@@ -4212,18 +4258,22 @@ begin
{self.}Default := object_.XmlAttrDefault.Value; {self.}Default := object_.XmlAttrDefault.Value;
if not ifnil(object_.XmlAttrStyleId) then if not ifnil(object_.XmlAttrStyleId) then
{self.}StyleId := object_.XmlAttrStyleId.Value; {self.}StyleId := object_.XmlAttrStyleId.Value;
if not ifnil(object_.XmlAttrCustomStyle) then
{self.}CustomStyle := object_.XmlAttrCustomStyle.Value;
if not ifnil(object_.XmlChildName) then if not ifnil(object_.XmlChildName) then
{self.}XmlChildName := new PureWValUnitDecorator(object_.XmlChildName); {self.}XmlChildName := new PureWValUnitDecorator(object_.XmlChildName);
if not ifnil(object_.XmlChildBasedOn) then if not ifnil(object_.XmlChildBasedOn) then
{self.}XmlChildBasedOn := new PureWValUnitDecorator(object_.XmlChildBasedOn); {self.}XmlChildBasedOn := new PureWValUnitDecorator(object_.XmlChildBasedOn);
if not ifnil(object_.XmlChildLocked) then
{self.}Locked.Copy(object_.XmlChildLocked);
if not ifnil(object_.XmlChildNext) then if not ifnil(object_.XmlChildNext) then
{self.}XmlChildNext := new PureWValUnitDecorator(object_.XmlChildNext); {self.}XmlChildNext := new PureWValUnitDecorator(object_.XmlChildNext);
if not ifnil(object_.XmlChildAutoRedefine) then if not ifnil(object_.XmlChildAutoRedefine) then
{self.}XmlChildAutoRedefine := new PureWValUnitDecorator(object_.XmlChildAutoRedefine); {self.}XmlChildAutoRedefine := new PureWValUnitDecorator(object_.XmlChildAutoRedefine);
if not ifnil(object_.XmlChildLink) then if not ifnil(object_.XmlChildLink) then
{self.}XmlChildLink := new PureWValUnitDecorator(object_.XmlChildLink); {self.}XmlChildLink := new PureWValUnitDecorator(object_.XmlChildLink);
if not ifnil(object_.XmlChildUIPriority) then if not ifnil(object_.XmlChildUiPriority) then
{self.}XmlChildUIPriority := new PureWValUnitDecorator(object_.XmlChildUIPriority); {self.}XmlChildUiPriority := new PureWValUnitDecorator(object_.XmlChildUiPriority);
if not ifnil(object_.XmlChildSemiHidden) then if not ifnil(object_.XmlChildSemiHidden) then
{self.}SemiHidden.Copy(object_.XmlChildSemiHidden); {self.}SemiHidden.Copy(object_.XmlChildSemiHidden);
if not ifnil(object_.XmlChildUnhideWhenUsed) then if not ifnil(object_.XmlChildUnhideWhenUsed) then
@@ -4624,6 +4674,8 @@ begin
tslassigning := 1; tslassigning := 1;
if not ifnil(object_.XmlAttrNumId) then if not ifnil(object_.XmlAttrNumId) then
{self.}NumId := object_.XmlAttrNumId.Value; {self.}NumId := object_.XmlAttrNumId.Value;
if not ifnil(object_.XmlAttrDurableId) then
{self.}DurableId := object_.XmlAttrDurableId.Value;
if not ifnil(object_.XmlChildAbstractNumId) then if not ifnil(object_.XmlChildAbstractNumId) then
{self.}XmlChildAbstractNumId := new PureWValUnitDecorator(object_.XmlChildAbstractNumId); {self.}XmlChildAbstractNumId := new PureWValUnitDecorator(object_.XmlChildAbstractNumId);
tslassigning := tslassigning_backup; tslassigning := tslassigning_backup;
autounit/DrawingML.tsf
+28 -28
View File
@@ -335,7 +335,7 @@ public
// multi property // multi property
property Fonts read ReadFonts write WriteFonts; property Fonts read ReadFonts write WriteFonts;
function ReadFonts(_index: integer); function ReadFonts(_index: integer);
function WriteFonts(_index: integer; _value: nil_OR_Font); function WriteFonts(_index: integer; _value: nil__Font);
function AddFont(): Font; function AddFont(): Font;
function AppendFont(): Font; function AppendFont(): Font;
@@ -429,9 +429,9 @@ public
property SolidFills read ReadSolidFills write WriteSolidFills; property SolidFills read ReadSolidFills write WriteSolidFills;
property GradFills read ReadGradFills write WriteGradFills; property GradFills read ReadGradFills write WriteGradFills;
function ReadSolidFills(_index: integer); function ReadSolidFills(_index: integer);
function WriteSolidFills(_index: integer; _value: nil_OR_SolidFill); function WriteSolidFills(_index: integer; _value: nil__SolidFill);
function ReadGradFills(_index: integer); function ReadGradFills(_index: integer);
function WriteGradFills(_index: integer; _value: nil_OR_GradFill); function WriteGradFills(_index: integer; _value: nil__GradFill);
function AddSolidFill(): SolidFill; function AddSolidFill(): SolidFill;
function AddGradFill(): GradFill; function AddGradFill(): GradFill;
function AppendSolidFill(): SolidFill; function AppendSolidFill(): SolidFill;
@@ -548,7 +548,7 @@ public
// multi property // multi property
property Gses read ReadGses write WriteGses; property Gses read ReadGses write WriteGses;
function ReadGses(_index: integer); function ReadGses(_index: integer);
function WriteGses(_index: integer; _value: nil_OR_Gs); function WriteGses(_index: integer; _value: nil__Gs);
function AddGs(): Gs; function AddGs(): Gs;
function AppendGs(): Gs; function AppendGs(): Gs;
@@ -626,7 +626,7 @@ public
// multi property // multi property
property Lns read ReadLns write WriteLns; property Lns read ReadLns write WriteLns;
function ReadLns(_index: integer); function ReadLns(_index: integer);
function WriteLns(_index: integer; _value: nil_OR_Ln); function WriteLns(_index: integer; _value: nil__Ln);
function AddLn(): Ln; function AddLn(): Ln;
function AppendLn(): Ln; function AppendLn(): Ln;
@@ -649,7 +649,7 @@ public
// multi property // multi property
property EffectStyles read ReadEffectStyles write WriteEffectStyles; property EffectStyles read ReadEffectStyles write WriteEffectStyles;
function ReadEffectStyles(_index: integer); function ReadEffectStyles(_index: integer);
function WriteEffectStyles(_index: integer; _value: nil_OR_EffectStyle); function WriteEffectStyles(_index: integer; _value: nil__EffectStyle);
function AddEffectStyle(): EffectStyle; function AddEffectStyle(): EffectStyle;
function AppendEffectStyle(): EffectStyle; function AppendEffectStyle(): EffectStyle;
@@ -739,7 +739,7 @@ public
// multi property // multi property
property Exts read ReadExts write WriteExts; property Exts read ReadExts write WriteExts;
function ReadExts(_index: integer); function ReadExts(_index: integer);
function WriteExts(_index: integer; _value: nil_OR_Ext); function WriteExts(_index: integer; _value: nil__Ext);
function AddExt(): Ext; function AddExt(): Ext;
function AppendExt(): Ext; function AppendExt(): Ext;
@@ -1103,9 +1103,9 @@ public
property Sers read ReadSers write WriteSers; property Sers read ReadSers write WriteSers;
property AxIds read ReadAxIds write WriteAxIds; property AxIds read ReadAxIds write WriteAxIds;
function ReadSers(_index: integer); function ReadSers(_index: integer);
function WriteSers(_index: integer; _value: nil_OR_Ser); function WriteSers(_index: integer; _value: nil__Ser);
function ReadAxIds(_index: integer); function ReadAxIds(_index: integer);
function WriteAxIds(_index: integer; _value: nil_OR_PureVal); function WriteAxIds(_index: integer; _value: nil__PureVal);
function AddSer(): Ser; function AddSer(): Ser;
function AddAxId(): PureVal; function AddAxId(): PureVal;
function AppendSer(): Ser; function AppendSer(): Ser;
@@ -1343,7 +1343,7 @@ public
// multi property // multi property
property Pts read ReadPts write WritePts; property Pts read ReadPts write WritePts;
function ReadPts(_index: integer); function ReadPts(_index: integer);
function WritePts(_index: integer; _value: nil_OR_Pt); function WritePts(_index: integer; _value: nil__Pt);
function AddPt(): Pt; function AddPt(): Pt;
function AppendPt(): Pt; function AppendPt(): Pt;
@@ -1377,7 +1377,7 @@ public
// multi property // multi property
property Pts read ReadPts write WritePts; property Pts read ReadPts write WritePts;
function ReadPts(_index: integer); function ReadPts(_index: integer);
function WritePts(_index: integer; _value: nil_OR_Pt); function WritePts(_index: integer; _value: nil__Pt);
function AddPt(): Pt; function AddPt(): Pt;
function AppendPt(): Pt; function AppendPt(): Pt;
@@ -1613,7 +1613,7 @@ public
// multi property // multi property
property Ps read ReadPs write WritePs; property Ps read ReadPs write WritePs;
function ReadPs(_index: integer); function ReadPs(_index: integer);
function WritePs(_index: integer; _value: nil_OR_P); function WritePs(_index: integer; _value: nil__P);
function AddP(): P; function AddP(): P;
function AppendP(): P; function AppendP(): P;
@@ -1706,7 +1706,7 @@ public
// multi property // multi property
property Ps read ReadPs write WritePs; property Ps read ReadPs write WritePs;
function ReadPs(_index: integer); function ReadPs(_index: integer);
function WritePs(_index: integer; _value: nil_OR_P); function WritePs(_index: integer; _value: nil__P);
function AddP(): P; function AddP(): P;
function AppendP(): P; function AppendP(): P;
@@ -1871,7 +1871,7 @@ public
// multi property // multi property
property Rs read ReadRs write WriteRs; property Rs read ReadRs write WriteRs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function AddR(): R; function AddR(): R;
function AppendR(): R; function AppendR(): R;
@@ -4817,7 +4817,7 @@ begin
return container_.Get(pre + "font", ind); return container_.Get(pre + "font", ind);
end; end;
function MFont.WriteFonts(_index: integer; _value: nil_OR_Font); function MFont.WriteFonts(_index: integer; _value: nil__Font);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -5214,7 +5214,7 @@ begin
return container_.Get(pre + "solidFill", ind); return container_.Get(pre + "solidFill", ind);
end; end;
function FillStyleLst.WriteSolidFills(_index: integer; _value: nil_OR_SolidFill); function FillStyleLst.WriteSolidFills(_index: integer; _value: nil__SolidFill);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -5240,7 +5240,7 @@ begin
return container_.Get(pre + "gradFill", ind); return container_.Get(pre + "gradFill", ind);
end; end;
function FillStyleLst.WriteGradFills(_index: integer; _value: nil_OR_GradFill); function FillStyleLst.WriteGradFills(_index: integer; _value: nil__GradFill);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -5759,7 +5759,7 @@ begin
return container_.Get(pre + "gs", ind); return container_.Get(pre + "gs", ind);
end; end;
function GsLst.WriteGses(_index: integer; _value: nil_OR_Gs); function GsLst.WriteGses(_index: integer; _value: nil__Gs);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6047,7 +6047,7 @@ begin
return container_.Get(pre + "ln", ind); return container_.Get(pre + "ln", ind);
end; end;
function LnStyleLst.WriteLns(_index: integer; _value: nil_OR_Ln); function LnStyleLst.WriteLns(_index: integer; _value: nil__Ln);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6141,7 +6141,7 @@ begin
return container_.Get(pre + "effectStyle", ind); return container_.Get(pre + "effectStyle", ind);
end; end;
function EffectStyleLst.WriteEffectStyles(_index: integer; _value: nil_OR_EffectStyle); function EffectStyleLst.WriteEffectStyles(_index: integer; _value: nil__EffectStyle);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6511,7 +6511,7 @@ begin
return container_.Get(pre + "ext", ind); return container_.Get(pre + "ext", ind);
end; end;
function ExtLst.WriteExts(_index: integer; _value: nil_OR_Ext); function ExtLst.WriteExts(_index: integer; _value: nil__Ext);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8426,7 +8426,7 @@ begin
return container_.Get(pre + "ser", ind); return container_.Get(pre + "ser", ind);
end; end;
function BarChart.WriteSers(_index: integer; _value: nil_OR_Ser); function BarChart.WriteSers(_index: integer; _value: nil__Ser);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8452,7 +8452,7 @@ begin
return container_.Get(pre + "axId", ind); return container_.Get(pre + "axId", ind);
end; end;
function BarChart.WriteAxIds(_index: integer; _value: nil_OR_PureVal); function BarChart.WriteAxIds(_index: integer; _value: nil__PureVal);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -9719,7 +9719,7 @@ begin
return container_.Get(pre + "pt", ind); return container_.Get(pre + "pt", ind);
end; end;
function StrCache.WritePts(_index: integer; _value: nil_OR_Pt); function StrCache.WritePts(_index: integer; _value: nil__Pt);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -9885,7 +9885,7 @@ begin
return container_.Get(pre + "pt", ind); return container_.Get(pre + "pt", ind);
end; end;
function NumCache.WritePts(_index: integer; _value: nil_OR_Pt); function NumCache.WritePts(_index: integer; _value: nil__Pt);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -11205,7 +11205,7 @@ begin
return container_.Get("a:p", ind); return container_.Get("a:p", ind);
end; end;
function TxPr.WritePs(_index: integer; _value: nil_OR_P); function TxPr.WritePs(_index: integer; _value: nil__P);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -11649,7 +11649,7 @@ begin
return container_.Get("a:p", ind); return container_.Get("a:p", ind);
end; end;
function Rich.WritePs(_index: integer; _value: nil_OR_P); function Rich.WritePs(_index: integer; _value: nil__P);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -12412,7 +12412,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function P.WriteRs(_index: integer; _value: nil_OR_R); function P.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
autounit/DrawingMLAdapter.tsf
-6
View File
@@ -1,6 +0,0 @@
unit DrawingMLAdapter;
interface
implementation
end.
autounit/DrawingMLAdapters.tsf
+6
View File
@@ -0,0 +1,6 @@
unit DrawingMLAdapters;
interface
implementation
end.
autounit/PptxMLAdapter.tsf
-6
View File
@@ -1,6 +0,0 @@
unit PptxMLAdapter;
interface
implementation
end.
autounit/SharedML.tsf
+125 -125
View File
@@ -158,21 +158,21 @@ public
property Naries read ReadNaries write WriteNaries; property Naries read ReadNaries write WriteNaries;
property Funcs read ReadFuncs write WriteFuncs; property Funcs read ReadFuncs write WriteFuncs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function ReadDs(_index: integer); function ReadDs(_index: integer);
function WriteDs(_index: integer; _value: nil_OR_D); function WriteDs(_index: integer; _value: nil__D);
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function ReadRads(_index: integer); function ReadRads(_index: integer);
function WriteRads(_index: integer; _value: nil_OR_Rad); function WriteRads(_index: integer; _value: nil__Rad);
function ReadSSubs(_index: integer); function ReadSSubs(_index: integer);
function WriteSSubs(_index: integer; _value: nil_OR_SSub); function WriteSSubs(_index: integer; _value: nil__SSub);
function ReadSSups(_index: integer); function ReadSSups(_index: integer);
function WriteSSups(_index: integer; _value: nil_OR_SSup); function WriteSSups(_index: integer; _value: nil__SSup);
function ReadNaries(_index: integer); function ReadNaries(_index: integer);
function WriteNaries(_index: integer; _value: nil_OR_Nary); function WriteNaries(_index: integer; _value: nil__Nary);
function ReadFuncs(_index: integer); function ReadFuncs(_index: integer);
function WriteFuncs(_index: integer; _value: nil_OR_Func); function WriteFuncs(_index: integer; _value: nil__Func);
function AddR(): R; function AddR(): R;
function AddD(): D; function AddD(): D;
function AddF(): F; function AddF(): F;
@@ -707,7 +707,7 @@ public
// multi property // multi property
property Rs read ReadRs write WriteRs; property Rs read ReadRs write WriteRs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function AddR(): R; function AddR(): R;
function AppendR(): R; function AppendR(): R;
@@ -854,7 +854,7 @@ public
// multi property // multi property
property Relationships read ReadRelationships write WriteRelationships; property Relationships read ReadRelationships write WriteRelationships;
function ReadRelationships(_index: integer); function ReadRelationships(_index: integer);
function WriteRelationships(_index: integer; _value: nil_OR_Relationship); function WriteRelationships(_index: integer; _value: nil__Relationship);
function AddRelationship(): Relationship; function AddRelationship(): Relationship;
function AppendRelationship(): Relationship; function AppendRelationship(): Relationship;
@@ -908,13 +908,13 @@ public
property Defaults read ReadDefaults write WriteDefaults; property Defaults read ReadDefaults write WriteDefaults;
property Overrides read ReadOverrides write WriteOverrides; property Overrides read ReadOverrides write WriteOverrides;
function ReadDefaults(_index: integer); function ReadDefaults(_index: integer);
function WriteDefaults(_index: integer; _value: nil_OR_Default); function WriteDefaults(_index: integer; _value: nil__Default);
function ReadOverrides(_index: integer); function ReadOverrides(_index: integer);
function WriteOverrides(_index: integer; _value: nil_OR__Override); function WriteOverrides(_index: integer; _value: nil___Override);
function AddDefault(): Default; function AddDefault(): Default;
function AddOverride(): _Override; function Add_Override(): _Override;
function AppendDefault(): Default; function AppendDefault(): Default;
function AppendOverride(): _Override; function Append_Override(): _Override;
public public
// Children // Children
@@ -999,21 +999,21 @@ public
property Naries read ReadNaries write WriteNaries; property Naries read ReadNaries write WriteNaries;
property Funcs read ReadFuncs write WriteFuncs; property Funcs read ReadFuncs write WriteFuncs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function ReadDs(_index: integer); function ReadDs(_index: integer);
function WriteDs(_index: integer; _value: nil_OR_D); function WriteDs(_index: integer; _value: nil__D);
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function ReadRads(_index: integer); function ReadRads(_index: integer);
function WriteRads(_index: integer; _value: nil_OR_Rad); function WriteRads(_index: integer; _value: nil__Rad);
function ReadSSubs(_index: integer); function ReadSSubs(_index: integer);
function WriteSSubs(_index: integer; _value: nil_OR_SSub); function WriteSSubs(_index: integer; _value: nil__SSub);
function ReadSSups(_index: integer); function ReadSSups(_index: integer);
function WriteSSups(_index: integer; _value: nil_OR_SSup); function WriteSSups(_index: integer; _value: nil__SSup);
function ReadNaries(_index: integer); function ReadNaries(_index: integer);
function WriteNaries(_index: integer; _value: nil_OR_Nary); function WriteNaries(_index: integer; _value: nil__Nary);
function ReadFuncs(_index: integer); function ReadFuncs(_index: integer);
function WriteFuncs(_index: integer; _value: nil_OR_Func); function WriteFuncs(_index: integer; _value: nil__Func);
function AddR(): R; function AddR(): R;
function AddD(): D; function AddD(): D;
function AddF(): F; function AddF(): F;
@@ -1063,21 +1063,21 @@ public
property Naries read ReadNaries write WriteNaries; property Naries read ReadNaries write WriteNaries;
property Funcs read ReadFuncs write WriteFuncs; property Funcs read ReadFuncs write WriteFuncs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function ReadDs(_index: integer); function ReadDs(_index: integer);
function WriteDs(_index: integer; _value: nil_OR_D); function WriteDs(_index: integer; _value: nil__D);
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function ReadRads(_index: integer); function ReadRads(_index: integer);
function WriteRads(_index: integer; _value: nil_OR_Rad); function WriteRads(_index: integer; _value: nil__Rad);
function ReadSSubs(_index: integer); function ReadSSubs(_index: integer);
function WriteSSubs(_index: integer; _value: nil_OR_SSub); function WriteSSubs(_index: integer; _value: nil__SSub);
function ReadSSups(_index: integer); function ReadSSups(_index: integer);
function WriteSSups(_index: integer; _value: nil_OR_SSup); function WriteSSups(_index: integer; _value: nil__SSup);
function ReadNaries(_index: integer); function ReadNaries(_index: integer);
function WriteNaries(_index: integer; _value: nil_OR_Nary); function WriteNaries(_index: integer; _value: nil__Nary);
function ReadFuncs(_index: integer); function ReadFuncs(_index: integer);
function WriteFuncs(_index: integer; _value: nil_OR_Func); function WriteFuncs(_index: integer; _value: nil__Func);
function AddR(): R; function AddR(): R;
function AddD(): D; function AddD(): D;
function AddF(): F; function AddF(): F;
@@ -1127,21 +1127,21 @@ public
property Naries read ReadNaries write WriteNaries; property Naries read ReadNaries write WriteNaries;
property Funcs read ReadFuncs write WriteFuncs; property Funcs read ReadFuncs write WriteFuncs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function ReadDs(_index: integer); function ReadDs(_index: integer);
function WriteDs(_index: integer; _value: nil_OR_D); function WriteDs(_index: integer; _value: nil__D);
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function ReadRads(_index: integer); function ReadRads(_index: integer);
function WriteRads(_index: integer; _value: nil_OR_Rad); function WriteRads(_index: integer; _value: nil__Rad);
function ReadSSubs(_index: integer); function ReadSSubs(_index: integer);
function WriteSSubs(_index: integer; _value: nil_OR_SSub); function WriteSSubs(_index: integer; _value: nil__SSub);
function ReadSSups(_index: integer); function ReadSSups(_index: integer);
function WriteSSups(_index: integer; _value: nil_OR_SSup); function WriteSSups(_index: integer; _value: nil__SSup);
function ReadNaries(_index: integer); function ReadNaries(_index: integer);
function WriteNaries(_index: integer; _value: nil_OR_Nary); function WriteNaries(_index: integer; _value: nil__Nary);
function ReadFuncs(_index: integer); function ReadFuncs(_index: integer);
function WriteFuncs(_index: integer; _value: nil_OR_Func); function WriteFuncs(_index: integer; _value: nil__Func);
function AddR(): R; function AddR(): R;
function AddD(): D; function AddD(): D;
function AddF(): F; function AddF(): F;
@@ -1191,21 +1191,21 @@ public
property Naries read ReadNaries write WriteNaries; property Naries read ReadNaries write WriteNaries;
property Funcs read ReadFuncs write WriteFuncs; property Funcs read ReadFuncs write WriteFuncs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function ReadDs(_index: integer); function ReadDs(_index: integer);
function WriteDs(_index: integer; _value: nil_OR_D); function WriteDs(_index: integer; _value: nil__D);
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function ReadRads(_index: integer); function ReadRads(_index: integer);
function WriteRads(_index: integer; _value: nil_OR_Rad); function WriteRads(_index: integer; _value: nil__Rad);
function ReadSSubs(_index: integer); function ReadSSubs(_index: integer);
function WriteSSubs(_index: integer; _value: nil_OR_SSub); function WriteSSubs(_index: integer; _value: nil__SSub);
function ReadSSups(_index: integer); function ReadSSups(_index: integer);
function WriteSSups(_index: integer; _value: nil_OR_SSup); function WriteSSups(_index: integer; _value: nil__SSup);
function ReadNaries(_index: integer); function ReadNaries(_index: integer);
function WriteNaries(_index: integer; _value: nil_OR_Nary); function WriteNaries(_index: integer; _value: nil__Nary);
function ReadFuncs(_index: integer); function ReadFuncs(_index: integer);
function WriteFuncs(_index: integer; _value: nil_OR_Func); function WriteFuncs(_index: integer; _value: nil__Func);
function AddR(): R; function AddR(): R;
function AddD(): D; function AddD(): D;
function AddF(): F; function AddF(): F;
@@ -1255,21 +1255,21 @@ public
property Naries read ReadNaries write WriteNaries; property Naries read ReadNaries write WriteNaries;
property Funcs read ReadFuncs write WriteFuncs; property Funcs read ReadFuncs write WriteFuncs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function ReadDs(_index: integer); function ReadDs(_index: integer);
function WriteDs(_index: integer; _value: nil_OR_D); function WriteDs(_index: integer; _value: nil__D);
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function ReadRads(_index: integer); function ReadRads(_index: integer);
function WriteRads(_index: integer; _value: nil_OR_Rad); function WriteRads(_index: integer; _value: nil__Rad);
function ReadSSubs(_index: integer); function ReadSSubs(_index: integer);
function WriteSSubs(_index: integer; _value: nil_OR_SSub); function WriteSSubs(_index: integer; _value: nil__SSub);
function ReadSSups(_index: integer); function ReadSSups(_index: integer);
function WriteSSups(_index: integer; _value: nil_OR_SSup); function WriteSSups(_index: integer; _value: nil__SSup);
function ReadNaries(_index: integer); function ReadNaries(_index: integer);
function WriteNaries(_index: integer; _value: nil_OR_Nary); function WriteNaries(_index: integer; _value: nil__Nary);
function ReadFuncs(_index: integer); function ReadFuncs(_index: integer);
function WriteFuncs(_index: integer; _value: nil_OR_Func); function WriteFuncs(_index: integer; _value: nil__Func);
function AddR(): R; function AddR(): R;
function AddD(): D; function AddD(): D;
function AddF(): F; function AddF(): F;
@@ -1319,21 +1319,21 @@ public
property Naries read ReadNaries write WriteNaries; property Naries read ReadNaries write WriteNaries;
property Funcs read ReadFuncs write WriteFuncs; property Funcs read ReadFuncs write WriteFuncs;
function ReadRs(_index: integer); function ReadRs(_index: integer);
function WriteRs(_index: integer; _value: nil_OR_R); function WriteRs(_index: integer; _value: nil__R);
function ReadDs(_index: integer); function ReadDs(_index: integer);
function WriteDs(_index: integer; _value: nil_OR_D); function WriteDs(_index: integer; _value: nil__D);
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function ReadRads(_index: integer); function ReadRads(_index: integer);
function WriteRads(_index: integer; _value: nil_OR_Rad); function WriteRads(_index: integer; _value: nil__Rad);
function ReadSSubs(_index: integer); function ReadSSubs(_index: integer);
function WriteSSubs(_index: integer; _value: nil_OR_SSub); function WriteSSubs(_index: integer; _value: nil__SSub);
function ReadSSups(_index: integer); function ReadSSups(_index: integer);
function WriteSSups(_index: integer; _value: nil_OR_SSup); function WriteSSups(_index: integer; _value: nil__SSup);
function ReadNaries(_index: integer); function ReadNaries(_index: integer);
function WriteNaries(_index: integer; _value: nil_OR_Nary); function WriteNaries(_index: integer; _value: nil__Nary);
function ReadFuncs(_index: integer); function ReadFuncs(_index: integer);
function WriteFuncs(_index: integer; _value: nil_OR_Func); function WriteFuncs(_index: integer; _value: nil__Func);
function AddR(): R; function AddR(): R;
function AddD(): D; function AddD(): D;
function AddF(): F; function AddF(): F;
@@ -2157,7 +2157,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function OMath.WriteRs(_index: integer; _value: nil_OR_R); function OMath.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -2183,7 +2183,7 @@ begin
return container_.Get(pre + "d", ind); return container_.Get(pre + "d", ind);
end; end;
function OMath.WriteDs(_index: integer; _value: nil_OR_D); function OMath.WriteDs(_index: integer; _value: nil__D);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -2209,7 +2209,7 @@ begin
return container_.Get(pre + "f", ind); return container_.Get(pre + "f", ind);
end; end;
function OMath.WriteFs(_index: integer; _value: nil_OR_F); function OMath.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -2235,7 +2235,7 @@ begin
return container_.Get(pre + "rad", ind); return container_.Get(pre + "rad", ind);
end; end;
function OMath.WriteRads(_index: integer; _value: nil_OR_Rad); function OMath.WriteRads(_index: integer; _value: nil__Rad);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -2261,7 +2261,7 @@ begin
return container_.Get(pre + "sSub", ind); return container_.Get(pre + "sSub", ind);
end; end;
function OMath.WriteSSubs(_index: integer; _value: nil_OR_SSub); function OMath.WriteSSubs(_index: integer; _value: nil__SSub);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -2287,7 +2287,7 @@ begin
return container_.Get(pre + "sSup", ind); return container_.Get(pre + "sSup", ind);
end; end;
function OMath.WriteSSups(_index: integer; _value: nil_OR_SSup); function OMath.WriteSSups(_index: integer; _value: nil__SSup);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -2313,7 +2313,7 @@ begin
return container_.Get(pre + "nary", ind); return container_.Get(pre + "nary", ind);
end; end;
function OMath.WriteNaries(_index: integer; _value: nil_OR_Nary); function OMath.WriteNaries(_index: integer; _value: nil__Nary);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -2339,7 +2339,7 @@ begin
return container_.Get(pre + "func", ind); return container_.Get(pre + "func", ind);
end; end;
function OMath.WriteFuncs(_index: integer; _value: nil_OR_Func); function OMath.WriteFuncs(_index: integer; _value: nil__Func);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -5114,7 +5114,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function FName.WriteRs(_index: integer; _value: nil_OR_R); function FName.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -5803,7 +5803,7 @@ begin
return container_.Get("Relationship", ind); return container_.Get("Relationship", ind);
end; end;
function Relationships.WriteRelationships(_index: integer; _value: nil_OR_Relationship); function Relationships.WriteRelationships(_index: integer; _value: nil__Relationship);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -5968,7 +5968,7 @@ begin
); );
sorted_child_ := array( sorted_child_ := array(
"Default": array(0, makeweakref(thisFunction(AppendDefault))), "Default": array(0, makeweakref(thisFunction(AppendDefault))),
"Override": array(1, makeweakref(thisFunction(AppendOverride))), "Override": array(1, makeweakref(thisFunction(Append_Override))),
); );
container_ := new TSOfficeContainer(sorted_child_); container_ := new TSOfficeContainer(sorted_child_);
end; end;
@@ -6007,7 +6007,7 @@ begin
return container_.Get("Default", ind); return container_.Get("Default", ind);
end; end;
function Types.WriteDefaults(_index: integer; _value: nil_OR_Default); function Types.WriteDefaults(_index: integer; _value: nil__Default);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6033,7 +6033,7 @@ begin
return container_.Get("Override", ind); return container_.Get("Override", ind);
end; end;
function Types.WriteOverrides(_index: integer; _value: nil_OR__Override); function Types.WriteOverrides(_index: integer; _value: nil___Override);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6060,7 +6060,7 @@ begin
return obj; return obj;
end; end;
function Types.AddOverride(): _Override; function Types.Add_Override(): _Override;
begin begin
obj := new _Override(self, "", "Override"); obj := new _Override(self, "", "Override");
obj.Enable := true; obj.Enable := true;
@@ -6076,7 +6076,7 @@ begin
return obj; return obj;
end; end;
function Types.AppendOverride(): _Override; function Types.Append_Override(): _Override;
begin begin
obj := new _Override(self, "", "Override"); obj := new _Override(self, "", "Override");
obj.Enable := true; obj.Enable := true;
@@ -6383,7 +6383,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function Num.WriteRs(_index: integer; _value: nil_OR_R); function Num.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6409,7 +6409,7 @@ begin
return container_.Get(pre + "d", ind); return container_.Get(pre + "d", ind);
end; end;
function Num.WriteDs(_index: integer; _value: nil_OR_D); function Num.WriteDs(_index: integer; _value: nil__D);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6435,7 +6435,7 @@ begin
return container_.Get(pre + "f", ind); return container_.Get(pre + "f", ind);
end; end;
function Num.WriteFs(_index: integer; _value: nil_OR_F); function Num.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6461,7 +6461,7 @@ begin
return container_.Get(pre + "rad", ind); return container_.Get(pre + "rad", ind);
end; end;
function Num.WriteRads(_index: integer; _value: nil_OR_Rad); function Num.WriteRads(_index: integer; _value: nil__Rad);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6487,7 +6487,7 @@ begin
return container_.Get(pre + "sSub", ind); return container_.Get(pre + "sSub", ind);
end; end;
function Num.WriteSSubs(_index: integer; _value: nil_OR_SSub); function Num.WriteSSubs(_index: integer; _value: nil__SSub);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6513,7 +6513,7 @@ begin
return container_.Get(pre + "sSup", ind); return container_.Get(pre + "sSup", ind);
end; end;
function Num.WriteSSups(_index: integer; _value: nil_OR_SSup); function Num.WriteSSups(_index: integer; _value: nil__SSup);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6539,7 +6539,7 @@ begin
return container_.Get(pre + "nary", ind); return container_.Get(pre + "nary", ind);
end; end;
function Num.WriteNaries(_index: integer; _value: nil_OR_Nary); function Num.WriteNaries(_index: integer; _value: nil__Nary);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6565,7 +6565,7 @@ begin
return container_.Get(pre + "func", ind); return container_.Get(pre + "func", ind);
end; end;
function Num.WriteFuncs(_index: integer; _value: nil_OR_Func); function Num.WriteFuncs(_index: integer; _value: nil__Func);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6839,7 +6839,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function Deg.WriteRs(_index: integer; _value: nil_OR_R); function Deg.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6865,7 +6865,7 @@ begin
return container_.Get(pre + "d", ind); return container_.Get(pre + "d", ind);
end; end;
function Deg.WriteDs(_index: integer; _value: nil_OR_D); function Deg.WriteDs(_index: integer; _value: nil__D);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6891,7 +6891,7 @@ begin
return container_.Get(pre + "f", ind); return container_.Get(pre + "f", ind);
end; end;
function Deg.WriteFs(_index: integer; _value: nil_OR_F); function Deg.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6917,7 +6917,7 @@ begin
return container_.Get(pre + "rad", ind); return container_.Get(pre + "rad", ind);
end; end;
function Deg.WriteRads(_index: integer; _value: nil_OR_Rad); function Deg.WriteRads(_index: integer; _value: nil__Rad);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6943,7 +6943,7 @@ begin
return container_.Get(pre + "sSub", ind); return container_.Get(pre + "sSub", ind);
end; end;
function Deg.WriteSSubs(_index: integer; _value: nil_OR_SSub); function Deg.WriteSSubs(_index: integer; _value: nil__SSub);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6969,7 +6969,7 @@ begin
return container_.Get(pre + "sSup", ind); return container_.Get(pre + "sSup", ind);
end; end;
function Deg.WriteSSups(_index: integer; _value: nil_OR_SSup); function Deg.WriteSSups(_index: integer; _value: nil__SSup);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -6995,7 +6995,7 @@ begin
return container_.Get(pre + "nary", ind); return container_.Get(pre + "nary", ind);
end; end;
function Deg.WriteNaries(_index: integer; _value: nil_OR_Nary); function Deg.WriteNaries(_index: integer; _value: nil__Nary);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7021,7 +7021,7 @@ begin
return container_.Get(pre + "func", ind); return container_.Get(pre + "func", ind);
end; end;
function Deg.WriteFuncs(_index: integer; _value: nil_OR_Func); function Deg.WriteFuncs(_index: integer; _value: nil__Func);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7295,7 +7295,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function E.WriteRs(_index: integer; _value: nil_OR_R); function E.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7321,7 +7321,7 @@ begin
return container_.Get(pre + "d", ind); return container_.Get(pre + "d", ind);
end; end;
function E.WriteDs(_index: integer; _value: nil_OR_D); function E.WriteDs(_index: integer; _value: nil__D);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7347,7 +7347,7 @@ begin
return container_.Get(pre + "f", ind); return container_.Get(pre + "f", ind);
end; end;
function E.WriteFs(_index: integer; _value: nil_OR_F); function E.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7373,7 +7373,7 @@ begin
return container_.Get(pre + "rad", ind); return container_.Get(pre + "rad", ind);
end; end;
function E.WriteRads(_index: integer; _value: nil_OR_Rad); function E.WriteRads(_index: integer; _value: nil__Rad);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7399,7 +7399,7 @@ begin
return container_.Get(pre + "sSub", ind); return container_.Get(pre + "sSub", ind);
end; end;
function E.WriteSSubs(_index: integer; _value: nil_OR_SSub); function E.WriteSSubs(_index: integer; _value: nil__SSub);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7425,7 +7425,7 @@ begin
return container_.Get(pre + "sSup", ind); return container_.Get(pre + "sSup", ind);
end; end;
function E.WriteSSups(_index: integer; _value: nil_OR_SSup); function E.WriteSSups(_index: integer; _value: nil__SSup);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7451,7 +7451,7 @@ begin
return container_.Get(pre + "nary", ind); return container_.Get(pre + "nary", ind);
end; end;
function E.WriteNaries(_index: integer; _value: nil_OR_Nary); function E.WriteNaries(_index: integer; _value: nil__Nary);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7477,7 +7477,7 @@ begin
return container_.Get(pre + "func", ind); return container_.Get(pre + "func", ind);
end; end;
function E.WriteFuncs(_index: integer; _value: nil_OR_Func); function E.WriteFuncs(_index: integer; _value: nil__Func);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7751,7 +7751,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function Sup.WriteRs(_index: integer; _value: nil_OR_R); function Sup.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7777,7 +7777,7 @@ begin
return container_.Get(pre + "d", ind); return container_.Get(pre + "d", ind);
end; end;
function Sup.WriteDs(_index: integer; _value: nil_OR_D); function Sup.WriteDs(_index: integer; _value: nil__D);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7803,7 +7803,7 @@ begin
return container_.Get(pre + "f", ind); return container_.Get(pre + "f", ind);
end; end;
function Sup.WriteFs(_index: integer; _value: nil_OR_F); function Sup.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7829,7 +7829,7 @@ begin
return container_.Get(pre + "rad", ind); return container_.Get(pre + "rad", ind);
end; end;
function Sup.WriteRads(_index: integer; _value: nil_OR_Rad); function Sup.WriteRads(_index: integer; _value: nil__Rad);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7855,7 +7855,7 @@ begin
return container_.Get(pre + "sSub", ind); return container_.Get(pre + "sSub", ind);
end; end;
function Sup.WriteSSubs(_index: integer; _value: nil_OR_SSub); function Sup.WriteSSubs(_index: integer; _value: nil__SSub);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7881,7 +7881,7 @@ begin
return container_.Get(pre + "sSup", ind); return container_.Get(pre + "sSup", ind);
end; end;
function Sup.WriteSSups(_index: integer; _value: nil_OR_SSup); function Sup.WriteSSups(_index: integer; _value: nil__SSup);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7907,7 +7907,7 @@ begin
return container_.Get(pre + "nary", ind); return container_.Get(pre + "nary", ind);
end; end;
function Sup.WriteNaries(_index: integer; _value: nil_OR_Nary); function Sup.WriteNaries(_index: integer; _value: nil__Nary);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -7933,7 +7933,7 @@ begin
return container_.Get(pre + "func", ind); return container_.Get(pre + "func", ind);
end; end;
function Sup.WriteFuncs(_index: integer; _value: nil_OR_Func); function Sup.WriteFuncs(_index: integer; _value: nil__Func);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8207,7 +8207,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function Den.WriteRs(_index: integer; _value: nil_OR_R); function Den.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8233,7 +8233,7 @@ begin
return container_.Get(pre + "d", ind); return container_.Get(pre + "d", ind);
end; end;
function Den.WriteDs(_index: integer; _value: nil_OR_D); function Den.WriteDs(_index: integer; _value: nil__D);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8259,7 +8259,7 @@ begin
return container_.Get(pre + "f", ind); return container_.Get(pre + "f", ind);
end; end;
function Den.WriteFs(_index: integer; _value: nil_OR_F); function Den.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8285,7 +8285,7 @@ begin
return container_.Get(pre + "rad", ind); return container_.Get(pre + "rad", ind);
end; end;
function Den.WriteRads(_index: integer; _value: nil_OR_Rad); function Den.WriteRads(_index: integer; _value: nil__Rad);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8311,7 +8311,7 @@ begin
return container_.Get(pre + "sSub", ind); return container_.Get(pre + "sSub", ind);
end; end;
function Den.WriteSSubs(_index: integer; _value: nil_OR_SSub); function Den.WriteSSubs(_index: integer; _value: nil__SSub);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8337,7 +8337,7 @@ begin
return container_.Get(pre + "sSup", ind); return container_.Get(pre + "sSup", ind);
end; end;
function Den.WriteSSups(_index: integer; _value: nil_OR_SSup); function Den.WriteSSups(_index: integer; _value: nil__SSup);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8363,7 +8363,7 @@ begin
return container_.Get(pre + "nary", ind); return container_.Get(pre + "nary", ind);
end; end;
function Den.WriteNaries(_index: integer; _value: nil_OR_Nary); function Den.WriteNaries(_index: integer; _value: nil__Nary);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8389,7 +8389,7 @@ begin
return container_.Get(pre + "func", ind); return container_.Get(pre + "func", ind);
end; end;
function Den.WriteFuncs(_index: integer; _value: nil_OR_Func); function Den.WriteFuncs(_index: integer; _value: nil__Func);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8663,7 +8663,7 @@ begin
return container_.Get(pre + "r", ind); return container_.Get(pre + "r", ind);
end; end;
function Sub.WriteRs(_index: integer; _value: nil_OR_R); function Sub.WriteRs(_index: integer; _value: nil__R);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8689,7 +8689,7 @@ begin
return container_.Get(pre + "d", ind); return container_.Get(pre + "d", ind);
end; end;
function Sub.WriteDs(_index: integer; _value: nil_OR_D); function Sub.WriteDs(_index: integer; _value: nil__D);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8715,7 +8715,7 @@ begin
return container_.Get(pre + "f", ind); return container_.Get(pre + "f", ind);
end; end;
function Sub.WriteFs(_index: integer; _value: nil_OR_F); function Sub.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8741,7 +8741,7 @@ begin
return container_.Get(pre + "rad", ind); return container_.Get(pre + "rad", ind);
end; end;
function Sub.WriteRads(_index: integer; _value: nil_OR_Rad); function Sub.WriteRads(_index: integer; _value: nil__Rad);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8767,7 +8767,7 @@ begin
return container_.Get(pre + "sSub", ind); return container_.Get(pre + "sSub", ind);
end; end;
function Sub.WriteSSubs(_index: integer; _value: nil_OR_SSub); function Sub.WriteSSubs(_index: integer; _value: nil__SSub);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8793,7 +8793,7 @@ begin
return container_.Get(pre + "sSup", ind); return container_.Get(pre + "sSup", ind);
end; end;
function Sub.WriteSSups(_index: integer; _value: nil_OR_SSup); function Sub.WriteSSups(_index: integer; _value: nil__SSup);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8819,7 +8819,7 @@ begin
return container_.Get(pre + "nary", ind); return container_.Get(pre + "nary", ind);
end; end;
function Sub.WriteNaries(_index: integer; _value: nil_OR_Nary); function Sub.WriteNaries(_index: integer; _value: nil__Nary);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
@@ -8845,7 +8845,7 @@ begin
return container_.Get(pre + "func", ind); return container_.Get(pre + "func", ind);
end; end;
function Sub.WriteFuncs(_index: integer; _value: nil_OR_Func); function Sub.WriteFuncs(_index: integer; _value: nil__Func);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
autounit/SharedMLAdapter.tsf
-43
View File
@@ -1,43 +0,0 @@
unit SharedMLAdapter;
interface
type RelationshipsAdapter = class
public
function Create(_obj: Relationships);
function Init();
function GetRelationshipById(_key: string);
function SetRelationshipById(_key: string; _value: tslobj);
private
object_: Relationships;
relationship_hash_: tableArray;
end;
implementation
function RelationshipsAdapter.Create(_obj: Relationships);
begin
object_ := _obj;
relationship_hash_ := array();
{self.}Init();
end;
function RelationshipsAdapter.Init();
begin
elements := object_.Relationships();
for k,v in elements do
relationship_hash_[v.Id] := v;
end;
function RelationshipsAdapter.GetRelationshipById(_key: string);
begin
return relationship_hash_[_key];
end;
function RelationshipsAdapter.SetRelationshipById(_key: string; _value: tslobj);
begin
relationship_hash_[_key] := _value;
end;
end.
autounit/SharedMLAdapters.tsf
+148
View File
@@ -0,0 +1,148 @@
unit SharedMLAdapters;
interface
type Relationships = class
public
function create(_obj: Relationships);
function Init();
function GetRelationshipById(_key: string);
function GetRelationshipByTarget(_key: string);
function AddRelationship(_value: Relationship);
function RemoveRelationship(_value: Relationship);
property RelationshipCount: uinteger read relationship_count_;
private
object_: Relationships;
relationship_id_hash_: hash;
relationship_target_hash_: hash;
relationship_count_: uinteger;
end;
type Types = class
public
function create(_obj: Types);
function Init();
function GetDefaultByExtension(_key: string);
function AddDefault(_value: Default);
function RemoveDefault(_value: Default);
function Get_OverrideByPartName(_key: string);
function Add_Override(_value: _Override);
function Remove_Override(_value: _Override);
property DefaultCount: uinteger read default_count_;
property _OverrideCount: uinteger read _override_count_;
private
object_: Types;
default_extension_hash_: hash;
default_count_: uinteger;
_override_partname_hash_: hash;
_override_count_: uinteger;
end;
implementation
function Relationships.create(_obj: Relationships);
begin
object_ := _obj;
relationship_count_ := 0;
relationship_id_hash_ := array();
relationship_target_hash_ := array();
{self.}Init();
end;
function Relationships.Init();
begin
elements := object_.Relationships();
relationship_count_ := length(elements);
for k,v in elements do
begin
relationship_id_hash_[v.Id] := v;
relationship_target_hash_[v.Target] := v;
end
end;
function Relationships.GetRelationshipById(_key: string);
begin
return relationship_id_hash_[_key];
end;
function Relationships.GetRelationshipByTarget(_key: string);
begin
return relationship_target_hash_[_key];
end;
function Relationships.AddRelationship(_value: Relationship);
begin
relationship_id_hash_[_value.Id] := _value;
relationship_target_hash_[_value.Target] := _value;
relationship_count_++;
end;
function Relationships.RemoveRelationship(_value: Relationship);
begin
reindex(relationship_id_hash_, array(_value.Id: nil));
reindex(relationship_target_hash_, array(_value.Target: nil));
relationship_count_--;
end;
function Types.create(_obj: Types);
begin
object_ := _obj;
default_count_ := 0;
default_extension_hash_ := array();
_override_count_ := 0;
_override_partname_hash_ := array();
{self.}Init();
end;
function Types.Init();
begin
elements := object_.Defaults();
default_count_ := length(elements);
for k,v in elements do
default_extension_hash_[v.Extension] := v;
elements := object_.Overrides();
_override_count_ := length(elements);
for k,v in elements do
_override_partname_hash_[v.PartName] := v;
end;
function Types.GetDefaultByExtension(_key: string);
begin
return default_extension_hash_[_key];
end;
function Types.AddDefault(_value: Default);
begin
default_extension_hash_[_value.Extension] := _value;
default_count_++;
end;
function Types.RemoveDefault(_value: Default);
begin
reindex(default_extension_hash_, array(_value.Extension: nil));
default_count_--;
end;
function Types.Get_OverrideByPartName(_key: string);
begin
return _override_partname_hash_[_key];
end;
function Types.Add_Override(_value: _Override);
begin
_override_partname_hash_[_value.PartName] := _value;
_override_count_++;
end;
function Types.Remove_Override(_value: _Override);
begin
reindex(_override_partname_hash_, array(_value.PartName: nil));
_override_count_--;
end;
end.
autounit/VML.tsf
+2 -2
View File
@@ -98,7 +98,7 @@ public
// multi property // multi property
property Fs read ReadFs write WriteFs; property Fs read ReadFs write WriteFs;
function ReadFs(_index: integer); function ReadFs(_index: integer);
function WriteFs(_index: integer; _value: nil_OR_F); function WriteFs(_index: integer; _value: nil__F);
function AddF(): F; function AddF(): F;
function AppendF(): F; function AppendF(): F;
@@ -1031,7 +1031,7 @@ begin
return container_.Get("v:f", ind); return container_.Get("v:f", ind);
end; end;
function Formulas.WriteFs(_index: integer; _value: nil_OR_F); function Formulas.WriteFs(_index: integer; _value: nil__F);
begin begin
if ifnil(_value) then if ifnil(_value) then
begin begin
autounit/VMLAdapter.tsf → autounit/VMLAdapters.tsf
+1 -1
View File
@@ -1,4 +1,4 @@
unit VMLAdapter; unit VMLAdapters;
interface interface
implementation implementation
utils/TSOfficeContainer.tsf
+40 -2
View File
@@ -7,6 +7,7 @@ public
function Append(data: any): boolean; function Append(data: any): boolean;
function Insert(data: any): boolean; function Insert(data: any): boolean;
function InsertAfter(data: any; pos_data: any); function InsertAfter(data: any; pos_data: any);
function InsertBefore(data: any; pos_data: any);
function Get(name: string; index: integer); function Get(name: string; index: integer);
function GetElements(include_removed: boolean): array of tslobj; function GetElements(include_removed: boolean): array of tslobj;
@@ -17,7 +18,7 @@ private
bucket_: array of LinkList; bucket_: array of LinkList;
child_: array of string; child_: array of string;
current_index_: integer; current_index_: integer;
min_index_; integer; min_index_: integer;
max_index_: integer; max_index_: integer;
end; end;
@@ -28,6 +29,7 @@ public
function Add(data: any); function Add(data: any);
function Delete(data: any): boolean; function Delete(data: any): boolean;
function InsertAfter(data: any; pos_data: any): boolean; function InsertAfter(data: any; pos_data: any): boolean;
function InsertBefore(data: any; pos_data: any): boolean;
function Name(): string; function Name(): string;
function Size(): integer; function Size(): integer;
function First(): Node; function First(): Node;
@@ -194,10 +196,20 @@ begin
end end
end; end;
function TSOfficeContainer.InsertBefore(data: any; pos_data: any);
begin
for i:=0 to current_index_ do
begin
obj := bucket_[i];
if ifObj(obj) then
if obj.InsertBefore(data, pos_data) then break;
end
end;
function TSOfficeContainer.GetElements(include_removed: boolean = true): array of tslobj; function TSOfficeContainer.GetElements(include_removed: boolean = true): array of tslobj;
begin begin
arr := array(); arr := array();
for i:=min_index_ to current_index_ do pf := function(arr, i)
begin begin
obj := bucket_[i]; obj := bucket_[i];
if ifObj(obj) then if ifObj(obj) then
@@ -211,6 +223,10 @@ begin
end end
end end
end end
for i:=0 to current_index_ do
##pf(arr, i);
for i:=min_index_ to -1 do
##pf(arr, i);
return arr; return arr;
end; end;
@@ -329,6 +345,28 @@ begin
return false; return false;
end; end;
function LinkList.InsertBefore(data: any; pos_data: any): boolean;
begin
node := {self.}First();
prev := nil;
while ifObj(node) do
begin
if node.data = pos_data then
begin
new_node := new Node();
new_node.data := data;
new_node.next := node;
if ifnil(prev) then head_.next := new_node;
else prev.next := new_node;
size_++;
return true;
end
prev := node;
node := node.next;
end
return false;
end;
function LinkList.Delete(data: any): boolean; function LinkList.Delete(data: any): boolean;
begin begin
node := {self.}First(); node := {self.}First();
迁移指南.md
+18
View File
@@ -27,3 +27,21 @@
4. 新增`OpenXmlCompositeElement`复杂类型的节点类，提供各种操作的方法，大部分有子节点的类均继承于该类。如`RPr`会有`B I Sz`等子节点元素，而`B I`这类的元素是`<x />`的`OpenXmlSimpleType`类型的 4. 新增`OpenXmlCompositeElement`复杂类型的节点类，提供各种操作的方法，大部分有子节点的类均继承于该类。如`RPr`会有`B I Sz`等子节点元素，而`B I`这类的元素是`<x />`的`OpenXmlSimpleType`类型的
影响范围：列表暂无；具体可见对应类的`// simple_type property`下的属性 影响范围：列表暂无；具体可见对应类的`// simple_type property`下的属性
## v3.0.0
对`adapter`做了`break changes`的更新
1. `unit`文件更名为`adapters`复数结尾，如`DocxMLAdapter` -> `DocxMLAdapters`
2. 移除冗余的命名方式（移除每个类的`Adapter`后缀），`StylesAdapter` -> `Styles`
```pascal
// 弃用
uses DocxMLAdapter;
styles_adapter := new DocxMLAdapter.StylesAdapter(styles);
// 迁移
uses DocxMLAdapters; // 复数s
styles_adapter := new DocxMLAdapters.Styles(styles); // 移除冗余
```