[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmerge/source

[Damjan Jovanovic]

 xmerge/source/bridge/java/XMergeBridge.java                                                                   |    1 
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java   |    2 
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java |    2 
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java                                  |   29 ++++------
 4 files changed, 14 insertions(+), 20 deletions(-)

New commits:
commit af75d8d3f6defc9ae79e09fde3cee3a3c60e32df
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Aug 24 03:07:26 2015 +0000

    Fix all xmerge javadoc errors.

diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 5317a24..4442301 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -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,
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
index 2e10fbb..6981a22 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
@@ -33,7 +33,7 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
 /**
  * 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 {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
index 6aac8e6..cb7d42a 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
@@ -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;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 18c9ff1..4b03bbf 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -123,26 +123,21 @@ class alignment extends conversionAlgorithm {
 /**
  *  <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
  */