nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo.java |
1 +
reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |
2 +-
wizards/com/sun/star/wizards/form/UIControlArranger.java |
4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit ed33d1d4928dc9886eaace62d3c62ea4305efdac
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon May 3 09:59:08 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon May 3 12:33:33 2021 +0200
clean up some Java warnings
Change-Id: Id54e8fd6803c3a6c0d924338d1781679ed0b1bfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115025
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo.java
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo.java
index f1a7a4714f05..dc5663213458 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo.java
@@ -49,6 +49,7 @@ public class PropertyInfo<PropType> {
return m_description;
}
+ @SuppressWarnings("unchecked")
public void setValue(Object value) throws IllegalArgumentException {
if (m_property.Type == Type.LONG) {
if (!(value instanceof Integer))
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 3c52473e3d3c..322c2ac1ccfa 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -205,7 +205,7 @@ public class SOReportJobFactory
{
if (exception instanceof ReportDataFactoryException == false)
return;
- exception = ((ReportDataFactoryException)exception).getParent();
+ exception = ((ReportDataFactoryException)exception).getCause();
if (exception instanceof DataSourceException == false)
return;
exception = ((DataSourceException)exception).getCause();
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java
b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index b73796eca410..8f92e8ce66b5 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -47,7 +47,7 @@ public class UIControlArranger
private final XRadioButton optAlignLeft;
private final XRadioButton optAlignRight;
private final XControl flnLabelPlacement;
- private final Map helpTexts = new HashMap(4);
+ private final Map<String,String> helpTexts = new HashMap<String,String>(4);
private final ArrangeButtonList[] m_aArrangeList = new
ArrangeButtonList[2];
private final Integer IControlStep;
private static final int SOBASEIMAGEYPOSITION = 66;
@@ -109,7 +109,7 @@ public class UIControlArranger
});
- DefaultListModel imageModel = new DefaultListModel();
+ DefaultListModel<String> imageModel = new DefaultListModel<String>();
imageModel.addElement(ARRANGELISTSIDE);
imageModel.addElement(ARRANGELISTTOP);
imageModel.addElement(ARRANGETABLE);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
