java: use 'Short.valueOf' instead of 'new Short'

Change-Id: Icef19ef61ee0af2dd3bda527263934006271f219

23 files changed, 36 insertions, 36 deletions

diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 58cd7a252c94..4bdc611e2aa9 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -622,7 +622,7 @@ public class ODatabaseForm extends TestCase {
         params.add("SAU99") ;
         params.add(Boolean.FALSE) ;
         params.add(new Byte((byte) 123)) ;
-        params.add(new Short((short) 234)) ;
+        params.add(Short.valueOf((short) 234)) ;
         params.add(Integer.valueOf(12345)) ;
         params.add(Long.valueOf(23456)) ;
         params.add(new Float(1.234)) ;
diff --git a/qadevOOo/tests/java/mod/_fps/FilePicker.java b/qadevOOo/tests/java/mod/_fps/FilePicker.java
index 82c34e67c44c..6ce1107eda1d 100644
--- a/qadevOOo/tests/java/mod/_fps/FilePicker.java
+++ b/qadevOOo/tests/java/mod/_fps/FilePicker.java
@@ -93,7 +93,7 @@ public class FilePicker extends TestCase {
         Object oInterface = null;
         XMultiServiceFactory xMSF = Param.getMSF();
 
-        Object[] iniArgs = new Object[] { new Short
+        Object[] iniArgs = new Object[] { Short.valueOf
             (com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_READONLY_VERSION)};
         short ctrlId =
             com.sun.star.ui.dialogs.ExtendedFilePickerElementIds.CHECKBOX_READONLY;
@@ -114,7 +114,7 @@ public class FilePicker extends TestCase {
 
         // adding relation for XFilePickerControlAccess
         tEnv.addObjRelation("XFilePickerControlAccess.ControlID",
-            new Short(ctrlId)) ;
+            Short.valueOf(ctrlId)) ;
         tEnv.addObjRelation("XFilePickerControlAccess.ControlValue",
             Boolean.FALSE) ;
 
diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
index e8c198ebf1a2..501e2b82d873 100644
--- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
@@ -132,7 +132,7 @@ public class XMLSettingsExporter extends TestCase {
             XPropertySet xPS = UnoRuntime.queryInterface
                 (XPropertySet.class, xMathDoc) ;
 
-            xPS.setPropertyValue("TopMargin", new Short(expMargin)) ;
+            xPS.setPropertyValue("TopMargin", Short.valueOf(expMargin)) ;
         } catch (com.sun.star.uno.Exception e) {
             e.printStackTrace(log) ;
             throw new StatusException("Can't create component.", e) ;
diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java
index 7a3a5a31864e..fae8af2c044b 100644
--- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java
@@ -131,7 +131,7 @@ public class DataInputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
index 73500ddc95ba..3ffd18444cc9 100644
--- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
@@ -108,7 +108,7 @@ public class DataOutputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
index 289de5cc02ca..6ec2d548c115 100644
--- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
@@ -131,7 +131,7 @@ public class MarkableOutputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
index 350ca4d19d63..3664491099e0 100644
--- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
@@ -245,7 +245,7 @@ public class ObjectInputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
index 7308371932c6..f8b84c1f90f0 100644
--- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
@@ -234,7 +234,7 @@ public class ObjectOutputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
index 6e7f81bfcc14..b24f50d7fbdc 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
@@ -128,7 +128,7 @@ public class DataInputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
index f91e967eed39..8144e67b1536 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
@@ -105,7 +105,7 @@ public class DataOutputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
index 94065169be7a..a90b0aef9a75 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
@@ -128,7 +128,7 @@ public class MarkableOutputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
index a2acc83c62f8..6c851658ea61 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
@@ -242,7 +242,7 @@ public class ObjectInputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
index 0a26e9fb1f63..fbe7a0d00872 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
@@ -231,7 +231,7 @@ public class ObjectOutputStream extends TestCase {
         data.add(Boolean.TRUE) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
-        data.add(new Short((short)1234)) ;
+        data.add(Short.valueOf((short)1234)) ;
         data.add(Integer.valueOf(123456)) ;
         data.add(new Float(1.234)) ;
         data.add(new Double(1.23456)) ;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
index c6823a6c742e..651975828ea3 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
@@ -97,7 +97,7 @@ public class SwAccessibleEndnoteView extends TestCase {
         try {
             //change zoom value to 10%
             //footer should be in the vissible area of the document
-            xPropSet.setPropertyValue("ZoomValue", new Short("10"));
+            xPropSet.setPropertyValue("ZoomValue", Short.valueOf("10"));
         } catch ( com.sun.star.lang.WrappedTargetException e ) {
             e.printStackTrace(log);
             throw new StatusException("Couldn't set propertyValue...", e);
@@ -133,9 +133,9 @@ public class SwAccessibleEndnoteView extends TestCase {
                 public void fireEvent() {
                     try {
                         //change zoom value to 130%
-                        PropSet.setPropertyValue("ZoomValue", new Short("15"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("15"));
                         //and back to 10%
-                        PropSet.setPropertyValue("ZoomValue", new Short("10"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("10"));
                     } catch ( com.sun.star.lang.WrappedTargetException e ) {
 
                     }  catch ( com.sun.star.lang.IllegalArgumentException e ) {
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
index 76e0f7846b1d..4d70c06cc72a 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
@@ -110,7 +110,7 @@ public class SwAccessibleFooterView extends TestCase {
             XViewSettingsSupplier xViewSetSup = UnoRuntime.queryInterface(XViewSettingsSupplier.class,
             xController);
             XPropertySet xPropSet = xViewSetSup.getViewSettings();
-            xPropSet.setPropertyValue("ZoomValue", new Short("20"));
+            xPropSet.setPropertyValue("ZoomValue", Short.valueOf("20"));
         } catch ( com.sun.star.lang.WrappedTargetException e ) {
             e.printStackTrace(log);
             throw new StatusException("Couldn't set propertyValue...", e);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
index efdd158eb842..92621b0ae27e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
@@ -98,7 +98,7 @@ public class SwAccessibleFootnoteView extends TestCase {
         try {
             //change zoom value to 10%
             //footer should be in the vissible area of the document
-            xPropSet.setPropertyValue("ZoomValue", new Short("10"));
+            xPropSet.setPropertyValue("ZoomValue", Short.valueOf("10"));
         } catch ( com.sun.star.lang.WrappedTargetException e ) {
             e.printStackTrace(log);
             throw new StatusException("Couldn't set propertyValue...", e);
@@ -134,9 +134,9 @@ public class SwAccessibleFootnoteView extends TestCase {
                 public void fireEvent() {
                     try {
                         //change zoom value to 130%
-                        PropSet.setPropertyValue("ZoomValue", new Short("15"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("15"));
                         //and back to 10%
-                        PropSet.setPropertyValue("ZoomValue", new Short("10"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("10"));
                     } catch ( com.sun.star.lang.WrappedTargetException e ) {
 
                     }  catch ( com.sun.star.lang.IllegalArgumentException e ) {
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
index cb8bfea423db..3696797dd8ff 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
@@ -107,9 +107,9 @@ public class SwAccessibleTableView extends TestCase {
                 public void fireEvent() {
                     try {
                         //change zoom value to 15%
-                        PropSet.setPropertyValue("ZoomValue", new Short("15"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("15"));
                         //and back to 100%
-                        PropSet.setPropertyValue("ZoomValue", new Short("100"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("100"));
                     } catch ( com.sun.star.lang.WrappedTargetException e ) {
 
                     }  catch ( com.sun.star.lang.IllegalArgumentException e ) {
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
index ab9a9764b359..da7b10d138f4 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
@@ -91,9 +91,9 @@ public class SwAccessibleTextEmbeddedObject extends TestCase {
                 public void fireEvent() {
                     try {
                         //change zoom value to 15%
-                        PropSet.setPropertyValue("ZoomValue", new Short("15"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("15"));
                         //and back to 100%
-                        PropSet.setPropertyValue("ZoomValue", new Short("100"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("100"));
                     } catch ( com.sun.star.lang.WrappedTargetException e ) {
 
                     }  catch ( com.sun.star.lang.IllegalArgumentException e ) {
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
index db0679727650..04aef60e68e4 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
@@ -124,9 +124,9 @@ public class SwAccessibleTextFrameView extends TestCase {
                 public void fireEvent() {
                     try {
                         //change zoom value to 15%
-                        PropSet.setPropertyValue("ZoomValue", new Short("15"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("15"));
                         //and back to 100%
-                        PropSet.setPropertyValue("ZoomValue", new Short("100"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("100"));
                     } catch ( com.sun.star.lang.WrappedTargetException e ) {
 
                     }  catch ( com.sun.star.lang.IllegalArgumentException e ) {
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
index c7c682eed8e4..66a14e7cc89f 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
@@ -113,9 +113,9 @@ public class SwAccessibleTextGraphicObject extends TestCase {
                 public void fireEvent() {
                     try {
                         //change zoom value to 15%
-                        PropSet.setPropertyValue("ZoomValue", new Short("15"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("15"));
                         //and back to 100%
-                        PropSet.setPropertyValue("ZoomValue", new Short("100"));
+                        PropSet.setPropertyValue("ZoomValue", Short.valueOf("100"));
                     } catch ( com.sun.star.lang.WrappedTargetException e ) {
 
                     }  catch ( com.sun.star.lang.IllegalArgumentException e ) {
diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
index 92623758637f..4bbd95dcf74a 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
@@ -156,7 +156,7 @@ public class SwXMailMerge extends TestCase {
             oObjProps.setPropertyValue("DataSourceName", cDataSourceName);
             oObjProps.setPropertyValue("Command", cDataCommand);
             oObjProps.setPropertyValue("CommandType", Integer.valueOf(CommandType.TABLE));
-            oObjProps.setPropertyValue("OutputType", new Short(MailMergeType.FILE));
+            oObjProps.setPropertyValue("OutputType", Short.valueOf(MailMergeType.FILE));
             oObjProps.setPropertyValue("DocumentURL", cTestDoc);
             oObjProps.setPropertyValue("OutputURL", cOutputURL);
             oObjProps.setPropertyValue("FileNamePrefix", "Author");
@@ -186,7 +186,7 @@ public class SwXMailMerge extends TestCase {
         vXJobArg0[0] = new NamedValue("DataSourceName", cDataSourceName);
         vXJobArg0[1] = new NamedValue("Command", cDataCommand);
         vXJobArg0[2] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE));
-        vXJobArg0[3] = new NamedValue("OutputType",new Short(MailMergeType.FILE));
+        vXJobArg0[3] = new NamedValue("OutputType",Short.valueOf(MailMergeType.FILE));
         vXJobArg0[4] = new NamedValue("DocumentURL", cTestDoc);
         vXJobArg0[5] = new NamedValue("OutputURL", cOutputURL);
         vXJobArg0[6] = new NamedValue("FileNamePrefix", "Identifier");
@@ -197,7 +197,7 @@ public class SwXMailMerge extends TestCase {
         vXJobArg1[1] = new NamedValue("Command", cDataCommand);
         vXJobArg1[2] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE));
         vXJobArg1[3] = new NamedValue("OutputType",
-                             new Short(MailMergeType.PRINTER));
+                             Short.valueOf(MailMergeType.PRINTER));
         vXJobArg1[4] = new NamedValue("DocumentURL", cTestDoc);
         vXJobArg1[5] = new NamedValue("FileNamePrefix", "Author");
         vXJobArg1[6] = new NamedValue("FileNameFromColumn", Boolean.TRUE);
@@ -208,7 +208,7 @@ public class SwXMailMerge extends TestCase {
         vXJobArg2[2] = new NamedValue("Command", cDataCommand);
         vXJobArg2[3] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE));
         vXJobArg2[4] = new NamedValue("OutputType",
-                             new Short(MailMergeType.FILE));
+                             Short.valueOf(MailMergeType.FILE));
         vXJobArg2[5] = new NamedValue("ResultSet", oResultSet);
         vXJobArg2[6] = new NamedValue("OutputURL", cOutputURL);
         vXJobArg2[7] = new NamedValue("FileNamePrefix", "Identifier");
diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
index 819d27ce87ed..d0943ae08160 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
@@ -139,7 +139,7 @@ public class XMLSettingsExporter extends TestCase {
             XViewSettingsSupplier xViewSetSup = UnoRuntime.queryInterface(XViewSettingsSupplier.class,
             xController);
             XPropertySet xPropSet = xViewSetSup.getViewSettings();
-            xPropSet.setPropertyValue("ZoomValue", new Short(ZOOM));
+            xPropSet.setPropertyValue("ZoomValue", Short.valueOf(ZOOM));
 
         } catch (com.sun.star.uno.Exception e) {
             e.printStackTrace(log) ;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
index 347562e094dd..7b34cde66845 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
@@ -108,7 +108,7 @@ public class UnoControlDialogModel extends TestCase {
             xPSetButton.setPropertyValue("Width", Integer.valueOf(50));
             xPSetButton.setPropertyValue("Height", Integer.valueOf(14));
             xPSetButton.setPropertyValue("Name", _buttonName);
-            xPSetButton.setPropertyValue("TabIndex", new Short((short) 0));
+            xPSetButton.setPropertyValue("TabIndex", Short.valueOf((short) 0));
             xPSetButton.setPropertyValue("Label", "Click Me");
 
             // create the label model and set the properties
@@ -121,7 +121,7 @@ public class UnoControlDialogModel extends TestCase {
             xPSetLabel.setPropertyValue("Width", Integer.valueOf(100));
             xPSetLabel.setPropertyValue("Height", Integer.valueOf(14));
             xPSetLabel.setPropertyValue("Name", _labelName);
-            xPSetLabel.setPropertyValue("TabIndex", new Short((short) 1));
+            xPSetLabel.setPropertyValue("TabIndex", Short.valueOf((short) 1));
             xPSetLabel.setPropertyValue("Label", _labelPrefix);
 
             // insert the control models into the dialog model