diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index db1ce02..ef41289 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.5.1 ---------- +[w2x] Style maps for paragraphs and headings now support the attributes before and after. These define fixed texts + to add before/after the content. (This is similar to the pseudo-elements ::before and ::after in CSS.) + [w4l] Replaced menu with a toolbar with four buttons: Insert BibTeX citation (not yet implemented), publish to LaTeX, view log files and edit custom format. (Publishing without showing the dialog is currently removed.) diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index b15c411..0d59d84 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java index e35a588..3ea8380 100644 --- a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * -* Version 1.4 (2014-09-23) +* Version 1.4 (2014-09-26) * */ @@ -363,6 +363,18 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer if (!attr.containsKey("css")) { attr.put("css", ""); } dlg.setComboBoxText("Element", attr.get("element")); dlg.setTextFieldText("Css", none2empty(attr.get("css"))); + + if (nCurrentFamily==1 || nCurrentFamily==2) { + if (!attr.containsKey("before")) { attr.put("before", ""); } + if (!attr.containsKey("after")) { attr.put("after", ""); } + dlg.setTextFieldText("Before", attr.get("before")); + dlg.setTextFieldText("After", attr.get("after")); + } + else { + dlg.setTextFieldText("Before", ""); + dlg.setTextFieldText("After", ""); + } + if (nCurrentFamily==1 || nCurrentFamily==2) { if (!attr.containsKey("block-element")) { attr.put("block-element", ""); } if (!attr.containsKey("block-css")) { attr.put("block-css", ""); } @@ -378,6 +390,10 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer protected void getControls(DialogAccess dlg, Map attr) { attr.put("element", dlg.getComboBoxText("Element")); attr.put("css", empty2none(dlg.getTextFieldText("Css"))); + if (nCurrentFamily==1 || nCurrentFamily==2) { + attr.put("before", dlg.getTextFieldText("Before")); + attr.put("after", dlg.getTextFieldText("After")); + } if (nCurrentFamily==1 || nCurrentFamily==2) { attr.put("block-element", dlg.getComboBoxText("BlockElement")); attr.put("block-css", empty2none(dlg.getTextFieldText("BlockCss"))); @@ -387,6 +403,8 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer protected void clearControls(DialogAccess dlg) { dlg.setComboBoxText("Element", ""); dlg.setTextFieldText("Css", ""); + dlg.setTextFieldText("Before", ""); + dlg.setTextFieldText("After", ""); dlg.setComboBoxText("BlockElement", ""); dlg.setTextFieldText("BlockCss", ""); } @@ -397,7 +415,11 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer dlg.setControlEnabled("ElementLabel", bHasMappings && nCurrentFamily<=2); dlg.setControlEnabled("Element", bHasMappings && nCurrentFamily<=2); dlg.setControlEnabled("CssLabel", bHasMappings); - dlg.setControlEnabled("Css", bHasMappings); + dlg.setControlEnabled("Css", bHasMappings); + dlg.setControlEnabled("BeforeLabel", bHasMappings && (nCurrentFamily==1 || nCurrentFamily==2)); + dlg.setControlEnabled("Before", bHasMappings && (nCurrentFamily==1 || nCurrentFamily==2)); + dlg.setControlEnabled("AfterLabel", bHasMappings && (nCurrentFamily==1 || nCurrentFamily==2)); + dlg.setControlEnabled("After", bHasMappings && (nCurrentFamily==1 || nCurrentFamily==2)); dlg.setControlEnabled("BlockElementLabel", bHasMappings && (nCurrentFamily==1 || nCurrentFamily==2)); dlg.setControlEnabled("BlockElement", bHasMappings && (nCurrentFamily==1 || nCurrentFamily==2)); dlg.setControlEnabled("BlockCssLabel", bHasMappings && (nCurrentFamily==1 || nCurrentFamily==2)); diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.java b/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.java index 50d30f7..88e21d2 100644 --- a/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.java +++ b/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.java @@ -34,9 +34,6 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import com.sun.star.beans.PropertyValue; -import com.sun.star.frame.XDispatchHelper; -import com.sun.star.frame.XDispatchProvider; import com.sun.star.frame.XFrame; import com.sun.star.lang.XComponent; import com.sun.star.lib.uno.helper.WeakBase; diff --git a/source/java/writer2latex/xhtml/HeadingStyleConverter.java b/source/java/writer2latex/xhtml/HeadingStyleConverter.java index ccfe6c0..39771cd 100644 --- a/source/java/writer2latex/xhtml/HeadingStyleConverter.java +++ b/source/java/writer2latex/xhtml/HeadingStyleConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-16) + * Version 1.6 (2014-10-24) * */package writer2latex.xhtml; @@ -82,9 +82,10 @@ public class HeadingStyleConverter extends StyleConverterHelper { String sDisplayName = style.getDisplayName(); if (styleMap.contains(sDisplayName)) { // Apply attributes as specified in style map from user - info.sTagName = styleMap.getBlockElement(sDisplayName); - if (!"(none)".equals(styleMap.getBlockCss(sDisplayName))) { - info.sClass = styleMap.getBlockCss(sDisplayName); + XhtmlStyleMapItem map = styleMap.get(sDisplayName); + info.sTagName = map.sBlockElement; + if (!"(none)".equals(map.sBlockCss)) { + info.sClass = map.sBlockCss; } } else { @@ -113,9 +114,10 @@ public class HeadingStyleConverter extends StyleConverterHelper { String sDisplayName = style.getDisplayName(); if (styleMap.contains(sDisplayName)) { // Apply attributes as specified in style map from user - info.sTagName = styleMap.getElement(sDisplayName); - if (!"(none)".equals(styleMap.getCss(sDisplayName))) { - info.sClass = styleMap.getCss(sDisplayName); + XhtmlStyleMapItem map = styleMap.get(sDisplayName); + info.sTagName = map.sElement; + if (!"(none)".equals(map.sCss)) { + info.sClass = map.sCss; } } } diff --git a/source/java/writer2latex/xhtml/ListStyleConverter.java b/source/java/writer2latex/xhtml/ListStyleConverter.java index 55c5e99..87a4ba1 100644 --- a/source/java/writer2latex/xhtml/ListStyleConverter.java +++ b/source/java/writer2latex/xhtml/ListStyleConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-16) + * Version 1.6 (2014-10-24) * */ @@ -64,11 +64,12 @@ public class ListStyleConverter extends StyleConverterHelper { else { String sDisplayName = style.getDisplayName(); if (styleMap.contains(sDisplayName)) { - if (styleMap.getElement(sDisplayName).length()>0) { - info.sTagName = styleMap.getElement(sDisplayName); + XhtmlStyleMapItem map = styleMap.get(sDisplayName); + if (map.sElement.length()>0) { + info.sTagName = map.sElement; } - if (!"(none)".equals(styleMap.getCss(sDisplayName))) { - info.sClass = styleMap.getCss(sDisplayName); + if (!"(none)".equals(map.sCss)) { + info.sClass = map.sCss; } } else { diff --git a/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java b/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java index a3f7216..1c75211 100644 --- a/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java +++ b/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-16) + * Version 1.6 (2014-10-24) * */ @@ -73,11 +73,12 @@ public abstract class StyleWithPropertiesConverterHelper String sDisplayName = style.getDisplayName(); if (styleMap.contains(sDisplayName)) { // Apply attributes as specified in style map from user - if (styleMap.getElement(sDisplayName).length()>0) { - info.sTagName = styleMap.getElement(sDisplayName); + XhtmlStyleMapItem map = styleMap.get(sDisplayName); + if (map.sElement.length()>0) { + info.sTagName = map.sElement; } - if (!"(none)".equals(styleMap.getCss(sDisplayName))) { - info.sClass = styleMap.getCss(sDisplayName); + if (!"(none)".equals(map.sCss)) { + info.sClass = map.sCss; } } else { diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java index bcdfaea..cd8270b 100644 --- a/source/java/writer2latex/xhtml/TextConverter.java +++ b/source/java/writer2latex/xhtml/TextConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-23) + * Version 1.6 (2014-10-26) * */ @@ -395,12 +395,13 @@ public class TextConverter extends ConverterHelper { if (sDisplayName!=null && xpar.contains(sDisplayName)) { Node curHnode = hnode; - String sBlockElement = xpar.getBlockElement(sDisplayName); - String sBlockCss = xpar.getBlockCss(sDisplayName); - if (xpar.getBlockElement(sDisplayName).length()>0) { - Element block = converter.createElement(xpar.getBlockElement(sDisplayName)); - if (!"(none)".equals(xpar.getBlockCss(sDisplayName))) { - block.setAttribute("class",xpar.getBlockCss(sDisplayName)); + XhtmlStyleMapItem map = xpar.get(sDisplayName); + String sBlockElement = map.sBlockElement; + String sBlockCss = map.sBlockCss; + if (map.sBlockElement.length()>0) { + Element block = converter.createElement(map.sBlockElement); + if (!"(none)".equals(map.sBlockCss)) { + block.setAttribute("class",map.sBlockCss); } hnode.appendChild(block); curHnode = block; @@ -415,8 +416,9 @@ public class TextConverter extends ConverterHelper { if (cnodeName.equals(XMLString.TEXT_P)) { String sCurDisplayName = ofr.getParStyles().getDisplayName(Misc.getAttribute(child,XMLString.TEXT_STYLE_NAME)); if (sCurDisplayName!=null && xpar.contains(sCurDisplayName)) { - if (sBlockElement.equals(xpar.getBlockElement(sCurDisplayName)) && - sBlockCss.equals(xpar.getBlockCss(sCurDisplayName))) { + XhtmlStyleMapItem newmap = xpar.get(sCurDisplayName); + if (sBlockElement.equals(newmap.sBlockElement) && + sBlockCss.equals(newmap.sBlockCss)) { bMoreParagraphs = true; } } @@ -701,7 +703,7 @@ public class TextConverter extends ConverterHelper { if (!bUnNumbered) { insertListLabel(listStyle,nListLevel,"SectionNumber",null,sLabel,heading); } - + // Add to toc if (!bInToc) { String sTarget = "toc"+(++nTocIndex); @@ -734,7 +736,11 @@ public class TextConverter extends ConverterHelper { applyStyle(innerInfo, content); } traverseInlineText(onode,content); - // Keep track of current headings for split output + + // Add before/after text if required + addBeforeAfter(heading,ofr.getParStyle(getParSc().getRealParStyleName(sStyleName)),config.getXHeadingStyleMap()); + + // Keep track of current headings for split output currentHeading[nLevel] = heading; for (int i=nLevel+1; i<=6; i++) { currentHeading[i] = null; @@ -817,10 +823,14 @@ public class TextConverter extends ConverterHelper { sCurrentListLabel = null; } - // Finally, in EPUB export, if the exported paragraph turns out to be empty, remove it if (converter.isOPS() && !par.hasChildNodes()) { + // Finally, in EPUB export, if the exported paragraph turns out to be empty, remove it hnode.removeChild(par); } + else { + // Otherwise, add before/after text if required + addBeforeAfter(par,ofr.getParStyle(getParSc().getRealParStyleName(sStyleName)),config.getXParStyleMap()); + } } private void prependAsapNode(Node node) { @@ -1979,6 +1989,26 @@ public class TextConverter extends ConverterHelper { // UTILITY METHODS /////////////////////////////////////////////////////////////////////////// + // Insert text before/after in an element + private void addBeforeAfter(Element elm, StyleWithProperties style, XhtmlStyleMap styleMap) { + if (style!=null && styleMap.contains(style.getDisplayName())) { + XhtmlStyleMapItem mapItem = styleMap.get(style.getDisplayName()); + if (mapItem.sBefore!=null && mapItem.sBefore.length()>0) { + Node child = elm.getFirstChild(); + if (child!=null) { + elm.insertBefore(converter.createTextNode(mapItem.sBefore),child); + } + else { + elm.appendChild(converter.createTextNode(mapItem.sBefore)); + } + } + if (mapItem.sAfter!=null && mapItem.sAfter.length()>0) { + elm.appendChild(converter.createTextNode(mapItem.sAfter)); + } + + } + } + // Methods to query individual formatting properties (no inheritance) // Does this style contain the bold attribute? @@ -2079,10 +2109,11 @@ public class TextConverter extends ConverterHelper { private Element applyAttribute(Element node, String sAttr, boolean bApply) { if (bApply) { XhtmlStyleMap xattr = config.getXAttrStyleMap(); - if (xattr.contains(sAttr) && xattr.getElement(sAttr).length()>0) { - Element attr = converter.createElement(xattr.getElement(sAttr)); - if (!"(none)".equals(xattr.getCss(sAttr))) { - attr.setAttribute("class",xattr.getCss(sAttr)); + if (xattr.contains(sAttr) && xattr.get(sAttr).sElement.length()>0) { + XhtmlStyleMapItem map = xattr.get(sAttr); + Element attr = converter.createElement(map.sElement); + if (!"(none)".equals(map.sCss)) { + attr.setAttribute("class",map.sCss); } node.appendChild(attr); return attr; @@ -2157,6 +2188,4 @@ public class TextConverter extends ConverterHelper { Misc.getPosInteger(node.getAttribute(XMLString.TEXT_LEVEL),1); } - - } diff --git a/source/java/writer2latex/xhtml/TextStyleConverter.java b/source/java/writer2latex/xhtml/TextStyleConverter.java index 3c929ca..0513de7 100644 --- a/source/java/writer2latex/xhtml/TextStyleConverter.java +++ b/source/java/writer2latex/xhtml/TextStyleConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-16) + * Version 1.6 (2014-10-24) * */ @@ -107,8 +107,9 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper { // Look for a style map String sDisplayName = ofr.getTextStyles().getDisplayName(sStyleName); if (styleMap.contains(sDisplayName)) { // class name from config - if (!"(none)".equals(styleMap.getCss(sDisplayName))) { - info.sClass = styleMap.getCss(sDisplayName); + XhtmlStyleMapItem map = styleMap.get(sDisplayName); + if (!"(none)".equals(map.sCss)) { + info.sClass = map.sCss; } return; } diff --git a/source/java/writer2latex/xhtml/XhtmlConfig.java b/source/java/writer2latex/xhtml/XhtmlConfig.java index 3ec86d5..4ae6db2 100644 --- a/source/java/writer2latex/xhtml/XhtmlConfig.java +++ b/source/java/writer2latex/xhtml/XhtmlConfig.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-23) + * Version 1.6 (2014-10-24) * */ @@ -295,27 +295,38 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { if (sFamily.length()==0) { // try old name sFamily = elm.getAttribute("class"); } + Map attr = new HashMap(); + String sElement = elm.getAttribute("element"); String sCss = elm.getAttribute("css"); if (sCss.length()==0) { sCss="(none)"; } - Map attr = new HashMap(); attr.put("element", sElement); attr.put("css", sCss); + String sBlockElement = elm.getAttribute("block-element"); String sBlockCss = elm.getAttribute("block-css"); if (sBlockCss.length()==0) { sBlockCss="(none)"; } - + + String sBefore = elm.getAttribute("before"); + String sAfter = elm.getAttribute("after"); + if ("heading".equals(sFamily)) { attr.put("block-element", sBlockElement); attr.put("block-css", sBlockCss); + attr.put("before", sBefore); + attr.put("after", sAfter); xheading.put(sName,attr); } if ("paragraph".equals(sFamily)) { attr.put("block-element", sBlockElement); attr.put("block-css", sBlockCss); + attr.put("before", sBefore); + attr.put("after", sAfter); xpar.put(sName,attr); } else if ("text".equals(sFamily)) { + attr.put("before", sBefore); + attr.put("after", sAfter); xtext.put(sName,attr); } else if ("frame".equals(sFamily)) { @@ -351,6 +362,8 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { smNode.setAttribute("css",attr.get("css")); if (attr.containsKey("block-element")) smNode.setAttribute("block-element",attr.get("block-element")); if (attr.containsKey("block-css")) smNode.setAttribute("block-css",attr.get("block-css")); + if (attr.containsKey("before")) smNode.setAttribute("before",attr.get("before")); + if (attr.containsKey("after")) smNode.setAttribute("after",attr.get("after")); dom.getDocumentElement().appendChild(smNode); } } @@ -428,7 +441,9 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { String sCss = attr.containsKey("css") ? attr.get("css") : ""; String sBlockElement = attr.containsKey("block-element") ? attr.get("block-element") : ""; String sBlockCss = attr.containsKey("block-css") ? attr.get("block-css") : ""; - map.put(sName, sBlockElement, sBlockCss, sElement, sCss); + String sBefore = attr.containsKey("before") ? attr.get("before") : ""; + String sAfter = attr.containsKey("after") ? attr.get("after") : ""; + map.put(sName, new XhtmlStyleMapItem(sBlockElement, sBlockCss, sElement, sCss, sBefore, sAfter)); } return map; diff --git a/source/java/writer2latex/xhtml/XhtmlStyleMap.java b/source/java/writer2latex/xhtml/XhtmlStyleMap.java index 1d3ca80..ddc7bb8 100644 --- a/source/java/writer2latex/xhtml/XhtmlStyleMap.java +++ b/source/java/writer2latex/xhtml/XhtmlStyleMap.java @@ -16,54 +16,37 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2003 by Henrik Just + * Copyright: 2002-2014 by Henrik Just * * All Rights Reserved. * - * Version 0.3.2 (2003-11-25) + * Version 1.6 (2014-10-24) * */ package writer2latex.xhtml; -import java.util.Hashtable; -import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; public class XhtmlStyleMap { - private Hashtable blockElement = new Hashtable(); - private Hashtable blockCss = new Hashtable(); - private Hashtable element = new Hashtable(); - private Hashtable css = new Hashtable(); - - public void put(String sName, String sBlockElement, String sBlockCss, String sElement, String sCss) { - blockElement.put(sName,sBlockElement); - blockCss.put(sName,sBlockCss); - element.put(sName,sElement); - css.put(sName,sCss); + private Map items = new HashMap(); + + public boolean contains(String sName) { + return sName!=null && items.containsKey(sName); } - public boolean contains(String sName) { - return sName!=null && element.containsKey(sName); - } - - public String getBlockElement(String sName) { - return blockElement.get(sName); + public void put(String sName, XhtmlStyleMapItem item) { + items.put(sName, item); } - public String getBlockCss(String sName) { - return blockCss.get(sName); - } - - public String getElement(String sName) { - return element.get(sName); + public XhtmlStyleMapItem get(String sName) { + return items.get(sName); } - public String getCss(String sName) { - return css.get(sName); - } - - public Enumeration getNames() { - return element.keys(); + public Iterator getNames() { + return items.keySet().iterator(); } } diff --git a/source/java/writer2latex/xhtml/XhtmlStyleMapItem.java b/source/java/writer2latex/xhtml/XhtmlStyleMapItem.java new file mode 100644 index 0000000..cb3087c --- /dev/null +++ b/source/java/writer2latex/xhtml/XhtmlStyleMapItem.java @@ -0,0 +1,47 @@ +/************************************************************************ + * + * XhtmlStyleMapItem.java + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * Copyright: 2002-2014 by Henrik Just + * + * All Rights Reserved. + * + * Version 1.6 (2014-10-24) + * + */ +package writer2latex.xhtml; + +/** This is a simple struct to hold data about a single style map + */ +public class XhtmlStyleMapItem { + public String sBlockElement=null; + public String sBlockCss=null; + public String sElement=null; + public String sCss=null; + public String sBefore=null; + public String sAfter=null; + + public XhtmlStyleMapItem(String sBlockElement, String sBlockCss, String sElement, String sCss, String sBefore, String sAfter) { + this.sBlockElement=sBlockElement; + this.sBlockCss=sBlockCss; + this.sElement=sElement; + this.sCss=sCss; + this.sBefore=sBefore; + this.sAfter=sAfter; + } + +} diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl index 5b4cace..1036303 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl @@ -28,11 +28,15 @@ - - - - - + + + + + + + + + diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp index d7b5af8..d056666 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp @@ -44,6 +44,16 @@ CSS class Enter the name of a CSS class. If you leave this field empty, the class attribute will not be set. + + + Before + The text you enter here will be added to the beginning of + each paragraph formatted with this style. + + + After + The text you enter here will be added to the end of + each paragraph formatted with this style. Block XHTML element diff --git a/source/oxt/writer2xhtml/w2x_filters.xcu b/source/oxt/writer2xhtml/w2x_filters.xcu index 886242e..0bbfc19 100644 --- a/source/oxt/writer2xhtml/w2x_filters.xcu +++ b/source/oxt/writer2xhtml/w2x_filters.xcu @@ -12,7 +12,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor - HTML 5 [Writer2xhtml] + HTML5 [Writer2xhtml] EXPORT ALIEN 3RDPARTYFILTER diff --git a/source/oxt/writer2xhtml/w2x_types.xcu b/source/oxt/writer2xhtml/w2x_types.xcu index 112c7a7..33affd7 100644 --- a/source/oxt/writer2xhtml/w2x_types.xcu +++ b/source/oxt/writer2xhtml/w2x_types.xcu @@ -10,7 +10,7 @@ false - HTML 5 + HTML5