XContainerWindowEventHandler. The title of the dialogs
+ * are used to differentiate between the individual pages
+ */
+public abstract class ConfigurationDialogBase extends WeakBase implements XContainerWindowEventHandler {
+
+ // The full path to the configuration file we handle
+ private String sConfigFileName = null;
+
+ // The component context
+ protected XComponentContext xContext;
+
+ // UNO simple file access service
+ protected XSimpleFileAccess2 sfa2 = null;
+
+ // Access to display names of the styles in the current document
+ protected StyleNameProvider styleNameProvider = null;
+
+ // The configuration implementation
+ protected Config config;
+
+ // The individual page handlers (the subclass must populate this)
+ protected MapConfigurationDialogBase */
+ public ConfigurationDialogBase(XComponentContext xContext) {
+ this.xContext = xContext;
+
+ // Get the SimpleFileAccess service
+ 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)/"+getConfigFileName(), false);
+ }
+ catch (com.sun.star.uno.Exception e) {
+ // failed to get PathSubstitution service (should not happen)
+ }
+
+ // Create the configuration
+ config = ConverterFactory.createConverter(getMIMEType()).getConfig();
+
+ // Get the style name provider
+ styleNameProvider = new StyleNameProvider(xContext);
+ }
+
+ // 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);
+ String sTitle = xDialog.getTitle();
+
+ if (!pageHandlers.containsKey(sTitle)) {
+ throw new com.sun.star.lang.WrappedTargetException("Unknown dialog "+sTitle);
+ }
+
+ DialogAccess dlg = new DialogAccess(xDialog);
+
+ try {
+ if (sMethod.equals("external_event") ) {
+ return handleExternalEvent(dlg, sTitle, event);
+ }
+ }
+ 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 pageHandlers.get(sTitle).handleEvent(dlg, sMethod);
+ }
+
+ private boolean handleExternalEvent(DialogAccess dlg, String sTitle, Object aEventObject) throws com.sun.star.uno.Exception {
+ try {
+ String sMethod = AnyConverter.toString(aEventObject);
+ if (sMethod.equals("ok")) {
+ loadConfig(); // The file may have been changed by other pages, thus we reload
+ pageHandlers.get(sTitle).getControls(dlg);
+ saveConfig();
+ return true;
+ }
+ else if (sMethod.equals("back") || sMethod.equals("initialize")) {
+ loadConfig();
+ pageHandlers.get(sTitle).setControls(dlg);
+ 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
+ }
+ }
+ }
+
+ // Inner class to handle the individual option pages
+ protected abstract class PageHandler {
+ protected abstract void getControls(DialogAccess dlg);
+
+ protected abstract void setControls(DialogAccess dlg);
+
+ protected abstract boolean handleEvent(DialogAccess dlg, String sMethodName);
+
+ // Methods to handle user controlled lists
+ protected XDialog getDialog(String sDialogName) {
+ XMultiComponentFactory xMCF = xContext.getServiceManager();
+ try {
+ Object provider = xMCF.createInstanceWithContext(
+ "com.sun.star.awt.DialogProvider2", xContext);
+ XDialogProvider2 xDialogProvider = (XDialogProvider2)
+ UnoRuntime.queryInterface(XDialogProvider2.class, provider);
+ String sDialogUrl = "vnd.sun.star.script:"+sDialogName+"?location=application";
+ return xDialogProvider.createDialog(sDialogUrl);
+ }
+ catch (Exception e) {
+ return null;
+ }
+ }
+
+ private boolean deleteItem(String sName) {
+ XDialog xDialog=getDialog(getDialogLibraryName()+".DeleteDialog");
+ if (xDialog!=null) {
+ DialogAccess ddlg = new DialogAccess(xDialog);
+ String sLabel = ddlg.getLabelText("DeleteLabel");
+ sLabel = sLabel.replaceAll("%s", sName);
+ ddlg.setLabelText("DeleteLabel", sLabel);
+ boolean bDelete = xDialog.execute()==ExecutableDialogResults.OK;
+ xDialog.endExecute();
+ return bDelete;
+ }
+ return false;
+ }
+
+ private boolean deleteCurrentItem(DialogAccess dlg, String sListName) {
+ String[] sItems = dlg.getListBoxStringItemList(sListName);
+ short nSelected = dlg.getListBoxSelectedItem(sListName);
+ if (nSelected>=0 && deleteItem(sItems[nSelected])) {
+ int nOldLen = sItems.length;
+ String[] sNewItems = new String[nOldLen-1];
+ if (nSelected>0) {
+ System.arraycopy(sItems, 0, sNewItems, 0, nSelected);
+ }
+ if (nSelectedContentEntry.
+ * The top level is 1 (entries corresponding to indexes are considered
+ * top level).
+ * Note that intermediate levels may be missing (e.g. a heading of
+ * level 3 may follow immediately after a heading of level 1).
+ *
+ * @return the outline level
+ */
+ public int getLevel();
+
+ /** Get the title for this entry
+ *
+ * @return the title
+ */
+ public String getTitle();
+
+ /** Get the file associated with the entry
+ *
+ * @return the output file
+ */
+ public OutputFile getFile();
+
+ /** Get the name of a target within the file, if any
+ *
+ * @return the target name, or null if no target is needed
+ */
+ public String getTarget();
+
+}
diff --git a/source/java/writer2latex/api/ConverterResult.java b/source/java/writer2latex/api/ConverterResult.java
index 69528c5..d9ab539 100644
--- a/source/java/writer2latex/api/ConverterResult.java
+++ b/source/java/writer2latex/api/ConverterResult.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-2010 by Henrik Just
*
* All Rights Reserved.
*
- * Version 1.0 (2008-11-24)
+ * Version 1.2 (2010-03-16)
*
*/
@@ -46,6 +46,11 @@ public interface ConverterResult {
*/
public IteratorConverterResult to a directory.
* Subdirectories are created as required by the individual
* OutputFiles.
diff --git a/source/java/writer2latex/api/MetaData.java b/source/java/writer2latex/api/MetaData.java
new file mode 100644
index 0000000..ddb64be
--- /dev/null
+++ b/source/java/writer2latex/api/MetaData.java
@@ -0,0 +1,45 @@
+/************************************************************************
+ *
+ * MetaData.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-2010 by Henrik Just
+ *
+ * All Rights Reserved.
+ *
+ * Version 1.2 (2010-03-15)
+ *
+ */
+
+package writer2latex.api;
+
+/** This interface provides access to the predefined meta data of the
+ * source document (currently incomplete)
+ */
+public interface MetaData {
+ /** Get the title of the source document
+ *
+ * @return the title (may return an empty string)
+ */
+ public String getTitle();
+
+ /** Get the (main) language of the document
+ *
+ * @return the language
+ */
+ public String getLanguage();
+
+}
diff --git a/source/java/writer2latex/api/OutputFile.java b/source/java/writer2latex/api/OutputFile.java
index 08b1cd7..b008a8c 100644
--- a/source/java/writer2latex/api/OutputFile.java
+++ b/source/java/writer2latex/api/OutputFile.java
@@ -52,17 +52,8 @@ public interface OutputFile {
/** Get the MIME type of the OutputFile.
*
- * @return string reprensentation of the MIME type
+ * @return string representation of the MIME type
*/
public String getMIMEType();
- /** Get the sequence number of this OutputFile.
- * The master document has the sequence number 0.
- * Other files which are part of the main document flow has a unique, positive sequence number.
- * Auxiliary files like images always has the sequence number -1.
- *
- * @return the sequence number
- */
- public int getSequenceNumber();
-
}
diff --git a/source/java/writer2latex/base/ConverterBase.java b/source/java/writer2latex/base/ConverterBase.java
index 073d5d3..3d0ff68 100644
--- a/source/java/writer2latex/base/ConverterBase.java
+++ b/source/java/writer2latex/base/ConverterBase.java
@@ -40,7 +40,6 @@ import writer2latex.office.ImageLoader;
import writer2latex.office.MetaData;
import writer2latex.office.OfficeReader;
import writer2latex.xmerge.EmbeddedObject;
-import writer2latex.xmerge.ConvertData;
import writer2latex.xmerge.OfficeDocument;
/**Abstract base implementation of writer2latex.api.Converter
Vector of OutputFile objects.
*
* @author Martin Maher
+ * TODO: Rewrite to support extended API
*/
-public class ConvertData implements ConverterResult {
-
+public class ConverterResultImpl implements ConverterResult {
+
/**
* Vector of OutputFile objects.
*/
@@ -74,6 +60,8 @@ public class ConvertData implements ConverterResult {
*/
private String name;
+ private MetaData metaData = null;
+
/**
* Resets ConvertData. This empties all OutputFile
@@ -141,6 +129,14 @@ public class ConvertData implements ConverterResult {
return v.iterator();
}
+ public MetaData getMetaData() {
+ return metaData;
+ }
+
+ public void setMetaData(MetaData metaData) {
+ this.metaData = metaData;
+ }
+
/**
* Gets the number of OutputFile objects currently stored
diff --git a/source/java/writer2latex/bibtex/BibTeXDocument.java b/source/java/writer2latex/bibtex/BibTeXDocument.java
index 5e9270d..b3acecc 100644
--- a/source/java/writer2latex/bibtex/BibTeXDocument.java
+++ b/source/java/writer2latex/bibtex/BibTeXDocument.java
@@ -106,10 +106,6 @@ public class BibTeXDocument implements Document {
return MIMETypes.BIBTEX;
}
- public int getSequenceNumber() {
- return -1;
- }
-
/**
* Writes out the Document content to the specified
* OutputStream.
This package contains EPUB specific code.
+It contains a writerlatex.api.Converter implementation for
+conversion into EPUB.
Constructs a new LaTeX Document.
* @@ -59,12 +57,10 @@ public class LaTeXDocument implements Document { * * @param sName The name of theLaTeXDocument.
* @param nWrap Lines should be wrapped after this position
- * @param nSequenceNumber this file has this sequence number in the result
*/
- public LaTeXDocument(String sName,int nWrap, int nSequenceNumber) {
+ public LaTeXDocument(String sName,int nWrap) {
this.nWrap = nWrap;
this.sName = trimDocumentName(sName);
- this.nSequenceNumber = nSequenceNumber;
contents = new LaTeXDocumentPortion(true);
}
@@ -104,10 +100,6 @@ public class LaTeXDocument implements Document {
return MIMETypes.LATEX;
}
- public int getSequenceNumber() {
- return nSequenceNumber;
- }
-
/**
* Writes out the Document content to the specified
* OutputStream.
Constructs a new SectionStyleConverter.
This class represents the metadata of an OOo Writer document.
*/ -public class MetaData { +public class MetaData implements writer2latex.api.MetaData { // Dublin Core private String sTitle = ""; private String sCreator = ""; diff --git a/source/java/writer2latex/xhtml/BatchConverterImpl.java b/source/java/writer2latex/xhtml/BatchConverterImpl.java index be713a4..a1424a9 100644 --- a/source/java/writer2latex/xhtml/BatchConverterImpl.java +++ b/source/java/writer2latex/xhtml/BatchConverterImpl.java @@ -69,7 +69,7 @@ public class BatchConverterImpl extends BatchConverterBase { } public void readTemplate(InputStream is) throws IOException { - template = new XhtmlDocument("Template",XhtmlDocument.XHTML10,-1); + template = new XhtmlDocument("Template",XhtmlDocument.XHTML10); try { template.read(is); } @@ -89,7 +89,7 @@ public class BatchConverterImpl extends BatchConverterBase { public OutputFile createIndexFile(String sHeading, IndexPageEntry[] entries) { // Create the index page (with header/footer or from template) - XhtmlDocument htmlDoc = new XhtmlDocument("index",XhtmlDocument.XHTML10,0); + XhtmlDocument htmlDoc = new XhtmlDocument("index",XhtmlDocument.XHTML10); htmlDoc.setConfig(config); if (template!=null) { htmlDoc.readFromTemplate(template); } else { htmlDoc.createHeaderFooter(); } diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java index ee7cc71..59bbaff 100644 --- a/source/java/writer2latex/xhtml/Converter.java +++ b/source/java/writer2latex/xhtml/Converter.java @@ -102,7 +102,7 @@ public class Converter extends ConverterBase { // override public void readTemplate(InputStream is) throws IOException { - template = new XhtmlDocument("Template",nType,-1); + template = new XhtmlDocument("Template",nType); template.read(is); } @@ -441,7 +441,7 @@ public class Converter extends ConverterBase { // Prepare next output file public Element nextOutFile() { if (nOutFileIndex>=0) { textCv.insertFootnotes(htmlDoc.getContentNode()); } - htmlDoc = new XhtmlDocument(getOutFileName(++nOutFileIndex,false),nType,nOutFileIndex); + htmlDoc = new XhtmlDocument(getOutFileName(++nOutFileIndex,false),nType); htmlDoc.setConfig(config); if (template!=null) { htmlDoc.readFromTemplate(template); } else if (bNeedHeaderFooter) { htmlDoc.createHeaderFooter(); } diff --git a/source/java/writer2latex/xhtml/XhtmlDocument.java b/source/java/writer2latex/xhtml/XhtmlDocument.java index 5dcbc69..538487f 100644 --- a/source/java/writer2latex/xhtml/XhtmlDocument.java +++ b/source/java/writer2latex/xhtml/XhtmlDocument.java @@ -79,9 +79,6 @@ public class XhtmlDocument extends DOMDocument { // Type of document private int nType; - // Sequence number - private int nSequenceNumber; - // Configuration private String sEncoding = "UTF-8"; private boolean bUseNamedEntities = false; @@ -115,12 +112,10 @@ public class XhtmlDocument extends DOMDocument { * writer2latex.xmerge.DOMDocument. * @param nameDocument name.
* @param nType the type of document
- * @param nSequenceNumber the sequence number of this file in the export
*/
- public XhtmlDocument(String name, int nType, int nSequenceNumber) {
+ public XhtmlDocument(String name, int nType) {
super(name,sExtension[nType]);
this.nType = nType;
- this.nSequenceNumber = nSequenceNumber;
// Define publicId and systemId
String sPublicId = null;
String sSystemId = null;
@@ -178,10 +173,6 @@ public class XhtmlDocument extends DOMDocument {
return "";
}
- @Override public int getSequenceNumber() {
- return nSequenceNumber;
- }
-
public Element getHeadNode() { return headNode; }
public Element getBodyNode() { return bodyNode; }
diff --git a/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java b/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java
index f4c7756..b30bf1d 100644
--- a/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java
+++ b/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java
@@ -166,10 +166,5 @@ public class BinaryGraphicsDocument implements Document {
public String getMIMEType() {
return sMimeType;
}
-
-
- public int getSequenceNumber() {
- return -1;
- }
}
\ No newline at end of file
diff --git a/source/java/writer2latex/xmerge/DOMDocument.java b/source/java/writer2latex/xmerge/DOMDocument.java
index 060914e..e235e23 100644
--- a/source/java/writer2latex/xmerge/DOMDocument.java
+++ b/source/java/writer2latex/xmerge/DOMDocument.java
@@ -393,15 +393,11 @@ public class DOMDocument
return doc;
}
- // TODO: We need these because we implement OutputFile (don't do that..)
+ // We need this because we implement OutputFile
public String getMIMEType() {
return "";
}
- public int getSequenceNumber() {
- return -1;
- }
-
}
diff --git a/source/java/writer2latex/xmerge/OfficeDocument.java b/source/java/writer2latex/xmerge/OfficeDocument.java
index 09ce812..179249f 100644
--- a/source/java/writer2latex/xmerge/OfficeDocument.java
+++ b/source/java/writer2latex/xmerge/OfficeDocument.java
@@ -101,7 +101,7 @@ public class OfficeDocument
/** DOM Document of content.xml. */
private Document styleDoc = null;
- /** DOM Docuemtn of META-INF/manifest.xml. */
+ /** DOM Document of META-INF/manifest.xml. */
private Document manifestDoc = null;
private String documentName = null;
@@ -1288,9 +1288,5 @@ public class OfficeDocument
return "";
}
-
- public int getSequenceNumber() {
- return -1;
- }
}
diff --git a/source/oxt/writer2xhtml/OptionPages.xcu b/source/oxt/writer2xhtml/OptionPages.xcu
index ad45cac..a36ec1a 100644
--- a/source/oxt/writer2xhtml/OptionPages.xcu
+++ b/source/oxt/writer2xhtml/OptionPages.xcu
@@ -55,7 +55,7 @@