diff --git a/source/diff.py b/source/diff.py index 4505ad2..7771f37 100644 --- a/source/diff.py +++ b/source/diff.py @@ -83,7 +83,6 @@ class FormButton(FormControlBase): super().__init__(obj) - class LOForm(ObjectBase): def __init__(self, obj): @@ -271,20 +270,6 @@ class LOCalc(LODocument): obj = self.obj.getStyleFamilies()['CellStyles'] return LOCellStyles(obj) - def insert(self, name, pos=-1): - # ~ sheet = obj.createInstance('com.sun.star.sheet.Spreadsheet') - # ~ obj.Sheets['New'] = sheet - index = pos - if pos < 0: - index = self._sheets.Count + pos + 1 - if isinstance(name, str): - self._sheets.insertNewByName(name, index) - else: - for n in name: - self._sheets.insertNewByName(n, index) - name = n - return LOCalcSheet(self._sheets[name], self) - def move(self, name, pos=-1): return self.sheets.move(name, pos) diff --git a/source/easymacro2.py b/source/easymacro2.py index b42c373..48dbb2d 100644 --- a/source/easymacro2.py +++ b/source/easymacro2.py @@ -1117,6 +1117,14 @@ class LOCalc(LODocument): s = self.create_instance('com.sun.star.sheet.Spreadsheet') return s + def insert(self, name): + names = name + if isinstance(name, str): + names = (name,) + for n in names: + self._sheets[n] = self.new_sheet() + return LOCalcSheet(self._sheets[n]) + def render(self, data, sheet=None, clean=True): if sheet is None: sheet = self.active @@ -1332,6 +1340,9 @@ class LOCalcSheet(object): def __exit__(self, exc_type, exc_value, traceback): pass + def __str__(self): + return f'easymacro.LOCalcSheet: {self.name}' + @property def obj(self): return self._obj