[Libreoffice-commits] core.git: xmerge/source

[rbuj]

 xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java              |    2 +-
 xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 34170ac810f4d8449af527564e661002f56a5ecb
Author: rbuj <robert.buj at gmail.com>
Date:   Sun Jul 27 11:53:43 2014 +0200

    xmerge: javadoc <code>..</code> fix
    
    Change-Id: I44b7014d01e481a69c514fc52ffb7e0bf09999e5
    Reviewed-on: https://gerrit.libreoffice.org/10571
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 883d137..7dff2f4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -154,7 +154,7 @@ public class Convert implements Cloneable {
 
     /**
      *  Clones a Convert object so another Convert object can
-     *  do the same conversion.  <code>InputStream<code> objects passed
+     *  do the same conversion.  <code>InputStream</code> objects passed
      *  in via calls to the <code>addInputStream</code> method are not
      *  copied.
      *
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
index 13a4b8b..b5438cd 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
@@ -26,7 +26,7 @@ import java.io.IOException;
  *  "Office" <code>Document</code> format.</p>
  *
  *  <p>The <code>DocumentDeserializer</code> object is created by
- *  the </code>PluginFactory</code> {@link
+ *  the <code>PluginFactory</code> {@link
  *  org.openoffice.xmerge.DocumentDeserializerFactory#createDocumentDeserializer
  *  createDocumentDeserializer} method.  When it is constructed, a
  *  <code>ConvertData</code> object is passed in to be used as input.</p>