diff options
| -rw-r--r-- | qadevOOo/tests/java/ifc/beans/_XProperty.java | 3 | ||||
| -rw-r--r-- | reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/qadevOOo/tests/java/ifc/beans/_XProperty.java b/qadevOOo/tests/java/ifc/beans/_XProperty.java index c81c53f30351..cb3886701621 100644 --- a/qadevOOo/tests/java/ifc/beans/_XProperty.java +++ b/qadevOOo/tests/java/ifc/beans/_XProperty.java @@ -28,8 +28,7 @@ public class _XProperty extends MultiMethodTest { public void _getAsProperty() { Property prop = oObj.getAsProperty(); - boolean res = (prop.Name instanceof String); - res &= (prop.Type != null); + boolean res = (prop.Type != null); tRes.tested("getAsProperty()", res); } }
\ No newline at end of file diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java index 9e0e429b0b92..6c598556da7d 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java @@ -220,11 +220,8 @@ public class PentahoReportJob implements ReportJob val = reportFunction.getChildValues()[0]; } } - if (val instanceof ContextLookup) - { - final ContextLookup context = (ContextLookup) val; - name = context.getName(); - } + final ContextLookup context = (ContextLookup) val; + name = context.getName(); break; } } |