Fixed merge

stesee · stesee · commit 29c26dbe994e · 2021-10-12T18:44:05.000+02:00
diff --git a/OpenXmlPowerTools/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverter.cs b/OpenXmlPowerTools/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverter.cs
@@ -2292,6 +2292,8 @@ private static XElement AddDefaultTabsAfterLastTab(XElement tabs, int defaultTab
                 if (defaultTabStop == 0)
                 {
                     defaultTabStop = 720;
+                }
+
                 var rangeStart = WordprocessingMLUtil.StringToTwips((string)lastTabElement.Attribute(W.pos)) / defaultTabStop + 1;
                 var tempTabs = new XElement(W.tabs,
                     tabs.Elements().Where(t => (string)t.Attribute(W.val) != "clear" && (string)t.Attribute(W.val) != "bar"),

Original file line number	Diff line number	Diff line change
`@@ -2292,6 +2292,8 @@ private static XElement AddDefaultTabsAfterLastTab(XElement tabs, int defaultTab`
`2292`	`2292`	`if (defaultTabStop == 0)`
`2293`	`2293`	`{`
`2294`	`2294`	`defaultTabStop = 720;`
	`2295`	`+ }`
	`2296`	`+`
`2295`	`2297`	`var rangeStart = WordprocessingMLUtil.StringToTwips((string)lastTabElement.Attribute(W.pos)) / defaultTabStop + 1;`
`2296`	`2298`	`var tempTabs = new XElement(W.tabs,`
`2297`	`2299`	`tabs.Elements().Where(t => (string)t.Attribute(W.val) != "clear" && (string)t.Attribute(W.val) != "bar"),`