diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssbb_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssbb_vorlage.xlsx index f0030119c3..b8ccc08583 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssbb_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssbb_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssit_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssit_vorlage.xlsx index fe4bd5dfc2..f72532a096 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssit_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssit_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sska_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sska_vorlage.xlsx index 814028d6ad..7700a50a4f 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sska_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sska_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskf_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskf_vorlage.xlsx index d142b52b5a..07f34b884d 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskf_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskf_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskg_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskg_vorlage.xlsx index d43e27e019..84b6aec5e9 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskg_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskg_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssko_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssko_vorlage.xlsx index 1e7b2aecbf..20a14a8e04 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssko_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssko_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskp_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskp_vorlage.xlsx index 11b56e0aa8..5c3e768ce1 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskp_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskp_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssks_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssks_vorlage.xlsx index 2226fab270..fa3fccbace 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssks_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssks_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskt_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskt_vorlage.xlsx index 36d8c07171..2691cb9408 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskt_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskt_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskw_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskw_vorlage.xlsx index 57fa4628b2..1107cb9c9c 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskw_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sskw_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssla_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssla_vorlage.xlsx index dd55ee18d0..527ab86cc8 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssla_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssla_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslb_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslb_vorlage.xlsx index 66e3010e1b..c5506e6bad 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslb_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslb_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssld_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssld_vorlage.xlsx index bb98773092..8db47c09d4 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssld_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssld_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslf_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslf_vorlage.xlsx index b732656a25..a85ffd7548 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslf_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslf_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssli_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssli_vorlage.xlsx index 013227a55f..532a06968f 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssli_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssli_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssln_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssln_vorlage.xlsx index 5874604084..a56d229af0 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssln_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssln_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslr_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslr_vorlage.xlsx index 2171eda782..e9fdac8811 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslr_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslr_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslw_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslw_vorlage.xlsx index a60bf773a3..84f90fc0a4 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslw_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslw_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslz_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslz_vorlage.xlsx index 2427695a4f..9a1d95adff 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslz_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sslz_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssvu_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssvu_vorlage.xlsx index 4ae37e2640..a54f703c6a 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssvu_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssvu_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssza_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssza_vorlage.xlsx index 3a80014a23..27d8685600 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssza_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/ssza_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszs_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszs_vorlage.xlsx index eeb8c628cd..134dd5f522 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszs_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszs_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszw_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszw_vorlage.xlsx index 391b8bff75..bf3933989a 100644 Binary files a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszw_vorlage.xlsx and b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszw_vorlage.xlsx differ diff --git a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/AbstractTransformTableHeader.java b/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/AbstractTransformTableHeader.java index cd53193694..a0673bae41 100644 --- a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/AbstractTransformTableHeader.java +++ b/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/AbstractTransformTableHeader.java @@ -80,6 +80,7 @@ */ public abstract class AbstractTransformTableHeader { protected static final String XSL_TEMPLATE_PATH = "data/export/pdf/table_template.xsl"; //$NON-NLS-1$ + protected static final float OFFSET = 0.01f; protected Document doc; protected XSSFSheet sheet; @@ -183,6 +184,7 @@ protected Element transformTable() { return tableTemplate; } + @SuppressWarnings("nls") private Set transformColumns() { final LinkedHashSet cols = new LinkedHashSet<>(); float sumWidth = 0f; @@ -193,6 +195,15 @@ private Set transformColumns() { columNumber = pair.getKey().intValue(); sumWidth = pair.getValue().floatValue(); } + + // Fill remaining page width + if (sumWidth < maxPaperWidth - OFFSET) { + final float remainingWidth = maxPaperWidth - sumWidth - OFFSET; + final float lastColumnWith = Float.parseFloat(cols.getLast() + .getAttribute(COLUMN_WIDTH).replace("cm", "")); + cols.getLast().setAttribute(COLUMN_WIDTH, + Double.toString(lastColumnWith + remainingWidth) + "cm"); + } return cols; } diff --git a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/MultiPageTableHeader.xtend b/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/MultiPageTableHeader.xtend index d49dbab0d5..9de078c3c1 100644 --- a/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/MultiPageTableHeader.xtend +++ b/java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/transform/MultiPageTableHeader.xtend @@ -83,10 +83,9 @@ class MultiPageTableHeader extends AbstractTransformTableHeader { // Add last column in page cols.add(createTableColumn(columNumber, columnWidth)) - // Add repeating column to new page - val newColNumber = cols.transformBreakColumns(columNumber) - return Pair.of(newColNumber, 0f) + val repeatColumns = cols.transformBreakColumns(columNumber) + return Pair.of(repeatColumns.key, repeatColumns.value) } else { cols.add(createTableColumn(columNumber, columnWidth)) return Pair.of(columNumber, sumWidth + columnWidth) @@ -94,24 +93,27 @@ class MultiPageTableHeader extends AbstractTransformTableHeader { } - private def int transformBreakColumns(LinkedHashSet columns, + private def Pair transformBreakColumns(LinkedHashSet columns, int columnNumber) { val repeatingColumns = getRepeatingColumns(sheet) if (repeatingColumns.empty) { // When repeating columns is empty, // then add only numerical order column + val columnWidth = sheet.getColumnWidthInCm(0).floatValue columns.add( createTableColumn(columnNumber, - sheet.getColumnWidthInCm(0).floatValue)) - return columnNumber + 1 + columnWidth)) + return columnNumber + 1 -> columnWidth } - repeatingColumns.forEach [ col, index | + var repeatColumnsWidth = 0f; + for (var index = 0; index < repeatingColumns.size; index++) { val colIndex = columnNumber + index + 1 + val columnWidth = sheet.getColumnWidthInCm(repeatingColumns.toList.get(index)).floatValue + repeatColumnsWidth += columnWidth columns.add( - createTableColumn(colIndex, - sheet.getColumnWidthInCm(col).floatValue)) - ] - return columnNumber + repeatingColumns.size + createTableColumn(colIndex,columnWidth)) + } + return columnNumber + repeatingColumns.size -> repeatColumnsWidth } override protected getCellSpanColumn(Optional excelCell) {