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

spire/xls/XlsWorksheet.py

@@ -158,7 +158,7 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
 
     @dispatch
 
-    def Subtotal(self ,range:IXLSRange,groupByIndex:int,totalFields:List[int],subtotalType:SubtotalTypes):
+    def Subtotal(self ,cellRange:IXLSRange,groupByIndex:int,totalFields:List[int],subtotalType:SubtotalTypes):
         """Creates subtotals for the specified range.
         
         This method creates subtotals for the specified range using the given grouping field,
@@ -171,7 +171,7 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
                 to which the subtotals are added.
             subtotalType (SubtotalTypes): The type of subtotal to calculate (e.g., sum, average, count).
         """
-        intPtrrange:c_void_p = range.Ptr
+        intPtrrange:c_void_p = cellRange.Ptr
         #arraytotalFields:ArrayTypetotalFields = ""
         counttotalFields = len(totalFields)
         ArrayTypetotalFields = c_int * counttotalFields
@@ -266,7 +266,7 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_GetDefaultRowStyle.argtypes=[c_void_p ,c_int]
         GetDllLibXls().XlsWorksheet_GetDefaultRowStyle.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetDefaultRowStyle, self.Ptr, rowIndex)
-        ret = None if intPtr==None else CellStyle(intPtr)
+        ret = None if intPtr==None else AddtionalFormatWrapper(intPtr)
         return ret
 
 
@@ -933,51 +933,51 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_ReplaceONI11.argtypes=[c_void_p ,c_void_p,ArrayTypenewValues,c_int,c_bool]
         CallCFunction(GetDllLibXls().XlsWorksheet_ReplaceONI11, self.Ptr, oldValue,arraynewValues,countnewValues,isVertical)
 
-    @dispatch
+    # @dispatch
 
-    def SaveToImage(self ,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int)->Stream:
-        """
+    # def SaveToImage(self ,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int)->Stream:
+    #     """
 
-        """
+    #     """
         
-        GetDllLibXls().XlsWorksheet_SaveToImage.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
-        GetDllLibXls().XlsWorksheet_SaveToImage.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImage, self.Ptr, firstRow,firstColumn,lastRow,lastColumn)
-        ret = None if intPtr==None else Stream(intPtr)
-        return ret
+    #     GetDllLibXls().XlsWorksheet_SaveToImage.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
+    #     GetDllLibXls().XlsWorksheet_SaveToImage.restype=c_void_p
+    #     intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImage, self.Ptr, firstRow,firstColumn,lastRow,lastColumn)
+    #     ret = None if intPtr==None else Stream(intPtr)
+    #     return ret
 
 
-    @dispatch
+    # @dispatch
 
-    def SaveToImage(self ,fileName:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int):
-        """
-        Save worksheet to image.
+    # def SaveToImage(self ,fileName:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int):
+    #     """
+    #     Save worksheet to image.
 
-        Args:
-            fileName: file Name
-            firstRow: 
-            firstColumn: 
-            lastRow: 
-            lastColumn: 
+    #     Args:
+    #         fileName: file Name
+    #         firstRow: 
+    #         firstColumn: 
+    #         lastRow: 
+    #         lastColumn: 
 
-        """
+    #     """
         
-        GetDllLibXls().XlsWorksheet_SaveToImageFFFLL.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int]
-        CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageFFFLL, self.Ptr, fileName,firstRow,firstColumn,lastRow,lastColumn)
+    #     GetDllLibXls().XlsWorksheet_SaveToImageFFFLL.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int]
+    #     CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageFFFLL, self.Ptr, fileName,firstRow,firstColumn,lastRow,lastColumn)
 
-    @dispatch
+    # @dispatch
 
-    def SaveToImage(self ,fileName:str):
-        """
-        Save worksheet to image.
+    # def SaveToImage(self ,fileName:str):
+    #     """
+    #     Save worksheet to image.
 
-        Args:
-            fileName: file Name
+    #     Args:
+    #         fileName: file Name
 
-        """
+    #     """
         
-        GetDllLibXls().XlsWorksheet_SaveToImageF.argtypes=[c_void_p ,c_void_p]
-        CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageF, self.Ptr, fileName)
+    #     GetDllLibXls().XlsWorksheet_SaveToImageF.argtypes=[c_void_p ,c_void_p]
+    #     CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageF, self.Ptr, fileName)
 
 #    @dispatch
 
@@ -1009,6 +1009,24 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         ret = None if intPtr==None else Stream(intPtr)
         return ret
 
+    def ToEMFStream(self ,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int)->'Stream':
+        """
+        Save worksheet to emf image.
+
+        Args:
+            firstRow: One-based index of the first row to convert.
+            firstColumn: One-based index of the first column to convert.
+            lastRow: One-based index of the last row to convert.
+            lastColumn: One-based index of the last column to convert.
+
+        """
+        
+        GetDllLibXls().XlsWorksheet_ToEMFStream.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
+        GetDllLibXls().XlsWorksheet_ToEMFStream.restype=c_void_p
+        intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_ToEMFStream, self.Ptr, firstRow,firstColumn,lastRow,lastColumn)
+        ret = None if intPtr==None else Stream(intPtr)
+        return ret
+
 
     @dispatch
 
@@ -1108,14 +1126,14 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
 
 
 
-    def SaveToEMFImage(self ,FilePath:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int,emfType:'EmfType'):
-        """
+    # def SaveToEMFImage(self ,FilePath:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int,emfType:'EmfType'):
+    #     """
 
-        """
-        enumemfType:c_int = emfType.value
+    #     """
+    #     enumemfType:c_int = emfType.value
 
-        GetDllLibXls().XlsWorksheet_SaveToEMFImage.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int,c_int]
-        CallCFunction(GetDllLibXls().XlsWorksheet_SaveToEMFImage, self.Ptr, FilePath,firstRow,firstColumn,lastRow,lastColumn,enumemfType)
+    #     GetDllLibXls().XlsWorksheet_SaveToEMFImage.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int,c_int]
+    #     CallCFunction(GetDllLibXls().XlsWorksheet_SaveToEMFImage, self.Ptr, FilePath,firstRow,firstColumn,lastRow,lastColumn,enumemfType)
 
     @dispatch
 
@@ -1858,7 +1876,7 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_get_HPageBreaks.argtypes=[c_void_p]
         GetDllLibXls().XlsWorksheet_get_HPageBreaks.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_HPageBreaks, self.Ptr)
-        ret = None if intPtr==None else IHPageBreaks(intPtr)
+        ret = None if intPtr==None else HPageBreaksCollection(intPtr)
         return ret
 
 
@@ -1871,7 +1889,7 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_get_HyperLinks.argtypes=[c_void_p]
         GetDllLibXls().XlsWorksheet_get_HyperLinks.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_HyperLinks, self.Ptr)
-        ret = None if intPtr==None else IHyperLinks(intPtr)
+        ret = None if intPtr==None else HyperLinksCollection(intPtr)
         return ret
 
 
@@ -2084,14 +2102,13 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
 
 
 
-    def SetCaculateValue(self ,value:'SpireObject',row:int,col:int):
+    def SetCaculateValue(self ,value:str,row:int,col:int):
         """
 
         """
-        intPtrvalue:c_void_p = value.Ptr
 
-        GetDllLibXls().XlsWorksheet_SetCaculateValue.argtypes=[c_void_p ,c_void_p,c_int,c_int]
-        CallCFunction(GetDllLibXls().XlsWorksheet_SetCaculateValue, self.Ptr, intPtrvalue,row,col)
+        GetDllLibXls().XlsWorksheet_SetCaculateValue.argtypes=[c_void_p ,c_wchar_p,c_int,c_int]
+        CallCFunction(GetDllLibXls().XlsWorksheet_SetCaculateValue, self.Ptr, value,row,col)
 
 #    @dispatch
 #
@@ -3176,24 +3193,24 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
 #
 
 
-    @dispatch
+    # @dispatch
 
-    def GetStringValue(self ,cellIndex:int)->str:
-        """
-        Returns string value corresponding to the cell.
+    # def GetStringValue(self ,cellIndex:int)->str:
+    #     """
+    #     Returns string value corresponding to the cell.
 
-        Args:
-            iCellIndex: Cell index to get value from.
+    #     Args:
+    #         iCellIndex: Cell index to get value from.
 
-        Returns:
-            String contained by the cell.
+    #     Returns:
+    #         String contained by the cell.
 
-        """
+    #     """
         
-        GetDllLibXls().XlsWorksheet_GetStringValue.argtypes=[c_void_p ,c_long]
-        GetDllLibXls().XlsWorksheet_GetStringValue.restype=c_void_p
-        ret = PtrToStr(CallCFunction(GetDllLibXls().XlsWorksheet_GetStringValue, self.Ptr, cellIndex))
-        return ret
+    #     GetDllLibXls().XlsWorksheet_GetStringValue.argtypes=[c_void_p ,c_long]
+    #     GetDllLibXls().XlsWorksheet_GetStringValue.restype=c_void_p
+    #     ret = PtrToStr(CallCFunction(GetDllLibXls().XlsWorksheet_GetStringValue, self.Ptr, cellIndex))
+    #     return ret
 
 
     @dispatch
@@ -3217,25 +3234,25 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         return ret
 
 
-    @dispatch
+    # @dispatch
 
-    def GetTextObject(self ,cellIndex:int)->SpireObject:
-        """
-        Returns TextWithFormat object corresponding to the specified cell.
+    # def GetTextObject(self ,cellIndex:int)->SpireObject:
+    #     """
+    #     Returns TextWithFormat object corresponding to the specified cell.
 
-        Args:
-            cellIndex: Cell index.
+    #     Args:
+    #         cellIndex: Cell index.
 
-        Returns:
-            Object corresponding to the specified cell.
+    #     Returns:
+    #         Object corresponding to the specified cell.
 
-        """
+    #     """
         
-        GetDllLibXls().XlsWorksheet_GetTextObject.argtypes=[c_void_p ,c_long]
-        GetDllLibXls().XlsWorksheet_GetTextObject.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObject, self.Ptr, cellIndex)
-        ret = None if intPtr==None else SpireObject(intPtr)
-        return ret
+    #     GetDllLibXls().XlsWorksheet_GetTextObject.argtypes=[c_void_p ,c_long]
+    #     GetDllLibXls().XlsWorksheet_GetTextObject.restype=c_void_p
+    #     intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObject, self.Ptr, cellIndex)
+    #     ret = None if intPtr==None else SpireObject(intPtr)
+    #     return ret
 
 
     @dispatch
@@ -3255,25 +3272,23 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         
         GetDllLibXls().XlsWorksheet_GetTextObjectRC.argtypes=[c_void_p ,c_int,c_int]
         GetDllLibXls().XlsWorksheet_GetTextObjectRC.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObjectRC, self.Ptr, row,column)
-        ret = None if intPtr==None else SpireObject(intPtr)
-        return ret
+        return PtrToStr(CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObjectRC, self.Ptr, row,column))
 
 
 
-    def HasArrayFormula(self ,cellIndex:int)->bool:
-        """
-        Indicates whether cell contains array-entered formula.
+    # def HasArrayFormula(self ,cellIndex:int)->bool:
+    #     """
+    #     Indicates whether cell contains array-entered formula.
 
-        Args:
-            cellIndex: cell index.
+    #     Args:
+    #         cellIndex: cell index.
 
-        """
+    #     """
         
-        GetDllLibXls().XlsWorksheet_HasArrayFormula.argtypes=[c_void_p ,c_long]
-        GetDllLibXls().XlsWorksheet_HasArrayFormula.restype=c_bool
-        ret = CallCFunction(GetDllLibXls().XlsWorksheet_HasArrayFormula, self.Ptr, cellIndex)
-        return ret
+    #     GetDllLibXls().XlsWorksheet_HasArrayFormula.argtypes=[c_void_p ,c_long]
+    #     GetDllLibXls().XlsWorksheet_HasArrayFormula.restype=c_bool
+    #     ret = CallCFunction(GetDllLibXls().XlsWorksheet_HasArrayFormula, self.Ptr, cellIndex)
+    #     return ret
 
 
     def HasArrayFormulaRecord(self ,row:int,column:int)->bool:
@@ -3339,17 +3354,17 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_InsertCutRange.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int]
         CallCFunction(GetDllLibXls().XlsWorksheet_InsertCutRange, self.Ptr, intPtrcutRange,rowIndex,colIndex,enummoveOptions)
 
-    @dispatch
+    # @dispatch
 
-    def IsArrayFormula(self ,cellIndex:int)->bool:
-        """
+    # def IsArrayFormula(self ,cellIndex:int)->bool:
+    #     """
 
-        """
+    #     """
         
-        GetDllLibXls().XlsWorksheet_IsArrayFormula.argtypes=[c_void_p ,c_long]
-        GetDllLibXls().XlsWorksheet_IsArrayFormula.restype=c_bool
-        ret = CallCFunction(GetDllLibXls().XlsWorksheet_IsArrayFormula, self.Ptr, cellIndex)
-        return ret
+    #     GetDllLibXls().XlsWorksheet_IsArrayFormula.argtypes=[c_void_p ,c_long]
+    #     GetDllLibXls().XlsWorksheet_IsArrayFormula.restype=c_bool
+    #     ret = CallCFunction(GetDllLibXls().XlsWorksheet_IsArrayFormula, self.Ptr, cellIndex)
+    #     return ret
 
     @dispatch
 
@@ -3643,29 +3658,29 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_GetDefaultColumnStyle.argtypes=[c_void_p ,c_int]
         GetDllLibXls().XlsWorksheet_GetDefaultColumnStyle.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetDefaultColumnStyle, self.Ptr, columnIndex)
-        ret = None if intPtr==None else CellStyle(intPtr)
+        ret = None if intPtr==None else AddtionalFormatWrapper(intPtr)
         return ret
 
 
 
-    def add_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
-        """
+    # def add_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
+    #     """
 
-        """
-        intPtrvalue:c_void_p = value.Ptr
+    #     """
+    #     intPtrvalue:c_void_p = value.Ptr
 
-        GetDllLibXls().XlsWorksheet_add_CellValueChanged.argtypes=[c_void_p ,c_void_p]
-        CallCFunction(GetDllLibXls().XlsWorksheet_add_CellValueChanged, self.Ptr, intPtrvalue)
+    #     GetDllLibXls().XlsWorksheet_add_CellValueChanged.argtypes=[c_void_p ,c_void_p]
+    #     CallCFunction(GetDllLibXls().XlsWorksheet_add_CellValueChanged, self.Ptr, intPtrvalue)
 
 
-    def remove_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
-        """
+    # def remove_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
+    #     """
 
-        """
-        intPtrvalue:c_void_p = value.Ptr
+    #     """
+    #     intPtrvalue:c_void_p = value.Ptr
 
-        GetDllLibXls().XlsWorksheet_remove_CellValueChanged.argtypes=[c_void_p ,c_void_p]
-        CallCFunction(GetDllLibXls().XlsWorksheet_remove_CellValueChanged, self.Ptr, intPtrvalue)
+    #     GetDllLibXls().XlsWorksheet_remove_CellValueChanged.argtypes=[c_void_p ,c_void_p]
+    #     CallCFunction(GetDllLibXls().XlsWorksheet_remove_CellValueChanged, self.Ptr, intPtrvalue)
 
     @property
     def Copying(self)->bool:
@@ -3716,7 +3731,7 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_get_AutoFilters.argtypes=[c_void_p]
         GetDllLibXls().XlsWorksheet_get_AutoFilters.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_AutoFilters, self.Ptr)
-        ret = None if intPtr==None else IAutoFilters(intPtr)
+        ret = None if intPtr==None else AutoFiltersCollection(intPtr)
         return ret
 
 
@@ -3735,18 +3750,18 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         return ret
 
 
-#    @property
-#
-#    def CellList(self)->'List1':
-#        """
-#
-#        """
-#        GetDllLibXls().XlsWorksheet_get_CellList.argtypes=[c_void_p]
-#        GetDllLibXls().XlsWorksheet_get_CellList.restype=c_void_p
-#        intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_CellList, self.Ptr)
-#        ret = None if intPtr==None else List1(intPtr)
-#        return ret
-#
+    @property
+ 
+    def CellList(self)->List['CellRange']:
+        """
+ 
+        """
+        GetDllLibXls().XlsWorksheet_get_CellList.argtypes=[c_void_p]
+        GetDllLibXls().XlsWorksheet_get_CellList.restype=c_void_p
+        intPtrArray = CallCFunction(GetDllLibXls().XlsWorksheet_get_CellList, self.Ptr)
+        ret = GetObjVectorFromArray(intPtrArray, CellRange)
+        return ret
+
 
 
     @property
@@ -4236,7 +4251,7 @@ class XlsWorksheet (  XlsWorksheetBase, IInternalWorksheet) :
         GetDllLibXls().XlsWorksheet_get_VPageBreaks.argtypes=[c_void_p]
         GetDllLibXls().XlsWorksheet_get_VPageBreaks.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_VPageBreaks, self.Ptr)
-        ret = None if intPtr==None else IVPageBreaks(intPtr)
+        ret = None if intPtr==None else VPageBreaksCollection(intPtr)
         return ret
 
 

spire/xls/XlsWorksheetBase.py

@@ -10,7 +10,24 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
     """
 
     """
-    
+
+    def ClearCellImageCache(self):
+        """
+        Clear Cell image array cache,not delete CellImage in cell.
+        """
+        
+        GetDllLibXls().XlsWorksheet_ClearCellImageCache.argtypes=[c_void_p]
+        CallCFunction(GetDllLibXls().XlsWorksheet_ClearCellImageCache, self.Ptr)
+
+    def CellImages(self )->List['ExcelPicture']:
+        """
+        Cell image array. Read-only
+        """
+        GetDllLibXls().XlsWorksheet_CellImages.argtypes=[c_void_p ,c_void_p]
+        GetDllLibXls().XlsWorksheet_CellImages.restype=IntPtrArray
+        intPtrArray = CallCFunction(GetDllLibXls().XlsWorksheet_CellImages, self.Ptr)
+        ret = GetObjVectorFromArray(intPtrArray, ExcelPicture)
+        return ret
 
     def GetShapes(self)->'IShapes':
         """
@@ -64,8 +81,8 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
             Check: Whether to validate selection state
         """
         
-        GetDllLibXls().XlsWorksheetBase_Unselect.argtypes=[c_void_p ,c_bool]
-        CallCFunction(GetDllLibXls().XlsWorksheetBase_Unselect, self.Ptr, Check)
+        GetDllLibXls().XlsWorksheetBase_UnselectC.argtypes=[c_void_p ,c_bool]
+        CallCFunction(GetDllLibXls().XlsWorksheetBase_UnselectC, self.Ptr, Check)
 
     @dispatch
 
@@ -75,7 +92,7 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
 
         Args:
             password: Protection password.
-
+            options:Specify which actions are allowed while the worksheet is protected.
         """
         enumoptions:c_int = options.value
 
@@ -171,7 +188,7 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
         GetDllLibXls().XlsWorksheetBase_AddTextEffectShape.argtypes=[c_void_p ,c_int,c_void_p,c_int,c_int,c_int,c_int,c_int,c_int]
         GetDllLibXls().XlsWorksheetBase_AddTextEffectShape.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheetBase_AddTextEffectShape, self.Ptr, enumeffect,text,upperLeftRow,top,upperLeftColumn,left,height,width)
-        ret = None if intPtr==None else IShape(intPtr)
+        ret = None if intPtr==None else XlsShape(intPtr)
         return ret
 
 
@@ -261,10 +278,11 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
         Returns:
             IWorkbook: Parent workbook object
         """
+        from spire.xls.XlsWorkbook import XlsWorkbook
         GetDllLibXls().XlsWorksheetBase_get_Workbook.argtypes=[c_void_p]
         GetDllLibXls().XlsWorksheetBase_get_Workbook.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheetBase_get_Workbook, self.Ptr)
-        ret = None if intPtr==None else IWorkbook(intPtr)
+        ret = None if intPtr==None else XlsWorkbook(intPtr)
         return ret
 
 
@@ -807,8 +825,8 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
 
     @IsRowColHeadersVisible.setter
     def IsRowColHeadersVisible(self, value:bool):
-        GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisible.argtypes=[c_void_p, c_bool]
-        CallCFunction(GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisible, self.Ptr, value)
+        GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisibleV.argtypes=[c_void_p, c_bool]
+        CallCFunction(GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisibleV, self.Ptr, value)
 
     @property
     def IsRightToLeft(self)->bool:
@@ -835,6 +853,7 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
         Returns:
             XlsWorkbook: Parent workbook instance
         """
+        from spire.xls.XlsWorkbook import XlsWorkbook
         GetDllLibXls().XlsWorksheetBase_get_ParentWorkbook.argtypes=[c_void_p]
         GetDllLibXls().XlsWorksheetBase_get_ParentWorkbook.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsWorksheetBase_get_ParentWorkbook, self.Ptr)
@@ -1326,18 +1345,18 @@ class XlsWorksheetBase (  XlsObject, INamedObject, ITabSheet, ICloneParent) :
         """
         Unselects the worksheet in the workbook UI.
         """
-        GetDllLibXls().XlsWorksheetBase_Unselect1.argtypes=[c_void_p]
-        CallCFunction(GetDllLibXls().XlsWorksheetBase_Unselect1, self.Ptr)
-
-    @staticmethod
-    def DEF_MIN_COLUMN_INDEX()->int:
-        """
-        Gets the minimum allowed column index constant for the worksheet.
-        """
-        #GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.argtypes=[]
-        GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.restype=c_int
-        ret = CallCFunction(GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX)
-        return ret
+        GetDllLibXls().XlsWorksheetBase_Unselect.argtypes=[c_void_p]
+        CallCFunction(GetDllLibXls().XlsWorksheetBase_Unselect, self.Ptr)
+
+    # @staticmethod
+    # def DEF_MIN_COLUMN_INDEX()->int:
+    #     """
+    #     Gets the minimum allowed column index constant for the worksheet.
+    #     """
+    #     #GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.argtypes=[]
+    #     GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.restype=c_int
+    #     ret = CallCFunction(GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX)
+    #     return ret
 
     @property
     def TabIndex(self)->int:

spire/xls/__init__.py

@@ -252,6 +252,7 @@ from spire.xls.enums.XLSXChartShadowOuterType import XLSXChartShadowOuterType
 from spire.xls.enums.XLSXPivotItemType import XLSXPivotItemType
 from spire.xls.enums.XmlOpenType import XmlOpenType
 from spire.xls.enums.PdfConformanceLevel import PdfConformanceLevel
+from spire.xls.enums.TextVerticalValue import TextVerticalValue
 from spire.xls.collection.CollectionBase import CollectionBase
 from spire.xls.TextSaveOptions import TextSaveOptions
 from spire.xls.interfaces.IDocumentProperty import IDocumentProperty
@@ -266,7 +267,7 @@ from spire.xls.XlsObject import XlsObject
 from spire.xls.interfaces.ImportObjectOptions import ImportObjectOptions
 from spire.xls.QueryTableXls import QueryTableXls
 from spire.xls.ReferRangeArea import ReferRangeArea
-from spire.xls.ReferRangeArea import ListReferRangeAreas
+# from spire.xls.ReferRangeArea import ListReferRangeAreas
 from spire.xls.license.LicenseProvider import LicenseProvider
 
 from spire.xls.interfaces.ICloneParent import ICloneParent
@@ -434,6 +435,7 @@ from spire.xls.interfaces.ITextBoxLinkShape import ITextBoxLinkShape
 from spire.xls.interfaces.collections.ITextBoxes import ITextBoxes
 from spire.xls.TextBoxShapeBase import TextBoxShapeBase
 from spire.xls.interfaces.ITextFrame import ITextFrame
+from spire.xls.MsoTextFrame import MsoTextFrame
 from spire.xls.interfaces.sorting.IDataSort import IDataSort
 from spire.xls.interfaces.ISortColumn import ISortColumn
 from spire.xls.interfaces.ISortColumns import ISortColumns

spire/xls/autofilter/AutoFitterOptions.py

@@ -10,6 +10,13 @@ class AutoFitterOptions (SpireObject) :
     """
     Configuration options for automatic column/row sizing operations.
     """
+    @dispatch
+    def __init__(self):
+        GetDllLibXls().AutoFitterOptions_Create.restype = c_void_p
+        intPtr = CallCFunction(GetDllLibXls().AutoFitterOptions_Create)
+
+        super(AutoFitterOptions, self).__init__(intPtr)
+
     @property
     def AutoFitMergedCells(self)->bool:
         """

spire/xls/autofilter/CustomFilter.py

@@ -6,10 +6,18 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class CustomFilter (  IAutoFilterCondition) :
+class CustomFilter (SpireObject,  IAutoFilterCondition) :
     """
 
     """
+
+    @dispatch
+    def __init__(self):
+        GetDllLibXls().CustomFilter_Create.restype = c_void_p
+        intPtr = CallCFunction(GetDllLibXls().CustomFilter_Create)
+
+        super(CustomFilter, self).__init__(intPtr)
+
     @property
 
     def FilterOperatorType(self)->'FilterOperatorType':

spire/xls/autofilter/FilterColumn.py

@@ -244,7 +244,7 @@ class FilterColumn (  SpireObject,IAutoFilter) :
         GetDllLibXls().FilterColumn_get_SecondCondition.argtypes=[c_void_p]
         GetDllLibXls().FilterColumn_get_SecondCondition.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().FilterColumn_get_SecondCondition, self.Ptr)
-        ret = None if intPtr==None else IAutoFilterCondition(intPtr)
+        ret = None if intPtr==None else CustomFilter(intPtr)
         return ret
 
     @property
@@ -258,7 +258,7 @@ class FilterColumn (  SpireObject,IAutoFilter) :
         GetDllLibXls().FilterColumn_get_FirstCondition.argtypes=[c_void_p]
         GetDllLibXls().FilterColumn_get_FirstCondition.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().FilterColumn_get_FirstCondition, self.Ptr)
-        ret = None if intPtr==None else IAutoFilterCondition(intPtr)
+        ret = None if intPtr==None else CustomFilter(intPtr)
         return ret
 
     @property

spire/xls/autofilter/XlsAutoFiltersCollection.py

@@ -73,6 +73,7 @@ class XlsAutoFiltersCollection (  SpireObject, IAutoFilters) :
         Returns:
             Worksheet: The worksheet object.
         """
+        from spire.xls.Worksheet import Worksheet
         GetDllLibXls().XlsAutoFiltersCollection_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().XlsAutoFiltersCollection_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsAutoFiltersCollection_get_Worksheet, self.Ptr)

spire/xls/charts/Chart.py

@@ -317,6 +317,7 @@ class Chart (  XlsChartShape) :
         Workbook contains the chart.
 
         """
+        from spire.xls.Workbook import Workbook
         GetDllLibXls().Chart_get_Workbook.argtypes=[c_void_p]
         GetDllLibXls().Chart_get_Workbook.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().Chart_get_Workbook, self.Ptr)

spire/xls/charts/ChartArea.py

@@ -48,6 +48,7 @@ class ChartArea (  XlsChartFrameFormat) :
             workbook.SaveToFile("Chart.xlsx")
 
         """
+        from spire.xls.charts.ChartInterior import ChartInterior
         GetDllLibXls().ChartArea_get_Interior.argtypes=[c_void_p]
         GetDllLibXls().ChartArea_get_Interior.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ChartArea_get_Interior, self.Ptr)

spire/xls/charts/ChartDataLabels.py

@@ -17,6 +17,7 @@ class ChartDataLabels (  XlsChartDataLabels) :
         Gets data format. Read-only.
 
         """
+        from spire.xls.charts.ChartSerieDataFormat import ChartSerieDataFormat
         GetDllLibXls().ChartDataLabels_get_Format.argtypes=[c_void_p]
         GetDllLibXls().ChartDataLabels_get_Format.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ChartDataLabels_get_Format, self.Ptr)

spire/xls/charts/ChartPlotArea.py

@@ -51,6 +51,7 @@ class ChartPlotArea (  XlsChartPlotArea) :
         Returns:
             Workbook: The workbook that contains the plot area. 
         """
+        from spire.xls.Workbook import Workbook
         GetDllLibXls().ChartPlotArea_get_Workbook.argtypes=[c_void_p]
         GetDllLibXls().ChartPlotArea_get_Workbook.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().ChartPlotArea_get_Workbook, self.Ptr)