Merge branch 'dev'

rabanti-github · Nov 4, 2018 · 75cc06e · 75cc06e
2 parents 262d3cc + 051dd34
commit 75cc06e
Show file tree

Hide file tree

Showing 532 changed files with 668 additions and 662 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## v2.6.2
+
+---
+Release Date: **04.11.2018**
+
+- Fixed a bug in the style handling of merged cells. Bug fix provided by David Courtel
+
+
 ## v2.6.1
 
 ---

diff --git a/Demo/Program.cs b/Demo/Program.cs
@@ -22,7 +22,6 @@ class Program
         /// <param name="args">Not used</param>
         static void Main(string[] args)
         {
-
             BasicDemo();
             ShortenerDemo();
             StreamDemo();
@@ -50,7 +49,6 @@ static void Main(string[] args)
             /* ######################### */
         }
 
-
         /// <summary>
         /// This is a very basic demo (adding three values and save the workbook)
         /// </summary>
@@ -64,7 +62,7 @@ private static void BasicDemo()
         }
 
         /// <summary>
-        /// This method show the shortened style of writing cells
+        /// This method shows the shortened style of writing cells
         /// </summary>
         private static void ShortenerDemo()
         {
@@ -166,7 +164,7 @@ private static void Demo2()
         }
 
         /// <summary>
-        /// This demo shows the usage of flipped direction when using AddnextCell, reading of the current cell address, and retrieving of cell values
+        /// This demo shows the usage of flipped direction when using AddNextCell, reading of the current cell address, and retrieving of cell values
         /// </summary>
         private static void Demo3()
         {

diff --git a/Executable/Debug/PicoXLSX.dll b/Executable/Debug/PicoXLSX.dll
diff --git a/Executable/Documentation.chm b/Executable/Documentation.chm
diff --git a/Executable/Release/PicoXLSX.dll b/Executable/Release/PicoXLSX.dll
diff --git a/PicoXLSX/Properties/AssemblyInfo.cs b/PicoXLSX/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.1")]
-[assembly: AssemblyFileVersion("2.6.1")]
+[assembly: AssemblyVersion("2.6.2")]
+[assembly: AssemblyFileVersion("2.6.2")]
diff --git a/PicoXLSX/Workbook.cs b/PicoXLSX/Workbook.cs
@@ -472,8 +472,8 @@ public void ResolveMergedCells()
                         if (pos != 0)
                         {
                             cell.DataType = Cell.CellType.EMPTY;
+                            cell.SetStyle(mergeStyle);
                         }
-                        cell.SetStyle(mergeStyle);
                         pos++;
                     }
 

diff --git a/docs/Documentation.chm b/docs/Documentation.chm
diff --git a/docs/WebKI.xml b/docs/WebKI.xml
@@ -262,8 +262,8 @@
   <HelpKINode Title="DATE enumeration member" Url="html/869e4b32-cce1-41ab-bb92-a93de8fb392c.htm" />
   <HelpKINode Title="dateFormat enumeration member" Url="html/34686cde-ba88-a4db-d64e-d3f544c9367a.htm" />
   <HelpKINode Title="DateFormat property" Url="html/de49e825-7876-1f38-8efe-d9f1198114b9.htm" />
-  <HelpKINode Title="Default enumeration member" Url="html/054880db-85e2-6c24-88b8-8502bd71892f.htm" />
   <HelpKINode Title="DEFAULT enumeration member" Url="html/869e4b32-cce1-41ab-bb92-a93de8fb392c.htm" />
+  <HelpKINode Title="Default enumeration member" Url="html/054880db-85e2-6c24-88b8-8502bd71892f.htm" />
   <HelpKINode Title="DEFAULTCOLOR field" Url="html/0e746481-09a9-80ed-3243-53123c0ac1b1.htm" />
   <HelpKINode Title="DefaultColumnWidth property" Url="html/40e6537e-c8a6-18c5-a02f-38411cbbcf8e.htm" />
   <HelpKINode Title="DEFAULTFONT field" Url="html/86194439-344c-6442-bdbf-21c9e9d3304b.htm" />
@@ -478,8 +478,8 @@
   <HelpKINode Title="LockWindowsIfProtected property" Url="html/ef8f758a-e442-70b6-604f-51cbdcf200f6.htm" />
   <HelpKINode Title="LowLevel class">
     <HelpKINode Title="LowLevel Class" Url="html/21d4a25a-f2b5-5ec4-8b84-8fcee13605a0.htm" />
-    <HelpKINode Title="constructor" Url="html/dbbcf6a6-b50e-1d72-6dc4-dfa09f1aca4e.htm" />
     <HelpKINode Title="constructor" Url="html/20d28a8a-5f98-83cc-261b-e6510f44cdc1.htm" />
+    <HelpKINode Title="constructor" Url="html/dbbcf6a6-b50e-1d72-6dc4-dfa09f1aca4e.htm" />
     <HelpKINode Title="methods" Url="html/322b3913-e838-3a82-7cd5-10444749e661.htm" />
     <HelpKINode Title="properties" Url="html/e8abb7d0-cd71-6f50-8803-cca034581033.htm" />
   </HelpKINode>
@@ -747,8 +747,8 @@
   <HelpKINode Title="SetRowHiddenState method" Url="html/c49f088a-d58d-680f-4d6a-b45d554cf7fa.htm" />
   <HelpKINode Title="SetSelectedCells method" Url="html/e642e906-3de8-5d92-f498-13d2f703628a.htm" />
   <HelpKINode Title="SetSelectedWorksheet method" Url="html/29b0d50b-54b9-ade1-8f89-55ef8b4c9705.htm" />
-  <HelpKINode Title="SetSheetname method" Url="html/26ed859f-c126-d114-a95b-d6a7bed349c7.htm" />
   <HelpKINode Title="SetSheetName method" Url="html/0dfb2d1a-1318-91b6-4ebb-a7bc6e4f4665.htm" />
+  <HelpKINode Title="SetSheetname method" Url="html/26ed859f-c126-d114-a95b-d6a7bed349c7.htm" />
   <HelpKINode Title="SetSheetProtectionPassword method" Url="html/425b6b66-0ccf-ec1f-8520-2c08807ea3cd.htm" />
   <HelpKINode Title="SetStyle method" Url="html/4c8dce52-9e1e-2231-320b-19c48ba64aac.htm" />
   <HelpKINode Title="SetWorkbookProtection method" Url="html/ee7b8e72-2649-dac7-a078-19be7954c1f9.htm" />