xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 1 + xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java | 1 + xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 3 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java | 3 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java | 3 +++ 5 files changed, 11 insertions(+)
New commits: commit 9f803ee4b64e11e481ae9bf92ffac7cbf568675a Author: rbuj <robert....@gmail.com> Date: Sun Jul 27 12:58:07 2014 +0200 xmerge: @Override Change-Id: I9be006d018335dcbfad5ccba5f55648ba24f609c Reviewed-on: https://gerrit.libreoffice.org/10577 Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@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 7dff2f4..a67faf2 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java @@ -160,6 +160,7 @@ public class Convert implements Cloneable { * * @return The cloned <code>Convert</code> object. */ + @Override public Object clone() { Convert aClone = null; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java index 00c0bf1..78575d6 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java @@ -112,6 +112,7 @@ public final class OfficeDocumentException extends IOException { * * @return The message value for the <code>Exception</code>. */ + @Override public String getMessage() { return message.toString() + super.getMessage(); } 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 986e539..c47b235 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 @@ -381,6 +381,7 @@ public class ParaStyle extends Style implements Cloneable { * * @return The fully-resolved copy of the <code>Style</code> in use. */ + @Override public Style getResolved() { ParaStyle resolved = null; try { @@ -493,6 +494,7 @@ public class ParaStyle extends Style implements Cloneable { * * @return The created <code>Node</code>. */ + @Override public Node createNode(org.w3c.dom.Document parentDoc, String name) { Element node = parentDoc.createElement(name); writeAttributes(node); @@ -509,6 +511,7 @@ public class ParaStyle extends Style implements Cloneable { * @return true if <code>style</code> is a subset, false * otherwise. */ + @Override public boolean isSubset(Style style) { if (!super.isSubset(style)) 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 57583d7..3e170b5 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 @@ -361,6 +361,7 @@ public class TextStyle extends Style implements Cloneable { * @return The <code>StyleCatalog</code> in which to look up * ancestors. */ + @Override public Style getResolved() { // Create a new object to return, which is a clone of this one. TextStyle resolved = null; @@ -506,6 +507,7 @@ public class TextStyle extends Style implements Cloneable { * * @return Created <code>Node</code>. */ + @Override public Node createNode(org.w3c.dom.Document parentDoc, String name) { Element node = parentDoc.createElement(name); writeAttributes(node); @@ -523,6 +525,7 @@ public class TextStyle extends Style implements Cloneable { * @return true if <code>style</code> is a subset, false * otherwise. */ + @Override public boolean isSubset(Style style) { if (style.getClass() != this.getClass()) return false; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index d5f8859..5669537 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java @@ -263,6 +263,7 @@ public class CellStyle extends Style implements Cloneable { * @return The <code>StyleCatalog</code> in which to look up * ancestors. */ + @Override public Style getResolved() { // Create a new object to return, which is a clone of this one. CellStyle resolved = null; @@ -332,6 +333,7 @@ public class CellStyle extends Style implements Cloneable { * * @return Created <code>Node</code>. */ + @Override public Node createNode(org.w3c.dom.Document parentDoc, String name) { Element node = parentDoc.createElement(name); writeAttributes(node); @@ -349,6 +351,7 @@ public class CellStyle extends Style implements Cloneable { * @return true if <code>style</code> is a subset, false * otherwise. */ + @Override public boolean isSubset(Style style) { if (style.getClass() != this.getClass()) return false; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits