From 428a170a92df4c2bf4c71d5ef6dc72f39962dbe6 Mon Sep 17 00:00:00 2001
From: Artem Koloskov <artem@ironsoftware.com>
Date: Fri, 9 Feb 2024 11:31:06 +0700
Subject: [PATCH] Upstream feature: change RemoveValidationData methods to
 RemoveDataValidation

---
 main/HSSF/UserModel/HSSFSheet.cs                         | 2 +-
 main/SS/UserModel/Sheet.cs                               | 2 +-
 ooxml/XSSF/Streaming/SXSSFSheet.cs                       | 4 ++--
 ooxml/XSSF/UserModel/XSSFSheet.cs                        | 2 +-
 testcases/main/HSSF/UserModel/TestDataValidation.cs      | 4 ++--
 testcases/ooxml/XSSF/UserModel/TestXSSFDataValidation.cs | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/main/HSSF/UserModel/HSSFSheet.cs b/main/HSSF/UserModel/HSSFSheet.cs
index e2a72cf53..d4017a8c0 100644
--- 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
index 94a883bea..3f9aba37d 100644
--- 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
index 8b5fb8b2b..35f1d566d 100644
--- 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
index b9a6d8900..72c0f953a 100644
--- 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
index 3c5aa1088..c68078553 100644
--- 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
index b7d112834..c52e70f37 100644
--- 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);
             }