diff --git a/source/distro/History.txt b/source/distro/History.txt index 48f6510..4e93aec 100644 --- a/source/distro/History.txt +++ b/source/distro/History.txt @@ -1,7 +1,7 @@ Version history for Writer2LaTeX ================================ -Version 1.6 beta (August 2015) +Version 1.6 beta (March 2018) - Writer2LaTex extension: - New toolbar replacing the previous separate extension Writer4LaTeX - New feature to insert bibliographic references in Writer directly from BibTeX files diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt index 32512aa..f17db5e 100644 --- a/source/distro/Readme.txt +++ b/source/distro/Readme.txt @@ -14,5 +14,5 @@ Bugs and feature requests should be reported to writer2latex (at) gmail.com -July 2015 +March 2018 Henrik Just diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index c842029..8151d86 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java index c08663b..bb1966e 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java @@ -77,7 +77,7 @@ public final class ApplicationsDialog // **** Implement XContainerWindowEventHandler - @Override public boolean callHandlerMethod(XWindow xWindow, Object event, String sMethod) + public boolean callHandlerMethod(XWindow xWindow, Object event, String sMethod) throws com.sun.star.lang.WrappedTargetException { XDialog xDialog = (XDialog)UnoRuntime.queryInterface(XDialog.class, xWindow); DialogAccess dlg = new DialogAccess(xDialog); @@ -117,22 +117,22 @@ public final class ApplicationsDialog return false; } - @Override public String[] getSupportedMethodNames() { + public String[] getSupportedMethodNames() { String[] sNames = { "external_event", "AfterExportChange", "ApplicationChange", "BrowseClick", "ExecutableUnfocus", "OptionsUnfocus", "AutomaticClick" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ return sNames; } // **** Implement the interface XServiceInfo - @Override public boolean supportsService(String sServiceName) { + public boolean supportsService(String sServiceName) { return sServiceName.equals(__serviceName); } - @Override public String getImplementationName() { + public String getImplementationName() { return __implementationName; } - @Override public String[] getSupportedServiceNames() { + public String[] getSupportedServiceNames() { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } diff --git a/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java b/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java index 7259a00..7eaea2d 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java @@ -111,7 +111,7 @@ public class BibTeXDialog extends DialogBase implements com.sun.star.lang.XIniti // **** Implement com.sun.star.lang.XInitialization // We expect to get the current frame and a comma separated list of BibTeX files to use - @Override public void initialize( Object[] objects ) + public void initialize( Object[] objects ) throws com.sun.star.uno.Exception { for (Object object : objects) { if (object instanceof XFrame) { diff --git a/source/java/writer2latex/base/BibliographyGenerator.java b/source/java/writer2latex/base/BibliographyGenerator.java index 233f4e3..b0abf08 100644 --- a/source/java/writer2latex/base/BibliographyGenerator.java +++ b/source/java/writer2latex/base/BibliographyGenerator.java @@ -138,7 +138,7 @@ public abstract class BibliographyGenerator { return this; } - @Override public int compare(Element a, Element b) { + public int compare(Element a, Element b) { int nCount = sortKeys.size(); for (int i=0; iDocument. */ - @Override public String getFileName() { + public String getFileName() { return fileName; } @@ -351,15 +351,15 @@ public class DOMDocument implements OutputFile { } // We need these because we implement OutputFile - @Override public String getMIMEType() { + public String getMIMEType() { return ""; } - @Override public boolean isMasterDocument() { + public boolean isMasterDocument() { return false; } - @Override public boolean containsMath() { + public boolean containsMath() { return false; } diff --git a/source/java/writer2latex/bibtex/BibTeXDocument.java b/source/java/writer2latex/bibtex/BibTeXDocument.java index a885a26..273b9df 100644 --- a/source/java/writer2latex/bibtex/BibTeXDocument.java +++ b/source/java/writer2latex/bibtex/BibTeXDocument.java @@ -110,23 +110,23 @@ public class BibTeXDocument implements OutputFile { // Implement writer2latex.api.OutputFile - @Override public String getFileName() { + public String getFileName() { return new String(sName + FILE_EXTENSION); } - @Override public String getMIMEType() { + public String getMIMEType() { return MIMETypes.BIBTEX; } - @Override public boolean isMasterDocument() { + public boolean isMasterDocument() { return bIsMaster; } - @Override public boolean containsMath() { + public boolean containsMath() { return false; } - @Override public void write(OutputStream os) throws IOException { + public void write(OutputStream os) throws IOException { // BibTeX files are plain ascii OutputStreamWriter osw = new OutputStreamWriter(os,"ASCII"); osw.write("%% This file was converted to BibTeX by Writer2BibTeX ver. "+ConverterFactory.getVersion()+".\n"); diff --git a/source/java/writer2latex/bibtex/Converter.java b/source/java/writer2latex/bibtex/Converter.java index d36210e..f1322f7 100644 --- a/source/java/writer2latex/bibtex/Converter.java +++ b/source/java/writer2latex/bibtex/Converter.java @@ -47,7 +47,7 @@ public final class Converter extends ConverterBase { config = new LaTeXConfig(); } - @Override public Config getConfig() { + public Config getConfig() { return config; } diff --git a/source/java/writer2latex/epub/EPUBWriter.java b/source/java/writer2latex/epub/EPUBWriter.java index 5a9ddd9..3dee14d 100644 --- a/source/java/writer2latex/epub/EPUBWriter.java +++ b/source/java/writer2latex/epub/EPUBWriter.java @@ -69,24 +69,24 @@ public class EPUBWriter implements OutputFile { // Implement OutputFile - @Override public String getFileName() { + public String getFileName() { return sFileName+".epub"; } - @Override public String getMIMEType() { + public String getMIMEType() { return "application/epub+zip"; } - @Override public boolean isMasterDocument() { + public boolean isMasterDocument() { return true; } - @Override public boolean containsMath() { + public boolean containsMath() { // We don't really care about this return nVersion==3; } - @Override public void write(OutputStream os) throws IOException { + public void write(OutputStream os) throws IOException { ZipOutputStream zos = new ZipOutputStream(os); // Write uncompressed MIME type as first entry diff --git a/source/java/writer2latex/latex/LaTeXDocument.java b/source/java/writer2latex/latex/LaTeXDocument.java index 6e4f9d1..8a7332d 100644 --- a/source/java/writer2latex/latex/LaTeXDocument.java +++ b/source/java/writer2latex/latex/LaTeXDocument.java @@ -81,19 +81,19 @@ public class LaTeXDocument implements OutputFile { * * @return The Document name with file extension. */ - @Override public String getFileName() { + public String getFileName() { return new String(sName + FILE_EXTENSION); } - @Override public String getMIMEType() { + public String getMIMEType() { return MIMETypes.LATEX; } - @Override public boolean isMasterDocument() { + public boolean isMasterDocument() { return bIsMaster; } - @Override public boolean containsMath() { + public boolean containsMath() { // We don't use this information currently return true; } diff --git a/source/java/writer2latex/xhtml/AlphabeticalIndexConverter.java b/source/java/writer2latex/xhtml/AlphabeticalIndexConverter.java index 739b656..3e6f574 100644 --- a/source/java/writer2latex/xhtml/AlphabeticalIndexConverter.java +++ b/source/java/writer2latex/xhtml/AlphabeticalIndexConverter.java @@ -124,7 +124,7 @@ class AlphabeticalIndexConverter extends IndexConverterHelper { Misc.getAttribute(source,XMLString.FO_LANGUAGE), Misc.getAttribute(source, XMLString.FO_COUNTRY)) { - @Override public int compare(AlphabeticalEntry a, AlphabeticalEntry b) { + public int compare(AlphabeticalEntry a, AlphabeticalEntry b) { return getCollator().compare(a.sWord, b.sWord); } }; diff --git a/source/java/writer2latex/xhtml/CssDocument.java b/source/java/writer2latex/xhtml/CssDocument.java index 7ec5a1c..6fe5e25 100644 --- a/source/java/writer2latex/xhtml/CssDocument.java +++ b/source/java/writer2latex/xhtml/CssDocument.java @@ -54,19 +54,19 @@ public class CssDocument implements OutputFile { sContent = ""; } - @Override public String getFileName() { + public String getFileName() { return sName; } - @Override public String getMIMEType() { + public String getMIMEType() { return "text/css"; } - @Override public boolean isMasterDocument() { + public boolean isMasterDocument() { return false; } - @Override public boolean containsMath() { + public boolean containsMath() { return false; } diff --git a/source/java/writer2latex/xhtml/ResourceDocument.java b/source/java/writer2latex/xhtml/ResourceDocument.java index 68bfcb8..61598c8 100644 --- a/source/java/writer2latex/xhtml/ResourceDocument.java +++ b/source/java/writer2latex/xhtml/ResourceDocument.java @@ -56,23 +56,23 @@ public class ResourceDocument implements OutputFile { // Implement OutputFile - @Override public String getFileName() { + public String getFileName() { return sFileName; } - @Override public String getMIMEType() { + public String getMIMEType() { return sMediaType; } - @Override public boolean isMasterDocument() { + public boolean isMasterDocument() { return false; } - @Override public boolean containsMath() { + public boolean containsMath() { return false; } - @Override public void write(OutputStream os) throws IOException { + public void write(OutputStream os) throws IOException { os.write(content); } diff --git a/source/readme-source.txt b/source/readme-source.txt index fe65fad..a0d7498 100644 --- a/source/readme-source.txt +++ b/source/readme-source.txt @@ -1,7 +1,7 @@ Writer2LaTeX source version 1.6 beta ==================================== -Writer2LaTeX is (c) 2002-2015 by Henrik Just. +Writer2LaTeX is (c) 2002-2018 by Henrik Just. The source is available under the terms and conditions of the GNU LESSER GENERAL PUBLIC LICENSE, version 2.1. Please see the file COPYING.TXT for details. @@ -124,7 +124,7 @@ In addition to oxt, the build file supports the following targets: clean -Henrik Just, July 2015 +Henrik Just, March 2018 Thanks to Michael Niedermair for writing the original ant build file