moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix some warnings

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808519 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2017-09-16 08:28:50 +00:00
parent 5341a131de
commit 356d4a77cb
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
View File

@ -417,7 +417,7 @@ public class PropertyIDMap implements Map<Long,String> {
/**
* Creates a {@link PropertyIDMap} backed by another map.
*
* @param map The instance to be created is backed by this map.
* @param idValues an array of key/value pairs via nested Object[2] arrays
*/
private PropertyIDMap(Object[][] idValues) {
Map<Long,String> m = new HashMap<>(idValues.length);

10
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
View File

@ -550,10 +550,7 @@ public class XSSFCellStyle implements CellStyle {
*/
@Override
public boolean getHidden() {
if (!_cellXf.isSetProtection() || !_cellXf.getProtection().isSetHidden()) {
return false;
}
return _cellXf.getProtection().getHidden();
return _cellXf.isSetProtection() && _cellXf.getProtection().isSetHidden() && _cellXf.getProtection().getHidden();
}
/**
@ -622,10 +619,7 @@ public class XSSFCellStyle implements CellStyle {
*/
@Override
public boolean getLocked() {
if (!_cellXf.isSetProtection() || !_cellXf.getProtection().isSetLocked()) {
return true;
}
return _cellXf.getProtection().getLocked();
return !_cellXf.isSetProtection() || !_cellXf.getProtection().isSetLocked() || _cellXf.getProtection().getLocked();
}
/**