diff options
| author | Robert Antoni Buj i Gelonch <robert.buj@gmail.com> | 2014-10-09 21:25:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-10 07:10:00 +0000 |
| commit | 6d848b2aaf4eb814dba90a3db8e5494530dc0ada (patch) | |
| tree | a039c78c536a812b69517aa766707b6186a38c9a /xmerge | |
| parent | 110ae4e498a55bd50ca0afe558126e9e029f68cd (diff) | |
xmerge: The if statement is redundant
Change-Id: I56c5727470c4dba9ffa7c298fb6ccea5be750f33
Reviewed-on: https://gerrit.libreoffice.org/11894
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmerge')
6 files changed, 7 insertions, 30 deletions
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 48c84efe406e..644d91eacc3f 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 @@ -352,10 +352,7 @@ public class CellStyle extends Style implements Cloneable { Format rhs = tStyle.getFormat(); - if(!fmt.isSubset(rhs)) - return false; - - return true; + return fmt.isSubset(rhs); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index 68c689f9976b..3b880083f7d5 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -225,10 +225,7 @@ public class ColumnStyle extends Style implements Cloneable { return false; ColumnStyle tStyle = (ColumnStyle)style; - if(colWidth!=tStyle.getColWidth()) - return false; - - return true; + return colWidth == tStyle.getColWidth(); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index 27f87f078171..84514bedd2d1 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -388,10 +388,7 @@ public class Format implements Cloneable { if (rhs.align!= align) return false; - if (rhs.vertAlign!= vertAlign) - return false; - - return true; + return rhs.vertAlign == vertAlign; } /** @@ -426,9 +423,6 @@ public class Format implements Cloneable { if (rhs.align!= align) return false; - if (rhs.vertAlign!= vertAlign) - return false; - - return true; + return rhs.vertAlign == vertAlign; } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index 3f8075c2ce50..6639ce13e787 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -224,10 +224,7 @@ public class RowStyle extends Style implements Cloneable { return false; RowStyle tStyle = (RowStyle)style; - if(rowHeight!=tStyle.getRowHeight()) - return false; - - return true; + return rowHeight == tStyle.getRowHeight(); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java index c90e5ea5df40..7ca174a0af1d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java @@ -292,10 +292,6 @@ public final class Driver { private boolean isZip(String zipName) { String str = zipName.toLowerCase(); - if (str.endsWith("sxw") || zipName.endsWith("sxc")) { - return true; - } - - return false; + return str.endsWith("sxw") || zipName.endsWith("sxc"); } }
\ No newline at end of file diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java index 7254ed0937ce..aefb3f9660fa 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java @@ -416,10 +416,6 @@ public class ColourConverter { matchedRGB += getClosest(c.getGreen(), points) << 8; matchedRGB += getClosest(c.getBlue(), points); - if (matchedRGB == 0xC0C0C0) { - return true; - } - - return false; + return matchedRGB == 0xC0C0C0; } }
\ No newline at end of file |