Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards

Conflicts:
	wizards/com/sun/star/wizards/common/Resource.java

merged resolved as per:
 e52421bc118e9c5f3fce5a32ba9efdcad7627d92
 9e91dbca08056fc31f388f5642fdfa3d2b910990

in the old components repository merging the corresponding commit
3b4fe490441f9f77829bc6c1ae30d79a4d50255b there

1 files changed, 7 insertions, 7 deletions

diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
index bab8a4bb240e..56d3d4d041cb 100644
--- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
+++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,8 +53,8 @@ public class GroupFieldHandler extends FieldSelection
             this.oWizardDialog = _CurUnoDialog;
             this.CurReportDocument = _CurReportDocument;
             this.CurDBMetaData = CurReportDocument.getRecordParser();
-            CurUnoDialog.setControlProperty("lstFields_2", "MultiSelection", new Boolean(false));
-            CurUnoDialog.setControlProperty("lstSelFields_2", "MultiSelection", new Boolean(false));
+            CurUnoDialog.setControlProperty("lstFields_2", "MultiSelection", Boolean.FALSE);
+            CurUnoDialog.setControlProperty("lstSelFields_2", "MultiSelection", Boolean.FALSE);
             addFieldSelectionListener(new FieldSelectionListener());
             String sNote = ReportWizard.getBlindTextNote(_CurReportDocument, _CurUnoDialog.m_oResource);
             CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_1",
@@ -64,7 +64,7 @@ public class GroupFieldHandler extends FieldSelection
                     },
                     new Object[]
                     {
-                        new Boolean(false), new Integer(18), sNote, new Boolean(true), new Integer(95), new Integer(158), new Integer(ReportWizard.SOGROUPPAGE), new Integer(209)
+                            Boolean.FALSE, 18, sNote, Boolean.TRUE, 95, 158, new Integer(ReportWizard.SOGROUPPAGE), 209
                     });
         }
         catch (Exception exception)
@@ -113,7 +113,7 @@ public class GroupFieldHandler extends FieldSelection
     {
         emptyFieldsListBoxes();
         GroupFieldVector.removeAllElements();
-        CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, new Boolean(false));
+        CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, Boolean.FALSE);
     }
 
     public void getGroupFieldNames(CommandMetaData CurDBMetaData)
@@ -162,7 +162,7 @@ public class GroupFieldHandler extends FieldSelection
             int iSelCount = xSelectedFieldsListBox.getItemCount();
             String[] CurGroupNames = xFieldsListBox.getItems();
             CurReportDocument.liveupdate_addGroupNametoDocument(CurGroupNames, CurGroupTitle, GroupFieldVector, CurReportDocument.getReportPath(), iSelCount);
-            CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, new Boolean(true));
+            CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, Boolean.TRUE);
             if (iSelCount >= MAXSELFIELDS)
             {
                 toggleMoveButtons(false, false);
@@ -178,7 +178,7 @@ public class GroupFieldHandler extends FieldSelection
                 String[] NewSelList = xSelectedFieldsListBox.getItems();
                 CurReportDocument.liveupdate_removeGroupName(NewSelList, OldGroupTitle, GroupFieldVector);
                 String[] NewSelGroupNames = xSelectedFieldsListBox.getItems();
-                CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, new Boolean(NewSelGroupNames.length == 0));
+                CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(NewSelGroupNames.length == 0));
 
             // CurReportDocument.refreshGroupFields(xSelectedFieldsListBox.getItems());
             }