Fixed issue JanKallman#176 Tint problem with small values. JanKallman…

…#178 LoadFromText, JanKallman#181 Custom properties causes corrupt workbook and JanKallman#10 Optimized adding of images in the Drawings collection. JanKallman#196 Text format with d does not match the Excel behavior. And some documentation of Sparklines
twaltari · Apr 25, 2018 · cdfc51d · cdfc51d
1 parent 8ab7d73
commit cdfc51d
Show file tree

Hide file tree

Showing 22 changed files with 216 additions and 218 deletions.
diff --git a/EPPlus/Compatibility/CompatibilitySettings.cs b/EPPlus/Compatibility/CompatibilitySettings.cs
@@ -92,17 +92,5 @@ public bool IsWorksheets1Based
                 }
             }
         }
-        //TODO: Add this in a future version
-        //public bool IsRowColumnCell1Based
-        //{
-        //    get
-        //    {
-        //        return excelPackage._rowColumnCellAdd == 1;
-        //    }
-        //    set
-        //    {
-        //        excelPackage._rowColumnCellAdd = value ? 1 : 0;
-        //    }
-        //}
     }
 }
diff --git a/EPPlus/Compatibility/DateTimeExtensions.cs b/EPPlus/Compatibility/DateTimeExtensions.cs
diff --git a/EPPlus/Compatibility/ImageCompat.cs b/EPPlus/Compatibility/ImageCompat.cs
@@ -8,9 +8,9 @@
 
 namespace OfficeOpenXml.Compatibility
 {
-    public class ImageCompat
+    internal class ImageCompat
     {
-        public static byte[] GetImageAsByteArray(Image image)
+        internal static byte[] GetImageAsByteArray(Image image)
         {
             var ms = new MemoryStream();
             if (image.RawFormat.Guid == ImageFormat.Gif.Guid)

diff --git a/EPPlus/Compatibility/SecurityElement.cs b/EPPlus/Compatibility/SecurityElement.cs
diff --git a/EPPlus/DataValidation/Formulas/ExcelDataValidationFormulaDateTime.cs b/EPPlus/DataValidation/Formulas/ExcelDataValidationFormulaDateTime.cs
@@ -47,7 +47,7 @@ public ExcelDataValidationFormulaDateTime(XmlNamespaceManager namespaceManager,
             if (!string.IsNullOrEmpty(value))
             {
                 double oADate = default(double);
-                if (double.TryParse(value, NumberStyles.Number, CultureInfo.InvariantCulture, out oADate))
+                if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out oADate))
                 {
                     Value = DateTime.FromOADate(oADate);
                 }

diff --git a/EPPlus/DataValidation/Formulas/ExcelDataValidationFormulaDecimal.cs b/EPPlus/DataValidation/Formulas/ExcelDataValidationFormulaDecimal.cs
@@ -51,7 +51,7 @@ public ExcelDataValidationFormulaDecimal(XmlNamespaceManager namespaceManager, X
             if (!string.IsNullOrEmpty(value))
             {
                 double dValue = default(double);
-                if (double.TryParse(value, NumberStyles.Number, CultureInfo.InvariantCulture, out dValue))
+                if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out dValue))
                 {
                     Value = dValue;
                 }

diff --git a/EPPlus/DataValidation/Formulas/ExcelDataValidationFormulaTime.cs b/EPPlus/DataValidation/Formulas/ExcelDataValidationFormulaTime.cs
@@ -49,7 +49,7 @@ public ExcelDataValidationFormulaTime(XmlNamespaceManager namespaceManager, XmlN
             if (!string.IsNullOrEmpty(value))
             {
                 decimal time = default(decimal);
-                if (decimal.TryParse(value, NumberStyles.Number, CultureInfo.InvariantCulture, out time))
+                if (decimal.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out time))
                 {
                     Value = new ExcelTime(time);
                 }

diff --git a/EPPlus/Drawing/ExcelDrawings.cs b/EPPlus/Drawing/ExcelDrawings.cs
@@ -428,7 +428,7 @@ public ExcelShape AddShape(string Name, ExcelShape Source)
         }
             private XmlElement CreateDrawingXml()
             {
-                if (DrawingXml.OuterXml == "")
+                if (DrawingXml.DocumentElement == null)
                 {
                     DrawingXml.LoadXml(string.Format("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><xdr:wsDr xmlns:xdr=\"{0}\" xmlns:a=\"{1}\" />", ExcelPackage.schemaSheetDrawings, ExcelPackage.schemaDrawings));
                     Packaging.ZipPackage package = Worksheet._package.Package;

diff --git a/EPPlus/EPPlus.MultiTarget.csproj b/EPPlus/EPPlus.MultiTarget.csproj
@@ -219,6 +219,10 @@ Release Candidate changes
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\EPPlus.xml</DocumentationFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Remove="Compatibility\DateTimeExtensions.cs" />
     <Compile Remove="Compatibility\SecurityElement.cs" />

diff --git a/EPPlus/ExcelPackage.cs b/EPPlus/ExcelPackage.cs
@@ -509,13 +509,13 @@ internal ImageInfo GetImageInfo(byte[] image)
                 return null;
             }
         }
+        internal static int _id = 1;
         private Uri GetNewUri(Packaging.ZipPackage package, string sUri)
         {
-            int id = 1;
             Uri uri;
             do
             {
-                uri = new Uri(string.Format(sUri, id++), UriKind.Relative);
+                uri = new Uri(string.Format(sUri, _id++), UriKind.Relative);
             }
             while (package.PartExists(uri));
             return uri;
@@ -748,7 +748,11 @@ private XmlNamespaceManager CreateDefaultNSM()
 		internal void SavePart(Uri uri, XmlDocument xmlDoc)
 		{
             Packaging.ZipPackagePart part = _package.GetPart(uri);
-			xmlDoc.Save(part.GetStream(FileMode.Create, FileAccess.Write));
+            var stream = part.GetStream(FileMode.Create, FileAccess.Write);
+            var xr = new XmlTextWriter(stream, Encoding.UTF8);
+            xr.Formatting = Formatting.None;
+
+            xmlDoc.Save(xr);
 		}
         /// <summary>
 		/// Saves the XmlDocument into the package at the specified Uri.
@@ -779,7 +783,11 @@ internal void SaveWorkbook(Uri uri, XmlDocument xmlDoc)
                     }
                 }
             }
-			xmlDoc.Save(part.GetStream(FileMode.Create, FileAccess.Write));
+            var stream = part.GetStream(FileMode.Create, FileAccess.Write);
+            var xr = new XmlTextWriter(stream, Encoding.UTF8);
+            xr.Formatting = Formatting.None;
+
+            xmlDoc.Save(xr);
 		}
 
 #endregion