diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-04 10:51:51 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-04 10:51:51 +0000 |
| commit | c3b9f96a70c9c8db7c59c9a4a6b62cb85b6eb222 (patch) | |
| tree | 52d7d2b193b7595f517e0e6a0915670d85b5956d /xmerge/source | |
| parent | 753b3d8084aa860baa31a7524f0bce7cbde15b3f (diff) | |
INTEGRATION: CWS xsltfilter07 (1.3.14); FILE MERGED
2007/04/17 18:46:46 sus 1.3.14.1: #i75724# Fixing Javadoc
Diffstat (limited to 'xmerge/source')
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java index 5a96030ad2b7..29786e826999 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java @@ -4,9 +4,9 @@ * * $RCSfile: Convert.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ihi $ $Date: 2006-08-01 13:17:36 $ + * last change: $Author: ihi $ $Date: 2007-06-04 11:51:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -144,14 +144,11 @@ public class Convert implements Cloneable { /** - * Adds the original Document to the Convert Class. This - * is to be used for merges. If this Document is added then - * it is assumed that a convert with merge is the desired - * operation. + * Returns a <code>DocumentMerger</code> for the given <code>Document</code>. * - * @param name The <code>Document</code> name. - * @param is <code>InputStream</code> object corresponding - * to the <code>Document</code>. + * @param origDoc The <code>Document</code> were later changes will be merged to + * + * @return The <code>DocumentMerger</code> object for the given document. * * @throws IOException If any I/O error occurs. */ |