Fixed worksheet protection handling; Added test

Author: rabanti-github

NanoXLSX/LowLevel/XlsxWriter.cs

@@ -1049,11 +1049,18 @@ private string CreateSheetProtectionString(Worksheet sheet)
             {
                 actualLockingValues.Add(Worksheet.SheetProtectionValue.scenarios, 1);
             }
-            if (!sheet.SheetProtectionValues.Contains(Worksheet.SheetProtectionValue.selectLockedCells))
+            bool allowSelectLocked = sheet.SheetProtectionValues.Contains(Worksheet.SheetProtectionValue.selectLockedCells);
+            bool allowSelectUnlocked = sheet.SheetProtectionValues.Contains(Worksheet.SheetProtectionValue.selectUnlockedCells);
+            if (allowSelectLocked && !allowSelectUnlocked)
+            {
+                // This shouldn't happen in Excel's UI, but handle it by allowing both
+                allowSelectUnlocked = true;
+            }
+            if (!allowSelectLocked)
             {
                 actualLockingValues.Add(Worksheet.SheetProtectionValue.selectLockedCells, 1);
             }
-            if (!sheet.SheetProtectionValues.Contains(Worksheet.SheetProtectionValue.selectUnlockedCells))
+            if (!allowSelectUnlocked)
             {
                 actualLockingValues.Add(Worksheet.SheetProtectionValue.selectUnlockedCells, 1);
             }
@@ -1375,24 +1382,17 @@ private string CreateStyleXfsString()
                     alignmentString = sb2.ToString();
                 }
 
-                if (style.CurrentCellXf.Hidden || !style.CurrentCellXf.Locked)
+                if (style.CurrentCellXf.Hidden && style.CurrentCellXf.Locked)
                 {
-                    if (style.CurrentCellXf.Hidden && style.CurrentCellXf.Locked)
-                    {
-                        protectionString = "<protection locked=\"1\" hidden=\"1\"/>";
-                    }
-                    else if (style.CurrentCellXf.Hidden && !style.CurrentCellXf.Locked)
-                    {
-                        protectionString = "<protection hidden=\"1\" locked=\"0\"/>";
-                    }
-                    else if (!style.CurrentCellXf.Hidden && !style.CurrentCellXf.Locked)
-                    {
-                        protectionString = "<protection locked=\"0\"/>";
-                    }
-                    else
-                    {
-                        protectionString = "<protection locked=\"1\"/>";
-                    }
+                    protectionString = "<protection locked=\"1\" hidden=\"1\"/>";
+                }
+                else if (style.CurrentCellXf.Hidden && !style.CurrentCellXf.Locked)
+                {
+                    protectionString = "<protection hidden=\"1\" locked=\"0\"/>";
+                }
+                else if (!style.CurrentCellXf.Hidden && !style.CurrentCellXf.Locked)
+                {
+                    protectionString = "<protection locked=\"0\"/>";
                 }
 
                 sb.Append("<xf numFmtId=\"");

NanoXlsx Test/Worksheets/WorksheetWriteReadTest.cs

@@ -498,6 +498,7 @@ public void SheetNameWriteReadTest()
         [InlineData(false, "", "", 0)]
         [InlineData(false, "autoFilter:0,sort:0", "", 0)]
         [InlineData(true, "", "objects:1,scenarios:1,selectLockedCells:1,selectUnlockedCells:1", 0)]
+        [InlineData(true, "selectLockedCells:1,selectUnlockedCells:0", "objects:1,scenarios:1", 0)] // Special case: only locked cells selectable is not possible, therefore none
         [InlineData(true, "autoFilter:0", "autoFilter:0,objects:1,scenarios:1,selectLockedCells:1,selectUnlockedCells:1", 0)]
         [InlineData(true, "pivotTables:0", "pivotTables:0,objects:1,scenarios:1,selectLockedCells:1,selectUnlockedCells:1", 0)]
         [InlineData(true, "sort:0", "sort:0,objects:1,scenarios:1,selectLockedCells:1,selectUnlockedCells:1", 0)]
@@ -556,6 +557,32 @@ public void SheetProtectionWriteReadTest(bool useSheetProtection, string givenPr
             }
         }
 
+        [Fact(DisplayName = "Test of the 'SheetProtectionValues' when setting selectLockedCells alone (causes auto-fix)")]
+        public void SheetProtectionWriteReadTest2()
+        {
+            int sheetIndex = 0;
+            Workbook workbook = PrepareWorkbook(4, "test");
+            for (int i = 0; i <= sheetIndex; i++)
+            {
+                if (sheetIndex == i)
+                {
+                    workbook.SetCurrentWorksheet(i);
+                    workbook.CurrentWorksheet.AddAllowedActionOnSheetProtection(Worksheet.SheetProtectionValue.selectUnlockedCells);
+                    workbook.CurrentWorksheet.AddAllowedActionOnSheetProtection(Worksheet.SheetProtectionValue.selectLockedCells);
+                    // Override default (technically invalid)
+                    workbook.CurrentWorksheet.RemoveAllowedActionOnSheetProtection(Worksheet.SheetProtectionValue.selectUnlockedCells);
+                    workbook.CurrentWorksheet.UseSheetProtection = true;
+                }
+            }
+            Worksheet givenWorksheet = WriteAndReadWorksheet(workbook, sheetIndex);
+            Assert.Equal(2, givenWorksheet.SheetProtectionValues.Count);
+            Assert.True(givenWorksheet.UseSheetProtection);
+            Assert.Contains(Worksheet.SheetProtectionValue.objects, givenWorksheet.SheetProtectionValues);
+            Assert.Contains(Worksheet.SheetProtectionValue.scenarios, givenWorksheet.SheetProtectionValues);
+            Assert.DoesNotContain(Worksheet.SheetProtectionValue.selectLockedCells, givenWorksheet.SheetProtectionValues);
+            Assert.DoesNotContain(Worksheet.SheetProtectionValue.selectUnlockedCells, givenWorksheet.SheetProtectionValues);
+        }
+
         [Theory(DisplayName = "Test of the 'SheetProtectionPasswordHash' property when writing and reading a worksheet")]
         [InlineData("x", 0)]
         [InlineData("@test-1,23", 0)]