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

spire/xls/Workbook.py

@@ -103,8 +103,8 @@ class Workbook (SpireObject) :
         """
         intPtrstream:c_void_p = stream.Ptr
 
-        GetDllLibXls().Workbook_SaveAsXmlS.argtypes=[c_void_p ,c_void_p]
-        CallCFunction(GetDllLibXls().Workbook_SaveAsXmlS, self.Ptr, intPtrstream)
+        GetDllLibXls().Workbook_SaveAsXmlStream.argtypes=[c_void_p ,c_void_p]
+        CallCFunction(GetDllLibXls().Workbook_SaveAsXmlStream, self.Ptr, intPtrstream)
 
 #    @dispatch
 #
@@ -124,46 +124,46 @@ class Workbook (SpireObject) :
 #        return ret
 
 
-    @dispatch
+    # @dispatch
 
-    def SaveChartAsEmfImage(self ,worksheet:Worksheet,chartIndex:int)->Stream:
-        """
-        Save chart to vector image.
+    # def SaveChartAsEmfImage(self ,worksheet:Worksheet,chartIndex:int)->Stream:
+    #     """
+    #     Save chart to vector image.
 
-        Args:
-            worksheet: work sheet
-            chartIndex: chart index
+    #     Args:
+    #         worksheet: work sheet
+    #         chartIndex: chart index
 
-        """
-        intPtrworksheet:c_void_p = worksheet.Ptr
+    #     """
+    #     intPtrworksheet:c_void_p = worksheet.Ptr
 
-        GetDllLibXls().Workbook_SaveChartAsEmfImageWC.argtypes=[c_void_p ,c_void_p,c_int]
-        GetDllLibXls().Workbook_SaveChartAsEmfImageWC.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().Workbook_SaveChartAsEmfImageWC, self.Ptr, intPtrworksheet,chartIndex)
-        ret = None if intPtr==None else Stream(intPtr)
-        return ret
+    #     GetDllLibXls().Workbook_SaveChartAsEmfImageWC.argtypes=[c_void_p ,c_void_p,c_int]
+    #     GetDllLibXls().Workbook_SaveChartAsEmfImageWC.restype=c_void_p
+    #     intPtr = CallCFunction(GetDllLibXls().Workbook_SaveChartAsEmfImageWC, self.Ptr, intPtrworksheet,chartIndex)
+    #     ret = None if intPtr==None else Stream(intPtr)
+    #     return ret
 
 
-    @dispatch
+    # @dispatch
 
-    def SaveChartAsEmfImage(self ,worksheet:Worksheet,chartIndex:int,emfStream:Stream)->Stream:
-        """
-        Save chart to vector image.
+    # def SaveChartAsEmfImage(self ,worksheet:Worksheet,chartIndex:int,emfStream:Stream)->Stream:
+    #     """
+    #     Save chart to vector image.
 
-        Args:
-            worksheet: work sheet
-            chartIndex: chart index
-            emfStream: output stream
+    #     Args:
+    #         worksheet: work sheet
+    #         chartIndex: chart index
+    #         emfStream: output stream
 
-        """
-        intPtrworksheet:c_void_p = worksheet.Ptr
-        intPtremfStream:c_void_p = emfStream.Ptr
+    #     """
+    #     intPtrworksheet:c_void_p = worksheet.Ptr
+    #     intPtremfStream:c_void_p = emfStream.Ptr
 
-        GetDllLibXls().Workbook_SaveChartAsEmfImageWCE.argtypes=[c_void_p ,c_void_p,c_int,c_void_p]
-        GetDllLibXls().Workbook_SaveChartAsEmfImageWCE.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().Workbook_SaveChartAsEmfImageWCE, self.Ptr, intPtrworksheet,chartIndex,intPtremfStream)
-        ret = None if intPtr==None else Stream(intPtr)
-        return ret
+    #     GetDllLibXls().Workbook_SaveChartAsEmfImageWCE.argtypes=[c_void_p ,c_void_p,c_int,c_void_p]
+    #     GetDllLibXls().Workbook_SaveChartAsEmfImageWCE.restype=c_void_p
+    #     intPtr = CallCFunction(GetDllLibXls().Workbook_SaveChartAsEmfImageWCE, self.Ptr, intPtrworksheet,chartIndex,intPtremfStream)
+    #     ret = None if intPtr==None else Stream(intPtr)
+    #     return ret
 
 
     @dispatch
@@ -439,8 +439,8 @@ class Workbook (SpireObject) :
 
         """
         
-        GetDllLibXls().Workbook_UnProtectB.argtypes=[c_void_p ,c_void_p]
-        CallCFunction(GetDllLibXls().Workbook_UnProtectB, self.Ptr, bookWindowAndStructurePassword)
+        GetDllLibXls().Workbook_UnProtect2.argtypes=[c_void_p ,c_void_p]
+        CallCFunction(GetDllLibXls().Workbook_UnProtect2, self.Ptr, bookWindowAndStructurePassword)
 
 
     def UnProtectWorkbook(self ,password:str):
@@ -519,44 +519,43 @@ class Workbook (SpireObject) :
         GetDllLibXls().Workbook_TrackedChanges.argtypes=[c_void_p,c_bool]
         CallCFunction(GetDllLibXls().Workbook_TrackedChanges, self.Ptr,switchValue)
 
-#
-#    def AddDigitalSignature(self ,certificate:'X509Certificate2',comments:str,signTime:'DateTime')->'IDigitalSignatures':
-#        """
-#    <summary>
-#        Add a DigitalSignature.
-#    </summary>
-#    <param name="certificate">Certificate object that was used to sign</param>
-#    <param name="comments">Signature Comments</param>
-#    <param name="signTime">Sign Time</param>
-#    <returns>Collection of DigitalSignature</returns>
-#        """
-#        intPtrcertificate:c_void_p = certificate.Ptr
-#        intPtrsignTime:c_void_p = signTime.Ptr
-#
-#        GetDllLibXls().Workbook_AddDigitalSignature.argtypes=[c_void_p ,c_void_p,c_void_p,c_void_p]
-#        GetDllLibXls().Workbook_AddDigitalSignature.restype=c_void_p
-#        intPtr = CallCFunction(GetDllLibXls().Workbook_AddDigitalSignature, self.Ptr, intPtrcertificate,comments,intPtrsignTime)
-#        ret = None if intPtr==None else IDigitalSignatures(intPtr)
-#        return ret
-#
 
-
-
-    def GetDigitalSignatures(self)->'IDigitalSignatures':
+    def AddDigitalSignature(self ,certificatePath:str,password:str,comments:str,signTime:'DateTime')->'IDigitalSignatures':
         """
-        Get collection of DigitalSignature in this file.
-
-        Returns:
-            Collection of DigitalSignature
-
+        <summary>
+            Add a DigitalSignature.
+        </summary>
+        <param name="certificate">Certificate object that was used to sign</param>
+        <param name="comments">Signature Comments</param>
+        <param name="signTime">Sign Time</param>
+        <returns>Collection of DigitalSignature</returns>
         """
-        GetDllLibXls().Workbook_GetDigitalSignatures.argtypes=[c_void_p]
-        GetDllLibXls().Workbook_GetDigitalSignatures.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().Workbook_GetDigitalSignatures, self.Ptr)
+        intPtrsignTime:c_void_p = signTime.Ptr
+ 
+        GetDllLibXls().Workbook_AddDigitalSignature.argtypes=[c_void_p ,c_wchar_p,c_wchar_p,c_wchar_p,c_void_p]
+        GetDllLibXls().Workbook_AddDigitalSignature.restype=c_void_p
+        intPtr = CallCFunction(GetDllLibXls().Workbook_AddDigitalSignature, self.Ptr, certificatePath,password,comments,intPtrsignTime)
         ret = None if intPtr==None else IDigitalSignatures(intPtr)
         return ret
 
 
+
+
+    # def GetDigitalSignatures(self)->'IDigitalSignatures':
+    #     """
+    #     Get collection of DigitalSignature in this file.
+
+    #     Returns:
+    #         Collection of DigitalSignature
+
+    #     """
+    #     GetDllLibXls().Workbook_GetDigitalSignatures.argtypes=[c_void_p]
+    #     GetDllLibXls().Workbook_GetDigitalSignatures.restype=c_void_p
+    #     intPtr = CallCFunction(GetDllLibXls().Workbook_GetDigitalSignatures, self.Ptr)
+    #     ret = None if intPtr==None else IDigitalSignatures(intPtr)
+    #     return ret
+
+
     def RemoveAllDigitalSignatures(self):
         """
         Remove all DigitalSignature in this file.
@@ -957,8 +956,8 @@ class Workbook (SpireObject) :
 
         """
         
-        GetDllLibXls().Workbook_LoadTemplateFromFileFL.argtypes=[c_void_p ,c_void_p,c_bool]
-        CallCFunction(GetDllLibXls().Workbook_LoadTemplateFromFileFL, self.Ptr, fileName,loadStyles)
+        GetDllLibXls().Workbook_LoadTemplateFromFileL.argtypes=[c_void_p ,c_void_p,c_bool]
+        CallCFunction(GetDllLibXls().Workbook_LoadTemplateFromFileL, self.Ptr, fileName,loadStyles)
 
     @dispatch
 
@@ -2444,7 +2443,7 @@ class Workbook (SpireObject) :
         GetDllLibXls().Workbook_get_Colors.argtypes=[c_void_p]
         GetDllLibXls().Workbook_get_Colors.restype=IntPtrArray
         intPtrArray = CallCFunction(GetDllLibXls().Workbook_get_Colors, self.Ptr)
-        ret = GetVectorFromArray(intPtrArray, Color)
+        ret = GetObjVectorFromArray(intPtrArray, Color)
         return ret
 
 
@@ -3093,29 +3092,29 @@ class Workbook (SpireObject) :
         return ret
 
 
-    @staticmethod
+    # @staticmethod
 
-    def FixDateTimeNow()->'DateTime':
-        """
+    # def FixDateTimeNow()->'DateTime':
+    #     """
 
-        """
-        #GetDllLibXls().Workbook_FixDateTimeNow.argtypes=[]
-        GetDllLibXls().Workbook_FixDateTimeNow.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().Workbook_FixDateTimeNow)
-        ret = None if intPtr==None else DateTime(intPtr)
-        return ret
+    #     """
+    #     #GetDllLibXls().Workbook_FixDateTimeNow.argtypes=[]
+    #     GetDllLibXls().Workbook_FixDateTimeNow.restype=c_void_p
+    #     intPtr = CallCFunction(GetDllLibXls().Workbook_FixDateTimeNow)
+    #     ret = None if intPtr==None else DateTime(intPtr)
+    #     return ret
 
 
-    @staticmethod
+    # @staticmethod
 
-    def FixDateTimeToday()->'DateTime':
-        """
+    # def FixDateTimeToday()->'DateTime':
+    #     """
 
-        """
-        #GetDllLibXls().Workbook_FixDateTimeToday.argtypes=[]
-        GetDllLibXls().Workbook_FixDateTimeToday.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().Workbook_FixDateTimeToday)
-        ret = None if intPtr==None else DateTime(intPtr)
-        return ret
+    #     """
+    #     #GetDllLibXls().Workbook_FixDateTimeToday.argtypes=[]
+    #     GetDllLibXls().Workbook_FixDateTimeToday.restype=c_void_p
+    #     intPtr = CallCFunction(GetDllLibXls().Workbook_FixDateTimeToday)
+    #     ret = None if intPtr==None else DateTime(intPtr)
+    #     return ret
 
 

spire/xls/Worksheet.py

@@ -10,6 +10,57 @@ class Worksheet (  XlsWorksheet) :
     """
 
     """
+    @dispatch
+
+    def RemoveDuplicates(self):
+        """
+        Remove Duplicate rows.
+
+        """
+        
+        GetDllLibXls().Worksheet_RemoveDuplicates.argtypes=[c_void_p]
+        CallCFunction(GetDllLibXls().Worksheet_RemoveDuplicates, self.Ptr)
+        
+
+    @dispatch
+
+    def RemoveDuplicates(self ,row:int,column:int,lastRow:int,lastColumn:int):
+        """
+        Remove Duplicate rows.
+
+        Args:
+            row: row start
+            column: column start 
+            lastRow: row end
+            lastColumn: column end
+
+        """
+        
+        GetDllLibXls().Worksheet_RemoveDuplicatesSSEE.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
+        CallCFunction(GetDllLibXls().Worksheet_RemoveDuplicatesSSEE, self.Ptr, row,column,lastRow,lastColumn)
+
+    @dispatch
+
+    def RemoveDuplicates(self ,row:int,column:int,lastRow:int,lastColumn:int,hasHeaders:bool, columnOffsets:List[int]):
+        """
+        Remove Duplicate rows.
+
+        Args:
+            row: row start
+            column: column start 
+            lastRow: row end
+            lastColumn: column end
+
+        """
+        countcolumnOffsets = len(columnOffsets)
+        ArrayTypecolumnOffsets = c_int * countcolumnOffsets
+        arraycolumnOffsets = ArrayTypecolumnOffsets()
+        for i in range(0, countcolumnOffsets):
+            arraycolumnOffsets[i] = columnOffsets[i]
+
+        GetDllLibXls().Worksheet_RemoveDuplicatesSSEEHC.argtypes=[c_void_p ,c_int,c_int,c_int,c_int,c_bool,ArrayTypecolumnOffsets,c_int]
+        CallCFunction(GetDllLibXls().Worksheet_RemoveDuplicatesSSEEHC, self.Ptr, row,column,lastRow,lastColumn,hasHeaders,arraycolumnOffsets,countcolumnOffsets)
+
     @property
 
     def AllocatedRange(self)->'CellRange':
@@ -596,8 +647,8 @@ class Worksheet (  XlsWorksheet) :
         intPtrsourceRange:c_void_p = sourceRange.Ptr
         intPtrdestRange:c_void_p = destRange.Ptr
 
-        GetDllLibXls().Worksheet_MoveSDUC.argtypes=[c_void_p ,c_void_p,c_void_p,c_bool,c_bool]
-        CallCFunction(GetDllLibXls().Worksheet_MoveSDUC, self.Ptr, intPtrsourceRange,intPtrdestRange,updateReference,copyStyle)
+        GetDllLibXls().Worksheet_MoveRS.argtypes=[c_void_p ,c_void_p,c_void_p,c_bool,c_bool]
+        CallCFunction(GetDllLibXls().Worksheet_MoveRS, self.Ptr, intPtrsourceRange,intPtrdestRange,updateReference,copyStyle)
 
 #    @dispatch
 #
@@ -815,8 +866,8 @@ class Worksheet (  XlsWorksheet) :
         """
         intPtrdefaultStyle:c_void_p = defaultStyle.Ptr
 
-        GetDllLibXls().Worksheet_SetDefaultColumnStyleFLD.argtypes=[c_void_p ,c_int,c_int,c_void_p]
-        CallCFunction(GetDllLibXls().Worksheet_SetDefaultColumnStyleFLD, self.Ptr, firstColumnIndex,lastColumnIndex,intPtrdefaultStyle)
+        GetDllLibXls().Worksheet_SetDefaultColumnStyleFL.argtypes=[c_void_p ,c_int,c_int,c_void_p]
+        CallCFunction(GetDllLibXls().Worksheet_SetDefaultColumnStyleFL, self.Ptr, firstColumnIndex,lastColumnIndex,intPtrdefaultStyle)
 
     @dispatch
 
@@ -874,8 +925,8 @@ class Worksheet (  XlsWorksheet) :
         """
         intPtrdefaultStyle:c_void_p = defaultStyle.Ptr
 
-        GetDllLibXls().Worksheet_SetDefaultRowStyleFLD.argtypes=[c_void_p ,c_int,c_int,c_void_p]
-        CallCFunction(GetDllLibXls().Worksheet_SetDefaultRowStyleFLD, self.Ptr, firstRowIndex,lastRowIndex,intPtrdefaultStyle)
+        GetDllLibXls().Worksheet_SetDefaultRowStyleFL.argtypes=[c_void_p ,c_int,c_int,c_void_p]
+        CallCFunction(GetDllLibXls().Worksheet_SetDefaultRowStyleFL, self.Ptr, firstRowIndex,lastRowIndex,intPtrdefaultStyle)
 
 
     def GetDefaultColumnStyle(self ,columnIndex:int)->'CellStyle':
@@ -990,8 +1041,8 @@ class Worksheet (  XlsWorksheet) :
 
         """
         
-        GetDllLibXls().Worksheet_RemoveRangeRC.argtypes=[c_void_p ,c_int,c_int]
-        CallCFunction(GetDllLibXls().Worksheet_RemoveRangeRC, self.Ptr, rowIndex,columnIndex)
+        GetDllLibXls().Worksheet_RemoveRangeI.argtypes=[c_void_p ,c_int,c_int]
+        CallCFunction(GetDllLibXls().Worksheet_RemoveRangeI, self.Ptr, rowIndex,columnIndex)
 
     @dispatch
 
@@ -1004,8 +1055,8 @@ class Worksheet (  XlsWorksheet) :
 
         """
         
-        GetDllLibXls().Worksheet_RemovePicture.argtypes=[c_void_p ,c_int]
-        CallCFunction(GetDllLibXls().Worksheet_RemovePicture, self.Ptr, index)
+        GetDllLibXls().Worksheet_RemovePictureI.argtypes=[c_void_p ,c_int]
+        CallCFunction(GetDllLibXls().Worksheet_RemovePictureI, self.Ptr, index)
 
     @dispatch
 
@@ -1018,8 +1069,8 @@ class Worksheet (  XlsWorksheet) :
 
         """
         
-        GetDllLibXls().Worksheet_RemovePictureP.argtypes=[c_void_p ,c_void_p]
-        CallCFunction(GetDllLibXls().Worksheet_RemovePictureP, self.Ptr, picturename)
+        GetDllLibXls().Worksheet_RemovePictureN.argtypes=[c_void_p ,c_void_p]
+        CallCFunction(GetDllLibXls().Worksheet_RemovePictureN, self.Ptr, picturename)
 
     @dispatch
 

spire/xls/XlsAddInFunction.py

@@ -72,21 +72,21 @@ class XlsAddInFunction (  XlsObject, IAddInFunction, ICloneParent) :
 
 
 
-    def Clone(self ,parent:'SpireObject')->'SpireObject':
+    def Clone(self ,parent:'XlsWorkbook')->'XlsAddInFunction':
         """Creates a new object that is a copy of the current instance.
 
         Args:
-            parent (SpireObject): Parent object for a copy of this instance.
+            parent (XlsWorkbook): Parent object for a copy of this instance.
 
         Returns:
-            SpireObject: A new object that is a copy of this instance.
+            XlsAddInFunction: A new object that is a copy of this instance.
         """
         intPtrparent:c_void_p = parent.Ptr
 
         GetDllLibXls().XlsAddInFunction_Clone.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsAddInFunction_Clone.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsAddInFunction_Clone, self.Ptr, intPtrparent)
-        ret = None if intPtr==None else SpireObject(intPtr)
+        ret = None if intPtr==None else XlsAddInFunction(intPtr)
         return ret
 
 

spire/xls/XlsArcShape.py

@@ -108,7 +108,7 @@ class XlsArcShape (  XlsPrstGeomShape, IArcShape) :
         GetDllLibXls().XlsArcShape_get_RichText.argtypes=[c_void_p]
         GetDllLibXls().XlsArcShape_get_RichText.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsArcShape_get_RichText, self.Ptr)
-        ret = None if intPtr==None else RichTextObject(intPtr)
+        ret = None if intPtr==None else RichTextShape(intPtr)
         return ret
 
 

spire/xls/XlsBorder.py

@@ -72,6 +72,7 @@ class XlsBorder (  XlsObject, IBorder) :
         Returns:
             OColor: An object representing the Office color.
         """
+        from spire.xls.OColor import OColor
         GetDllLibXls().XlsBorder_get_OColor.argtypes=[c_void_p]
         GetDllLibXls().XlsBorder_get_OColor.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsBorder_get_OColor, self.Ptr)

spire/xls/XlsButtonShape.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class XlsButtonShape (  XlsShape, IShape, ITextBox) :
+class XlsButtonShape (  XlsShape, IButtonShape) :
     """Represents a button shape in an Excel worksheet.
     
     This class provides properties and methods for manipulating button shapes in Excel,

spire/xls/XlsComment.py

@@ -6,7 +6,7 @@ from spire.xls import *
 from ctypes import *
 import abc
 
-class XlsComment (  XlsShape, IComment, ITextBox) :
+class XlsComment (  XlsShape, ICommentShape) :
     """Represents a comment in an Excel worksheet.
     
     This class provides properties and methods for manipulating comments in Excel,

spire/xls/XlsDataValidationTable.py

@@ -21,6 +21,7 @@ class XlsDataValidationTable (  SpireObject, IDataValidationTable) :
         Returns:
             Worksheet: The worksheet object containing this data validation table.
         """
+        from spire.xls.Worksheet import Worksheet
         GetDllLibXls().XlsDataValidationTable_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().XlsDataValidationTable_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsDataValidationTable_get_Worksheet, self.Ptr)
@@ -36,6 +37,7 @@ class XlsDataValidationTable (  SpireObject, IDataValidationTable) :
         Returns:
             Workbook: The workbook object containing this data validation table.
         """
+        from spire.xls.Workbook import Workbook
         GetDllLibXls().XlsDataValidationTable_get_Workbook.argtypes=[c_void_p]
         GetDllLibXls().XlsDataValidationTable_get_Workbook.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsDataValidationTable_get_Workbook, self.Ptr)
@@ -53,7 +55,7 @@ class XlsDataValidationTable (  SpireObject, IDataValidationTable) :
         Returns:
             XlsDataValidationCollection: The data validation collection at the specified index.
         """
-        
+        from spire.xls.collection.XlsDataValidationCollection import XlsDataValidationCollection
         GetDllLibXls().XlsDataValidationTable_get_Item.argtypes=[c_void_p ,c_int]
         GetDllLibXls().XlsDataValidationTable_get_Item.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsDataValidationTable_get_Item, self.Ptr, index)

spire/xls/XlsFont.py

@@ -94,6 +94,7 @@ class XlsFont (  XlsObject, IFont, IOptimizedUpdate, ICloneParent) :
         Returns:
             OColor: An object representing the Office color of the font.
         """
+        from spire.xls.OColor import OColor
         GetDllLibXls().XlsFont_get_OColor.argtypes=[c_void_p]
         GetDllLibXls().XlsFont_get_OColor.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsFont_get_OColor, self.Ptr)
@@ -151,30 +152,35 @@ class XlsFont (  XlsObject, IFont, IOptimizedUpdate, ICloneParent) :
         CallCFunction(GetDllLibXls().XlsFont_set_Color, self.Ptr, value.Ptr)
 
 
-    def SetThemeColor(self ,type:'ThemeColorType',tint:float):
+    def SetThemeColor(self ,themeType:'ThemeColorType',tint:float):
         """Sets a theme color for the font.
         
         Args:
             type (ThemeColorType): The theme color type to set.
             tint (float): The tint value to apply to the theme color.
         """
-        enumtype:c_int = type.value
+        enumtype:c_int = themeType.value
 
         GetDllLibXls().XlsFont_SetThemeColor.argtypes=[c_void_p ,c_int,c_double]
         CallCFunction(GetDllLibXls().XlsFont_SetThemeColor, self.Ptr, enumtype,tint)
 
-#
-#    def GetThemeColor(self ,type:'ThemeColorType&',tint:'Double&')->bool:
-#        """
-#
-#        """
-#        intPtrtype:c_void_p = type.Ptr
-#        intPtrtint:c_void_p = tint.Ptr
-#
-#        GetDllLibXls().XlsFont_GetThemeColor.argtypes=[c_void_p ,c_void_p,c_void_p]
-#        GetDllLibXls().XlsFont_GetThemeColor.restype=c_bool
-#        ret = CallCFunction(GetDllLibXls().XlsFont_GetThemeColor, self.Ptr, intPtrtype,intPtrtint)
-#        return ret
+    def GetThemeColor(self)->Tuple[bool,ThemeColorType,float]:
+
+        GetDllLibXls().XlsFont_GetThemeColor_bool.argtypes=[c_void_p ]
+        GetDllLibXls().XlsFont_GetThemeColor_bool.restype=c_bool
+        ret = CallCFunction(GetDllLibXls().XlsFont_GetThemeColor_bool, self.Ptr)
+        if not ret:
+            return False,None,None
+        GetDllLibXls().XlsFont_GetThemeColor_Type.argtypes=[c_void_p ]
+        GetDllLibXls().XlsFont_GetThemeColor_Type.restype=c_int
+        ret_type = CallCFunction(GetDllLibXls().XlsFont_GetThemeColor_Type, self.Ptr)
+        theme_type = None if ret_type is None else ThemeColorType(ret_type)
+
+        GetDllLibXls().XlsFont_GetThemeColor_Tint.argtypes=[c_void_p ]
+        GetDllLibXls().XlsFont_GetThemeColor_Tint.restype=c_double
+        theme_tint = CallCFunction(GetDllLibXls().XlsFont_GetThemeColor_Tint, self.Ptr)
+
+        return True,theme_type,theme_tint
 
 
     @property

spire/xls/XlsName.py

@@ -13,6 +13,19 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
     to provide functionality for working with named ranges, including accessing
     and manipulating range properties, formatting, and cell values.
     """
+
+    @property
+
+    def CommentValue(self)->str:
+        """Gets the comment value of the nameManager.
+        Returns:
+            str: The comment value of the nameManager.
+        """
+        GetDllLibXls().XlsName_get_CommentValue.argtypes=[c_void_p]
+        GetDllLibXls().XlsName_get_CommentValue.restype=c_void_p
+        ret = PtrToStr(CallCFunction(GetDllLibXls().XlsName_get_CommentValue, self.Ptr))
+        return ret
+
     @property
 
     def Comment(self)->'ICommentShape':
@@ -21,6 +34,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         Returns:
             ICommentShape: The comment object.
         """
+        from spire.xls.XlsComment import XlsComment
         GetDllLibXls().XlsName_get_Comment.argtypes=[c_void_p]
         GetDllLibXls().XlsName_get_Comment.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsName_get_Comment, self.Ptr)
@@ -36,11 +50,10 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         Returns:
             IRichTextString: The rich text formatting object.
         """
-        GetDllLibXls().XlsName_get_RichText.argtypes=[c_void_p]
-        GetDllLibXls().XlsName_get_RichText.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().XlsName_get_RichText, self.Ptr)
-        ret = None if intPtr==None else RichTextObject(intPtr)
-        return ret
+        refres = self.RefersToRange
+        if refres == None:
+            return None
+        return refres.RichText
 
 
     @property
@@ -192,7 +205,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         GetDllLibXls().XlsName_get_Hyperlinks.argtypes=[c_void_p]
         GetDllLibXls().XlsName_get_Hyperlinks.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsName_get_Hyperlinks, self.Ptr)
-        ret = None if intPtr==None else IHyperLinks(intPtr)
+        ret = None if intPtr==None else XlsHyperLinksCollection(intPtr)
         return ret
 
 
@@ -341,6 +354,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         Returns:
             ICommentShape: The newly added comment.
         """
+        from spire.xls.XlsComment import XlsComment
         GetDllLibXls().XlsName_AddComment.argtypes=[c_void_p]
         GetDllLibXls().XlsName_AddComment.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsName_AddComment, self.Ptr)
@@ -501,17 +515,13 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         CallCFunction(GetDllLibXls().XlsName_ExpandGroupGF, self.Ptr, enumgroupBy,enumflags)
 
 
-    def GetEnumerator(self)->'IEnumerator':
+    def GetEnumerator(self)->'EnumeratorXlsRange':
         """Gets an enumerator that can be used to iterate through the cells in the named range.
         
         Returns:
             IEnumerator: An enumerator for iterating through the cells.
         """
-        GetDllLibXls().XlsName_GetEnumerator.argtypes=[c_void_p]
-        GetDllLibXls().XlsName_GetEnumerator.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().XlsName_GetEnumerator, self.Ptr)
-        ret = None if intPtr==None else IEnumerator(intPtr)
-        return ret
+        return self.RefersToRange.GetEnumerator()
 
 
     @dispatch
@@ -547,7 +557,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         GetDllLibXls().XlsName_Clone.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsName_Clone.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsName_Clone, self.Ptr, intPtrparent)
-        ret = None if intPtr==None else SpireObject(intPtr)
+        ret = None if intPtr==None else XlsName(intPtr)
         return ret
 
 
@@ -783,7 +793,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
 
     def SetIndex(self ,index:int):
         """Sets the index of the named range in the collection.
-        
+        the method is not implemented
         This method changes the position of the named range in the collection.
         
         Args:
@@ -797,7 +807,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
 
     def SetIndex(self ,index:int,bRaiseEvent:bool):
         """Sets the index of the named range with an option to raise an event.
-        
+        the method is not implemented
         This method changes the position of the named range in the collection
         and optionally raises a notification event.
         
@@ -989,6 +999,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         Returns:
             IWorksheet: The worksheet that contains the named range.
         """
+        from spire.xls.XlsWorksheet import XlsWorksheet
         GetDllLibXls().XlsName_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().XlsName_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsName_get_Worksheet, self.Ptr)
@@ -1132,6 +1143,7 @@ class XlsName (  XlsObject, INamedRange, IXLSRange) :
         Returns:
             IBorders: The collection of borders.
         """
+        from spire.xls.collection.XlsBordersCollection import XlsBordersCollection
         GetDllLibXls().XlsName_get_Borders.argtypes=[c_void_p]
         GetDllLibXls().XlsName_get_Borders.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsName_get_Borders, self.Ptr)

spire/xls/XlsOvalShape.py

@@ -108,7 +108,7 @@ class XlsOvalShape (  XlsShape, IOvalShape) :
         GetDllLibXls().XlsOvalShape_get_RichText.argtypes=[c_void_p]
         GetDllLibXls().XlsOvalShape_get_RichText.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsOvalShape_get_RichText, self.Ptr)
-        ret = None if intPtr==None else RichTextObject(intPtr)
+        ret = None if intPtr==None else RichTextShape(intPtr)
         return ret