use getRunVar() for internal vars

jxlsteam · Dec 22, 2023 · 079636b · 079636b
1 parent 872e3bc
commit 079636b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/jxls-poi/src/main/java/org/jxls/transform/poi/PoiCellData.java b/jxls-poi/src/main/java/org/jxls/transform/poi/PoiCellData.java
@@ -149,8 +149,8 @@ public void writeToCell(Cell cell, Context context, PoiTransformer transformer)
             updateCellGeneralInfo(cell);
             updateCellContents(cell);
             CellStyle targetCellStyle = cellStyle;
-            if (Boolean.TRUE.equals(context.getVar(CellData.IGNORE_SOURCE_CELL_STYLE) )) {
-                CellStyle dataFormatCellStyle = findCellStyle(evaluationResult, (Map<String, String>) context.getVar(CellData.CELL_STYLE_MAP), transformer);
+            if (Boolean.TRUE.equals(context.getRunVar(CellData.IGNORE_SOURCE_CELL_STYLE) )) {
+                CellStyle dataFormatCellStyle = findCellStyle(evaluationResult, (Map<String, String>) context.getRunVar(CellData.CELL_STYLE_MAP), transformer);
                 if (dataFormatCellStyle != null) {
                     targetCellStyle = dataFormatCellStyle;
                 }

diff --git a/jxls/src/main/java/org/jxls/area/XlsArea.java b/jxls/src/main/java/org/jxls/area/XlsArea.java
@@ -232,7 +232,7 @@ public Size applyAt(CellRef cellRef, Context context) {
         transformStaticCells(cellRef, context, commandsArea);
         fireAfterApplyEvent(cellRef, context);
         Size finalSize = new Size(cellRange.calculateWidth(), cellRange.calculateHeight());
-        if (Boolean.TRUE.equals(context.getVar(IS_FORMULA_PROCESSING_REQUIRED))) {
+        if (Boolean.TRUE.equals(context.getRunVar(IS_FORMULA_PROCESSING_REQUIRED))) {
             AreaRef newAreaRef = new AreaRef(cellRef, finalSize);
             updateCellDataFinalAreaForFormulaCells(newAreaRef);
         }
@@ -525,7 +525,7 @@ private void transformStaticCells(CellRef cellRef, Context context,
     }
 
     private void updateCellDataArea(CellRef srcCell, CellRef targetCell, Context context) {
-        if (!Boolean.TRUE.equals(context.getVar(IS_FORMULA_PROCESSING_REQUIRED))) {
+        if (!Boolean.TRUE.equals(context.getRunVar(IS_FORMULA_PROCESSING_REQUIRED))) {
             return;
         }
         CellData cellData = transformer.getCellData(srcCell);

diff --git a/jxls/src/main/java/org/jxls/command/GridCommand.java b/jxls/src/main/java/org/jxls/command/GridCommand.java
@@ -164,9 +164,9 @@ private Size processBody(final CellRef cellRef, Context context) {
         CellRef currentCell = cellRef;
         int totalWidth = 0;
         int totalHeight = 0;
-        Boolean oldIgnoreSourceCellStyle = (Boolean) context.getVar(CellData.IGNORE_SOURCE_CELL_STYLE);
+        Boolean oldIgnoreSourceCellStyle = (Boolean) context.getRunVar(CellData.IGNORE_SOURCE_CELL_STYLE);
         context.putVar(CellData.IGNORE_SOURCE_CELL_STYLE, Boolean.TRUE);
-        Map<String, String> oldStyleCellMap = (Map<String, String>) context.getVar(CellData.CELL_STYLE_MAP);
+        Map<String, String> oldStyleCellMap = (Map<String, String>) context.getRunVar(CellData.CELL_STYLE_MAP);
         context.putVar(CellData.CELL_STYLE_MAP, this.cellStyleMap);
         // TODO possible error: content of DATA_VAR is not saved & restored
         for (Object rowObject : dataCollection) {