[Libreoffice-commits] .: 8 commits - xmerge/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Nov 1 14:05:28 PDT 2010
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/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java | 2
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java | 180 ++++------
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 44 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java | 5
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java | 2
12 files changed, 116 insertions(+), 130 deletions(-)
New commits:
commit cbbd1e4bea1ca0dcb72edcd418007f8eb7efedb4
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Mon Nov 1 15:04:48 2010 +0000
Fix javadoc comments in filters/xmerge - TextNodeIterator.java
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
index 619440e..3d016f9 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
@@ -52,7 +52,7 @@ public final class TextNodeIterator extends NodeIterator {
/**
* Standard constructor.
*
- * @param initial The initial root <code>Node</code>.
+ * @param node The initial root <code>Node</code>.
*/
public TextNodeIterator(Node node) {
super(null, node);
commit 425c83766421df3b6bafa8674119fb807dc2e505
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Mon Nov 1 15:02:24 2010 +0000
Fix javadoc comments in filters/xmerge - pocketword
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
index aaa226b..db53410 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,9 +45,8 @@ import org.openoffice.xmerge.converter.xml.StyleCatalog;
import java.io.IOException;
-
/**
- * <p>Pocket Word implementation of <code>DocumentDeserializer</code>
+ * <p>Pocket Word implementation of <code>DocumentDeserializer</code>
* for use by {@link
* org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
* PluginFactoryImpl}.</p>
@@ -57,17 +56,16 @@ import java.io.IOException;
* @author Mark Murnane
* @version 1.1
*/
-public final class DocumentSerializerImpl
+public final class DocumentSerializerImpl
implements DocumentSerializer, OfficeConstants {
-
+
private PocketWordDocument pswDoc;
private SxwDocument sxwDoc;
-
+
private StyleCatalog styleCat = null;
-
+
private boolean inList = false;
-
-
+
/**
* <p>Initialises a new <code>DocumentSerializerImpl</code> using the.<br>
* supplied <code>Document</code></p>
@@ -76,14 +74,13 @@ public final class DocumentSerializerImpl
* org.openoffice.xmerge.converter.xml.sxw.SxwDocument SxwDocument}
* object.</p>
*
- * @param document The <code>Document</code> to convert.
+ * @param doc The <code>Document</code> to convert.
*/
public DocumentSerializerImpl(Document doc) {
sxwDoc = (SxwDocument)doc;
pswDoc = new PocketWordDocument(sxwDoc.getName());
}
-
-
+
/**
* <p>Convert the data passed into the <code>DocumentSerializerImpl</code>
* constructor into Pocket Word format.</p>
@@ -98,28 +95,27 @@ public final class DocumentSerializerImpl
* @throws ConvertException If any conversion error occurs.
* @throws IOException If any I/O error occurs.
*/
- public ConvertData serialize() throws IOException, ConvertException {
+ public ConvertData serialize() throws IOException, ConvertException {
ConvertData cd = new ConvertData();
-
+
org.w3c.dom.Document doc = sxwDoc.getContentDOM();
-
+
// Load any style info before traversing the document content tree
loadStyles();
-
+
NodeList list = doc.getElementsByTagName(TAG_OFFICE_BODY);
-
+
int len = list.getLength();
if (len > 0) {
Node node = list.item(0);
traverseBody(node);
}
-
+
cd.addDocument(pswDoc);
-
+
return cd;
}
-
-
+
/*
* Handles the loading of defined styles from the style.xml file as well
* as automatic styles from the content.xml file.
@@ -132,19 +128,19 @@ public final class DocumentSerializerImpl
org.w3c.dom.Document styleDom = sxwDoc.getStyleDOM();
styleCat = new StyleCatalog(25);
-
+
NodeList nl = null;
- String families[] = new String[] { PocketWordConstants.TEXT_STYLE_FAMILY,
- PocketWordConstants.PARAGRAPH_STYLE_FAMILY,
+ String families[] = new String[] { PocketWordConstants.TEXT_STYLE_FAMILY,
+ PocketWordConstants.PARAGRAPH_STYLE_FAMILY,
PocketWordConstants.PARAGRAPH_STYLE_FAMILY };
- Class classes[] = new Class[] { TextStyle.class,
- ParaStyle.class,
+ Class classes[] = new Class[] { TextStyle.class,
+ ParaStyle.class,
TextStyle.class };
-
+
String[] styleTypes = new String[] { TAG_OFFICE_STYLES,
TAG_OFFICE_AUTOMATIC_STYLES,
TAG_OFFICE_MASTER_STYLES };
-
+
/*
* Documents converted from PSW -> SXW will not have a style.xml when
* being converted back to PSW. This would occur if a document was
@@ -154,49 +150,48 @@ public final class DocumentSerializerImpl
* portions of a complete Writer SXW file.
*/
if (styleDom != null) {
- // Process the Style XML tree
- for (int i = 0; i < styleTypes.length; i++ ) {
+ // Process the Style XML tree
+ for (int i = 0; i < styleTypes.length; i++ ) {
nl = styleDom.getElementsByTagName(styleTypes[i]);
if (nl.getLength() != 0) {
styleCat.add(nl.item(0), families, classes, null, false);
}
}
}
-
+
/*
- * Process the content XML for any other style info.
+ * Process the content XML for any other style info.
* Should only be automatic types here.
*/
- for (int i = 0; i < styleTypes.length; i++ ) {
+ for (int i = 0; i < styleTypes.length; i++ ) {
nl = contentDom.getElementsByTagName(styleTypes[i]);
if (nl.getLength() != 0) {
styleCat.add(nl.item(0), families, classes, null, false);
}
}
}
-
-
+
/*
- * Process the office:body tag.
+ * Process the office:body tag.
*/
private void traverseBody(Node node) throws IOException, ConvertException {
-
+
if (node.hasChildNodes()) {
NodeList nList = node.getChildNodes();
int len = nList.getLength();
-
+
for (int i = 0; i < len; i++) {
Node child = nList.item(i);
-
+
if (child.getNodeType() == Node.ELEMENT_NODE) {
String nodeName = child.getNodeName();
-
- if (nodeName.equals(TAG_PARAGRAPH)
+
+ if (nodeName.equals(TAG_PARAGRAPH)
|| nodeName.equals(TAG_HEADING)) {
traverseParagraph(child);
}
-
- if (nodeName.equals(TAG_UNORDERED_LIST) ||
+
+ if (nodeName.equals(TAG_UNORDERED_LIST) ||
nodeName.equals(TAG_ORDERED_LIST)) {
traverseList(child);
}
@@ -204,67 +199,65 @@ public final class DocumentSerializerImpl
}
}
}
-
-
+
/*
* Process a text:p tag
*/
private void traverseParagraph(Node node) throws IOException, ConvertException {
String styleName = getAttribute(node, ATTRIBUTE_TEXT_STYLE_NAME);
-
- ParaStyle pstyle = (ParaStyle)styleCat.lookup(styleName,
- PocketWordConstants.PARAGRAPH_STYLE_FAMILY, null,
+
+ ParaStyle pstyle = (ParaStyle)styleCat.lookup(styleName,
+ PocketWordConstants.PARAGRAPH_STYLE_FAMILY, null,
ParaStyle.class);
if (pstyle != null) {
pstyle = (ParaStyle)pstyle.getResolved();
}
-
- TextStyle tstyle = (TextStyle)styleCat.lookup(styleName,
- PocketWordConstants.PARAGRAPH_STYLE_FAMILY, null,
+
+ TextStyle tstyle = (TextStyle)styleCat.lookup(styleName,
+ PocketWordConstants.PARAGRAPH_STYLE_FAMILY, null,
TextStyle.class);
if (pstyle != null) {
tstyle = (TextStyle)tstyle.getResolved();
}
-
+
try {
pswDoc.addParagraph(pstyle, inList);
- }
+ }
catch (Exception e) {
throw new ConvertException(
"Error adding paragraph to PocketWordDocument.\n"
+ e.toString());
}
-
+
traverseParagraphContents(node, tstyle);
}
-
-
+
/*
* Process the contents of a paragraph. This method handles situations
- * where the paragraph contains multiple children, each representing a
+ * where the paragraph contains multiple children, each representing a
* differently formatted piece of text.
*/
- private void traverseParagraphContents (Node node, TextStyle defTextStyle)
+ private void traverseParagraphContents (Node node, TextStyle defTextStyle)
throws IOException, ConvertException {
// First up, get the style of this little bit
String styleName = getAttribute(node, ATTRIBUTE_TEXT_STYLE_NAME);
- TextStyle tStyle = (TextStyle)styleCat.lookup(styleName,
- PocketWordConstants.TEXT_STYLE_FAMILY, null,
+ TextStyle tStyle = (TextStyle)styleCat.lookup(styleName,
+ PocketWordConstants.TEXT_STYLE_FAMILY, null,
TextStyle.class);
-
+
if (tStyle == null) {
tStyle = defTextStyle;
}
-
+
if (node.hasChildNodes()) {
NodeList nList = node.getChildNodes();
int len = nList.getLength();
-
+
for (int i = 0; i < len; i++) {
-
+
Node child = nList.item(i);
short nodeType = child.getNodeType();
-
+
switch (nodeType) {
case Node.TEXT_NODE:
String s = child.getNodeValue();
@@ -274,31 +267,31 @@ public final class DocumentSerializerImpl
}
catch (Exception e) {
throw new ConvertException(
- "Error adding data to paragraph in " +
+ "Error adding data to paragraph in " +
"PocketWordDocument.\n" + e.toString());
-
+
}
}
break;
-
+
case Node.ELEMENT_NODE:
if (child.getNodeName().equals(TAG_SPACE)) {
StringBuffer sb = new StringBuffer("");
int count = 1;
-
+
NamedNodeMap map = child.getAttributes();
-
+
if (map.getLength() > 0) {
Node attr = map.getNamedItem(ATTRIBUTE_SPACE_COUNT);
count = Integer.parseInt(attr.getNodeValue().trim());
}
-
+
for ( ; count > 0; count--) {
sb.append(" ");
}
-
+
/*
- * May want to look at style info for spaces. Could
+ * May want to look at style info for spaces. Could
* be important when calculating font metrics.
*/
try {
@@ -306,9 +299,9 @@ public final class DocumentSerializerImpl
}
catch (Exception e) {
throw new ConvertException(
- "Error adding data to paragraph in " +
+ "Error adding data to paragraph in " +
"PocketWordDocument.\n" + e.toString());
-
+
}
}
else if (child.getNodeName().equals(TAG_TAB_STOP)) {
@@ -317,9 +310,9 @@ public final class DocumentSerializerImpl
}
catch (Exception e) {
throw new ConvertException(
- "Error adding data to paragraph in " +
+ "Error adding data to paragraph in " +
"PocketWordDocument.\n" + e.toString());
-
+
}
}
else if (child.getNodeName().equals(TAG_LINE_BREAK)) {
@@ -355,41 +348,39 @@ public final class DocumentSerializerImpl
pswDoc.addParagraphData("", tStyle);
}
}
-
-
+
/*
* Process a text:ordered-list or text:unordered-list tag. Pocket Word has
- * no concept of a list so there is no need to differentiate between the
+ * no concept of a list so there is no need to differentiate between the
* two.
*
* Each item on the list contains a text:p node.
*/
private void traverseList (Node node) throws IOException, ConvertException {
inList = true;
-
+
if (node.hasChildNodes()) {
NodeList nList = node.getChildNodes();
int len = nList.getLength();
-
+
for (int i = 0; i < len; i++) {
Node child = nList.item(i);
-
+
if (child.getNodeType() == Node.ELEMENT_NODE) {
String nodeName = child.getNodeName();
-
+
if (nodeName.equals(TAG_LIST_ITEM)) {
traverseListItem(child);
}
}
}
}
-
+
inList = false;
}
-
-
+
/*
- * Process a text:list-item node. They usually contain have a single
+ * Process a text:list-item node. They usually contain have a single
* text:p child but can also have sections or other lists.
*
* For this case, only paragraphs are supported.
@@ -398,13 +389,13 @@ public final class DocumentSerializerImpl
if (node.hasChildNodes()) {
NodeList nList = node.getChildNodes();
int len = nList.getLength();
-
+
for (int i = 0; i < len; i++) {
Node child = nList.item(i);
-
+
if (child.getNodeType() == Node.ELEMENT_NODE) {
String nodeName = child.getNodeName();
-
+
if (nodeName.equals(TAG_PARAGRAPH)) {
traverseParagraph(child);
}
@@ -413,21 +404,20 @@ public final class DocumentSerializerImpl
}
}
-
-
+
/*
* Utility method to retrieve a Node attribute.
*/
private String getAttribute (Node node, String attribute) {
NamedNodeMap attrNodes = node.getAttributes();
-
+
if (attrNodes != null) {
Node attr = attrNodes.getNamedItem(attribute);
if (attr != null) {
return attr.getNodeValue();
}
}
-
+
return null;
}
}
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
index ee2dc90..b727d46 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
@@ -105,7 +105,7 @@ public class PocketWordDocument implements Document, PocketWordConstants {
* <p>This method reads <code>byte</code> data from the InputStream and
* extracts font and paragraph data from the file.</p>
*
- * @param is InputStream containing a Pocket Word data file.
+ * @param docData InputStream containing a Pocket Word data file.
*
* @throws IOException In case of any I/O errors.
*/
commit f13aa14608749cc327db3bfd9c2a86ee5f0e30f7
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Mon Nov 1 14:58:49 2010 +0000
Fix javadoc comments in filters/xmerge - XMergeBridge.java
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 4a84b32..9302ebb 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -97,7 +97,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,
commit 00636ad9b7f612af36cc356d01bf0148552bcbc9
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Mon Nov 1 14:47:27 2010 +0000
Fix javadoc warnings in filters/xmerge - merger
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index c3b5f3c..6f8a810 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -44,15 +44,12 @@ public interface MergeAlgorithm {
* This method is to merge the difference to an <code>Iterator</code>.
* The original <code>Iterator</code> will be modified after the call.
*
- * @param objSeq The original sequence which the difference
+ * @param orgSeq The original sequence which the difference
* will be applied. It will be modified.
* @param modSeq The modified sequence where the difference
* content will be extracted.
* @param differences The <code>Difference</code> array.
*
- * @return An <code>Iterator</code> which is the modified original
- * <code>Iterator</code> Sequence. Same as the first parameter.
- *
* @throws MergeException If an error occurs during the merge.
*/
public void applyDifference(Iterator orgSeq, Iterator modSeq,
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
index 9ff5617..1fcc6c6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
@@ -47,6 +47,6 @@ public interface NodeMergeAlgorithm {
* @param modifyNode The <code>Node</code> to be merged. It may
* be modified.
*/
- public void merge(Node orginialNode, Node modifyNode);
+ public void merge(Node orginalNode, Node modifyNode);
}
commit dd3f635badedacc656d2124a7e601e92062665ce
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Thu Oct 28 14:02:14 2010 +0100
Fix javadoc comments in filters/xmerge pexcel
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 aa14a3c..603919b 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
@@ -37,7 +37,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 1a1b6da..f3f05a6 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
@@ -31,7 +31,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/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
index ac4ec27..12e77e2 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
@@ -48,7 +48,7 @@ public abstract class SymbolLookup {
/**
* Associate a symbol with a numeric value in the lookup table
* @param symbol The symbol that will act as the key in the lookup table
- * @param value The value to be associated with a given symbol
+ * @param id The ID number to be associated with a given symbol
*/
public void addEntry(String symbol, int id) {
Integer iObj = new Integer(id);
commit 98e3f2cda345a75786918ca7fa06ee22ae8c0f4d
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Thu Oct 28 13:47:25 2010 +0100
Fix javadoc comments in TextStyle.java
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 16f18cc..b14defa 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -78,7 +78,7 @@ public class TextStyle extends Style implements Cloneable {
/**
* Constructor for use when going from DOM to client device format.
*
- * @param Node The <i>style:style</i> <code>Node</code> containing
+ * @param node The <i>style:style</i> <code>Node</code> containing
* the <code>Style</code>. (This <code>Node</code> is
* assumed have a <i>family</i> attribute of <i>text</i>).
* @param sc The <code>StyleCatalog</code>, which is used for
commit eafaae7931c713832ad857f7ed0b54016085bc41
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Thu Oct 28 13:45:44 2010 +0100
Fix javadoc comments in ParaStyle.java
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 3955222..2006d75 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
@@ -269,15 +269,15 @@ public class ParaStyle extends Style implements Cloneable {
/**
* Constructor for use when going from client device format to DOM.
*
- * @param name Name of the <code>Style</code>. Can be null.
- * @param family Family of the <code>Style</code> - usually
- * <i>paragraph</i>, <i>text</i>, etc. Can be null.
- * @param parent Name of the parent <code>Style</code>, or null
- * if none.
- * @param attribs Array of attributes to set.
- * @param values Array of values to set.
- * @param sc The <code>StyleCatalog</code>, which is used for
- * looking up ancestor <code>Style</code> objects.
+ * @param name Name of the <code>Style</code>. Can be null.
+ * @param familyName Family of the <code>Style</code> - usually
+ * <i>paragraph</i>, <i>text</i>, etc. Can be null.
+ * @param parentName Name of the parent <code>Style</code>, or null
+ * if none.
+ * @param attribs Array of attributes to set.
+ * @param values Array of values to set.
+ * @param sc The <code>StyleCatalog</code>, which is used for
+ * looking up ancestor <code>Style</code> objects.
*/
public ParaStyle(String name, String familyName, String parentName,
String attribs[], String values[], StyleCatalog sc) {
@@ -292,15 +292,15 @@ public class ParaStyle extends Style implements Cloneable {
* Alternate constructor for use when going from client device
* format to DOM.
*
- * @param name Name of the <code>Style</code>. Can be null.
- * @param family Family of the <code>Style</code> - usually
- * <i>paragraph</i>, <i>text</i>, etc. Can be null.
- * @param parent Name of the parent <code>Style</code>, or
- * null if none.
- * @param attribs Array of attributes indices to set.
- * @param values Array of values to set.
- * @param sc The <code>StyleCatalog</code>, which is used for
- * looking up ancestor <code>Style</code> objects.
+ * @param name Name of the <code>Style</code>. Can be null.
+ * @param familyName Family of the <code>Style</code> - usually
+ * <i>paragraph</i>, <i>text</i>, etc. Can be null.
+ * @param parentName Name of the parent <code>Style</code>, or
+ * null if none.
+ * @param attribs Array of attributes indices to set.
+ * @param values Array of values to set.
+ * @param lookup The <code>StyleCatalog</code>, which is used for
+ * looking up ancestor <code>Style</code> objects.
*/
public ParaStyle(String name, String familyName, String parentName,
int attribs[], String values[], StyleCatalog lookup) {
@@ -377,7 +377,7 @@ public class ParaStyle extends Style implements Cloneable {
* Set an attribute for this paragraph <code>Style</code>.
*
* @param attr The attribute index to set.
- * @apram value The attribute value to set.
+ * @param value The attribute value to set.
*/
public void setAttribute(int attr, String value) {
isSet[attr] = true;
@@ -500,9 +500,9 @@ public class ParaStyle extends Style implements Cloneable {
/**
* Create the <code>Node</code> with the specified elements.
*
- * @parentDoc Parent <code>Document</code> of the
- * <code>Node</code> to create.
- * @param name Name of the <code>Node</code>.
+ * @param parentDoc Parent <code>Document</code> of the
+ * <code>Node</code> to create.
+ * @param name Name of the <code>Node</code>.
*
* @return The created <code>Node</code>.
*/
commit dbc2ed1fc76bcb1f273e9dfc59d10ce2ea2955f9
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Thu Oct 28 13:41:37 2010 +0100
Fix javadoc comments in EmbeddedXMLObject.java
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
index 623e61d..c5d31df 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
@@ -138,7 +138,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
/**
* Sets the settings data for the embedded object.
*
- * @param styles DOM representation of the object's styles.
+ * @param settings DOM representation of the object's styles.
*/
public void setSettingsDOM(Document settings) {
settingsDOM = settings;
More information about the Libreoffice-commits
mailing list