feat(xlsx): рисунки — картинки, диаграммы, theme, OLE-флаг (шаг 7)

- DrawingBridge: xdr-якоря two/one/absoluteCell (EMU-кумулятив по Metrics,
  hidden=0; xdr:ext отличается от вложенного a:ext по namespace), inline-emit
  в from-ячейку, clamp скрытых строк/колонок, fallback-абзацы в конец листа;
  порог extent 22M EMU как DrawingPreRenderer
- xdr:pic → word/media/xlsx-imageN (as-is, тип по расширению); c:chart →
  word/charts/xlsx-chartN.xml c сохранением graphicData — штатный шаг 3.5
  дорисовывает PNG и ловит errorOnCharts (Kind.CHARTS, сквозной тест);
  SmartArt/фигуры/внешние blip — пропуск+warn; theme1.xml → word/theme
  (палитра для чартов); OLE — warn либо 422 по флагу
- юниты DrawingBridgeTest (8), пакетный тест эмита в cell+theme, PDF:
  imageCount≥3/distinct≥2 на xlsx-chart-image, errorOnCharts→Kind.CHARTS
This commit is contained in:
Pjandro
2026-11-03 02:19:12 +00:00
parent a48f8cd027
commit 4a59662027
7 changed files with 880 additions and 11 deletions
@@ -0,0 +1,451 @@
package ru.pjandro.wordpdf.internal.xlsx;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.pjandro.wordpdf.internal.DocxPackageWriter;
/**
* Перенос рисунков {@code xl/drawings/drawingN.xml} (dml-схема {@code xdr:}/
* {@code a:}) в ячейки выходного документа.
*
* <p>Якоря {@code twoCellAnchor}/{@code oneCellAnchor}/{@code absoluteAnchor}:
* EMU-позиция ячейки — кумулятив по {@link Metrics} (hidden-колонки дают 0);
* extent — {@code to−from} или {@code ext}. Эмит — inline-картинка
* ({@code wp:inline/wp:extent}) раном в from-ячейку; картинка переливается
* через ячейку — принятая деградация. {@code wp:extent} больше
* {@link #MAX_EXTENT_EMU} (та же граница, что {@code DrawingPreRenderer}) —
* пропуск + warn.</p>
*
* <p>{@code xdr:pic} → media-часть as-is; {@code c:chart} — копия chart-части
* в {@code word/charts/} с сохранением {@code a:graphicData} — штатный шаг
* 3.5 пайплайна ({@code DrawingPreRenderer}) дорисует PNG и отреагирует на
* {@code errorOnCharts}. SmartArt/фигуры — пропуск + warn; OLE не эмитится
* никогда (флаг {@code errorOnOle} проверяет {@code XlsxToDocx} по
* structural-признакам листа). Связи перенесённых chart-частей
* (colors/styles/external-data) не копируются — висячие r:id в chart-XML
* безвредны.</p>
*/
final class DrawingBridge {
/** Потолок inline-простирашения, как {@code DrawingPreRenderer.MAX_EXTENT_EMU}. */
static final long MAX_EXTENT_EMU = 22_000_000L;
/** Рисунок, размещённый в from-ячейку (1-based строка, 0-based колонка). */
record Placement(int row1, int col, String runXml) {
}
private static final Logger LOG = LoggerFactory.getLogger(DrawingBridge.class);
private static final String XDR_NS =
"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";
private static final String URI_PICTURE =
"http://schemas.openxmlformats.org/drawingml/2006/picture";
private static final String URI_CHART =
"http://schemas.openxmlformats.org/drawingml/2006/chart";
private static final String IMAGE_REL_TYPE =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
private static final String CHART_REL_TYPE =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
private static final String THEME_REL_TYPE =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";
private static final String CHART_CONTENT_TYPE =
"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
private static final String THEME_CONTENT_TYPE =
"application/vnd.openxmlformats-officedocument.theme+xml";
private static final long EMU_PER_PT = 12_700L;
/** Типы якорей. */
private static final int MODE_TWO_CELL = 1;
private static final int MODE_ONE_CELL = 2;
private static final int MODE_ABSOLUTE = 3;
/** Элементы-границы якоря. */
private static final String EL_FROM = "from";
private static final String EL_TO = "to";
/** Разновидности содержимого якоря. */
private static final String KIND_PIC = "pic";
private static final String KIND_SKIP = "skip";
private final List<DocxPackageWriter.Part> parts;
private final WarnOnce warn;
private int drawingNo;
DrawingBridge(List<DocxPackageWriter.Part> parts, WarnOnce warn) {
this.parts = parts;
this.warn = warn;
}
/** Theme-часть книги (палитра для chart-рендерера); нет части — ничего. */
static void emitTheme(XlsxPackage pkg, List<DocxPackageWriter.Part> parts) {
byte[] theme = pkg.entry("xl/theme/theme1.xml");
if (theme != null) {
parts.add(new DocxPackageWriter.Part("word/theme/theme1.xml",
THEME_CONTENT_TYPE, THEME_REL_TYPE, theme));
}
}
/** Рисунки листа в исходных координатах якорей. */
List<Placement> read(XlsxPackage pkg, SheetModel sheet, Metrics metrics) {
String drawingPath = sheet.drawingPath();
byte[] xml = drawingPath == null ? null : pkg.entry(drawingPath);
if (xml == null) {
return List.of();
}
List<Placement> out = new ArrayList<>();
try {
XMLStreamReader xr = XlsxPackage.newSecureReader()
.createXMLStreamReader(new ByteArrayInputStream(xml));
parse(xr, pkg, sheet, metrics, drawingPath, out);
} catch (Exception e) {
warn.warn(LOG, "drawing листа не разобран ({}), рисунки пропущены",
e.toString());
}
return out;
}
/**
* Кладёт рисунки в ячейки: якорь на hidden-строке/колонке клампится к
* первой видимой далее (план). Ключ — {@code (row1 << 32) | col}.
*/
static Map<Long, List<String>> byCell(List<Placement> drawings, SheetModel sheet) {
Map<Long, List<String>> byCell = new LinkedHashMap<>();
for (Placement p : drawings) {
int row = p.row1();
SheetModel.RowData rd = sheet.rows().get(row);
if (rd != null && rd.hidden()) {
Integer next = firstVisibleRowAfter(sheet, row);
if (next != null) {
row = next;
}
}
int col = p.col();
for (SheetModel.ColDef d = sheet.col(col); d != null && d.hidden();
d = sheet.col(col)) {
col++;
}
byCell.computeIfAbsent((long) row << 32 | col & 0xFFFF_FFFFL,
k -> new ArrayList<>()).add(p.runXml());
}
return byCell;
}
private static Integer firstVisibleRowAfter(SheetModel sheet, int fromRow) {
for (var e : sheet.rows().tailMap(fromRow + 1).entrySet()) {
if (!e.getValue().hidden()) {
return e.getKey();
}
}
return null;
}
private void parse(XMLStreamReader xr, XlsxPackage pkg, SheetModel sheet, Metrics metrics,
String drawingPath, List<Placement> out) throws Exception {
int mode = 0; // 1 twoCell, 2 oneCell, 3 absolute
int fromCol = 0;
int fromRow = 0;
long fromColOff = 0;
long fromRowOff = 0;
int toCol = 0;
int toRow = 0;
long toColOff = 0;
long toRowOff = 0;
long extCx = 0;
long extCy = 0;
String kind = null; // pic | chart | skip
String embed = null;
String chartRid = null;
String graphicUri = null;
boolean inFrom = false;
boolean inTo = false;
while (xr.hasNext()) {
int ev = xr.next();
if (ev == XMLStreamConstants.START_ELEMENT) {
String local = xr.getLocalName();
if (mode == 0) {
switch (local) {
case "twoCellAnchor" -> mode = MODE_TWO_CELL;
case "oneCellAnchor" -> mode = MODE_ONE_CELL;
case "absoluteAnchor" -> mode = MODE_ABSOLUTE;
default -> {
}
}
if (mode != 0) {
fromCol = 0;
fromRow = 0;
fromColOff = 0;
fromRowOff = 0;
toCol = 0;
toRow = 0;
toColOff = 0;
toRowOff = 0;
extCx = 0;
extCy = 0;
kind = null;
embed = null;
chartRid = null;
graphicUri = null;
continue;
}
}
switch (local) {
case EL_FROM -> inFrom = true;
case EL_TO -> inTo = true;
case "col" -> {
if (inFrom) {
fromCol = (int) parseLong(xr.getElementText());
} else if (inTo) {
toCol = (int) parseLong(xr.getElementText());
}
}
case "row" -> {
if (inFrom) {
fromRow = (int) parseLong(xr.getElementText());
} else if (inTo) {
toRow = (int) parseLong(xr.getElementText());
}
}
case "colOff" -> {
if (inFrom) {
fromColOff = parseLong(xr.getElementText());
} else if (inTo) {
toColOff = parseLong(xr.getElementText());
}
}
case "rowOff" -> {
if (inFrom) {
fromRowOff = parseLong(xr.getElementText());
} else if (inTo) {
toRowOff = parseLong(xr.getElementText());
}
}
case "ext" -> {
// xdr:ext якоря, не a:ext из pic/spPr (он там дубликат)
if (mode != 0 && XDR_NS.equals(xr.getNamespaceURI())) {
extCx = parseLong(XlsxPackage.attr(xr, "cx"));
extCy = parseLong(XlsxPackage.attr(xr, "cy"));
}
}
case "blip" -> {
kind = KIND_PIC;
embed = XlsxPackage.attr(xr, "embed");
}
case "graphicData" -> graphicUri = XlsxPackage.attr(xr, "uri");
case "chart" -> {
if (URI_CHART.equals(graphicUri)) {
kind = "chart";
chartRid = XlsxPackage.attr(xr, "id");
} else {
kind = KIND_SKIP;
}
}
case "sp", "cxnSp" -> {
kind = KIND_SKIP;
warn.warn(LOG, "xdr:фигура ({}) в .xlsx не эмитится", local);
}
default -> {
}
}
} else if (ev == XMLStreamConstants.END_ELEMENT) {
String local = xr.getLocalName();
if (EL_FROM.equals(local)) {
inFrom = false;
} else if (EL_TO.equals(local)) {
inTo = false;
} else if (mode == MODE_TWO_CELL && "twoCellAnchor".equals(local)
|| mode == MODE_ONE_CELL && "oneCellAnchor".equals(local)
|| mode == MODE_ABSOLUTE && "absoluteAnchor".equals(local)) {
long cx;
long cy;
if (mode == MODE_TWO_CELL) {
cx = cellX(sheet, metrics, toCol) + toColOff
- (cellX(sheet, metrics, fromCol) + fromColOff);
cy = cellY(sheet, metrics, toRow) + toRowOff
- (cellY(sheet, metrics, fromRow) + fromRowOff);
} else {
cx = extCx;
cy = extCy;
}
Placement p = finish(pkg, drawingPath, mode, fromRow, fromCol,
cx, cy, kind, embed, chartRid, graphicUri);
if (p != null) {
out.add(p);
}
mode = 0;
}
}
}
}
private Placement finish(XlsxPackage pkg, String drawingPath, int mode,
int fromRow, int fromCol, long cx, long cy, String kind,
String embed, String chartRid, String graphicUri) {
if (kind == null && graphicUri != null && graphicUri.contains("/diagram")) {
warn.warn(LOG, "SmartArt (diagram) в .xlsx отброшен");
return null;
}
if (kind == null || KIND_SKIP.equals(kind)) {
return null;
}
if (cx <= 0 || cy <= 0) {
warn.warn(LOG, "drawing с нулевым/отрицательным extent отброшен");
return null;
}
if (cx > MAX_EXTENT_EMU || cy > MAX_EXTENT_EMU) {
warn.warn(LOG, "drawing extent {}×{} EMU за пределами {} — пропущен",
cx, cy, MAX_EXTENT_EMU);
return null;
}
drawingNo++;
String runXml;
if (KIND_PIC.equals(kind)) {
if (!addImage(pkg, drawingPath, embed)) {
drawingNo--;
return null;
}
runXml = inlineOpen(cx, cy) + "<a:graphic><a:graphicData uri=\"" + URI_PICTURE
+ "\"><pic:pic><pic:nvPicPr><pic:cNvPr id=\"" + drawingNo
+ "\" name=\"xlsx-drawing-" + drawingNo + "\"/><pic:cNvPicPr/></pic:nvPicPr>"
+ "<pic:blipFill><a:blip r:embed=\"" + lastPartRId()
+ "\"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill>"
+ "<pic:spPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"" + cx
+ "\" cy=\"" + cy
+ "\"/></a:xfrm><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom>"
+ "</pic:spPr></pic:pic></a:graphicData></a:graphic>" + inlineClose();
} else {
byte[] chart = chartBytes(pkg, drawingPath, chartRid);
if (chart.length == 0) {
drawingNo--;
return null;
}
parts.add(new DocxPackageWriter.Part("word/charts/xlsx-chart" + drawingNo + ".xml",
CHART_CONTENT_TYPE, CHART_REL_TYPE, chart));
runXml = inlineOpen(cx, cy) + "<a:graphic><a:graphicData uri=\"" + URI_CHART
+ "\"><c:chart r:id=\"" + lastPartRId()
+ "\"/></a:graphicData></a:graphic>" + inlineClose();
}
int anchorRow = mode == MODE_ABSOLUTE ? 1 : fromRow + 1;
int anchorCol = mode == MODE_ABSOLUTE ? 0 : fromCol;
return new Placement(anchorRow, anchorCol, runXml);
}
private String inlineOpen(long cx, long cy) {
return "<w:r><w:drawing><wp:inline distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\">"
+ "<wp:extent cx=\"" + cx + "\" cy=\"" + cy + "\"/>"
+ "<wp:docPr id=\"" + drawingNo + "\" name=\"Drawing " + drawingNo + "\"/>";
}
private String inlineClose() {
return "</wp:inline></w:drawing></w:r>";
}
private String lastPartRId() {
return "rId" + parts.size();
}
/** Media-байты as-is частью пакета; тип по расширению target'а. */
private boolean addImage(XlsxPackage pkg, String drawingPath, String embed) {
XlsxPackage.Rel rel = findRel(pkg, drawingPath, embed);
if (rel == null || rel.external()) {
warn.warn(LOG, "blip без внутренней связи (r:embed={}) — картинка пропущена", embed);
return false;
}
String target = XlsxPackage.resolvePath(XlsxPackage.parentDir(drawingPath),
rel.target());
byte[] bytes = pkg.entry(target);
if (bytes == null) {
warn.warn(LOG, "media-часть {} отсутствует — картинка пропущена", target);
return false;
}
int dot = target.lastIndexOf('.');
String ext = dot < 0 ? "" : target.substring(dot + 1).toLowerCase(Locale.ROOT);
String contentType = switch (ext) {
case "png" -> "image/png";
case "jpg", "jpeg" -> "image/jpeg";
case "gif" -> "image/gif";
case "bmp" -> "image/bmp";
case "tif", "tiff" -> "image/tiff";
default -> null;
};
if (contentType == null) {
warn.warn(LOG, "формат media .{} не переносится (векторный/неизвестный)", ext);
return false;
}
parts.add(new DocxPackageWriter.Part("word/media/xlsx-image" + drawingNo + "." + ext,
contentType, IMAGE_REL_TYPE, bytes));
return true;
}
/** Байты chart-части по r:id связи drawing-части; пустой массив — нет части. */
private byte[] chartBytes(XlsxPackage pkg, String drawingPath, String chartRid) {
XlsxPackage.Rel rel = findRel(pkg, drawingPath, chartRid);
if (rel == null || rel.external()) {
warn.warn(LOG, "c:chart без внутренней связи (r:id={}) — диаграмма пропущена",
chartRid);
return new byte[0];
}
byte[] bytes = pkg.entry(XlsxPackage.resolvePath(
XlsxPackage.parentDir(drawingPath), rel.target()));
if (bytes == null) {
warn.warn(LOG, "chart-часть по связи {} отсутствует — диаграмма пропущена",
chartRid);
return new byte[0];
}
return bytes;
}
private static XlsxPackage.Rel findRel(XlsxPackage pkg, String partPath, String id) {
if (id == null) {
return null;
}
for (XlsxPackage.Rel rel : pkg.rels(partPath)) {
if (rel.id().equals(id)) {
return rel;
}
}
return null;
}
/** Кумулятив EMU до левого края колонки (hidden — 0 вклада). */
static long cellX(SheetModel sheet, Metrics metrics, int col) {
long px = 0;
for (int c = 0; c < col; c++) {
SheetModel.ColDef def = sheet.col(c);
px += metrics.colWidthPx(def == null ? null : def.width(), sheet.baseColWidth(),
def != null && def.hidden());
}
return Metrics.pxToEmu((int) Math.min(px, Integer.MAX_VALUE));
}
/** Кумулятив EMU до верхнего края строки (hidden — 0; ht null — дефолт). */
static long cellY(SheetModel sheet, Metrics metrics, int row0) {
long emu = 0;
for (int r = 1; r <= row0; r++) {
SheetModel.RowData row = sheet.rows().get(r);
if (row != null && row.hidden()) {
continue;
}
double pt = row == null || row.ht() == null
? sheet.defaultRowHeight() : row.ht();
emu += Math.round(pt * EMU_PER_PT);
}
return emu;
}
private static long parseLong(String s) {
try {
return s == null ? 0 : Long.parseLong(s.trim());
} catch (NumberFormatException e) {
return 0;
}
}
}
@@ -3,6 +3,8 @@ package ru.pjandro.wordpdf.internal.xlsx;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import ru.pjandro.wordpdf.internal.DocxPackageWriter;
/**
@@ -38,25 +40,28 @@ final class SheetToTable {
* свою страницу). Рисунки — шаг 7.
*
* @param page страница листа (размер/поля уже после ориентации)
* @param drawings рисунки по ячейкам ({@code (row1 << 32) | col});
* употреблённые изымаются — вызывающий доемает остаток
* @param hyperlinks дедуплицированный порядок targets внешних ссылок
* (id {@code hl0…} = позиция множества)
*/
static List<String> emit(SheetModel sheet, StylesModel styles, SharedStrings sst,
WorkbookModel wb, Metrics metrics, NumberFormats numfmt, ColorResolver colors,
PrintLayout.Page page, List<DocxPackageWriter.Part> parts,
PrintLayout.Page page, Map<Long, List<String>> drawings,
List<DocxPackageWriter.Part> parts,
LinkedHashSet<String> hyperlinks, WarnOnce warn) {
PrintLayout.Plan plan = PrintLayout.plan(sheet, metrics, page, warn);
List<String> blocks = new ArrayList<>();
for (PrintLayout.Block block : plan.blocks()) {
blocks.add(emitBlock(sheet, styles, sst, metrics, numfmt, colors,
plan.widthScale(), block, hyperlinks, warn));
plan.widthScale(), block, drawings, hyperlinks, warn));
}
return blocks;
}
private static String emitBlock(SheetModel sheet, StylesModel styles, SharedStrings sst,
Metrics metrics, NumberFormats numfmt, ColorResolver colors,
double widthScale, PrintLayout.Block block,
double widthScale, PrintLayout.Block block, Map<Long, List<String>> drawings,
LinkedHashSet<String> hyperlinks, WarnOnce warn) {
List<Integer> visibleCols = block.cols();
StringBuilder xml = new StringBuilder();
@@ -80,7 +85,7 @@ final class SheetToTable {
continue;
}
emitRow(xml, e.getKey(), row, sheet, styles, sst, metrics, numfmt, colors,
widthScale, visibleCols, hyperlinks, warn);
widthScale, drawings, visibleCols, hyperlinks, warn);
emittedRows++;
}
if (emittedRows == 0) {
@@ -117,6 +122,7 @@ final class SheetToTable {
private static void emitRow(StringBuilder xml, int rowNum1, SheetModel.RowData row,
SheetModel sheet, StylesModel styles, SharedStrings sst, Metrics metrics,
NumberFormats numfmt, ColorResolver colors, double widthScale,
Map<Long, List<String>> drawings,
List<Integer> visibleCols, LinkedHashSet<String> hyperlinks, WarnOnce warn) {
int r = rowNum1 - 1;
xml.append("<w:tr><w:trPr><w:trHeight w:val=\"")
@@ -128,7 +134,7 @@ final class SheetToTable {
case V_CONT -> xml.append("<w:tc><w:tcPr><w:vMerge/></w:tcPr><w:p/></w:tc>");
case H_CONT -> xml.append("<w:tc><w:p/></w:tc>");
default -> emitCell(xml, r, c, row, role, sheet, styles, sst, metrics,
numfmt, colors, widthScale, visibleCols, hyperlinks, warn);
numfmt, colors, widthScale, drawings, visibleCols, hyperlinks, warn);
}
}
xml.append("</w:tr>");
@@ -185,6 +191,7 @@ final class SheetToTable {
private static void emitCell(StringBuilder xml, int r, int c, SheetModel.RowData row,
MergeRole role, SheetModel sheet, StylesModel styles, SharedStrings sst,
Metrics metrics, NumberFormats numfmt, ColorResolver colors, double widthScale,
Map<Long, List<String>> drawings,
List<Integer> visibleCols, LinkedHashSet<String> hyperlinks,
WarnOnce warn) {
xml.append("<w:tc><w:tcPr><w:tcW w:w=\"").append(colTwips(sheet, metrics, c, widthScale))
@@ -209,6 +216,10 @@ final class SheetToTable {
SheetModel.CellData cell = contentCell(sheet, row, r, c, merge);
String linkId = hyperlinkId(sheet, r, c, hyperlinks);
emitParagraph(xml, cell, xf, linkId, styles, sst, metrics, numfmt, colors, warn);
List<String> runs = drawings.remove((long) (r + 1) << 32 | c & 0xFFFF_FFFFL);
if (runs != null) {
xml.append("<w:p>").append(String.join("", runs)).append("</w:p>");
}
xml.append("</w:tc>");
}
@@ -1,5 +1,8 @@
package ru.pjandro.wordpdf.internal.xlsx;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.pjandro.wordpdf.ConvertOptions;
import ru.pjandro.wordpdf.ConversionException;
import ru.pjandro.wordpdf.DrawingFoundException;
@@ -9,6 +12,7 @@ import ru.pjandro.wordpdf.internal.DocxPackageWriter;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
/**
* Мост .xlsx → in-memory .docx: лист Excel превращается в Word-таблицу
@@ -25,6 +29,9 @@ import java.util.List;
*/
public final class XlsxToDocx {
private static final Logger LOG = LoggerFactory.getLogger(XlsxToDocx.class);
private XlsxToDocx() {
}
@@ -64,6 +71,8 @@ public final class XlsxToDocx {
StringBuilder body = new StringBuilder();
List<DocxPackageWriter.Part> parts = new ArrayList<>();
DrawingBridge.emitTheme(pkg, parts);
DrawingBridge bridge = new DrawingBridge(parts, warn);
LinkedHashSet<String> hyperlinks = new LinkedHashSet<>();
// Каждый блок печати заканчивается paragraph-level sectPr (конец
// секции = новая страница); секция последнего блока уходит финальным
@@ -74,15 +83,21 @@ public final class XlsxToDocx {
continue;
}
SheetModel model = SheetModel.read(pkg, sheet, warn);
if (model.olePresent() && options.errorOnOle()) {
// OLE в xlsx: объект не эмитится никогда; флаг — отказ (шаг 7
// уточняет находку по embeddings; structural-признаки — здесь)
if (model.olePresent()) {
if (options.errorOnOle()) {
// OLE в xlsx: объект не эмитится никогда; флаг — отказ
// по structural-признакам листа (rels oleObject/objectLink,
// legacyDrawing)
throw new DrawingFoundException(DrawingFoundException.Kind.OLE);
}
warn.warn(LOG, "OLE-объекты в листе «{}» не переносятся", sheet.name());
}
PrintLayout.Page page = PrintLayout.page(model, warn);
String sect = PrintLayout.sectPr(page);
Map<Long, List<String>> drawings = DrawingBridge.byCell(
bridge.read(pkg, model, metrics), model);
for (String blockXml : SheetToTable.emit(model, styles, sst, wb, metrics, numfmt,
colors, page, parts, hyperlinks, warn)) {
colors, page, drawings, parts, hyperlinks, warn)) {
if (pendingSect != null) {
body.append("<w:p><w:pPr><w:sectPr>").append(pendingSect)
.append("</w:sectPr></w:pPr></w:p>");
@@ -90,6 +105,11 @@ public final class XlsxToDocx {
body.append(blockXml);
pendingSect = sect;
}
// рисунки, чьи from-ячейки не были отрисованы (несущественная
// строка, вне диапазона) — в конец листа отдельными абзацами
for (List<String> runs : drawings.values()) {
body.append("<w:p>").append(String.join("", runs)).append("</w:p>");
}
}
// финальный абзац body (Word-контент-блок после последней таблицы)
body.append("<w:p/>");
@@ -10,12 +10,21 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.nio.file.Path;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -152,4 +161,59 @@ class XlsxPdfConverterTest {
assertEquals(841.9, box.getHeight(), 1);
}
}
/** Количество Image XObject на всех страницах PDF. */
private static int imageCount(Path pdf) throws IOException {
int count = 0;
try (PDDocument doc = Loader.loadPDF(pdf.toFile())) {
for (PDPage page : doc.getPages()) {
PDResources res = page.getResources();
for (COSName name : res.getXObjectNames()) {
if (res.isImageXObject(name)) {
count++;
}
}
}
}
return count;
}
/** Различные image-потоки без SMask (как в WordPdfConverterTest). */
private static int distinctImageCount(Path pdf) throws IOException {
Set<COSBase> streams = new HashSet<>();
try (PDDocument doc = Loader.loadPDF(pdf.toFile())) {
for (PDPage page : doc.getPages()) {
PDResources res = page.getResources();
for (COSName name : res.getXObjectNames()) {
if (res.isImageXObject(name)) {
PDImageXObject img =
(PDImageXObject)
res.getXObject(name);
if (img.getSoftMask() == null) {
streams.add(img.getCOSObject());
}
}
}
}
}
return streams.size();
}
@Test
void chartImage_imageCountAndNoCrash() throws IOException {
Path pdf = convertPdf(sample("xlsx-chart-image.xlsx"));
// PNG-картинка + 2 диаграммы (step 3.5 дорисовывает c:chart в PNG)
assertTrue(imageCount(pdf) >= 3, "растров мало: " + imageCount(pdf));
assertTrue(distinctImageCount(pdf) >= 2,
"растры не различаются: " + distinctImageCount(pdf));
}
@Test
void errorOnCharts_xlsxRejectsWithChartKind() throws IOException {
DrawingFoundException e = assertThrows(DrawingFoundException.class,
() -> WordPdfConverter.convert(sample("xlsx-chart-image.xlsx"), "xlsx",
new ConvertOptions(true, false, false,
WordPdfSettings.MAX_INPUT_MB, WordPdfSettings.MAX_PAGES)));
assertEquals(DrawingFoundException.Kind.CHARTS, e.kind());
}
}
@@ -0,0 +1,275 @@
package ru.pjandro.wordpdf.internal.xlsx;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
import ru.pjandro.wordpdf.internal.DocxPackageWriter;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Мост рисунков .xlsx: EMU-extent по якорям, media/chart-части, clamp
* скрытых якорей, отбрасывание фигур/SmartArt/внешних связей/гигантских
* extent. Пакеты — крафт {@link XlsxTestZips}.
*/
class DrawingBridgeTest {
private static final String XDR = "xmlns:xdr=\"http://schemas.openxmlformats.org"
+ "/drawingml/2006/spreadsheetDrawing\" xmlns:a=\"http://schemas.openxmlformats"
+ ".org/drawingml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org"
+ "/officeDocument/2006/relationships\"";
/** Лист + drawing-часть в одном пакете. */
private record Ctx(SheetModel sheet, XlsxPackage pkg) {
}
private static Ctx build(String sheetBody, String anchors, Map<String, String> extra)
throws IOException {
Map<String, String> parts = new LinkedHashMap<>();
// лист обязан ссылаться на рисунок элементом <drawing r:id> — путь
// resolving идёт по нему (как в реальных .xlsx), а не по релсам
parts.put("xl/worksheets/sheet1.xml",
XlsxTestZips.sheet(sheetBody + "<drawing r:id=\"d1\"/>"));
parts.put("xl/worksheets/_rels/sheet1.xml.rels", rels(
new String[] {"d1", XlsxTestZips.REL_DRAWING, "../drawings/drawing1.xml"}));
parts.put("xl/drawings/drawing1.xml",
"<?xml version=\"1.0\"?><xdr:wsDr " + XDR + ">" + anchors + "</xdr:wsDr>");
parts.putAll(extra);
XlsxPackage pkg = XlsxTestZips.workbook("Лист1|", parts);
SheetModel sheet = SheetModel.read(pkg, WorkbookModel.read(pkg).sheets().get(0),
new WarnOnce());
return new Ctx(sheet, pkg);
}
private static String rels(String[]... triples) {
StringBuilder sb = new StringBuilder(
"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats"
+ ".org/package/2006/relationships\">");
for (String[] t : triples) {
sb.append("<Relationship Id=\"").append(t[0]).append("\" Type=\"").append(t[1])
.append("\" Target=\"").append(t[2]).append("\"/>");
}
return sb.append("</Relationships>").toString();
}
private static String imageRels(String id, String target) {
return rels(new String[] {id,
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
target});
}
private static Metrics metrics() {
return Metrics.forNormalFamily("Carlito");
}
private static List<DrawingBridge.Placement> read(Ctx ctx,
List<DocxPackageWriter.Part> parts) {
return new DrawingBridge(parts, new WarnOnce()).read(ctx.pkg(), ctx.sheet(), metrics());
}
@Test
void picTwoCellAnchor_extentFromCellGeometry() throws IOException {
Ctx ctx = build("""
<cols><col min="1" max="2" width="10" customWidth="1"/></cols>
<sheetData><row r="1"><c r="A1"><v>1</v></c></row></sheetData>""",
"""
<xdr:twoCellAnchor>
<xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>0</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from>
<xdr:to><xdr:col>2</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>2</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to>
<xdr:pic><xdr:nvPicPr><xdr:cNvPr id="2" name="i"/><xdr:cNvPicPr/></xdr:nvPicPr>
<xdr:blipFill><a:blip r:embed="e1"/><a:stretch><a:fillRect/></a:stretch>
</xdr:blipFill>
</xdr:pic>
</xdr:twoCellAnchor>""",
Map.of("xl/drawings/_rels/drawing1.xml.rels", imageRels("e1", "../media/i.png"),
"xl/media/i.png", "PNGDATA"));
List<DocxPackageWriter.Part> parts = new ArrayList<>();
List<DrawingBridge.Placement> out = read(ctx, parts);
assertEquals(1, out.size());
DrawingBridge.Placement pl = out.get(0);
assertEquals(1, pl.row1());
assertEquals(0, pl.col());
long cx = DrawingBridge.cellX(ctx.sheet(), metrics(), 2);
long cy = DrawingBridge.cellY(ctx.sheet(), metrics(), 2);
assertTrue(pl.runXml().contains("<wp:extent cx=\"" + cx + "\" cy=\"" + cy + "\"/>"),
pl.runXml());
assertEquals("word/media/xlsx-image1.png", parts.get(0).entry());
assertEquals("image/png", parts.get(0).contentType());
assertTrue(pl.runXml().contains("r:embed=\"rId1\""));
assertTrue(pl.runXml().contains("<pic:pic"));
}
@Test
void oneCellAnchor_usesXdrExtNotInnerAExt() throws IOException {
Ctx ctx = build("<sheetData/>",
"""
<xdr:oneCellAnchor>
<xdr:from><xdr:col>1</xdr:col><xdr:colOff>100</xdr:colOff>
<xdr:row>3</xdr:row><xdr:rowOff>200</xdr:rowOff></xdr:from>
<xdr:ext cx="952500" cy="476250"/>
<xdr:pic><xdr:blipFill><a:blip r:embed="e1"/></xdr:blipFill>
<xdr:spPr><a:xfrm><a:off x="0" y="0"/>
<a:ext cx="111" cy="222"/></a:xfrm></xdr:spPr>
</xdr:pic>
</xdr:oneCellAnchor>""",
Map.of("xl/drawings/_rels/drawing1.xml.rels", imageRels("e1", "../media/i.png"),
"xl/media/i.png", "X"));
List<DrawingBridge.Placement> out = read(ctx, new ArrayList<>());
assertEquals(1, out.size());
assertTrue(out.get(0).runXml().contains("<wp:extent cx=\"952500\" cy=\"476250\"/>"),
"a:ext внутри pic не должен затирать xdr:ext: " + out.get(0).runXml());
assertEquals(4, out.get(0).row1());
assertEquals(1, out.get(0).col());
}
@Test
void chartAnchor_copiesPartKeepsGraphicData() throws IOException {
Ctx ctx = build("<sheetData/>",
"""
<xdr:twoCellAnchor>
<xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>0</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from>
<xdr:to><xdr:col>1</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>1</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to>
<xdr:graphicFrame>
<a:graphic><a:graphicData
uri="http://schemas.openxmlformats.org/drawingml/2006/chart">
<c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart"
r:id="ch1"/>
</a:graphicData></a:graphic>
</xdr:graphicFrame>
</xdr:twoCellAnchor>""",
Map.of("xl/drawings/_rels/drawing1.xml.rels", rels(new String[] {"ch1",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+ "/chart",
"../charts/chart1.xml"}),
"xl/charts/chart1.xml", "<c:chartSpace>данные</c:chartSpace>"));
List<DocxPackageWriter.Part> parts = new ArrayList<>();
List<DrawingBridge.Placement> out = read(ctx, parts);
assertEquals(1, out.size());
assertEquals("word/charts/xlsx-chart1.xml", parts.get(0).entry());
assertTrue(out.get(0).runXml().contains("<c:chart r:id=\"rId1\"/>"), out.get(0).runXml());
assertTrue(out.get(0).runXml().contains("<a:graphicData uri=\"http://schemas"
+ ".openxmlformats.org/drawingml/2006/chart\">"));
}
@Test
void giantExtentShapeDiagram_skipped() throws IOException {
Ctx ctx = build("<sheetData/>",
"""
<xdr:oneCellAnchor>
<xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>0</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from>
<xdr:ext cx="30000000" cy="100"/>
<xdr:pic><xdr:blipFill><a:blip r:embed="e1"/></xdr:blipFill></xdr:pic>
</xdr:oneCellAnchor>
<xdr:sp><xdr:nvSpPr/><xdr:spPr/></xdr:sp>
<xdr:twoCellAnchor>
<xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>0</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from>
<xdr:to><xdr:col>1</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>1</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to>
<a:graphic><a:graphicData
uri="http://schemas.openxmlformats.org/drawingml/2006/diagram">
<dsp:dspData xmlns:dsp="urn:x"/>
</a:graphicData></a:graphic>
</xdr:twoCellAnchor>""",
Map.of("xl/drawings/_rels/drawing1.xml.rels", imageRels("e1", "../media/i.png"),
"xl/media/i.png", "X"));
assertTrue(read(ctx, new ArrayList<>()).isEmpty(),
"гигантский extent/фигура/SmartArt не эмитятся");
}
@Test
void missingMediaOrExternal_skipped() throws IOException {
Ctx ctx = build("<sheetData/>",
"""
<xdr:oneCellAnchor>
<xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>0</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from>
<xdr:ext cx="9525" cy="9525"/>
<xdr:pic><xdr:blipFill><a:blip r:embed="gone"/></xdr:blipFill></xdr:pic>
</xdr:oneCellAnchor>
<xdr:oneCellAnchor>
<xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff>
<xdr:row>1</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from>
<xdr:ext cx="9525" cy="9525"/>
<xdr:pic><xdr:blipFill><a:blip r:embed="ext1"/></xdr:blipFill></xdr:pic>
</xdr:oneCellAnchor>""",
Map.of("xl/drawings/_rels/drawing1.xml.rels",
"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas"
+ ".openxmlformats.org/package/2006/relationships\">"
+ "<Relationship Id=\"ext1\" Target=\"http://example.com/i.png\""
+ " TargetMode=\"External\""
+ " Type=\"http://schemas.openxmlformats.org/officeDocument/2006"
+ "/relationships/image\"/></Relationships>"));
List<DocxPackageWriter.Part> parts = new ArrayList<>();
assertTrue(read(ctx, parts).isEmpty());
assertTrue(parts.isEmpty());
}
@Test
void byCell_clampsHiddenAnchorRowAndCol() throws IOException {
Ctx ctx = build("""
<cols>
<col min="1" max="1" width="8"/>
<col min="2" max="2" width="8" hidden="1"/>
</cols>
<sheetData>
<row r="1" hidden="1"/>
<row r="2"><c r="A2"><v>1</v></c></row>
</sheetData>""", "", Map.of());
Map<Long, List<String>> map = DrawingBridge.byCell(List.of(
new DrawingBridge.Placement(1, 1, "<w:r>1</w:r>"),
new DrawingBridge.Placement(1, 0, "<w:r>2</w:r>")), ctx.sheet());
// строка 1 скрыта → 2; колонка 2 скрыта → 3 (за описанием — видимая)
assertEquals(List.of("<w:r>1</w:r>"), map.get(2L << 32 | 2), map.keySet().toString());
assertEquals(List.of("<w:r>2</w:r>"), map.get(2L << 32 | 0), map.keySet().toString());
}
@Test
void cellCumulative_hiddenContributeZero() throws IOException {
Ctx ctx = build("""
<cols>
<col min="1" max="1" width="10" customWidth="1"/>
<col min="2" max="2" width="10" customWidth="1" hidden="1"/>
<col min="3" max="3" width="10" customWidth="1"/>
</cols>
<sheetData>
<row r="1" ht="20" customHeight="1"/>
<row r="2" hidden="1"/>
<row r="3"/>
</sheetData>""", "", Map.of());
Metrics m = metrics();
long colW = Metrics.pxToEmu(75); // 10 знаков Carlito (MDW 7): 70+5 px
assertEquals(colW, DrawingBridge.cellX(ctx.sheet(), m, 1));
assertEquals(colW, DrawingBridge.cellX(ctx.sheet(), m, 2),
"hidden-колонка не даёт вклада");
assertEquals(2 * colW, DrawingBridge.cellX(ctx.sheet(), m, 3));
assertEquals(20 * 12700, DrawingBridge.cellY(ctx.sheet(), m, 1));
assertEquals(20 * 12700, DrawingBridge.cellY(ctx.sheet(), m, 2),
"hidden-строка не даёт вклада");
assertEquals(20 * 12700 + 15 * 12700, DrawingBridge.cellY(ctx.sheet(), m, 3),
"после скрытых — дефолтная высота 15pt");
}
@Test
void themePart_emittedWhenPresent() throws IOException {
Map<String, String> parts = new LinkedHashMap<>();
parts.put("xl/theme/theme1.xml", "<a:theme>палитра</a:theme>");
XlsxPackage pkg = XlsxTestZips.workbook("Лист1|", parts);
List<DocxPackageWriter.Part> out = new ArrayList<>();
DrawingBridge.emitTheme(pkg, out);
assertEquals(1, out.size());
assertEquals("word/theme/theme1.xml", out.get(0).entry());
assertTrue(out.get(0).relType().endsWith("/theme"));
}
}
@@ -100,7 +100,7 @@ class SheetToTableTest {
LinkedHashSet<String> links = new LinkedHashSet<>();
String xml = String.join("", SheetToTable.emit(model, styles, sst, wb, metrics,
new NumberFormats(styles.customFormats(), wb.date1904()), colors,
PrintLayout.page(model, warn), outParts, links, warn));
PrintLayout.page(model, warn), new LinkedHashMap<>(), outParts, links, warn));
return new Emitted(xml, outParts, new ArrayList<>(links));
}
@@ -6,6 +6,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -217,6 +218,53 @@ class XlsxToDocxTest {
assertTrue(xml.contains("<w:p/>"), "документ обязан содержать контент-блок");
}
@Test
void drawings_imageRunInCellAndThemePartCarried() throws IOException {
String xdr = "xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/"
+ "spreadsheetDrawing\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml"
+ "/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument"
+ "/2006/relationships\"";
String pic = "<xdr:oneCellAnchor><xdr:from><xdr:col>0</xdr:col><xdr:colOff>0</xdr:colOff>"
+ "<xdr:row>0</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from>"
+ "<xdr:ext cx=\"952500\" cy=\"952500\"/>"
+ "<xdr:pic><xdr:blipFill><a:blip r:embed=\"e1\"/></xdr:blipFill></xdr:pic>"
+ "</xdr:oneCellAnchor>";
byte[] xlsx = XlsxTestZips.workbookBytes("Лист|", Map.of(
"xl/worksheets/sheet1.xml", XlsxTestZips.sheet(
"<sheetData><row r=\"1\"><c r=\"A1\"><v>1</v></c></row></sheetData>"
+ "<drawing r:id=\"d1\"/>"),
"xl/worksheets/_rels/sheet1.xml.rels",
"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats"
+ ".org/package/2006/relationships\"><Relationship Id=\"d1\" Type=\""
+ XlsxTestZips.REL_DRAWING + "\" Target=\"../drawings/drawing1.xml\""
+ "/></Relationships>",
"xl/drawings/drawing1.xml",
"<?xml version=\"1.0\"?><xdr:wsDr " + xdr + ">" + pic + "</xdr:wsDr>",
"xl/drawings/_rels/drawing1.xml.rels",
"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats"
+ ".org/package/2006/relationships\"><Relationship Id=\"e1\" Type=\""
+ "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+ "/image\" Target=\"../media/i.png\"/></Relationships>",
"xl/media/i.png", "PNGDATA",
"xl/theme/theme1.xml", "<a:theme/>"));
byte[] docx = XlsxToDocx.convert(xlsx, ConvertOptions.defaults());
Map<String, String> entries = new LinkedHashMap<>();
try (ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(docx))) {
ZipEntry entry;
while ((entry = zip.getNextEntry()) != null) {
entries.put(entry.getName(),
new String(zip.readAllBytes(), StandardCharsets.UTF_8));
}
}
String body = entries.get("word/document.xml");
assertTrue(body.contains("<wp:inline"), "картинка не доехала в тело: " + body);
assertTrue(body.indexOf("<wp:inline") < body.indexOf("</w:tc>"),
"рисунок обязан стоять внутри from-ячейки");
assertTrue(entries.containsKey("word/media/xlsx-image1.png"));
assertTrue(entries.containsKey("word/theme/theme1.xml"), "theme-часть не перенесена");
assertTrue(entries.get("word/_rels/document.xml.rels").contains("/theme"));
}
@Test
void sections_breakAfterBlockAndFinalBodySectPr() throws IOException {
byte[] xlsx = XlsxTestZips.workbookBytes("Л1|;Л2|", Map.of(