litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Fix for loop in headers and footers

Browse source
This commit is contained in:
George Litvinov 2019-03-14 17:18:01 +03:00 • committed by Georgy Litvinov
parent 4021dc3b99
commit a5baa6eda1
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/writer2latex/xhtml/TextConverter.java
View file

@ -110,6 +110,8 @@ public class TextConverter extends ConverterHelper {
private boolean inTable = false; private boolean inTable = false;
private boolean inList = false; private boolean inList = false;
private boolean inFootnote = false; private boolean inFootnote = false;
private boolean inHeader = false;
private boolean inFooter = false;
public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) { public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) {
super(ofr,config,converter); super(ofr,config,converter);
@ -1666,6 +1668,12 @@ public class TextConverter extends ConverterHelper {
//check for first para inside //check for first para inside
// Check it's master page, pageNumber, Page break before - if we already set MP - throw it away // 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. // And make a note to pass this paragraph next time you'll meet it.
if (inHeader) {
return hnode;
}
if (inFooter) {
return hnode;
}
if (inTable){ if (inTable){
return hnode; return hnode;
} }
@ -1847,6 +1855,7 @@ public class TextConverter extends ConverterHelper {
private Node addHeader(Node node) { private Node addHeader(Node node) {
inHeader = true;
MasterPage masterPage = ofr.getFullMasterPage(currentMasterPage); MasterPage masterPage = ofr.getFullMasterPage(currentMasterPage);
if (currentMasterPage != null) { if (currentMasterPage != null) {
@ -1860,11 +1869,13 @@ public class TextConverter extends ConverterHelper {
} else { } else {
System.out.println("ERROR MP is null"); System.out.println("ERROR MP is null");
} }
inHeader = false;
return node; return node;
} }
private Node addFooter(Node node) { private Node addFooter(Node node) {
inFooter = true;
MasterPage masterPage = ofr.getFullMasterPage(currentMasterPage); MasterPage masterPage = ofr.getFullMasterPage(currentMasterPage);
if (currentMasterPage != null) { if (currentMasterPage != null) {
@ -1878,6 +1889,7 @@ public class TextConverter extends ConverterHelper {
} else { } else {
System.out.println("ERROR MP is null"); System.out.println("ERROR MP is null");
} }
inFooter = false;
return node; return node;
} }