This is an automated email from the ASF dual-hosted git repository. centic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/poi.git
commit c6a621edc6b8635c9741f8ca94d331c64876dd7b Author: Dominik Stadler <[email protected]> AuthorDate: Sun Nov 16 20:24:41 2025 +0100 Remove deprecated methods with @Removal("5...") We announced their removal already for 5.0.0 or 5.3.0, so we can safely remove them now as we plan a 6.0.0 release next. Cell.setCellType() needs a closer look later as it is not a simple deletion of code. --- .../poi/poifs/crypt/dsig/SignatureConfig.java | 38 +- .../main/java/org/apache/poi/hslf/blip/Bitmap.java | 13 - .../main/java/org/apache/poi/hslf/blip/DIB.java | 13 - .../main/java/org/apache/poi/hslf/blip/EMF.java | 13 - .../main/java/org/apache/poi/hslf/blip/JPEG.java | 13 - .../main/java/org/apache/poi/hslf/blip/PICT.java | 13 - .../main/java/org/apache/poi/hslf/blip/PNG.java | 13 - .../main/java/org/apache/poi/hslf/blip/WMF.java | 13 - .../apache/poi/hslf/usermodel/HSLFPictureData.java | 72 -- .../org/apache/poi/hslf/usermodel/HSLFShape.java | 73 +- .../org/apache/poi/hwpf/usermodel/HWPFList.java | 1 + .../org/apache/poi/ddf/EscherArrayProperty.java | 22 +- .../org/apache/poi/ddf/EscherMetafileBlip.java | 14 - .../hssf/record/AbstractEscherHolderRecord.java | 14 - .../apache/poi/hssf/record/DrawingGroupRecord.java | 15 - .../apache/poi/hssf/record/EscherAggregate.java | 824 --------------------- .../java/org/apache/poi/ss/usermodel/Cell.java | 4 +- 17 files changed, 11 insertions(+), 1157 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java index a36a0b2bbe..18d62ca1fa 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java +++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java @@ -34,7 +34,6 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -47,7 +46,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.xml.crypto.URIDereferencer; import javax.xml.crypto.dsig.CanonicalizationMethod; import javax.xml.crypto.dsig.DigestMethod; import javax.xml.crypto.dsig.Transform; @@ -70,7 +68,6 @@ import org.apache.poi.poifs.crypt.dsig.services.TimeStampService; import org.apache.poi.poifs.crypt.dsig.services.TimeStampServiceValidator; import org.apache.poi.poifs.crypt.dsig.services.TimeStampSimpleHttpClient; import org.apache.poi.util.LocaleUtil; -import org.apache.poi.util.Removal; import org.apache.xml.security.signature.XMLSignature; /** @@ -113,12 +110,12 @@ public class SignatureConfig { private static final String XMLSEC_SANTUARIO = "org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI"; private static final String XMLSEC_JDK = "org.jcp.xml.dsig.internal.dom.XMLDSigRI"; - private static final List<Supplier<SignatureFacet>> DEFAULT_FACETS = Collections.unmodifiableList(Arrays.asList( - OOXMLSignatureFacet::new, - KeyInfoSignatureFacet::new, - XAdESSignatureFacet::new, - Office2010SignatureFacet::new - )); + private static final List<Supplier<SignatureFacet>> DEFAULT_FACETS = List.of( + OOXMLSignatureFacet::new, + KeyInfoSignatureFacet::new, + XAdESSignatureFacet::new, + Office2010SignatureFacet::new + ); private List<SignatureFacet> signatureFacets = new ArrayList<>(); private HashAlgorithm digestAlgo = HashAlgorithm.sha256; @@ -130,7 +127,6 @@ public class SignatureConfig { * the optional signature policy service used for XAdES-EPES. */ private SignaturePolicyService signaturePolicyService; - private URIDereferencer uriDereferencer = new OOXMLURIDereferencer(); private String canonicalizationMethod = CanonicalizationMethod.INCLUSIVE; private boolean includeEntireCertificateChain = true; @@ -402,28 +398,6 @@ public class SignatureConfig { this.signaturePolicyService = signaturePolicyService; } - /** - * @return the dereferencer used for Reference/@URI attributes, defaults to {@link OOXMLURIDereferencer} - * - * @deprecated in POI 5.0.0 - use {@link SignatureInfo#getUriDereferencer()} instead - */ - @Deprecated - @Removal(version = "5.0.0") - public URIDereferencer getUriDereferencer() { - return uriDereferencer; - } - - /** - * @param uriDereferencer the dereferencer used for Reference/@URI attributes - * - * @deprecated in POI 5.0.0 - use {@link SignatureInfo#setUriDereferencer(URIDereferencer)} instead - */ - @Deprecated - @Removal(version = "5.0.0") - public void setUriDereferencer(URIDereferencer uriDereferencer) { - this.uriDereferencer = uriDereferencer; - } - /** * @return Gives back the human-readable description of what the citizen * will be signing. The default value is "Office OpenXML Document". diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java index a1b90a8e7e..c9b2a9bf4f 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java @@ -28,10 +28,8 @@ import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.hslf.usermodel.HSLFPictureData; -import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; import org.apache.poi.util.Units; /** @@ -40,17 +38,6 @@ import org.apache.poi.util.Units; */ public abstract class Bitmap extends HSLFPictureData { - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * {@link Bitmap}. This API led to detached {@link Bitmap} instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public Bitmap() { - this(new EscherContainerRecord(), new EscherBSERecord()); - } - /** * Creates a new instance. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java index b43b2e06d3..deb91740b2 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java @@ -20,11 +20,9 @@ package org.apache.poi.hslf.blip; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.hslf.record.RecordAtom; -import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; /** * Represents a DIB picture data in a PPT file @@ -36,17 +34,6 @@ public final class DIB extends Bitmap { */ private static final int HEADER_SIZE = 14; - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * {@link DIB}. This API led to detached {@link DIB} instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public DIB() { - this(new EscherContainerRecord(), new EscherBSERecord()); - } - /** * Creates a new instance. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java index d8d9231f49..5e8f74f9ba 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java @@ -27,11 +27,9 @@ import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.hslf.exceptions.HSLFException; -import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.sl.image.ImageHeaderEMF; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; import org.apache.poi.util.Units; /** @@ -39,17 +37,6 @@ import org.apache.poi.util.Units; */ public final class EMF extends Metafile { - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * EMF. This API led to detached EMF instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public EMF() { - this(new EscherContainerRecord(), new EscherBSERecord()); - } - /** * Creates a new instance. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java index 40f6a77a45..5d9a2ef4f2 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java @@ -20,9 +20,7 @@ package org.apache.poi.hslf.blip; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; -import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; /** * Represents a JPEG picture data in a PPT file @@ -33,17 +31,6 @@ public final class JPEG extends Bitmap { private ColorSpace colorSpace = ColorSpace.rgb; - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * {@link JPEG}. This API led to detached {@link JPEG} instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public JPEG() { - this(new EscherContainerRecord(), new EscherBSERecord()); - } - /** * Creates a new instance. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java index 69c6b766b6..e94ef92a47 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java @@ -33,11 +33,9 @@ import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.hslf.exceptions.HSLFException; -import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.sl.image.ImageHeaderPICT; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; import org.apache.poi.util.Units; /** @@ -46,17 +44,6 @@ import org.apache.poi.util.Units; public final class PICT extends Metafile { private static final Logger LOG = PoiLogManager.getLogger(PICT.class); - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * PICT. This API led to detached PICT instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public PICT() { - this(new EscherContainerRecord(), new EscherBSERecord()); - } - /** * Creates a new instance. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java index e08f2185d0..6e729a0b97 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java @@ -19,27 +19,14 @@ package org.apache.poi.hslf.blip; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; -import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.sl.image.ImageHeaderPNG; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; /** * Represents a PNG picture data in a PPT file */ public final class PNG extends Bitmap { - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * {@link PNG}. This API led to detached {@link PNG} instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public PNG() { - this(new EscherContainerRecord(), new EscherBSERecord()); - } - /** * Creates a new instance. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java index 16e7d5f294..8e79a5c2ae 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java @@ -27,11 +27,9 @@ import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.hslf.exceptions.HSLFException; -import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.sl.image.ImageHeaderWMF; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; import org.apache.poi.util.Units; /** @@ -39,17 +37,6 @@ import org.apache.poi.util.Units; */ public final class WMF extends Metafile { - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * WMF. This API led to detached WMF instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public WMF() { - this(new EscherContainerRecord(), new EscherBSERecord()); - } - /** * Creates a new instance. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java index 4a517ae6d3..2d90e69e9d 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java @@ -30,8 +30,6 @@ import java.util.Map; import java.util.Objects; import java.util.function.Supplier; -import org.apache.logging.log4j.Logger; -import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -47,7 +45,6 @@ import org.apache.poi.poifs.crypt.HashAlgorithm; import org.apache.poi.sl.usermodel.PictureData; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; import org.apache.poi.util.Units; /** @@ -55,8 +52,6 @@ import org.apache.poi.util.Units; */ public abstract class HSLFPictureData implements PictureData, GenericRecord { - private static final Logger LOGGER = PoiLogManager.getLogger(HSLFPictureData.class); - /** * Size of the image checksum calculated using MD5 algorithm. */ @@ -108,19 +103,6 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { */ final EscherBSERecord bse; - /** - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * {@link HSLFPictureData}. This API led to detached {@link HSLFPictureData} instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public HSLFPictureData() { - this(new EscherContainerRecord(), new EscherBSERecord()); - LOGGER.atWarn().log("The no-arg constructor is deprecated. Some functionality such as updating pictures won't " + - "work."); - } - /** * Creates a new instance. * @@ -171,23 +153,6 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { return formattedData; } - /** - * Sets the formatted data for this picture. - * <p> - * Primarily intended for internal POI use. Use {@link #setData(byte[])} to change the picture represented by this - * object. - * - * @param data Picture data formatted for the HSLF format. Excludes the {@link #PREAMBLE_SIZE preamble}. - * @see #setData(byte[]) - * @see #formatImageForSlideshow(byte[]) - * @deprecated Set image data using {@link #setData(byte[])}. - */ - @Deprecated - @Removal(version = "5.3") - public void setRawData(byte[] data){ - formattedData = (data == null) ? null : data.clone(); - } - /** * File offset in the 'Pictures' stream * @@ -197,20 +162,6 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { return bse.getOffset(); } - /** - * Set offset of this picture in the 'Pictures' stream. - * We need to set it when a new picture is created. - * - * @param offset in the 'Pictures' stream - * @deprecated This function was only intended for POI internal use. If you have a use case you're concerned about, - * please open an issue in the POI issue tracker. - */ - @Deprecated - @Removal(version = "5.3") - public void setOffset(int offset){ - LOGGER.atWarn().log("HSLFPictureData#setOffset is deprecated."); - } - /** * Returns 16-byte checksum of this picture */ @@ -246,29 +197,6 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { out.write(rd); } - /** - * Create an instance of {@link HSLFPictureData} by type. - * - * @param type type of picture. - * @return concrete instance of {@link HSLFPictureData}. - * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new - * {@link HSLFPictureData}. This API led to detached {@link HSLFPictureData} instances (See Bugzilla - * 46122) and prevented adding additional functionality. - */ - @Deprecated - @Removal(version = "5.3") - public static HSLFPictureData create(PictureType type){ - LOGGER.atWarn().log("HSLFPictureData#create(PictureType) is deprecated. Some functionality such " + - "as updating pictures won't work."); - - // This record code is a stub. It exists only for API compatibility. - EscherContainerRecord record = new EscherContainerRecord(); - EscherBSERecord bse = new EscherBSERecord(); - return new HSLFSlideShowImpl.PictureFactory(record, type, new byte[0], 0, 0) - .setRecord(bse) - .build(); - } - /** * Creates a new instance of the given image type using data already formatted for storage inside the slideshow. * <p> diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java index a6c307cc96..6475a00bfd 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java @@ -51,7 +51,6 @@ import org.apache.poi.sl.usermodel.Shape; import org.apache.poi.sl.usermodel.ShapeContainer; import org.apache.poi.sl.usermodel.ShapeType; import org.apache.poi.util.RecordFormatException; -import org.apache.poi.util.Removal; import org.apache.poi.util.StringUtil; import org.apache.poi.util.Units; @@ -261,19 +260,6 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { return getEscherChild(recordId.typeID); } - /** - * Returns escher property by id. - * - * @return escher property or {@code null} if not found. - * - * @deprecated use {@link #getEscherProperty(EscherPropertyTypes)} instead - */ - @Deprecated - @Removal(version = "5.0.0") - public static <T extends EscherProperty> T getEscherProperty(AbstractEscherOptRecord opt, int propId){ - return (opt == null) ? null : opt.lookup(propId); - } - /** * Returns escher property by type. * @@ -283,31 +269,6 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { return (opt == null) ? null : opt.lookup(type); } - /** - * Set an escher property for this shape. - * - * @param opt The opt record to set the properties to. - * @param propId The id of the property. One of the constants defined in EscherOptRecord. - * @param value value of the property. If value = -1 then the property is removed. - * - * @deprecated use {@link #setEscherProperty(AbstractEscherOptRecord, EscherPropertyTypes, int)} - */ - @Deprecated - @Removal(version = "5.0.0") - public static void setEscherProperty(AbstractEscherOptRecord opt, short propId, int value){ - List<EscherProperty> props = opt.getEscherProperties(); - for ( Iterator<EscherProperty> iterator = props.iterator(); iterator.hasNext(); ) { - if (iterator.next().getPropertyNumber() == propId){ - iterator.remove(); - break; - } - } - if (value != -1) { - opt.addEscherProperty(new EscherSimpleProperty(propId, value)); - opt.sortProperties(); - } - } - /** * Set an escher property for this shape. * @@ -333,23 +294,6 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { } } - - - /** - * Set an simple escher property for this shape. - * - * @param propId The id of the property. One of the constants defined in EscherOptRecord. - * @param value value of the property. If value = -1 then the property is removed. - * - * @deprecated use {@link #setEscherProperty(EscherPropertyTypes, int)} - */ - @Deprecated - @Removal(version = "5.0.0") - public void setEscherProperty(short propId, int value){ - AbstractEscherOptRecord opt = getEscherOptRecord(); - setEscherProperty(opt, propId, value); - } - /** * Set an simple escher property for this shape. * @@ -368,7 +312,7 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { */ public int getEscherProperty(short propId){ AbstractEscherOptRecord opt = getEscherOptRecord(); - EscherSimpleProperty prop = getEscherProperty(opt, propId); + EscherSimpleProperty prop = (opt == null) ? null : opt.lookup(propId); return prop == null ? 0 : prop.getPropertyValue(); } @@ -383,21 +327,6 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { return prop == null ? 0 : prop.getPropertyValue(); } - /** - * Get the value of a simple escher property for this shape. - * - * @param propId The id of the property. One of the constants defined in EscherOptRecord. - * - * @deprecated use {@link #getEscherProperty(EscherPropertyTypes, int)} instead - */ - @Deprecated - @Removal(version = "5.0.0") - public int getEscherProperty(short propId, int defaultValue){ - AbstractEscherOptRecord opt = getEscherOptRecord(); - EscherSimpleProperty prop = getEscherProperty(opt, propId); - return prop == null ? defaultValue : prop.getPropertyValue(); - } - /** * Get the value of a simple escher property for this shape. * diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java index e67e262097..6c9a2a5dae 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java @@ -196,6 +196,7 @@ public final class HWPFList /** * @deprecated use {@link #isStartAtOverridden(char)} */ + @Deprecated @Removal(version = "POI 6.0.0") public boolean isStartAtOverriden(char level ) { diff --git a/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java index e135623c4b..d40cbabe35 100644 --- a/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java +++ b/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java @@ -30,7 +30,6 @@ import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; /** * Escher array properties are the most weird construction ever invented @@ -70,7 +69,7 @@ public final class EscherArrayProperty extends EscherComplexProperty implements public static int getMaxRecordLength() { return MAX_RECORD_LENGTH; } - + /** * Create an instance of an escher array property. * This constructor can be used to create emptyComplexParts with a complexSize = 0. @@ -88,25 +87,6 @@ public final class EscherArrayProperty extends EscherComplexProperty implements emptyComplexPart = (complexSize == 0); } - /** - * Create an instance of an escher array property. - * This constructor defaults to a 6 bytes header if the complexData is null or byte[0]. - * - * @param propertyNumber the property number part of the property id - * @param isBlipId {@code true}, if it references a blip - * @param complexData the data - * - * @deprecated use {@link #EscherArrayProperty(EscherPropertyTypes, boolean, int)} and {@link #setComplexData(byte[])} - */ - @Deprecated - @Removal(version = "5.0.0") - public EscherArrayProperty(short propertyNumber, boolean isBlipId, byte[] complexData) { - // this is called by user code, if the complexData is empty/null, allocate a space for a valid header - // be aware, that there are complex data areas with less than 6 bytes - this((short)(propertyNumber | (isBlipId ? IS_BLIP : 0)), safeSize(complexData == null ? 0 : complexData.length)); - setComplexData(complexData); - } - /** * Create an instance of an escher array property. * This constructor defaults to a 6 bytes header if the complexSize is 0. diff --git a/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java b/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java index f1d2f386bb..339c9c0b74 100644 --- a/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java +++ b/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java @@ -36,7 +36,6 @@ import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hssf.usermodel.HSSFPictureData; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; public final class EscherMetafileBlip extends EscherBlipRecord { private static final Logger LOGGER = PoiLogManager.getLogger(EscherMetafileBlip.class); @@ -44,19 +43,6 @@ public final class EscherMetafileBlip extends EscherBlipRecord { private static final int DEFAULT_MAX_RECORD_LENGTH = 100_000_000; private static int MAX_RECORD_LENGTH = DEFAULT_MAX_RECORD_LENGTH; - /** @deprecated use EscherRecordTypes.BLIP_EMF.typeID */ - @Deprecated - @Removal(version = "5.3") - public static final short RECORD_ID_EMF = EscherRecordTypes.BLIP_EMF.typeID; - /** @deprecated use EscherRecordTypes.BLIP_WMF.typeID */ - @Deprecated - @Removal(version = "5.3") - public static final short RECORD_ID_WMF = EscherRecordTypes.BLIP_WMF.typeID; - /** @deprecated use EscherRecordTypes.BLIP_PICT.typeID */ - @Deprecated - @Removal(version = "5.3") - public static final short RECORD_ID_PICT = EscherRecordTypes.BLIP_PICT.typeID; - private static final int HEADER_SIZE = 8; private final byte[] field_1_UID = new byte[16]; diff --git a/poi/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java index 14b7e56ce9..688a3bff4c 100644 --- a/poi/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java +++ b/poi/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java @@ -27,7 +27,6 @@ import org.apache.poi.ddf.EscherRecordFactory; import org.apache.poi.ddf.NullEscherSerializationListener; import org.apache.poi.hssf.util.LazilyConcatenatedByteArray; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; /** * The escher container record is used to hold escher records. It is abstract and @@ -64,19 +63,6 @@ public abstract class AbstractEscherHolderRecord extends Record { } } - /** - * @deprecated Call {@link #decode()} instead. - */ - @Removal(version = "5.3") - @Deprecated - protected void convertRawBytesToEscherRecords() { - // decode() does a check to see if raw bytes have already been interpreted. In the case that we did not eagerly - // interpret the bytes due to DESERIALIZE being false, decode() will interpret the bytes. If we did already - // interpret the bytes due to DESERIALIZE being true, decode skips doing the work again. - if (!DESERIALIZE) { - decode(); - } - } private void convertToEscherRecords( int offset, int size, byte[] data ) { escherRecords.clear(); diff --git a/poi/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java index ee301fce45..8b53aff296 100644 --- a/poi/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java +++ b/poi/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java @@ -25,7 +25,6 @@ import org.apache.poi.ddf.EscherRecord; import org.apache.poi.ddf.EscherRecordTypes; import org.apache.poi.ddf.NullEscherSerializationListener; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; /** * Specifies a group of drawing objects. @@ -95,20 +94,6 @@ public final class DrawingGroupRecord extends AbstractEscherHolderRecord { return writeData( offset, data, buffer ); } - /** - * Process the bytes into escher records. - * (Not done by default in case we break things, - * unless you set the "poi.deserialize.escher" - * system property) - * - * @deprecated Call {@link #decode()} instead. - */ - @Removal(version = "5.3") - @Deprecated - public void processChildRecords() { - decode(); - } - public int getRecordSize() { // TODO - convert this to a RecordAggregate return grossSizeFromDataSize(getRawDataSize()); diff --git a/poi/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java index 67beb21207..6a0414c31c 100644 --- a/poi/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java +++ b/poi/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java @@ -19,7 +19,6 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.RecordInputStream.MAX_RECORD_DATA_SIZE; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -40,11 +39,9 @@ import org.apache.poi.ddf.EscherSerializationListener; import org.apache.poi.ddf.EscherSpRecord; import org.apache.poi.ddf.EscherSpgrRecord; import org.apache.poi.ddf.EscherTextboxRecord; -import org.apache.poi.sl.usermodel.ShapeType; import org.apache.poi.util.GenericRecordXmlWriter; import org.apache.poi.util.IOUtils; import org.apache.poi.util.RecordFormatException; -import org.apache.poi.util.Removal; /** * This class is used to aggregate the MSODRAWING and OBJ record @@ -109,827 +106,6 @@ public final class EscherAggregate extends AbstractEscherHolderRecord { return MAX_RECORD_LENGTH; } - /** @deprecated not used */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_MIN = (short) 0; - /** @deprecated use {@link ShapeType#NOT_PRIMITIVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_NOT_PRIMATIVE = (short) 0; - /** @deprecated use {@link ShapeType#RECT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_RECTANGLE = (short) 1; - /** @deprecated use {@link ShapeType#ROUND_RECT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ROUNDRECTANGLE = (short) 2; - /** @deprecated use {@link ShapeType#ELLIPSE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ELLIPSE = (short) 3; - /** @deprecated use {@link ShapeType#DIAMOND} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_DIAMOND = (short) 4; - /** @deprecated use {@link ShapeType#TRIANGLE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ISOCELESTRIANGLE = (short) 5; - /** @deprecated use {@link ShapeType#RT_TRIANGLE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_RIGHTTRIANGLE = (short) 6; - /** @deprecated use {@link ShapeType#PARALLELOGRAM} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_PARALLELOGRAM = (short) 7; - /** @deprecated use {@link ShapeType#TRAPEZOID} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TRAPEZOID = (short) 8; - /** @deprecated use {@link ShapeType#HEXAGON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_HEXAGON = (short) 9; - /** @deprecated use {@link ShapeType#OCTAGON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_OCTAGON = (short) 10; - /** @deprecated use {@link ShapeType#PLUS} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_PLUS = (short) 11; - /** @deprecated use {@link ShapeType#STAR_5} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_STAR = (short) 12; - /** @deprecated use {@link ShapeType#RIGHT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ARROW = (short) 13; - /** @deprecated use {@link ShapeType#THICK_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_THICKARROW = (short) 14; - /** @deprecated use {@link ShapeType#HOME_PLATE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_HOMEPLATE = (short) 15; - /** @deprecated use {@link ShapeType#CUBE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CUBE = (short) 16; - /** @deprecated use {@link ShapeType#BALLOON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BALLOON = (short) 17; - /** @deprecated use {@link ShapeType#SEAL} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SEAL = (short) 18; - /** @deprecated use {@link ShapeType#ARC} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ARC = (short) 19; - /** @deprecated use {@link ShapeType#LINE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LINE = (short) 20; - /** @deprecated use {@link ShapeType#PLAQUE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_PLAQUE = (short) 21; - /** @deprecated use {@link ShapeType#CAN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CAN = (short) 22; - /** @deprecated use {@link ShapeType#DONUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_DONUT = (short) 23; - /** @deprecated use {@link ShapeType#TEXT_SIMPLE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTSIMPLE = (short) 24; - /** @deprecated use {@link ShapeType#TEXT_OCTAGON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTOCTAGON = (short) 25; - /** @deprecated use {@link ShapeType#TEXT_HEXAGON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTHEXAGON = (short) 26; - /** @deprecated use {@link ShapeType#TEXT_CURVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCURVE = (short) 27; - /** @deprecated use {@link ShapeType#TEXT_WAVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTWAVE = (short) 28; - /** @deprecated use {@link ShapeType#TEXT_RING} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTRING = (short) 29; - /** @deprecated use {@link ShapeType#TEXT_ON_CURVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTONCURVE = (short) 30; - /** @deprecated use {@link ShapeType#TEXT_ON_RING} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTONRING = (short) 31; - /** @deprecated use {@link ShapeType#STRAIGHT_CONNECTOR_1} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_STRAIGHTCONNECTOR1 = (short) 32; - /** @deprecated use {@link ShapeType#BENT_CONNECTOR_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BENTCONNECTOR2 = (short) 33; - /** @deprecated use {@link ShapeType#BENT_CONNECTOR_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BENTCONNECTOR3 = (short) 34; - /** @deprecated use {@link ShapeType#BENT_CONNECTOR_4} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BENTCONNECTOR4 = (short) 35; - /** @deprecated use {@link ShapeType#BENT_CONNECTOR_5} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BENTCONNECTOR5 = (short) 36; - /** @deprecated use {@link ShapeType#CURVED_CONNECTOR_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDCONNECTOR2 = (short) 37; - /** @deprecated use {@link ShapeType#CURVED_CONNECTOR_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDCONNECTOR3 = (short) 38; - /** @deprecated use {@link ShapeType#CURVED_CONNECTOR_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDCONNECTOR4 = (short) 39; - /** @deprecated use {@link ShapeType#CURVED_CONNECTOR_5} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDCONNECTOR5 = (short) 40; - /** @deprecated use {@link ShapeType#CALLOUT_1} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CALLOUT1 = (short) 41; - /** @deprecated use {@link ShapeType#CALLOUT_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CALLOUT2 = (short) 42; - /** @deprecated use {@link ShapeType#CALLOUT_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CALLOUT3 = (short) 43; - /** @deprecated use {@link ShapeType#ACCENT_CALLOUT_1} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTCALLOUT1 = (short) 44; - /** @deprecated use {@link ShapeType#ACCENT_CALLOUT_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTCALLOUT2 = (short) 45; - /** @deprecated use {@link ShapeType#ACCENT_CALLOUT_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTCALLOUT3 = (short) 46; - /** @deprecated use {@link ShapeType#BORDER_CALLOUT_1} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BORDERCALLOUT1 = (short) 47; - /** @deprecated use {@link ShapeType#BORDER_CALLOUT_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BORDERCALLOUT2 = (short) 48; - /** @deprecated use {@link ShapeType#BORDER_CALLOUT_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BORDERCALLOUT3 = (short) 49; - /** @deprecated use {@link ShapeType#ACCENT_BORDER_CALLOUT_1} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTBORDERCALLOUT1 = (short) 50; - /** @deprecated use {@link ShapeType#ACCENT_BORDER_CALLOUT_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTBORDERCALLOUT2 = (short) 51; - /** @deprecated use {@link ShapeType#ACCENT_BORDER_CALLOUT_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTBORDERCALLOUT3 = (short) 52; - /** @deprecated use {@link ShapeType#RIBBON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_RIBBON = (short) 53; - /** @deprecated use {@link ShapeType#RIBBON_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_RIBBON2 = (short) 54; - /** @deprecated use {@link ShapeType#CHEVRON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CHEVRON = (short) 55; - /** @deprecated use {@link ShapeType#PENTAGON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_PENTAGON = (short) 56; - /** @deprecated use {@link ShapeType#NO_SMOKING} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_NOSMOKING = (short) 57; - /** @deprecated use {@link ShapeType#STAR_8} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SEAL8 = (short) 58; - /** @deprecated use {@link ShapeType#STAR_16} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SEAL16 = (short) 59; - /** @deprecated use {@link ShapeType#STAR_32} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SEAL32 = (short) 60; - /** @deprecated use {@link ShapeType#WEDGE_RECT_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_WEDGERECTCALLOUT = (short) 61; - /** @deprecated use {@link ShapeType#WEDGE_ROUND_RECT_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_WEDGERRECTCALLOUT = (short) 62; - /** @deprecated use {@link ShapeType#WEDGE_ELLIPSE_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_WEDGEELLIPSECALLOUT = (short) 63; - /** @deprecated use {@link ShapeType#WAVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_WAVE = (short) 64; - /** @deprecated use {@link ShapeType#FOLDED_CORNER} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FOLDEDCORNER = (short) 65; - /** @deprecated use {@link ShapeType#LEFT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTARROW = (short) 66; - /** @deprecated use {@link ShapeType#DOWN_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_DOWNARROW = (short) 67; - /** @deprecated use {@link ShapeType#UP_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_UPARROW = (short) 68; - /** @deprecated use {@link ShapeType#LEFT_RIGHT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTRIGHTARROW = (short) 69; - /** @deprecated use {@link ShapeType#UP_DOWN_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_UPDOWNARROW = (short) 70; - /** @deprecated use {@link ShapeType#IRREGULAR_SEAL_1} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_IRREGULARSEAL1 = (short) 71; - /** @deprecated use {@link ShapeType#IRREGULAR_SEAL_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_IRREGULARSEAL2 = (short) 72; - /** @deprecated use {@link ShapeType#LIGHTNING_BOLT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LIGHTNINGBOLT = (short) 73; - /** @deprecated use {@link ShapeType#HEART} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_HEART = (short) 74; - /** @deprecated use {@link ShapeType#FRAME} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_PICTUREFRAME = (short) 75; - /** @deprecated use {@link ShapeType#QUAD_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_QUADARROW = (short) 76; - /** @deprecated use {@link ShapeType#LEFT_ARROW_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTARROWCALLOUT = (short) 77; - /** @deprecated use {@link ShapeType#RIGHT_ARROW_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_RIGHTARROWCALLOUT = (short) 78; - /** @deprecated use {@link ShapeType#UP_ARROW_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_UPARROWCALLOUT = (short) 79; - /** @deprecated use {@link ShapeType#DOWN_ARROW_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_DOWNARROWCALLOUT = (short) 80; - /** @deprecated use {@link ShapeType#LEFT_RIGHT_ARROW_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTRIGHTARROWCALLOUT = (short) 81; - /** @deprecated use {@link ShapeType#UP_DOWN_ARROW_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_UPDOWNARROWCALLOUT = (short) 82; - /** @deprecated use {@link ShapeType#QUAD_ARROW_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_QUADARROWCALLOUT = (short) 83; - /** @deprecated use {@link ShapeType#BEVEL} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BEVEL = (short) 84; - /** @deprecated use {@link ShapeType#LEFT_BRACKET} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTBRACKET = (short) 85; - /** @deprecated use {@link ShapeType#RIGHT_BRACKET} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_RIGHTBRACKET = (short) 86; - /** @deprecated use {@link ShapeType#LEFT_BRACE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTBRACE = (short) 87; - /** @deprecated use {@link ShapeType#RIGHT_BRACE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_RIGHTBRACE = (short) 88; - /** @deprecated use {@link ShapeType#LEFT_UP_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTUPARROW = (short) 89; - /** @deprecated use {@link ShapeType#BENT_UP_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BENTUPARROW = (short) 90; - /** @deprecated use {@link ShapeType#BENT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BENTARROW = (short) 91; - /** @deprecated use {@link ShapeType#STAR_24} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SEAL24 = (short) 92; - /** @deprecated use {@link ShapeType#STRIPED_RIGHT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_STRIPEDRIGHTARROW = (short) 93; - /** @deprecated use {@link ShapeType#NOTCHED_RIGHT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_NOTCHEDRIGHTARROW = (short) 94; - /** @deprecated use {@link ShapeType#BLOCK_ARC} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BLOCKARC = (short) 95; - /** @deprecated use {@link ShapeType#SMILEY_FACE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SMILEYFACE = (short) 96; - /** @deprecated use {@link ShapeType#VERTICAL_SCROLL} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_VERTICALSCROLL = (short) 97; - /** @deprecated use {@link ShapeType#HORIZONTAL_SCROLL} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_HORIZONTALSCROLL = (short) 98; - /** @deprecated use {@link ShapeType#CIRCULAR_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CIRCULARARROW = (short) 99; - /** @deprecated use {@link ShapeType#NOTCHED_CIRCULAR_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_NOTCHEDCIRCULARARROW = (short) 100; - /** @deprecated use {@link ShapeType#UTURN_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_UTURNARROW = (short) 101; - /** @deprecated use {@link ShapeType#CURVED_RIGHT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDRIGHTARROW = (short) 102; - /** @deprecated use {@link ShapeType#CURVED_LEFT_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDLEFTARROW = (short) 103; - /** @deprecated use {@link ShapeType#CURVED_UP_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDUPARROW = (short) 104; - /** @deprecated use {@link ShapeType#CURVED_DOWN_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CURVEDDOWNARROW = (short) 105; - /** @deprecated use {@link ShapeType#CLOUD_CALLOUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CLOUDCALLOUT = (short) 106; - /** @deprecated use {@link ShapeType#ELLIPSE_RIBBON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ELLIPSERIBBON = (short) 107; - /** @deprecated use {@link ShapeType#ELLIPSE_RIBBON_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ELLIPSERIBBON2 = (short) 108; - /** @deprecated use {@link ShapeType#FLOW_CHART_PROCESS} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTPROCESS = (short) 109; - /** @deprecated use {@link ShapeType#FLOW_CHART_DECISION} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTDECISION = (short) 110; - /** @deprecated use {@link ShapeType#FLOW_CHART_INPUT_OUTPUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTINPUTOUTPUT = (short) 111; - /** @deprecated use {@link ShapeType#FLOW_CHART_PREDEFINED_PROCESS} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTPREDEFINEDPROCESS = (short) 112; - /** @deprecated use {@link ShapeType#FLOW_CHART_INTERNAL_STORAGE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTINTERNALSTORAGE = (short) 113; - /** @deprecated use {@link ShapeType#FLOW_CHART_DOCUMENT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTDOCUMENT = (short) 114; - /** @deprecated use {@link ShapeType#FLOW_CHART_MULTIDOCUMENT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTMULTIDOCUMENT = (short) 115; - /** @deprecated use {@link ShapeType#FLOW_CHART_TERMINATOR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTTERMINATOR = (short) 116; - /** @deprecated use {@link ShapeType#FLOW_CHART_PREPARATION} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTPREPARATION = (short) 117; - /** @deprecated use {@link ShapeType#FLOW_CHART_MANUAL_INPUT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTMANUALINPUT = (short) 118; - /** @deprecated use {@link ShapeType#FLOW_CHART_MANUAL_OPERATION} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTMANUALOPERATION = (short) 119; - /** @deprecated use {@link ShapeType#FLOW_CHART_CONNECTOR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTCONNECTOR = (short) 120; - /** @deprecated use {@link ShapeType#FLOW_CHART_PUNCHED_CARD} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTPUNCHEDCARD = (short) 121; - /** @deprecated use {@link ShapeType#FLOW_CHART_PUNCHED_TAPE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTPUNCHEDTAPE = (short) 122; - /** @deprecated use {@link ShapeType#FLOW_CHART_SUMMING_JUNCTION} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTSUMMINGJUNCTION = (short) 123; - /** @deprecated use {@link ShapeType#FLOW_CHART_OR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTOR = (short) 124; - /** @deprecated use {@link ShapeType#FLOW_CHART_COLLATE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTCOLLATE = (short) 125; - /** @deprecated use {@link ShapeType#FLOW_CHART_SORT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTSORT = (short) 126; - /** @deprecated use {@link ShapeType#FLOW_CHART_EXTRACT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTEXTRACT = (short) 127; - /** @deprecated use {@link ShapeType#FLOW_CHART_MERGE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTMERGE = (short) 128; - /** @deprecated use {@link ShapeType#FLOW_CHART_OFFLINE_STORAGE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTOFFLINESTORAGE = (short) 129; - /** @deprecated use {@link ShapeType#FLOW_CHART_ONLINE_STORAGE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTONLINESTORAGE = (short) 130; - /** @deprecated use {@link ShapeType#FLOW_CHART_MAGNETIC_TAPE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTMAGNETICTAPE = (short) 131; - /** @deprecated use {@link ShapeType#FLOW_CHART_MAGNETIC_DISK} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTMAGNETICDISK = (short) 132; - /** @deprecated use {@link ShapeType#FLOW_CHART_MAGNETIC_DRUM} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTMAGNETICDRUM = (short) 133; - /** @deprecated use {@link ShapeType#FLOW_CHART_DISPLAY} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTDISPLAY = (short) 134; - /** @deprecated use {@link ShapeType#FLOW_CHART_DELAY} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTDELAY = (short) 135; - /** @deprecated use {@link ShapeType#TEXT_PLAIN_TEXT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTPLAINTEXT = (short) 136; - /** @deprecated use {@link ShapeType#TEXT_STOP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTSTOP = (short) 137; - /** @deprecated use {@link ShapeType#TEXT_TRIANGLE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTTRIANGLE = (short) 138; - /** @deprecated use {@link ShapeType#TEXT_TRIANGLE_INVERTED} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTTRIANGLEINVERTED = (short) 139; - /** @deprecated use {@link ShapeType#TEXT_CHEVRON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCHEVRON = (short) 140; - /** @deprecated use {@link ShapeType#TEXT_CHEVRON_INVERTED} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCHEVRONINVERTED = (short) 141; - /** @deprecated use {@link ShapeType#TEXT_RING_INSIDE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTRINGINSIDE = (short) 142; - /** @deprecated use {@link ShapeType#TEXT_RING_OUTSIDE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTRINGOUTSIDE = (short) 143; - /** @deprecated use {@link ShapeType#TEXT_ARCH_UP_CURVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTARCHUPCURVE = (short) 144; - /** @deprecated use {@link ShapeType#TEXT_ARCH_DOWN_CURVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTARCHDOWNCURVE = (short) 145; - /** @deprecated use {@link ShapeType#TEXT_CIRCLE_CURVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCIRCLECURVE = (short) 146; - /** @deprecated use {@link ShapeType#TEXT_BUTTON_CURVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTBUTTONCURVE = (short) 147; - /** @deprecated use {@link ShapeType#TEXT_ARCH_UP_POUR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTARCHUPPOUR = (short) 148; - /** @deprecated use {@link ShapeType#TEXT_ARCH_DOWN_POUR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTARCHDOWNPOUR = (short) 149; - /** @deprecated use {@link ShapeType#TEXT_CIRCLE_POUR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCIRCLEPOUR = (short) 150; - /** @deprecated use {@link ShapeType#TEXT_BUTTON_POUR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTBUTTONPOUR = (short) 151; - /** @deprecated use {@link ShapeType#TEXT_CURVE_UP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCURVEUP = (short) 152; - /** @deprecated use {@link ShapeType#TEXT_CURVE_DOWN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCURVEDOWN = (short) 153; - /** @deprecated use {@link ShapeType#TEXT_CASCADE_UP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCASCADEUP = (short) 154; - /** @deprecated use {@link ShapeType#TEXT_CASCADE_DOWN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCASCADEDOWN = (short) 155; - /** @deprecated use {@link ShapeType#TEXT_WAVE_1} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTWAVE1 = (short) 156; - /** @deprecated use {@link ShapeType#TEXT_WAVE_2} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTWAVE2 = (short) 157; - /** @deprecated use {@link ShapeType#TEXT_WAVE_3} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTWAVE3 = (short) 158; - /** @deprecated use {@link ShapeType#TEXT_WAVE_4} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTWAVE4 = (short) 159; - /** @deprecated use {@link ShapeType#TEXT_INFLATE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTINFLATE = (short) 160; - /** @deprecated use {@link ShapeType#TEXT_DEFLATE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTDEFLATE = (short) 161; - /** @deprecated use {@link ShapeType#TEXT_INFLATE_BOTTOM} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTINFLATEBOTTOM = (short) 162; - /** @deprecated use {@link ShapeType#TEXT_DEFLATE_BOTTOM} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTDEFLATEBOTTOM = (short) 163; - /** @deprecated use {@link ShapeType#TEXT_INFLATE_TOP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTINFLATETOP = (short) 164; - /** @deprecated use {@link ShapeType#TEXT_DEFLATE_TOP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTDEFLATETOP = (short) 165; - /** @deprecated use {@link ShapeType#TEXT_DEFLATE_INFLATE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTDEFLATEINFLATE = (short) 166; - /** @deprecated use {@link ShapeType#TEXT_DEFLATE_INFLATE_DEFLATE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTDEFLATEINFLATEDEFLATE = (short) 167; - /** @deprecated use {@link ShapeType#TEXT_FADE_RIGHT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTFADERIGHT = (short) 168; - /** @deprecated use {@link ShapeType#TEXT_FADE_LEFT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTFADELEFT = (short) 169; - /** @deprecated use {@link ShapeType#TEXT_FADE_UP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTFADEUP = (short) 170; - /** @deprecated use {@link ShapeType#TEXT_FADE_DOWN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTFADEDOWN = (short) 171; - /** @deprecated use {@link ShapeType#TEXT_SLANT_UP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTSLANTUP = (short) 172; - /** @deprecated use {@link ShapeType#TEXT_SLANT_DOWN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTSLANTDOWN = (short) 173; - /** @deprecated use {@link ShapeType#TEXT_CAN_UP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCANUP = (short) 174; - /** @deprecated use {@link ShapeType#TEXT_CAN_DOWN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTCANDOWN = (short) 175; - /** @deprecated use {@link ShapeType#FLOW_CHART_ALTERNATE_PROCESS} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTALTERNATEPROCESS = (short) 176; - /** @deprecated use {@link ShapeType#FLOW_CHART_OFFPAGE_CONNECTOR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_FLOWCHARTOFFPAGECONNECTOR = (short) 177; - /** @deprecated use {@link ShapeType#CALLOUT_90} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_CALLOUT90 = (short) 178; - /** @deprecated use {@link ShapeType#ACCENT_CALLOUT_90} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTCALLOUT90 = (short) 179; - /** @deprecated use {@link ShapeType#BORDER_CALLOUT_90} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BORDERCALLOUT90 = (short) 180; - /** @deprecated use {@link ShapeType#ACCENT_BORDER_CALLOUT_90} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACCENTBORDERCALLOUT90 = (short) 181; - /** @deprecated use {@link ShapeType#LEFT_RIGHT_UP_ARROW} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_LEFTRIGHTUPARROW = (short) 182; - /** @deprecated use {@link ShapeType#SUN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SUN = (short) 183; - /** @deprecated use {@link ShapeType#MOON} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_MOON = (short) 184; - /** @deprecated use {@link ShapeType#BRACKET_PAIR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BRACKETPAIR = (short) 185; - /** @deprecated use {@link ShapeType#BRACE_PAIR} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_BRACEPAIR = (short) 186; - /** @deprecated use {@link ShapeType#STAR_4} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_SEAL4 = (short) 187; - /** @deprecated use {@link ShapeType#DOUBLE_WAVE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_DOUBLEWAVE = (short) 188; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_BLANK} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONBLANK = (short) 189; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_HOME} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONHOME = (short) 190; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_HELP} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONHELP = (short) 191; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_INFORMATION} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONINFORMATION = (short) 192; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_FORWARD_NEXT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONFORWARDNEXT = (short) 193; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_BACK_PREVIOUS} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONBACKPREVIOUS = (short) 194; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_END} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONEND = (short) 195; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_BEGINNING} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONBEGINNING = (short) 196; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_RETURN} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONRETURN = (short) 197; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_DOCUMENT} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONDOCUMENT = (short) 198; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_SOUND} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONSOUND = (short) 199; - /** @deprecated use {@link ShapeType#ACTION_BUTTON_MOVIE} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_ACTIONBUTTONMOVIE = (short) 200; - /** @deprecated use {@link ShapeType#HOST_CONTROL} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_HOSTCONTROL = (short) 201; - /** @deprecated use {@link ShapeType#TEXT_BOX} */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_TEXTBOX = (short) 202; - /** @deprecated not used */ - @Deprecated - @Removal(version = "5.3") - public static final short ST_NIL = (short) 0x0FFF; - /** * Maps shape container objects to their {@link TextObjectRecord} or {@link ObjRecord} */ diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/Cell.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Cell.java index 362358ba6a..13cc0b4e71 100644 --- a/poi/src/main/java/org/apache/poi/ss/usermodel/Cell.java +++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Cell.java @@ -234,12 +234,12 @@ public interface Cell { * * <p>In XSSF implementation, there is a <code>XSSFWorkbook.setCellFormulaValidation(boolean)</code> * setting that can validate (but also in some cases, reformat) the formula.</p> - * + * * @param formula the formula to set, e.g. <code>"SUM(C4:E4)"</code>. * If the argument is <code>null</code> then the current formula is removed. * * @see Cell#removeFormula - * @see Workbook#setForceFormulaRecalculation(boolean) + * @see Workbook#setForceFormulaRecalculation(boolean) * @throws IllegalStateException if this cell is a part of an array formula group containing other cells * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid */ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
