1. 升级装饰器和适配器代码

2. 修复components的bug

autoclass/adapter/docx/NumberingAdapter@DOCX.tsf

@@ -3,12 +3,10 @@ public
     function Create(_obj: Numbering);
     function Init();
 
-    property AbstractNumId read ReadAbstractNumId write WriteAbstractNumId;
+    function GetAbstractNumByAbstractNumId(_key: string);
-    property NumId read ReadNumId write WriteNumId;
+    function SetAbstractNumByAbstractNumId(_key: string; _value: tslobj);
-    function ReadAbstractNumId(_key: string);
+    function GetNumByNumId(_key: string);
-    function WriteAbstractNumId(_key: string; _value: tslobj);
+    function SetNumByNumId(_key: string; _value: tslobj);
-    function ReadNumId(_key: string);
-    function WriteNumId(_key: string; _value: tslobj);
 
 private
     object_: Numbering;
@@ -26,30 +24,30 @@ end;
 
 function NumberingAdapter.Init();
 begin
-    elements := object_.AbstractNums;
+    elements := object_.AbstractNums();
     for k,v in elements do
         abstractnum_hash_[v.AbstractNumId] := v;
-    elements := object_.Nums;
+    elements := object_.Nums();
     for k,v in elements do
         num_hash_[v.NumId] := v;
 end;
 
-function NumberingAdapter.ReadAbstractNumId(_key: string);
+function NumberingAdapter.GetAbstractNumByAbstractNumId(_key: string);
 begin
     return abstractnum_hash_[_key];
 end;
 
-function NumberingAdapter.WriteAbstractNumId(_key: string; _value: tslobj);
+function NumberingAdapter.SetAbstractNumByAbstractNumId(_key: string; _value: tslobj);
 begin
     abstractnum_hash_[_key] := _value;
 end;
 
-function NumberingAdapter.ReadNumId(_key: string);
+function NumberingAdapter.GetNumByNumId(_key: string);
 begin
     return num_hash_[_key];
 end;
 
-function NumberingAdapter.WriteNumId(_key: string; _value: tslobj);
+function NumberingAdapter.SetNumByNumId(_key: string; _value: tslobj);
 begin
     num_hash_[_key] := _value;
 end;

autoclass/adapter/docx/RelationshipsAdapter@DOCX.tsf

@@ -3,9 +3,8 @@ public
     function Create(_obj: Relationships);
     function Init();
 
-    property Id read ReadId write WriteId;
+    function GetRelationshipById(_key: string);
-    function ReadId(_key: string);
+    function SetRelationshipById(_key: string; _value: tslobj);
-    function WriteId(_key: string; _value: tslobj);
 
 private
     object_: Relationships;
@@ -21,17 +20,17 @@ end;
 
 function RelationshipsAdapter.Init();
 begin
-    elements := object_.Relationships;
+    elements := object_.Relationships();
     for k,v in elements do
         relationship_hash_[v.Id] := v;
 end;
 
-function RelationshipsAdapter.ReadId(_key: string);
+function RelationshipsAdapter.GetRelationshipById(_key: string);
 begin
     return relationship_hash_[_key];
 end;
 
-function RelationshipsAdapter.WriteId(_key: string; _value: tslobj);
+function RelationshipsAdapter.SetRelationshipById(_key: string; _value: tslobj);
 begin
     relationship_hash_[_key] := _value;
 end;

autoclass/adapter/docx/SectPrAdapter@DOCX.tsf

@@ -0,0 +1,53 @@
+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;
+
+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;

autoclass/adapter/docx/StylesAdapter@DOCX.tsf

@@ -3,9 +3,8 @@ public
     function Create(_obj: Styles);
     function Init();
 
-    property StyleId read ReadStyleId write WriteStyleId;
+    function GetStyleByStyleId(_key: string);
-    function ReadStyleId(_key: string);
+    function SetStyleByStyleId(_key: string; _value: tslobj);
-    function WriteStyleId(_key: string; _value: tslobj);
 
 private
     object_: Styles;
@@ -21,17 +20,17 @@ end;
 
 function StylesAdapter.Init();
 begin
-    elements := object_.Styles;
+    elements := object_.Styles();
     for k,v in elements do
         style_hash_[v.StyleId] := v;
 end;
 
-function StylesAdapter.ReadStyleId(_key: string);
+function StylesAdapter.GetStyleByStyleId(_key: string);
 begin
     return style_hash_[_key];
 end;
 
-function StylesAdapter.WriteStyleId(_key: string; _value: tslobj);
+function StylesAdapter.SetStyleByStyleId(_key: string; _value: tslobj);
 begin
     style_hash_[_key] := _value;
 end;

autoclass/decorator/docx/APPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type APPrUnitDecorator = class(APPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: APPr);
+    function GetObject();
     function Convert();
 private
     object_: APPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function APPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function APPrUnitDecorator.Convert();
 begin
     {self.}DefRPr := new ARPrUnitDecorator(object_.DefRPr);

autoclass/decorator/docx/ARPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ARPrUnitDecorator = class(ARPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: ARPr);
+    function GetObject();
     function Convert();
 private
     object_: ARPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ARPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ARPrUnitDecorator.Convert();
 begin
     {self.}XmlAttrLang.Value := object_.XmlAttrLang.Value;

autoclass/decorator/docx/ARUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ARUnitDecorator = class(AR)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: AR);
+    function GetObject();
     function Convert();
 private
     object_: AR;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ARUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ARUnitDecorator.Convert();
 begin
     {self.}RPr := new ARPrUnitDecorator(object_.RPr);

autoclass/decorator/docx/AbstractNumUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type AbstractNumUnitDecorator = class(AbstractNum)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: AbstractNum);
+    function GetObject();
     function Convert();
 private
     object_: AbstractNum;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function AbstractNumUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function AbstractNumUnitDecorator.Convert();
 begin
     {self.}XmlAttrAbstractNumId.Value := object_.XmlAttrAbstractNumId.Value;

autoclass/decorator/docx/AlternateContentUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type AlternateContentUnitDecorator = class(AlternateContent)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: AlternateContent);
+    function GetObject();
     function Convert();
 private
     object_: AlternateContent;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function AlternateContentUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function AlternateContentUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value;

autoclass/decorator/docx/ApUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ApUnitDecorator = class(Ap)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Ap);
+    function GetObject();
     function Convert();
 private
     object_: Ap;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ApUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ApUnitDecorator.Convert();
 begin
     {self.}PPr := new APPrUnitDecorator(object_.PPr);

autoclass/decorator/docx/AxUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type AxUnitDecorator = class(Ax)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Ax);
+    function GetObject();
     function Convert();
 private
     object_: Ax;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function AxUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function AxUnitDecorator.Convert();
 begin
     {self.}AxId := new PureValUnitDecorator(object_.AxId);

autoclass/decorator/docx/BarChartUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type BarChartUnitDecorator = class(BarChart)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: BarChart);
+    function GetObject();
     function Convert();
 private
     object_: BarChart;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function BarChartUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function BarChartUnitDecorator.Convert();
 begin
     {self.}BarDir := new PureValUnitDecorator(object_.BarDir);

autoclass/decorator/docx/BlipFillUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type BlipFillUnitDecorator = class(BlipFill)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: BlipFill);
+    function GetObject();
     function Convert();
 private
     object_: BlipFill;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function BlipFillUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function BlipFillUnitDecorator.Convert();
 begin
     {self.}Blip := new BlipUnitDecorator(object_.Blip);

autoclass/decorator/docx/BlipUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type BlipUnitDecorator = class(Blip)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Blip);
+    function GetObject();
     function Convert();
 private
     object_: Blip;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function BlipUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function BlipUnitDecorator.Convert();
 begin
     {self.}XmlAttrEmbed.Value := object_.XmlAttrEmbed.Value;

autoclass/decorator/docx/BodyPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type BodyPrUnitDecorator = class(BodyPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: BodyPr);
+    function GetObject();
     function Convert();
 private
     object_: BodyPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function BodyPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function BodyPrUnitDecorator.Convert();
 begin
     {self.}XmlAttrRot.Value := object_.XmlAttrRot.Value;

autoclass/decorator/docx/BodyUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type BodyUnitDecorator = class(Body)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Body);
+    function GetObject();
     function Convert();
 private
     object_: Body;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function BodyUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function BodyUnitDecorator.Convert();
 begin
     {self.}SectPr := new SectPrUnitDecorator(object_.SectPr);

autoclass/decorator/docx/BookmarkUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type BookmarkUnitDecorator = class(Bookmark)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Bookmark);
+    function GetObject();
     function Convert();
 private
     object_: Bookmark;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function BookmarkUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function BookmarkUnitDecorator.Convert();
 begin
     {self.}XmlAttrName.Value := object_.XmlAttrName.Value;

autoclass/decorator/docx/BrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type BrUnitDecorator = class(Br)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Br);
+    function GetObject();
     function Convert();
 private
     object_: Br;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function BrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function BrUnitDecorator.Convert();
 begin
     {self.}XmlAttrType.Value := object_.XmlAttrType.Value;

autoclass/decorator/docx/CNvGraphicFramePrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CNvGraphicFramePrUnitDecorator = class(CNvGraphicFramePr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: CNvGraphicFramePr);
+    function GetObject();
     function Convert();
 private
     object_: CNvGraphicFramePr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CNvGraphicFramePrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CNvGraphicFramePrUnitDecorator.Convert();
 begin
     {self.}GraphicFrameLocks := new GraphicFrameLocksUnitDecorator(object_.GraphicFrameLocks);

autoclass/decorator/docx/CNvPicPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CNvPicPrUnitDecorator = class(CNvPicPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: CNvPicPr);
+    function GetObject();
     function Convert();
 private
     object_: CNvPicPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CNvPicPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CNvPicPrUnitDecorator.Convert();
 begin
     {self.}PicLocks := new PicLocksUnitDecorator(object_.PicLocks);

autoclass/decorator/docx/CNvPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CNvPrUnitDecorator = class(CNvPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: CNvPr);
+    function GetObject();
     function Convert();
 private
     object_: CNvPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CNvPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CNvPrUnitDecorator.Convert();
 begin
     {self.}XmlAttrId.Value := object_.XmlAttrId.Value;

autoclass/decorator/docx/CXYUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CXYUnitDecorator = class(CXY)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: CXY);
+    function GetObject();
     function Convert();
 private
     object_: CXY;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CXYUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CXYUnitDecorator.Convert();
 begin
     {self.}XmlAttrCx.Value := TSSafeUnitConverter.EmusToPoints(object_.XmlAttrCx.Value);

autoclass/decorator/docx/CacheUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CacheUnitDecorator = class(Cache)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Cache);
+    function GetObject();
     function Convert();
 private
     object_: Cache;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CacheUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CacheUnitDecorator.Convert();
 begin
     {self.}PtCount := new PureValUnitDecorator(object_.PtCount);

autoclass/decorator/docx/CatUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CatUnitDecorator = class(Cat)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Cat);
+    function GetObject();
     function Convert();
 private
     object_: Cat;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CatUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CatUnitDecorator.Convert();
 begin
     {self.}StrRef := new StrRefUnitDecorator(object_.StrRef);

autoclass/decorator/docx/ChartSpaceUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ChartSpaceUnitDecorator = class(ChartSpace)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: ChartSpace);
+    function GetObject();
     function Convert();
 private
     object_: ChartSpace;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ChartSpaceUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ChartSpaceUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsC.Value := object_.XmlAttrXmlnsC.Value;

autoclass/decorator/docx/ChartUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ChartUnitDecorator = class(Chart)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Chart);
+    function GetObject();
     function Convert();
 private
     object_: Chart;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ChartUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ChartUnitDecorator.Convert();
 begin
     {self.}Title := new TitleUnitDecorator(object_.Title);

autoclass/decorator/docx/ChoiceUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ChoiceUnitDecorator = class(Choice)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Choice);
+    function GetObject();
     function Convert();
 private
     object_: Choice;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ChoiceUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ChoiceUnitDecorator.Convert();
 begin
     {self.}XmlAttrRequires.Value := object_.XmlAttrRequires.Value;

autoclass/decorator/docx/Clr1UnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type Clr1UnitDecorator = class(Clr1)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Clr1);
+    function GetObject();
     function Convert();
 private
     object_: Clr1;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function Clr1UnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function Clr1UnitDecorator.Convert();
 begin
     {self.}SysClr := new SysClrUnitDecorator(object_.SysClr);

autoclass/decorator/docx/Clr2UnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type Clr2UnitDecorator = class(Clr2)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Clr2);
+    function GetObject();
     function Convert();
 private
     object_: Clr2;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function Clr2UnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function Clr2UnitDecorator.Convert();
 begin
     {self.}SrgbClr := new SrgbClrUnitDecorator(object_.SrgbClr);

autoclass/decorator/docx/ClrSchemeUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ClrSchemeUnitDecorator = class(ClrScheme)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: ClrScheme);
+    function GetObject();
     function Convert();
 private
     object_: ClrScheme;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ClrSchemeUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ClrSchemeUnitDecorator.Convert();
 begin
     {self.}XmlAttrName.Value := object_.XmlAttrName.Value;

autoclass/decorator/docx/ColorUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ColorUnitDecorator = class(Color)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Color);
+    function GetObject();
     function Convert();
 private
     object_: Color;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ColorUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ColorUnitDecorator.Convert();
 begin
     {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value;

autoclass/decorator/docx/ColsUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ColsUnitDecorator = class(Cols)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Cols);
+    function GetObject();
     function Convert();
 private
     object_: Cols;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ColsUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ColsUnitDecorator.Convert();
 begin
     {self.}XmlAttrSpace.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrSpace.Value);

autoclass/decorator/docx/CommentRangeUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CommentRangeUnitDecorator = class(CommentRange)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: CommentRange);
+    function GetObject();
     function Convert();
 private
     object_: CommentRange;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CommentRangeUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CommentRangeUnitDecorator.Convert();
 begin
     {self.}XmlAttrId.Value := object_.XmlAttrId.Value;

autoclass/decorator/docx/CommentUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CommentUnitDecorator = class(Comment)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Comment);
+    function GetObject();
     function Convert();
 private
     object_: Comment;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CommentUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CommentUnitDecorator.Convert();
 begin
     {self.}XmlAttrAuthor.Value := object_.XmlAttrAuthor.Value;

autoclass/decorator/docx/CommentsUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CommentsUnitDecorator = class(Comments)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Comments);
+    function GetObject();
     function Convert();
 private
     object_: Comments;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CommentsUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CommentsUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value;

autoclass/decorator/docx/CompatSettingUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CompatSettingUnitDecorator = class(CompatSetting)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: CompatSetting);
+    function GetObject();
     function Convert();
 private
     object_: CompatSetting;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CompatSettingUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CompatSettingUnitDecorator.Convert();
 begin
     {self.}XmlAttrName.Value := object_.XmlAttrName.Value;

autoclass/decorator/docx/CompatUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CompatUnitDecorator = class(Compat)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Compat);
+    function GetObject();
     function Convert();
 private
     object_: Compat;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CompatUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CompatUnitDecorator.Convert();
 begin
     if not ifnil(object_.XmlChildSpaceForUL.Value) then {self.}XmlChildSpaceForUL.Value := object_.XmlChildSpaceForUL.Value;

autoclass/decorator/docx/CorePropertiesUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CorePropertiesUnitDecorator = class(CoreProperties)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: CoreProperties);
+    function GetObject();
     function Convert();
 private
     object_: CoreProperties;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CorePropertiesUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CorePropertiesUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsCp.Value := object_.XmlAttrXmlnsCp.Value;

autoclass/decorator/docx/CreatedUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type CreatedUnitDecorator = class(Created)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Created);
+    function GetObject();
     function Convert();
 private
     object_: Created;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function CreatedUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function CreatedUnitDecorator.Convert();
 begin
     {self.}XmlAttrXsiType.Value := object_.XmlAttrXsiType.Value;

autoclass/decorator/docx/DLblsUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DLblsUnitDecorator = class(DLbls)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: DLbls);
+    function GetObject();
     function Convert();
 private
     object_: DLbls;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DLblsUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DLblsUnitDecorator.Convert();
 begin
     {self.}SpPr := new SpPrUnitDecorator(object_.SpPr);

autoclass/decorator/docx/DTableUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DTableUnitDecorator = class(DTable)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: DTable);
+    function GetObject();
     function Convert();
 private
     object_: DTable;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DTableUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DTableUnitDecorator.Convert();
 begin
     {self.}ShowHorzBorder := new PureValUnitDecorator(object_.ShowHorzBorder);

autoclass/decorator/docx/DefaultUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DefaultUnitDecorator = class(Default)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Default);
+    function GetObject();
     function Convert();
 private
     object_: Default;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DefaultUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DefaultUnitDecorator.Convert();
 begin
     {self.}XmlAttrExtension.Value := object_.XmlAttrExtension.Value;

autoclass/decorator/docx/DocDefaultsUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DocDefaultsUnitDecorator = class(DocDefaults)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: DocDefaults);
+    function GetObject();
     function Convert();
 private
     object_: DocDefaults;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DocDefaultsUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DocDefaultsUnitDecorator.Convert();
 begin
     {self.}RPrDefault := new RPrDefaultUnitDecorator(object_.RPrDefault);

autoclass/decorator/docx/DocGridUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DocGridUnitDecorator = class(DocGrid)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: DocGrid);
+    function GetObject();
     function Convert();
 private
     object_: DocGrid;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DocGridUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DocGridUnitDecorator.Convert();
 begin
     {self.}XmlAttrType.Value := object_.XmlAttrType.Value;

autoclass/decorator/docx/DocPartObjUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DocPartObjUnitDecorator = class(DocPartObj)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: DocPartObj);
+    function GetObject();
     function Convert();
 private
     object_: DocPartObj;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DocPartObjUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DocPartObjUnitDecorator.Convert();
 begin
     {self.}DocPartGallery := new PureWValUnitDecorator(object_.DocPartGallery);

autoclass/decorator/docx/DocPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DocPrUnitDecorator = class(DocPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: DocPr);
+    function GetObject();
     function Convert();
 private
     object_: DocPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DocPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DocPrUnitDecorator.Convert();
 begin
     {self.}XmlAttrId.Value := object_.XmlAttrId.Value;

autoclass/decorator/docx/DocumentUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DocumentUnitDecorator = class(Document)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Document);
+    function GetObject();
     function Convert();
 private
     object_: Document;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DocumentUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DocumentUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value;

autoclass/decorator/docx/DrawingUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type DrawingUnitDecorator = class(Drawing)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Drawing);
+    function GetObject();
     function Convert();
 private
     object_: Drawing;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function DrawingUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function DrawingUnitDecorator.Convert();
 begin
     {self.}_Inline := new _InlineUnitDecorator(object_._Inline);

autoclass/decorator/docx/EffectExtentUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type EffectExtentUnitDecorator = class(EffectExtent)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: EffectExtent);
+    function GetObject();
     function Convert();
 private
     object_: EffectExtent;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function EffectExtentUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function EffectExtentUnitDecorator.Convert();
 begin
     {self.}XmlAttrL.Value := object_.XmlAttrL.Value;

autoclass/decorator/docx/EffectLstUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type EffectLstUnitDecorator = class(EffectLst)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: EffectLst);
+    function GetObject();
     function Convert();
 private
     object_: EffectLst;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function EffectLstUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function EffectLstUnitDecorator.Convert();
 begin
     {self.}OuterShdw := new OuterShdwUnitDecorator(object_.OuterShdw);

autoclass/decorator/docx/EffectStyleLstUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type EffectStyleLstUnitDecorator = class(EffectStyleLst)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: EffectStyleLst);
+    function GetObject();
     function Convert();
 private
     object_: EffectStyleLst;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function EffectStyleLstUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function EffectStyleLstUnitDecorator.Convert();
 begin
 end;

autoclass/decorator/docx/EffectStyleUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type EffectStyleUnitDecorator = class(EffectStyle)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: EffectStyle);
+    function GetObject();
     function Convert();
 private
     object_: EffectStyle;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function EffectStyleUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function EffectStyleUnitDecorator.Convert();
 begin
     {self.}EffectLst := new EffectLstUnitDecorator(object_.EffectLst);

autoclass/decorator/docx/EndnotePrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type EndnotePrUnitDecorator = class(EndnotePr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: EndnotePr);
+    function GetObject();
     function Convert();
 private
     object_: EndnotePr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function EndnotePrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function EndnotePrUnitDecorator.Convert();
 begin
 end;

autoclass/decorator/docx/EndnoteUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type EndnoteUnitDecorator = class(Endnote)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Endnote);
+    function GetObject();
     function Convert();
 private
     object_: Endnote;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function EndnoteUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function EndnoteUnitDecorator.Convert();
 begin
     {self.}XmlAttrType.Value := object_.XmlAttrType.Value;

autoclass/decorator/docx/EndnotesUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type EndnotesUnitDecorator = class(Endnotes)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Endnotes);
+    function GetObject();
     function Convert();
 private
     object_: Endnotes;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function EndnotesUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function EndnotesUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value;

autoclass/decorator/docx/ExtLstUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ExtLstUnitDecorator = class(ExtLst)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: ExtLst);
+    function GetObject();
     function Convert();
 private
     object_: ExtLst;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ExtLstUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ExtLstUnitDecorator.Convert();
 begin
 end;

autoclass/decorator/docx/ExtUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ExtUnitDecorator = class(Ext)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Ext);
+    function GetObject();
     function Convert();
 private
     object_: Ext;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ExtUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ExtUnitDecorator.Convert();
 begin
     {self.}XmlAttrUri.Value := object_.XmlAttrUri.Value;

autoclass/decorator/docx/ExternalDataUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ExternalDataUnitDecorator = class(ExternalData)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: ExternalData);
+    function GetObject();
     function Convert();
 private
     object_: ExternalData;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ExternalDataUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ExternalDataUnitDecorator.Convert();
 begin
     {self.}XmlAttrId.Value := object_.XmlAttrId.Value;

autoclass/decorator/docx/FallbackUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FallbackUnitDecorator = class(Fallback)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Fallback);
+    function GetObject();
     function Convert();
 private
     object_: Fallback;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FallbackUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FallbackUnitDecorator.Convert();
 begin
     {self.}Style := new PureValUnitDecorator(object_.Style);

autoclass/decorator/docx/FillStyleLstUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FillStyleLstUnitDecorator = class(FillStyleLst)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: FillStyleLst);
+    function GetObject();
     function Convert();
 private
     object_: FillStyleLst;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FillStyleLstUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FillStyleLstUnitDecorator.Convert();
 begin
 end;

autoclass/decorator/docx/FldCharUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FldCharUnitDecorator = class(FldChar)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: FldChar);
+    function GetObject();
     function Convert();
 private
     object_: FldChar;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FldCharUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FldCharUnitDecorator.Convert();
 begin
     {self.}XmlAttrFldCharType.Value := object_.XmlAttrFldCharType.Value;

autoclass/decorator/docx/FmtSchemeUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FmtSchemeUnitDecorator = class(FmtScheme)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: FmtScheme);
+    function GetObject();
     function Convert();
 private
     object_: FmtScheme;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FmtSchemeUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FmtSchemeUnitDecorator.Convert();
 begin
     {self.}XmlAttrName.Value := object_.XmlAttrName.Value;

autoclass/decorator/docx/FontSchemeUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FontSchemeUnitDecorator = class(FontScheme)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: FontScheme);
+    function GetObject();
     function Convert();
 private
     object_: FontScheme;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FontSchemeUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FontSchemeUnitDecorator.Convert();
 begin
     {self.}XmlAttrName.Value := object_.XmlAttrName.Value;

autoclass/decorator/docx/FontUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FontUnitDecorator = class(Font)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Font);
+    function GetObject();
     function Convert();
 private
     object_: Font;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FontUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FontUnitDecorator.Convert();
 begin
     {self.}XmlAttrName.Value := object_.XmlAttrName.Value;

autoclass/decorator/docx/FontsUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FontsUnitDecorator = class(Fonts)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Fonts);
+    function GetObject();
     function Convert();
 private
     object_: Fonts;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FontsUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FontsUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsMc.Value := object_.XmlAttrXmlnsMc.Value;

autoclass/decorator/docx/FootnotePrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FootnotePrUnitDecorator = class(FootnotePr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: FootnotePr);
+    function GetObject();
     function Convert();
 private
     object_: FootnotePr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FootnotePrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FootnotePrUnitDecorator.Convert();
 begin
 end;

autoclass/decorator/docx/FootnoteUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FootnoteUnitDecorator = class(Footnote)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Footnote);
+    function GetObject();
     function Convert();
 private
     object_: Footnote;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FootnoteUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FootnoteUnitDecorator.Convert();
 begin
     {self.}XmlAttrType.Value := object_.XmlAttrType.Value;

autoclass/decorator/docx/FootnotesUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FootnotesUnitDecorator = class(Footnotes)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Footnotes);
+    function GetObject();
     function Convert();
 private
     object_: Footnotes;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FootnotesUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FootnotesUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsWpc.Value := object_.XmlAttrXmlnsWpc.Value;

autoclass/decorator/docx/FtrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type FtrUnitDecorator = class(Ftr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Ftr);
+    function GetObject();
     function Convert();
 private
     object_: Ftr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function FtrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function FtrUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value;

autoclass/decorator/docx/GradFillUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type GradFillUnitDecorator = class(GradFill)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: GradFill);
+    function GetObject();
     function Convert();
 private
     object_: GradFill;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function GradFillUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function GradFillUnitDecorator.Convert();
 begin
     {self.}XmlAttrRotWithShape.Value := object_.XmlAttrRotWithShape.Value;

autoclass/decorator/docx/GraphicDataUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type GraphicDataUnitDecorator = class(GraphicData)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: GraphicData);
+    function GetObject();
     function Convert();
 private
     object_: GraphicData;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function GraphicDataUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function GraphicDataUnitDecorator.Convert();
 begin
     {self.}XmlAttrUri.Value := object_.XmlAttrUri.Value;

autoclass/decorator/docx/GraphicFrameLocksUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type GraphicFrameLocksUnitDecorator = class(GraphicFrameLocks)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: GraphicFrameLocks);
+    function GetObject();
     function Convert();
 private
     object_: GraphicFrameLocks;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function GraphicFrameLocksUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function GraphicFrameLocksUnitDecorator.Convert();
 begin
     {self.}XmlAttrNoChangeAspect.Value := object_.XmlAttrNoChangeAspect.Value;

autoclass/decorator/docx/GraphicUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type GraphicUnitDecorator = class(Graphic)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Graphic);
+    function GetObject();
     function Convert();
 private
     object_: Graphic;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function GraphicUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function GraphicUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsA.Value := object_.XmlAttrXmlnsA.Value;

autoclass/decorator/docx/GridColUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type GridColUnitDecorator = class(GridCol)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: GridCol);
+    function GetObject();
     function Convert();
 private
     object_: GridCol;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function GridColUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function GridColUnitDecorator.Convert();
 begin
     {self.}XmlAttrw.Value := TSSafeUnitConverter.TwipsToPoints(object_.XmlAttrw.Value);

autoclass/decorator/docx/GsLstUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type GsLstUnitDecorator = class(GsLst)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: GsLst);
+    function GetObject();
     function Convert();
 private
     object_: GsLst;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function GsLstUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function GsLstUnitDecorator.Convert();
 begin
 end;

autoclass/decorator/docx/GsUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type GsUnitDecorator = class(Gs)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Gs);
+    function GetObject();
     function Convert();
 private
     object_: Gs;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function GsUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function GsUnitDecorator.Convert();
 begin
     {self.}XmlAttrPos.Value := object_.XmlAttrPos.Value;

autoclass/decorator/docx/HdrShapeDefaultsUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type HdrShapeDefaultsUnitDecorator = class(HdrShapeDefaults)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: HdrShapeDefaults);
+    function GetObject();
     function Convert();
 private
     object_: HdrShapeDefaults;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function HdrShapeDefaultsUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function HdrShapeDefaultsUnitDecorator.Convert();
 begin
     {self.}ShapeDefaults := new ShapeDefaultsUnitDecorator(object_.ShapeDefaults);

autoclass/decorator/docx/HdrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type HdrUnitDecorator = class(Hdr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Hdr);
+    function GetObject();
     function Convert();
 private
     object_: Hdr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function HdrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function HdrUnitDecorator.Convert();
 begin
     {self.}XmlAttrXmlnsM.Value := object_.XmlAttrXmlnsM.Value;

autoclass/decorator/docx/HyperLinkUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type HyperLinkUnitDecorator = class(HyperLink)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: HyperLink);
+    function GetObject();
     function Convert();
 private
     object_: HyperLink;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function HyperLinkUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function HyperLinkUnitDecorator.Convert();
 begin
     {self.}XmlAttrAnchor.Value := object_.XmlAttrAnchor.Value;

autoclass/decorator/docx/IdMapUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type IdMapUnitDecorator = class(IdMap)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: IdMap);
+    function GetObject();
     function Convert();
 private
     object_: IdMap;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function IdMapUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function IdMapUnitDecorator.Convert();
 begin
     {self.}XmlAttrExt.Value := object_.XmlAttrExt.Value;

autoclass/decorator/docx/IndUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type IndUnitDecorator = class(Ind)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Ind);
+    function GetObject();
     function Convert();
 private
     object_: Ind;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function IndUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function IndUnitDecorator.Convert();
 begin
     {self.}XmlAttrFirstLineChars.Value := TSSafeUnitConverter.PercentToNumber(object_.XmlAttrFirstLineChars.Value);

autoclass/decorator/docx/InstrTextUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type InstrTextUnitDecorator = class(InstrText)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: InstrText);
+    function GetObject();
     function Convert();
 private
     object_: InstrText;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function InstrTextUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function InstrTextUnitDecorator.Convert();
 begin
     {self.}XmlAttrSpace.Value := object_.XmlAttrSpace.Value;

autoclass/decorator/docx/LangUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LangUnitDecorator = class(Lang)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Lang);
+    function GetObject();
     function Convert();
 private
     object_: Lang;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LangUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LangUnitDecorator.Convert();
 begin
     {self.}XmlAttrVal.Value := object_.XmlAttrVal.Value;

autoclass/decorator/docx/LatenStylesUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LatenStylesUnitDecorator = class(LatenStyles)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: LatenStyles);
+    function GetObject();
     function Convert();
 private
     object_: LatenStyles;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LatenStylesUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LatenStylesUnitDecorator.Convert();
 begin
     {self.}XmlAttrDefLickedState.Value := object_.XmlAttrDefLickedState.Value;

autoclass/decorator/docx/LatinUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LatinUnitDecorator = class(Latin)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Latin);
+    function GetObject();
     function Convert();
 private
     object_: Latin;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LatinUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LatinUnitDecorator.Convert();
 begin
     {self.}XmlAttrTypeface.Value := object_.XmlAttrTypeface.Value;

autoclass/decorator/docx/LegendUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LegendUnitDecorator = class(Legend)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Legend);
+    function GetObject();
     function Convert();
 private
     object_: Legend;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LegendUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LegendUnitDecorator.Convert();
 begin
     {self.}LegendPos := new PureValUnitDecorator(object_.LegendPos);

autoclass/decorator/docx/LinUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LinUnitDecorator = class(Lin)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Lin);
+    function GetObject();
     function Convert();
 private
     object_: Lin;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LinUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LinUnitDecorator.Convert();
 begin
     {self.}XmlAttrAng.Value := object_.XmlAttrAng.Value;

autoclass/decorator/docx/LnStyleLstUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LnStyleLstUnitDecorator = class(LnStyleLst)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: LnStyleLst);
+    function GetObject();
     function Convert();
 private
     object_: LnStyleLst;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LnStyleLstUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LnStyleLstUnitDecorator.Convert();
 begin
 end;

autoclass/decorator/docx/LnUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LnUnitDecorator = class(Ln)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Ln);
+    function GetObject();
     function Convert();
 private
     object_: Ln;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LnUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LnUnitDecorator.Convert();
 begin
     {self.}XmlAttrW.Value := object_.XmlAttrW.Value;

autoclass/decorator/docx/LsdExceptionUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LsdExceptionUnitDecorator = class(LsdException)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: LsdException);
+    function GetObject();
     function Convert();
 private
     object_: LsdException;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LsdExceptionUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LsdExceptionUnitDecorator.Convert();
 begin
     {self.}XmlAttrName.Value := object_.XmlAttrName.Value;

autoclass/decorator/docx/LvlUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type LvlUnitDecorator = class(Lvl)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Lvl);
+    function GetObject();
     function Convert();
 private
     object_: Lvl;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function LvlUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function LvlUnitDecorator.Convert();
 begin
     {self.}XmlAttrIlvl.Value := object_.XmlAttrIlvl.Value;

autoclass/decorator/docx/MFontFontUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type MFontFontUnitDecorator = class(MFontFont)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: MFontFont);
+    function GetObject();
     function Convert();
 private
     object_: MFontFont;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function MFontFontUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function MFontFontUnitDecorator.Convert();
 begin
     {self.}XmlAttrScript.Value := object_.XmlAttrScript.Value;

autoclass/decorator/docx/MFontUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type MFontUnitDecorator = class(MFont)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: MFont);
+    function GetObject();
     function Convert();
 private
     object_: MFont;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function MFontUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function MFontUnitDecorator.Convert();
 begin
     {self.}Latin := new LatinUnitDecorator(object_.Latin);

autoclass/decorator/docx/MathPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type MathPrUnitDecorator = class(MathPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: MathPr);
+    function GetObject();
     function Convert();
 private
     object_: MathPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function MathPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function MathPrUnitDecorator.Convert();
 begin
     {self.}MathFont := new PureWValUnitDecorator(object_.MathFont);

autoclass/decorator/docx/MiterUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type MiterUnitDecorator = class(Miter)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Miter);
+    function GetObject();
     function Convert();
 private
     object_: Miter;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function MiterUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function MiterUnitDecorator.Convert();
 begin
     {self.}XmlAttrLim.Value := object_.XmlAttrLim.Value;

autoclass/decorator/docx/ModifiedUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type ModifiedUnitDecorator = class(Modified)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Modified);
+    function GetObject();
     function Convert();
 private
     object_: Modified;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function ModifiedUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function ModifiedUnitDecorator.Convert();
 begin
     {self.}XmlAttrXsiType.Value := object_.XmlAttrXsiType.Value;

autoclass/decorator/docx/NumFmtUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type NumFmtUnitDecorator = class(NumFmt)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: NumFmt);
+    function GetObject();
     function Convert();
 private
     object_: NumFmt;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function NumFmtUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function NumFmtUnitDecorator.Convert();
 begin
     {self.}XmlAttrFormatCode.Value := object_.XmlAttrFormatCode.Value;

autoclass/decorator/docx/NumPrUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type NumPrUnitDecorator = class(NumPr)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: NumPr);
+    function GetObject();
     function Convert();
 private
     object_: NumPr;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function NumPrUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function NumPrUnitDecorator.Convert();
 begin
     {self.}Ilvl := new PureWValUnitDecorator(object_.Ilvl);

autoclass/decorator/docx/NumRefUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type NumRefUnitDecorator = class(NumRef)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: NumRef);
+    function GetObject();
     function Convert();
 private
     object_: NumRef;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function NumRefUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function NumRefUnitDecorator.Convert();
 begin
     {self.}NumCache := new CacheUnitDecorator(object_.NumCache);

autoclass/decorator/docx/NumUnitDecorator@DOCX.tsf

@@ -2,6 +2,7 @@ type NumUnitDecorator = class(Num)
 uses TSSafeUnitConverter;
 public
     function Create(_obj: Num);
+    function GetObject();
     function Convert();
 private
     object_: Num;
@@ -14,6 +15,11 @@ begin
     {self.}Convert();
 end;
 
+function NumUnitDecorator.GetObject();
+begin
+    return object_;
+end;
+
 function NumUnitDecorator.Convert();
 begin
     {self.}XmlAttrNumId.Value := object_.XmlAttrNumId.Value;