From 1076b865479dcb1290f6120d8cd2c1090dae14f4 Mon Sep 17 00:00:00 2001
From: sandraros <34005250+sandraros@users.noreply.github.com>
Date: Mon, 4 Oct 2021 16:50:50 +0200
Subject: [PATCH] Fix #547 autofilter messed up if several sheets (#821)

Fix #547

Co-authored-by: sandraros <sandra.rossi@gmail.com>
Co-authored-by: Abo <andrea@borgia.bo.it>
Co-authored-by: Lars Hvam <larshp@hotmail.com>
---
 src/zcl_excel_reader_2007.clas.abap | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap
index fa6ff86..097da72 100644
--- a/src/zcl_excel_reader_2007.clas.abap
+++ b/src/zcl_excel_reader_2007.clas.abap
@@ -26,6 +26,7 @@ CLASS zcl_excel_reader_2007 DEFINITION
         targetmode TYPE string,
         worksheet  TYPE REF TO zcl_excel_worksheet,
         sheetid    TYPE string,     "ins #235 - repeat rows/cols - needed to identify correct sheet
+        localsheetid TYPE string,
       END OF t_relationship .
     TYPES:
       BEGIN OF t_fileversion,
@@ -1935,6 +1936,7 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
       READ TABLE lt_worksheets ASSIGNING <worksheet> WITH KEY id = ls_sheet-id.
       IF sy-subrc = 0.
         <worksheet>-sheetid = ls_sheet-sheetid.                                "ins #235 - repeat rows/cols - needed to identify correct sheet
+        <worksheet>-localsheetid = |{ lv_workbook_index - 1 }|.
         CONCATENATE lv_path <worksheet>-target
             INTO lv_worksheet_path.
         me->load_worksheet( ip_path      = lv_worksheet_path
@@ -1998,8 +2000,7 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
 *--------------------------------------------------------------------*
 * issue#235 - repeat rows/columns - begin
 *--------------------------------------------------------------------*
-        lv_tabix = ls_range-localsheetid + 1.
-        READ TABLE lt_worksheets ASSIGNING <worksheet> INDEX lv_tabix.
+        READ TABLE lt_worksheets ASSIGNING <worksheet> WITH KEY localsheetid = ls_range-localsheetid.
         IF sy-subrc = 0.
           CASE ls_range-name.