diff --git a/pyexcel_xlsx/xlsxr.py b/pyexcel_xlsx/xlsxr.py index a2c56f5..3e0309f 100644 --- a/pyexcel_xlsx/xlsxr.py +++ b/pyexcel_xlsx/xlsxr.py @@ -41,10 +41,9 @@ def column_iterator(self, row): class MergedCell(object): - def __init__(self, cell_ranges_str): - topleft, bottomright = cell_ranges_str.split(':') - self.__rl, self.__cl = convert_coordinate(topleft) - self.__rh, self.__ch = convert_coordinate(bottomright) + def __init__(self, cell_ranges): + self.__rl, self.__cl = cell_ranges.bounds[:2] + self.__rh, self.__ch = cell_ranges.bounds[2:] self.value = None def register_cells(self, registry): @@ -78,7 +77,7 @@ def __init__(self, sheet, **keywords): self.max_column = 0 self.__sheet_max_row = sheet.max_row self.__sheet_max_column = sheet.max_column - for ranges_str in sheet.merged_cell_ranges: + for ranges_str in sheet.merged_cells.ranges[:]: merged_cells = MergedCell(ranges_str) merged_cells.register_cells(self.__merged_cells) if self.max_row < merged_cells.bottom_row():