diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs index fc2468d..ca23648 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs @@ -374,7 +374,7 @@ foreach (var run in runElements) { var runProperties = run.RunProperties; - String text = run.Text.InnerText; + String text = run.Text.InnerText.Replace("\n", Environment.NewLine); if (runProperties == null) { @@ -388,7 +388,7 @@ if (fontColor.HasValue) rt.FontColor = fontColor; - var fontFamilyNumbering = runProperties.Elements().FirstOrDefault(); + var fontFamilyNumbering = runProperties.Elements().FirstOrDefault(); if (fontFamilyNumbering != null && fontFamilyNumbering.Val != null) rt.FontFamilyNumbering = (XLFontFamilyNumberingValues)Int32.Parse(fontFamilyNumbering.Val.ToString()); var runFont = runProperties.Elements().FirstOrDefault(); diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs index 5902642..0fd6ca1 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs @@ -725,14 +725,16 @@ FontSize fontSize = new FontSize() { Val = rt.FontSize }; Color color = GetNewColor(rt.FontColor); RunFont fontName = new RunFont() { Val = rt.FontName }; - FontFamilyNumbering fontFamilyNumbering = new FontFamilyNumbering() { Val = (Int32)rt.FontFamilyNumbering }; + FontFamily fontFamilyNumbering = new FontFamily() { Val = (Int32)rt.FontFamilyNumbering }; if (bold != null) runProperties.Append(bold); if (italic != null) runProperties.Append(italic); - if (underline != null) runProperties.Append(underline); + if (strike != null) runProperties.Append(strike); - runProperties.Append(verticalAlignment); if (shadow != null) runProperties.Append(shadow); + if (underline != null) runProperties.Append(underline); + runProperties.Append(verticalAlignment); + runProperties.Append(fontSize); runProperties.Append(color); runProperties.Append(fontName);