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>

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 fmt.isSubset(rhs);
-            return false;
-
-        return true;
     }
 
     /**

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 colWidth == tStyle.getColWidth();
-            return false;
-
-        return true;
     }
 
     /**

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 rhs.vertAlign == vertAlign;
-                return false;
-
-        return true;
     }
 
     /**
@@ -426,9 +423,6 @@ public class Format implements Cloneable {
         if (rhs.align!= align)
                 return false;
 
-        if (rhs.vertAlign!= vertAlign)
+        return rhs.vertAlign == vertAlign;
-                return false;
-
-        return true;
     }
 }

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 rowHeight == tStyle.getRowHeight();
-            return false;
-
-        return true;
     }
 
     /**

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 str.endsWith("sxw") || zipName.endsWith("sxc");
-            return true;
-        }
-
-        return false;
     }
 }

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 matchedRGB == 0xC0C0C0;
-            return true;
-        }
-
-        return false;
     }
 }