fix some deprecation warnings

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

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
index 50cc38fb774cc47bcf37327804994a6b5820a845..07dc096c5b5a3e200c6d53e7851475542b33d217 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
@@ -81,7 +81,7 @@ public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow
         }
 
         _rows = new ArrayList<>(_table.sizeOfTrArray());
-        for(CTTableRow row : _table.getTrArray()) {
+        for(CTTableRow row : _table.getTrList()) {
             _rows.add(new XSLFTableRow(row, this));
         }
         updateRowColIndexes();

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
index e0cf82fe298a1aedf699b59fbf5d9eef1eb4de0a..160ad5fafdba4c85dd89329351eb160dd0d6ebc2 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
@@ -50,9 +50,9 @@ public class XSLFTableStyles extends POIXMLDocumentPart implements Iterable<XSLF
         TblStyleLstDocument styleDoc = TblStyleLstDocument.Factory.parse(is);
         is.close();
         _tblStyleLst = styleDoc.getTblStyleLst();
-        CTTableStyle[] tblStyleArray = _tblStyleLst.getTblStyleArray();
-        _styles = new ArrayList<>(tblStyleArray.length);
-        for(CTTableStyle c : tblStyleArray){
+        List<CTTableStyle> tblStyles = _tblStyleLst.getTblStyleList();
+        _styles = new ArrayList<>(tblStyles.size());
+        for(CTTableStyle c : tblStyles){
             _styles.add(new XSLFTableStyle(c));
         }
     }

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
index 9d2f714704f879c4154d93a933329817822a1a8c..68b4b22a2f811d107eb1a8731ecb3425e21aad9a 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
@@ -838,7 +838,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
         
         List<XSLFTextRun> otherRs = other.getTextRuns();
         int i=0;
-        for(CTRegularTextRun rtr : thisP.getRArray()) {
+        for(CTRegularTextRun rtr : thisP.getRList()) {
             XSLFTextRun run = newTextRun(rtr);
             run.copy(otherRs.get(i++));
             _runs.add(run);

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
index bccbbf167f65e13a93c66175b0514139bad14adb..0aa77208672d6a155cae33f1f62b16d9750a0e22 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
@@ -53,8 +53,7 @@ public class ColumnHelper {
         int i = 0;
         for (i = 0; i < colsArray.length; i++) {
             CTCols cols = colsArray[i];
-            CTCol[] colArray = cols.getColArray();
-            for (CTCol col : colArray) {
+            for (CTCol col : cols.getColList()) {
                 addCleanColIntoCols(newCols, col, trackedCols);
             }
         }
@@ -310,7 +309,7 @@ public class ColumnHelper {
     }
 
     private boolean columnExists(CTCols cols, long min, long max) {
-        for (CTCol col : cols.getColArray()) {
+        for (CTCol col : cols.getColList()) {
             if (col.getMin() == min && col.getMax() == max) {
                 return true;
             }
@@ -321,7 +320,7 @@ public class ColumnHelper {
     public int getIndexOfColumn(CTCols cols, CTCol searchCol) {
         if (cols == null || searchCol == null) return -1;
         int i = 0;
-        for (CTCol col : cols.getColArray()) {
+        for (CTCol col : cols.getColList()) {
             if (col.getMin() == searchCol.getMin() && col.getMax() == searchCol.getMax()) {
                 return i;
             }