Skip to content

[fix bug] use col span count to caculate row span #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: vNext
Choose a base branch
from
Open

[fix bug] use col span count to caculate row span #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06edc1f
[fix bug] use col span count to caculate row span
Nov 17, 2020
bcb63da
Merge branch 'vNext' of github.com:smartlei24/Open-Xml-PowerTools int…
Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion OpenXmlPowerTools/WmlToHtmlConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,15 +820,29 @@ private static object ProcessTableCell(WordprocessingDocument wordDoc, WmlToHtml
{
var currentRow = element.Parent.ElementsBeforeSelf(W.tr).Count();
var currentCell = element.ElementsBeforeSelf(W.tc).Count();

var tbl = element.Parent.Parent;
var beforeColsCount = element
.ElementsBeforeSelf(W.tc)
.Select(c => c.Element(W.tcPr).Elements(W.gridSpan).Attributes(W.val).FirstOrDefault())
.Select(a => a == null || (int)a == 0 ? 1 : (int)a)
.Sum();

int rowSpanCount = 1;
currentRow += 1;
while (true)
{
var row = tbl.Elements(W.tr).Skip(currentRow).FirstOrDefault();
if (row == null)
break;
var cell2 = row.Elements(W.tc).Skip(currentCell).FirstOrDefault();
var rowCurrentColCount = 0;
var cell2 = row.Elements(W.tc).SkipWhile(e =>
{
var val = e.Element(W.tcPr).Elements(W.gridSpan).Attributes(W.val).FirstOrDefault();
var col = val == null || (int)val == 0 ? 1 : (int) val;
rowCurrentColCount += col;
return rowCurrentColCount <= beforeColsCount;
}).FirstOrDefault();
if (cell2 == null)
break;
if (cell2.Elements(W.tcPr).Elements(W.vMerge).FirstOrDefault() == null)
Expand Down