Config ui prototype and some minor fixes

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

source/distro/changelog.txt

@@ -2,6 +2,16 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- version 1.1.1 ----------
 
+[w2x] Use svg:title as alternative text on graphics if svg:desc is not present
+
+[all] Bugfix: Filtername (Writer2LaTeX/Writer2xhtml) was not displayed in error messages
+
+[w2x] New option hexadecimal_entities with values true (default) and false.
+  When this option is set to true, numeric character entities are exported
+  using hexadecimal numbers, otherwise decimal numbers are used
+
+[w2x] Export tabs as ASCII TAB rather than space
+
 [w2l] Allow additional characters in bibliography keys (_, - and :)
 
 [w2l] Bugfix: Fixed crash when using the option external_bibtex_files

source/java/org/openoffice/da/comp/w2lcommon/filter/ByteArrayXStream.java

@@ -26,7 +26,7 @@
  
 package org.openoffice.da.comp.w2lcommon.filter;
 
-// This class is based on these java uno adapter classes:
+// This class is based on these java uno adapter classes: 
 //   com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter;
 //   com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter;
 // See http://go-oo.org/lxr/source/udk/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java

source/java/org/openoffice/da/comp/w2lcommon/filter/EPSCleaner.java

@@ -29,7 +29,7 @@ package org.openoffice.da.comp.w2lcommon.filter;
  *  See the issue http://qa.openoffice.org/issues/show_bug.cgi?id=25256
  *  According to this message http://markmail.org/message/dc6rprmtktxuq35v
  *  on dev@openoffice.org the binary data is an EPSI preview in TIFF format
- *  TODO: Is it possible to avoid this export?
+ *  TODO: Is it possible to avoid this export? 
  */
 public class EPSCleaner {
 

source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  *  
- *  Version 1.2 (2009-04-25)
+ *  Version 1.2 (2009-09-06)
  *  
  */
  
@@ -82,7 +82,7 @@ public abstract class ExportFilterBase implements
     public static final String __implementationName = "";
 	
     /** Filter name to include in error messages */
-	public static final String __displayName = "";
+	public String __displayName = "";
 
     private static XComponentContext xComponentContext = null;
     protected static XMultiServiceFactory xMSF;
@@ -94,7 +94,6 @@ public abstract class ExportFilterBase implements
 	
     private Object filterData;
     private XSimpleFileAccess2 sfa2;
-	
 
     /** We need to get the Service Manager from the Component context to
      *  instantiate certain services, hence this constructor.

source/java/org/openoffice/da/comp/w2lcommon/helper/DialogAccess.java

@@ -0,0 +1,269 @@
+/************************************************************************
+ *
+ *  DialogAccess.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-2009 by Henrik Just
+ *
+ *  All Rights Reserved.
+ * 
+ *  Version 1.2 (2009-09-06)
+ *
+ */ 
+
+package org.openoffice.da.comp.w2lcommon.helper;
+
+import com.sun.star.awt.XControl;
+import com.sun.star.awt.XControlContainer;
+import com.sun.star.awt.XControlModel;
+import com.sun.star.awt.XDialog;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.uno.UnoRuntime;
+
+
+/** This class provides some convenient methods to access a uno dialog
+ */
+public class DialogAccess {
+	
+	/** The XDialog containing the controls. The subclass must override this */
+	private Object xDialog = null;
+	
+    // State of a checkbox
+    
+	public static final short CHECKBOX_NOT_CHECKED = 0;
+    public static final short CHECKBOX_CHECKED = 1;
+    public static final short CHECKBOX_DONT_KNOW = 2;
+    
+    public DialogAccess(XDialog xDialog) {
+    	this.xDialog = xDialog;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Helpers to access controls in the dialog (to be used by the subclass)
+    // Note: The helpers fail silently if an exception occurs. Could query the
+    // the ClassId property for the control type and check that the property
+    // exists to ensure a correct behaviour in all cases, but as long as the
+    // helpers are used correctly, this doesn't really matter.
+	
+    // Get the properties of a named control in the dialog
+    public XPropertySet getControlProperties(String sControlName) {
+        XControlContainer xContainer = (XControlContainer)
+            UnoRuntime.queryInterface(XControlContainer.class, xDialog);
+        XControl xControl = xContainer.getControl(sControlName);
+        XControlModel xModel = xControl.getModel();
+        XPropertySet xPropertySet = (XPropertySet)
+            UnoRuntime.queryInterface(XPropertySet.class, xModel);
+        return xPropertySet;
+    }
+
+    
+    public void setControlEnabled(String sControlName, boolean bEnabled) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("Enabled", new Boolean(bEnabled));
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist
+        }
+    }
+	
+    public short getCheckBoxState(String sControlName) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            return ((Short) xPropertySet.getPropertyValue("State")).shortValue();
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a checkbox
+            return CHECKBOX_DONT_KNOW;
+        }
+    }
+	
+    public boolean getCheckBoxStateAsBoolean(String sControlName) {
+	    return getCheckBoxState(sControlName)==CHECKBOX_CHECKED;
+    }
+	
+    public void setCheckBoxState(String sControlName, short nState) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("State",new Short(nState));
+        }
+        catch (Exception e) {
+            // will fail if the control does not exist or is not a checkbox or
+            // nState has an illegal value
+        }
+    }
+	
+    public void setCheckBoxStateAsBoolean(String sControlName, boolean bChecked) {
+	    setCheckBoxState(sControlName,bChecked ? CHECKBOX_CHECKED : CHECKBOX_NOT_CHECKED);
+    }
+	
+    public String[] getListBoxStringItemList(String sControlName) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            return (String[]) xPropertySet.getPropertyValue("StringItemList");
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a list box
+            return new String[0];
+        }
+    }
+	
+    public void setListBoxStringItemList(String sControlName, String[] items) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("StringItemList",items);
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a list box
+        }
+    }
+	
+    public short getListBoxSelectedItem(String sControlName) {
+        // Returns the first selected element in case of a multiselection
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            short[] selection = (short[]) xPropertySet.getPropertyValue("SelectedItems");
+            return selection[0];
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a list box
+            return -1;
+        }
+    }
+	
+    public void setListBoxSelectedItem(String sControlName, short nIndex) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            short[] selection = new short[1];
+            selection[0] = nIndex;
+            xPropertySet.setPropertyValue("SelectedItems",selection);
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a list box or
+            // nIndex is an illegal value
+        }
+    }
+	
+    public short getListBoxLineCount(String sControlName) {
+        // Returns the first selected element in case of a multiselection
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            return ((Short) xPropertySet.getPropertyValue("LineCount")).shortValue();
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a list box
+            return 0;
+        }
+    }
+	
+    public void setListBoxLineCount(String sControlName, short nLineCount) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("LineCount",new Short(nLineCount));
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a list box or
+            // nLineCount is an illegal value
+        }
+    }
+	
+    public String getComboBoxText(String sControlName) {
+        // Returns the text of a combobox
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            return (String) xPropertySet.getPropertyValue("Text");
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a combo
+            return "";
+        }
+    }
+	
+    public void setComboBoxText(String sControlName, String sText) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("Text", sText);
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a combo box or
+            // nText is an illegal value
+        }
+    }
+	
+    public String getTextFieldText(String sControlName) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            return (String) xPropertySet.getPropertyValue("Text");
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a text field
+            return "";
+        }
+    }
+	
+    public void setTextFieldText(String sControlName, String sText) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("Text",sText);
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a text field
+        }
+    }
+	
+    public String getFormattedFieldText(String sControlName) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            return (String) xPropertySet.getPropertyValue("Text");
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a formatted field
+            return "";
+        }
+    }
+	
+    public void setFormattedFieldText(String sControlName, String sText) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("Text",sText);
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a formatted field
+        }
+    }
+	
+    public int getNumericFieldValue(String sControlName) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            return ((Double) xPropertySet.getPropertyValue("Value")).intValue();
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a numeric field
+            return 0;
+        }
+    }
+	
+    public void setNumericFieldValue(String sControlName, int nValue) {
+        XPropertySet xPropertySet = getControlProperties(sControlName);
+        try {
+            xPropertySet.setPropertyValue("Value",new Double(nValue));
+        }
+        catch (Exception e) {
+            // Will fail if the control does not exist or is not a numeric field
+        }
+    }
+	
+}

source/java/org/openoffice/da/comp/w2lcommon/helper/MessageBox.java

@@ -38,7 +38,7 @@ import com.sun.star.frame.XFrame;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 
-/** This class provides simple access to a uno awt message box
+/** This class provides simple access to a uno awt message box 
  */
 public class MessageBox {
 

source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java

@@ -0,0 +1,396 @@
+/************************************************************************
+ *
+ *  ConfigurationDialog.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-2009 by Henrik Just
+ *
+ *  All Rights Reserved.
+ * 
+ *  Version 1.2 (2009-09-06)
+ *
+ */ 
+ 
+package org.openoffice.da.comp.writer2latex;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.Vector;
+
+import com.sun.star.awt.XControl;
+import com.sun.star.awt.XControlContainer;
+import com.sun.star.awt.XControlModel;
+import com.sun.star.awt.XContainerWindowEventHandler;
+import com.sun.star.awt.XDialog;
+import com.sun.star.awt.XWindow;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.io.NotConnectedException;
+import com.sun.star.io.XInputStream;
+import com.sun.star.io.XOutputStream;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.ucb.CommandAbortedException;
+import com.sun.star.ucb.XSimpleFileAccess2;
+import com.sun.star.ui.dialogs.ExecutableDialogResults;
+import com.sun.star.ui.dialogs.XExecutableDialog;
+import com.sun.star.ui.dialogs.XFilePicker;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.XStringSubstitution;
+
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.lib.uno.adapter.XInputStreamToInputStreamAdapter;
+import com.sun.star.lib.uno.adapter.XOutputStreamToOutputStreamAdapter;
+
+import writer2latex.api.Config;
+import writer2latex.api.ConverterFactory;
+
+import org.openoffice.da.comp.w2lcommon.helper.DialogAccess;
+
+/** This class provides a uno component which implements the configuration
+ *  of Writer2LaTeX. The same component is used for all pages - using the
+ *  dialog title to distinguish between tha pages.
+ */
+public final class ConfigurationDialog extends WeakBase
+    implements XServiceInfo, XContainerWindowEventHandler {
+
+    //private XComponentContext xContext;
+    private XSimpleFileAccess2 sfa2;
+    private String sConfigFileName = null;
+    Config config;
+    private String sTitle = null;
+    private DialogAccess dlg = null;
+    
+    /** The component will be registered under this name.
+     */
+    public static String __serviceName = "org.openoffice.da.writer2latex.ConfigurationDialog";
+
+    /** The component should also have an implementation name.
+     */
+    public static String __implementationName = "org.openoffice.da.comp.writer2latex.ConfigurationDialog";
+
+    /** Create a new ConfigurationDialog */
+    public ConfigurationDialog(XComponentContext xContext) {
+        //this.xContext = xContext;
+
+        // Get the SimpleFileAccess service
+        sfa2 = null;
+        try {
+            Object sfaObject = xContext.getServiceManager().createInstanceWithContext(
+                "com.sun.star.ucb.SimpleFileAccess", xContext);
+            sfa2 = (XSimpleFileAccess2) UnoRuntime.queryInterface(XSimpleFileAccess2.class, sfaObject);
+        }
+        catch (com.sun.star.uno.Exception e) {
+            // failed to get SimpleFileAccess service (should not happen)
+        }
+
+        // Create the config file name
+        XStringSubstitution xPathSub = null;
+        try {
+            Object psObject = xContext.getServiceManager().createInstanceWithContext(
+               "com.sun.star.util.PathSubstitution", xContext);
+            xPathSub = (XStringSubstitution) UnoRuntime.queryInterface(XStringSubstitution.class, psObject);
+            sConfigFileName = xPathSub.substituteVariables("$(user)/writer2latex.xml", false);
+        }
+        catch (com.sun.star.uno.Exception e) {
+            // failed to get PathSubstitution service (should not happen)
+        }
+        
+        // Create the configuration
+        config = ConverterFactory.createConverter("application/x-latex").getConfig();
+    }
+        	
+    // Implement XContainerWindowEventHandler
+    public boolean callHandlerMethod(XWindow xWindow, Object event, String sMethod)
+        throws com.sun.star.lang.WrappedTargetException {
+    	XDialog xDialog = (XDialog)UnoRuntime.queryInterface(XDialog.class, xWindow);
+    	sTitle = xDialog.getTitle();
+   		dlg = new DialogAccess(xDialog);
+
+   		try {
+            if (sMethod.equals("external_event") ){
+                return handleExternalEvent(event);
+            }
+            else if (sMethod.equals("NoPreambleChange")) {
+                enableDocumentclassControls();
+                return true;
+            }
+            else if (sMethod.equals("ExportGeometryChange")) {
+            	enablePagesControls();
+                return true;
+            }
+            else if (sMethod.equals("ExportHeaderAndFooterChange")) {
+            	enablePagesControls();
+                return true;
+            }
+            else if (sMethod.equals("NoTablesChange")) {
+            	enableTablesControls();
+            	return true;
+            }
+            else if (sMethod.equals("UseSupertabularChange")) {
+            	enableTablesControls();
+            	return true;
+            }
+            else if (sMethod.equals("UseLongtableChange")) {
+            	enableTablesControls();
+            	return true;
+            }
+        }
+        catch (com.sun.star.uno.RuntimeException e) {
+            throw e;
+        }
+        catch (com.sun.star.uno.Exception e) {
+            throw new com.sun.star.lang.WrappedTargetException(sMethod, this, e);
+        }
+        return false;
+    }
+	
+    public String[] getSupportedMethodNames() {
+        String[] sNames = { "external_event", "NoPreambleChange", "ExportGeometryChange", "ExportHeaderAndFooterChange", "NoTablesChange", "UseSupertabularChange", "UseLongtableChange" };
+        return sNames;
+    }
+    
+    // Implement the interface XServiceInfo
+    public boolean supportsService(String sServiceName) {
+        return sServiceName.equals(__serviceName);
+    }
+
+    public String getImplementationName() {
+        return __implementationName;
+    }
+    
+    public String[] getSupportedServiceNames() {
+        String[] sSupportedServiceNames = { __serviceName };
+        return sSupportedServiceNames;
+    }
+	
+    // Private stuff    
+    private boolean handleExternalEvent(Object aEventObject)
+    throws com.sun.star.uno.Exception {
+    	try {
+    		String sMethod = AnyConverter.toString(aEventObject);
+    		if (sMethod.equals("ok")) {
+    			loadConfig();
+    			getControls();
+    			saveConfig();
+    			return true;
+    		} else if (sMethod.equals("back") || sMethod.equals("initialize")) {
+    			loadConfig();
+    			setControls();
+    			return true;
+    		}
+    	}
+    	catch (com.sun.star.lang.IllegalArgumentException e) {
+    		throw new com.sun.star.lang.IllegalArgumentException(
+    				"Method external_event requires a string in the event object argument.", this,(short) -1);
+    	}
+    	return false;
+    }
+    
+	// Load the user configuration from file
+    private void loadConfig() {
+        if (sfa2!=null && sConfigFileName!=null) {
+            try {
+                XInputStream xIs = sfa2.openFileRead(sConfigFileName);
+                if (xIs!=null) {
+                    InputStream is = new XInputStreamToInputStreamAdapter(xIs);
+                    config.read(is);
+                    is.close();
+                    xIs.closeInput();
+                }
+            }
+            catch (IOException e) {
+                // ignore
+            }
+            catch (NotConnectedException e) {
+                // ignore
+            }
+            catch (CommandAbortedException e) {
+                // ignore
+            }
+            catch (com.sun.star.uno.Exception e) {
+                // ignore
+            }
+        }
+    }
+    
+	// Save the user configuration
+    private void saveConfig() {
+        if (sfa2!=null && sConfigFileName!=null) {
+            try {
+            	// Remove the file if it exists
+            	if (sfa2.exists(sConfigFileName)) {
+            		sfa2.kill(sConfigFileName);
+            	}
+            	// Then write the new contents
+                XOutputStream xOs = sfa2.openFileWrite(sConfigFileName);
+                if (xOs!=null) {
+                    OutputStream os = new XOutputStreamToOutputStreamAdapter(xOs);
+                    config.write(os);
+                    os.close();
+                    xOs.closeOutput();
+                }
+            }
+            catch (IOException e) {
+                // ignore
+            }
+            catch (NotConnectedException e) {
+                // ignore
+            }
+            catch (CommandAbortedException e) {
+                // ignore
+            }
+            catch (com.sun.star.uno.Exception e) {
+                // ignore
+            }
+        }
+    }
+    
+	// Set controls based on the config
+    private void setControls() {
+    	if ("Documentclass".equals(sTitle)) {
+    		loadDocumentclass();
+    	}
+    	else if ("Pages".equals(sTitle)) {
+    		loadPages();
+    	}
+    	else if ("Tables".equals(sTitle)) {
+    		loadTables();
+    	}
+    }
+    
+	// Change the config based on the controls
+    private void getControls() {
+    	if ("Documentclass".equals(sTitle)) {
+    		saveDocumentclass();
+    	}
+    	else if ("Pages".equals(sTitle)) {
+    		savePages();
+    	}
+    	else if ("Tables".equals(sTitle)) {
+    		saveTables();
+    	}
+    }
+    
+    // The page "Documentclass"
+    // This page handles the options no_preamble, documentclass, global_options and the custom-preamble
+    
+    private void loadDocumentclass() {
+    	dlg.setCheckBoxStateAsBoolean("NoPreamble","true".equals(config.getOption("no_preamble")));
+    	dlg.setTextFieldText("Documentclass",config.getOption("documentclass"));
+    	dlg.setTextFieldText("GlobalOptions",config.getOption("global_options"));
+    	//dlg.setTextFieldText("CustomPreamble",config.getLongOption("custom-preamble"));
+    	enableDocumentclassControls();
+    }
+    
+    private void saveDocumentclass() {
+    	config.setOption("no_preamble", Boolean.toString(dlg.getCheckBoxStateAsBoolean("NoPreamble")));
+    	config.setOption("documentclass", dlg.getTextFieldText("Documentclass"));
+    	config.setOption("global_options", dlg.getTextFieldText("GlobalOptions"));
+    	//config.setLongOption("custom-preamble", dlg.getTextFieldText("CustomPreamble"));
+    }
+
+    private void enableDocumentclassControls() {
+    	boolean bPreamble = !dlg.getCheckBoxStateAsBoolean("NoPreamble");
+    	dlg.setControlEnabled("DocumentclassLabel",bPreamble);
+    	dlg.setControlEnabled("Documentclass",bPreamble);
+    	dlg.setControlEnabled("GlobalOptionsLabel",bPreamble);
+    	dlg.setControlEnabled("GlobalOptions",bPreamble);
+    	dlg.setControlEnabled("CustomPreambleLabel",bPreamble);
+    	dlg.setControlEnabled("CustomPreamble",bPreamble);
+    }
+    
+    // The page "Pages"
+    // This page handles the options page_formatting, use_geometry, use_fancyhdr, use_lastpage and use_endnotes
+    
+    private void loadPages() {
+    	enablePagesControls();
+    }
+    
+    private void savePages() {
+    	
+    }
+    
+    private void enablePagesControls() {
+    	boolean bExportGeometry = dlg.getCheckBoxStateAsBoolean("ExportGeometry");
+    	dlg.setControlEnabled("UseGeometry",bExportGeometry);
+
+    	boolean bExport = dlg.getCheckBoxStateAsBoolean("ExportHeaderAndFooter");
+    	dlg.setControlEnabled("UseFancyhdr",bExport);
+    }
+    
+    // The page "Tables"
+    // This page handles the options table_content, use_tabulary, use_colortbl, use_multirow, use_supertabular, use_longtable,
+    // table_first_head_style, table_head_style, table_foot_style, table_last_foot_style
+	// Limitation: Cannot handle the values "error" and "warning" for table_content
+    
+    private void loadTables() {
+    	dlg.setCheckBoxStateAsBoolean("NoTables", !"accept".equals(config.getOption("table_content")));
+    	dlg.setCheckBoxStateAsBoolean("UseTabulary", "true".equals(config.getOption("use_tabulary")));
+    	//dlg.setCheckBoxStateAsBoolean("UseMultirow", "true".equals(config.getOption("use_multirow")));
+    	dlg.setCheckBoxStateAsBoolean("UseSupertabular","true".equals(config.getOption("use_supertabular")));
+    	dlg.setCheckBoxStateAsBoolean("UseLongtable", "true".equals(config.getOption("use_longtable")));
+    	dlg.setTextFieldText("TableFirstHeadStyle", config.getOption("table_first_head_style"));
+    	dlg.setTextFieldText("TableHeadStyle", config.getOption("table_head_style"));
+    	dlg.setTextFieldText("TableFootStyle", config.getOption("table_foot_style"));
+    	dlg.setTextFieldText("TableLastFootStyle", config.getOption("table_last_foot_style"));
+    	dlg.setTextFieldText("TableSequenceName", config.getOption("table_sequence_name"));
+    	enableTablesControls();
+    }
+    
+    private void saveTables() {
+    	config.setOption("table_content", dlg.getCheckBoxStateAsBoolean("NoTables") ? "ignore" : "accept");
+    	config.setOption("use_tabulary", Boolean.toString(dlg.getCheckBoxStateAsBoolean("UseTabulary")));
+    	//config.setOption("use_multirow", Boolean.toString(dlg.getCheckBoxStateAsBoolean("UseMultirow")));
+    	config.setOption("use_supertabular", Boolean.toString(dlg.getCheckBoxStateAsBoolean("UseSupertabular")));
+    	config.setOption("use_longtable", Boolean.toString(dlg.getCheckBoxStateAsBoolean("UseLongtable")));
+    	config.setOption("table_first_head_style", dlg.getTextFieldText("TableFirstHeadStyle"));
+    	config.setOption("table_head_style", dlg.getTextFieldText("TableHeadStyle"));
+    	config.setOption("table_foot_style", dlg.getTextFieldText("TableFootStyle"));
+    	config.setOption("table_last_foot_style", dlg.getTextFieldText("TableLastFootStyle"));
+    	config.setOption("table_sequence_name", dlg.getTextFieldText("TableSequenceName"));
+    }
+    
+    private void enableTablesControls() {
+    	boolean bNoTables = dlg.getCheckBoxStateAsBoolean("NoTables");
+    	boolean bSupertabular = dlg.getCheckBoxStateAsBoolean("UseSupertabular");
+    	boolean bLongtable = dlg.getCheckBoxStateAsBoolean("UseLongtable");
+    	dlg.setControlEnabled("UseTabulary", !bNoTables);
+    	dlg.setControlEnabled("UseMultirow", false);
+    	dlg.setControlEnabled("UseSupertabular", !bNoTables);
+    	dlg.setControlEnabled("UseLongtable", !bNoTables && !bSupertabular);
+    	dlg.setControlEnabled("TableFirstHeadLabel", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableFirstHeadStyle", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableHeadLabel", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableHeadStyle", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableFootLabel", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableFootStyle", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableLastFootLabel", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableLastFootStyle", !bNoTables && (bSupertabular || bLongtable));
+    	dlg.setControlEnabled("TableSequenceLabel", !bNoTables);
+    	dlg.setControlEnabled("TableSequenceName", !bNoTables);
+    	
+    }
+
+	
+}
+
+
+

source/java/org/openoffice/da/comp/writer2latex/W2LExportFilter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-07-21)
+ *  Version 1.2 (2009-09-06)
  *
  */ 
  
@@ -42,7 +42,7 @@ public class W2LExportFilter extends ExportFilterBase {
     public static final String __implementationName = "org.openoffice.da.comp.writer2latex.W2LExportFilter";
 	
     /** Filter name to include in error messages */
-	public static final String __displayName = "Writer2LaTeX";
+	public final String __displayName = "Writer2LaTeX";
 
     public W2LExportFilter(XComponentContext xComponentContext1) {
         super(xComponentContext1);

source/java/org/openoffice/da/comp/writer2latex/W2LRegistration.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-07-21) 
+ *  Version 1.2 (2009-09-06) 
  *
  */ 
  
@@ -78,6 +78,12 @@ public class W2LRegistration {
             multiFactory,						    
             regKey);
         }
+        else if (implName.equals(ConfigurationDialog.__implementationName)) {
+            xSingleServiceFactory = FactoryHelper.getServiceFactory(ConfigurationDialog.class,
+            ConfigurationDialog.__serviceName,
+            multiFactory,						    
+            regKey);
+        }
         
         return xSingleServiceFactory;
     }
@@ -97,7 +103,9 @@ public class W2LRegistration {
             FactoryHelper.writeRegistryServiceInfo(LaTeXOptionsDialog.__implementationName,
                 LaTeXOptionsDialog.__serviceName, regKey) &
             FactoryHelper.writeRegistryServiceInfo(W2LStarMathConverter.__implementationName,
-                W2LStarMathConverter.__serviceName, regKey);
+                W2LStarMathConverter.__serviceName, regKey) &
+        	FactoryHelper.writeRegistryServiceInfo(ConfigurationDialog.__implementationName,
+                ConfigurationDialog.__serviceName, regKey);
     }
 }
 

source/java/org/openoffice/da/comp/writer2xhtml/W2XExportFilter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-07-21)
+ *  Version 1.2 (2009-09-06)
  *
  */ 
  
@@ -42,7 +42,7 @@ public class W2XExportFilter extends ExportFilterBase {
     public static final String __implementationName = "org.openoffice.da.comp.writer2xhtml.W2XExportFilter";
 	
     /** Filter name to include in error messages */
-	public static final String __displayName = "Writer2xhtml";
+	public final String __displayName = "Writer2xhtml";
 
     public W2XExportFilter(XComponentContext xComponentContext1) {
         super(xComponentContext1);

source/java/writer2latex/api/ConverterFactory.java

@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.1.1";
-    private static final String DATE = "2008-08-31";
+    private static final String DATE = "2008-09-07";
 	
     /** Return version information
      *  @return the Writer2LaTeX version in the form

source/java/writer2latex/api/GraphicConverter.java

@@ -27,7 +27,7 @@
 package writer2latex.api;
 
 /** A simple interface for a graphic converter which converts between various
- *  graphics formats
+ *  graphics formats 
  */
 public interface GraphicConverter {
     

source/java/writer2latex/api/IndexPageEntry.java

@@ -26,7 +26,7 @@
  
 package writer2latex.api;
 
-/** This class represents a single entry on an index page created by a batch converter
+/** This class represents a single entry on an index page created by a batch converter 
  */
 public class IndexPageEntry {
 

source/java/writer2latex/base/Option.java

@@ -26,7 +26,7 @@
 
 package writer2latex.base;
 
-// The mother of all options; reads and writes string values
+// The mother of all options; reads and writes string values 
 public class Option {
     protected String sValue;
     private String sName;

source/java/writer2latex/latex/i18n/ReplacementTrieNode.java

@@ -26,7 +26,7 @@
 
 package writer2latex.latex.i18n;
 
-/** This class contains a node in a trie of string -> LaTeX code replacements 
+/** This class contains a node in a trie of string -> LaTeX code replacements  
 */
 public class ReplacementTrieNode {
 

source/java/writer2latex/latex/i18n/UnicodeCharacter.java

@@ -26,7 +26,7 @@
 
 package writer2latex.latex.i18n;
 
-// Helper class: A struct to hold the LaTeX representations of a unicode character
+// Helper class: A struct to hold the LaTeX representations of a unicode character 
 class UnicodeCharacter implements Cloneable {
     final static int NORMAL = 0;     // this is a normal character
     final static int COMBINING = 1;  // this character should be ignored

source/java/writer2latex/latex/i18n/UnicodeStringParser.java

@@ -29,7 +29,7 @@ package writer2latex.latex.i18n;
 // Helper class: Parse a unicode string.
 // Note: Some 8-bit fonts have additional "spacer" characters that are used
 // for manual placement of accents. These are ignored between the base character
-// and the combining character, thus we are parsing according to the rule
+// and the combining character, thus we are parsing according to the rule 
 // <base char> <spacer char>* <combining char>?
 class UnicodeStringParser {
     private UnicodeTable table; // the table to use

source/java/writer2latex/latex/i18n/UnicodeTable.java

@@ -18,7 +18,7 @@
  *
  *  Copyright: 2002-2007 by Henrik Just
  *
- *  All Rights Reserved.
+ *  All Rights Reserved. 
  * 
  *  Version 0.5 (2007-07-24) 
  * 

source/java/writer2latex/latex/util/BeforeAfter.java

@@ -26,7 +26,7 @@
 
 package writer2latex.latex.util;
 
-/** Utility class to hold LaTeX code to put before/after other LaTeX code
+/** Utility class to hold LaTeX code to put before/after other LaTeX code 
  */
 public class BeforeAfter {
     private String sBefore="";

source/java/writer2latex/latex/util/HeadingMap.java

@@ -27,7 +27,7 @@
 package writer2latex.latex.util;
 
 /** This class contains data for the mapping of OOo headings to LaTeX headings.
-    A LaTeX heading is characterized by a name and a level.
+    A LaTeX heading is characterized by a name and a level. 
     The heading is inserted with \name{...} or \name[...]{...}
     The headings are supposed to be "normal" LaTeX headings,
     ie. the names are also counter names, and the headings

source/java/writer2latex/latex/util/StyleMapItem.java

@@ -26,7 +26,7 @@
  
 package writer2latex.latex.util;
 
-// A struct to hold data about a style map
+// A struct to hold data about a style map 
 class StyleMapItem {
     String sBefore;
     String sAfter;

source/java/writer2latex/office/CellView.java

@@ -29,7 +29,7 @@ package writer2latex.office;
 import org.w3c.dom.Element;
 
 /**
- *  This class represent a cell in a table view</p>
+ *  This class represent a cell in a table view
  */
 public class CellView {
     public Element cell = null;

source/java/writer2latex/office/XMLString.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2009-03-27)
+ *  Version 1.2 (2009-09-07)
  *
  */
 
@@ -440,6 +440,7 @@ public class XMLString {
 
     // svg namespace
 	public static final String SVG_DESC="svg:desc";
+	public static final String SVG_TITLE="svg:title";
 
     public static final String SVG_FONT_FAMILY="svg:font-family"; // oasis (font declarations only)
     public static final String SVG_X="svg:x";

source/java/writer2latex/util/Base64.java

@@ -1,5 +1,5 @@
 /**
- * This is Robert Harders public domain Base64 class. It is unmodified, except for the package name.
+ * This is Robert Harders public domain Base64 class. It is unmodified, except for the package name. 
  *
  * <p>Encodes and decodes to and from Base64 notation.</p>
  * <p>Homepage: <a href="http://iharder.net/base64">http://iharder.net/base64</a>.</p>

source/java/writer2latex/util/CSVList.java

@@ -26,7 +26,7 @@
 
 package writer2latex.util;
 
-// Create a list of values separated by commas or another seperation character
+// Create a list of values separated by commas or another seperation character 
 public class CSVList{
     private String sSep;
     private String sNameValueSep;

source/java/writer2latex/util/Misc.java

@@ -39,7 +39,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.NamedNodeMap;
 
-// This class contains some usefull, but unrelated static methods
+// This class contains some usefull, but unrelated static methods 
 public class Misc{
 
     private final static int BUFFERSIZE = 1024;

source/java/writer2latex/util/SimpleInputBuffer.java

@@ -27,7 +27,7 @@
 package writer2latex.util;
 
 /** This class provides a simple string input buffer; it can be used as the
- *  basis of a tokenizer.
+ *  basis of a tokenizer. 
  */
 public class SimpleInputBuffer {
     

source/java/writer2latex/xhtml/BatchConverterImpl.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-02-08) 
+ *  Version 1.2 (2009-09-05) 
  *
  */
  
@@ -94,6 +94,7 @@ public class BatchConverterImpl extends BatchConverterBase {
         htmlDoc.setNoDoctype(config.xhtmlNoDoctype());
         htmlDoc.setAddBOM(config.xhtmlAddBOM());
         htmlDoc.setUseNamedEntities(config.useNamedEntities());
+        htmlDoc.setHexadecimalEntities(config.hexadecimalEntities());
         if (template!=null) { htmlDoc.readFromTemplate(template); }
         else { htmlDoc.createHeaderFooter(); }
 

source/java/writer2latex/xhtml/Converter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2009-05-29)
+ *  Version 1.2 (2009-09-05)
  *
  */
 
@@ -446,6 +446,7 @@ public class Converter extends ConverterBase {
         htmlDoc.setNoDoctype(config.xhtmlNoDoctype());
         htmlDoc.setAddBOM(config.xhtmlAddBOM());
         htmlDoc.setUseNamedEntities(config.useNamedEntities());
+        htmlDoc.setHexadecimalEntities(config.hexadecimalEntities());
         htmlDoc.setXsltPath(config.getXsltPath());
         if (template!=null) { htmlDoc.readFromTemplate(template); }
         else if (bNeedHeaderFooter) { htmlDoc.createHeaderFooter(); }

source/java/writer2latex/xhtml/DrawConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-03-08)
+ *  Version 1.0 (2009-09-07)
  *
  */
  
@@ -391,6 +391,9 @@ public class DrawConverter extends ConverterHelper {
         // Add alternative text, using either alt.text, name or file name
         Element frame = getFrame(onode);
         Element desc = Misc.getChildByTagName(frame,XMLString.SVG_DESC);
+        if (desc==null) {
+            desc = Misc.getChildByTagName(frame,XMLString.SVG_TITLE);        	
+        }
         String sAltText = desc!=null ? Misc.getPCDATA(desc) : (sName!=null ? sName : sFileName);
         image.setAttribute("alt",sAltText);
 

source/java/writer2latex/xhtml/LinkDescriptor.java

@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 
 /**
  * Helper class (a struct) to contain information about a Link (used to manage
- * links to be resolved later)
+ * links to be resolved later) 
  */
 final class LinkDescriptor {
     Element element; // the a-element

source/java/writer2latex/xhtml/TextConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-03-10)
+ *  Version 1.0 (2009-09-05)
  *
  */
 
@@ -1456,16 +1456,16 @@ public class TextConverter extends ConverterHelper {
     }
 	
     private void handleTabStop(Node onode, Node hnode) {
-        // xhtml does not have tab stops, we export a space, which the
+        // xhtml does not have tab stops, but we export and ASCII TAB character, which the
         // user may choose to format
         if (config.getXhtmlTabstopStyle().length()>0) {
             Element span = converter.createElement("span");
             hnode.appendChild(span);
             span.setAttribute("class",config.getXhtmlTabstopStyle());
-            span.appendChild(converter.createTextNode(" "));
+            span.appendChild(converter.createTextNode("\t"));
         }
         else {
-            hnode.appendChild(converter.createTextNode(" "));
+            hnode.appendChild(converter.createTextNode("\t"));
         }
     }
 	

source/java/writer2latex/xhtml/XhtmlConfig.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-11-14)
+ *  Version 1.2 (2009-09-05)
  *
  */
 
@@ -38,7 +38,7 @@ import writer2latex.util.Misc;
 
 public class XhtmlConfig extends writer2latex.base.ConfigBase {
     // Implement configuration methods
-    protected int getOptionCount() { return 36; }
+    protected int getOptionCount() { return 37; }
     protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; }
 	
     // Override setOption: To be backwards compatible, we must accept options
@@ -65,34 +65,35 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     private static final int ADD_BOM = 5;
     private static final int ENCODING = 6;
     private static final int USE_NAMED_ENTITIES = 7;
-    private static final int CUSTOM_STYLESHEET = 8;
+    private static final int HEXADECIMAL_ENTITIES = 8;
-    private static final int FORMATTING = 9;
+    private static final int CUSTOM_STYLESHEET = 9;
-    private static final int FRAME_FORMATTING = 10;
+    private static final int FORMATTING = 10;
-    private static final int SECTION_FORMATTING = 11;
+    private static final int FRAME_FORMATTING = 11;
-    private static final int TABLE_FORMATTING = 12;
+    private static final int SECTION_FORMATTING = 12;
-    private static final int IGNORE_TABLE_DIMENSIONS = 13;
+    private static final int TABLE_FORMATTING = 13;
-    private static final int USE_DUBLIN_CORE = 14;
+    private static final int IGNORE_TABLE_DIMENSIONS = 14;
-    private static final int NOTES = 15;
+    private static final int USE_DUBLIN_CORE = 15;
-    private static final int CONVERT_TO_PX = 16;
+    private static final int NOTES = 16;
-    private static final int SCALING = 17;
+    private static final int CONVERT_TO_PX = 17;
-    private static final int COLUMN_SCALING = 18;
+    private static final int SCALING = 18;
-    private static final int FLOAT_OBJECTS = 19;
+    private static final int COLUMN_SCALING = 19;
-    private static final int TABSTOP_STYLE = 20;
+    private static final int FLOAT_OBJECTS = 20;
-    private static final int USE_LIST_HACK = 21;
+    private static final int TABSTOP_STYLE = 21;
-    private static final int SPLIT_LEVEL = 22;
+    private static final int USE_LIST_HACK = 22;
-    private static final int REPEAT_LEVELS = 23;
+    private static final int SPLIT_LEVEL = 23;
-    private static final int CALC_SPLIT = 24;
+    private static final int REPEAT_LEVELS = 24;
-    private static final int DISPLAY_HIDDEN_SHEETS = 25;
+    private static final int CALC_SPLIT = 25;
-    private static final int DISPLAY_HIDDEN_ROWS_COLS = 26;
+    private static final int DISPLAY_HIDDEN_SHEETS = 26;
-    private static final int DISPLAY_FILTERED_ROWS_COLS = 27;
+    private static final int DISPLAY_HIDDEN_ROWS_COLS = 27;
-    private static final int APPLY_PRINT_RANGES = 28;
+    private static final int DISPLAY_FILTERED_ROWS_COLS = 28;
-    private static final int USE_TITLE_AS_HEADING = 29;
+    private static final int APPLY_PRINT_RANGES = 29;
-    private static final int USE_SHEET_NAMES_AS_HEADINGS = 30;
+    private static final int USE_TITLE_AS_HEADING = 30;
-    private static final int XSLT_PATH = 31;
+    private static final int USE_SHEET_NAMES_AS_HEADINGS = 31;
-    private static final int SAVE_IMAGES_IN_SUBDIR = 32;
+    private static final int XSLT_PATH = 32;
-    private static final int UPLINK = 33;
+    private static final int SAVE_IMAGES_IN_SUBDIR = 33;
-    private static final int DIRECTORY_ICON = 34;
+    private static final int UPLINK = 34;
-    private static final int DOCUMENT_ICON = 35;
+    private static final int DIRECTORY_ICON = 35;
+    private static final int DOCUMENT_ICON = 36;
 
     protected XhtmlStyleMap xpar = new XhtmlStyleMap();
     protected XhtmlStyleMap xtext = new XhtmlStyleMap();
@@ -111,6 +112,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         options[ADD_BOM] = new BooleanOption("add_bom","false");
         options[ENCODING] = new Option("encoding","UTF-8");
         options[USE_NAMED_ENTITIES] = new BooleanOption("use_named_entities","false");
+        options[HEXADECIMAL_ENTITIES] = new BooleanOption("hexadecimal_entities","true");
         options[CUSTOM_STYLESHEET] = new Option("custom_stylesheet","");
         options[FORMATTING] = new XhtmlFormatOption("formatting","convert_all");
         options[FRAME_FORMATTING] = new XhtmlFormatOption("frame_formatting","convert_all");
@@ -216,6 +218,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public boolean xhtmlAddBOM() { return ((BooleanOption) options[ADD_BOM]).getValue(); }
     public String xhtmlEncoding() { return options[ENCODING].getString(); }
     public boolean useNamedEntities() { return ((BooleanOption) options[USE_NAMED_ENTITIES]).getValue(); }
+    public boolean hexadecimalEntities() { return ((BooleanOption) options[HEXADECIMAL_ENTITIES]).getValue(); }
     public String xhtmlCustomStylesheet() { return options[CUSTOM_STYLESHEET].getString(); }
     public int xhtmlFormatting() { return ((XhtmlFormatOption) options[FORMATTING]).getValue(); }
     public int xhtmlFrameFormatting() { return ((XhtmlFormatOption) options[FRAME_FORMATTING]).getValue(); }

source/java/writer2latex/xhtml/XhtmlDocument.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-05-29)
+ *  Version 1.2 (2009-09-05)
  *
  */
  
@@ -82,6 +82,7 @@ public class XhtmlDocument extends DOMDocument {
     // Configuration
     private String sEncoding = "UTF-8";	
     private boolean bUseNamedEntities = false;
+    private boolean bHexadecimalEntities = true;
     private char cLimit = 65535;
     private boolean bNoDoctype = false;
     private boolean bAddBOM = false;
@@ -292,6 +293,10 @@ public class XhtmlDocument extends DOMDocument {
         bUseNamedEntities = b;
     }
 	
+    public void setHexadecimalEntities(boolean b) {
+        bHexadecimalEntities = b;
+    }
+	
     public void setXsltPath(String s) { sXsltPath = s; }
 
     public String getFileExtension() { return super.getFileExtension(); }
@@ -474,7 +479,12 @@ public class XhtmlDocument extends DOMDocument {
     		}
     	}
         if (c>cLimit) {
-            osw.write("&#x"+Integer.toHexString(c).toUpperCase()+";");
+        	if (bHexadecimalEntities) {
+                osw.write("&#x"+Integer.toHexString(c).toUpperCase()+";");        		
+        	}
+        	else {
+        		osw.write("&#"+Integer.toString(c).toUpperCase()+";");
+        	}
         }
         else {
             osw.write(c);

source/java/writer2latex/xmerge/OfficeConstants.java

@@ -42,7 +42,7 @@ package writer2latex.xmerge;
 
 /**
  *  This interface contains constants for StarOffice XML tags,
- *  attributes (StarCalc cell types, etc.).
+ *  attributes (StarCalc cell types, etc.). 
  *
  *  @author      Herbie Ong, Paul Rank, Martin Maher
  */

source/java/writer2latex/xmerge/OfficeDocumentException.java

@@ -52,7 +52,7 @@ import org.xml.sax.SAXParseException;
 /**
  *  Used by OfficeDocument to encapsulate exceptions.  It will add
  *  more details to the message string if it is of type
- *  <code>SAXParseException</code>.
+ *  <code>SAXParseException</code>. 
  *
  *  @author      Herbie Ong
  */

source/oxt/writer2latex/OptionPages.xcu

@@ -17,52 +17,155 @@
   </node>
   
   <node oor:name="Nodes">
+
+	<!-- We define a single root node -->
     <node oor:name="org.openoffice.da.writer2latex.configuration" 
       oor:op="fuse"> 
       <prop oor:name="Id">
-        <value>org.openoffice.da.writer2latex.configuration</value>
+        <value>org.openoffice.da.writer2latex/configuration</value>
       </prop>
       <prop oor:name="Label">
         <value xml:lang="en-US">Writer2LaTeX</value>
       </prop>
       <prop oor:name="OptionsPage">
-        <value>%origin%/W2LDialogs2/Configuration1.xdl</value>
+        <value>%origin%/W2LDialogs2/ConfigurationRoot.xdl</value>
       </prop>
       <prop oor:name="EventHandlerService">
         <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
       </prop>
+
       <node oor:name="Leaves">
-        <node oor:name="org.openoffice.da.writer2latex.configuration.subpage1" 
+      	<!-- and the root node has several leaves -->
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.documentclass" 
           oor:op="fuse">
           <prop oor:name="Id">
-            <value>org.openoffice.da.writer2latex.configuration.subpage1</value>
+            <value>org.openoffice.da.writer2latex/configuration/documentclass</value>
           </prop>
           <prop oor:name="Label">
-            <value xml:lang="en-US">Subpage</value>
+            <value xml:lang="en-US">Documentclass</value>
           </prop>
           <prop oor:name="OptionsPage">
-            <value>%origin%/W2LDialogs2/Configuration2.xdl</value>
+            <value>%origin%/W2LDialogs2/Documentclass.xdl</value>
           </prop>
           <prop oor:name="EventHandlerService">
              <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
           </prop>
         </node>
-        <node oor:name="org.openoffice.da.writer2latex.configuration.subpage2" 
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.styles" 
           oor:op="fuse">
           <prop oor:name="Id">
-            <value>org.openoffice.da.writer2latex.configuration.subpage2</value>
+            <value>org.openoffice.da.writer2latex.configuration.styles</value>
           </prop>
           <prop oor:name="Label">
-            <value xml:lang="en-US">Subpage</value>
+            <value xml:lang="en-US">Styles</value>
           </prop>
           <prop oor:name="OptionsPage">
-            <value>%origin%/W2LDialogs2/Configuration1.xdl</value>
+            <value>%origin%/W2LDialogs2/Styles.xdl</value>
           </prop>
           <prop oor:name="EventHandlerService">
              <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
           </prop>
         </node>
-      </node>
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.formatting" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2latex.configuration.formatting</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Formatting</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2LDialogs2/Formatting.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.fonts" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2latex.configuration.fonts</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Fonts</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2LDialogs2/Fonts.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.pages" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2latex.configuration.pages</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Pages</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2LDialogs2/Pages.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.tables" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2latex.configuration.tables</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Tables</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2LDialogs2/Tables.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.figures" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2latex.configuration.figures</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Figures</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2LDialogs2/Figures.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2latex.configuration.textandmath" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2latex.configuration.textandmath</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Text and math</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2LDialogs2/TextAndMath.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value>org.openoffice.da.writer2latex.ConfigurationDialog</value>
+          </prop>
+        </node>
+
+	  </node>
     </node>
   </node>
   

source/oxt/writer2latex/W2LDialogs2/Configuration1.xdl

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Configuration1" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Writer2LaTeX Custom Configuration" dlg:withtitlebar="false">
- <dlg:styles>
-  <dlg:style dlg:style-id="0" dlg:border="none"/>
-  <dlg:style dlg:style-id="1" dlg:font-height="14"/>
- </dlg:styles>
- <dlg:bulletinboard>
-  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="32" dlg:width="248" dlg:height="2"/>
-  <dlg:img dlg:style-id="0" dlg:id="ImageControl1" dlg:tab-index="1" dlg:left="8" dlg:top="6" dlg:width="21" dlg:height="21" dlg:scale-image="false" dlg:src="../images/w2licon.png"/>
-  <dlg:text dlg:style-id="1" dlg:id="Label1" dlg:tab-index="2" dlg:left="36" dlg:top="10" dlg:width="193" dlg:height="16" dlg:value="Writer2LaTeX Custom Configuration"/>
-  <dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="37" dlg:top="43" dlg:width="194" dlg:height="113" dlg:value="This is where you create a custom configuration for the Writer2LaTeX export filter. You can define how to convert text, tables, figures etc. to LaTeX code" dlg:multiline="true"/>
- </dlg:bulletinboard>
-</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Configuration2.xdl

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Configuration2" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="101" dlg:closeable="true" dlg:moveable="true" dlg:title="Writer2LaTeX Custom Configuration" dlg:withtitlebar="false">
- <dlg:bulletinboard>
-  <dlg:text dlg:id="Page2" dlg:tab-index="0" dlg:left="6" dlg:top="4" dlg:width="210" dlg:height="12" dlg:value="Custom Config - page 2"/>
-  
- </dlg:bulletinboard>
-</dlg:window>

source/oxt/writer2latex/W2LDialogs2/ConfigurationRoot.xdl

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Configuration1" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="ConfigurationRoot" dlg:withtitlebar="false">
+ <dlg:styles>
+  <dlg:style dlg:style-id="0" dlg:border="none"/>
+  <dlg:style dlg:style-id="1" dlg:font-height="14"/>
+ </dlg:styles>
+ <dlg:bulletinboard>
+  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="32" dlg:width="248" dlg:height="2"/>
+  <dlg:img dlg:style-id="0" dlg:id="ImageControl1" dlg:tab-index="1" dlg:left="8" dlg:top="6" dlg:width="21" dlg:height="21" dlg:scale-image="false" dlg:src="file:///home/henrik/workspace/Writer2LaTeX%20trunk/source/oxt/writer2latex/images/w2licon.png"/>
+  <dlg:text dlg:style-id="1" dlg:id="Label1" dlg:tab-index="2" dlg:left="34" dlg:top="10" dlg:width="193" dlg:height="16" dlg:value="Writer2LaTeX Custom Configuration"/>
+  <dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="34" dlg:top="43" dlg:width="194" dlg:height="78" dlg:value="This is where you create a custom configuration for the Writer2LaTeX export filter. You can define how to convert text, tables, figures etc. to LaTeX code. Creating a custom configuration requires some knowledge of LaTeX.&#x0a;You can export your configuration as an extension, that can be deployed to another OpenOffice.org installation." dlg:multiline="true"/>
+  <dlg:button dlg:id="ExportButton" dlg:tab-index="4" dlg:left="34" dlg:top="140" dlg:width="190" dlg:height="12" dlg:value="Export as extension..."/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Documentclass.xdl

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Documentclass" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Documentclass" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:checkbox dlg:id="NoPreamble" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="240" dlg:height="12" dlg:value="Do not include preamble" dlg:checked="false">
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:NoPreambleChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:text dlg:id="DocumentclassLabel" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="100" dlg:height="12" dlg:value="Documentclass"/>
+  <dlg:textfield dlg:id="Documentclass" dlg:tab-index="2" dlg:left="120" dlg:top="20" dlg:width="130" dlg:height="12"/>
+  <dlg:text dlg:id="GlobalOptionsLabel" dlg:tab-index="3" dlg:left="10" dlg:top="36" dlg:width="100" dlg:height="12" dlg:value="Global options"/>
+  <dlg:textfield dlg:id="GlobalOptions" dlg:tab-index="4" dlg:left="120" dlg:top="34" dlg:width="130" dlg:height="12"/>
+  <dlg:text dlg:id="CustomPreambleLabel" dlg:tab-index="5" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:value="Custom preamble"/>
+  <dlg:textfield dlg:id="CustomPreamble" dlg:tab-index="6" dlg:left="20" dlg:top="64" dlg:width="230" dlg:height="110" dlg:hscroll="true" dlg:vscroll="true" dlg:multiline="true"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Figures.xdl

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Figures" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Figures" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="GeneralLabel" dlg:tab-index="0" dlg:left="5" dlg:top="8" dlg:width="245" dlg:height="12" dlg:value="General"/>
+  <dlg:text dlg:id="FigureSequenceLabel" dlg:tab-index="3" dlg:left="10" dlg:top="50" dlg:width="90" dlg:height="12" dlg:value="Figure sequence name"/>
+  <dlg:text dlg:id="GraphicsLabel" dlg:tab-index="5" dlg:left="5" dlg:top="64" dlg:width="245" dlg:height="12" dlg:value="Graphics"/>
+  <dlg:checkbox dlg:id="NoGraphics" dlg:tab-index="6" dlg:left="10" dlg:top="78" dlg:width="240" dlg:height="12" dlg:value="Do not export graphics" dlg:checked="false"/>
+  <dlg:textfield dlg:id="GraphicOptions" dlg:tab-index="9" dlg:left="120" dlg:top="104" dlg:width="130" dlg:height="12"/>
+  <dlg:text dlg:id="GraphicOptionsLabel" dlg:tab-index="8" dlg:left="10" dlg:top="106" dlg:width="90" dlg:height="12" dlg:value="Graphic options"/>
+  <dlg:checkbox dlg:id="UseCaption" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Use caption.sty to format captions (also for tables)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="AlignFrames" dlg:tab-index="2" dlg:left="10" dlg:top="36" dlg:width="240" dlg:height="12" dlg:value="Center figures" dlg:checked="false"/>
+  <dlg:textfield dlg:id="FigureSeqenceName" dlg:tab-index="4" dlg:left="120" dlg:top="48" dlg:width="130" dlg:height="12"/>
+  <dlg:checkbox dlg:id="OmitFileExtension" dlg:tab-index="7" dlg:left="10" dlg:top="92" dlg:width="240" dlg:height="12" dlg:value="Omit file extension" dlg:checked="false"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Fonts.xdl

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Fonts" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Fonts" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="XeTeXLabel" dlg:tab-index="0" dlg:left="5" dlg:top="8" dlg:width="245" dlg:height="12" dlg:value="XeTeX"/>
+  <dlg:text dlg:id="OtherLabel" dlg:tab-index="2" dlg:left="5" dlg:top="36" dlg:width="245" dlg:height="12" dlg:value="Other TeX variants"/>
+  <dlg:checkbox dlg:id="UseFontspec" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Use original fonts (fontspec.sty)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UsePifont" dlg:tab-index="3" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:value="Use pifont.sty (dingbats)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseTipa" dlg:tab-index="4" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:value="Use tipa.sty and tipax.sty (phonetic symbols)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseEurosym" dlg:tab-index="5" dlg:left="10" dlg:top="78" dlg:width="240" dlg:height="12" dlg:value="Use eurosym.sty (euro currency symbol)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseWasysym" dlg:tab-index="6" dlg:left="10" dlg:top="92" dlg:width="240" dlg:height="12" dlg:value="Use wasysym.sty (various symbols)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseIfsym" dlg:tab-index="7" dlg:left="10" dlg:top="106" dlg:width="240" dlg:height="12" dlg:value="Use ifsym.sty (geometric shapes)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseBbding" dlg:tab-index="8" dlg:left="10" dlg:top="120" dlg:width="240" dlg:height="12" dlg:value="Use bbding.sty (metafont dingbats)" dlg:checked="false"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Formatting.xdl

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Formatting" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Formatting" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="FormattingLabel" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="100" dlg:height="12" dlg:value="Formatting export"/>
+  <dlg:menulist dlg:id="Formatting" dlg:tab-index="1" dlg:left="120" dlg:top="6" dlg:width="130" dlg:height="12" dlg:spin="true">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Ignore all"/>
+    <dlg:menuitem dlg:value="Ignore most"/>
+    <dlg:menuitem dlg:value="Convert basic"/>
+    <dlg:menuitem dlg:value="Convert most"/>
+    <dlg:menuitem dlg:value="Convert all"/>
+   </dlg:menupopup>
+  </dlg:menulist>
+  <dlg:checkbox dlg:id="UseColor" dlg:tab-index="2" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Use color.sty (color support)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseUlem" dlg:tab-index="5" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:value="Use ulem.sty (underline and strike out text)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseHyperref" dlg:tab-index="6" dlg:left="10" dlg:top="78" dlg:width="240" dlg:height="12" dlg:value="Use hyperref.sty (support for hyperlinks)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseTitlesec" dlg:tab-index="7" dlg:left="10" dlg:top="92" dlg:width="240" dlg:height="12" dlg:value="Use titlesec.sty to format headings" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseTitletoc" dlg:tab-index="8" dlg:left="10" dlg:top="106" dlg:width="240" dlg:height="12" dlg:value="Use titletoc.sty to format content tables" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseSoul" dlg:tab-index="4" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:value="Use soul.sty (underline and strike out text)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseColortbl" dlg:tab-index="3" dlg:left="10" dlg:top="36" dlg:width="240" dlg:height="12" dlg:value="Use colortbl.sty (background color in tables)" dlg:checked="false"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Pages.xdl

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Pages" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Pages" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="GeometryLabel" dlg:tab-index="0" dlg:left="5" dlg:top="8" dlg:width="245" dlg:height="12" dlg:value="Page geometry (page size and margins)"/>
+  <dlg:checkbox dlg:id="ExportGeometry" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Export page geometry" dlg:checked="false">
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:ExportGeometryChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:text dlg:id="HeaderAndFooterLabel" dlg:tab-index="3" dlg:left="5" dlg:top="50" dlg:width="245" dlg:height="12" dlg:value="Header and footer"/>
+  <dlg:checkbox dlg:id="ExportHeaderAndFooter" dlg:tab-index="4" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:value="Export header and footer" dlg:checked="false">
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:ExportHeaderAndFooterChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:text dlg:id="PageNumberLabel" dlg:tab-index="6" dlg:left="5" dlg:top="92" dlg:width="245" dlg:height="12" dlg:value="Page numbers"/>
+  <dlg:text dlg:id="EndnoteLabel" dlg:tab-index="8" dlg:left="5" dlg:top="120" dlg:width="245" dlg:height="12" dlg:value="Endnotes"/>
+  <dlg:checkbox dlg:id="UseGeometry" dlg:tab-index="2" dlg:left="20" dlg:top="36" dlg:width="230" dlg:height="12" dlg:value="Use geometry.sty" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseFancyhdr" dlg:tab-index="5" dlg:left="20" dlg:top="78" dlg:width="230" dlg:height="12" dlg:value="Use fancyhdr.sty" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseLastpage" dlg:tab-index="7" dlg:left="10" dlg:top="106" dlg:width="240" dlg:height="12" dlg:value="Use lastpage.sty" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseEndnotes" dlg:tab-index="9" dlg:left="10" dlg:top="134" dlg:width="240" dlg:height="12" dlg:value="Use endnotes.sty" dlg:checked="false"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Styles.xdl

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Styles" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Styles" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="StyleFamilyLabel" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="60" dlg:height="12" dlg:value="Style family"/>
+  <dlg:menulist dlg:id="StyleFamily" dlg:tab-index="1" dlg:left="80" dlg:top="6" dlg:width="170" dlg:height="12" dlg:spin="true" dlg:linecount="6">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Character"/>
+    <dlg:menuitem dlg:value="Paragraph"/>
+    <dlg:menuitem dlg:value="Paragraph block"/>
+    <dlg:menuitem dlg:value="List"/>
+    <dlg:menuitem dlg:value="List item"/>
+    <dlg:menuitem dlg:value="Attribute"/>
+   </dlg:menupopup>
+  </dlg:menulist>
+  <dlg:text dlg:id="StyleNameLabel" dlg:tab-index="3" dlg:left="10" dlg:top="22" dlg:width="60" dlg:height="12" dlg:value="Style name"/>
+  <dlg:button dlg:id="NewStyleButton" dlg:tab-index="4" dlg:left="165" dlg:top="20" dlg:width="40" dlg:height="12" dlg:value="New..."/>
+  <dlg:button dlg:id="DeleteStyleButton" dlg:tab-index="5" dlg:left="210" dlg:top="20" dlg:width="40" dlg:height="12" dlg:value="Delete..."/>
+  <dlg:text dlg:id="BeforeLabel" dlg:tab-index="6" dlg:left="10" dlg:top="36" dlg:width="60" dlg:height="12" dlg:value="LaTeX code before"/>
+  <dlg:textfield dlg:id="Before" dlg:tab-index="7" dlg:left="80" dlg:top="34" dlg:width="170" dlg:height="12"/>
+  <dlg:text dlg:id="AfterLabel" dlg:tab-index="8" dlg:left="10" dlg:top="50" dlg:width="60" dlg:height="12" dlg:value="LaTeX code after"/>
+  <dlg:textfield dlg:id="After" dlg:tab-index="9" dlg:left="80" dlg:top="48" dlg:width="170" dlg:height="12"/>
+  <dlg:text dlg:id="NextStylesLabel" dlg:tab-index="10" dlg:left="10" dlg:top="64" dlg:width="60" dlg:height="12" dlg:value="Next style(s)"/>
+  <dlg:textfield dlg:id="Next" dlg:tab-index="11" dlg:left="80" dlg:top="62" dlg:width="170" dlg:height="12"/>
+  <dlg:checkbox dlg:id="LineBreak" dlg:tab-index="13" dlg:left="10" dlg:top="92" dlg:width="240" dlg:height="12" dlg:value="Line break inside" dlg:checked="false"/>
+  <dlg:text dlg:id="OtherStylesLabel" dlg:tab-index="14" dlg:left="10" dlg:top="112" dlg:width="60" dlg:height="12" dlg:value="Other styles"/>
+  <dlg:menulist dlg:id="OtherStyles" dlg:tab-index="15" dlg:left="80" dlg:top="110" dlg:width="170" dlg:height="12" dlg:spin="true">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Ignore"/>
+    <dlg:menuitem dlg:value="Convert"/>
+   </dlg:menupopup>
+  </dlg:menulist>
+  <dlg:checkbox dlg:id="Verbatim" dlg:tab-index="12" dlg:left="10" dlg:top="78" dlg:width="240" dlg:height="12" dlg:value="Verbatim content" dlg:checked="false"/>
+  <dlg:menulist dlg:id="StyleName" dlg:tab-index="2" dlg:left="80" dlg:top="20" dlg:width="80" dlg:height="12" dlg:spin="true"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/Tables.xdl

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Tables" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Tables" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:checkbox dlg:id="NoTables" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="240" dlg:height="12" dlg:value="Do not export tables" dlg:checked="false">
+     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:NoTablesChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:checkbox dlg:id="UseTabulary" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Use tabulary.sty (automatic column width)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseMultirow" dlg:tab-index="2" dlg:left="10" dlg:top="36" dlg:width="240" dlg:height="12" dlg:value="Use multirow.sty (support for rowspan)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseSupertabular" dlg:tab-index="3" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:value="Use supertabular.sty (multipage tables)" dlg:checked="false">
+     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseSupertabularChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:checkbox dlg:id="UseLongtable" dlg:tab-index="4" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:value="Use longtable.sty (multipage tables)" dlg:checked="false">
+     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseLongtableChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:text dlg:id="TableFirstHeadLabel" dlg:tab-index="5" dlg:left="25" dlg:top="78" dlg:width="90" dlg:height="12" dlg:value="Style for first head"/>
+  <dlg:text dlg:id="TableHeadLabel" dlg:tab-index="6" dlg:left="25" dlg:top="92" dlg:width="90" dlg:height="12" dlg:value="Style for head"/>
+  <dlg:text dlg:id="TableFootLabel" dlg:tab-index="7" dlg:left="25" dlg:top="106" dlg:width="90" dlg:height="12" dlg:value="Style for foot"/>
+  <dlg:text dlg:id="TableLastFootLabel" dlg:tab-index="8" dlg:left="25" dlg:top="120" dlg:width="90" dlg:height="12" dlg:value="Style for last foot"/>
+  <dlg:textfield dlg:id="TableFirstHeadStyle" dlg:tab-index="9" dlg:left="120" dlg:top="76" dlg:width="130" dlg:height="12"/>
+  <dlg:textfield dlg:id="TableHeadStyle" dlg:tab-index="10" dlg:left="120" dlg:top="90" dlg:width="130" dlg:height="12"/>
+  <dlg:textfield dlg:id="TableFootStyle" dlg:tab-index="11" dlg:left="120" dlg:top="104" dlg:width="130" dlg:height="12"/>
+  <dlg:textfield dlg:id="TableLastFootStyle" dlg:tab-index="12" dlg:left="120" dlg:top="118" dlg:width="130" dlg:height="12"/>
+  <dlg:text dlg:id="TableSequenceLabel" dlg:tab-index="13" dlg:left="10" dlg:top="134" dlg:width="90" dlg:height="12" dlg:value="Table sequence name"/>
+  <dlg:textfield dlg:id="TableSequenceName" dlg:tab-index="14" dlg:left="120" dlg:top="134" dlg:width="130" dlg:height="12"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/TextAndMath.xdl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="TextAndMath" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="TextAndMath" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="MathPackageLabel" dlg:tab-index="0" dlg:left="5" dlg:top="8" dlg:width="245" dlg:height="12" dlg:value="Math packages"/>
+  <dlg:checkbox dlg:id="UseOoomath" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Use ooomath.sty (custom package supporting OpenOffice.org equations)" dlg:checked="false"/>
+  <dlg:text dlg:id="MathSymbolsLabel" dlg:tab-index="2" dlg:left="5" dlg:top="36" dlg:width="245" dlg:height="12" dlg:value="Math symbols"/>
+  <dlg:text dlg:id="MathSymbolNameLabel" dlg:tab-index="3" dlg:left="10" dlg:top="50" dlg:width="50" dlg:height="12" dlg:value="Name"/>
+  <dlg:button dlg:id="NewSymbolButton" dlg:tab-index="5" dlg:left="165" dlg:top="48" dlg:width="40" dlg:height="12" dlg:value="New..."/>
+  <dlg:button dlg:id="DeleteSymbolButton" dlg:tab-index="6" dlg:left="210" dlg:top="48" dlg:width="40" dlg:height="12" dlg:value="Delete..."/>
+  <dlg:text dlg:id="MathLaTeXLabel" dlg:tab-index="7" dlg:left="10" dlg:top="64" dlg:width="50" dlg:height="12" dlg:value="LaTeX code"/>
+  <dlg:textfield dlg:id="MathLaTeX" dlg:tab-index="8" dlg:left="70" dlg:top="62" dlg:width="180" dlg:height="12"/>
+  <dlg:text dlg:id="TextReplaceLabel" dlg:tab-index="9" dlg:left="5" dlg:top="78" dlg:width="245" dlg:height="12" dlg:value="Text replace"/>
+  <dlg:text dlg:id="InputLabel" dlg:tab-index="10" dlg:left="10" dlg:top="92" dlg:width="50" dlg:height="12" dlg:value="Input"/>
+  <dlg:menulist dlg:id="MathSymbolName" dlg:tab-index="4" dlg:left="70" dlg:top="48" dlg:width="90" dlg:height="12" dlg:spin="true"/>
+  <dlg:button dlg:id="NewTextButton" dlg:tab-index="12" dlg:left="165" dlg:top="90" dlg:width="40" dlg:height="12" dlg:value="New..."/>
+  <dlg:button dlg:id="DeleteTextButton" dlg:tab-index="13" dlg:left="210" dlg:top="90" dlg:width="40" dlg:height="12" dlg:value="Delete..."/>
+  <dlg:text dlg:id="LaTeXLabel" dlg:tab-index="14" dlg:left="10" dlg:top="106" dlg:width="50" dlg:height="12" dlg:value="LaTeX code"/>
+  <dlg:textfield dlg:id="LaTeX" dlg:tab-index="15" dlg:left="70" dlg:top="104" dlg:width="180" dlg:height="12"/>
+  <dlg:text dlg:id="TabStopLabel" dlg:tab-index="16" dlg:left="5" dlg:top="120" dlg:width="245" dlg:height="12" dlg:value="Tab stops"/>
+  <dlg:text dlg:id="TabStopLaTeXLabel" dlg:tab-index="17" dlg:left="10" dlg:top="134" dlg:width="50" dlg:height="12" dlg:value="LaTeX code"/>
+  <dlg:textfield dlg:id="TabStopLaTeX" dlg:tab-index="18" dlg:left="70" dlg:top="132" dlg:width="180" dlg:height="12"/>
+  <dlg:menulist dlg:id="TextInput" dlg:tab-index="11" dlg:left="70" dlg:top="90" dlg:width="90" dlg:height="12" dlg:spin="true"/>
+ </dlg:bulletinboard>
+</dlg:window>

source/oxt/writer2latex/W2LDialogs2/dialog.xlb

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
 <library:library xmlns:library="http://openoffice.org/2000/library" library:name="W2LDialogs2" library:readonly="false" library:passwordprotected="false">
- <library:element library:name="Configuration1"/>
+ <library:element library:name="ConfigurationRoot"/>
- <library:element library:name="Configuration2"/>
+ <library:element library:name="Documentclass"/>
+ <library:element library:name="Styles"/>
+ <library:element library:name="Formatting"/>
+ <library:element library:name="Fonts"/>
+ <library:element library:name="Pages"/>
+ <library:element library:name="Tables"/>
+ <library:element library:name="Figures"/>
+ <library:element library:name="TextAndMath"/>
 </library:library>