Bugfixing configuration UI + renaming to 1.2 beta

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@140 f0f2a975-2e09-46c8-9428-3b39399b9f3c

build.xml

@@ -34,8 +34,8 @@
 
     <!-- configure the directories -->
     <property name="jarfile" value="writer2latex"/>
-    <property name="basename" value="writer2latex11"/>
+    <property name="basename" value="writer2latex12"/>
-    <property name="distrofile" value="${basename}9beta.zip" />
+    <property name="distrofile" value="${basename}beta.zip" />
     <!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
     <property name="src" location="source/java"/>
     <property name="source.distro" location="source/distro" />

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

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

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
 

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<String,String>());
 					clearControls(dlg);
+					sCurrentStyleName=null;
 					styleNameChange(dlg);
 				}
 				updateStyleControls(dlg);

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();

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 VERSION = "1.2";
-    private static final String DATE = "2012-03-11";
+    private static final String DATE = "2012-03-12";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>

source/oxt/writer2latex/description.xml

@@ -5,7 +5,7 @@
 
   <identifier value="org.openoffice.da.writer2latex.oxt"/>
 
-  <version value="1.1.9" />
+  <version value="1.2" />
 
   <dependencies>
     <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>

source/oxt/writer2xhtml/description.xml

@@ -5,7 +5,7 @@
 			 
   <identifier value="org.openoffice.da.writer2xhtml.oxt" />
   
-  <version value="1.1.9" />
+  <version value="1.2" />
   
   <dependencies>
     <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>

source/oxt/writer4latex/description.xml

@@ -4,7 +4,7 @@
              xmlns:xlink="http://www.w3.org/1999/xlink">
 
   <identifier value="org.openoffice.da.writer4latex.oxt" />
-  <version value="1.1.9" />
+  <version value="1.2" />
   <dependencies>
     <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>
   </dependencies>

source/oxt/xhtml-config-sample/description.xml

@@ -2,5 +2,5 @@
 <description xmlns="http://openoffice.org/extensions/description/2006"
              xmlns:d="http://openoffice.org/extensions/description/2006">
   <identifier value="org.openoffice.da.writer2latex.xhtml-config-sample.oxt" />
-  <version value="1.1.9" />
+  <version value="1.2" />
 </description> 

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