java,wizards: remove unused parameters

Change-Id: I13f0c7afca233cc0ff6692f8fb442a80c4208d20

5 files changed, 14 insertions, 27 deletions

diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index cfc697cdac98..b358f3a51f2e 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -43,9 +43,9 @@ public class FieldLinker extends DBLimitedFieldSelection
     private String[] sSlaveListHeader;
     private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
 
-    public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosX, int iCompPosY, int iCompWidth, int _firsthelpid)
+    public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosX, int iCompPosY, int _firsthelpid)
     {
-        super(_CurUnoDialog, iStep, iCompPosX, iCompPosY, iCompWidth, _firsthelpid);
+        super(_CurUnoDialog, iStep, iCompPosX, iCompPosY, _firsthelpid);
     }
 
     protected void insertControlGroup(int i)
diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java
index 8c3fc796b25d..41c975faceff 100644
--- a/wizards/com/sun/star/wizards/form/FormControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java
@@ -329,7 +329,7 @@ public class FormControlArranger
         }
     }
 
-    public void positionControls(int _icurArrangement, Point _aStartPoint, Size _aFormSize, short _iAlign, Short _NBorderType)
+    public void positionControls(int _icurArrangement, Point _aStartPoint, short _iAlign, Short _NBorderType)
     {
         try
         {
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index 9fe87522a35c..8ef1936fb883 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -238,8 +238,8 @@ public class FormDocument extends TextDocument
         {
             oMainControlForm.oFormController.positionControls(oMainControlForm.curArrangement,
                     oMainControlForm.aStartPoint,
-                    oMainControlForm.getFormSize(),
-                    curUIControlArranger.getAlignValue(), _NBorderType);
+                    curUIControlArranger.getAlignValue(),
+                    _NBorderType);
         }
     }
 
@@ -260,7 +260,7 @@ public class FormDocument extends TextDocument
         {
 //          oSubControlForm.oFormController.adjustYPositions(_idiffheight);
             oSubControlForm.setStartPoint(new Point(oSubControlForm.aStartPoint.X, oMainControlForm.getActualFormHeight() + oMainControlForm.aStartPoint.Y + SOFORMGAP));
-            oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, oSubControlForm.getAvailableFormSize(), curUIControlArranger.getAlignValue(), _NBorderType);
+            oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType);
         }
     }
 
@@ -402,11 +402,11 @@ public class FormDocument extends TextDocument
             else
             {
                 adaptControlStyles = !oFormController.areControlsexisting();
-                oFormController.positionControls(_curArrangement, aStartPoint, getAvailableFormSize(), curUIControlArranger.getAlignValue(), _NBorderType);
+                oFormController.positionControls(_curArrangement, aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType);
             }
             if (adaptControlStyles)
             {
-                curStyleApplier.applyStyle(false, true);
+                curStyleApplier.applyStyle(true);
             }
             if ((Name.equals(SOMAINFORM)) && (oControlForms.size() > 1))
             {
@@ -437,19 +437,6 @@ public class FormDocument extends TextDocument
             return aFormSize;
         }
 
-        private Size getAvailableFormSize()
-        {
-            if (this.Name.equals(SOMAINFORM))
-            {
-                setFormSize(getMainFormSize(curArrangement));
-            }
-            else
-            {
-                setFormSize(getSubFormSize());
-            }
-            return aFormSize;
-        }
-
         public void setFormSize(Size _aSize)
         {
             aFormSize = _aSize;
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index 17e45ba65fcc..5c57fe4cde6f 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -67,7 +67,7 @@ public class FormWizard extends DatabaseObjectWizard
     public FormWizard(XMultiServiceFactory i_servicFactory, final PropertyValue[] i_wizardContext)
     {
         super(i_servicFactory, 34400, i_wizardContext);
-        super.addResourceHandler("FormWizard", "dbw");
+        super.addResourceHandler("dbw");
         Helper.setUnoPropertyValues(xDialogModel,
                 new String[]
                 {
@@ -123,7 +123,7 @@ public class FormWizard extends DatabaseObjectWizard
                     {
                         final String sTableName = curSubFormFieldSelection.getSelectedCommandName();
                         String[] aFieldNames = curSubFormFieldSelection.getSelectedFieldNames();
-                        curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
+                        curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames);
                     }
                     else
                     {
@@ -175,7 +175,7 @@ public class FormWizard extends DatabaseObjectWizard
             {
                 final String sTableName = curDBCommandFieldSelection.getSelectedCommandName();
                 final String[] aFieldNames = curDBCommandFieldSelection.getSelectedFieldNames();
-                curFormDocument.oMainFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
+                curFormDocument.oMainFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames);
 
                 final String[] aMainFieldNames = curFormDocument.oMainFormDBMetaData.getFieldNames();
                 curFormDocument.LinkFieldNames = JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aMainFieldNames, 1);
@@ -187,7 +187,7 @@ public class FormWizard extends DatabaseObjectWizard
             {
                 final String sTableName = curSubFormFieldSelection.getSelectedCommandName();
                 final String[] aFieldNames = curSubFormFieldSelection.getSelectedFieldNames();
-                curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
+                curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames);
 
                 final String[] aSubFieldNames = curFormDocument.oSubFormDBMetaData.getFieldNames();
                 curFormDocument.LinkFieldNames = JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aSubFieldNames, 0);
@@ -248,7 +248,7 @@ public class FormWizard extends DatabaseObjectWizard
 
         curFormDocument.xProgressBar.setValue(40);
 
-        curFieldLinker = new FieldLinker(this, SOFIELDLINKER_PAGE, 95, 30, 210, 34441);
+        curFieldLinker = new FieldLinker(this, SOFIELDLINKER_PAGE, 95, 30, 34441);
         curFormDocument.xProgressBar.setValue(50);
 
         curControlArranger = new UIControlArranger(this, curFormDocument);
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 55386e750802..3e6b087d96e7 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -202,7 +202,7 @@ public class StyleApplier
         return (short) -1;
     }
 
-    public void applyStyle(boolean _bmodifyBackground, boolean _bapplyalways)
+    public void applyStyle(boolean _bapplyalways)
     {
         short iStyle = getStyleIndex();
         if ((iStyle != iOldLayoutPos) || _bapplyalways)