Skip to content

Commit d02e49a

Browse files
Fixed a drawing related bug in the worksheet generation (#1011)
* Fixed a drawing related bug in the worksheet generation The drawing's id referenced in the worksheet did not match the one defined in the .rels file * Adjusted one of the tests to reflect the corrected drawing id
1 parent d9d3e76 commit d02e49a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎src/MiniExcel.OpenXml/Constants/WorksheetXml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ internal static string Cell(string cellReference, string? cellType, string style
6868
}
6969

7070
internal static string Autofilter(string dimensionRef) => $"<x:autoFilter ref=\"{dimensionRef}\" />";
71-
internal static string Drawing(int sheetIndex) => $"<x:drawing r:id=\"drawing{sheetIndex}\" />";
72-
}
71+
internal static string Drawing(int sheetIndex) => $"<x:drawing r:id=\"rDrawing{sheetIndex}\" />";
72+
}

‎tests/MiniExcel.OpenXml.Tests/Issues/MiniExcelGiteeIssuesTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,13 @@ public void IssueI50VD5()
316316
Assert.Contains("/xl/media/", SheetHelper.GetZipFileContent(path, "xl/drawings/_rels/drawing1.xml.rels"));
317317
Assert.Contains("ext cx=\"609600\" cy=\"190500\"", SheetHelper.GetZipFileContent(path, "xl/drawings/drawing1.xml"));
318318
Assert.Contains("/xl/drawings/drawing1.xml", SheetHelper.GetZipFileContent(path, "[Content_Types].xml"));
319-
Assert.Contains("drawing r:id=\"drawing1\"", SheetHelper.GetZipFileContent(path, "xl/worksheets/sheet1.xml"));
319+
Assert.Contains("drawing r:id=\"rDrawing1\"", SheetHelper.GetZipFileContent(path, "xl/worksheets/sheet1.xml"));
320320
Assert.Contains("../drawings/drawing1.xml", SheetHelper.GetZipFileContent(path, "xl/worksheets/_rels/sheet1.xml.rels"));
321321

322322
Assert.Contains("/xl/media/", SheetHelper.GetZipFileContent(path, "xl/drawings/_rels/drawing2.xml.rels"));
323323
Assert.Contains("ext cx=\"609600\" cy=\"190500\"", SheetHelper.GetZipFileContent(path, "xl/drawings/drawing2.xml"));
324324
Assert.Contains("/xl/drawings/drawing1.xml", SheetHelper.GetZipFileContent(path, "[Content_Types].xml"));
325-
Assert.Contains("drawing r:id=\"drawing2\"", SheetHelper.GetZipFileContent(path, "xl/worksheets/sheet2.xml"));
325+
Assert.Contains("drawing r:id=\"rDrawing2\"", SheetHelper.GetZipFileContent(path, "xl/worksheets/sheet2.xml"));
326326
Assert.Contains("../drawings/drawing2.xml", SheetHelper.GetZipFileContent(path, "xl/worksheets/_rels/sheet2.xml.rels"));
327327
}
328328
}

0 commit comments

Comments
 (0)