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

spire/xls/charts/XlsChartShape.py

@@ -249,7 +249,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_AddShapeInChart.argtypes=[c_void_p ,c_int,c_int,c_int,c_int,c_int,c_int]
         GetDllLibXls().XlsChartShape_AddShapeInChart.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_AddShapeInChart, self.Ptr, enumtype,enumplacement,left,top,height,width)
-        ret = None if intPtr==None else IShape(intPtr)
+        ret = None if intPtr==None else XlsShape(intPtr)
         return ret
 
 
@@ -352,7 +352,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_PageSetup.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_PageSetup.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_PageSetup, self.Ptr)
-        ret = None if intPtr==None else IChartPageSetup(intPtr)
+        ret = None if intPtr==None else ChartPageSetup(intPtr)
         return ret
 
 
@@ -404,7 +404,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_PrimaryCategoryAxis.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_PrimaryCategoryAxis.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_PrimaryCategoryAxis, self.Ptr)
-        ret = None if intPtr==None else IChartCategoryAxis(intPtr)
+        ret = None if intPtr==None else ChartCategoryAxis(intPtr)
         return ret
 
 
@@ -420,7 +420,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_PrimaryValueAxis.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_PrimaryValueAxis.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_PrimaryValueAxis, self.Ptr)
-        ret = None if intPtr==None else IChartValueAxis(intPtr)
+        ret = None if intPtr==None else ChartValueAxis(intPtr)
         return ret
 
 
@@ -436,7 +436,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_PrimarySerieAxis.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_PrimarySerieAxis.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_PrimarySerieAxis, self.Ptr)
-        ret = None if intPtr==None else IChartSeriesAxis(intPtr)
+        ret = None if intPtr==None else ChartSeriesAxis(intPtr)
         return ret
 
 
@@ -452,7 +452,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_SecondaryCategoryAxis.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_SecondaryCategoryAxis.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_SecondaryCategoryAxis, self.Ptr)
-        ret = None if intPtr==None else IChartCategoryAxis(intPtr)
+        ret = None if intPtr==None else ChartCategoryAxis(intPtr)
         return ret
 
 
@@ -468,7 +468,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_SecondaryValueAxis.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_SecondaryValueAxis.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_SecondaryValueAxis, self.Ptr)
-        ret = None if intPtr==None else IChartValueAxis(intPtr)
+        ret = None if intPtr==None else ChartValueAxis(intPtr)
         return ret
 
 
@@ -500,7 +500,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_PlotArea.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_PlotArea.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_PlotArea, self.Ptr)
-        ret = None if intPtr==None else XlsChartFrameFormat(intPtr)
+        ret = None if intPtr==None else XlsChartPlotArea(intPtr)
         return ret
 
 
@@ -516,7 +516,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_Walls.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_Walls.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_Walls, self.Ptr)
-        ret = None if intPtr==None else IChartWallOrFloor(intPtr)
+        ret = None if intPtr==None else XlsChartWallOrFloor(intPtr)
         return ret
 
 
@@ -543,7 +543,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_Floor.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_Floor.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_Floor, self.Ptr)
-        ret = None if intPtr==None else IChartWallOrFloor(intPtr)
+        ret = None if intPtr==None else XlsChartWallOrFloor(intPtr)
         return ret
 
 
@@ -559,7 +559,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_DataTable.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_DataTable.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_DataTable, self.Ptr)
-        ret = None if intPtr==None else IChartDataTable(intPtr)
+        ret = None if intPtr==None else ChartDataTable(intPtr)
         return ret
 
 
@@ -661,7 +661,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_Legend.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_Legend.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_Legend, self.Ptr)
-        ret = None if intPtr==None else IChartLegend(intPtr)
+        ret = None if intPtr==None else ChartLegend(intPtr)
         return ret
 
 
@@ -1216,7 +1216,7 @@ class XlsChartShape (  XlsShape, IChartShape) :
         GetDllLibXls().XlsChartShape_get_ChartTitleArea.argtypes=[c_void_p]
         GetDllLibXls().XlsChartShape_get_ChartTitleArea.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartShape_get_ChartTitleArea, self.Ptr)
-        ret = None if intPtr==None else IChartTextArea(intPtr)
+        ret = None if intPtr==None else XlsChartTitleArea(intPtr)
         return ret
 
 

spire/xls/charts/XlsChartTitleArea.py

@@ -304,6 +304,7 @@ class XlsChartTitleArea (  XlsObject, IChartTextArea, IFont, IOptimizedUpdate) :
         Returns:
             IChartFrameFormat: The frame format of the chart title area.
         """
+        from spire.xls.charts.XlsChartFrameFormat import XlsChartFrameFormat
         GetDllLibXls().XlsChartTitleArea_get_FrameFormat.argtypes=[c_void_p]
         GetDllLibXls().XlsChartTitleArea_get_FrameFormat.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartTitleArea_get_FrameFormat, self.Ptr)
@@ -376,6 +377,7 @@ class XlsChartTitleArea (  XlsObject, IChartTextArea, IFont, IOptimizedUpdate) :
         Returns:
             XlsFont: The font of the chart title area.
         """
+        from spire.xls.XlsFont import XlsFont
         GetDllLibXls().XlsChartTitleArea_get_Font.argtypes=[c_void_p]
         GetDllLibXls().XlsChartTitleArea_get_Font.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartTitleArea_get_Font, self.Ptr)

spire/xls/charts/XlsChartWallOrFloor.py

@@ -19,6 +19,7 @@ class XlsChartWallOrFloor (  XlsObject, IChartWallOrFloor, IChartFillBorder) :
         Returns:
             ChartBorder: The border of the chart wall or floor.
         """
+        from spire.xls.charts.ChartBorder import ChartBorder
         GetDllLibXls().XlsChartWallOrFloor_get_Border.argtypes=[c_void_p]
         GetDllLibXls().XlsChartWallOrFloor_get_Border.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartWallOrFloor_get_Border, self.Ptr)
@@ -87,6 +88,7 @@ class XlsChartWallOrFloor (  XlsObject, IChartWallOrFloor, IChartFillBorder) :
         Returns:
             ChartBorder: The line properties of the chart wall or floor.
         """
+        from spire.xls.charts.ChartBorder import ChartBorder
         GetDllLibXls().XlsChartWallOrFloor_get_LineProperties.argtypes=[c_void_p]
         GetDllLibXls().XlsChartWallOrFloor_get_LineProperties.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartWallOrFloor_get_LineProperties, self.Ptr)
@@ -103,10 +105,11 @@ class XlsChartWallOrFloor (  XlsObject, IChartWallOrFloor, IChartFillBorder) :
         Returns:
             IChartInterior: The interior of the chart wall or floor.
         """
+        from spire.xls.charts.ChartInterior import ChartInterior
         GetDllLibXls().XlsChartWallOrFloor_get_Interior.argtypes=[c_void_p]
         GetDllLibXls().XlsChartWallOrFloor_get_Interior.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartWallOrFloor_get_Interior, self.Ptr)
-        ret = None if intPtr==None else IChartInterior(intPtr)
+        ret = None if intPtr==None else ChartInterior(intPtr)
         return ret
 
 
@@ -135,6 +138,7 @@ class XlsChartWallOrFloor (  XlsObject, IChartWallOrFloor, IChartFillBorder) :
         Returns:
             Format3D: The 3D format of the chart wall or floor.
         """
+        from spire.xls.Format3D import Format3D
         GetDllLibXls().XlsChartWallOrFloor_get_Format3D.argtypes=[c_void_p]
         GetDllLibXls().XlsChartWallOrFloor_get_Format3D.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartWallOrFloor_get_Format3D, self.Ptr)
@@ -181,7 +185,7 @@ class XlsChartWallOrFloor (  XlsObject, IChartWallOrFloor, IChartFillBorder) :
         GetDllLibXls().XlsChartWallOrFloor_Clone.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsChartWallOrFloor_Clone.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartWallOrFloor_Clone, self.Ptr, intPtrparent)
-        ret = None if intPtr==None else SpireObject(intPtr)
+        ret = None if intPtr==None else XlsChartWallOrFloor(intPtr)
         return ret
 
 
@@ -239,6 +243,7 @@ class XlsChartWallOrFloor (  XlsObject, IChartWallOrFloor, IChartFillBorder) :
         GetDllLibXls().XlsChartWallOrFloor_get_ForeGroundColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsChartWallOrFloor_get_ForeGroundColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartWallOrFloor_get_ForeGroundColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 
@@ -293,6 +298,7 @@ class XlsChartWallOrFloor (  XlsObject, IChartWallOrFloor, IChartFillBorder) :
         GetDllLibXls().XlsChartWallOrFloor_get_BackGroundColorObject.argtypes=[c_void_p]
         GetDllLibXls().XlsChartWallOrFloor_get_BackGroundColorObject.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartWallOrFloor_get_BackGroundColorObject, self.Ptr)
+        from spire.xls.OColor import OColor
         ret = None if intPtr==None else OColor(intPtr)
         return ret
 

spire/xls/collection/ArcShapeCollection.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class ArcShapeCollection (  IArcShapes) :
+class ArcShapeCollection (CollectionBase[XlsArcShape],  IArcShapes) :
     """
     Represents a collection of arc shapes in a worksheet.
     """

spire/xls/collection/AutoFiltersCollection.py

@@ -18,6 +18,7 @@ class AutoFiltersCollection (  XlsAutoFiltersCollection) :
         Returns:
             Worksheet: The parent worksheet.
         """
+        from spire.xls.Worksheet import Worksheet
         GetDllLibXls().AutoFiltersCollection_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().AutoFiltersCollection_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().AutoFiltersCollection_get_Worksheet, self.Ptr)

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/XlsChartFormatCollection.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 XlsChartFormatCollection (  ICloneParent) :
+class XlsChartFormatCollection (CollectionBase[XlsChartFormat],  ICloneParent) :
     """
 
     """
@@ -46,7 +46,7 @@ class XlsChartFormatCollection (  ICloneParent) :
 
     @dispatch
 
-    def Add(self ,format:XlsChartFormat)->XlsChartFormat:
+    def Add(self ,format:XlsChartFormat)->Optional[XlsChartFormat]:
         """
 
         """
@@ -61,7 +61,7 @@ class XlsChartFormatCollection (  ICloneParent) :
 
     @dispatch
 
-    def Add(self ,format:XlsChartFormat,bCanReplace:bool)->XlsChartFormat:
+    def Add(self ,format:XlsChartFormat,bCanReplace:bool)->Optional[XlsChartFormat]:
         """
 
         """

spire/xls/collection/XlsChartSeries.py

@@ -43,16 +43,16 @@ class XlsChartSeries (  CollectionBase[XlsChartSerie],ICloneParent, IChartSeries
 
     @dispatch
 
-    def Clone(self ,parent:SpireObject)->SpireObject:
+    def Clone(self ,parent:SpireObject)->'XlsChartSeries':
         """
-
+        parent : ChartSheet or Chart
         """
         intPtrparent:c_void_p = parent.Ptr
 
         GetDllLibXls().XlsChartSeries_Clone.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsChartSeries_Clone.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsChartSeries_Clone, self.Ptr, intPtrparent)
-        ret = None if intPtr==None else SpireObject(intPtr)
+        ret = None if intPtr==None else XlsChartSeries(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) :
     """
 
     """