Upstream feature: change RemoveValidationData methods to RemoveDataVa…

…lidation
antony-liu · Feb 9, 2024 · 428a170 · 428a170
1 parent a39833e
commit 428a170
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/main/HSSF/UserModel/HSSFSheet.cs b/main/HSSF/UserModel/HSSFSheet.cs
@@ -548,7 +548,7 @@ public void AddValidationData(IDataValidation dataValidation)
             dvt.AddDataValidation(dvRecord);
         }
 
-        public void RemoveValidationData(IDataValidation dataValidation)
+        public void RemoveDataValidation(IDataValidation dataValidation)
         {
             if (dataValidation == null)
             {

diff --git a/main/SS/UserModel/Sheet.cs b/main/SS/UserModel/Sheet.cs
@@ -844,7 +844,7 @@ bool Autobreaks
         /// Removes a data validation object
         /// </summary>
         /// <param name="dataValidation">The data validation object settings</param>
-        void RemoveValidationData(IDataValidation dataValidation);
+        void RemoveDataValidation(IDataValidation dataValidation);
 
         /// <summary>
         /// Enable filtering for a range of cells

diff --git a/ooxml/XSSF/Streaming/SXSSFSheet.cs b/ooxml/XSSF/Streaming/SXSSFSheet.cs
@@ -500,9 +500,9 @@ public void AddValidationData(IDataValidation dataValidation)
             _sh.AddValidationData(dataValidation);
         }
 
-        public void RemoveValidationData(IDataValidation dataValidation)
+        public void RemoveDataValidation(IDataValidation dataValidation)
         {
-            _sh.RemoveValidationData(dataValidation);
+            _sh.RemoveDataValidation(dataValidation);
         }
 
         /**

diff --git a/ooxml/XSSF/UserModel/XSSFSheet.cs b/ooxml/XSSF/UserModel/XSSFSheet.cs
@@ -3328,7 +3328,7 @@ public void AddValidationData(IDataValidation dataValidation)
             dataValidations.count = (uint)currentCount + 1;
         }
 
-        public void RemoveValidationData(IDataValidation dataValidation)
+        public void RemoveDataValidation(IDataValidation dataValidation)
         {
             XSSFDataValidation xssfDataValidation = (XSSFDataValidation)dataValidation;
             CT_DataValidations dataValidations = worksheet.dataValidations;

diff --git a/testcases/main/HSSF/UserModel/TestDataValidation.cs b/testcases/main/HSSF/UserModel/TestDataValidation.cs
@@ -465,7 +465,7 @@ public void TestGetDataValidationsFormula()
         }
 
         [Test]
-        public void TestRemoveValidationData()
+        public void TestRemoveDataValidation()
         {
 
             HSSFWorkbook wb = new HSSFWorkbook();
@@ -482,7 +482,7 @@ public void TestRemoveValidationData()
             list = sheet.GetDataValidations();
             Assert.AreEqual(1, list.Count);
 
-            sheet.RemoveValidationData(validation);
+            sheet.RemoveDataValidation(validation);
 
             list = sheet.GetDataValidations();
             Assert.AreEqual(0, list.Count);

diff --git a/testcases/ooxml/XSSF/UserModel/TestXSSFDataValidation.cs b/testcases/ooxml/XSSF/UserModel/TestXSSFDataValidation.cs
@@ -373,7 +373,7 @@ public void TestCreateMultipleRegionsValidation()
         }
 
         [Test]
-        public void TestRemoveValidationData()
+        public void TestRemoveDataValidation()
         {
             XSSFWorkbook wb = new XSSFWorkbook();
             try {
@@ -389,7 +389,7 @@ public void TestRemoveValidationData()
 
                 Assert.AreEqual(1, sheet.GetDataValidations().Count);
 
-                sheet.RemoveValidationData(dataValidation);
+                sheet.RemoveDataValidation(dataValidation);
 
                 Assert.AreEqual(0, sheet.GetDataValidations().Count);
             }