It seems that some PPT files only have linkAtom + linkDetailsA for their ExHyperlink, and miss the linkDetailsB. For those files, do the right thing
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@525127 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b06e1f33cb
commit
99e3b2389d
@ -33,7 +33,6 @@ public class ExHyperlink extends RecordContainer {
|
|||||||
private ExHyperlinkAtom linkAtom;
|
private ExHyperlinkAtom linkAtom;
|
||||||
private CString linkDetailsA;
|
private CString linkDetailsA;
|
||||||
private CString linkDetailsB;
|
private CString linkDetailsB;
|
||||||
private Comment2000Atom commentAtom;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the ExHyperlinkAtom of this link
|
* Returns the ExHyperlinkAtom of this link
|
||||||
@ -55,8 +54,12 @@ public class ExHyperlink extends RecordContainer {
|
|||||||
*/
|
*/
|
||||||
public void setLinkURL(String url) {
|
public void setLinkURL(String url) {
|
||||||
linkDetailsA.setText(url);
|
linkDetailsA.setText(url);
|
||||||
|
|
||||||
|
// linkDetailsB isn't present in all PPT versions
|
||||||
|
if(linkDetailsB != null) {
|
||||||
linkDetailsB.setText(url);
|
linkDetailsB.setText(url);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the link details (field A)
|
* Get the link details (field A)
|
||||||
@ -90,6 +93,11 @@ public class ExHyperlink extends RecordContainer {
|
|||||||
* methods.
|
* methods.
|
||||||
*/
|
*/
|
||||||
private void findInterestingChildren() {
|
private void findInterestingChildren() {
|
||||||
|
// We need to have 2 children, ideally 3, and sometimes have more
|
||||||
|
if(_children.length < 2) {
|
||||||
|
throw new IllegalStateException("We need at least two child records, but we only had " + _children.length);
|
||||||
|
}
|
||||||
|
|
||||||
// First child should be the ExHyperlinkAtom
|
// First child should be the ExHyperlinkAtom
|
||||||
if(_children[0] instanceof ExHyperlinkAtom) {
|
if(_children[0] instanceof ExHyperlinkAtom) {
|
||||||
linkAtom = (ExHyperlinkAtom)_children[0];
|
linkAtom = (ExHyperlinkAtom)_children[0];
|
||||||
@ -103,12 +111,17 @@ public class ExHyperlink extends RecordContainer {
|
|||||||
} else {
|
} else {
|
||||||
throw new IllegalStateException("Second child record wasn't a CString, was of type " + _children[1].getRecordType());
|
throw new IllegalStateException("Second child record wasn't a CString, was of type " + _children[1].getRecordType());
|
||||||
}
|
}
|
||||||
// Third child should be the second link details
|
|
||||||
|
// Third child, if it exists, should be the second link details
|
||||||
|
if(_children.length >= 3) {
|
||||||
if(_children[2] instanceof CString) {
|
if(_children[2] instanceof CString) {
|
||||||
linkDetailsB = (CString)_children[2];
|
linkDetailsB = (CString)_children[2];
|
||||||
} else {
|
} else {
|
||||||
throw new IllegalStateException("Third child record wasn't a CString, was of type " + _children[2].getRecordType());
|
throw new IllegalStateException("Third child record wasn't a CString, was of type " + _children[2].getRecordType());
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// Should be fine to not have one
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user