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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. spire/xls/AddtionalFormatWrapper.py +18 -15
  2. spire/xls/CellRange.py +10 -8
  3. spire/xls/CellStyleFlag.py +7 -0
  4. spire/xls/CellStyleObject.py +19 -12
  5. spire/xls/CommentsRange.py +6 -17
  6. spire/xls/ConverterSetting.py +15 -0
  7. spire/xls/DocumentProperty.py +1 -1
  8. spire/xls/ExcelCommentObject.py +6 -1
  9. spire/xls/ExcelFont.py +21 -15
  10. spire/xls/ExcelGradient.py +2 -0
  11. spire/xls/ExcelInterior.py +0 -13
  12. spire/xls/ExportTableOptions.py +6 -0
  13. spire/xls/Font.py +103 -103
  14. spire/xls/FontWrapper.py +20 -18
  15. spire/xls/GradientStops.py +1 -1
  16. spire/xls/HPageBreak.py +1 -0
  17. spire/xls/HyperLink.py +1 -0
  18. spire/xls/MsoTextFrame.py +102 -0
  19. spire/xls/RangeRichTextString.py +2 -2
  20. spire/xls/ReferRangeArea.py +0 -8
  21. spire/xls/RichText.py +1 -1
  22. spire/xls/RichTextShape.py +2 -1
  23. spire/xls/RichTextString.py +1 -0
  24. spire/xls/ShapeGlow.py +1 -1
  25. spire/xls/TextSaveOptions.py +7 -0
  26. spire/xls/VPageBreak.py +1 -0
  27. spire/xls/Workbook.py +85 -86
  28. spire/xls/Worksheet.py +63 -12
  29. spire/xls/XlsAddInFunction.py +4 -4
  30. spire/xls/XlsArcShape.py +1 -1
  31. spire/xls/XlsBorder.py +1 -0
  32. spire/xls/XlsButtonShape.py +1 -1
  33. spire/xls/XlsComment.py +1 -1
  34. spire/xls/XlsDataValidationTable.py +3 -1
  35. spire/xls/XlsFont.py +20 -14
  36. spire/xls/XlsName.py +14 -15
  37. spire/xls/XlsOvalShape.py +1 -1
  38. spire/xls/XlsPageSetup.py +8 -2
  39. spire/xls/XlsRadioButtonShape.py +21 -51
  40. spire/xls/XlsRange.py +26 -10
  41. spire/xls/XlsRectangleShape.py +1 -1
  42. spire/xls/XlsShape.py +7 -5
  43. spire/xls/XlsShapeFill.py +3 -0
  44. spire/xls/XlsStyle.py +3 -3
  45. spire/xls/XlsValidation.py +7 -4
  46. spire/xls/XlsWorkbook.py +50 -29
  47. spire/xls/XlsWorksheet.py +118 -121
  48. spire/xls/XlsWorksheetBase.py +39 -20
  49. spire/xls/__init__.py +2 -1
  50. spire/xls/autofilter/AutoFitterOptions.py +7 -0
  51. spire/xls/autofilter/CustomFilter.py +9 -1
  52. spire/xls/autofilter/FilterColumn.py +2 -2
  53. spire/xls/autofilter/XlsAutoFiltersCollection.py +1 -0
  54. spire/xls/charts/ChartArea.py +1 -0
  55. spire/xls/charts/XlsChart.py +1 -1
  56. spire/xls/charts/XlsChartFrameFormat.py +2 -1
  57. spire/xls/collection/ArcShapeCollection.py +1 -1
  58. spire/xls/collection/AutoFiltersCollection.py +1 -0
  59. spire/xls/collection/BordersCollectionArrayWrapper.py +2 -2
  60. spire/xls/collection/ButtonShapeCollection.py +4 -4
  61. spire/xls/collection/DataConnections.py +1 -1
  62. spire/xls/collection/ExternalLinkCollection.py +2 -1
  63. spire/xls/collection/GroupBoxCollection.py +4 -4
  64. spire/xls/collection/QueryTableCollection.py +1 -1
  65. spire/xls/collection/RangesCollection.py +4 -3
  66. spire/xls/collection/ShapeCollectionBase.py +6 -6
  67. spire/xls/collection/WorksheetsCollection.py +6 -6
  68. spire/xls/collection/XlsBordersCollection.py +2 -2
  69. spire/xls/collection/XlsChartsCollection.py +10 -8
  70. spire/xls/collection/XlsDataValidationCollection.py +4 -2
  71. spire/xls/collection/XlsFontsCollection.py +2 -1
  72. spire/xls/collection/XlsRangesCollection.py +17 -10
  73. spire/xls/collection/XlsStylesCollection.py +2 -2
  74. spire/xls/collection/XlsWorkbookObjectsCollection.py +5 -4
  75. spire/xls/collection/pivot_table/XlsPivotCachesCollection.py +1 -0
  76. spire/xls/collection/pivot_table/XlsPivotTablesCollection.py +1 -0
  77. spire/xls/conditional_formatting/ConditionalFormatWrapper.py +2 -2
  78. spire/xls/conditional_formatting/XlsConditionalFormat.py +10 -2
  79. spire/xls/conditional_formatting/XlsConditionalFormats.py +10 -5
  80. spire/xls/interfaces/IWorksheet.py +10 -10
  81. spire/xls/interfaces/ImportObjectOptions.py +7 -0
  82. spire/xls/lib/Spire.Xls.Base.dll +0 -0
  83. spire/xls/pivot_tables/PivotStyle.py +1 -0
  84. spire/xls/pivot_tables/PivotTableStyle.py +19 -12
  85. {spire_xls-15.7.1.dist-info → spire_xls-15.11.1.dist-info}/METADATA +1 -1
  86. {spire_xls-15.7.1.dist-info → spire_xls-15.11.1.dist-info}/RECORD +88 -87
  87. {spire_xls-15.7.1.dist-info → spire_xls-15.11.1.dist-info}/WHEEL +0 -0
  88. {spire_xls-15.7.1.dist-info → spire_xls-15.11.1.dist-info}/top_level.txt +0 -0
spire/xls/XlsWorksheet.py CHANGED
@@ -158,7 +158,7 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
158
158
 
159
159
  @dispatch
160
160
 
161
- def Subtotal(self ,range:IXLSRange,groupByIndex:int,totalFields:List[int],subtotalType:SubtotalTypes):
161
+ def Subtotal(self ,cellRange:IXLSRange,groupByIndex:int,totalFields:List[int],subtotalType:SubtotalTypes):
162
162
  """Creates subtotals for the specified range.
163
163
 
164
164
  This method creates subtotals for the specified range using the given grouping field,
@@ -171,7 +171,7 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
171
171
  to which the subtotals are added.
172
172
  subtotalType (SubtotalTypes): The type of subtotal to calculate (e.g., sum, average, count).
173
173
  """
174
- intPtrrange:c_void_p = range.Ptr
174
+ intPtrrange:c_void_p = cellRange.Ptr
175
175
  #arraytotalFields:ArrayTypetotalFields = ""
176
176
  counttotalFields = len(totalFields)
177
177
  ArrayTypetotalFields = c_int * counttotalFields
@@ -266,7 +266,7 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
266
266
  GetDllLibXls().XlsWorksheet_GetDefaultRowStyle.argtypes=[c_void_p ,c_int]
267
267
  GetDllLibXls().XlsWorksheet_GetDefaultRowStyle.restype=c_void_p
268
268
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetDefaultRowStyle, self.Ptr, rowIndex)
269
- ret = None if intPtr==None else CellStyle(intPtr)
269
+ ret = None if intPtr==None else AddtionalFormatWrapper(intPtr)
270
270
  return ret
271
271
 
272
272
 
@@ -933,51 +933,51 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
933
933
  GetDllLibXls().XlsWorksheet_ReplaceONI11.argtypes=[c_void_p ,c_void_p,ArrayTypenewValues,c_int,c_bool]
934
934
  CallCFunction(GetDllLibXls().XlsWorksheet_ReplaceONI11, self.Ptr, oldValue,arraynewValues,countnewValues,isVertical)
935
935
 
936
- @dispatch
936
+ # @dispatch
937
937
 
938
- def SaveToImage(self ,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int)->Stream:
939
- """
938
+ # def SaveToImage(self ,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int)->Stream:
939
+ # """
940
940
 
941
- """
941
+ # """
942
942
 
943
- GetDllLibXls().XlsWorksheet_SaveToImage.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
944
- GetDllLibXls().XlsWorksheet_SaveToImage.restype=c_void_p
945
- intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImage, self.Ptr, firstRow,firstColumn,lastRow,lastColumn)
946
- ret = None if intPtr==None else Stream(intPtr)
947
- return ret
943
+ # GetDllLibXls().XlsWorksheet_SaveToImage.argtypes=[c_void_p ,c_int,c_int,c_int,c_int]
944
+ # GetDllLibXls().XlsWorksheet_SaveToImage.restype=c_void_p
945
+ # intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImage, self.Ptr, firstRow,firstColumn,lastRow,lastColumn)
946
+ # ret = None if intPtr==None else Stream(intPtr)
947
+ # return ret
948
948
 
949
949
 
950
- @dispatch
950
+ # @dispatch
951
951
 
952
- def SaveToImage(self ,fileName:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int):
953
- """
954
- Save worksheet to image.
952
+ # def SaveToImage(self ,fileName:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int):
953
+ # """
954
+ # Save worksheet to image.
955
955
 
956
- Args:
957
- fileName: file Name
958
- firstRow:
959
- firstColumn:
960
- lastRow:
961
- lastColumn:
956
+ # Args:
957
+ # fileName: file Name
958
+ # firstRow:
959
+ # firstColumn:
960
+ # lastRow:
961
+ # lastColumn:
962
962
 
963
- """
963
+ # """
964
964
 
965
- GetDllLibXls().XlsWorksheet_SaveToImageFFFLL.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int]
966
- CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageFFFLL, self.Ptr, fileName,firstRow,firstColumn,lastRow,lastColumn)
965
+ # GetDllLibXls().XlsWorksheet_SaveToImageFFFLL.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int]
966
+ # CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageFFFLL, self.Ptr, fileName,firstRow,firstColumn,lastRow,lastColumn)
967
967
 
968
- @dispatch
968
+ # @dispatch
969
969
 
970
- def SaveToImage(self ,fileName:str):
971
- """
972
- Save worksheet to image.
970
+ # def SaveToImage(self ,fileName:str):
971
+ # """
972
+ # Save worksheet to image.
973
973
 
974
- Args:
975
- fileName: file Name
974
+ # Args:
975
+ # fileName: file Name
976
976
 
977
- """
977
+ # """
978
978
 
979
- GetDllLibXls().XlsWorksheet_SaveToImageF.argtypes=[c_void_p ,c_void_p]
980
- CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageF, self.Ptr, fileName)
979
+ # GetDllLibXls().XlsWorksheet_SaveToImageF.argtypes=[c_void_p ,c_void_p]
980
+ # CallCFunction(GetDllLibXls().XlsWorksheet_SaveToImageF, self.Ptr, fileName)
981
981
 
982
982
  # @dispatch
983
983
 
@@ -1108,14 +1108,14 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
1108
1108
 
1109
1109
 
1110
1110
 
1111
- def SaveToEMFImage(self ,FilePath:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int,emfType:'EmfType'):
1112
- """
1111
+ # def SaveToEMFImage(self ,FilePath:str,firstRow:int,firstColumn:int,lastRow:int,lastColumn:int,emfType:'EmfType'):
1112
+ # """
1113
1113
 
1114
- """
1115
- enumemfType:c_int = emfType.value
1114
+ # """
1115
+ # enumemfType:c_int = emfType.value
1116
1116
 
1117
- GetDllLibXls().XlsWorksheet_SaveToEMFImage.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int,c_int]
1118
- CallCFunction(GetDllLibXls().XlsWorksheet_SaveToEMFImage, self.Ptr, FilePath,firstRow,firstColumn,lastRow,lastColumn,enumemfType)
1117
+ # GetDllLibXls().XlsWorksheet_SaveToEMFImage.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int,c_int,c_int]
1118
+ # CallCFunction(GetDllLibXls().XlsWorksheet_SaveToEMFImage, self.Ptr, FilePath,firstRow,firstColumn,lastRow,lastColumn,enumemfType)
1119
1119
 
1120
1120
  @dispatch
1121
1121
 
@@ -1858,7 +1858,7 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
1858
1858
  GetDllLibXls().XlsWorksheet_get_HPageBreaks.argtypes=[c_void_p]
1859
1859
  GetDllLibXls().XlsWorksheet_get_HPageBreaks.restype=c_void_p
1860
1860
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_HPageBreaks, self.Ptr)
1861
- ret = None if intPtr==None else IHPageBreaks(intPtr)
1861
+ ret = None if intPtr==None else HPageBreaksCollection(intPtr)
1862
1862
  return ret
1863
1863
 
1864
1864
 
@@ -1871,7 +1871,7 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
1871
1871
  GetDllLibXls().XlsWorksheet_get_HyperLinks.argtypes=[c_void_p]
1872
1872
  GetDllLibXls().XlsWorksheet_get_HyperLinks.restype=c_void_p
1873
1873
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_HyperLinks, self.Ptr)
1874
- ret = None if intPtr==None else IHyperLinks(intPtr)
1874
+ ret = None if intPtr==None else HyperLinksCollection(intPtr)
1875
1875
  return ret
1876
1876
 
1877
1877
 
@@ -2084,14 +2084,13 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
2084
2084
 
2085
2085
 
2086
2086
 
2087
- def SetCaculateValue(self ,value:'SpireObject',row:int,col:int):
2087
+ def SetCaculateValue(self ,value:str,row:int,col:int):
2088
2088
  """
2089
2089
 
2090
2090
  """
2091
- intPtrvalue:c_void_p = value.Ptr
2092
2091
 
2093
- GetDllLibXls().XlsWorksheet_SetCaculateValue.argtypes=[c_void_p ,c_void_p,c_int,c_int]
2094
- CallCFunction(GetDllLibXls().XlsWorksheet_SetCaculateValue, self.Ptr, intPtrvalue,row,col)
2092
+ GetDllLibXls().XlsWorksheet_SetCaculateValue.argtypes=[c_void_p ,c_wchar_p,c_int,c_int]
2093
+ CallCFunction(GetDllLibXls().XlsWorksheet_SetCaculateValue, self.Ptr, value,row,col)
2095
2094
 
2096
2095
  # @dispatch
2097
2096
  #
@@ -3176,24 +3175,24 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
3176
3175
  #
3177
3176
 
3178
3177
 
3179
- @dispatch
3178
+ # @dispatch
3180
3179
 
3181
- def GetStringValue(self ,cellIndex:int)->str:
3182
- """
3183
- Returns string value corresponding to the cell.
3180
+ # def GetStringValue(self ,cellIndex:int)->str:
3181
+ # """
3182
+ # Returns string value corresponding to the cell.
3184
3183
 
3185
- Args:
3186
- iCellIndex: Cell index to get value from.
3184
+ # Args:
3185
+ # iCellIndex: Cell index to get value from.
3187
3186
 
3188
- Returns:
3189
- String contained by the cell.
3187
+ # Returns:
3188
+ # String contained by the cell.
3190
3189
 
3191
- """
3190
+ # """
3192
3191
 
3193
- GetDllLibXls().XlsWorksheet_GetStringValue.argtypes=[c_void_p ,c_long]
3194
- GetDllLibXls().XlsWorksheet_GetStringValue.restype=c_void_p
3195
- ret = PtrToStr(CallCFunction(GetDllLibXls().XlsWorksheet_GetStringValue, self.Ptr, cellIndex))
3196
- return ret
3192
+ # GetDllLibXls().XlsWorksheet_GetStringValue.argtypes=[c_void_p ,c_long]
3193
+ # GetDllLibXls().XlsWorksheet_GetStringValue.restype=c_void_p
3194
+ # ret = PtrToStr(CallCFunction(GetDllLibXls().XlsWorksheet_GetStringValue, self.Ptr, cellIndex))
3195
+ # return ret
3197
3196
 
3198
3197
 
3199
3198
  @dispatch
@@ -3217,25 +3216,25 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
3217
3216
  return ret
3218
3217
 
3219
3218
 
3220
- @dispatch
3219
+ # @dispatch
3221
3220
 
3222
- def GetTextObject(self ,cellIndex:int)->SpireObject:
3223
- """
3224
- Returns TextWithFormat object corresponding to the specified cell.
3221
+ # def GetTextObject(self ,cellIndex:int)->SpireObject:
3222
+ # """
3223
+ # Returns TextWithFormat object corresponding to the specified cell.
3225
3224
 
3226
- Args:
3227
- cellIndex: Cell index.
3225
+ # Args:
3226
+ # cellIndex: Cell index.
3228
3227
 
3229
- Returns:
3230
- Object corresponding to the specified cell.
3228
+ # Returns:
3229
+ # Object corresponding to the specified cell.
3231
3230
 
3232
- """
3231
+ # """
3233
3232
 
3234
- GetDllLibXls().XlsWorksheet_GetTextObject.argtypes=[c_void_p ,c_long]
3235
- GetDllLibXls().XlsWorksheet_GetTextObject.restype=c_void_p
3236
- intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObject, self.Ptr, cellIndex)
3237
- ret = None if intPtr==None else SpireObject(intPtr)
3238
- return ret
3233
+ # GetDllLibXls().XlsWorksheet_GetTextObject.argtypes=[c_void_p ,c_long]
3234
+ # GetDllLibXls().XlsWorksheet_GetTextObject.restype=c_void_p
3235
+ # intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObject, self.Ptr, cellIndex)
3236
+ # ret = None if intPtr==None else SpireObject(intPtr)
3237
+ # return ret
3239
3238
 
3240
3239
 
3241
3240
  @dispatch
@@ -3255,25 +3254,23 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
3255
3254
 
3256
3255
  GetDllLibXls().XlsWorksheet_GetTextObjectRC.argtypes=[c_void_p ,c_int,c_int]
3257
3256
  GetDllLibXls().XlsWorksheet_GetTextObjectRC.restype=c_void_p
3258
- intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObjectRC, self.Ptr, row,column)
3259
- ret = None if intPtr==None else SpireObject(intPtr)
3260
- return ret
3257
+ return PtrToStr(CallCFunction(GetDllLibXls().XlsWorksheet_GetTextObjectRC, self.Ptr, row,column))
3261
3258
 
3262
3259
 
3263
3260
 
3264
- def HasArrayFormula(self ,cellIndex:int)->bool:
3265
- """
3266
- Indicates whether cell contains array-entered formula.
3261
+ # def HasArrayFormula(self ,cellIndex:int)->bool:
3262
+ # """
3263
+ # Indicates whether cell contains array-entered formula.
3267
3264
 
3268
- Args:
3269
- cellIndex: cell index.
3265
+ # Args:
3266
+ # cellIndex: cell index.
3270
3267
 
3271
- """
3268
+ # """
3272
3269
 
3273
- GetDllLibXls().XlsWorksheet_HasArrayFormula.argtypes=[c_void_p ,c_long]
3274
- GetDllLibXls().XlsWorksheet_HasArrayFormula.restype=c_bool
3275
- ret = CallCFunction(GetDllLibXls().XlsWorksheet_HasArrayFormula, self.Ptr, cellIndex)
3276
- return ret
3270
+ # GetDllLibXls().XlsWorksheet_HasArrayFormula.argtypes=[c_void_p ,c_long]
3271
+ # GetDllLibXls().XlsWorksheet_HasArrayFormula.restype=c_bool
3272
+ # ret = CallCFunction(GetDllLibXls().XlsWorksheet_HasArrayFormula, self.Ptr, cellIndex)
3273
+ # return ret
3277
3274
 
3278
3275
 
3279
3276
  def HasArrayFormulaRecord(self ,row:int,column:int)->bool:
@@ -3339,17 +3336,17 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
3339
3336
  GetDllLibXls().XlsWorksheet_InsertCutRange.argtypes=[c_void_p ,c_void_p,c_int,c_int,c_int]
3340
3337
  CallCFunction(GetDllLibXls().XlsWorksheet_InsertCutRange, self.Ptr, intPtrcutRange,rowIndex,colIndex,enummoveOptions)
3341
3338
 
3342
- @dispatch
3339
+ # @dispatch
3343
3340
 
3344
- def IsArrayFormula(self ,cellIndex:int)->bool:
3345
- """
3341
+ # def IsArrayFormula(self ,cellIndex:int)->bool:
3342
+ # """
3346
3343
 
3347
- """
3344
+ # """
3348
3345
 
3349
- GetDllLibXls().XlsWorksheet_IsArrayFormula.argtypes=[c_void_p ,c_long]
3350
- GetDllLibXls().XlsWorksheet_IsArrayFormula.restype=c_bool
3351
- ret = CallCFunction(GetDllLibXls().XlsWorksheet_IsArrayFormula, self.Ptr, cellIndex)
3352
- return ret
3346
+ # GetDllLibXls().XlsWorksheet_IsArrayFormula.argtypes=[c_void_p ,c_long]
3347
+ # GetDllLibXls().XlsWorksheet_IsArrayFormula.restype=c_bool
3348
+ # ret = CallCFunction(GetDllLibXls().XlsWorksheet_IsArrayFormula, self.Ptr, cellIndex)
3349
+ # return ret
3353
3350
 
3354
3351
  @dispatch
3355
3352
 
@@ -3643,29 +3640,29 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
3643
3640
  GetDllLibXls().XlsWorksheet_GetDefaultColumnStyle.argtypes=[c_void_p ,c_int]
3644
3641
  GetDllLibXls().XlsWorksheet_GetDefaultColumnStyle.restype=c_void_p
3645
3642
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_GetDefaultColumnStyle, self.Ptr, columnIndex)
3646
- ret = None if intPtr==None else CellStyle(intPtr)
3643
+ ret = None if intPtr==None else AddtionalFormatWrapper(intPtr)
3647
3644
  return ret
3648
3645
 
3649
3646
 
3650
3647
 
3651
- def add_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
3652
- """
3648
+ # def add_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
3649
+ # """
3653
3650
 
3654
- """
3655
- intPtrvalue:c_void_p = value.Ptr
3651
+ # """
3652
+ # intPtrvalue:c_void_p = value.Ptr
3656
3653
 
3657
- GetDllLibXls().XlsWorksheet_add_CellValueChanged.argtypes=[c_void_p ,c_void_p]
3658
- CallCFunction(GetDllLibXls().XlsWorksheet_add_CellValueChanged, self.Ptr, intPtrvalue)
3654
+ # GetDllLibXls().XlsWorksheet_add_CellValueChanged.argtypes=[c_void_p ,c_void_p]
3655
+ # CallCFunction(GetDllLibXls().XlsWorksheet_add_CellValueChanged, self.Ptr, intPtrvalue)
3659
3656
 
3660
3657
 
3661
- def remove_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
3662
- """
3658
+ # def remove_CellValueChanged(self ,value:'CellValueChangedEventHandler'):
3659
+ # """
3663
3660
 
3664
- """
3665
- intPtrvalue:c_void_p = value.Ptr
3661
+ # """
3662
+ # intPtrvalue:c_void_p = value.Ptr
3666
3663
 
3667
- GetDllLibXls().XlsWorksheet_remove_CellValueChanged.argtypes=[c_void_p ,c_void_p]
3668
- CallCFunction(GetDllLibXls().XlsWorksheet_remove_CellValueChanged, self.Ptr, intPtrvalue)
3664
+ # GetDllLibXls().XlsWorksheet_remove_CellValueChanged.argtypes=[c_void_p ,c_void_p]
3665
+ # CallCFunction(GetDllLibXls().XlsWorksheet_remove_CellValueChanged, self.Ptr, intPtrvalue)
3669
3666
 
3670
3667
  @property
3671
3668
  def Copying(self)->bool:
@@ -3716,7 +3713,7 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
3716
3713
  GetDllLibXls().XlsWorksheet_get_AutoFilters.argtypes=[c_void_p]
3717
3714
  GetDllLibXls().XlsWorksheet_get_AutoFilters.restype=c_void_p
3718
3715
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_AutoFilters, self.Ptr)
3719
- ret = None if intPtr==None else IAutoFilters(intPtr)
3716
+ ret = None if intPtr==None else AutoFiltersCollection(intPtr)
3720
3717
  return ret
3721
3718
 
3722
3719
 
@@ -3735,18 +3732,18 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
3735
3732
  return ret
3736
3733
 
3737
3734
 
3738
- # @property
3739
- #
3740
- # def CellList(self)->'List1':
3741
- # """
3742
- #
3743
- # """
3744
- # GetDllLibXls().XlsWorksheet_get_CellList.argtypes=[c_void_p]
3745
- # GetDllLibXls().XlsWorksheet_get_CellList.restype=c_void_p
3746
- # intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_CellList, self.Ptr)
3747
- # ret = None if intPtr==None else List1(intPtr)
3748
- # return ret
3749
- #
3735
+ @property
3736
+
3737
+ def CellList(self)->List['CellRange']:
3738
+ """
3739
+
3740
+ """
3741
+ GetDllLibXls().XlsWorksheet_get_CellList.argtypes=[c_void_p]
3742
+ GetDllLibXls().XlsWorksheet_get_CellList.restype=c_void_p
3743
+ intPtrArray = CallCFunction(GetDllLibXls().XlsWorksheet_get_CellList, self.Ptr)
3744
+ ret = GetObjVectorFromArray(intPtrArray, CellRange)
3745
+ return ret
3746
+
3750
3747
 
3751
3748
 
3752
3749
  @property
@@ -4236,7 +4233,7 @@ class XlsWorksheet ( XlsWorksheetBase, IInternalWorksheet) :
4236
4233
  GetDllLibXls().XlsWorksheet_get_VPageBreaks.argtypes=[c_void_p]
4237
4234
  GetDllLibXls().XlsWorksheet_get_VPageBreaks.restype=c_void_p
4238
4235
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheet_get_VPageBreaks, self.Ptr)
4239
- ret = None if intPtr==None else IVPageBreaks(intPtr)
4236
+ ret = None if intPtr==None else VPageBreaksCollection(intPtr)
4240
4237
  return ret
4241
4238
 
4242
4239
 
@@ -10,7 +10,24 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
10
10
  """
11
11
 
12
12
  """
13
-
13
+
14
+ def ClearCellImageCache(self):
15
+ """
16
+ Clear Cell image array cache,not delete CellImage in cell.
17
+ """
18
+
19
+ GetDllLibXls().XlsWorksheet_ClearCellImageCache.argtypes=[c_void_p]
20
+ CallCFunction(GetDllLibXls().XlsWorksheet_ClearCellImageCache, self.Ptr)
21
+
22
+ def CellImages(self )->List['ExcelPicture']:
23
+ """
24
+ Cell image array. Read-only
25
+ """
26
+ GetDllLibXls().XlsWorksheet_CellImages.argtypes=[c_void_p ,c_void_p]
27
+ GetDllLibXls().XlsWorksheet_CellImages.restype=IntPtrArray
28
+ intPtrArray = CallCFunction(GetDllLibXls().XlsWorksheet_CellImages, self.Ptr)
29
+ ret = GetObjVectorFromArray(intPtrArray, ExcelPicture)
30
+ return ret
14
31
 
15
32
  def GetShapes(self)->'IShapes':
16
33
  """
@@ -64,8 +81,8 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
64
81
  Check: Whether to validate selection state
65
82
  """
66
83
 
67
- GetDllLibXls().XlsWorksheetBase_Unselect.argtypes=[c_void_p ,c_bool]
68
- CallCFunction(GetDllLibXls().XlsWorksheetBase_Unselect, self.Ptr, Check)
84
+ GetDllLibXls().XlsWorksheetBase_UnselectC.argtypes=[c_void_p ,c_bool]
85
+ CallCFunction(GetDllLibXls().XlsWorksheetBase_UnselectC, self.Ptr, Check)
69
86
 
70
87
  @dispatch
71
88
 
@@ -75,7 +92,7 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
75
92
 
76
93
  Args:
77
94
  password: Protection password.
78
-
95
+ options:Specify which actions are allowed while the worksheet is protected.
79
96
  """
80
97
  enumoptions:c_int = options.value
81
98
 
@@ -171,7 +188,7 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
171
188
  GetDllLibXls().XlsWorksheetBase_AddTextEffectShape.argtypes=[c_void_p ,c_int,c_void_p,c_int,c_int,c_int,c_int,c_int,c_int]
172
189
  GetDllLibXls().XlsWorksheetBase_AddTextEffectShape.restype=c_void_p
173
190
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheetBase_AddTextEffectShape, self.Ptr, enumeffect,text,upperLeftRow,top,upperLeftColumn,left,height,width)
174
- ret = None if intPtr==None else IShape(intPtr)
191
+ ret = None if intPtr==None else XlsShape(intPtr)
175
192
  return ret
176
193
 
177
194
 
@@ -261,10 +278,11 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
261
278
  Returns:
262
279
  IWorkbook: Parent workbook object
263
280
  """
281
+ from spire.xls.XlsWorkbook import XlsWorkbook
264
282
  GetDllLibXls().XlsWorksheetBase_get_Workbook.argtypes=[c_void_p]
265
283
  GetDllLibXls().XlsWorksheetBase_get_Workbook.restype=c_void_p
266
284
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheetBase_get_Workbook, self.Ptr)
267
- ret = None if intPtr==None else IWorkbook(intPtr)
285
+ ret = None if intPtr==None else XlsWorkbook(intPtr)
268
286
  return ret
269
287
 
270
288
 
@@ -807,8 +825,8 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
807
825
 
808
826
  @IsRowColHeadersVisible.setter
809
827
  def IsRowColHeadersVisible(self, value:bool):
810
- GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisible.argtypes=[c_void_p, c_bool]
811
- CallCFunction(GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisible, self.Ptr, value)
828
+ GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisibleV.argtypes=[c_void_p, c_bool]
829
+ CallCFunction(GetDllLibXls().XlsWorksheetBase_set_IsRowColHeadersVisibleV, self.Ptr, value)
812
830
 
813
831
  @property
814
832
  def IsRightToLeft(self)->bool:
@@ -835,6 +853,7 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
835
853
  Returns:
836
854
  XlsWorkbook: Parent workbook instance
837
855
  """
856
+ from spire.xls.XlsWorkbook import XlsWorkbook
838
857
  GetDllLibXls().XlsWorksheetBase_get_ParentWorkbook.argtypes=[c_void_p]
839
858
  GetDllLibXls().XlsWorksheetBase_get_ParentWorkbook.restype=c_void_p
840
859
  intPtr = CallCFunction(GetDllLibXls().XlsWorksheetBase_get_ParentWorkbook, self.Ptr)
@@ -1326,18 +1345,18 @@ class XlsWorksheetBase ( XlsObject, INamedObject, ITabSheet, ICloneParent) :
1326
1345
  """
1327
1346
  Unselects the worksheet in the workbook UI.
1328
1347
  """
1329
- GetDllLibXls().XlsWorksheetBase_Unselect1.argtypes=[c_void_p]
1330
- CallCFunction(GetDllLibXls().XlsWorksheetBase_Unselect1, self.Ptr)
1331
-
1332
- @staticmethod
1333
- def DEF_MIN_COLUMN_INDEX()->int:
1334
- """
1335
- Gets the minimum allowed column index constant for the worksheet.
1336
- """
1337
- #GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.argtypes=[]
1338
- GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.restype=c_int
1339
- ret = CallCFunction(GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX)
1340
- return ret
1348
+ GetDllLibXls().XlsWorksheetBase_Unselect.argtypes=[c_void_p]
1349
+ CallCFunction(GetDllLibXls().XlsWorksheetBase_Unselect, self.Ptr)
1350
+
1351
+ # @staticmethod
1352
+ # def DEF_MIN_COLUMN_INDEX()->int:
1353
+ # """
1354
+ # Gets the minimum allowed column index constant for the worksheet.
1355
+ # """
1356
+ # #GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.argtypes=[]
1357
+ # GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX.restype=c_int
1358
+ # ret = CallCFunction(GetDllLibXls().XlsWorksheetBase_DEF_MIN_COLUMN_INDEX)
1359
+ # return ret
1341
1360
 
1342
1361
  @property
1343
1362
  def TabIndex(self)->int:
spire/xls/__init__.py CHANGED
@@ -266,7 +266,7 @@ from spire.xls.XlsObject import XlsObject
266
266
  from spire.xls.interfaces.ImportObjectOptions import ImportObjectOptions
267
267
  from spire.xls.QueryTableXls import QueryTableXls
268
268
  from spire.xls.ReferRangeArea import ReferRangeArea
269
- from spire.xls.ReferRangeArea import ListReferRangeAreas
269
+ # from spire.xls.ReferRangeArea import ListReferRangeAreas
270
270
  from spire.xls.license.LicenseProvider import LicenseProvider
271
271
 
272
272
  from spire.xls.interfaces.ICloneParent import ICloneParent
@@ -434,6 +434,7 @@ from spire.xls.interfaces.ITextBoxLinkShape import ITextBoxLinkShape
434
434
  from spire.xls.interfaces.collections.ITextBoxes import ITextBoxes
435
435
  from spire.xls.TextBoxShapeBase import TextBoxShapeBase
436
436
  from spire.xls.interfaces.ITextFrame import ITextFrame
437
+ from spire.xls.MsoTextFrame import MsoTextFrame
437
438
  from spire.xls.interfaces.sorting.IDataSort import IDataSort
438
439
  from spire.xls.interfaces.ISortColumn import ISortColumn
439
440
  from spire.xls.interfaces.ISortColumns import ISortColumns
@@ -10,6 +10,13 @@ class AutoFitterOptions (SpireObject) :
10
10
  """
11
11
  Configuration options for automatic column/row sizing operations.
12
12
  """
13
+ @dispatch
14
+ def __init__(self):
15
+ GetDllLibXls().AutoFitterOptions_Create.restype = c_void_p
16
+ intPtr = CallCFunction(GetDllLibXls().AutoFitterOptions_Create)
17
+
18
+ super(AutoFitterOptions, self).__init__(intPtr)
19
+
13
20
  @property
14
21
  def AutoFitMergedCells(self)->bool:
15
22
  """
@@ -6,10 +6,18 @@ from spire.xls import *
6
6
  from ctypes import *
7
7
  import abc
8
8
 
9
- class CustomFilter ( IAutoFilterCondition) :
9
+ class CustomFilter (SpireObject, IAutoFilterCondition) :
10
10
  """
11
11
 
12
12
  """
13
+
14
+ @dispatch
15
+ def __init__(self):
16
+ GetDllLibXls().CustomFilter_Create.restype = c_void_p
17
+ intPtr = CallCFunction(GetDllLibXls().CustomFilter_Create)
18
+
19
+ super(CustomFilter, self).__init__(intPtr)
20
+
13
21
  @property
14
22
 
15
23
  def FilterOperatorType(self)->'FilterOperatorType':
@@ -244,7 +244,7 @@ class FilterColumn ( SpireObject,IAutoFilter) :
244
244
  GetDllLibXls().FilterColumn_get_SecondCondition.argtypes=[c_void_p]
245
245
  GetDllLibXls().FilterColumn_get_SecondCondition.restype=c_void_p
246
246
  intPtr = CallCFunction(GetDllLibXls().FilterColumn_get_SecondCondition, self.Ptr)
247
- ret = None if intPtr==None else IAutoFilterCondition(intPtr)
247
+ ret = None if intPtr==None else CustomFilter(intPtr)
248
248
  return ret
249
249
 
250
250
  @property
@@ -258,7 +258,7 @@ class FilterColumn ( SpireObject,IAutoFilter) :
258
258
  GetDllLibXls().FilterColumn_get_FirstCondition.argtypes=[c_void_p]
259
259
  GetDllLibXls().FilterColumn_get_FirstCondition.restype=c_void_p
260
260
  intPtr = CallCFunction(GetDllLibXls().FilterColumn_get_FirstCondition, self.Ptr)
261
- ret = None if intPtr==None else IAutoFilterCondition(intPtr)
261
+ ret = None if intPtr==None else CustomFilter(intPtr)
262
262
  return ret
263
263
 
264
264
  @property
@@ -73,6 +73,7 @@ class XlsAutoFiltersCollection ( SpireObject, IAutoFilters) :
73
73
  Returns:
74
74
  Worksheet: The worksheet object.
75
75
  """
76
+ from spire.xls.Worksheet import Worksheet
76
77
  GetDllLibXls().XlsAutoFiltersCollection_get_Worksheet.argtypes=[c_void_p]
77
78
  GetDllLibXls().XlsAutoFiltersCollection_get_Worksheet.restype=c_void_p
78
79
  intPtr = CallCFunction(GetDllLibXls().XlsAutoFiltersCollection_get_Worksheet, self.Ptr)
@@ -48,6 +48,7 @@ class ChartArea ( XlsChartFrameFormat) :
48
48
  workbook.SaveToFile("Chart.xlsx")
49
49
 
50
50
  """
51
+ from spire.xls.charts.ChartInterior import ChartInterior
51
52
  GetDllLibXls().ChartArea_get_Interior.argtypes=[c_void_p]
52
53
  GetDllLibXls().ChartArea_get_Interior.restype=c_void_p
53
54
  intPtr = CallCFunction(GetDllLibXls().ChartArea_get_Interior, self.Ptr)
@@ -1421,7 +1421,7 @@ class XlsChart ( XlsWorksheetBase, ICloneParent, IChart) :
1421
1421
  GetDllLibXls().XlsChart_get_ChartTitleFont.argtypes=[c_void_p]
1422
1422
  GetDllLibXls().XlsChart_get_ChartTitleFont.restype=c_void_p
1423
1423
  intPtr = CallCFunction(GetDllLibXls().XlsChart_get_ChartTitleFont, self.Ptr)
1424
- ret = None if intPtr==None else XlsFont(intPtr)
1424
+ ret = None if intPtr==None else ChartTextArea(intPtr)
1425
1425
  return ret
1426
1426
 
1427
1427
 
@@ -166,10 +166,11 @@ class XlsChartFrameFormat ( XlsObject, IChartFrameFormat, IChartFillBorder) :
166
166
  workbook.SaveToFile("Chart.xlsx")
167
167
 
168
168
  """
169
+ from spire.xls.charts.XlsChartFill import XlsChartFill
169
170
  GetDllLibXls().XlsChartFrameFormat_get_Fill.argtypes=[c_void_p]
170
171
  GetDllLibXls().XlsChartFrameFormat_get_Fill.restype=c_void_p
171
172
  intPtr = CallCFunction(GetDllLibXls().XlsChartFrameFormat_get_Fill, self.Ptr)
172
- ret = None if intPtr==None else XlsShapeFill(intPtr)
173
+ ret = None if intPtr==None else XlsChartFill(intPtr)
173
174
  return ret
174
175
 
175
176
 
@@ -6,7 +6,7 @@ from spire.xls import *
6
6
  from ctypes import *
7
7
  import abc
8
8
 
9
- class ArcShapeCollection ( IArcShapes) :
9
+ class ArcShapeCollection (CollectionBase[XlsArcShape], IArcShapes) :
10
10
  """
11
11
  Represents a collection of arc shapes in a worksheet.
12
12
  """
@@ -18,6 +18,7 @@ class AutoFiltersCollection ( XlsAutoFiltersCollection) :
18
18
  Returns:
19
19
  Worksheet: The parent worksheet.
20
20
  """
21
+ from spire.xls.Worksheet import Worksheet
21
22
  GetDllLibXls().AutoFiltersCollection_get_Worksheet.argtypes=[c_void_p]
22
23
  GetDllLibXls().AutoFiltersCollection_get_Worksheet.restype=c_void_p
23
24
  intPtr = CallCFunction(GetDllLibXls().AutoFiltersCollection_get_Worksheet, self.Ptr)