summaryrefslogtreecommitdiffstats
path: root/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-01-27 13:51:16 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2010-01-27 13:51:16 +0100
commit6163dce52f006f6f5a390eebd000caeaa1c70854 (patch)
treed789b8d74ace47cf1dbeecd505c268be107c6864 /reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
parentCWS-TOOLING: integrate CWS vcl108 (diff)
parentAutomated merge with ssh://hg@hg.services.openoffice.org/cws/dba33b (diff)
downloadcore-6163dce52f006f6f5a390eebd000caeaa1c70854.tar.gz
core-6163dce52f006f6f5a390eebd000caeaa1c70854.zip
CWS-TOOLING: integrate CWS dba33d
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java')
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
index 64b50cba1197..496bfd23387f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
@@ -96,9 +96,7 @@ public final class StyleMapperKey
final StyleMapperKey that = (StyleMapperKey) o;
- if ((attributeName != null ? !attributeName.equals(that.attributeName) : that.attributeName != null) ||
- (attributeNamespace != null ? !attributeNamespace.equals(that.attributeNamespace) : that.attributeNamespace != null) ||
- !elementName.equals(that.elementName) || !elementNamespace.equals(that.elementNamespace))
+ if ((attributeName != null ? !attributeName.equals(that.attributeName) : that.attributeName != null) || (attributeNamespace != null ? !attributeNamespace.equals(that.attributeNamespace) : that.attributeNamespace != null) || !elementName.equals(that.elementName) || !elementNamespace.equals(that.elementNamespace))
{
return false;
}