From a8df51771d01903cbb06913f9bfa6ceb2b020d42 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sun, 27 Jul 2014 11:44:47 +0200
Subject: xmerge: If statement is redundant

Change-Id: Ic36d66e376f6fca536a25db4b3b69b50e2b95ae2
Reviewed-on: https://gerrit.libreoffice.org/10570
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
---
 .../java/org/openoffice/xmerge/ConverterFactory.java  |  5 +----
 .../xmerge/converter/xml/sxc/ColumnRowInfo.java       | 19 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
index 700377964f7b..1b4c0d18db17 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
@@ -55,10 +55,7 @@ public class ConverterFactory {
         else
             foundInfo = ConverterInfoMgr.findConverterInfo(mimeTypeOut, mimeTypeIn);
 
-        if (foundInfo != null)
-            return true;
-        else
-            return false;
+        return foundInfo != null;
     }
 
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
index 985bee0b8465..b02efb6b7835 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
@@ -143,10 +143,7 @@ public class ColumnRowInfo {
      */
     public boolean isRow() {
 
-        if(type==ROW)
-            return true;
-        else
-            return false;
+        return type==ROW;
     }
 
     /**
@@ -156,10 +153,7 @@ public class ColumnRowInfo {
      */
     public boolean isColumn() {
 
-        if(type==COLUMN)
-            return true;
-        else
-            return false;
+        return type==COLUMN;
     }
 
     /**
@@ -179,11 +173,8 @@ public class ColumnRowInfo {
      */
     public boolean isDefaultSize() {
 
-        if( type==ROW &&
-            dimension>DEFAULTROWSIZE_MIN &&
-            dimension<DEFAULTROWSIZE_MAX)
-            return true;
-        else
-            return false;
+        return type==ROW &&
+                dimension>DEFAULTROWSIZE_MIN &&
+                dimension<DEFAULTROWSIZE_MAX;
     }
 }
-- 
cgit