remove some deprecated code

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884225 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/src/java/org/apache/poi/ss/util/SheetUtil.java
index dcedf03a14e9ed5dea2dc5dab64942773b77d85d..1fb06f98c1be996551b591d88eb4f3c642bee036 100644 (file)
--- a/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/src/java/org/apache/poi/ss/util/SheetUtil.java
@@ -93,15 +93,6 @@ public class SheetUtil {
         public void evaluateAll() {}
         @Override
         public CellType evaluateFormulaCell(Cell cell) { return cell.getCachedFormulaResultType(); }
-        /**
-         * @since POI 3.15 beta 3
-         * @deprecated POI 3.15 beta 3. Will be deleted when we make the CellType enum transition. See bug 59791.
-         */
-        @Deprecated
-        @Removal(version = "4.2")
-        @Internal(since="POI 3.15 beta 3")
-        @Override
-        public CellType evaluateFormulaCellEnum(Cell cell) { return evaluateFormulaCell(cell); }
     };
 
     /**

diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
index b91e0a58916c403f91c91b04e713210b25bb49a0..b154f37d4106bae33349615db4dcad1c63b3062e 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
@@ -716,7 +716,6 @@ public class TestXWPFRun {
         rpr.addNewVertAlign().setVal(STVerticalAlignRun.SUBSCRIPT);
 
         XWPFRun run = new XWPFRun(ctRun, irb);
-        assertEquals(VerticalAlign.SUBSCRIPT, run.getSubscript());
 
         run.setSubscript(VerticalAlign.BASELINE);
         assertEquals(STVerticalAlignRun.BASELINE, rpr.getVertAlign().getVal());