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

spire/xls/common/SpireObject.py

@@ -9,6 +9,8 @@ elif __package__ == "spire.xls.common":
     from spire.xls.common import *
 elif __package__ == "spire.doc.common":
     from spire.doc.common import *
+elif __package__ == "spire.ocr.common" :
+    from spire.ocr.common import *
 else :
     from spire.presentation.common import *
 

spire/xls/common/Stream.py

@@ -7,6 +7,8 @@ elif __package__ == "spire.xls.common":
     from spire.xls.common import *
 elif __package__ == "spire.doc.common":
     from spire.doc.common import *
+elif __package__ == "spire.ocr.common" :
+    from spire.ocr.common import *
 else :
     from spire.presentation.common import *
 #from spire.xls import *

spire/xls/common/String.py

@@ -7,6 +7,8 @@ elif __package__ == "spire.xls.common":
     from spire.xls.common import *
 elif __package__ == "spire.doc.common":
     from spire.doc.common import *
+elif __package__ == "spire.ocr.common" :
+    from spire.ocr.common import *
 else :
     from spire.presentation.common import *
 #from spire.xls import *
@@ -24,7 +26,7 @@ class String (  SpireObject) :
         super(String, self).__init__(intPtr)
     @dispatch
     def __init__(self, value:str):
-        if __package__ == "spire.presentation.common":
+        if __package__ == "spire.presentation.common" or __package__ == "spire.doc.common":
             valuePtr = StrToPtr(value)
             dlllib.String_CreateV.argtypes=[ c_void_p]
             dlllib.String_CreateV.restype = c_void_p

spire/xls/common/TimeSpan.py

@@ -7,6 +7,8 @@ elif __package__ == "spire.xls.common":
     from spire.xls.common import *
 elif __package__ == "spire.doc.common":
     from spire.doc.common import *
+elif __package__ == "spire.ocr.common" :
+    from spire.ocr.common import *
 else :
     from spire.presentation.common import *
 #from spire.xls import *

spire/xls/common/UInt16.py

@@ -7,6 +7,8 @@ elif __package__ == "spire.xls.common":
     from spire.xls.common import *
 elif __package__ == "spire.doc.common":
     from spire.doc.common import *
+elif __package__ == "spire.ocr.common" :
+    from spire.ocr.common import *
 else :
     from spire.presentation.common import *
 #from spire.xls import *

spire/xls/common/UInt32.py

@@ -7,6 +7,8 @@ elif __package__ == "spire.xls.common":
     from spire.xls.common import *
 elif __package__ == "spire.doc.common":
     from spire.doc.common import *
+elif __package__ == "spire.ocr.common" :
+    from spire.ocr.common import *
 else :
     from spire.presentation.common import *
 #from spire.xls import *

spire/xls/common/UInt64.py

@@ -7,6 +7,8 @@ elif __package__ == "spire.xls.common":
     from spire.xls.common import *
 elif __package__ == "spire.doc.common":
     from spire.doc.common import *
+elif __package__ == "spire.ocr.common" :
+    from spire.ocr.common import *
 else :
     from spire.presentation.common import *
 #from spire.xls import *

spire/xls/common/__init__.py

@@ -25,26 +25,31 @@ if os_name == "Windows":
     lib_pathDoc = r'.\Spire.Doc.Base.dll'
     lib_pathPdf = r'.\Spire.Pdf.Base.dll'
     lib_pathPpt = r'.\Spire.Presentation.Base.dll'
+    lib_pathOcr = r'.\Spire.Ocr.Base.dll'
 elif os_name == "Linux":
     lib_pathXls = r'./Spire.Xls.Base.so'
     lib_pathDoc = r'./Spire.Doc.Base.so'
     lib_pathPdf = r'./Spire.Pdf.Base.so'
     lib_pathPpt = r'./Spire.Presentation.Base.so'
+    lib_pathOcr = r'./Spire.Ocr.Base.so'
 elif os_name =="Darwin":
     lib_pathXls = r'./Spire.Xls.Base.dylib'
     lib_pathDoc = r'./Spire.Doc.Base.dylib'
     lib_pathPdf = r'./Spire.Pdf.Base.dylib'
     lib_pathPpt = r'./Spire.Presentation.Base.dylib'
+    lib_pathOcr = r'./Spire.Ocr.Base.dylib'
 else:
     lib_pathXls = r'./Spire.Xls.Base.dll'
     lib_pathDoc = r'./Spire.Doc.Base.dll'
     lib_pathPdf = r'./Spire.Pdf.Base.dll'
     lib_pathPpt = r'./Spire.Presentation.Base.dll'
+    lib_pathOcr = r'./Spire.Ocr.Base.dll'
 dlllibXls = None
 dlllibXls = LoadLib(lib_pathXls)
 dlllibDoc = LoadLib(lib_pathDoc)
 dlllibPdf = LoadLib(lib_pathPdf)
 dlllibPpt = LoadLib(lib_pathPpt)
+dlllibOcr = LoadLib(lib_pathOcr)
 dlllib = dlllibXls
 if dlllibXls != None and __package__ == "spire.xls.common":
     dlllib = dlllibXls
@@ -54,6 +59,8 @@ elif dlllibPdf != None and __package__ == "spire.pdf.common":
     dlllib = dlllibPdf
 elif dlllibPpt != None and __package__ == "spire.presentation.common":
     dlllib = dlllibPpt
+elif dlllibOcr != None and __package__ == "spire.ocr.common":
+    dlllib = dlllibOcr
 
 def GetDllLibXls():
     #if dlllibXls != None:
@@ -80,6 +87,13 @@ def GetDllLibPpt():
     #if dlllibPpt != None:
     dlllib = dlllibPpt
     return dlllibPpt;
+def GetDllLibOcr():
+    #if dlllibPdf == None:
+    #    dlllibPdf = LoadLib(lib_pathPdf)
+    #if dlllibPdf != None:
+    dlllib = dlllibOcr
+    return dlllibOcr;
+
 def ChangeHandleToXls():
     GetDllLibXls()
 def ChangeHandleToDoc():
@@ -88,6 +102,8 @@ def ChangeHandleToPdf():
     GetDllLibPdf()
 def ChangeHandleToPpt():
     GetDllLibPpt()
+def ChangeHandleToOcr():
+    GetDllLibOcr()
     
 class SpireException(Exception):
     """Custom Exception"""
@@ -97,23 +113,78 @@ class SpireException(Exception):
 
 def CallCFunction(func, *args, **kwargs):
     if hasattr(func, 'argtypes') and func.argtypes is not None:
-        new_argtypes = [c_int if arg == c_bool else arg for arg in func.argtypes]
+        if os_name == "Windows":
+            new_argtypes = [c_int if arg == c_bool else arg for arg in func.argtypes]
+            if len(new_argtypes) == len(args):
+                new_argtypes.append(POINTER(c_uint64))
+        else:
+            arg_count = len(args)
+            new_argtypes = [c_int if arg == c_bool else arg for arg in func.argtypes[:arg_count]]
+            new_argtypes.append(c_void_p)
         func.argtypes = new_argtypes
         
-    data = create_string_buffer(sizeof(c_uint64))
-    old_value  = 0
-    # Write the initial values to the allocated memory
-    memmove(data, byref(c_uint64(0)), sizeof(c_uint64))
-    args = list(args) +[data]
+    error_code_buffer = c_uint64(0)
+    args = list(args) + [byref(error_code_buffer)]
 
     result = func(*args, **kwargs)
-    modified_value = cast(data, POINTER(c_uint64)).contents.value
-    if old_value != modified_value:
+    modified_value = error_code_buffer.value
+    if modified_value != 0:
         info = PtrToStr(modified_value)
         raise SpireException(info)
     return result
 
-if __package__ == "spire.pdf.common" :
+if __package__ == "spire.ocr.common":
+    from spire.ocr.common.SpireObject import SpireObject
+
+    from spire.ocr.common.Common import IntPtrArray
+    from spire.ocr.common.Common import GetObjVectorFromArray
+    from spire.ocr.common.Common import GetVectorFromArray
+    from spire.ocr.common.Common import GetStrVectorFromArray
+    from spire.ocr.common.Common import GetIntPtrArray
+    from spire.ocr.common.Common import GetByteArray
+    from spire.ocr.common.Common import GetIntValue
+    from spire.ocr.common.Common import GetBytesFromArray
+    from spire.ocr.common.Common import PtrToStr
+    from spire.ocr.common.Common import ReleasePtr
+    from spire.ocr.common.Common import StrToPtr
+
+    from spire.ocr.common.RegexOptions import RegexOptions
+    from spire.ocr.common.CultureInfo import CultureInfo
+    from spire.ocr.common.Boolean import Boolean
+    from spire.ocr.common.Byte import Byte
+    from spire.ocr.common.Char import Char
+    from spire.ocr.common.Int16 import Int16
+    from spire.ocr.common.Int32 import Int32
+    from spire.ocr.common.Int64 import Int64
+    from spire.ocr.common.PixelFormat import PixelFormat
+    from spire.ocr.common.Size import Size
+    from spire.ocr.common.SizeF import SizeF
+    from spire.ocr.common.Point import Point
+    from spire.ocr.common.PointF import PointF
+    from spire.ocr.common.Rectangle import Rectangle
+    from spire.ocr.common.RectangleF import RectangleF
+    from spire.ocr.common.Single import Single
+    from spire.ocr.common.TimeSpan import TimeSpan
+    from spire.ocr.common.UInt16 import UInt16
+    from spire.ocr.common.UInt32 import UInt32
+    from spire.ocr.common.UInt64 import UInt64
+    from spire.ocr.common.Stream import Stream
+    from spire.ocr.common.License import License
+    from spire.ocr.common.Color import Color
+    from spire.ocr.common.DateTime import DateTime
+    from spire.ocr.common.Double import Double
+    from spire.ocr.common.EmfType import EmfType
+    from spire.ocr.common.Encoding import Encoding
+    from spire.ocr.common.FontStyle import FontStyle
+    from spire.ocr.common.GraphicsUnit import GraphicsUnit
+    from spire.ocr.common.ICollection import ICollection
+    from spire.ocr.common.IDictionary import IDictionary
+    from spire.ocr.common.IEnumerable import IEnumerable
+    from spire.ocr.common.IEnumerator import IEnumerator
+    from spire.ocr.common.IList import IList
+    from spire.ocr.common.String import String
+    from spire.ocr.common.Regex import Regex
+elif __package__ == "spire.pdf.common" :
     from spire.pdf.common.SpireObject import SpireObject
 
     from spire.pdf.common.Common import IntPtrArray

spire/xls/conditional_formatting/ConditionValue.py

@@ -67,17 +67,5 @@ class ConditionValue (  SpireObject,IConditionValue) :
         GetDllLibXls().ConditionValue_set_Value.argtypes=[c_void_p, c_void_p]
         CallCFunction(GetDllLibXls().ConditionValue_set_Value, self.Ptr, value.Ptr)
 
-    def m_condtionValue(self)->'IConditionValue':
-        """
-        Gets the internal condition value object.
-
-        Returns:
-            IConditionValue: The internal condition value.
-        """
-        GetDllLibXls().ConditionValue_m_condtionValue.argtypes=[c_void_p]
-        GetDllLibXls().ConditionValue_m_condtionValue.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().ConditionValue_m_condtionValue, self.Ptr)
-        ret = None if intPtr==None else XlsConditionValue(intPtr)
-        return ret
 
 

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/XlsConditionValue.py

@@ -66,8 +66,7 @@ class XlsConditionValue (  SpireObject, IConditionValue) :
         GetDllLibXls().XlsConditionValue_set_Value.argtypes=[c_void_p, c_void_p]
         CallCFunction(GetDllLibXls().XlsConditionValue_set_Value, self.Ptr, value.Ptr)
 
-    @staticmethod
-    def op_Equality(first:'XlsConditionValue',second:'XlsConditionValue')->bool:
+    def __eq__(self,second:'XlsConditionValue')->bool:
         """
         Determines whether two XlsConditionValue instances are equal.
 
@@ -77,7 +76,7 @@ class XlsConditionValue (  SpireObject, IConditionValue) :
         Returns:
             bool: True if equal; otherwise, False.
         """
-        intPtrfirst:c_void_p = first.Ptr
+        intPtrfirst:c_void_p = self.Ptr
         intPtrsecond:c_void_p = second.Ptr
 
         GetDllLibXls().XlsConditionValue_op_Equality.argtypes=[ c_void_p,c_void_p]
@@ -85,8 +84,7 @@ class XlsConditionValue (  SpireObject, IConditionValue) :
         ret = CallCFunction(GetDllLibXls().XlsConditionValue_op_Equality,  intPtrfirst,intPtrsecond)
         return ret
 
-    @staticmethod
-    def op_Inequality(first:'XlsConditionValue',second:'XlsConditionValue')->bool:
+    def __ne__(self,second:'XlsConditionValue')->bool:
         """
         Determines whether two XlsConditionValue instances are not equal.
 
@@ -96,7 +94,7 @@ class XlsConditionValue (  SpireObject, IConditionValue) :
         Returns:
             bool: True if not equal; otherwise, False.
         """
-        intPtrfirst:c_void_p = first.Ptr
+        intPtrfirst:c_void_p = self.Ptr
         intPtrsecond:c_void_p = second.Ptr
 
         GetDllLibXls().XlsConditionValue_op_Inequality.argtypes=[ c_void_p,c_void_p]

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)

spire/xls/conditional_formatting/XlsConditionalFormats.py

@@ -400,17 +400,21 @@ class XlsConditionalFormats (  SpireObject, ICloneParent, IConditionalFormats) :
 
     @dispatch
 
-    def AddCells(self ,arrCells:IList):
+    def AddCells(self ,arrRanges:List['Rectangle']):
         """
         Adds conditional formats to the specified cells.
 
         Args:
             arrCells (IList): The list of cells to add formats to.
         """
-        intPtrarrCells:c_void_p = arrCells.Ptr
+        countarrRanges = len(arrRanges)
+        ArrayTypearrRanges = c_void_p * countarrRanges
+        arrayarrRanges = ArrayTypearrRanges()
+        for i in range(0, countarrRanges):
+            arrayarrRanges[i] = arrRanges[i].Ptr
 
-        GetDllLibXls().XlsConditionalFormats_AddCellsA.argtypes=[c_void_p ,c_void_p]
-        CallCFunction(GetDllLibXls().XlsConditionalFormats_AddCellsA, self.Ptr, intPtrarrCells)
+        GetDllLibXls().XlsConditionalFormats_AddCellsA.argtypes=[c_void_p ,ArrayTypearrRanges,c_int]
+        CallCFunction(GetDllLibXls().XlsConditionalFormats_AddCellsA, self.Ptr, arrayarrRanges,countarrRanges)
 
 
     def AddRange(self ,range:'IXLSRange'):
@@ -508,7 +512,7 @@ class XlsConditionalFormats (  SpireObject, ICloneParent, IConditionalFormats) :
         GetDllLibXls().XlsConditionalFormats_Clone.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().XlsConditionalFormats_Clone.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormats_Clone, self.Ptr, intPtrparent)
-        ret = None if intPtr==None else SpireObject(intPtr)
+        ret = None if intPtr==None else XlsConditionalFormats(intPtr)
         return ret
 
 
@@ -617,6 +621,7 @@ class XlsConditionalFormats (  SpireObject, ICloneParent, IConditionalFormats) :
         GetDllLibXls().XlsConditionalFormats_GetEnumerator.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().XlsConditionalFormats_GetEnumerator, self.Ptr)
         ret = None if intPtr==None else IEnumerator(intPtr)
+        ret._gtype = XlsConditionalFormat
         return ret
 
 

spire/xls/interfaces/IChartErrorBars.py

@@ -301,6 +301,7 @@ class IChartErrorBars (SpireObject) :
             workbook.SaveToFile("Chart.xlsx")
 
         """
+        from spire.xls.charts.ChartShadow import ChartShadow
         GetDllLibXls().IChartErrorBars_get_Shadow.argtypes=[c_void_p]
         GetDllLibXls().IChartErrorBars_get_Shadow.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().IChartErrorBars_get_Shadow, self.Ptr)
@@ -315,6 +316,7 @@ class IChartErrorBars (SpireObject) :
         Gets the chart3 D options.
 
         """
+        from spire.xls.Format3D import Format3D
         GetDllLibXls().IChartErrorBars_get_Chart3DOptions.argtypes=[c_void_p]
         GetDllLibXls().IChartErrorBars_get_Chart3DOptions.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().IChartErrorBars_get_Chart3DOptions, self.Ptr)

spire/xls/interfaces/IChartTrendLine.py

@@ -19,6 +19,7 @@ class IChartTrendLine (SpireObject) :
         Gets the IThreeDFormat object. Read-only.[Deprecated]
 
         """
+        from spire.xls.Format3D import Format3D
         GetDllLibXls().IChartTrendLine_get_Chart3DOptions.argtypes=[c_void_p]
         GetDllLibXls().IChartTrendLine_get_Chart3DOptions.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().IChartTrendLine_get_Chart3DOptions, self.Ptr)

spire/xls/interfaces/IListObject.py

@@ -178,6 +178,7 @@ class IListObject (SpireObject) :
             workbook.SaveToFile("Table.xlsx")
 
         """
+        from spire.xls.XlsWorksheet import XlsWorksheet
         GetDllLibXls().IListObject_get_Worksheet.argtypes=[c_void_p]
         GetDllLibXls().IListObject_get_Worksheet.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().IListObject_get_Worksheet, self.Ptr)
@@ -434,6 +435,7 @@ class IListObject (SpireObject) :
         Gets the AutoFiltersCollection collection in the table. Read-only.
 
         """
+        from spire.xls.collection.AutoFiltersCollection import AutoFiltersCollection
         GetDllLibXls().IListObject_get_AutoFilters.argtypes=[c_void_p]
         GetDllLibXls().IListObject_get_AutoFilters.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().IListObject_get_AutoFilters, self.Ptr)

spire/xls/interfaces/IOleObject.py

@@ -43,6 +43,7 @@ class IOleObject (SpireObject) :
         Returns:
             IXLSRange: The range representing the location of the OLE object.
         """
+        from spire.xls.XlsRange import XlsRange
         GetDllLibXls().IOleObject_get_Location.argtypes=[c_void_p]
         GetDllLibXls().IOleObject_get_Location.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().IOleObject_get_Location, self.Ptr)
@@ -118,6 +119,7 @@ class IOleObject (SpireObject) :
         Returns:
             IPictureShape: The picture shape object associated with the OLE object.
         """
+        from spire.xls.XlsBitmapShape import XlsBitmapShape
         GetDllLibXls().IOleObject_get_Shape.argtypes=[c_void_p]
         GetDllLibXls().IOleObject_get_Shape.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().IOleObject_get_Shape, self.Ptr)

spire/xls/interfaces/IWorksheet.py

@@ -1218,21 +1218,21 @@ class IWorksheet (  ITabSheet, IExcelApplication) :
 
 
 
-    @abc.abstractmethod
-    def add_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
-        """
+    # @abc.abstractmethod
+    # def add_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
+    #     """
 
-        """
-        pass
+    #     """
+    #     pass
 
 
 
-    @abc.abstractmethod
-    def remove_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
-        """
+    # @abc.abstractmethod
+    # def remove_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
+    #     """
 
-        """
-        pass
+    #     """
+    #     pass
 
 
     @property

spire/xls/interfaces/ImportObjectOptions.py

@@ -12,6 +12,13 @@ class ImportObjectOptions (SpireObject) :
     
     This class provides various settings to control how data is imported into Excel worksheets.
     """
+    @dispatch
+    def __init__(self):
+        GetDllLibXls().ImportObjectOptions_Create.restype = c_void_p
+        intPtr = CallCFunction(GetDllLibXls().ImportObjectOptions_Create)
+
+        super(ImportObjectOptions, self).__init__(intPtr)
+
     @property
     def ConvertNumericData(self)->bool:
         """

spire/xls/interfaces/collections/IShapes.py

@@ -84,9 +84,9 @@ class IShapes (  IEnumerable[XlsShape]) :
 
         """
         
-        GetDllLibXls().IShapes_AddComment.argtypes=[c_void_p ,c_void_p,c_bool]
-        GetDllLibXls().IShapes_AddComment.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().IShapes_AddComment, self.Ptr, commentText,bIsParseOptions)
+        GetDllLibXls().IShapes_AddCommentCB.argtypes=[c_void_p ,c_void_p,c_bool]
+        GetDllLibXls().IShapes_AddCommentCB.restype=c_void_p
+        intPtr = CallCFunction(GetDllLibXls().IShapes_AddCommentCB, self.Ptr, commentText,bIsParseOptions)
         ret = None if intPtr==None else XlsComment(intPtr)
         return ret
 
@@ -111,9 +111,9 @@ class IShapes (  IEnumerable[XlsShape]) :
         """
 
         """
-        GetDllLibXls().IShapes_AddComment1.argtypes=[c_void_p]
-        GetDllLibXls().IShapes_AddComment1.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().IShapes_AddComment1, self.Ptr)
+        GetDllLibXls().IShapes_AddComment.argtypes=[c_void_p]
+        GetDllLibXls().IShapes_AddComment.restype=c_void_p
+        intPtr = CallCFunction(GetDllLibXls().IShapes_AddComment, self.Ptr)
         ret = None if intPtr==None else XlsComment(intPtr)
         return ret
 

spire/xls/interfaces/pivot_table/IPivotTableOptions.py

@@ -188,7 +188,7 @@ class IPivotTableOptions (SpireObject) :
         CallCFunction(GetDllLibXls().IPivotTableOptions_set_EnableFieldProperties, self.Ptr, value)
 
     @property
-    def Indent(self)->'UInt32':
+    def Indent(self)->int:
         """
         Gets or sets the indent value for the PivotTable.
 
@@ -196,15 +196,14 @@ class IPivotTableOptions (SpireObject) :
             UInt32: The indent value.
         """
         GetDllLibXls().IPivotTableOptions_get_Indent.argtypes=[c_void_p]
-        GetDllLibXls().IPivotTableOptions_get_Indent.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().IPivotTableOptions_get_Indent, self.Ptr)
-        ret = None if intPtr==None else UInt32(intPtr)
+        GetDllLibXls().IPivotTableOptions_get_Indent.restype=c_int
+        ret = CallCFunction(GetDllLibXls().IPivotTableOptions_get_Indent, self.Ptr)
         return ret
 
     @Indent.setter
-    def Indent(self, value:'UInt32'):
-        GetDllLibXls().IPivotTableOptions_set_Indent.argtypes=[c_void_p, c_void_p]
-        CallCFunction(GetDllLibXls().IPivotTableOptions_set_Indent, self.Ptr, value.Ptr)
+    def Indent(self, value:int):
+        GetDllLibXls().IPivotTableOptions_set_Indent.argtypes=[c_void_p, c_int]
+        CallCFunction(GetDllLibXls().IPivotTableOptions_set_Indent, self.Ptr, value)
 
     @property
     def ErrorString(self)->str:
@@ -490,18 +489,17 @@ class IPivotTableOptions (SpireObject) :
         CallCFunction(GetDllLibXls().IPivotTableOptions_set_ShowDrillIndicators, self.Ptr, value)
 
     @property
-    def DataPosition(self)->'Int16':
+    def DataPosition(self)->int:
         """
 
         """
         GetDllLibXls().IPivotTableOptions_get_DataPosition.argtypes=[c_void_p]
-        GetDllLibXls().IPivotTableOptions_get_DataPosition.restype=c_void_p
-        intPtr = CallCFunction(GetDllLibXls().IPivotTableOptions_get_DataPosition, self.Ptr)
-        ret = None if intPtr==None else Int16(intPtr)
+        GetDllLibXls().IPivotTableOptions_get_DataPosition.restype=c_int
+        ret = CallCFunction(GetDllLibXls().IPivotTableOptions_get_DataPosition, self.Ptr)
         return ret
 
     @DataPosition.setter
-    def DataPosition(self, value:'Int16'):
-        GetDllLibXls().IPivotTableOptions_set_DataPosition.argtypes=[c_void_p, c_void_p]
-        CallCFunction(GetDllLibXls().IPivotTableOptions_set_DataPosition, self.Ptr, value.Ptr)
+    def DataPosition(self, value:int):
+        GetDllLibXls().IPivotTableOptions_set_DataPosition.argtypes=[c_void_p, c_int]
+        CallCFunction(GetDllLibXls().IPivotTableOptions_set_DataPosition, self.Ptr, value)
 

spire/xls/pivot_tables/PivotDataField.py

@@ -157,7 +157,7 @@ class PivotDataField (  SpireObject, IPivotDataField, ICloneParent) :
         GetDllLibXls().PivotDataField_Clone.argtypes=[c_void_p ,c_void_p]
         GetDllLibXls().PivotDataField_Clone.restype=c_void_p
         intPtr = CallCFunction(GetDllLibXls().PivotDataField_Clone, self.Ptr, intPtrparent)
-        ret = None if intPtr==None else SpireObject(intPtr)
+        ret = None if intPtr==None else PivotDataField(intPtr)
         return ret
 
 

spire/xls/pivot_tables/PivotReportFilter.py

@@ -79,9 +79,9 @@ class PivotReportFilter (SpireObject) :
         Args:
             fieldName (str): The name of the field to use as a report filter.
         """
-        GetDllLibXls().PivotReportFilter_Create.argtypes=[ c_void_p]
-        GetDllLibXls().PivotReportFilter_Create.restype = c_void_p
-        intPtr = CallCFunction(GetDllLibXls().PivotReportFilter_Create,fieldName)
+        GetDllLibXls().PivotReportFilter_CreateF.argtypes=[ c_void_p]
+        GetDllLibXls().PivotReportFilter_CreateF.restype = c_void_p
+        intPtr = CallCFunction(GetDllLibXls().PivotReportFilter_CreateF,fieldName)
         
         super(PivotReportFilter, self).__init__(intPtr)
     """
@@ -124,7 +124,7 @@ class PivotReportFilter (SpireObject) :
         GetDllLibXls().PivotReportFilter_get_FilterItemStrings.argtypes=[c_void_p]
         GetDllLibXls().PivotReportFilter_get_FilterItemStrings.restype=IntPtrArray
         intPtrArray = CallCFunction(GetDllLibXls().PivotReportFilter_get_FilterItemStrings, self.Ptr)
-        ret = GetStrVectorFromArray(intPtrArray, str)
+        ret = GetStrVectorFromArray(intPtrArray, c_void_p)
         return ret