From 524c8f5e124740177a0812a893f339a8246ad965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schm=C3=B6cker?= <stefan@schmoecker.de>
Date: Fri, 23 Oct 2015 08:52:33 +0200
Subject: [PATCH] Add formula as export parameter to
 ZCL_EXCEL_WORKSHEET->GET_CELL Autofilters got lost at last attempt to
 modularize the very long method ZCL_EXCEL_WRITER_2007->CREATE_XL_SHEET

---
 ZA2X/CLAS/ZCL_EXCEL_WORKSHEET.slnk   | 14 ++++++++------
 ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ZA2X/CLAS/ZCL_EXCEL_WORKSHEET.slnk b/ZA2X/CLAS/ZCL_EXCEL_WORKSHEET.slnk
index f60a4db..7afd5cb 100644
--- a/ZA2X/CLAS/ZCL_EXCEL_WORKSHEET.slnk
+++ b/ZA2X/CLAS/ZCL_EXCEL_WORKSHEET.slnk
@@ -40,10 +40,10 @@
 "/>
  <types CLSNAME="ZCL_EXCEL_WORKSHEET" CMPNAME="MTY_TS_OUTLINES_ROW" VERSION="1" LANGU="E" DESCRIPT="All row outlines ( sorted table )" EXPOSURE="2" STATE="1" EDITORDER="3 " TYPTYPE="4" SRCROW1="22 " SRCCOLUMN1="4 " SRCROW2="22 " SRCCOLUMN2="93 " TYPESRC_LENG="0 " TYPESRC="MTY_TS_OUTLINES_ROW type sorted table of MTY_S_OUTLINE_ROW with unique key row_from row_to
 "/>
- <implementing CLSNAME="ZCL_EXCEL_WORKSHEET" REFCLSNAME="ZIF_EXCEL_SHEET_PRINTSETTINGS" VERSION="1" EXPOSURE="2" STATE="1" RELTYPE="1" EDITORDER="1 "/>
- <implementing CLSNAME="ZCL_EXCEL_WORKSHEET" REFCLSNAME="ZIF_EXCEL_SHEET_PROPERTIES" VERSION="1" EXPOSURE="2" STATE="1" RELTYPE="1" EDITORDER="2 "/>
- <implementing CLSNAME="ZCL_EXCEL_WORKSHEET" REFCLSNAME="ZIF_EXCEL_SHEET_PROTECTION" VERSION="1" EXPOSURE="2" STATE="1" RELTYPE="1" EDITORDER="3 "/>
  <implementing CLSNAME="ZCL_EXCEL_WORKSHEET" REFCLSNAME="ZIF_EXCEL_SHEET_VBA_PROJECT" VERSION="1" EXPOSURE="2" STATE="1" RELTYPE="1" EDITORDER="4 "/>
+ <implementing CLSNAME="ZCL_EXCEL_WORKSHEET" REFCLSNAME="ZIF_EXCEL_SHEET_PROTECTION" VERSION="1" EXPOSURE="2" STATE="1" RELTYPE="1" EDITORDER="3 "/>
+ <implementing CLSNAME="ZCL_EXCEL_WORKSHEET" REFCLSNAME="ZIF_EXCEL_SHEET_PROPERTIES" VERSION="1" EXPOSURE="2" STATE="1" RELTYPE="1" EDITORDER="2 "/>
+ <implementing CLSNAME="ZCL_EXCEL_WORKSHEET" REFCLSNAME="ZIF_EXCEL_SHEET_PRINTSETTINGS" VERSION="1" EXPOSURE="2" STATE="1" RELTYPE="1" EDITORDER="1 "/>
  <localImplementation>*&quot;* local class implementation for public class
 *&quot;* use this source file for the implementation part of
 *&quot;* local helper classes
@@ -3874,6 +3874,7 @@ ENDMETHOD.</source>
   <parameter CLSNAME="ZCL_EXCEL_WORKSHEET" CMPNAME="GET_CELL" SCONAME="EP_RC" VERSION="1" LANGU="E" DESCRIPT="Return Value of ABAP Statements" CMPTYPE="1" MTDTYPE="0" EDITORDER="4 " DISPID="0 " PARDECLTYP="1" PARPASSTYP="1" TYPTYPE="1" TYPE="SYSUBRC"/>
   <parameter CLSNAME="ZCL_EXCEL_WORKSHEET" CMPNAME="GET_CELL" SCONAME="EP_STYLE" VERSION="1" LANGU="E" DESCRIPT="Style" CMPTYPE="1" MTDTYPE="0" EDITORDER="5 " DISPID="0 " PARDECLTYP="1" PARPASSTYP="1" TYPTYPE="3" TYPE="ZCL_EXCEL_STYLE"/>
   <parameter CLSNAME="ZCL_EXCEL_WORKSHEET" CMPNAME="GET_CELL" SCONAME="EP_GUID" VERSION="1" LANGU="E" DESCRIPT="Style identifier" CMPTYPE="1" MTDTYPE="0" EDITORDER="6 " DISPID="0 " PARDECLTYP="1" PARPASSTYP="1" TYPTYPE="1" TYPE="ZEXCEL_CELL_STYLE"/>
+  <parameter CLSNAME="ZCL_EXCEL_WORKSHEET" CMPNAME="GET_CELL" SCONAME="EP_FORMULA" VERSION="1" LANGU="E" DESCRIPT="Cell Formula" CMPTYPE="1" MTDTYPE="0" EDITORDER="7 " DISPID="0 " PARDECLTYP="1" PARPASSTYP="1" TYPTYPE="1" TYPE="ZEXCEL_CELL_FORMULA"/>
   <exception CLSNAME="ZCL_EXCEL_WORKSHEET" CMPNAME="GET_CELL" SCONAME="ZCX_EXCEL" VERSION="1" LANGU="E" DESCRIPT="Exceptions for ABAP2XLSX" MTDTYPE="0" EDITORDER="1 "/>
   <source>method GET_CELL.
 
@@ -3888,10 +3889,11 @@ ENDMETHOD.</source>
                                                                 cell_column  = lv_column.
 
   ep_rc = sy-subrc.
-  ep_value = ls_sheet_content-cell_value.
-  ep_guid  = ls_sheet_content-cell_style.     &quot; issue 139 - added this to be used for columnwidth calculation
+  ep_value    = ls_sheet_content-cell_value.
+  ep_guid     = ls_sheet_content-cell_style.       &quot; issue 139 - added this to be used for columnwidth calculation
+  ep_formula  = ls_sheet_content-cell_formula.
 
-  &quot; Addition to solve issue #120, contribution by Stefan Schm#ƒÂ#cker
+  &quot; Addition to solve issue #120, contribution by Stefan Schmöcker
   DATA: style_iterator TYPE REF TO cl_object_collection_iterator,
         style          TYPE REF TO zcl_excel_style.
   IF ep_style IS REQUESTED.
diff --git a/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk b/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk
index 1eb3077..7e765e0 100644
--- a/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk
+++ b/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk
@@ -3533,8 +3533,8 @@ ENDMETHOD.</source>
 *  col_count      = io_worksheet-&gt;get_highest_column( ).
 *  &quot; Get autofilter
 **  lv_guid        = io_worksheet-&gt;get_guid( ) .
-*  lo_autofilters = excel-&gt;get_autofilters_reference( ).
-*  lo_autofilter  = lo_autofilters-&gt;get( io_worksheet = io_worksheet ) .
+  lo_autofilters = excel-&gt;get_autofilters_reference( ).
+  lo_autofilter  = lo_autofilters-&gt;get( io_worksheet = io_worksheet ) .
 *  IF lo_autofilter IS BOUND.
 *    lt_values           = lo_autofilter-&gt;get_values( ) .
 *    ls_area             = lo_autofilter-&gt;get_filter_area( ) .