diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 5243aea..0c1993d 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.9 ---------- +[w2x] Bugfix: Ignore empty element attribute in style maps + +[all] Fixed bugs in some of the filter configuration dialogs + [w2l] Added support for the new StarMath keywords nospace (ignored) and prec, nprec, succ, nsucc, preccurlyeq, succcurlyeq, precsim, succsim (converted) diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java index 1824c77..614f59e 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * -* Copyright: 2002-2011 by Henrik Just +* Copyright: 2002-2012 by Henrik Just * * All Rights Reserved. * -* Version 1.2 (2011-06-06) +* Version 1.2 (2012-03-07) * */ @@ -688,6 +688,7 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta if (sNewName!=null) { styleMap[nCurrentFamily].put(sNewName, new HashMap()); clearControls(dlg); + styleNameChange(dlg); } updateStyleControls(dlg); } @@ -698,6 +699,7 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta String sStyleName = sCurrentStyleName; if (deleteCurrentItem(dlg,"StyleName")) { styleMap[nCurrentFamily].remove(sStyleName); + sCurrentStyleName=null; styleNameChange(dlg); } updateStyleControls(dlg); diff --git a/source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java index 8a39bbc..cea1cd1 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2011 by Henrik Just + * Copyright: 2002-2012 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2011-09-20) + * Version 1.2 (2012-03-07) * */ @@ -164,6 +164,8 @@ public final class ConfigurationDialog extends ConfigurationDialogBase implement } dlg.setListBoxSelectedItem("MaxLevel", nMaxLevel); + maxLevelChange(dlg); + // Get other controls from config checkBoxFromConfig(dlg,"UseTitlesec","use_titlesec"); @@ -235,6 +237,8 @@ public final class ConfigurationDialog extends ConfigurationDialogBase implement } dlg.setListBoxSelectedItem("WriterLevel", nNewWriterLevel); } + + writerLevelChange(dlg); // All controls should be disabled if the maximum level is zero boolean bUpdate = dlg.getListBoxSelectedItem("MaxLevel")>0; diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java index 9e981dc..ce349de 100644 --- a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * -* Copyright: 2002-2011 by Henrik Just +* Copyright: 2002-2012 by Henrik Just * * All Rights Reserved. * -* Version 1.2 (2011-06-11) +* Version 1.2 (2012-03-07) * */ diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index e52d141..30601d1 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2012-03-05) + * Version 1.2 (2012-03-11) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.1.9"; - private static final String DATE = "2012-03-05"; + private static final String DATE = "2012-03-11"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/xhtml/ListStyleConverter.java b/source/java/writer2latex/xhtml/ListStyleConverter.java index 349af61..51e4360 100644 --- a/source/java/writer2latex/xhtml/ListStyleConverter.java +++ b/source/java/writer2latex/xhtml/ListStyleConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2012 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-05-05) + * Version 1.2 (2012-03-07) * */ @@ -64,7 +64,9 @@ public class ListStyleConverter extends StyleConverterHelper { else { String sDisplayName = style.getDisplayName(); if (styleMap.contains(sDisplayName)) { - info.sTagName = styleMap.getElement(sDisplayName); + if (styleMap.getElement(sDisplayName).length()>0) { + info.sTagName = styleMap.getElement(sDisplayName); + } if (!"(none)".equals(styleMap.getCss(sDisplayName))) { info.sClass = styleMap.getCss(sDisplayName); } diff --git a/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java b/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java index 77a833e..31579b7 100644 --- a/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java +++ b/source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2012 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-03-03) + * Version 1.2 (2012-03-07) * */ @@ -73,7 +73,9 @@ public abstract class StyleWithPropertiesConverterHelper String sDisplayName = style.getDisplayName(); if (styleMap.contains(sDisplayName)) { // Apply attributes as specified in style map from user - info.sTagName = styleMap.getElement(sDisplayName); + if (styleMap.getElement(sDisplayName).length()>0) { + info.sTagName = styleMap.getElement(sDisplayName); + } if (!"(none)".equals(styleMap.getCss(sDisplayName))) { info.sClass = styleMap.getCss(sDisplayName); } diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java index 830dfca..591ecf3 100644 --- a/source/java/writer2latex/xhtml/TextConverter.java +++ b/source/java/writer2latex/xhtml/TextConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2012-03-05) + * Version 1.2 (2012-03-07) * */ @@ -2076,15 +2076,18 @@ public class TextConverter extends ConverterHelper { /* apply hard formatting attribute style maps */ private Element applyAttribute(Element node, String sAttr, boolean bApply) { - if (!bApply) { return node; } - XhtmlStyleMap xattr = config.getXAttrStyleMap(); - if (!xattr.contains(sAttr)) { return node; } - Element attr = converter.createElement(xattr.getElement(sAttr)); - if (!"(none)".equals(xattr.getCss(sAttr))) { - attr.setAttribute("class",xattr.getCss(sAttr)); - } - node.appendChild(attr); - return attr; + 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)); + } + node.appendChild(attr); + return attr; + } + } + return node; } /* Create a styled paragraph node */