Incorrect page breaks detecting from XLSX template #142

cuba-platform · Mar 25, 2021 · bf4fc01 · bf4fc01
1 parent 1b173a5
commit bf4fc01
Showing 1 changed file with 22 additions and 1 deletion.
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
@@ -762,7 +762,7 @@ protected List<Cell> copyCells(BandData band, Range templateRange, List<Row> res
 
  resultCells.addAll(currentRowResultCells);
 
- copyRowSettings(templateRow, resultRow, getWorksheet(templateRow), getWorksheet(resultRow));
+ copyRowSettings(templateRow, resultRow, getTemplateWorksheet(templateRow), getWorksheet(resultRow));
  }
  return resultCells;
  }
@@ -901,6 +901,27 @@ protected Worksheet getWorksheet(Row newRow) {
  return (Worksheet) resultSheetData.getParent();
  }
 
+ protected Worksheet getTemplateWorksheet(Row newRow) {
+ SheetData resultSheetData = (SheetData) newRow.getParent();
+ Worksheet worksheet = (Worksheet) resultSheetData.getParent();
+
+ for (Document.SheetWrapper sheetWrapper : template.getWorksheets()) {
+ if (sheetWrapper.getWorksheet().getJaxbElement() == worksheet) {
+ return worksheet;
+ }
+ }
+
+ int i = 0;
+ for (Document.SheetWrapper sheetWrapper : result.getWorksheets()) {
+ if (sheetWrapper.getWorksheet().getJaxbElement() == worksheet) {
+ break;
+ }
+ i++;
+ }
+
+ return template.getWorksheets().get(i).getWorksheet().getJaxbElement();
+ }
+
  protected void addFormulaForPostProcessing(Range templateRange, BandData bandData, Row newRow, Cell templateCell, Cell newCell) {
  Worksheet worksheet = getWorksheet(newRow);
  Set<Range> formulaRanges = Range.fromCellFormula(result.getSheetName(worksheet), templateCell);