diff options
3 files changed, 10 insertions, 17 deletions
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java index e543288c9ef2..6c549268c135 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java @@ -98,7 +98,7 @@ public final class DEPSSolverImpl extends BaseEvolutionarySolver public String[] getSupportedServiceNames() { return m_serviceNames; } - + // com.sun.star.sheet.XSolver: private DEPSAgent[] m_agents; @@ -142,8 +142,7 @@ public final class DEPSSolverImpl extends BaseEvolutionarySolver m_agents[i].setGTBehavior(psGTBehavior); m_agents[i].setSpecComparator(m_specCompareEngine); - if (m_agents[i] instanceof ILibEngine) - ((ILibEngine)m_agents[i]).setLibrary(m_library); + m_agents[i].setLibrary(m_library); } //Learn: @@ -160,7 +159,7 @@ public final class DEPSSolverImpl extends BaseEvolutionarySolver if (m_solverStatusDialog.getUserState() == IEvolutionarySolverStatusDialog.CONTINUE) lockDocument(); - + m_toleratedCount = 0; m_toleratedMin = -1.0 * m_tolerance.getValue(); m_toleratedMax = m_tolerance.getValue(); @@ -196,7 +195,7 @@ public final class DEPSSolverImpl extends BaseEvolutionarySolver m_solverStatusDialog.setRuntime(runtime + (System.nanoTime() - startTime)); m_xReschedule.reschedule(); } - + applySolution(); //show the current solution unlockDocument(); //allow the solution to be displayed diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java index 163818cf0aa4..d8f7cd8f9ead 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java @@ -124,18 +124,14 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget { return 0; } - if (arg0 instanceof ColumnBoundary) + if (boundary > arg0.boundary) { - if (boundary > arg0.boundary) - { - return 1; - } - else - { - return -1; - } + return 1; + } + else + { + return -1; } - return 1; } public boolean equals(final Object obj) diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index a30329c6daf5..9c3a868b3bce 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -34,8 +34,6 @@ public class AccessibilityTreeModel public AccessibilityTreeModel (AccessibleTreeNode aRoot) { // create default node (unless we have a 'proper' node) - if( ! (aRoot instanceof AccessibleTreeNode) ) - aRoot = new StringNode ("Root", null); setRoot (aRoot); maNodeMap = new NodeMap(); |