Author: damjan
Date: Mon Aug 24 03:07:26 2015
New Revision: 1697306
URL: http://svn.apache.org/r1697306
Log:
Fix all xmerge javadoc errors.
Modified:
openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
Modified: openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java?rev=1697306&r1=1697305&r2=1697306&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java (original)
+++ openoffice/trunk/main/xmerge/source/bridge/java/XMergeBridge.java Mon Aug
24 03:07:26 2015
@@ -92,7 +92,6 @@ public class XMergeBridge {
/** This inner class provides the component as a concrete implementation
* of the service description. It implements the needed interfaces.
- * @implements XTypeProvider
*/
static public class _XMergeBridge implements
XImportFilter,
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java?rev=1697306&r1=1697305&r2=1697306&view=diff
==============================================================================
---
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
(original)
+++
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
Mon Aug 24 03:07:26 2015
@@ -33,7 +33,7 @@ import org.openoffice.xmerge.converter.x
/**
* This Helper class provides a simplified interface to conversion between
PocketXL formula representation
* and Calc formula representation.<p>
- * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula}
+ * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula}
*/
public class FormulaHelper {
Modified:
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java?rev=1697306&r1=1697305&r2=1697306&view=diff
==============================================================================
---
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
(original)
+++
openoffice/trunk/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
Mon Aug 24 03:07:26 2015
@@ -27,7 +27,7 @@ import java.util.HashMap;
/**
* This class defines the precedence applied to each operator when performing
a conversion
- * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2
from infix to RPN.}.
+ * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler#infix2RPN
from infix to RPN.}.
*/
public class PrecedenceTable {
public static final int DEFAULT_PRECEDENCE = 0;
Modified:
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java?rev=1697306&r1=1697305&r2=1697306&view=diff
==============================================================================
---
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
(original)
+++
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
Mon Aug 24 03:07:26 2015
@@ -123,26 +123,21 @@ class alignment extends conversionAlgori
/**
* <p>This class represents a paragraph <code>Style</code>.</p>
*
- * <p><table border="1" cellpadding="1"><tr><td>
- * Attribute </td><td>Value
- * </td></tr><tr><td>
- * MARGIN_LEFT </td><td>mm * 100
- * </td></tr><tr><td>
- * MARGIN_RIGHT </td><td>mm * 100
- * </td></tr><tr><td>
- * MARGIN_TOP </td><td>mm * 100 (space on top of paragraph)
- * </td></tr><tr><td>
- * MARGIN_BOTTOM </td><td>mm * 100
- * </td></tr><tr><td>
- * TEXT_INDENT </td><td>mm * 100 (first line indent)
- * </td></tr><tr><td>
- * LINE_HEIGHT </td><td>mm * 100, unless or'ed with LH_PCT, in which
+ * <p><table border="1" cellpadding="1">
+ * <caption>Properties</caption>
+ * <tr><th>Attribute</th><th>Value</th></tr>
+ * <tr><td>MARGIN_LEFT </td><td>mm * 100</td></tr>
+ * <tr><td>MARGIN_RIGHT </td><td>mm * 100</td></tr>
+ * <tr><td>MARGIN_TOP </td><td>mm * 100 (space on top of
paragraph)</td></tr>
+ * <tr><td>MARGIN_BOTTOM </td><td>mm * 100</td></tr>
+ * <tr><td>TEXT_INDENT </td><td>mm * 100 (first line indent)</td></tr>
+ * <tr><td>LINE_HEIGHT </td><td>mm * 100, unless or'ed with LH_PCT, in
which
* case it is a percentage (e.g. 200% for double spacing)
* Can also be or'ed with LH_ATLEAST. Value is stored
* in bits indicated by LH_VALUEMASK.
- * </td></tr><tr><td>
- * TEXT_ALIGN </td><td>ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT
- * </td></tr></table>
+ * </td></tr>
+ * <tr><td>TEXT_ALIGN </td><td>ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST,
ALIGN_LEFT</td></tr>
+ * </table>
*
* @author David Proulx
*/
