mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmerge: The if statement is redundant

Browse Source 
Change-Id: I56c5727470c4dba9ffa7c298fb6ccea5be750f33
Reviewed-on: https://gerrit.libreoffice.org/11894
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Robert Antoni Buj i Gelonch
2014-10-09 21:25:08 +02:00
committed by Noel Grandin
parent 110ae4e498
commit 6d848b2aaf
6 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
View File

@@ -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);
}
/**

5
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
View File

@@ -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();
}
/**

10
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
View File

@@ -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;
}
}

5
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
View File

@@ -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();
}
/**

6
xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
View File

@@ -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");
}
}

6
xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
View File

@@ -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;
}
}