From a5baa6eda16069052f95b3db5186c9ca13c59434 Mon Sep 17 00:00:00 2001 From: George Litvinov Date: Thu, 14 Mar 2019 17:18:01 +0300 Subject: [PATCH] Fix for loop in headers and footers --- .../java/writer2latex/xhtml/TextConverter.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/writer2latex/xhtml/TextConverter.java b/src/main/java/writer2latex/xhtml/TextConverter.java index 54774b0..cfc1f66 100644 --- a/src/main/java/writer2latex/xhtml/TextConverter.java +++ b/src/main/java/writer2latex/xhtml/TextConverter.java @@ -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; }