From e1bf8fff0dfcdc3c6e67c18a4e4c7da97f6e2984 Mon Sep 17 00:00:00 2001
From: rbuj bName
, and a corresponding String object sName
* that contains characters without the '\0' characters.
The {@link #write write} method is called within the + *
The write
method is called within the
* {@link org.openoffice.xmerge.converter.palm.PalmDocument#write
* PalmDocument.write} method for writing out its data to the OutputStream
* object.
The {@link #read read} method is called within the + *
The read
method is called within the
* {@link org.openoffice.xmerge.converter.palm.PalmDocument#read
* PalmDocument.read} method for reading in its data from the InputStream
* object.
This decoder has the following assumptions on the PDB file:
* - *Record
indices in the RecordList are sorted in
- * order, i.e. the first Record
index refers to
- * Record
0, and so forth.Record
in the Record
section
- * are sorted as well in order, i.e. first Record
- * comes ahead of second Record
, etc.Record
indices in the RecordList are sorted in
+ * order, i.e. the first Record
index refers to
+ * Record
0, and so forth.Record
in the Record
section
+ * are sorted as well in order, i.e. first Record
+ * comes ahead of second Record
, etc.Other decoders assume these as well.
* diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java index cdd866fb250a..83f8a27f423d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java @@ -86,7 +86,7 @@ public final class PdbEncoder { /** - *Write out a PDB into the given OutputStream
.
OutputStream
.
*
* First, write out the header data by using the
* PdbHeader
write
method. Next,
@@ -98,12 +98,12 @@ public final class PdbEncoder {
* Record
index info, where each Record
* index info contains:
Record
from the
- * top of the PDB.Record
attribute.Record
ID.Record
from the
+ * top of the PDB.Record
attribute.Record
ID.There should be a total of header.numRecords
* of Record
index info
This class represents a paragraph Style
.
Style
.
*
- * - * Attribute | Value - * |
- * MARGIN_LEFT | mm * 100 - * |
- * MARGIN_RIGHT | mm * 100 - * |
- * MARGIN_TOP | mm * 100 (space on top of paragraph) - * |
- * MARGIN_BOTTOM | mm * 100 - * |
- * TEXT_INDENT | mm * 100 (first line indent) - * |
- * LINE_HEIGHT | 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. - * |
- * TEXT_ALIGN | ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT - * |
Attribute | Value |
MARGIN_LEFT | mm * 100 |
MARGIN_RIGHT | mm * 100 |
MARGIN_TOP | mm * 100 (space on top of paragraph) |
MARGIN_BOTTOM | mm * 100 |
TEXT_INDENT | mm * 100 (first line indent) |
LINE_HEIGHT | + *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. | + *
TEXT_ALIGN | ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT |
DocumentMerger
for
* the {@link
* org.openoffice.xmerge.converter.xml.sxc.SxcPluginFactory
- * SxcPluginFactory}. Used with SXC Document
objects.
+ * SxcPluginFactory}.
+ *
+ * Used with SXC Document
objects.
DocumentMerger
* for the {@link
* org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl
- * PluginFactoryImpl}.
+ * PluginFactoryImpl}.
*/
public class DocumentMergerImpl implements DocumentMerger {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
index 94d4112de75b..746709840e28 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
@@ -28,28 +28,32 @@ import org.openoffice.xmerge.merger.Iterator;
import org.openoffice.xmerge.converter.xml.OfficeConstants;
/**
- * A very simple and direct difference algorithm for row
- * Node
objects in a spreadsheet. Basically, it will
- * compare objects in sequence and does not look ahead (unlike LCS).
Node
objects in a spreadsheet.
*
- * Basically, it will compare objects in sequence and does not look ahead + * (unlike LCS).
+ * + *NOTE: The algorithm will have potential side effect to split rows.
*/ diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java index d6c872e506d9..cbad7ccfdb61 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java @@ -33,14 +33,17 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; public class SheetUtil { /** - *Empty the content of a cell value. This includes the following: - *
+ * Empty the content of a cell value. * - *Node
for most of the cells.
- * This includes the following:
+ * + *Node
for most of the cells.
+ * ConverterCapabilities
.
* @param node The Node
.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index 7e13cd678792..e4a7276ece24 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -31,7 +31,7 @@ import java.util.Properties;
/**
* This class is used for logging debug messages.
* Currently, there are three types of logging: {@link #INFO},
- * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties
+ * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties
* file to set or unset each type. Also use Debug.properties
* to set the writer to either System.out
,
* System.err
, or to a file.
--
cgit