Merge branch 'master' of https://github.com/DissectMalware/pyxlsb2

Author: DissectMalware

pyxlsb2/ptgs.py

@@ -633,7 +633,7 @@ def stringify(self, tokens, workbook):
 
         supporting_link, first_sheet_idx, last_sheet_idx = workbook.resolve_extern_sheet_id(self.extern_sheet_idx)
         address = None
-        if supporting_link.brt == rt.SUP_SAME or supporting_link.brt == rt.SUP_SELF:
+        if supporting_link.brt in rt._SUP_LINK_TYPES:
             if first_sheet_idx == last_sheet_idx and first_sheet_idx >= 0:
                 address = workbook.sheets[first_sheet_idx].name + '!' + cell_add
             elif first_sheet_idx == last_sheet_idx and first_sheet_idx == -1:
@@ -698,13 +698,16 @@ def stringify(self, tokens, workbook):
                                   ,self.last_row_rel)
         supporting_link, first_sheet_idx, last_sheet_idx = workbook.resolve_extern_sheet_id(self.extern_sheet_idx)
 
+        cell_add_first = self.cell_address(self.first_col, self.first_row, self.first_col_rel, self.first_row_rel)
+        cell_add_last = self.cell_address(self.last_col, self.last_row, self.last_col_rel, self.last_row_rel)
+
         address = None
-        if supporting_link.brt == rt.SUP_SAME or supporting_link.brt == rt.SUP_SELF:
+        if supporting_link.brt in rt._SUP_LINK_TYPES:
             if first_sheet_idx == last_sheet_idx and first_sheet_idx >= 0:
                 address = workbook.sheets[first_sheet_idx].name + '!' + first + ':' + last
 
         if address is None:
-            print("AreaPtg External Address Not Supported {0} {1} {2}".format(cell_add, first_sheet_idx, last_sheet_idx))
+            print("AreaPtg External Address Not Supported {0}:{1} {2} {3}".format(cell_add_first, cell_add_last, first_sheet_idx, last_sheet_idx))
             #raise NotImplementedError('External address not supported')
 
         return address

pyxlsb2/recordtypes.py

@@ -779,3 +779,5 @@
 
 _by_name = {k: v for k, v in locals().items() if not k.startswith('_')}
 _by_num = {v: k for k, v in _by_name.items()}
+# https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-xlsb/8cc503eb-12ab-4a47-bbc7-2dbcef47150b
+_SUP_LINK_TYPES = {SUP_SELF, SUP_SAME, SUP_ADDIN, SUP_BOOK_SRC}

pyxlsb2/workbook.py

@@ -61,7 +61,7 @@ def _parse(self):
                     self.externals = {'SupportingLinks':[], 'ExternalSheets': []}
                 elif rectype == rt.EXTERN_SHEET:
                     self.externals['ExternalSheets'] = rec
-                elif rectype == rt.SUP_SELF or rectype == rt.SUP_SAME:
+                elif rectype in rt._SUP_LINK_TYPES:
                     self.externals['SupportingLinks'].append(rec)
                 elif rectype == rt.NAME:
                     self.list_names.append(rec.name)

pyxlsb2/worksheet.py

@@ -86,7 +86,6 @@ def rows(self, sparse=True):
                 if rec.v is not None and rec.c is not None:
                     row._add_cell(rec.c, rec.v, rec.f, rec.style)
 
-
             elif rectype >= rt.CELL_BLANK and rectype <= rt.FMLA_ERROR:
                 if rec.v is not None and rec.c is not None:
                     row._add_cell(rec.c, rec.v, rec.f, rec.style)