Disable calcChain processing #174

cuba-platform · Jan 19, 2023 · 200eb57 · 200eb57
1 parent 733e092
commit 200eb57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 37 deletions.
diff --git a/core/modules/core/src/com/haulmont/yarg/formatters/impl/XlsxFormatter.java b/core/modules/core/src/com/haulmont/yarg/formatters/impl/XlsxFormatter.java
@@ -357,9 +357,8 @@ protected void shiftChart(Document.ChartWrapper chart, Range templateRange, Rang
 
  //todo support formulas without range but with list of cells
  protected void updateFormulas() {
- CTCalcChain calculationChain = getCalculationChain();
- int formulaCount = processInnerFormulas(calculationChain);
- processOuterFormulas(formulaCount, calculationChain);
+ processInnerFormulas();
+ processOuterFormulas();
  }
 
  protected void updateConditionalFormatting() {
@@ -393,7 +392,7 @@ protected void updateConditionalFormatting() {
  }
  }
 
- protected void processOuterFormulas(int formulaCount, CTCalcChain calculationChain) {
+ protected void processOuterFormulas() {
  for (CellWithBand cellWithWithBand : outerFormulas) {
  Cell cellWithFormula = cellWithWithBand.cell;
  String oldFormula = cellWithFormula.getF().getValue();
@@ -456,7 +455,7 @@ protected void processOuterFormulas(int formulaCount, CTCalcChain calculationCha
  for (Range formulaRange : formulaRanges) {
  if (newRanges.size() > 0) {
  Range shiftedRange = calculateFormulaRangeChange(formulaRange, templateRange, newRanges);
- updateFormula(cellWithFormula, formulaRange, shiftedRange, calculationChain, formulaCount++);
+ updateFormula(cellWithFormula, formulaRange, shiftedRange);
  } else {
  cellWithFormula.setF(null);
  cellWithFormula.setV("ERROR: Formula references to empty range");
@@ -482,9 +481,7 @@ protected Range calculateFormulaRangeChange(Range formulaRange, Range templateRa
  return shiftedRange;
  }
 
- protected int processInnerFormulas(CTCalcChain calculationChain) {
- int formulaCount = 1;
-
+ protected void processInnerFormulas() {
  for (CellWithBand cellWithWithBand : innerFormulas) {
  Cell cellWithFormula = cellWithWithBand.cell;
  String oldFormula = cellWithFormula.getF().getValue();
@@ -506,46 +503,24 @@ protected int processInnerFormulas(CTCalcChain calculationChain) {
 
  for (Range formulaRange : formulaRanges) {
  Range shiftedFormulaRange = formulaRange.copy().shift(offset.downOffset, offset.rightOffset);
- updateFormula(cellWithFormula, formulaRange, shiftedFormulaRange, calculationChain, formulaCount++);
+ updateFormula(cellWithFormula, formulaRange, shiftedFormulaRange);
  }
  break;
  }
  }
  }
  }
  }
- return formulaCount;
- }
-
- protected CTCalcChain getCalculationChain() {
- return null; // calcChain processing is disabled until it is well-formed
  }
 
- protected void updateFormula(Cell cellWithFormula, Range originalFormulaRange, Range formulaRange,
- CTCalcChain calculationChain, int formulaCount) {
+ protected void updateFormula(Cell cellWithFormula, Range originalFormulaRange, Range formulaRange) {
  CTCellFormula formula = cellWithFormula.getF();
  formula.setValue(formula.getValue().replace(originalFormulaRange.toRange(), formulaRange.toRange()));
  if (originalFormulaRange.isOneCellRange() && formulaRange.isOneCellRange()) {
  //here we check that there are no alpha-numeric symbols around the single reference
  String pattern = "(?<!\\w+)" + originalFormulaRange.toFirstCellReference() + "(?!\\w+)";
  formula.setValue(formula.getValue().replaceAll(pattern, formulaRange.toFirstCellReference()));
  }
-
- if (calculationChain != null) {
- CTCalcCell calcCell = new CTCalcCell();
- calcCell.setR(cellWithFormula.getR());
- String sheetName = originalFormulaRange.getSheet();
- Sheets sheets = template.getWorkbook().getSheets();
- if (sheets != null && sheets.getSheet() != null) {
- for (Sheet sheet : sheets.getSheet()) {
- if (Objects.equals(sheet.getName(), sheetName)) {
- calcCell.setI((int) sheet.getSheetId());
- break;
- }
- }
- }
- calculationChain.getC().add(calcCell);
- }
  }
 
  protected Offset calculateOffset(Range from, Range to) {

diff --git a/core/modules/core/test/com/haulmont/yarg/formatters/impl/XlsxFormulaUpdateTest.java b/core/modules/core/test/com/haulmont/yarg/formatters/impl/XlsxFormulaUpdateTest.java
@@ -84,20 +84,20 @@ public void testFormulaShifts() throws Exception {
  new FormatterFactoryInput("xls", new BandData(""), reportTemplate, null));
 
  Cell cellWithFormula = cellWithFormula("SUM(A9:A9)/B9");
- xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:A9"), Range.fromRange("Sheet", "A90:A90"), null, 0);
- xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "B9:B9"), Range.fromRange("Sheet", "B90:B90"), null, 0);
+ xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:A9"), Range.fromRange("Sheet", "A90:A90"));
+ xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "B9:B9"), Range.fromRange("Sheet", "B90:B90"));
  Assert.assertEquals("SUM(A90:A90)/B90", cellWithFormula.getF().getValue());
 
  cellWithFormula = cellWithFormula("SUM(A9:B9)");
- xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:B9"), Range.fromRange("Sheet", "A90:B90"), null, 0);
+ xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:B9"), Range.fromRange("Sheet", "A90:B90"));
  Assert.assertEquals("SUM(A90:B90)", cellWithFormula.getF().getValue());
 
  cellWithFormula = cellWithFormula("A9*SUM(A9:A9)");
- xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:A9"), Range.fromRange("Sheet", "A90:A90"), null, 0);
+ xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:A9"), Range.fromRange("Sheet", "A90:A90"));
  Assert.assertEquals("A90*SUM(A90:A90)", cellWithFormula.getF().getValue());
 
  cellWithFormula = cellWithFormula("CA9*SUM(A9:A9)");
- xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:A9"), Range.fromRange("Sheet", "A90:A90"), null, 0);
+ xlsxFormatter.updateFormula(cellWithFormula, Range.fromRange("Sheet", "A9:A9"), Range.fromRange("Sheet", "A90:A90"));
  Assert.assertEquals("CA9*SUM(A90:A90)", cellWithFormula.getF().getValue());
  }