diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2020-04-12 22:03:52 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2020-04-12 22:03:52 +0000 |
| commit | 4fd05fac12a32de2e6312e93c463277a40b6ff20 (patch) | |
| tree | 8d563874200d02d4af3793d321bd963270c2890d /src/java/org/apache/poi/poifs | |
| parent | f7b4edd27e98abf3529f829157ab81db89fc12f7 (diff) | |
| download | poi-4fd05fac12a32de2e6312e93c463277a40b6ff20.tar.gz poi-4fd05fac12a32de2e6312e93c463277a40b6ff20.zip | |
#63745 - Add traversing and debugging interface to HSSF
This makes toString() implementations obsolete.
This also contains preparation for #64036 to (maybe) change the record factory interface of HSSF.
Remove duplicated record SeriesToChartGroupRecord, which is a duplicate of SeriesChartGroupIndexRecord.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1876433 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/poi/poifs')
| -rw-r--r-- | src/java/org/apache/poi/poifs/crypt/Decryptor.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/poi/poifs/crypt/Encryptor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/java/org/apache/poi/poifs/crypt/Decryptor.java b/src/java/org/apache/poi/poifs/crypt/Decryptor.java index d3743c47d4..34a12b5e0a 100644 --- a/src/java/org/apache/poi/poifs/crypt/Decryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/Decryptor.java @@ -192,7 +192,7 @@ public abstract class Decryptor implements GenericRecord { @Override public Map<String, Supplier<?>> getGenericProperties() { return GenericRecordUtil.getGenericProperties( - "secretKey", secretKey::getEncoded, + "secretKey", secretKey == null ? () -> null : secretKey::getEncoded, "verifier", this::getVerifier, "integrityHmacKey", this::getIntegrityHmacKey, "integrityHmacValue", this::getIntegrityHmacValue diff --git a/src/java/org/apache/poi/poifs/crypt/Encryptor.java b/src/java/org/apache/poi/poifs/crypt/Encryptor.java index 93db9a2792..9c2041d72a 100644 --- a/src/java/org/apache/poi/poifs/crypt/Encryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/Encryptor.java @@ -102,7 +102,7 @@ public abstract class Encryptor implements GenericRecord { @Override public Map<String, Supplier<?>> getGenericProperties() { return GenericRecordUtil.getGenericProperties( - "secretKey", secretKey::getEncoded + "secretKey", secretKey == null ? () -> null : secretKey::getEncoded ); } } |