Author: fanningpj
Date: Wed Jul 12 08:38:20 2017
New Revision: 1801697
URL: http://svn.apache.org/viewvc?rev=1801697&view=rev
Log:
remove more deprecated methods
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java?rev=1801697&r1=1801696&r2=1801697&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java Wed Jul 12
08:38:20 2017
@@ -98,22 +98,6 @@ public final class DBCellRecord extends
protected int getDataSize() {
return 4 + field_2_cell_offsets.length * 2;
}
-
- /**
- * @param nBlocks number of blocks
- * @param nRows number of rows
- *
- * @return the size of the group of <tt>DBCellRecord</tt>s needed to encode
- * the specified number of blocks and rows
- *
- * @deprecated in POI 3.15-beta2, scheduled for removal in POI 3.17 - this
method is not used within POI
- */
- public static int calculateSizeOfRecords(int nBlocks, int nRows) {
- // One DBCell per block.
- // 8 bytes per DBCell (non variable section)
- // 2 bytes per row reference
- return nBlocks * 8 + nRows * 2;
- }
public short getSid() {
return sid;
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java?rev=1801697&r1=1801696&r2=1801697&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java Wed Jul 12
08:38:20 2017
@@ -37,6 +37,7 @@ import org.apache.poi.ss.usermodel.DataF
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.util.DateFormatConverter;
import org.apache.poi.util.LocaleUtil;
+import org.apache.poi.util.Removal;
/**
* Format a value according to the standard Excel behavior. This "standard" is
@@ -123,6 +124,8 @@ public class CellFormat {
* used when the format specified is <tt>General</tt>.
* @deprecated use {@link #getInstance(Locale, String)} instead
*/
+ @Deprecated
+ @Removal(version="3.18")
public static final CellFormat GENERAL_FORMAT =
createGeneralFormat(LocaleUtil.getUserLocale());
private static CellFormat createGeneralFormat(final Locale locale) {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java?rev=1801697&r1=1801696&r2=1801697&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java Wed Jul
12 08:38:20 2017
@@ -558,15 +558,6 @@ public class StylesTable extends POIXMLD
public int getNumDataFormats() {
return numberFormats.size();
}
-
- /**
- * For unit testing only
- * @deprecated POI 3.14 beta 2. Use {@link #getNumDataFormats()} instead.
- */
- @Internal
- public int _getNumberFormatSize() {
- return getNumDataFormats();
- }
/**
* For unit testing only
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
