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

Fix for prev commits

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-30 19:27:57 +01:00
parent 0926dbe218
commit d53e861086
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/writer2latex/xhtml/content/Separator.java
View file

@ -225,8 +225,10 @@ public class Separator {
node = node.getParentNode(); node = node.getParentNode();
} }
Node result = node.getParentNode(); Node result = node.getParentNode();
if (node.getChildNodes().getLength() == 0){ if (node.getChildNodes().getLength() == 1){
result.removeChild(node); if (node.getFirstChild().getChildNodes().getLength() == 0) {
result.removeChild(node);
}
} }
return result; return result;

6
src/main/java/writer2latex/xhtml/content/TextParser.java
View file

@ -1821,10 +1821,8 @@ public class TextParser extends Parser {
private void setPageContainerStyle() { private void setPageContainerStyle() {
MasterPage mp = ofr.getFullMasterPage(currentMasterPage); MasterPage mp = ofr.getFullMasterPage(currentMasterPage);
PageLayout layout = ofr.getPageLayout(mp.getPageLayoutName()); PageLayout layout = ofr.getPageLayout(mp.getPageLayoutName());
if (layout.getColCount() != 1) { String containerStyle = "column-count: " + layout.getColCount() + ";";
String containerStyle = "column-count: " + layout.getColCount() + ";"; pageContainer.setRootStyle(containerStyle);
pageContainer.setRootStyle(containerStyle);
}
} }
private void fitPageNumberToMasterPageStyle() { private void fitPageNumberToMasterPageStyle() {