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

refactored a bit

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-17 15:15:35 +01:00
parent e431c50ccc
commit 06338087e7
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/writer2latex/xhtml/DrawConverter.java
View file

@ -371,6 +371,7 @@ public class DrawConverter extends ConverterHelper {
boolean bNoTextPar = OfficeReader.isNoTextPar(OfficeReader.getParagraph(onode)); boolean bNoTextPar = OfficeReader.isNoTextPar(OfficeReader.getParagraph(onode));
String sHref = Misc.getAttribute(onode, XMLString.XLINK_HREF); String sHref = Misc.getAttribute(onode, XMLString.XLINK_HREF);
HashMap<String, String> settings = null;
String fontSize = null; String fontSize = null;
if (sHref!=null) { // Embedded object in package or linked object if (sHref!=null) { // Embedded object in package or linked object
if (ofr.isInPackage(sHref)) { // Embedded object in package if (ofr.isInPackage(sHref)) { // Embedded object in package
@ -380,8 +381,7 @@ public class DrawConverter extends ConverterHelper {
if (MIMETypes.MATH.equals(object.getType()) || MIMETypes.ODF.equals(object.getType())) { // Formula! if (MIMETypes.MATH.equals(object.getType()) || MIMETypes.ODF.equals(object.getType())) { // Formula!
EmbeddedXMLObject xmlObject = (EmbeddedXMLObject) object; EmbeddedXMLObject xmlObject = (EmbeddedXMLObject) object;
Document objectSettings = xmlObject.getSettingsDOM(); Document objectSettings = xmlObject.getSettingsDOM();
fontSize = getFontSize(objectSettings); settings = parseSettings(objectSettings);
Element replacementImage = null; Element replacementImage = null;
if (ofr.isOpenDocument()) { // look for replacement image if (ofr.isOpenDocument()) { // look for replacement image
replacementImage = Misc.getChildByTagName(getFrame(onode),XMLString.DRAW_IMAGE); replacementImage = Misc.getChildByTagName(getFrame(onode),XMLString.DRAW_IMAGE);
@ -391,15 +391,7 @@ public class DrawConverter extends ConverterHelper {
getMathCv().convert(replacementImage,xmlObject.getContentDOM().getDocumentElement(),hnode,bNoTextPar); getMathCv().convert(replacementImage,xmlObject.getContentDOM().getDocumentElement(),hnode,bNoTextPar);
Node convertedMath = hnode.getLastChild(); Node convertedMath = hnode.getLastChild();
if (fontSize != null) { applySettings(settings, convertedMath);
if (convertedMath != null && convertedMath.getNodeType() == Node.ELEMENT_NODE) {
Element elementWithFont = (Element) convertedMath;
String styleAttr = elementWithFont.getAttribute("style");
if (styleAttr == null) { styleAttr = "";}
String fontValue = getStyleCv().getTextSc().scale(fontSize+"pt");
elementWithFont.setAttribute("style", "font-size:"+ fontValue);
}
}
hnode.appendChild(converter.createTextNode(" ")); hnode.appendChild(converter.createTextNode(" "));
} }
@ -457,18 +449,33 @@ public class DrawConverter extends ConverterHelper {
} }
} }
} }
private void applySettings(HashMap<String, String> settings, Node convertedMath) {
String fontSize;
fontSize = settings.get("BaseFontHeight");
if (fontSize != null) {
if (convertedMath != null && convertedMath.getNodeType() == Node.ELEMENT_NODE) {
Element elementWithFont = (Element) convertedMath;
String styleAttr = elementWithFont.getAttribute("style");
if (styleAttr == null) { styleAttr = "";}
String fontValue = getStyleCv().getTextSc().scale(fontSize+"pt");
elementWithFont.setAttribute("style", "font-size:"+ fontValue);
}
}
}
private String getFontSize(Document objectSettings) { private HashMap<String, String> parseSettings(Document objectSettings) {
HashMap<String, String> settings = new HashMap<String, String>();
if (objectSettings == null) { if (objectSettings == null) {
return null; return settings;
} }
String fontHeight = null; String attrValue = null;
Node docSettings = objectSettings.getLastChild(); Node docSettings = objectSettings.getLastChild();
String nodeName = docSettings.getNodeName(); String nodeName = docSettings.getNodeName();
if (nodeName != null && nodeName.equals("office:document-settings")) { if (nodeName != null && nodeName.equals("office:document-settings")) {
Node officeSettings = docSettings.getFirstChild(); Node officeSettings = docSettings.getFirstChild();
if (officeSettings == null) { if (officeSettings == null) {
return null; return settings;
} }
nodeName = officeSettings.getNodeName(); nodeName = officeSettings.getNodeName();
if (nodeName != null && nodeName.equals("office:settings")) { if (nodeName != null && nodeName.equals("office:settings")) {
@ -488,9 +495,10 @@ public class DrawConverter extends ConverterHelper {
Node itemAttr = itemAttrs.getNamedItem("config:name"); Node itemAttr = itemAttrs.getNamedItem("config:name");
if (itemAttr != null) { if (itemAttr != null) {
String attrName = itemAttr.getTextContent(); String attrName = itemAttr.getTextContent();
if (attrName != null && attrName.equals("BaseFontHeight")) { if (attrName != null) {
fontHeight = configItem.getTextContent(); attrValue = configItem.getTextContent();
return fontHeight; settings.put(attrName, attrValue);
return settings;
} }
} }
} }
@ -501,7 +509,7 @@ public class DrawConverter extends ConverterHelper {
} }
} }
return null; return settings;
} }
private void handleDrawImage(Element onode, Element hnodeBlock, Element hnodeInline, int nMode) { private void handleDrawImage(Element onode, Element hnodeBlock, Element hnodeInline, int nMode) {