Fix for loop in headers and footers
This commit is contained in:
parent
4021dc3b99
commit
a5baa6eda1
1 changed files with 13 additions and 1 deletions
|
@ -110,7 +110,9 @@ public class TextConverter extends ConverterHelper {
|
|||
private boolean inTable = false;
|
||||
private boolean inList = false;
|
||||
private boolean inFootnote = false;
|
||||
|
||||
private boolean inHeader = false;
|
||||
private boolean inFooter = false;
|
||||
|
||||
public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) {
|
||||
super(ofr,config,converter);
|
||||
tocCv = new TOCConverter(ofr, config, converter);
|
||||
|
@ -1666,6 +1668,12 @@ public class TextConverter extends ConverterHelper {
|
|||
//check for first para inside
|
||||
// Check it's master page, pageNumber, Page break before - if we already set MP - throw it away
|
||||
// And make a note to pass this paragraph next time you'll meet it.
|
||||
if (inHeader) {
|
||||
return hnode;
|
||||
}
|
||||
if (inFooter) {
|
||||
return hnode;
|
||||
}
|
||||
if (inTable){
|
||||
return hnode;
|
||||
}
|
||||
|
@ -1847,6 +1855,7 @@ public class TextConverter extends ConverterHelper {
|
|||
|
||||
private Node addHeader(Node node) {
|
||||
|
||||
inHeader = true;
|
||||
MasterPage masterPage = ofr.getFullMasterPage(currentMasterPage);
|
||||
if (currentMasterPage != null) {
|
||||
|
||||
|
@ -1860,11 +1869,13 @@ public class TextConverter extends ConverterHelper {
|
|||
} else {
|
||||
System.out.println("ERROR MP is null");
|
||||
}
|
||||
inHeader = false;
|
||||
return node;
|
||||
}
|
||||
|
||||
private Node addFooter(Node node) {
|
||||
|
||||
inFooter = true;
|
||||
MasterPage masterPage = ofr.getFullMasterPage(currentMasterPage);
|
||||
if (currentMasterPage != null) {
|
||||
|
||||
|
@ -1878,6 +1889,7 @@ public class TextConverter extends ConverterHelper {
|
|||
} else {
|
||||
System.out.println("ERROR MP is null");
|
||||
}
|
||||
inFooter = false;
|
||||
return node;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue