diff --git a/build.xml b/build.xml index 02cb1dc..0f8fd06 100644 --- a/build.xml +++ b/build.xml @@ -34,8 +34,8 @@ - - + + diff --git a/source/distro/History.txt b/source/distro/History.txt index 5c11abc..fc0f03b 100644 --- a/source/distro/History.txt +++ b/source/distro/History.txt @@ -1,7 +1,7 @@ Version history for Writer2LaTeX ================================ -Version 1.1.9 beta (March 2012) +Version 1.2 beta (March 2012) - Filters: - Added user interface to edit custom configuration - Added help files diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt index be088cb..0dc5af5 100644 --- a/source/distro/Readme.txt +++ b/source/distro/Readme.txt @@ -1,7 +1,7 @@ -Writer2LaTeX version 1.1.9 (beta test release) -============================================== +Writer2LaTeX version 1.2 (beta test release) +============================================ -This is the distribution of Writer2LaTeX version 1.1.9 +This is the distribution of Writer2LaTeX version 1.2 beta Latest version can be found at the web site http://writer2latex.sourceforge.net diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 0c1993d..c4b8f6e 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -1,6 +1,6 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ----------- version 1.1.9 ---------- +---------- version 1.2 beta ---------- [w2x] Bugfix: Ignore empty element attribute in style maps diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 65bc2c8..7e7913f 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/w2lcommon/filter/ConfigurationDialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java index 614f59e..29b77bd 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * -* Version 1.2 (2012-03-07) +* Version 1.2 (2012-03-11) * */ @@ -443,9 +443,12 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta while ((sLine = reader.readLine())!=null) { buf.append(sLine).append('\n'); } + reader.close(); + is.close(); } catch (IOException e) { } + xIs.closeInput(); return buf.toString(); } } @@ -688,6 +691,7 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta if (sNewName!=null) { styleMap[nCurrentFamily].put(sNewName, new HashMap()); clearControls(dlg); + 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 cea1cd1..cf8d14f 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2012-03-07) + * Version 1.2 (2012-03-12) * */ @@ -496,7 +496,7 @@ public final class ConfigurationDialog extends ConfigurationDialogBase implement // This page handles the options use_color, use_soul, use_ulem and use_hyperref // In addition it handles style maps for formatting attributes private class CharactersHandler extends AttributePageHandler { - private final String[] sLaTeXAttributeNames = { "bold", "italic", "small-caps", "superscript", "subscipt" }; + private final String[] sLaTeXAttributeNames = { "bold", "italic", "small-caps", "superscript", "subscript" }; protected CharactersHandler() { super(); diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 30601d1..a6d57bf 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-11) + * Version 1.2 (2012-03-12) * */ @@ -32,8 +32,8 @@ package writer2latex.api; public class ConverterFactory { // Version information - private static final String VERSION = "1.1.9"; - private static final String DATE = "2012-03-11"; + private static final String VERSION = "1.2"; + private static final String DATE = "2012-03-12"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml index 7b21c77..29f9462 100644 --- a/source/oxt/writer2latex/description.xml +++ b/source/oxt/writer2latex/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index bde317c..2d8c329 100644 --- a/source/oxt/writer2xhtml/description.xml +++ b/source/oxt/writer2xhtml/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml index 933a9db..f0d101f 100644 --- a/source/oxt/writer4latex/description.xml +++ b/source/oxt/writer4latex/description.xml @@ -4,7 +4,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/source/oxt/xhtml-config-sample/description.xml b/source/oxt/xhtml-config-sample/description.xml index af8e19e..5135be5 100644 --- a/source/oxt/xhtml-config-sample/description.xml +++ b/source/oxt/xhtml-config-sample/description.xml @@ -2,5 +2,5 @@ - + diff --git a/source/readme-source.txt b/source/readme-source.txt index c17e6aa..c4f48be 100644 --- a/source/readme-source.txt +++ b/source/readme-source.txt @@ -1,5 +1,5 @@ -Writer2LaTeX source version 1.1.9 -================================= +Writer2LaTeX source version 1.2 beta +==================================== Writer2LaTeX is (c) 2002-2012 by Henrik Just. The source is available under the terms and conditions of the