Author: kiwiwings
Date: Thu Apr 2 23:54:48 2020
New Revision: 1876067
URL: http://svn.apache.org/viewvc?rev=1876067&view=rev
Log:
Sonar Fixes - "static" base class members should not be accessed via derived
types
Modified:
poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java
poi/trunk/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java
poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
Modified: poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java Thu Apr 2
23:54:48 2020
@@ -57,7 +57,7 @@ public class VariantSupport extends Vari
Variant.VT_FILETIME, Variant.VT_LPSTR, Variant.VT_LPWSTR,
Variant.VT_CF, Variant.VT_BOOL };
-
+
private static final POILogger logger =
POILogFactory.getLogger(VariantSupport.class);
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 100_000;
@@ -69,10 +69,10 @@ public class VariantSupport extends Vari
* been issued for.
*/
private static List<Long> unsupportedMessage;
-
+
private static final byte[] paddingBytes = new byte[3];
-
+
/**
* Specifies whether warnings about unsupported variant types are to be
* written to {@code System.err} or not.
@@ -166,7 +166,7 @@ public class VariantSupport extends Vari
LittleEndianByteArrayInputStream lei = new
LittleEndianByteArrayInputStream(src, offset);
return read( lei, length, type, codepage );
}
-
+
public static Object read( LittleEndianByteArrayInputStream lei,
final int length, final long type, final int codepage )
throws ReadingNotSupportedException, UnsupportedEncodingException {
@@ -233,7 +233,7 @@ public class VariantSupport extends Vari
*
* August 20, 2009
*/
- // l1 = LittleEndian.getInt(src, o1); o1 += LittleEndian.INT_SIZE;
+ // l1 = LittleEndian.getInt(src, o1); o1 +=
LittleEndianConts.INT_SIZE;
// }
// final byte[] v = new byte[l1];
// System.arraycopy(src, o1, v, 0, v.length);
@@ -246,7 +246,7 @@ public class VariantSupport extends Vari
case Variant.VT_BOOL:
VariantBool bool = (VariantBool) typedPropertyValue.getValue();
return bool.getValue();
-
+
/*
* it is not very good, but what can do without breaking current
* API? --sergey
@@ -359,7 +359,7 @@ public class VariantSupport extends Vari
if (bi.bitLength() > 64) {
throw new WritingNotSupportedException(type, value);
}
-
+
byte[] biBytesBE = bi.toByteArray(), biBytesLE = new
byte[LittleEndianConsts.LONG_SIZE];
int i=biBytesBE.length;
for (byte b : biBytesBE) {
@@ -368,7 +368,7 @@ public class VariantSupport extends Vari
}
i--;
}
-
+
out.write(biBytesLE);
length = LittleEndianConsts.LONG_SIZE;
}
@@ -383,7 +383,7 @@ public class VariantSupport extends Vari
}
break;
}
-
+
case Variant.VT_R8:
if (value instanceof Number) {
LittleEndian.putDouble( ((Number)value).doubleValue(),
out);
@@ -412,7 +412,7 @@ public class VariantSupport extends Vari
throw new WritingNotSupportedException(type, value);
}
}
-
+
/* pad values to 4-bytes */
int padding = (4-(length & 0x3)) & 0x3;
out.write(paddingBytes, 0, padding);
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java Thu Apr
2 23:54:48 2020
@@ -36,24 +36,62 @@ import org.apache.poi.hssf.record.Escher
import org.apache.poi.hssf.record.ObjRecord;
import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
import org.apache.poi.ss.usermodel.Picture;
+import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.ImageUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
+import org.apache.poi.util.Removal;
import org.apache.poi.util.StringUtil;
/**
* Represents a escher picture. Eg. A GIF, JPEG etc...
*/
public class HSSFPicture extends HSSFSimpleShape implements Picture {
- @SuppressWarnings("unused")
- private static POILogger logger =
POILogFactory.getLogger(HSSFPicture.class);
-
- public static final int PICTURE_TYPE_EMF = HSSFWorkbook.PICTURE_TYPE_EMF;
// Windows Enhanced Metafile
- public static final int PICTURE_TYPE_WMF = HSSFWorkbook.PICTURE_TYPE_WMF;
// Windows Metafile
- public static final int PICTURE_TYPE_PICT =
HSSFWorkbook.PICTURE_TYPE_PICT; // Macintosh PICT
- public static final int PICTURE_TYPE_JPEG =
HSSFWorkbook.PICTURE_TYPE_JPEG; // JFIF
- public static final int PICTURE_TYPE_PNG = HSSFWorkbook.PICTURE_TYPE_PNG;
// PNG
- public static final int PICTURE_TYPE_DIB = HSSFWorkbook.PICTURE_TYPE_DIB;
// Windows DIB
+ /**
+ * Windows Enhanced Metafile
+ * @deprecated use {@link Workbook#PICTURE_TYPE_EMF}
+ */
+ @Removal(version = "5.0.0")
+ @Deprecated
+ public static final int PICTURE_TYPE_EMF = Workbook.PICTURE_TYPE_EMF;
+
+ /**
+ * Windows Metafile
+ * @deprecated use {@link Workbook#PICTURE_TYPE_WMF}
+ */
+ @Removal(version = "5.0.0")
+ @Deprecated
+ public static final int PICTURE_TYPE_WMF = Workbook.PICTURE_TYPE_WMF;
+
+ /**
+ * Macintosh PICT
+ * @deprecated use {@link Workbook#PICTURE_TYPE_PICT}
+ */
+ @Removal(version = "5.0.0")
+ @Deprecated
+ public static final int PICTURE_TYPE_PICT = Workbook.PICTURE_TYPE_PICT;
+
+ /**
+ * JFIF / JPEG
+ * @deprecated use {@link Workbook#PICTURE_TYPE_JPEG}
+ */
+ @Removal(version = "5.0.0")
+ @Deprecated
+ public static final int PICTURE_TYPE_JPEG = Workbook.PICTURE_TYPE_JPEG;
+
+ /**
+ * PNG
+ * @deprecated use {@link Workbook#PICTURE_TYPE_PNG}
+ */
+ @Removal(version = "5.0.0")
+ @Deprecated
+ public static final int PICTURE_TYPE_PNG = Workbook.PICTURE_TYPE_PNG;
+
+ /**
+ * Windows DIB
+ * @deprecated use {@link Workbook#PICTURE_TYPE_DIB}
+ */
+ @Removal(version = "5.0.0")
+ @Deprecated
+ public static final int PICTURE_TYPE_DIB = Workbook.PICTURE_TYPE_DIB;
public HSSFPicture(EscherContainerRecord spContainer, ObjRecord objRecord)
{
super(spContainer, objRecord);
@@ -88,6 +126,7 @@ public class HSSFPicture extends HSSFSim
protected EscherContainerRecord createSpContainer() {
EscherContainerRecord spContainer = super.createSpContainer();
EscherOptRecord opt =
spContainer.getChildById(EscherOptRecord.RECORD_ID);
+ assert(opt != null);
opt.removeEscherProperty(EscherPropertyTypes.LINESTYLE__LINEDASHING);
opt.removeEscherProperty(EscherPropertyTypes.LINESTYLE__NOLINEDRAWDASH);
spContainer.removeChildRecord(spContainer.getChildById(EscherTextboxRecord.RECORD_ID));
@@ -96,7 +135,7 @@ public class HSSFPicture extends HSSFSim
/**
* Reset the image to the dimension of the embedded image
- *
+ *
* <p>
* Please note, that this method works correctly only for workbooks
* with default font size (Arial 10pt for .xls).
@@ -117,7 +156,7 @@ public class HSSFPicture extends HSSFSim
public void resize(double scale) {
resize(scale,scale);
}
-
+
/**
* Resize the image
* <p>
@@ -129,7 +168,7 @@ public class HSSFPicture extends HSSFSim
* <code>resize(1.0,1.0)</code> keeps the original size,<br>
* <code>resize(0.5,0.5)</code> resize to 50% of the original,<br>
* <code>resize(2.0,2.0)</code> resizes to 200% of the original.<br>
- * <code>resize({@link Double#MAX_VALUE},{@link Double#MAX_VALUE})</code>
resizes to the dimension of the embedded image.
+ * <code>resize({@link Double#MAX_VALUE},{@link Double#MAX_VALUE})</code>
resizes to the dimension of the embedded image.
* </p>
*
* @param scaleX the amount by which the image width is multiplied
relative to the original width.
@@ -175,7 +214,7 @@ public class HSSFPicture extends HSSFSim
public HSSFClientAnchor getPreferredSize(double scale){
return getPreferredSize(scale, scale);
}
-
+
/**
* Calculate the preferred size for this picture.
*
@@ -203,7 +242,7 @@ public class HSSFPicture extends HSSFSim
int type = bse.getBlipTypeWin32();
return ImageUtils.getImageDimension(new ByteArrayInputStream(data),
type);
}
-
+
/**
* Return picture data for this shape
*
@@ -215,7 +254,7 @@ public class HSSFPicture extends HSSFSim
if (picIdx == -1) {
return null;
}
-
+
HSSFPatriarch patriarch = getPatriarch();
HSSFShape parent = getParent();
while(patriarch == null && parent != null) {
@@ -252,9 +291,9 @@ public class HSSFPicture extends HSSFSim
? ""
: StringUtil.getFromUnicodeLE(propFile.getComplexData()).trim();
}
-
+
public void setFileName(String data){
- // TODO: add trailing \u0000?
+ // TODO: add trailing \u0000?
byte[] bytes = StringUtil.getToUnicodeLE(data);
EscherComplexProperty prop = new
EscherComplexProperty(EscherPropertyTypes.BLIP__BLIPFILENAME, true,
bytes.length);
prop.setComplexData(bytes);
@@ -274,7 +313,7 @@ public class HSSFPicture extends HSSFSim
ObjRecord obj = (ObjRecord) getObjRecord().cloneViaReserialise();
return new HSSFPicture(spContainer, obj);
}
-
+
/**
* @return the anchor that is used by this picture.
*/
@@ -284,7 +323,7 @@ public class HSSFPicture extends HSSFSim
return (a instanceof HSSFClientAnchor) ? (HSSFClientAnchor)a : null;
}
-
+
/**
* @return the sheet which contains the picture shape
*/
Modified: poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java Thu Apr 2
23:54:48 2020
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.poi.poifs.common.POIFSBigBlockSize;
import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
/**
* A block of block allocation table entries. BATBlocks are created
@@ -39,30 +40,30 @@ public final class BATBlock implements B
private POIFSBigBlockSize bigBlockSize;
/**
- * For a regular fat block, these are 128 / 1024
+ * For a regular fat block, these are 128 / 1024
* next sector values.
* For a XFat (DIFat) block, these are 127 / 1023
* next sector values, then a chaining value.
*/
private int[] _values;
-
+
/**
* Does this BATBlock have any free sectors in it?
*/
private boolean _has_free_sectors;
-
+
/**
* Where in the file are we?
*/
private int ourBlockIndex;
-
+
/**
* Create a single instance initialized with default values
*/
private BATBlock(POIFSBigBlockSize bigBlockSize)
{
this.bigBlockSize = bigBlockSize;
-
+
int _entries_per_block = bigBlockSize.getBATEntriesPerBlock();
_values = new int[_entries_per_block];
_has_free_sectors = true;
@@ -89,19 +90,19 @@ public final class BATBlock implements B
{
// Create an empty block
BATBlock block = new BATBlock(bigBlockSize);
-
+
// Fill it
- byte[] buffer = new byte[LittleEndian.INT_SIZE];
+ byte[] buffer = new byte[LittleEndianConsts.INT_SIZE];
for(int i=0; i<block._values.length; i++) {
data.get(buffer);
block._values[i] = LittleEndian.getInt(buffer);
}
block.recomputeFree();
-
+
// All done
return block;
}
-
+
/**
* Creates a single BATBlock, with all the values set to empty.
*/
@@ -119,7 +120,7 @@ public final class BATBlock implements B
* number of FAT (BAT) sectors specified. (We don't care if those BAT
* blocks come from the 109 in the header, or from header + XBATS, it
* won't affect the calculation)
- *
+ *
* The actual file size will be between [size of fatCount-1 blocks] and
* [size of fatCount blocks].
* For 512 byte block sizes, this means we may over-estimate by up to
65kb.
@@ -129,12 +130,12 @@ public final class BATBlock implements B
final int numBATs) {
// Header isn't FAT addressed
long size = 1;
-
+
// The header has up to 109 BATs, and extra ones are referenced
// from XBATs
// However, all BATs can contain 128/1024 blocks
size += (((long)numBATs) * bigBlockSize.getBATEntriesPerBlock());
-
+
// So far we've been in sector counts, turn into bytes
return size * bigBlockSize.getBigBlockSize();
}
@@ -148,26 +149,26 @@ public final class BATBlock implements B
* and the relative index within it.
* The List of BATBlocks must be in sequential order
*/
- public static BATBlockAndIndex getBATBlockAndIndex(final int offset,
+ public static BATBlockAndIndex getBATBlockAndIndex(final int offset,
final HeaderBlock header, final List<BATBlock> bats) {
POIFSBigBlockSize bigBlockSize = header.getBigBlockSize();
int entriesPerBlock = bigBlockSize.getBATEntriesPerBlock();
-
+
int whichBAT = offset / entriesPerBlock;
int index = offset % entriesPerBlock;
return new BATBlockAndIndex( index, bats.get(whichBAT) );
}
-
+
/**
* Returns the BATBlock that handles the specified offset,
* and the relative index within it, for the mini stream.
* The List of BATBlocks must be in sequential order
*/
- public static BATBlockAndIndex getSBATBlockAndIndex(final int offset,
+ public static BATBlockAndIndex getSBATBlockAndIndex(final int offset,
final HeaderBlock header, final List<BATBlock> sbats) {
return getBATBlockAndIndex(offset, header, sbats);
}
-
+
/**
* Does this BATBlock have any free sectors in it, or
* is it full?
@@ -190,20 +191,20 @@ public final class BATBlock implements B
}
return usedSectors;
}
-
+
public int getValueAt(int relativeOffset) {
if(relativeOffset >= _values.length) {
throw new ArrayIndexOutOfBoundsException(
- "Unable to fetch offset " + relativeOffset + " as the " +
+ "Unable to fetch offset " + relativeOffset + " as the " +
"BAT only contains " + _values.length + " entries"
- );
+ );
}
return _values[relativeOffset];
}
public void setValueAt(int relativeOffset, int value) {
int oldValue = _values[relativeOffset];
_values[relativeOffset] = value;
-
+
// Do we need to re-compute the free?
if(value == POIFSConstants.UNUSED_BLOCK) {
_has_free_sectors = true;
@@ -213,7 +214,7 @@ public final class BATBlock implements B
recomputeFree();
}
}
-
+
/**
* Record where in the file we live
*/
@@ -221,7 +222,7 @@ public final class BATBlock implements B
this.ourBlockIndex = index;
}
/**
- * Retrieve where in the file we live
+ * Retrieve where in the file we live
*/
public int getOurBlockIndex() {
return ourBlockIndex;
@@ -246,18 +247,18 @@ public final class BATBlock implements B
// Save it out
block.put( serialize() );
}
-
+
private byte[] serialize() {
// Create the empty array
byte[] data = new byte[ bigBlockSize.getBigBlockSize() ];
-
+
// Fill in the values
int offset = 0;
for (int _value : _values) {
LittleEndian.putInt(data, offset, _value);
- offset += LittleEndian.INT_SIZE;
+ offset += LittleEndianConsts.INT_SIZE;
}
-
+
// Done
return data;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java Thu Apr 2
23:54:48 2020
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.Units;
@@ -77,7 +78,7 @@ public class ImageHeaderWMF {
public ImageHeaderWMF(byte[] data, final int off) {
int offset = off;
- int key = LittleEndian.getInt(data, offset); offset +=
LittleEndian.INT_SIZE; //header key
+ int key = LittleEndian.getInt(data, offset); offset +=
LittleEndianConsts.INT_SIZE; //header key
if (key != APMHEADER_KEY) {
LOG.log(POILogger.WARN, "WMF file doesn't contain a placeable
header - ignore parsing");
handle = 0;
@@ -90,16 +91,16 @@ public class ImageHeaderWMF {
return;
}
- handle = LittleEndian.getUShort(data, offset); offset +=
LittleEndian.SHORT_SIZE;
- left = LittleEndian.getShort(data, offset); offset +=
LittleEndian.SHORT_SIZE;
- top = LittleEndian.getShort(data, offset); offset +=
LittleEndian.SHORT_SIZE;
- right = LittleEndian.getShort(data, offset); offset +=
LittleEndian.SHORT_SIZE;
- bottom = LittleEndian.getShort(data, offset); offset +=
LittleEndian.SHORT_SIZE;
+ handle = LittleEndian.getUShort(data, offset); offset +=
LittleEndianConsts.SHORT_SIZE;
+ left = LittleEndian.getShort(data, offset); offset +=
LittleEndianConsts.SHORT_SIZE;
+ top = LittleEndian.getShort(data, offset); offset +=
LittleEndianConsts.SHORT_SIZE;
+ right = LittleEndian.getShort(data, offset); offset +=
LittleEndianConsts.SHORT_SIZE;
+ bottom = LittleEndian.getShort(data, offset); offset +=
LittleEndianConsts.SHORT_SIZE;
- inch = LittleEndian.getUShort(data, offset); offset +=
LittleEndian.SHORT_SIZE;
- reserved = LittleEndian.getInt(data, offset); offset +=
LittleEndian.INT_SIZE;
+ inch = LittleEndian.getUShort(data, offset); offset +=
LittleEndianConsts.SHORT_SIZE;
+ reserved = LittleEndian.getInt(data, offset); offset +=
LittleEndianConsts.INT_SIZE;
- checksum = LittleEndian.getShort(data, offset); offset +=
LittleEndian.SHORT_SIZE;
+ checksum = LittleEndian.getShort(data, offset); offset +=
LittleEndianConsts.SHORT_SIZE;
if (checksum != getChecksum()){
LOG.log(POILogger.WARN, "WMF checksum does not match the header
data");
}
@@ -124,14 +125,14 @@ public class ImageHeaderWMF {
public void write(OutputStream out) throws IOException {
byte[] header = new byte[22];
int pos = 0;
- LittleEndian.putInt(header, pos, APMHEADER_KEY); pos +=
LittleEndian.INT_SIZE; //header key
- LittleEndian.putUShort(header, pos, 0); pos +=
LittleEndian.SHORT_SIZE; //hmf
- LittleEndian.putUShort(header, pos, left); pos +=
LittleEndian.SHORT_SIZE; //left
- LittleEndian.putUShort(header, pos, top); pos +=
LittleEndian.SHORT_SIZE; //top
- LittleEndian.putUShort(header, pos, right); pos +=
LittleEndian.SHORT_SIZE; //right
- LittleEndian.putUShort(header, pos, bottom); pos +=
LittleEndian.SHORT_SIZE; //bottom
- LittleEndian.putUShort(header, pos, inch); pos +=
LittleEndian.SHORT_SIZE; //inch
- LittleEndian.putInt(header, pos, 0); pos += LittleEndian.INT_SIZE;
//reserved
+ LittleEndian.putInt(header, pos, APMHEADER_KEY); pos +=
LittleEndianConsts.INT_SIZE; //header key
+ LittleEndian.putUShort(header, pos, 0); pos +=
LittleEndianConsts.SHORT_SIZE; //hmf
+ LittleEndian.putUShort(header, pos, left); pos +=
LittleEndianConsts.SHORT_SIZE; //left
+ LittleEndian.putUShort(header, pos, top); pos +=
LittleEndianConsts.SHORT_SIZE; //top
+ LittleEndian.putUShort(header, pos, right); pos +=
LittleEndianConsts.SHORT_SIZE; //right
+ LittleEndian.putUShort(header, pos, bottom); pos +=
LittleEndianConsts.SHORT_SIZE; //bottom
+ LittleEndian.putUShort(header, pos, inch); pos +=
LittleEndianConsts.SHORT_SIZE; //inch
+ LittleEndian.putInt(header, pos, 0); pos +=
LittleEndianConsts.INT_SIZE; //reserved
checksum = getChecksum();
LittleEndian.putUShort(header, pos, checksum);
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java Thu
Apr 2 23:54:48 2020
@@ -19,6 +19,7 @@ package org.apache.poi.ss.format;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.FieldPosition;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Formatter;
@@ -558,7 +559,7 @@ public class CellNumberFormatter extends
private void writeScientific(double value, StringBuffer output,
Set<CellNumberStringMod> mods) {
StringBuffer result = new StringBuffer();
- FieldPosition fractionPos = new
FieldPosition(DecimalFormat.FRACTION_FIELD);
+ FieldPosition fractionPos = new
FieldPosition(NumberFormat.FRACTION_FIELD);
decimalFmt.format(value, result, fractionPos);
writeInteger(result, output, integerSpecials, mods,
showGroupingSeparator);
writeFractional(result, output);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java Thu Apr 2
23:54:48 2020
@@ -19,7 +19,7 @@ package org.apache.poi.ss.formula.ptg;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.LittleEndianInput;
import org.apache.poi.util.LittleEndianOutput;
@@ -208,7 +208,7 @@ public final class AttrPtg extends Contr
public int getSize() {
if (_jumpTable != null) {
- return SIZE + (_jumpTable.length + 1) * LittleEndian.SHORT_SIZE;
+ return SIZE + (_jumpTable.length + 1) *
LittleEndianConsts.SHORT_SIZE;
}
return SIZE;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
Thu Apr 2 23:54:48 2020
@@ -40,6 +40,7 @@ import java.util.stream.Collectors;
import javax.xml.crypto.URIDereferencer;
import javax.xml.crypto.dsig.CanonicalizationMethod;
import javax.xml.crypto.dsig.DigestMethod;
+import javax.xml.crypto.dsig.Transform;
import javax.xml.crypto.dsig.XMLSignatureFactory;
import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
@@ -405,9 +406,9 @@ public class SignatureConfig {
}
switch (canonicalizationMethod) {
+ case Transform.ENVELOPED:
case CanonicalizationMethod.INCLUSIVE:
case CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS:
- case CanonicalizationMethod.ENVELOPED:
case CanonicalizationMethod.EXCLUSIVE:
case CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS:
return canonicalizationMethod;
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
Thu Apr 2 23:54:48 2020
@@ -53,7 +53,7 @@ public class EnvelopedSignatureFacet imp
, List<XMLObject> objects)
throws XMLSignatureException {
List<Transform> transforms = new ArrayList<>();
- Transform envelopedTransform = newTransform(signatureInfo,
CanonicalizationMethod.ENVELOPED);
+ Transform envelopedTransform = newTransform(signatureInfo,
Transform.ENVELOPED);
transforms.add(envelopedTransform);
Transform exclusiveTransform = newTransform(signatureInfo,
CanonicalizationMethod.EXCLUSIVE);
transforms.add(exclusiveTransform);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java Thu
Apr 2 23:54:48 2020
@@ -17,6 +17,7 @@
package org.apache.poi.xdgf.geom;
+import com.graphbuilder.curve.BSpline;
import com.graphbuilder.curve.ControlPath;
import com.graphbuilder.curve.GroupIterator;
import com.graphbuilder.curve.NURBSpline;
@@ -49,7 +50,7 @@ public class SplineRenderer {
NURBSpline spline = new NURBSpline(controlPoints, gi);
spline.setDegree(degree);
- spline.setKnotVectorType(NURBSpline.NON_UNIFORM);
+ spline.setKnotVectorType(BSpline.NON_UNIFORM);
spline.setKnotVector(knots);
if (weights == null) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
Thu Apr 2 23:54:48 2020
@@ -19,6 +19,7 @@ package org.apache.poi.xssf.binary;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
/**
* This class encapsulates what the spec calls a "Cell" object.
@@ -39,7 +40,7 @@ class XSSFBCellHeader {
* @param cell cell buffer to update
*/
public static void parse(byte[] data, int offset, int currentRow,
XSSFBCellHeader cell) {
- int colNum = XSSFBUtils.castToInt(LittleEndian.getUInt(data, offset));
offset += LittleEndian.INT_SIZE;
+ int colNum = XSSFBUtils.castToInt(LittleEndian.getUInt(data, offset));
offset += LittleEndianConsts.INT_SIZE;
int styleIdx = XSSFBUtils.get24BitInt(data, offset); offset += 3;
//TODO: range checking
boolean showPhonetic = false;//TODO: fill this out
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java Thu
Apr 2 23:54:48 2020
@@ -20,6 +20,7 @@ package org.apache.poi.xssf.binary;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
/**
* @since 3.16-beta3
@@ -28,7 +29,7 @@ import org.apache.poi.util.LittleEndian;
class XSSFBCellRange {
//TODO: Convert this to generate an AreaReference
- public static final int length = 4* LittleEndian.INT_SIZE;
+ public static final int length = 4* LittleEndianConsts.INT_SIZE;
/**
* Parses an RfX cell range from the data starting at the offset.
* This performs no range checking.
@@ -41,9 +42,9 @@ class XSSFBCellRange {
if (cellRange == null) {
cellRange = new XSSFBCellRange();
}
- cellRange.firstRow = XSSFBUtils.castToInt(LittleEndian.getUInt(data,
offset)); offset += LittleEndian.INT_SIZE;
- cellRange.lastRow = XSSFBUtils.castToInt(LittleEndian.getUInt(data,
offset)); offset += LittleEndian.INT_SIZE;
- cellRange.firstCol = XSSFBUtils.castToInt(LittleEndian.getUInt(data,
offset)); offset += LittleEndian.INT_SIZE;
+ cellRange.firstRow = XSSFBUtils.castToInt(LittleEndian.getUInt(data,
offset)); offset += LittleEndianConsts.INT_SIZE;
+ cellRange.lastRow = XSSFBUtils.castToInt(LittleEndian.getUInt(data,
offset)); offset += LittleEndianConsts.INT_SIZE;
+ cellRange.firstCol = XSSFBUtils.castToInt(LittleEndian.getUInt(data,
offset)); offset += LittleEndianConsts.INT_SIZE;
cellRange.lastCol = XSSFBUtils.castToInt(LittleEndian.getUInt(data,
offset));
return cellRange;
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
Thu Apr 2 23:54:48 2020
@@ -29,6 +29,7 @@ import java.util.TreeMap;
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
/**
* @since 3.16-beta3
@@ -60,7 +61,7 @@ public class XSSFBCommentsTable extends
switch (recordType) {
case BrtBeginComment:
int offset = 0;
- authorId = XSSFBUtils.castToInt(LittleEndian.getUInt(data));
offset += LittleEndian.INT_SIZE;
+ authorId = XSSFBUtils.castToInt(LittleEndian.getUInt(data));
offset += LittleEndianConsts.INT_SIZE;
cellRange = XSSFBCellRange.parse(data, offset, cellRange);
offset+= XSSFBCellRange.length;
//for strict parsing; confirm that firstRow==lastRow and
firstCol==colLats (2.4.28)
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
Thu Apr 2 23:54:48 2020
@@ -36,8 +36,8 @@ import org.apache.poi.openxml4j.opc.Pack
import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.xssf.binary.XSSFBCommentsTable;
@@ -236,9 +236,9 @@ public class XSSFBReader extends XSSFRea
int offset = 0;
//this is the sheet state #2.5.142
/*long hsShtat =*/ //noinspection ResultOfMethodCallIgnored
- LittleEndian.getUInt(data, offset); offset +=
LittleEndian.INT_SIZE;
+ LittleEndian.getUInt(data, offset); offset +=
LittleEndianConsts.INT_SIZE;
- long iTabID = LittleEndian.getUInt(data, offset); offset +=
LittleEndian.INT_SIZE;
+ long iTabID = LittleEndian.getUInt(data, offset); offset +=
LittleEndianConsts.INT_SIZE;
//according to #2.4.304
if (iTabID < 1 || iTabID > 0x0000FFFFL) {
throw new XSSFBParseException("table id out of range:
"+iTabID);
@@ -257,7 +257,7 @@ public class XSSFBReader extends XSSFRea
//undocumented what is contained in these 8 bytes.
//for the non-beta xlsb files, this would be 4, not 8.
int offset = 8;
- long iTabID = LittleEndian.getUInt(data, offset); offset +=
LittleEndian.INT_SIZE;
+ long iTabID = LittleEndian.getUInt(data, offset); offset +=
LittleEndianConsts.INT_SIZE;
if (iTabID < 1 || iTabID > 0x0000FFFFL) {
throw new XSSFBParseException("table id out of range:
"+iTabID);
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
Thu Apr 2 23:54:48 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hdgf.chunks;
-import org.apache.poi.util.LittleEndian;
-
import java.nio.charset.Charset;
+import org.apache.poi.util.LittleEndian;
+
/**
* A chunk header
*/
@@ -79,13 +79,7 @@ public abstract class ChunkHeader {
* @return the header size
*/
public static int getHeaderSize(int documentVersion) {
- if(documentVersion > 6) {
- return ChunkHeaderV11.getHeaderSize();
- } else if(documentVersion == 6) {
- return ChunkHeaderV6.getHeaderSize();
- } else {
- return ChunkHeaderV4V5.getHeaderSize();
- }
+ return documentVersion >= 6 ? ChunkHeaderV6.getHeaderSize() :
ChunkHeaderV4V5.getHeaderSize();
}
public abstract int getSizeInBytes();
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java
Thu Apr 2 23:54:48 2020
@@ -49,7 +49,6 @@ import org.apache.poi.hwmf.record.HwmfTe
import org.apache.poi.util.GenericRecordJsonWriter;
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.LittleEndianInputStream;
@@ -875,7 +874,7 @@ public final class HemfFill {
xform.setToIdentity();
}
- return 6 * LittleEndian.INT_SIZE;
+ return 6 * LittleEndianConsts.INT_SIZE;
}
static Shape getRgnShape(List<Rectangle2D> rgnRects) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java Thu
Apr 2 23:54:48 2020
@@ -33,6 +33,7 @@ import org.apache.poi.poifs.filesystem.D
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
/**
* Utility class which dumps raw contents of a ppt file into XML format
@@ -72,7 +73,7 @@ public final class PPTXMLDump {
return bos.toByteArray();
}
}
-
+
/**
* Dump the structure of the supplied PPT file into XML
* @param outWriter <code>Writer</code> to write out
@@ -118,11 +119,11 @@ public final class PPTXMLDump {
//read record header
int info = LittleEndian.getUShort(data, pos);
- pos += LittleEndian.SHORT_SIZE;
+ pos += LittleEndianConsts.SHORT_SIZE;
int type = LittleEndian.getUShort(data, pos);
- pos += LittleEndian.SHORT_SIZE;
+ pos += LittleEndianConsts.SHORT_SIZE;
int size = (int)LittleEndian.getUInt(data, pos);
- pos += LittleEndian.INT_SIZE;
+ pos += LittleEndianConsts.INT_SIZE;
//get name of the record by type
String recname = RecordTypes.forTypeID(type).name();
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
Thu Apr 2 23:54:48 2020
@@ -32,7 +32,6 @@ import java.util.function.Supplier;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.common.usermodel.GenericRecord;
import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.record.StyleTextPropAtom;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogFactory;
@@ -292,12 +291,12 @@ public class TextPropCollection implemen
if (!isMasterStyle) {
// First goes the number of characters we affect
// MasterStyles don't have this field
- StyleTextPropAtom.writeLittleEndian(charactersCovered,o);
+
org.apache.poi.hslf.record.Record.writeLittleEndian(charactersCovered,o);
}
// Then we have the indentLevel field if it's a paragraph
collection
if (textPropType == TextPropType.paragraph && indentLevel > -1)
{
- StyleTextPropAtom.writeLittleEndian(indentLevel, o);
+ org.apache.poi.hslf.record.Record.writeLittleEndian(indentLevel,
o);
}
// Then the mask field
@@ -305,7 +304,7 @@ public class TextPropCollection implemen
for (TextProp textProp : textProps.values()) {
mask |= textProp.getWriteMask();
}
- StyleTextPropAtom.writeLittleEndian(mask,o);
+ org.apache.poi.hslf.record.Record.writeLittleEndian(mask,o);
// Then the contents of all the properties
for (TextProp textProp : getTextPropList()) {
@@ -314,9 +313,9 @@ public class TextPropCollection implemen
// don't add empty properties, as they can't be recognized
while reading
continue;
} else if (textProp.getSize() == 2) {
- StyleTextPropAtom.writeLittleEndian((short)val,o);
+
org.apache.poi.hslf.record.Record.writeLittleEndian((short)val,o);
} else if (textProp.getSize() == 4) {
- StyleTextPropAtom.writeLittleEndian(val,o);
+ org.apache.poi.hslf.record.Record.writeLittleEndian(val,o);
} else if (textProp instanceof HSLFTabStopPropCollection) {
((HSLFTabStopPropCollection)textProp).writeProperty(o);
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
Thu Apr 2 23:54:48 2020
@@ -20,6 +20,7 @@ package org.apache.poi.hslf.record;
import java.util.function.Supplier;
import org.apache.poi.ddf.DefaultEscherRecordFactory;
+import org.apache.poi.ddf.EscherClientDataRecord;
import org.apache.poi.ddf.EscherRecord;
import org.apache.poi.ddf.EscherRecordFactory;
@@ -40,7 +41,7 @@ public class HSLFEscherRecordFactory ext
protected Supplier<? extends EscherRecord> getConstructor(short options,
short recordId) {
if (recordId == EscherPlaceholder.RECORD_ID) {
return EscherPlaceholder::new;
- } else if (recordId == HSLFEscherClientDataRecord.RECORD_ID) {
+ } else if (recordId == EscherClientDataRecord.RECORD_ID) {
return HSLFEscherClientDataRecord::new;
}
return super.getConstructor(options, recordId);
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
Thu Apr 2 23:54:48 2020
@@ -32,6 +32,7 @@ import org.apache.poi.sl.usermodel.TextS
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.LittleEndianOutputStream;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
@@ -148,7 +149,7 @@ public final class TxMasterStyleAtom ext
//number of indentation levels
short levels = LittleEndian.getShort(_data, 0);
- pos += LittleEndian.SHORT_SIZE;
+ pos += LittleEndianConsts.SHORT_SIZE;
paragraphStyles = new ArrayList<>(levels);
charStyles = new ArrayList<>(levels);
@@ -159,19 +160,19 @@ public final class TxMasterStyleAtom ext
// Fetch the 2 byte value, that is safe to ignore for some
types of text
short indentLevel = LittleEndian.getShort(_data, pos);
prprops.setIndentLevel(indentLevel);
- pos += LittleEndian.SHORT_SIZE;
+ pos += LittleEndianConsts.SHORT_SIZE;
} else {
prprops.setIndentLevel((short)-1);
}
head = LittleEndian.getInt(_data, pos);
- pos += LittleEndian.INT_SIZE;
+ pos += LittleEndianConsts.INT_SIZE;
pos += prprops.buildTextPropList( head, _data, pos);
paragraphStyles.add(prprops);
head = LittleEndian.getInt(_data, pos);
- pos += LittleEndian.INT_SIZE;
+ pos += LittleEndianConsts.INT_SIZE;
TextPropCollection chprops = new TextPropCollection(0,
TextPropType.character);
pos += chprops.buildTextPropList( head, _data, pos);
charStyles.add(chprops);
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
Thu Apr 2 23:54:48 2020
@@ -247,7 +247,7 @@ public class HSLFAutoShape extends HSLFT
while (segIter.hasNext()) {
byte[] segElem = segIter.next();
- HSLFFreeformShape.PathInfo pi = getPathInfo(segElem);
+ HSLFAutoShape.PathInfo pi = getPathInfo(segElem);
if (pi == null) {
continue;
}
@@ -376,7 +376,7 @@ public class HSLFAutoShape extends HSLFT
}
private static void handleEscapeInfo(CTPath2D pathCT, Path2D path2D,
byte[] segElem, Iterator<byte[]> vertIter) {
- HSLFFreeformShape.EscapeInfo ei = getEscapeInfo(segElem);
+ HSLFAutoShape.EscapeInfo ei = getEscapeInfo(segElem);
if (ei == null) {
return;
}
@@ -474,16 +474,16 @@ public class HSLFAutoShape extends HSLFT
return new Point2D.Double(xyPoints[0],xyPoints[1]);
}
- private static HSLFFreeformShape.PathInfo getPathInfo(byte[] elem) {
+ private static HSLFAutoShape.PathInfo getPathInfo(byte[] elem) {
int elemUS = LittleEndian.getUShort(elem, 0);
int pathInfo = PATH_INFO.getValue(elemUS);
- return HSLFFreeformShape.PathInfo.valueOf(pathInfo);
+ return HSLFAutoShape.PathInfo.valueOf(pathInfo);
}
- private static HSLFFreeformShape.EscapeInfo getEscapeInfo(byte[] elem) {
+ private static HSLFAutoShape.EscapeInfo getEscapeInfo(byte[] elem) {
int elemUS = LittleEndian.getUShort(elem, 0);
int escInfo = ESCAPE_INFO.getValue(elemUS);
- return HSLFFreeformShape.EscapeInfo.valueOf(escInfo);
+ return HSLFAutoShape.EscapeInfo.valueOf(escInfo);
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
Thu Apr 2 23:54:48 2020
@@ -37,6 +37,7 @@ import org.apache.poi.poifs.crypt.Crypto
import org.apache.poi.poifs.crypt.HashAlgorithm;
import org.apache.poi.sl.usermodel.PictureData;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.Units;
/**
@@ -64,10 +65,10 @@ public abstract class HSLFPictureData im
private int uidInstanceCount = 1;
/**
- * The 1-based index within the pictures stream
+ * The 1-based index within the pictures stream
*/
private int index = -1;
-
+
/**
* Blip signature.
*/
@@ -84,13 +85,13 @@ public abstract class HSLFPictureData im
/**
* The instance type/signatures defines if one or two UID instances will
be included
- *
+ *
* @param uidInstanceCount the number of uid sequences
*/
protected void setUIDInstanceCount(int uidInstanceCount) {
this.uidInstanceCount = uidInstanceCount;
}
-
+
/**
* Returns the raw binary data of this Picture excluding the first 8 bytes
* which hold image signature and size of the image data.
@@ -137,7 +138,7 @@ public abstract class HSLFPictureData im
public byte[] getChecksum() {
return getChecksum(getData());
}
-
+
/**
* Compute 16-byte checksum of this picture using MD5 algorithm.
*/
@@ -153,18 +154,18 @@ public abstract class HSLFPictureData im
public void write(OutputStream out) throws IOException {
byte[] data;
- data = new byte[LittleEndian.SHORT_SIZE];
+ data = new byte[LittleEndianConsts.SHORT_SIZE];
LittleEndian.putUShort(data, 0, getSignature());
out.write(data);
- data = new byte[LittleEndian.SHORT_SIZE];
+ data = new byte[LittleEndianConsts.SHORT_SIZE];
PictureType pt = getType();
LittleEndian.putUShort(data, 0, pt.nativeId + 0xF018);
out.write(data);
byte[] rd = getRawData();
- data = new byte[LittleEndian.INT_SIZE];
+ data = new byte[LittleEndianConsts.INT_SIZE];
LittleEndian.putInt(data, 0, rd.length);
out.write(data);
@@ -223,7 +224,7 @@ public abstract class HSLFPictureData im
public void setIndex(int index) {
this.index = index;
}
-
+
@Override
public final String getContentType() {
return getType().contentType;
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
Thu Apr 2 23:54:48 2020
@@ -32,7 +32,7 @@ import org.w3c.dom.Document;
/**
* Common class for {@link ExcelToFoConverter} and {@link ExcelToHtmlConverter}
- *
+ *
* @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
* @see AbstractWordConverter
*/
@@ -41,13 +41,13 @@ public abstract class AbstractExcelConve
{
protected static int getColumnWidth( HSSFSheet sheet, int columnIndex )
{
- return ExcelToHtmlUtils.getColumnWidthInPx( sheet
+ return AbstractExcelUtils.getColumnWidthInPx( sheet
.getColumnWidth( columnIndex ) );
}
protected static int getDefaultColumnWidth( HSSFSheet sheet )
{
- return ExcelToHtmlUtils.getColumnWidthInPx( sheet
+ return AbstractExcelUtils.getColumnWidthInPx( sheet
.getDefaultColumnWidth() );
}
@@ -68,7 +68,7 @@ public abstract class AbstractExcelConve
/**
* Generates name for output as column header in case
* <tt>{@link #isOutputColumnHeaders()} == true</tt>
- *
+ *
* @param columnIndex
* 0-based column index
*/
@@ -151,12 +151,12 @@ public abstract class AbstractExcelConve
value = ErrorEval.getText( cell.getErrorCellValue() );
break;
default:
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
break;
}
break;
case BLANK:
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
break;
case NUMERIC:
value = _formatter.formatCellValue( cell );
@@ -171,7 +171,7 @@ public abstract class AbstractExcelConve
return true;
}
- return ExcelToHtmlUtils.isEmpty( value );
+ return AbstractExcelUtils.isEmpty( value );
}
public void setFontReplacer( FontReplacer fontReplacer )
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
Thu Apr 2 23:54:48 2020
@@ -217,7 +217,7 @@ public class ExcelToFoConverter extends
}
else
{
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
}
break;
case NUMERIC:
@@ -237,12 +237,12 @@ public class ExcelToFoConverter extends
POILogger.WARN,
"Unexpected cell cachedFormulaResultType ("
+ cell.getCachedFormulaResultType() + ")" );
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
break;
}
break;
case BLANK:
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
break;
case NUMERIC:
value = _formatter.formatCellValue( cell );
@@ -259,7 +259,7 @@ public class ExcelToFoConverter extends
return true;
}
- final boolean noText = ExcelToHtmlUtils.isEmpty( value );
+ final boolean noText = AbstractExcelUtils.isEmpty( value );
final boolean wrapInDivs = !noText && !cellStyle.getWrapText();
final boolean emptyStyle = isEmptyStyle( cellStyle );
@@ -318,7 +318,7 @@ public class ExcelToFoConverter extends
block.appendChild( text );
tableCellElement.appendChild( block );
- return ExcelToHtmlUtils.isEmpty( value ) && emptyStyle;
+ return AbstractExcelUtils.isEmpty( value ) && emptyStyle;
}
protected void processCellStyle( HSSFWorkbook workbook,
@@ -349,7 +349,7 @@ public class ExcelToFoConverter extends
.getFillBackgroundColorColor();
if ( backgroundColor != null )
cellTarget.setAttribute( "background-color",
- ExcelToHtmlUtils.getColor( backgroundColor ) );
+ AbstractExcelUtils.getColor( backgroundColor ) );
}
processCellStyleBorder( workbook, cellTarget, "top",
@@ -373,17 +373,17 @@ public class ExcelToFoConverter extends
return;
StringBuilder borderStyle = new StringBuilder();
- borderStyle.append( ExcelToHtmlUtils.getBorderWidth( xlsBorder ) );
+ borderStyle.append( AbstractExcelUtils.getBorderWidth( xlsBorder ) );
final HSSFColor color = workbook.getCustomPalette().getColor(
borderColor );
if ( color != null )
{
borderStyle.append( ' ' );
- borderStyle.append( ExcelToHtmlUtils.getColor( color ) );
+ borderStyle.append( AbstractExcelUtils.getColor( color ) );
borderStyle.append( ' ' );
- borderStyle.append( ExcelToHtmlUtils.getBorderStyle( xlsBorder ) );
+ borderStyle.append( AbstractExcelUtils.getBorderStyle( xlsBorder )
);
}
cellTarget.setAttribute( "border-" + type, borderStyle.toString() );
@@ -404,7 +404,7 @@ public class ExcelToFoConverter extends
font.getColor() );
if ( fontColor != null )
blockTarget.setAttribute( "color",
- ExcelToHtmlUtils.getColor( fontColor ) );
+ AbstractExcelUtils.getColor( fontColor ) );
if ( font.getFontHeightInPoints() != 0 )
blockTarget.setAttribute( "font-size", font.getFontHeightInPoints()
@@ -532,7 +532,7 @@ public class ExcelToFoConverter extends
if ( !isOutputHiddenColumns() && sheet.isColumnHidden( colIx ) )
continue;
- CellRangeAddress range = ExcelToHtmlUtils.getMergedRange(
+ CellRangeAddress range = AbstractExcelUtils.getMergedRange(
mergedRanges, row.getRowNum(), colIx );
if ( range != null
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
Thu Apr 2 23:54:48 2020
@@ -53,7 +53,7 @@ import org.w3c.dom.Text;
/**
* Converts xls files (97-2007) to HTML file.
- *
+ *
* @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
*/
@Beta
@@ -63,7 +63,7 @@ public class ExcelToHtmlConverter extend
/**
* Java main() interface to interact with {@link ExcelToHtmlConverter}
- *
+ *
* <p>
* Usage: ExcelToHtmlConverter infile outfile
* </p>
@@ -92,7 +92,7 @@ public class ExcelToHtmlConverter extend
/**
* Converts Excel file (97-2007) into HTML file.
- *
+ *
* @param xlsFile
* workbook file to process
* @return DOM representation of result HTML
@@ -100,14 +100,14 @@ public class ExcelToHtmlConverter extend
* @throws ParserConfigurationException If configuration is incorrect
*/
public static Document process( File xlsFile ) throws IOException,
ParserConfigurationException {
- try (HSSFWorkbook workbook = ExcelToHtmlUtils.loadXls(xlsFile)) {
+ try (HSSFWorkbook workbook = AbstractExcelUtils.loadXls(xlsFile)) {
return ExcelToHtmlConverter.process(workbook);
}
}
/**
* Converts Excel file (97-2007) into HTML file.
- *
+ *
* @param xlsStream workbook stream to process
* @return DOM representation of result HTML
* @throws IOException If an error occurs reading or writing files
@@ -121,7 +121,7 @@ public class ExcelToHtmlConverter extend
/**
* Converts Excel file (97-2007) into HTML file.
- *
+ *
* @param workbook workbook instance to process
* @return DOM representation of result HTML
* @throws IOException If an error occurs reading or writing files
@@ -173,13 +173,13 @@ public class ExcelToHtmlConverter extend
case SOLID_FOREGROUND:
final HSSFColor foregroundColor =
cellStyle.getFillForegroundColorColor();
if ( foregroundColor == null ) break;
- String fgCol = ExcelToHtmlUtils.getColor( foregroundColor );
+ String fgCol = AbstractExcelUtils.getColor( foregroundColor );
style.append("background-color:").append(fgCol).append(";");
break;
default:
final HSSFColor backgroundColor =
cellStyle.getFillBackgroundColorColor();
if ( backgroundColor == null ) break;
- String bgCol = ExcelToHtmlUtils.getColor( backgroundColor );
+ String bgCol = AbstractExcelUtils.getColor( backgroundColor );
style.append("background-color:").append(bgCol).append(";");
break;
}
@@ -206,16 +206,16 @@ public class ExcelToHtmlConverter extend
}
StringBuilder borderStyle = new StringBuilder();
- borderStyle.append( ExcelToHtmlUtils.getBorderWidth( xlsBorder ) );
+ borderStyle.append( AbstractExcelUtils.getBorderWidth( xlsBorder ) );
borderStyle.append( ' ' );
- borderStyle.append( ExcelToHtmlUtils.getBorderStyle( xlsBorder ) );
+ borderStyle.append( AbstractExcelUtils.getBorderStyle( xlsBorder ) );
final HSSFColor color = workbook.getCustomPalette().getColor(
borderColor );
if ( color != null )
{
borderStyle.append( ' ' );
- borderStyle.append( ExcelToHtmlUtils.getColor( color ) );
+ borderStyle.append( AbstractExcelUtils.getColor( color ) );
}
style.append("border-").append(type).append(":").append(borderStyle).append(";");
@@ -231,7 +231,7 @@ public class ExcelToHtmlConverter extend
final HSSFColor fontColor = workbook.getCustomPalette().getColor(
font.getColor() );
if ( fontColor != null )
- style.append("color:
").append(ExcelToHtmlUtils.getColor(fontColor)).append("; ");
+ style.append("color:
").append(AbstractExcelUtils.getColor(fontColor)).append("; ");
if ( font.getFontHeightInPoints() != 0 )
style.append("font-size:").append(font.getFontHeightInPoints()).append("pt;");
@@ -307,7 +307,7 @@ public class ExcelToHtmlConverter extend
}
else
{
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
}
break;
case NUMERIC:
@@ -327,12 +327,12 @@ public class ExcelToHtmlConverter extend
POILogger.WARN,
"Unexpected cell cachedFormulaResultType ("
+ cell.getCachedFormulaResultType() + ")" );
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
break;
}
break;
case BLANK:
- value = ExcelToHtmlUtils.EMPTY;
+ value = AbstractExcelUtils.EMPTY;
break;
case NUMERIC:
value = _formatter.formatCellValue( cell );
@@ -349,14 +349,14 @@ public class ExcelToHtmlConverter extend
return true;
}
- final boolean noText = ExcelToHtmlUtils.isEmpty( value );
+ final boolean noText = AbstractExcelUtils.isEmpty( value );
final boolean wrapInDivs = !noText && isUseDivsToSpan() &&
!cellStyle.getWrapText();
if ( cellStyle.getIndex() != 0 ) {
@SuppressWarnings("resource")
HSSFWorkbook workbook = cell.getRow().getSheet().getWorkbook();
String mainCssClass = getStyleClassName( workbook, cellStyle );
-
+
if ( wrapInDivs ) {
tableCellElement.setAttribute( "class", mainCssClass + " "
+ cssClassContainerCell );
@@ -419,7 +419,7 @@ public class ExcelToHtmlConverter extend
tableCellElement.appendChild( text );
}
- return ExcelToHtmlUtils.isEmpty( value ) && (cellStyle.getIndex() ==
0);
+ return AbstractExcelUtils.isEmpty( value ) && (cellStyle.getIndex() ==
0);
}
protected void processColumnHeaders( HSSFSheet sheet, int maxSheetColumns,
@@ -472,16 +472,16 @@ public class ExcelToHtmlConverter extend
}
protected void processDocumentInformation(SummaryInformation
summaryInformation ) {
- if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getTitle() ) )
+ if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getTitle() ) )
htmlDocumentFacade.setTitle( summaryInformation.getTitle() );
- if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getAuthor() ) )
+ if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getAuthor() ) )
htmlDocumentFacade.addAuthor( summaryInformation.getAuthor() );
- if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getKeywords() ) )
+ if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getKeywords() )
)
htmlDocumentFacade.addKeywords( summaryInformation.getKeywords() );
- if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getComments() ) )
+ if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getComments() )
)
htmlDocumentFacade
.addDescription( summaryInformation.getComments() );
}
@@ -512,7 +512,7 @@ public class ExcelToHtmlConverter extend
if ( !isOutputHiddenColumns() && sheet.isColumnHidden( colIx ) )
continue;
- CellRangeAddress range = ExcelToHtmlUtils.getMergedRange(
+ CellRangeAddress range = AbstractExcelUtils.getMergedRange(
mergedRanges, row.getRowNum(), colIx );
if ( range != null
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
Thu Apr 2 23:54:48 2020
@@ -923,7 +923,7 @@ public abstract class AbstractWordConver
imageWidth *= aspectRatioX / 1000f;
}
imageWidth /= AbstractWordUtils.TWIPS_PER_INCH;
-
+
float imageHeight = picture.getDyaGoal();
if (aspectRatioY > 0) {
imageHeight *= aspectRatioY / 1000f;
@@ -934,7 +934,7 @@ public abstract class AbstractWordConver
picture.suggestPictureType(),
picture.suggestFullFileName(), imageWidth, imageHeight );
- if ( WordToFoUtils.isNotEmpty( url ) )
+ if ( AbstractWordUtils.isNotEmpty( url ) )
{
processImage( currentBlock, inlined, picture, url );
return;
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
Thu Apr 2 23:54:48 2020
@@ -61,7 +61,7 @@ public class AbstractWordUtils
* Creates array of all possible cell edges. In HTML (and FO) cells from
* different rows and same column should have same width, otherwise
spanning
* shall be used.
- *
+ *
* @param table
* table to build cell edges array from
* @return array of cell edges (including leftest one) in twips
@@ -137,7 +137,7 @@ public class AbstractWordUtils
{
Node child1 = childNodes.item( i );
Node child2 = childNodes.item( i + 1 );
- if ( !WordToFoUtils.canBeMerged( child1, child2, childTagName ) )
+ if ( !AbstractWordUtils.canBeMerged( child1, child2, childTagName
) )
continue;
// merge
@@ -266,7 +266,7 @@ public class AbstractWordUtils
numberingState.levels.remove( childKey );
}
}
-
+
bulletBuffer.append( NumberFormatter.getNumber( num,
list.getNumberFormat( level ) ) );
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
Thu Apr 2 23:54:48 2020
@@ -309,9 +309,8 @@ public class FoDocumentFacade
if ( child.getNodeType() == Node.ELEMENT_NODE )
{
Element childElement = (Element) child;
- if ( WordToFoUtils.isNotEmpty( childElement.getNamespaceURI() )
- && WordToFoUtils.isNotEmpty( childElement
- .getLocalName() )
+ if ( AbstractWordUtils.isNotEmpty(
childElement.getNamespaceURI() )
+ && AbstractWordUtils.isNotEmpty(
childElement.getLocalName() )
&& namespace.equals( childElement.getNamespaceURI() )
&& name.equals( childElement.getLocalName() ) )
{
@@ -321,7 +320,7 @@ public class FoDocumentFacade
}
}
- if ( WordToFoUtils.isNotEmpty( value ) )
+ if ( AbstractWordUtils.isNotEmpty( value ) )
{
Element property = document.createElementNS( namespace, prefix
+ ":" + name );
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
Thu Apr 2 23:54:48 2020
@@ -27,6 +27,7 @@ import org.apache.poi.hwpf.model.io.HWPF
import org.apache.poi.hwpf.sprm.SprmBuffer;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.StringUtil;
@Internal
@@ -54,7 +55,7 @@ public class ComplexFileTable {
while (tableStream[offset] == GRPPRL_TYPE) {
offset++;
int size = LittleEndian.getShort(tableStream, offset);
- offset += LittleEndian.SHORT_SIZE;
+ offset += LittleEndianConsts.SHORT_SIZE;
byte[] bs = LittleEndian.getByteArray(tableStream, offset, size,
MAX_RECORD_LENGTH);
offset += size;
@@ -68,7 +69,7 @@ public class ComplexFileTable {
" but had " + tableStream[offset]);
}
int pieceTableSize = LittleEndian.getInt(tableStream, ++offset);
- offset += LittleEndian.INT_SIZE;
+ offset += LittleEndianConsts.INT_SIZE;
_tpt = newTextPieceTable(documentStream, tableStream, offset,
pieceTableSize, fcMin, charset);
}
@@ -99,7 +100,7 @@ public class ComplexFileTable {
byte[] table = _tpt.writeTo(wordDocumentStream);
- byte[] numHolder = new byte[LittleEndian.INT_SIZE];
+ byte[] numHolder = new byte[LittleEndianConsts.INT_SIZE];
LittleEndian.putInt(numHolder, 0, table.length);
tableStream.write(numHolder);
tableStream.write(table);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java Thu Apr
2 23:54:48 2020
@@ -18,6 +18,7 @@ package org.apache.poi.hwpf.model;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
/**
* The FFData structure specifies form field data for a text box, check box, or
@@ -29,7 +30,7 @@ import org.apache.poi.util.LittleEndian;
* <p>
* This class is internal. It content or properties may change without notice
* due to changes in our knowledge of internal Microsoft Word binary
structures.
- *
+ *
* @author Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word (.doc)
* Binary File Format; Copyright (c) 2012 Microsoft Corporation;
* Release: October 8, 2012
@@ -114,7 +115,7 @@ public class FFData
{
this._wDef = Integer
.valueOf( LittleEndian.getUShort( std, offset ) );
- offset += LittleEndian.SHORT_SIZE;
+ offset += LittleEndianConsts.SHORT_SIZE;
}
else
{
@@ -170,7 +171,7 @@ public class FFData
if ( _base.getIType() == FFDataBase.ITYPE_CHCK
|| _base.getIType() == FFDataBase.ITYPE_DROP )
{
- size += LittleEndian.SHORT_SIZE;
+ size += LittleEndianConsts.SHORT_SIZE;
}
size += _xstzTextFormat.getSize();
@@ -211,7 +212,7 @@ public class FFData
|| _base.getIType() == FFDataBase.ITYPE_DROP )
{
LittleEndian.putUShort( buffer, offset, _wDef );
- offset += LittleEndian.SHORT_SIZE;
+ offset += LittleEndianConsts.SHORT_SIZE;
}
offset += _xstzTextFormat.serialize( buffer, offset );
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
Thu Apr 2 23:54:48 2020
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
@@ -146,7 +147,7 @@ public final class FIBFieldHandler
private final static POILogger log =
POILogFactory.getLogger(FIBFieldHandler.class);
- private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2;
+ private static final int FIELD_SIZE = LittleEndianConsts.INT_SIZE * 2;
private Map<Integer, UnhandledDataStructure> _unknownMap = new HashMap<>();
private int[] _fields;
@@ -161,7 +162,7 @@ public final class FIBFieldHandler
{
int fieldOffset = (x * FIELD_SIZE) + offset;
int dsOffset = LittleEndian.getInt(mainStream, fieldOffset);
- fieldOffset += LittleEndian.INT_SIZE;
+ fieldOffset += LittleEndianConsts.INT_SIZE;
int dsSize = LittleEndian.getInt(mainStream, fieldOffset);
if (offsetList.contains(Integer.valueOf(x)) ^ areKnown)
@@ -216,13 +217,13 @@ public final class FIBFieldHandler
public int sizeInBytes()
{
- return (_fields.length * LittleEndian.INT_SIZE);
+ return (_fields.length * LittleEndianConsts.INT_SIZE);
}
public int getFieldsCount() {
return _fields.length / 2;
}
-
+
void writeTo(byte[] mainStream, int offset, ByteArrayOutputStream
tableStream)
throws IOException
{
@@ -233,21 +234,21 @@ public final class FIBFieldHandler
{
_fields[x * 2] = tableStream.size();
LittleEndian.putInt(mainStream, offset, tableStream.size());
- offset += LittleEndian.INT_SIZE;
+ offset += LittleEndianConsts.INT_SIZE;
byte[] buf = ds.getBuf();
tableStream.write(buf);
_fields[(x * 2) + 1] = buf.length;
LittleEndian.putInt(mainStream, offset, buf.length);
- offset += LittleEndian.INT_SIZE;
+ offset += LittleEndianConsts.INT_SIZE;
}
else
{
LittleEndian.putInt(mainStream, offset, _fields[x * 2]);
- offset += LittleEndian.INT_SIZE;
+ offset += LittleEndianConsts.INT_SIZE;
LittleEndian.putInt(mainStream, offset, _fields[(x * 2) + 1]);
- offset += LittleEndian.INT_SIZE;
+ offset += LittleEndianConsts.INT_SIZE;
}
}
}
@@ -283,9 +284,9 @@ public final class FIBFieldHandler
{
result.append( '\t' );
result.append( leftPad( Integer.toString( x ), 8, ' ' ) );
- result.append( leftPad( Integer.toString( 154 + x *
LittleEndian.INT_SIZE * 2 ), 6, ' ' ) );
+ result.append( leftPad( Integer.toString( 154 + x *
LittleEndianConsts.INT_SIZE * 2 ), 6, ' ' ) );
result.append( " 0x" );
- result.append( leftPad( Integer.toHexString( 154 + x *
LittleEndian.INT_SIZE * 2 ), 4, '0' ) );
+ result.append( leftPad( Integer.toHexString( 154 + x *
LittleEndianConsts.INT_SIZE * 2 ), 4, '0' ) );
result.append( leftPad( Integer.toString( getFieldOffset( x ) ),
8, ' ' ) );
result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8,
' ' ) );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java?rev=1876067&r1=1876066&r2=1876067&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java Thu Apr 2
23:54:48 2020
@@ -24,6 +24,7 @@ import org.apache.poi.util.BitFieldFacto
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
/**
* FFN - Font Family Name. FFN is a data structure that stores the names of
the Main
@@ -63,15 +64,15 @@ public final class Ffn
int offsetTmp = offset;
_cbFfnM1 = LittleEndian.getUByte(buf,offset);
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
_info = buf[offset];
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
_wWeight = LittleEndian.getShort(buf, offset);
- offset += LittleEndian.SHORT_SIZE;
+ offset += LittleEndianConsts.SHORT_SIZE;
_chs = buf[offset];
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
_ixchSzAlt = buf[offset];
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
// read panose and fs so we can write them back out.
System.arraycopy(buf, offset, _panose, 0, _panose.length);
@@ -86,7 +87,7 @@ public final class Ffn
for(int i = 0; i < _xszFfnLength; i++)
{
_xszFfn[i] = (char)LittleEndian.getShort(buf, offset);
- offset += LittleEndian.SHORT_SIZE;
+ offset += LittleEndianConsts.SHORT_SIZE;
}
@@ -161,15 +162,15 @@ public final class Ffn
byte[] buf = IOUtils.safelyAllocate(this.getSize(), MAX_RECORD_LENGTH);
buf[offset] = (byte)_cbFfnM1;
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
buf[offset] = _info;
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
LittleEndian.putShort(buf, offset, _wWeight);
- offset += LittleEndian.SHORT_SIZE;
+ offset += LittleEndianConsts.SHORT_SIZE;
buf[offset] = _chs;
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
buf[offset] = _ixchSzAlt;
- offset += LittleEndian.BYTE_SIZE;
+ offset += LittleEndianConsts.BYTE_SIZE;
System.arraycopy(_panose,0,buf, offset,_panose.length);
offset += _panose.length;
@@ -179,7 +180,7 @@ public final class Ffn
for(int i = 0; i < _xszFfn.length; i++)
{
LittleEndian.putShort(buf, offset, (short)_xszFfn[i]);
- offset += LittleEndian.SHORT_SIZE;
+ offset += LittleEndianConsts.SHORT_SIZE;
}
return buf;
@@ -190,7 +191,7 @@ public final class Ffn
public boolean equals(Object other) {
if (!(other instanceof Ffn)) return false;
Ffn o = (Ffn)other;
-
+
return (
o._cbFfnM1 == this._cbFfnM1
&& o._info == this._info
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
