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

Bugfixing configuration UI

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@139 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2012-03-11 13:05:41 +00:00
parent bf0c99a95c
commit 8140cf28f0
8 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/distro/changelog.txt
View file

@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.9 ---------- ---------- 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, [w2l] Added support for the new StarMath keywords nospace (ignored) and prec, nprec, succ, nsucc, preccurlyeq, succcurlyeq,
precsim, succsim (converted) precsim, succsim (converted)

6
source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2011 by Henrik Just * Copyright: 2002-2012 by Henrik Just
* *
* All Rights Reserved. * 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) { if (sNewName!=null) {
styleMap[nCurrentFamily].put(sNewName, new HashMap<String,String>()); styleMap[nCurrentFamily].put(sNewName, new HashMap<String,String>());
clearControls(dlg); clearControls(dlg);
styleNameChange(dlg);
} }
updateStyleControls(dlg); updateStyleControls(dlg);
} }
@ -698,6 +699,7 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta
String sStyleName = sCurrentStyleName; String sStyleName = sCurrentStyleName;
if (deleteCurrentItem(dlg,"StyleName")) { if (deleteCurrentItem(dlg,"StyleName")) {
styleMap[nCurrentFamily].remove(sStyleName); styleMap[nCurrentFamily].remove(sStyleName);
sCurrentStyleName=null;
styleNameChange(dlg); styleNameChange(dlg);
} }
updateStyleControls(dlg); updateStyleControls(dlg);

8
source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2011 by Henrik Just * Copyright: 2002-2012 by Henrik Just
* *
* All Rights Reserved. * 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); dlg.setListBoxSelectedItem("MaxLevel", nMaxLevel);
maxLevelChange(dlg);
// Get other controls from config // Get other controls from config
checkBoxFromConfig(dlg,"UseTitlesec","use_titlesec"); checkBoxFromConfig(dlg,"UseTitlesec","use_titlesec");
@ -235,6 +237,8 @@ public final class ConfigurationDialog extends ConfigurationDialogBase implement
} }
dlg.setListBoxSelectedItem("WriterLevel", nNewWriterLevel); dlg.setListBoxSelectedItem("WriterLevel", nNewWriterLevel);
} }
writerLevelChange(dlg);
// All controls should be disabled if the maximum level is zero // All controls should be disabled if the maximum level is zero
boolean bUpdate = dlg.getListBoxSelectedItem("MaxLevel")>0; boolean bUpdate = dlg.getListBoxSelectedItem("MaxLevel")>0;

4
source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2011 by Henrik Just * Copyright: 2002-2012 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2011-06-11) * Version 1.2 (2012-03-07)
* *
*/ */

4
source/java/writer2latex/api/ConverterFactory.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2012-03-05) * Version 1.2 (2012-03-11)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.1.9"; 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 /** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)<br/> * (major version).(minor version).(patch level)<br/>

8
source/java/writer2latex/xhtml/ListStyleConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2010 by Henrik Just * Copyright: 2002-2012 by Henrik Just
* *
* All Rights Reserved. * 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 { else {
String sDisplayName = style.getDisplayName(); String sDisplayName = style.getDisplayName();
if (styleMap.contains(sDisplayName)) { 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))) { if (!"(none)".equals(styleMap.getCss(sDisplayName))) {
info.sClass = styleMap.getCss(sDisplayName); info.sClass = styleMap.getCss(sDisplayName);
} }

8
source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2010 by Henrik Just * Copyright: 2002-2012 by Henrik Just
* *
* All Rights Reserved. * 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(); String sDisplayName = style.getDisplayName();
if (styleMap.contains(sDisplayName)) { if (styleMap.contains(sDisplayName)) {
// Apply attributes as specified in style map from user // 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))) { if (!"(none)".equals(styleMap.getCss(sDisplayName))) {
info.sClass = styleMap.getCss(sDisplayName); info.sClass = styleMap.getCss(sDisplayName);
} }

23
source/java/writer2latex/xhtml/TextConverter.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * 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 */ /* apply hard formatting attribute style maps */
private Element applyAttribute(Element node, String sAttr, boolean bApply) { private Element applyAttribute(Element node, String sAttr, boolean bApply) {
if (!bApply) { return node; } if (bApply) {
XhtmlStyleMap xattr = config.getXAttrStyleMap(); XhtmlStyleMap xattr = config.getXAttrStyleMap();
if (!xattr.contains(sAttr)) { return node; } if (xattr.contains(sAttr) && xattr.getElement(sAttr).length()>0) {
Element attr = converter.createElement(xattr.getElement(sAttr)); Element attr = converter.createElement(xattr.getElement(sAttr));
if (!"(none)".equals(xattr.getCss(sAttr))) { if (!"(none)".equals(xattr.getCss(sAttr))) {
attr.setAttribute("class",xattr.getCss(sAttr)); attr.setAttribute("class",xattr.getCss(sAttr));
} }
node.appendChild(attr); node.appendChild(attr);
return attr; return attr;
}
}
return node;
} }
/* Create a styled paragraph node */ /* Create a styled paragraph node */