spire-xls 15.7.1__py3-none-win_amd64.whl → 15.11.1__py3-none-win_amd64.whl

spire/xls/collection/BordersCollectionArrayWrapper.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class BordersCollectionArrayWrapper (  IBorders) :
+class BordersCollectionArrayWrapper (CollectionBase[IBorder],  IBorders) :
     """
     Implements the IBorders interface for manipulating Excel cell border collections.
     """
@@ -74,7 +74,7 @@ class BordersCollectionArrayWrapper (  IBorders) :
         GetDllLibXls().BordersCollectionArrayWrapper_get_Item.argtypes=[c_void_p ,c_int]
         GetDllLibXls().BordersCollectionArrayWrapper_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().BordersCollectionArrayWrapper_get_Item, self.Ptr, enumIndex)
-        ret = None if intPtr==None else IBorder(intPtr)
+        ret = None if intPtr==None else XlsBorderArrayWrapper(intPtr)
         return ret
 
     @property

spire/xls/collection/ButtonShapeCollection.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class ButtonShapeCollection (  IButtonShapes) :
+class ButtonShapeCollection ( CollectionBase[IButtonShape], IButtonShapes) :
     """
 
     """
@@ -20,7 +20,7 @@ class ButtonShapeCollection (  IButtonShapes) :
         GetDllLibXls().ButtonShapeCollection_get_Item.argtypes=[c_void_p ,c_int]
         GetDllLibXls().ButtonShapeCollection_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ButtonShapeCollection_get_Item, self.Ptr, index)
-        ret = None if intPtr==None else IButtonShape(intPtr)
+        ret = None if intPtr==None else XlsButtonShape(intPtr)
         return ret
 
 
@@ -34,7 +34,7 @@ class ButtonShapeCollection (  IButtonShapes) :
         GetDllLibXls().ButtonShapeCollection_get_ItemN.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().ButtonShapeCollection_get_ItemN.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ButtonShapeCollection_get_ItemN, self.Ptr, name)
-        ret = None if intPtr==None else IButtonShape(intPtr)
+        ret = None if intPtr==None else XlsButtonShape(intPtr)
         return ret
 
 
@@ -47,7 +47,7 @@ class ButtonShapeCollection (  IButtonShapes) :
         GetDllLibXls().ButtonShapeCollection_AddButton.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
         GetDllLibXls().ButtonShapeCollection_AddButton.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ButtonShapeCollection_AddButton, self.Ptr, row,column,height,width)
-        ret = None if intPtr==None else IButtonShape(intPtr)
+        ret = None if intPtr==None else XlsButtonShape(intPtr)
         return ret
 
 

spire/xls/collection/DataConnections.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class DataConnections (SpireObject) :
+class DataConnections (CollectionBase[ExternalConnection],SpireObject) :
     """
 
     """

spire/xls/collection/ExternalLinkCollection.py

@@ -4,9 +4,10 @@ from typing import TypeVar,Union,Generic,List,Tuple
 from spire.xls.common import *
 from spire.xls import *
 from ctypes import *
+from spire.xls.ExternalLink import ExternalLink
 import abc
 
-class ExternalLinkCollection (SpireObject) :
+class ExternalLinkCollection (CollectionBase[ExternalLink]) :
     """
 
     """

spire/xls/collection/GroupBoxCollection.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class GroupBoxCollection (  IGroupBoxes) :
+class GroupBoxCollection (CollectionBase[IGroupBox], IGroupBoxes) :
     """
 
     """
@@ -20,7 +20,7 @@ class GroupBoxCollection (  IGroupBoxes) :
         GetDllLibXls().GroupBoxCollection_get_Item.argtypes=[c_void_p ,c_int]
         GetDllLibXls().GroupBoxCollection_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().GroupBoxCollection_get_Item, self.Ptr, index)
-        ret = None if intPtr==None else IGroupBox(intPtr)
+        ret = None if intPtr==None else XlsGroupBoxShape(intPtr)
         return ret
 
 
@@ -34,7 +34,7 @@ class GroupBoxCollection (  IGroupBoxes) :
         GetDllLibXls().GroupBoxCollection_get_ItemN.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().GroupBoxCollection_get_ItemN.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().GroupBoxCollection_get_ItemN, self.Ptr, name)
-        ret = None if intPtr==None else IGroupBox(intPtr)
+        ret = None if intPtr==None else XlsGroupBoxShape(intPtr)
         return ret
 
 
@@ -47,7 +47,7 @@ class GroupBoxCollection (  IGroupBoxes) :
         GetDllLibXls().GroupBoxCollection_AddGroupBox.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
         GetDllLibXls().GroupBoxCollection_AddGroupBox.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().GroupBoxCollection_AddGroupBox, self.Ptr, row,column,height,width)
-        ret = None if intPtr==None else IGroupBox(intPtr)
+        ret = None if intPtr==None else XlsGroupBoxShape(intPtr)
         return ret
 
 

spire/xls/collection/QueryTableCollection.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class QueryTableCollection (SpireObject) :
+class QueryTableCollection (CollectionBase['QueryTableXls'],SpireObject) :
     """
 
     """

spire/xls/collection/RangesCollection.py

@@ -388,7 +388,7 @@ class RangesCollection (  XlsRangesCollection) :
         GetDllLibXls().RangesCollection_get_EntireRow.argtypes=[c_void_p]
         GetDllLibXls().RangesCollection_get_EntireRow.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().RangesCollection_get_EntireRow, self.Ptr)
-        ret = None if intPtr==None else RangesCollection(intPtr)
+        ret = None if intPtr==None else XlsRangesCollection(intPtr)
         return ret
 
 
@@ -402,7 +402,7 @@ class RangesCollection (  XlsRangesCollection) :
         GetDllLibXls().RangesCollection_get_EntireColumn.argtypes=[c_void_p]
         GetDllLibXls().RangesCollection_get_EntireColumn.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().RangesCollection_get_EntireColumn, self.Ptr)
-        ret = None if intPtr==None else RangesCollection(intPtr)
+        ret = None if intPtr==None else XlsRangesCollection(intPtr)
         return ret
 
 
@@ -503,7 +503,7 @@ class RangesCollection (  XlsRangesCollection) :
         GetDllLibXls().RangesCollection_get_MergeArea.argtypes=[c_void_p]
         GetDllLibXls().RangesCollection_get_MergeArea.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().RangesCollection_get_MergeArea, self.Ptr)
-        ret = None if intPtr==None else RangesCollection(intPtr)
+        ret = None if intPtr==None else XlsRangesCollection(intPtr)
         return ret
 
 
@@ -546,6 +546,7 @@ class RangesCollection (  XlsRangesCollection) :
         """
 
         """
+        from spire.xls import Worksheet
         GetDllLibXls().RangesCollection_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().RangesCollection_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().RangesCollection_get_Worksheet, self.Ptr)

spire/xls/collection/ShapeCollectionBase.py

@@ -1,12 +1,12 @@
 from enum import Enum
 from plum import dispatch
-from typing import TypeVar,Union,Generic,List,Tuple
+from typing import TypeVar,Union,Generic,List,Tuple,Optional
 from spire.xls.common import *
 from spire.xls import *
 from ctypes import *
 import abc
 
-class ShapeCollectionBase (SpireObject) :
+class ShapeCollectionBase (CollectionBase[IShape],SpireObject) :
     """
 
     """
@@ -20,7 +20,7 @@ class ShapeCollectionBase (SpireObject) :
         GetDllLibXls().ShapeCollectionBase_get_Item.argtypes=[c_void_p ,c_int]
         GetDllLibXls().ShapeCollectionBase_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ShapeCollectionBase_get_Item, self.Ptr, index)
-        ret = None if intPtr==None else IShape(intPtr)
+        ret = None if intPtr==None else XlsShape(intPtr)
         return ret
 
 
@@ -34,7 +34,7 @@ class ShapeCollectionBase (SpireObject) :
         GetDllLibXls().ShapeCollectionBase_get_ItemS.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().ShapeCollectionBase_get_ItemS.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ShapeCollectionBase_get_ItemS, self.Ptr, strShapeName)
-        ret = None if intPtr==None else IShape(intPtr)
+        ret = None if intPtr==None else XlsShape(intPtr)
         return ret
 
 
@@ -58,7 +58,7 @@ class ShapeCollectionBase (SpireObject) :
 
     @dispatch
 
-    def AddCopy(self ,sourceShape:IShape)->IShape:
+    def AddCopy(self ,sourceShape:IShape)->Optional[IShape]:
         """
 
         """
@@ -67,7 +67,7 @@ class ShapeCollectionBase (SpireObject) :
         GetDllLibXls().ShapeCollectionBase_AddCopyS.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().ShapeCollectionBase_AddCopyS.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ShapeCollectionBase_AddCopyS, self.Ptr, intPtrsourceShape)
-        ret = None if intPtr==None else IShape(intPtr)
+        ret = None if intPtr==None else XlsShape(intPtr)
         return ret
 
 

spire/xls/collection/WorksheetsCollection.py

@@ -97,9 +97,9 @@ class WorksheetsCollection (  XlsWorksheetsCollection) :
             Worksheet: The created worksheet.
         """
         
-        GetDllLibXls().WorksheetsCollection_Create.argtypes=[c_void_p ,c_void_p]
-        GetDllLibXls().WorksheetsCollection_Create.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().WorksheetsCollection_Create, self.Ptr, name)
+        GetDllLibXls().WorksheetsCollection_CreateN.argtypes=[c_void_p ,c_void_p]
+        GetDllLibXls().WorksheetsCollection_CreateN.restype=c_void_p
+        intPtr = CallCFunction(GetDllLibXls().WorksheetsCollection_CreateN, self.Ptr, name)
         ret = None if intPtr==None else Worksheet(intPtr)
         return ret
 
@@ -113,9 +113,9 @@ class WorksheetsCollection (  XlsWorksheetsCollection) :
         Returns:
             Worksheet: The created worksheet.
         """
-        GetDllLibXls().WorksheetsCollection_Create1.argtypes=[c_void_p]
-        GetDllLibXls().WorksheetsCollection_Create1.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().WorksheetsCollection_Create1, self.Ptr)
+        GetDllLibXls().WorksheetsCollection_Create.argtypes=[c_void_p]
+        GetDllLibXls().WorksheetsCollection_Create.restype=c_void_p
+        intPtr = CallCFunction(GetDllLibXls().WorksheetsCollection_Create, self.Ptr)
         ret = None if intPtr==None else Worksheet(intPtr)
         return ret
 

spire/xls/collection/XlsBordersCollection.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class XlsBordersCollection (  CollectionBase[XlsBorder],IBorders) :
+class XlsBordersCollection (  CollectionBase[XlsBorder],IBorders,SpireObject) :
     """
 
     """
@@ -57,7 +57,7 @@ class XlsBordersCollection (  CollectionBase[XlsBorder],IBorders) :
         GetDllLibXls().XlsBordersCollection_get_Item.argtypes=[c_void_p ,c_int]
         GetDllLibXls().XlsBordersCollection_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsBordersCollection_get_Item, self.Ptr, enumindex)
-        ret = None if intPtr==None else IBorder(intPtr)
+        ret = None if intPtr==None else XlsBorder(intPtr)
         return ret
 
 

spire/xls/collection/XlsChartsCollection.py

@@ -15,11 +15,11 @@ class XlsChartsCollection (CollectionBase[IChart],  ICharts) :
         """
 
         """
-        
+        from spire.xls.charts.ChartSheet import ChartSheet
         GetDllLibXls().XlsChartsCollection_get_Item.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsChartsCollection_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartsCollection_get_Item, self.Ptr, name)
-        ret = None if intPtr==None else IChart(intPtr)
+        ret = None if intPtr==None else ChartSheet(intPtr)
         return ret
 
 
@@ -29,10 +29,11 @@ class XlsChartsCollection (CollectionBase[IChart],  ICharts) :
         """
 
         """
+        from spire.xls.charts.ChartSheet import ChartSheet
         GetDllLibXls().XlsChartsCollection_Add.argtypes=[c_void_p]
         GetDllLibXls().XlsChartsCollection_Add.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartsCollection_Add, self.Ptr)
-        ret = None if intPtr==None else IChart(intPtr)
+        ret = None if intPtr==None else ChartSheet(intPtr)
         return ret
 
 
@@ -42,11 +43,11 @@ class XlsChartsCollection (CollectionBase[IChart],  ICharts) :
         """
 
         """
-        
+        from spire.xls.charts.ChartSheet import ChartSheet
         GetDllLibXls().XlsChartsCollection_AddN.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsChartsCollection_AddN.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartsCollection_AddN, self.Ptr, name)
-        ret = None if intPtr==None else IChart(intPtr)
+        ret = None if intPtr==None else ChartSheet(intPtr)
         return ret
 
 
@@ -55,11 +56,11 @@ class XlsChartsCollection (CollectionBase[IChart],  ICharts) :
         """
 
         """
-        
+        from spire.xls.charts.ChartSheet import ChartSheet
         GetDllLibXls().XlsChartsCollection_Remove.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsChartsCollection_Remove.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartsCollection_Remove, self.Ptr, name)
-        ret = None if intPtr==None else IChart(intPtr)
+        ret = None if intPtr==None else ChartSheet(intPtr)
         return ret
 
 
@@ -78,12 +79,13 @@ class XlsChartsCollection (CollectionBase[IChart],  ICharts) :
         """
 
         """
+        from spire.xls.charts.ChartSheet import ChartSheet
         intPtrchartToAdd:c_void_p = chartToAdd.Ptr
 
         GetDllLibXls().XlsChartsCollection_AddC.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsChartsCollection_AddC.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartsCollection_AddC, self.Ptr, intPtrchartToAdd)
-        ret = None if intPtr==None else IChart(intPtr)
+        ret = None if intPtr==None else ChartSheet(intPtr)
         return ret
 
 

spire/xls/collection/XlsDataValidationCollection.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class XlsDataValidationCollection (  IDataValidationCollection) :
+class XlsDataValidationCollection (CollectionBase[IDataValidationTable],  IDataValidationCollection) :
     """
 
     """
@@ -19,7 +19,7 @@ class XlsDataValidationCollection (  IDataValidationCollection) :
         GetDllLibXls().XlsDataValidationCollection_get_ParentTable.argtypes=[c_void_p]
         GetDllLibXls().XlsDataValidationCollection_get_ParentTable.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsDataValidationCollection_get_ParentTable, self.Ptr)
-        ret = None if intPtr==None else IDataValidationTable(intPtr)
+        ret = None if intPtr==None else XlsDataValidationTable(intPtr)
         return ret
 
 
@@ -29,6 +29,7 @@ class XlsDataValidationCollection (  IDataValidationCollection) :
         """
 
         """
+        from spire.xls.Workbook import Workbook
         GetDllLibXls().XlsDataValidationCollection_get_Workbook.argtypes=[c_void_p]
         GetDllLibXls().XlsDataValidationCollection_get_Workbook.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsDataValidationCollection_get_Workbook, self.Ptr)
@@ -42,6 +43,7 @@ class XlsDataValidationCollection (  IDataValidationCollection) :
         """
 
         """
+        from spire.xls.Worksheet import Worksheet
         GetDllLibXls().XlsDataValidationCollection_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().XlsDataValidationCollection_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsDataValidationCollection_get_Worksheet, self.Ptr)

spire/xls/collection/XlsFontsCollection.py

@@ -4,9 +4,10 @@ from typing import TypeVar,Union,Generic,List,Tuple
 from spire.xls.common import *
 from spire.xls import *
 from ctypes import *
+from spire.xls.XlsFont import XlsFont
 import abc
 
-class XlsFontsCollection (SpireObject) :
+class XlsFontsCollection (CollectionBase[XlsFont],SpireObject) :
     """
 
     """

spire/xls/collection/XlsRangesCollection.py

@@ -73,10 +73,11 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         Returns:
             ICommentShape: The added comment shape.
         """
+        from spire.xls.CommentsRange import CommentsRange
         GetDllLibXls().XlsRangesCollection_AddComment.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_AddComment.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_AddComment, self.Ptr)
-        ret = None if intPtr==None else XlsComment(intPtr)
+        ret = None if intPtr==None else CommentsRange(intPtr)
         return ret
 
 
@@ -296,7 +297,7 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         GetDllLibXls().XlsRangesCollection_GetRectangles.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_GetRectangles.restype=IntPtrArray
         intPtrArray = CallCFunction(GetDllLibXls().XlsRangesCollection_GetRectangles, self.Ptr)
-        ret = GetVectorFromArray(intPtrArray, Rectangle)
+        ret = GetObjVectorFromArray(intPtrArray, Rectangle)
         return ret
 
 
@@ -364,7 +365,7 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         GetDllLibXls().XlsRangesCollection_GetEnumerator.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_GetEnumerator.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_GetEnumerator, self.Ptr)
-        ret = None if intPtr==None else IEnumerator(intPtr)
+        ret = None if intPtr==None else EnumeratorXlsRange(intPtr)
         return ret
 
 
@@ -461,10 +462,11 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         """
 
         """
+        from spire.xls.collection.BordersCollectionArrayWrapper import BordersCollectionArrayWrapper
         GetDllLibXls().XlsRangesCollection_get_Borders.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_get_Borders.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_get_Borders, self.Ptr)
-        ret = None if intPtr==None else XlsBordersCollection(intPtr)
+        ret = None if intPtr==None else BordersCollectionArrayWrapper(intPtr)
         return ret
 
 
@@ -882,10 +884,11 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         Returns hyperlinks for this ranges collection.
 
         """
+        from spire.xls.collection.HyperLinksCollection import HyperLinksCollection
         GetDllLibXls().XlsRangesCollection_get_Hyperlinks.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_get_Hyperlinks.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_get_Hyperlinks, self.Ptr)
-        ret = None if intPtr==None else IHyperLinks(intPtr)
+        ret = None if intPtr==None else HyperLinksCollection(intPtr)
         return ret
 
 
@@ -1083,10 +1086,11 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         """
 
         """
+        from spire.xls.StyleArrayWrapper import StyleArrayWrapper
         GetDllLibXls().XlsRangesCollection_get_Style.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_get_Style.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_get_Style, self.Ptr)
-        ret = None if intPtr==None else CellStyle(intPtr)
+        ret = None if intPtr==None else StyleArrayWrapper(intPtr)
         return ret
 
 
@@ -1205,6 +1209,7 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         """
 
         """
+        from spire.xls.XlsWorksheet import XlsWorksheet
         GetDllLibXls().XlsRangesCollection_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_get_Worksheet, self.Ptr)
@@ -1424,10 +1429,11 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         """
 
         """
+        from spire.xls.CommentsRange import CommentsRange
         GetDllLibXls().XlsRangesCollection_get_Comment.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_get_Comment.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_get_Comment, self.Ptr)
-        ret = None if intPtr==None else XlsComment(intPtr)
+        ret = None if intPtr==None else CommentsRange(intPtr)
         return ret
 
 
@@ -1437,10 +1443,11 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         """
 
         """
+        from spire.xls.RTFStringArray import RTFStringArray
         GetDllLibXls().XlsRangesCollection_get_RichText.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_get_RichText.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_get_RichText, self.Ptr)
-        ret = None if intPtr==None else RichTextObject(intPtr)
+        ret = None if intPtr==None else RTFStringArray(intPtr)
         return ret
 
 
@@ -1463,7 +1470,7 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         GetDllLibXls().XlsRangesCollection_get_MergeArea.argtypes=[c_void_p]
         GetDllLibXls().XlsRangesCollection_get_MergeArea.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsRangesCollection_get_MergeArea, self.Ptr)
-        ret = None if intPtr==None else XlsRange(intPtr)
+        ret = None if intPtr==None else XlsRangesCollection(intPtr)
         return ret
 
 
@@ -1631,4 +1638,4 @@ class XlsRangesCollection (  CollectionBase[XlsRange], IXLSRanges, ICombinedRang
         """
         Clears the contents of the range.
         """
-        GetObjIntPtr(self.Ptr, "ClearContents", "");
+        raise NotImplementedError()

spire/xls/collection/XlsStylesCollection.py

@@ -43,11 +43,11 @@ class XlsStylesCollection (  CollectionBase[CellStyleObject], IStyles) :
         """
 
         """
-        
+        from spire.xls.XlsStyle import XlsStyle
         GetDllLibXls().XlsStylesCollection_get_Item.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsStylesCollection_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsStylesCollection_get_Item, self.Ptr, name)
-        ret = None if intPtr==None else CellStyle(intPtr)
+        ret = None if intPtr==None else XlsStyle(intPtr)
         return ret
 
 

spire/xls/collection/XlsWorkbookObjectsCollection.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class XlsWorkbookObjectsCollection (  ITabSheets) :
+class XlsWorkbookObjectsCollection (  ITabSheets,SpireObject) :
     """
 
     """
@@ -16,10 +16,11 @@ class XlsWorkbookObjectsCollection (  ITabSheets) :
         """
 
         """
+        from spire.xls.XlsWorkbook import XlsWorkbook
         GetDllLibXls().XlsWorkbookObjectsCollection_get_Workbook.argtypes=[c_void_p]
         GetDllLibXls().XlsWorkbookObjectsCollection_get_Workbook.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorkbookObjectsCollection_get_Workbook, self.Ptr)
-        ret = None if intPtr==None else IWorkbook(intPtr)
+        ret = None if intPtr==None else XlsWorkbook(intPtr)
         return ret
 
 
@@ -39,11 +40,11 @@ class XlsWorkbookObjectsCollection (  ITabSheets) :
         """
 
         """
-        
+        from spire.xls.XlsWorksheetBase import XlsWorksheetBase
         GetDllLibXls().XlsWorkbookObjectsCollection_get_Item.argtypes=[c_void_p ,c_int]
         GetDllLibXls().XlsWorkbookObjectsCollection_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorkbookObjectsCollection_get_Item, self.Ptr, index)
-        ret = None if intPtr==None else ITabSheet(intPtr)
+        ret = None if intPtr==None else XlsWorksheetBase(intPtr)
         return ret
 
 

spire/xls/collection/pivot_table/XlsPivotCachesCollection.py

@@ -16,6 +16,7 @@ class XlsPivotCachesCollection (  CollectionBase[XlsPivotCache], IPivotCaches) :
         """
 
         """
+        from spire.xls.XlsWorkbook import XlsWorkbook
         GetDllLibXls().XlsPivotCachesCollection_get_Parent.argtypes=[c_void_p]
         GetDllLibXls().XlsPivotCachesCollection_get_Parent.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsPivotCachesCollection_get_Parent, self.Ptr)

spire/xls/collection/pivot_table/XlsPivotTablesCollection.py

@@ -106,6 +106,7 @@ class XlsPivotTablesCollection (CollectionBase[XlsPivotTable],IPivotTables) :
         """
 
         """
+        from spire.xls.XlsWorksheetBase import XlsWorksheetBase
         GetDllLibXls().XlsPivotTablesCollection_get_ParentWorksheet.argtypes=[c_void_p]
         GetDllLibXls().XlsPivotTablesCollection_get_ParentWorksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsPivotTablesCollection_get_ParentWorksheet, self.Ptr)

spire/xls/conditional_formatting/ConditionalFormatWrapper.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from plum import dispatch
-from typing import TypeVar,Union,Generic,List,Tuple
+from typing import TypeVar,Union,Generic,List,Tuple,Optional
 from spire.xls.common import *
 from spire.xls import *
 from ctypes import *
@@ -965,7 +965,7 @@ class ConditionalFormatWrapper (  CommonWrapper, IOptimizedUpdate, IConditionalF
         CallCFunction(GetDllLibXls().ConditionalFormatWrapper_EndUpdate, self.Ptr)
 
     @dispatch
-    def MakeFormula(self)->str:
+    def MakeFormula(self)->Optional[str]:
         """
         Generates the formula for the conditional format.
 

spire/xls/conditional_formatting/XlsConditionalFormat.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from plum import dispatch
-from typing import TypeVar,Union,Generic,List,Tuple
+from typing import TypeVar,Union,Generic,List,Tuple,Optional
 from spire.xls.common import *
 from spire.xls import *
 from ctypes import *
@@ -133,6 +133,7 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         GetDllLibXls().XlsConditionalFormat_get_OColor.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_OColor.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_OColor, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
@@ -147,6 +148,7 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         GetDllLibXls().XlsConditionalFormat_get_BackColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_BackColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_BackColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
@@ -161,6 +163,7 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         GetDllLibXls().XlsConditionalFormat_get_TopBorderColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_TopBorderColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_TopBorderColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
@@ -175,6 +178,7 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         GetDllLibXls().XlsConditionalFormat_get_BottomBorderColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_BottomBorderColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_BottomBorderColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
@@ -189,6 +193,7 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         GetDllLibXls().XlsConditionalFormat_get_LeftBorderColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_LeftBorderColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_LeftBorderColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
@@ -203,6 +208,7 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         GetDllLibXls().XlsConditionalFormat_get_RightBorderColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_RightBorderColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_RightBorderColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
@@ -217,13 +223,14 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         GetDllLibXls().XlsConditionalFormat_get_FontColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_FontColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_FontColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
 
     @dispatch
 
-    def MakeFormula(self)->str:
+    def MakeFormula(self)->Optional[str]:
         """Creates a formula string for the conditional format without parameters.
         
         Returns:
@@ -374,6 +381,7 @@ class XlsConditionalFormat (  XlsObject, IConditionalFormat, ICloneParent) :
         """
 
         """
+        from spire.xls.TopBottom import TopBottom
         GetDllLibXls().XlsConditionalFormat_get_TopBottom.argtypes=[c_void_p]
         GetDllLibXls().XlsConditionalFormat_get_TopBottom.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormat_get_TopBottom, self.Ptr)