CWS-TOOLING: integrate CWS dba33d

1 files changed, 4 insertions, 9 deletions

diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
index 0a5988a44b94..ca3047a16c16 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
@@ -178,13 +178,9 @@ public class MasterPageFactory
             {
                 return false;
             }
-            if (templateName != null ? !templateName.equals(
-                    key.templateName) : key.templateName != null)
-            {
-                return false;
-            }
+            return !(templateName != null ? !templateName.equals(
+                    key.templateName) : key.templateName != null);
 
-            return true;
         }
 
         public int hashCode()
@@ -196,7 +192,6 @@ public class MasterPageFactory
             return result;
         }
     }
-
     // todo: Patch the page-layout ...
     private static final String DEFAULT_PAGE_NAME = "Default";
     private final OfficeMasterStyles predefinedStyles;
@@ -265,7 +260,7 @@ public class MasterPageFactory
             }
             catch (CloneNotSupportedException cne)
             {
-                throw new IllegalStateException("Implementation error: Unable to derive page",cne);
+                throw new IllegalStateException("Implementation error: Unable to derive page", cne);
             }
         }
 
@@ -403,7 +398,7 @@ public class MasterPageFactory
         }
         catch (CloneNotSupportedException e)
         {
-            throw new IllegalStateException("Clone failed.",e);
+            throw new IllegalStateException("Clone failed.", e);
         }
     }