Fixed issue #1653 and enabled update of the Workbook.MaxFontWidth property. (#1654)

Author: JanKallman

src/EPPlus/ExcelWorkbook.cs

@@ -341,13 +341,23 @@ private void GetSharedStrings()
 						if (xr.LocalName == "t" && xr.NodeType == XmlNodeType.Element)
 						{
 							var text = ConvertUtil.ExcelDecodeString(xr.ReadElementContentAsString());
-							_sharedStringsListNew.Add(new SharedStringTextItem() { Text = text, Position = index });
-							if (!_sharedStringsLookup.ContainsKey(text))
+							if(xr.Name=="r" && xr.NodeType == XmlNodeType.Element)
 							{
-								_sharedStringsLookup.Add(text, index++);
-							}
-						}
-						else if (xr.LocalName == "r" && xr.NodeType == XmlNodeType.Element)
+                                var item = new SharedStringRichTextItem() { RichText = new ExcelRichTextCollection(xr, this), Position = index++ };
+								item.RichText.Insert(0, text);
+								_sharedStringsListNew.Add(item);
+                                text = item.RichText.GetXML();
+                            }
+                            else
+							{
+                                _sharedStringsListNew.Add(new SharedStringTextItem() { Text = text, Position = index });
+                                if (!_sharedStringsLookup.ContainsKey(text))
+                                {
+                                    _sharedStringsLookup.Add(text, index++);
+                                }
+                            }
+                        }
+						if (xr.LocalName == "r" && xr.NodeType == XmlNodeType.Element)
 						{
 							var item = new SharedStringRichTextItem() { RichText = new ExcelRichTextCollection(xr, this), Position = index++ };
 							_sharedStringsListNew.Add(item);
@@ -734,34 +744,37 @@ public ExcelThreadedCommentPersonCollection ThreadedCommentPersons
 			}
 		}
 		/// <summary>
-		/// Max font width for the workbook
-		/// <remarks>This method uses GDI. If you use Azure or another environment that does not support GDI, you have to set this value manually if you don't use the standard Calibri font</remarks>
+		/// Max font width for the workbook, used in the calculation of column widths.
+		/// <remarks>This property uses the static <see cref="FontSize.FontWidths"></see> dictionary to get the max font width /></remarks>
 		/// </summary>
 		public decimal MaxFontWidth
 		{
 			get
 			{
-				var ix = Styles.GetNormalStyleIndex();
-				if (ix >= 0)
+				if (_standardFontWidth == decimal.MinValue)
 				{
-					var font = Styles.NamedStyles[ix].Style.Font;
-					if (font.Index == int.MinValue) font.Index = 0;
-					if (_standardFontWidth == decimal.MinValue || _fontID != font.Id)
+					var ix = Styles.GetNormalStyleIndex();
+					if (ix >= 0)
 					{
-						try
+						var font = Styles.NamedStyles[ix].Style.Font;
+						if (font.Index == int.MinValue) font.Index = 0;
+						if (_standardFontWidth == decimal.MinValue || _fontID != font.Id)
 						{
-							_standardFontWidth = FontSize.GetWidthPixels(font.Name, font.Size);
-							_fontID = Styles.NamedStyles[ix].Style.Font.Id;
-						}
-						catch   //Error, Font missing and Calibri removed in dictionary
-						{
-							_standardFontWidth = (int)(font.Size * (2D / 3D)); //Aprox for Calibri.
+							try
+							{
+								_standardFontWidth = FontSize.GetWidthPixels(font.Name, font.Size);
+								_fontID = Styles.NamedStyles[ix].Style.Font.Id;
+							}
+							catch   //Error, Font missing and Calibri removed in dictionary
+							{
+								_standardFontWidth = (int)(font.Size * (2D / 3D)); //Aprox for Calibri.
+							}
 						}
 					}
-				}
-				else
-				{
-					_standardFontWidth = 7; //Calibri 11
+					else
+					{
+						_standardFontWidth = 7; //Calibri 11
+					}
 				}
 				return _standardFontWidth;
 			}
@@ -1957,13 +1970,14 @@ internal ExcelTable GetTable(string name)
 
 		internal void ClearDefaultHeightsAndWidths()
 		{
-			foreach (var ws in Worksheets)
+			_standardFontWidth = decimal.MinValue;
+            foreach (var ws in Worksheets)
 			{
 				if (ws.IsChartSheet == false)
 				{
 					if (ws.CustomHeight == false)
 					{
-						ws._defaultRowHeight = double.NaN;
+						ws._defaultRowHeight = double.NaN;						
 					}
 				}
 			}

src/EPPlus/Style/RichText/ExcelRichTextCollection.cs

@@ -158,7 +158,7 @@ public ExcelRichText Insert(int index, string text)
             }
             else
             {
-                prevIndex = index - 1;
+                prevIndex = index <= 0 ? 0 : index - 1;
             }
             if(_list.Count > 0)
             {
@@ -175,12 +175,7 @@ public ExcelRichText Insert(int index, string text)
                 rt.ColorSettings = prevRT.ColorSettings.Clone();
                 rt.PreserveSpace = prevRT.PreserveSpace;
             }
-            else if(_cells == null)
-            {
-                rt.FontName = "Calibri";
-                rt.Size = 11;
-            }
-            else
+            else if(_cells != null)
             {
                 var style = _cells.Offset(0, 0).Style;
                 rt.FontName = style.Font.Name;

src/EPPlusTest/Issues/DrawingIssues.cs

@@ -43,5 +43,29 @@ public void i1446()
                 var sbr = sheet.Drawings[1].As.Control.ScrollBar;
             }
         }
+
+        [TestMethod]
+        public void i1640()
+        {
+            using (var package = OpenTemplatePackage("i1640.xlsx"))
+            {
+                package.Workbook.MaxFontWidth = 8;
+                FontSize.FontWidths.Add("ＭＳ Ｐゴシック", new Dictionary<float, short> { { 11, 8 } });
+
+                var sheet = package.Workbook.Worksheets[0];
+                CopyRows(sheet, 1, 10, 11, 20);
+                SaveAndCleanup(package);
+            }
+        }
+        public void CopyRows(ExcelWorksheet excelWorksheet, int sourceFrom, int sourceTo, int destFrom, int destTo)
+        {
+            for (int i = destFrom; i <= destTo; i++)
+            {
+                excelWorksheet.Row(i).Height = excelWorksheet.Row(sourceFrom + i - destFrom).Height;
+            }
+
+            excelWorksheet.Cells[sourceFrom.ToString() + ":" + sourceTo].Copy(
+                excelWorksheet.Cells[destFrom.ToString() + ":" + destTo]);
+        }
     }
 }

src/EPPlusTest/Issues/RangeTextIssues.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using OfficeOpenXml.FormulaParsing;
 using System.Globalization;
+using System.Diagnostics;
 
 namespace EPPlusTest.Issues
 {
@@ -40,6 +41,18 @@ public void s667()
 
             }
         }
- 
+        [TestMethod]
+        public void i1653()
+        {
+            using(var package = OpenTemplatePackage("i1653.xlsx"))
+            {
+                ExcelWorkbook workbook = package.Workbook;
+                ExcelWorksheet worksheet = workbook.Worksheets[0];
+                var cell = worksheet.Cells["C17"].Text;
+
+                // Assert failed: `cell.Text` and `cell.Value` are both empty string
+                    Debug.Assert(cell == "{\"any_orange_frag\" : 700, \"any_purple_frag\" : 800,\"any_blue_frag\" : 1200, \"any_green_frag\":2500}");
+            }
+        }
     }
 }